Received: by 2002:a05:6a10:a0d1:0:0:0:0 with SMTP id j17csp1110024pxa; Wed, 5 Aug 2020 23:03:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxA8Cn+ux26WsECg8BulCZUNHl9xVTbAWuvcY0pbKmxkwkFMaGW/739wwsilNFzXnF/MPcQ X-Received: by 2002:a17:906:1f53:: with SMTP id d19mr2709455ejk.327.1596693822054; Wed, 05 Aug 2020 23:03:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1596693822; cv=none; d=google.com; s=arc-20160816; b=pY1OkQM6gDhGpkZb+iQTm+NrdiYjQkrUPq67GVdrVG4vUZ+Mwt+IewOkkK1UXp5mRv un5K0FwWv9eHJTHBn//kQTv4ca/ItFZNUmPzK3uL2a1H6q35oeYlbTLLPNnYuJC47sJG 875ieJO2FKBGdt2knafAHtW1tSdj9XVMruW7l3TwG09mA3yAwNJMPXu4SAMEaiZEiKzB 2u9Ck+23UPQSum7dLXu6k+csxsWLMBZihy4/MbMPAttRVNGRHsiuToouh8tYxE12tyJF xUOtA8m7tlqWS+Sr/6Xd/sTwzM7EVKhJeAHIBGJg9EQnW03pQVR/4Q764i2Iqz1cEp/W oTIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:in-reply-to:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :dkim-signature; bh=MQuBJ0AZA3Ql/KbLn468nE0MeNrmfmZUYry76u8WWnU=; b=WK+6zBo6K2IHjrZ6Han0McZJ7MrVG2GDNhrbTdMj2SoBtUvH07pMzLf/Di/BDEKZgb KtEBVS4xoGn2kaeFxFYH1qc1qv04W/SguODsKOZeWvXOrKmGzAn5aFx4CclD4DMSLnFy hUcyVNgI/y0CYsZonJFZFrClwm+Vk+BoXB0YNrvslukXaF5fEC7Hj5THzIU0gLGOxM2I J79kyWqOwL24GaeeX7KhyAquIyFQxEPwCTaqSyiPM1YegjIZmXyRDTLe03zbsh1xhirK 2ZNDeg5O7OAMTNrXoY4GjIjYS2AdbYDoYwuOAMDjDrtl/406eAMc4kPFl3x7lOg8pAtc RnUw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=jfX2ioH7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id y3si2751450edi.200.2020.08.05.23.03.19; Wed, 05 Aug 2020 23:03:42 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=jfX2ioH7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726923AbgHFGAq (ORCPT + 99 others); Thu, 6 Aug 2020 02:00:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56282 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726051AbgHFGAp (ORCPT ); Thu, 6 Aug 2020 02:00:45 -0400 Received: from mail-pj1-x1044.google.com (mail-pj1-x1044.google.com [IPv6:2607:f8b0:4864:20::1044]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 20861C061574; Wed, 5 Aug 2020 23:00:43 -0700 (PDT) Received: by mail-pj1-x1044.google.com with SMTP id 2so6074992pjx.5; Wed, 05 Aug 2020 23:00:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=MQuBJ0AZA3Ql/KbLn468nE0MeNrmfmZUYry76u8WWnU=; b=jfX2ioH7ZSJzrDANkazGM2XJ7JGsVM3tBYR+RSYwcg/QLerDtmI8jEw3H/5e15kW44 RdeU2DdDLmI10zC0CweUu8fZ37g6mnn5baVOhReo3lXeWp9XSKC+4V7Of0+OwqCuI4HG 77axr46GEeY2Jmgoy9wGnQoCNgx0L8uhh/bI4zWmrr1GhqvMaz59mfSuqAv7niwihqTD AbKBMVdEaT6bS/ggY3wjGM+36AjP0+JIvLXMVkdJ9y8RhNy3U7pvaEhKR8SwCrGFOpAJ p6pnV/p/0+ayK2r2gatPQWKV31vBIQYHFCugvJfaWXQrwbYd30qXTnmP1G2alMR9rXzv gAsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=MQuBJ0AZA3Ql/KbLn468nE0MeNrmfmZUYry76u8WWnU=; b=f56L+brcMR5aLkvbpiiSlJ9fyF71Yb/f9oV0cq95ODCymyMyikVOUBmdY3FSuvp3yv ylkmv/dENJmvNu8xVL6mi0mFCaLw6d3jfl/4Tpww4pBQi8clJWdeVh/jP1vSjRPqoL6s 6cvlZowZmLfzQy5PADfiWkjRyb4gsn5hgm4WASM5TTquQtz+NGABh6iI20s4f295VqcN FAKoGXhs9zMRv3lrAA8tZ6nWE2dfUu8apliXs3TDFyXBaMvA5+kWJqjQ00lJf9hds5wU +DqY1H1R7r0TzQlqikcsooyTI9AJoA++74Q14SNOo3i/UGlkIpI4gZ60Ai4l/t19uCLT isvQ== X-Gm-Message-State: AOAM530i56PwHCy851WhOxY4qAw3S40Z5OXNyoorjts6yTmuFN7jFbc3 U85Y2ithk9BHrxpnqp5SzWo= X-Received: by 2002:a17:90b:124e:: with SMTP id gx14mr6994509pjb.225.1596693639235; Wed, 05 Aug 2020 23:00:39 -0700 (PDT) Received: from gmail.com ([103.105.152.86]) by smtp.gmail.com with ESMTPSA id a33sm5485817pgl.75.2020.08.05.23.00.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Aug 2020 23:00:38 -0700 (PDT) Date: Thu, 6 Aug 2020 11:29:06 +0530 From: Vaibhav Gupta To: Bjorn Helgaas Cc: Bjorn Helgaas , Bjorn Helgaas , Vaibhav Gupta , Bartlomiej Zolnierkiewicz , Paul Mackerras , Russell King , Andres Salomon , Antonino Daplas , Florian Tobias Schandinat , dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-geode@lists.infradead.org, linux-kernel@vger.kernel.org, linux-kernel-mentees@lists.linuxfoundation.org, Shuah Khan Subject: Re: [PATCH v1 01/12] fbdev: gxfb: use generic power management Message-ID: <20200806055843.GA486683@gmail.com> References: <20200805180722.244008-2-vaibhavgupta40@gmail.com> <20200805201901.GA529929@bjorn-Precision-5520> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20200805201901.GA529929@bjorn-Precision-5520> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Aug 05, 2020 at 03:19:01PM -0500, Bjorn Helgaas wrote: > On Wed, Aug 05, 2020 at 11:37:11PM +0530, Vaibhav Gupta wrote: > > Drivers using legacy power management .suspen()/.resume() callbacks > > have to manage PCI states and device's PM states themselves. They also > > need to take care of standard configuration registers. > > s/using legacy/using legacy PCI/ > s/.suspen/.suspend/ (in all these patches) > Oh, that's a blunder. Since most of the drivers in my project need similar changes, I made a template for commit message. And by mistake I would have edited the template itself. > I wouldn't necessarily repost the whole series just for that (unless > the maintainer wants it), but maybe update your branch so if you have > occasion to repost for other reasons, this will be fixed. > > This particular driver actually doesn't *do* any of the PCI state or > device PM state management you mention. And I don't see the "single > 'struct dev_pm_ops'" you mention below -- I thought that meant you > would have a single struct shared between drivers (I think you did > that for IDE?), but that's not what you're doing. This driver has > gxfb_pm_ops, the next has lxfb_pm_ops, etc. > Yeah, the sentence sounds misleading. What I meant was that earlier there were two pointers for PM, .suspend and .resume. Whereas now there is a single "struct dev_pm_ops" variable inside pci_driver. > AFAICT the patches are fine, but the commit logs don't seem exactly > accurate. > I am fixing it. Thanks Vaibhav Gupta > > Switch to generic power management framework using a single > > "struct dev_pm_ops" variable to take the unnecessary load from the driver. > > This also avoids the need for the driver to directly call most of the PCI > > helper functions and device power state control functions, as through > > the generic framework PCI Core takes care of the necessary operations, > > and drivers are required to do only device-specific jobs. > > > > Signed-off-by: Vaibhav Gupta > > --- > > drivers/video/fbdev/geode/gxfb.h | 5 ---- > > drivers/video/fbdev/geode/gxfb_core.c | 36 ++++++++++++++------------ > > drivers/video/fbdev/geode/suspend_gx.c | 4 --- > > 3 files changed, 20 insertions(+), 25 deletions(-) > > > > diff --git a/drivers/video/fbdev/geode/gxfb.h b/drivers/video/fbdev/geode/gxfb.h > > index d2e9c5c8e294..792c111c21e4 100644 > > --- a/drivers/video/fbdev/geode/gxfb.h > > +++ b/drivers/video/fbdev/geode/gxfb.h > > @@ -21,7 +21,6 @@ struct gxfb_par { > > void __iomem *dc_regs; > > void __iomem *vid_regs; > > void __iomem *gp_regs; > > -#ifdef CONFIG_PM > > int powered_down; > > > > /* register state, for power management functionality */ > > @@ -36,7 +35,6 @@ struct gxfb_par { > > uint64_t fp[FP_REG_COUNT]; > > > > uint32_t pal[DC_PAL_COUNT]; > > -#endif > > }; > > > > unsigned int gx_frame_buffer_size(void); > > @@ -49,11 +47,8 @@ void gx_set_dclk_frequency(struct fb_info *info); > > void gx_configure_display(struct fb_info *info); > > int gx_blank_display(struct fb_info *info, int blank_mode); > > > > -#ifdef CONFIG_PM > > int gx_powerdown(struct fb_info *info); > > int gx_powerup(struct fb_info *info); > > -#endif > > - > > > > /* Graphics Processor registers (table 6-23 from the data book) */ > > enum gp_registers { > > diff --git a/drivers/video/fbdev/geode/gxfb_core.c b/drivers/video/fbdev/geode/gxfb_core.c > > index d38a148d4746..44089b331f91 100644 > > --- a/drivers/video/fbdev/geode/gxfb_core.c > > +++ b/drivers/video/fbdev/geode/gxfb_core.c > > @@ -322,17 +322,14 @@ static struct fb_info *gxfb_init_fbinfo(struct device *dev) > > return info; > > } > > > > -#ifdef CONFIG_PM > > -static int gxfb_suspend(struct pci_dev *pdev, pm_message_t state) > > +static int __maybe_unused gxfb_suspend(struct device *dev) > > { > > - struct fb_info *info = pci_get_drvdata(pdev); > > + struct fb_info *info = dev_get_drvdata(dev); > > > > - if (state.event == PM_EVENT_SUSPEND) { > > - console_lock(); > > - gx_powerdown(info); > > - fb_set_suspend(info, 1); > > - console_unlock(); > > - } > > + console_lock(); > > + gx_powerdown(info); > > + fb_set_suspend(info, 1); > > + console_unlock(); > > > > /* there's no point in setting PCI states; we emulate PCI, so > > * we don't end up getting power savings anyways */ > > @@ -340,9 +337,9 @@ static int gxfb_suspend(struct pci_dev *pdev, pm_message_t state) > > return 0; > > } > > > > -static int gxfb_resume(struct pci_dev *pdev) > > +static int __maybe_unused gxfb_resume(struct device *dev) > > { > > - struct fb_info *info = pci_get_drvdata(pdev); > > + struct fb_info *info = dev_get_drvdata(dev); > > int ret; > > > > console_lock(); > > @@ -356,7 +353,6 @@ static int gxfb_resume(struct pci_dev *pdev) > > console_unlock(); > > return 0; > > } > > -#endif > > > > static int gxfb_probe(struct pci_dev *pdev, const struct pci_device_id *id) > > { > > @@ -467,15 +463,23 @@ static const struct pci_device_id gxfb_id_table[] = { > > > > MODULE_DEVICE_TABLE(pci, gxfb_id_table); > > > > +static const struct dev_pm_ops gxfb_pm_ops = { > > +#ifdef CONFIG_PM_SLEEP > > + .suspend = gxfb_suspend, > > + .resume = gxfb_resume, > > + .freeze = NULL, > > + .thaw = gxfb_resume, > > + .poweroff = NULL, > > + .restore = gxfb_resume, > > +#endif > > +}; > > + > > static struct pci_driver gxfb_driver = { > > .name = "gxfb", > > .id_table = gxfb_id_table, > > .probe = gxfb_probe, > > .remove = gxfb_remove, > > -#ifdef CONFIG_PM > > - .suspend = gxfb_suspend, > > - .resume = gxfb_resume, > > -#endif > > + .driver.pm = &gxfb_pm_ops, > > }; > > > > #ifndef MODULE > > diff --git a/drivers/video/fbdev/geode/suspend_gx.c b/drivers/video/fbdev/geode/suspend_gx.c > > index 1110a527c35c..8c49d4e98772 100644 > > --- a/drivers/video/fbdev/geode/suspend_gx.c > > +++ b/drivers/video/fbdev/geode/suspend_gx.c > > @@ -11,8 +11,6 @@ > > > > #include "gxfb.h" > > > > -#ifdef CONFIG_PM > > - > > static void gx_save_regs(struct gxfb_par *par) > > { > > int i; > > @@ -259,5 +257,3 @@ int gx_powerup(struct fb_info *info) > > par->powered_down = 0; > > return 0; > > } > > - > > -#endif > > -- > > 2.27.0 > >