linux-kernel-mentees.lists.linuxfoundation.org archive mirror
 help / color / mirror / Atom feed
From: Vaibhav Gupta <vaibhavgupta40@gmail.com>
To: Bjorn Helgaas <helgaas@kernel.org>,
	Bjorn Helgaas <bhelgaas@google.com>,
	Bjorn Helgaas <bjorn@helgaas.com>,
	Vaibhav Gupta <vaibhav.varodek@gmail.com>,
	Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>,
	Sam Ravnborg <sam@ravnborg.org>,
	Paul Mackerras <paulus@samba.org>,
	Russell King <linux@armlinux.org.uk>,
	Andres Salomon <dilinger@queued.net>,
	Antonino Daplas <adaplas@gmail.com>
Cc: linux-fbdev@vger.kernel.org,
	Vaibhav Gupta <vaibhavgupta40@gmail.com>,
	linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org,
	linux-geode@lists.infradead.org,
	linux-kernel-mentees@lists.linuxfoundation.org,
	linux-arm-kernel@lists.infradead.org
Subject: [Linux-kernel-mentees] [PATCH v2 03/12] fbdev: via-core: use generic power management
Date: Tue, 11 Aug 2020 00:27:14 +0530	[thread overview]
Message-ID: <20200810185723.15540-4-vaibhavgupta40@gmail.com> (raw)
In-Reply-To: <20200810185723.15540-1-vaibhavgupta40@gmail.com>

Drivers should do only device-specific jobs. But in general, drivers using
legacy PCI PM framework for .suspend()/.resume() have to manage many PCI
PM-related tasks themselves which can be done by PCI Core itself. This
brings extra load on the driver and it directly calls PCI helper functions
to handle them.

Switch to the new generic framework by updating function signatures and
define a "struct dev_pm_ops" variable to bind PM callbacks. Also, remove
unnecessary calls to the PCI Helper functions along with the legacy
.suspend & .resume bindings. Additionally, this helps us to remove the
unnecessary call to via_suspend() in the event of Freeze and Hibernate, as
the function does nothing in their case.

Signed-off-by: Vaibhav Gupta <vaibhavgupta40@gmail.com>
---
 drivers/video/fbdev/via/via-core.c | 39 ++++++++++++------------------
 include/linux/via-core.h           |  2 --
 2 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/drivers/video/fbdev/via/via-core.c b/drivers/video/fbdev/via/via-core.c
index 703ddee9a244..89d75079b730 100644
--- a/drivers/video/fbdev/via/via-core.c
+++ b/drivers/video/fbdev/via/via-core.c
@@ -558,9 +558,8 @@ static void via_teardown_subdevs(void)
 /*
  * Power management functions
  */
-#ifdef CONFIG_PM
-static LIST_HEAD(viafb_pm_hooks);
-static DEFINE_MUTEX(viafb_pm_hooks_lock);
+static __maybe_unused LIST_HEAD(viafb_pm_hooks);
+static __maybe_unused DEFINE_MUTEX(viafb_pm_hooks_lock);
 
 void viafb_pm_register(struct viafb_pm_hooks *hooks)
 {
@@ -580,12 +579,10 @@ void viafb_pm_unregister(struct viafb_pm_hooks *hooks)
 }
 EXPORT_SYMBOL_GPL(viafb_pm_unregister);
 
-static int via_suspend(struct pci_dev *pdev, pm_message_t state)
+static int __maybe_unused via_suspend(struct device *dev)
 {
 	struct viafb_pm_hooks *hooks;
 
-	if (state.event != PM_EVENT_SUSPEND)
-		return 0;
 	/*
 	 * "I've occasionally hit a few drivers that caused suspend
 	 * failures, and each and every time it was a driver bug, and
@@ -600,24 +597,13 @@ static int via_suspend(struct pci_dev *pdev, pm_message_t state)
 		hooks->suspend(hooks->private);
 	mutex_unlock(&viafb_pm_hooks_lock);
 
-	pci_save_state(pdev);
-	pci_disable_device(pdev);
-	pci_set_power_state(pdev, pci_choose_state(pdev, state));
 	return 0;
 }
 
-static int via_resume(struct pci_dev *pdev)
+static int __maybe_unused via_resume(struct device *dev)
 {
 	struct viafb_pm_hooks *hooks;
 
-	/* Get the bus side powered up */
-	pci_set_power_state(pdev, PCI_D0);
-	pci_restore_state(pdev);
-	if (pci_enable_device(pdev))
-		return 0;
-
-	pci_set_master(pdev);
-
 	/* Now bring back any subdevs */
 	mutex_lock(&viafb_pm_hooks_lock);
 	list_for_each_entry(hooks, &viafb_pm_hooks, list)
@@ -626,7 +612,6 @@ static int via_resume(struct pci_dev *pdev)
 
 	return 0;
 }
-#endif /* CONFIG_PM */
 
 static int via_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
@@ -712,15 +697,23 @@ static const struct pci_device_id via_pci_table[] = {
 };
 MODULE_DEVICE_TABLE(pci, via_pci_table);
 
+static const struct dev_pm_ops via_pm_ops = {
+#ifdef CONFIG_PM_SLEEP
+	.suspend	= via_suspend,
+	.resume		= via_resume,
+	.freeze		= NULL,
+	.thaw		= via_resume,
+	.poweroff	= NULL,
+	.restore	= via_resume,
+#endif
+};
+
 static struct pci_driver via_driver = {
 	.name		= "viafb",
 	.id_table	= via_pci_table,
 	.probe		= via_pci_probe,
 	.remove		= via_pci_remove,
-#ifdef CONFIG_PM
-	.suspend	= via_suspend,
-	.resume		= via_resume,
-#endif
+	.driver.pm	= &via_pm_ops,
 };
 
 static int __init via_core_init(void)
diff --git a/include/linux/via-core.h b/include/linux/via-core.h
index 9e802deedb2d..8737599b9148 100644
--- a/include/linux/via-core.h
+++ b/include/linux/via-core.h
@@ -47,7 +47,6 @@ struct via_port_cfg {
 /*
  * Allow subdevs to register suspend/resume hooks.
  */
-#ifdef CONFIG_PM
 struct viafb_pm_hooks {
 	struct list_head list;
 	int (*suspend)(void *private);
@@ -57,7 +56,6 @@ struct viafb_pm_hooks {
 
 void viafb_pm_register(struct viafb_pm_hooks *hooks);
 void viafb_pm_unregister(struct viafb_pm_hooks *hooks);
-#endif /* CONFIG_PM */
 
 /*
  * This is the global viafb "device" containing stuff needed by
-- 
2.27.0

_______________________________________________
Linux-kernel-mentees mailing list
Linux-kernel-mentees@lists.linuxfoundation.org
https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees

  parent reply	other threads:[~2020-08-10 18:59 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-08-05 18:07 [Linux-kernel-mentees] [PATCH v1 00/12] video: fbdev: use generic power management Vaibhav Gupta
2020-08-05 18:07 ` [Linux-kernel-mentees] [PATCH v1 01/12] fbdev: gxfb: " Vaibhav Gupta
2020-08-05 20:19   ` Bjorn Helgaas
2020-08-06  5:59     ` Vaibhav Gupta
2020-08-08 11:17   ` Sam Ravnborg
2020-08-10  9:39     ` Vaibhav Gupta
2020-08-10  9:44       ` Vaibhav Gupta
2020-08-10 16:54       ` Sam Ravnborg
2020-08-10 17:58         ` Vaibhav Gupta
2020-08-10 18:57         ` [Linux-kernel-mentees] [PATCH v2 00/12] video: fbdev: " Vaibhav Gupta
2020-08-10 18:57           ` [Linux-kernel-mentees] [PATCH v2 01/12] fbdev: gxfb: " Vaibhav Gupta
2020-08-16 20:16             ` Sam Ravnborg
2020-08-17  7:45               ` Vaibhav Gupta
2020-08-10 18:57           ` [Linux-kernel-mentees] [PATCH v2 02/12] fbdev: lxfb: " Vaibhav Gupta
2020-08-10 18:57           ` Vaibhav Gupta [this message]
2020-08-10 18:57           ` [Linux-kernel-mentees] [PATCH v2 04/12] fbdev: aty: " Vaibhav Gupta
2020-08-10 18:57           ` [Linux-kernel-mentees] [PATCH v2 05/12] fbdev: aty128fb: " Vaibhav Gupta
2020-08-10 18:57           ` [Linux-kernel-mentees] [PATCH v2 06/12] fbdev: nvidia: " Vaibhav Gupta
2020-08-10 18:57           ` [Linux-kernel-mentees] [PATCH v2 07/12] fbdev: savagefb: " Vaibhav Gupta
2020-08-10 18:57           ` [Linux-kernel-mentees] [PATCH v2 08/12] fbdev: cyber2000fb: " Vaibhav Gupta
2020-08-10 18:57           ` [Linux-kernel-mentees] [PATCH v2 09/12] fbdev: i740fb: " Vaibhav Gupta
2020-08-16 20:24             ` Sam Ravnborg
2020-08-17  7:46               ` Vaibhav Gupta
2020-08-10 18:57           ` [Linux-kernel-mentees] [PATCH v2 10/12] fbdev: vt8623fb: " Vaibhav Gupta
2020-08-10 18:57           ` [Linux-kernel-mentees] [PATCH v2 11/12] fbdev: s3fb: " Vaibhav Gupta
2020-08-10 18:57           ` [Linux-kernel-mentees] [PATCH v2 12/12] fbdev: arkfb: " Vaibhav Gupta
2020-08-05 18:07 ` [Linux-kernel-mentees] [PATCH v1 02/12] fbdev: lxfb: " Vaibhav Gupta
2020-08-08 11:19   ` Sam Ravnborg
2020-08-05 18:07 ` [Linux-kernel-mentees] [PATCH v1 03/12] fbdev: via-core: " Vaibhav Gupta
2020-08-05 18:07 ` [Linux-kernel-mentees] [PATCH v1 04/12] fbdev: aty: " Vaibhav Gupta
2020-08-05 18:07 ` [Linux-kernel-mentees] [PATCH v1 05/12] fbdev: aty128fb: " Vaibhav Gupta
2020-08-05 18:07 ` [Linux-kernel-mentees] [PATCH v1 06/12] fbdev: nvidia: " Vaibhav Gupta
2020-08-05 18:07 ` [Linux-kernel-mentees] [PATCH v1 07/12] fbdev: savagefb: " Vaibhav Gupta
2020-08-05 18:07 ` [Linux-kernel-mentees] [PATCH v1 08/12] fbdev: cyber2000fb: " Vaibhav Gupta
2020-08-05 18:07 ` [Linux-kernel-mentees] [PATCH v1 09/12] fbdev: i740fb: " Vaibhav Gupta
2020-08-05 18:07 ` [Linux-kernel-mentees] [PATCH v1 10/12] fbdev: vt8623fb: " Vaibhav Gupta
2020-08-05 18:07 ` [Linux-kernel-mentees] [PATCH v1 11/12] fbdev: s3fb: " Vaibhav Gupta
2020-08-05 18:07 ` [Linux-kernel-mentees] [PATCH v1 12/12] fbdev: arkfb: " Vaibhav Gupta

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200810185723.15540-4-vaibhavgupta40@gmail.com \
    --to=vaibhavgupta40@gmail.com \
    --cc=adaplas@gmail.com \
    --cc=b.zolnierkie@samsung.com \
    --cc=bhelgaas@google.com \
    --cc=bjorn@helgaas.com \
    --cc=dilinger@queued.net \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=helgaas@kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-fbdev@vger.kernel.org \
    --cc=linux-geode@lists.infradead.org \
    --cc=linux-kernel-mentees@lists.linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux@armlinux.org.uk \
    --cc=paulus@samba.org \
    --cc=sam@ravnborg.org \
    --cc=vaibhav.varodek@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).