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>,
Adam Radford <aradford@gmail.com>,
"James E.J. Bottomley" <jejb@linux.ibm.com>,
"Martin K. Petersen" <martin.petersen@oracle.com>,
Adaptec OEM Raid Solutions <aacraid@microsemi.com>,
Hannes Reinecke <hare@suse.com>,
Bradley Grove <linuxdrivers@attotech.com>,
John Garry <john.garry@huawei.com>,
Don Brace <don.brace@microsemi.com>,
Xiang Chen <chenxiang66@hisilicon.com>,
James Smart <james.smart@broadcom.com>,
Dick Kennedy <dick.kennedy@broadcom.com>,
Kashyap Desai <kashyap.desai@broadcom.com>,
Sumit Saxena <sumit.saxena@broadcom.com>,
Shivasharan S <shivasharan.srikanteshwara@broadcom.com>,
Sathya Prakash <sathya.prakash@broadcom.com>,
Sreekanth Reddy <sreekanth.reddy@broadcom.com>,
Suganath Prabu Subramani <suganath-prabu.subramani@broadcom.com>,
Jack Wang <jinpu.wang@cloud.ionos.com>,
Balsundar P <balsundar.p@microchip.com>
Cc: Vaibhav Gupta <vaibhavgupta40@gmail.com>,
Shuah Khan <skhan@linuxfoundation.org>,
linux-kernel@vger.kernel.org,
linux-kernel-mentees@lists.linuxfoundation.org,
linux-scsi@vger.kernel.org, esc.storagedev@microsemi.com,
megaraidlinux.pdl@broadcom.com, MPT-FusionLinux.pdl@broadcom.com
Subject: [PATCH v4 07/29] scsi: aic79xx: use generic power management
Date: Mon, 2 Nov 2020 22:17:08 +0530 [thread overview]
Message-ID: <20201102164730.324035-8-vaibhavgupta40@gmail.com> (raw)
In-Reply-To: <20201102164730.324035-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.
Signed-off-by: Vaibhav Gupta <vaibhavgupta40@gmail.com>
---
drivers/scsi/aic7xxx/aic79xx.h | 12 +++----
drivers/scsi/aic7xxx/aic79xx_core.c | 8 ++---
drivers/scsi/aic7xxx/aic79xx_osm_pci.c | 43 +++++++-------------------
drivers/scsi/aic7xxx/aic79xx_pci.c | 6 ++--
4 files changed, 20 insertions(+), 49 deletions(-)
diff --git a/drivers/scsi/aic7xxx/aic79xx.h b/drivers/scsi/aic7xxx/aic79xx.h
index 9a515551641c..dd5dfd4f30a5 100644
--- a/drivers/scsi/aic7xxx/aic79xx.h
+++ b/drivers/scsi/aic7xxx/aic79xx.h
@@ -1330,10 +1330,8 @@ const struct ahd_pci_identity *ahd_find_pci_device(ahd_dev_softc_t);
int ahd_pci_config(struct ahd_softc *,
const struct ahd_pci_identity *);
int ahd_pci_test_register_access(struct ahd_softc *);
-#ifdef CONFIG_PM
-void ahd_pci_suspend(struct ahd_softc *);
-void ahd_pci_resume(struct ahd_softc *);
-#endif
+void __maybe_unused ahd_pci_suspend(struct ahd_softc *);
+void __maybe_unused ahd_pci_resume(struct ahd_softc *);
/************************** SCB and SCB queue management **********************/
void ahd_qinfifo_requeue_tail(struct ahd_softc *ahd,
@@ -1344,10 +1342,8 @@ struct ahd_softc *ahd_alloc(void *platform_arg, char *name);
int ahd_softc_init(struct ahd_softc *);
void ahd_controller_info(struct ahd_softc *ahd, char *buf);
int ahd_init(struct ahd_softc *ahd);
-#ifdef CONFIG_PM
-int ahd_suspend(struct ahd_softc *ahd);
-void ahd_resume(struct ahd_softc *ahd);
-#endif
+int __maybe_unused ahd_suspend(struct ahd_softc *ahd);
+void __maybe_unused ahd_resume(struct ahd_softc *ahd);
int ahd_default_config(struct ahd_softc *ahd);
int ahd_parse_vpddata(struct ahd_softc *ahd,
struct vpd_config *vpd);
diff --git a/drivers/scsi/aic7xxx/aic79xx_core.c b/drivers/scsi/aic7xxx/aic79xx_core.c
index 98b02e7d38bb..78560a85b1e3 100644
--- a/drivers/scsi/aic7xxx/aic79xx_core.c
+++ b/drivers/scsi/aic7xxx/aic79xx_core.c
@@ -7866,11 +7866,9 @@ ahd_pause_and_flushwork(struct ahd_softc *ahd)
ahd->flags &= ~AHD_ALL_INTERRUPTS;
}
-#ifdef CONFIG_PM
-int
+int __maybe_unused
ahd_suspend(struct ahd_softc *ahd)
{
-
ahd_pause_and_flushwork(ahd);
if (LIST_FIRST(&ahd->pending_scbs) != NULL) {
@@ -7881,15 +7879,13 @@ ahd_suspend(struct ahd_softc *ahd)
return (0);
}
-void
+void __maybe_unused
ahd_resume(struct ahd_softc *ahd)
{
-
ahd_reset(ahd, /*reinit*/TRUE);
ahd_intr_enable(ahd, TRUE);
ahd_restart(ahd);
}
-#endif
/************************** Busy Target Table *********************************/
/*
diff --git a/drivers/scsi/aic7xxx/aic79xx_osm_pci.c b/drivers/scsi/aic7xxx/aic79xx_osm_pci.c
index 8b891a05d9e7..07b670b80f1b 100644
--- a/drivers/scsi/aic7xxx/aic79xx_osm_pci.c
+++ b/drivers/scsi/aic7xxx/aic79xx_osm_pci.c
@@ -74,11 +74,10 @@ static const struct pci_device_id ahd_linux_pci_id_table[] = {
MODULE_DEVICE_TABLE(pci, ahd_linux_pci_id_table);
-#ifdef CONFIG_PM
-static int
-ahd_linux_pci_dev_suspend(struct pci_dev *pdev, pm_message_t mesg)
+static int __maybe_unused
+ahd_linux_pci_dev_suspend(struct device *dev)
{
- struct ahd_softc *ahd = pci_get_drvdata(pdev);
+ struct ahd_softc *ahd = dev_get_drvdata(dev);
int rc;
if ((rc = ahd_suspend(ahd)))
@@ -86,39 +85,20 @@ ahd_linux_pci_dev_suspend(struct pci_dev *pdev, pm_message_t mesg)
ahd_pci_suspend(ahd);
- pci_save_state(pdev);
- pci_disable_device(pdev);
-
- if (mesg.event & PM_EVENT_SLEEP)
- pci_set_power_state(pdev, PCI_D3hot);
-
return rc;
}
-static int
-ahd_linux_pci_dev_resume(struct pci_dev *pdev)
+static int __maybe_unused
+ahd_linux_pci_dev_resume(struct device *dev)
{
- struct ahd_softc *ahd = pci_get_drvdata(pdev);
- int rc;
-
- pci_set_power_state(pdev, PCI_D0);
- pci_restore_state(pdev);
-
- if ((rc = pci_enable_device(pdev))) {
- dev_printk(KERN_ERR, &pdev->dev,
- "failed to enable device after resume (%d)\n", rc);
- return rc;
- }
-
- pci_set_master(pdev);
+ struct ahd_softc *ahd = dev_get_drvdata(dev);
ahd_pci_resume(ahd);
ahd_resume(ahd);
- return rc;
+ return 0;
}
-#endif
static void
ahd_linux_pci_dev_remove(struct pci_dev *pdev)
@@ -224,13 +204,14 @@ ahd_linux_pci_dev_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
return (0);
}
+static SIMPLE_DEV_PM_OPS(ahd_linux_pci_dev_pm_ops,
+ ahd_linux_pci_dev_suspend,
+ ahd_linux_pci_dev_resume);
+
static struct pci_driver aic79xx_pci_driver = {
.name = "aic79xx",
.probe = ahd_linux_pci_dev_probe,
-#ifdef CONFIG_PM
- .suspend = ahd_linux_pci_dev_suspend,
- .resume = ahd_linux_pci_dev_resume,
-#endif
+ .driver.pm = &ahd_linux_pci_dev_pm_ops,
.remove = ahd_linux_pci_dev_remove,
.id_table = ahd_linux_pci_id_table
};
diff --git a/drivers/scsi/aic7xxx/aic79xx_pci.c b/drivers/scsi/aic7xxx/aic79xx_pci.c
index 8397ae93f7dd..2f0bdb9225a4 100644
--- a/drivers/scsi/aic7xxx/aic79xx_pci.c
+++ b/drivers/scsi/aic7xxx/aic79xx_pci.c
@@ -377,8 +377,7 @@ ahd_pci_config(struct ahd_softc *ahd, const struct ahd_pci_identity *entry)
return ahd_pci_map_int(ahd);
}
-#ifdef CONFIG_PM
-void
+void __maybe_unused
ahd_pci_suspend(struct ahd_softc *ahd)
{
/*
@@ -394,7 +393,7 @@ ahd_pci_suspend(struct ahd_softc *ahd)
}
-void
+void __maybe_unused
ahd_pci_resume(struct ahd_softc *ahd)
{
ahd_pci_write_config(ahd->dev_softc, DEVCONFIG,
@@ -404,7 +403,6 @@ ahd_pci_resume(struct ahd_softc *ahd)
ahd_pci_write_config(ahd->dev_softc, CSIZE_LATTIME,
ahd->suspend_state.pci_state.csize_lattime, /*bytes*/1);
}
-#endif
/*
* Perform some simple tests that should catch situations where
--
2.28.0
next prev parent reply other threads:[~2020-11-02 16:51 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-02 16:47 [PATCH v4 00/29] scsi: " Vaibhav Gupta
2020-11-02 16:47 ` [PATCH v4 01/29] scsi: megaraid_sas: Drop PCI wakeup calls from .resume Vaibhav Gupta
2020-11-02 16:47 ` [PATCH v4 02/29] scsi: megaraid_sas: use generic power management Vaibhav Gupta
2020-11-02 16:47 ` [PATCH v4 03/29] scsi: megaraid_sas: update function description Vaibhav Gupta
2020-11-02 16:47 ` [PATCH v4 04/29] scsi: aacraid: Drop pci_enable_wake() from .resume Vaibhav Gupta
2020-11-02 16:47 ` [PATCH v4 05/29] scsi: aacraid: use generic power management Vaibhav Gupta
2020-11-02 16:47 ` [PATCH v4 06/29] scsi: aic7xxx: " Vaibhav Gupta
2020-11-02 16:47 ` Vaibhav Gupta [this message]
2020-11-02 16:47 ` [PATCH v4 08/29] scsi: arcmsr: Drop PCI wakeup calls from .resume Vaibhav Gupta
2020-11-02 16:47 ` [PATCH v4 09/29] scsi: arcmsr: use generic power management Vaibhav Gupta
2020-11-02 16:47 ` [PATCH v4 10/29] scsi: esas2r: Drop PCI Wakeup calls from .resume Vaibhav Gupta
2020-11-02 16:47 ` [PATCH v4 11/29] scsi: esas2r: use generic power management Vaibhav Gupta
2020-11-02 16:47 ` [PATCH v4 12/29] scsi: hisi_sas_v3_hw: Drop PCI Wakeup calls from .resume Vaibhav Gupta
2020-11-02 16:47 ` [PATCH v4 13/29] scsi: hisi_sas_v3_hw: Don't use PCI helper functions Vaibhav Gupta
2020-11-02 16:47 ` [PATCH v4 14/29] scsi: hisi_sas_v3_hw: Remove extra function calls for runtime pm Vaibhav Gupta
2020-11-02 16:47 ` [PATCH v4 15/29] scsi: mpt3sas_scsih: Drop PCI Wakeup calls from .resume Vaibhav Gupta
2020-11-02 16:47 ` [PATCH v4 16/29] scsi: mpt3sas_scsih: use generic power management Vaibhav Gupta
2020-11-02 16:47 ` [PATCH v4 17/29] scsi: lpfc: " Vaibhav Gupta
2020-11-02 16:47 ` [PATCH v4 18/29] scsi: pm_8001: Drop PCI Wakeup calls from .resume Vaibhav Gupta
2020-11-02 16:47 ` [PATCH v4 19/29] scsi: pm_8001: use generic power management Vaibhav Gupta
2020-11-02 16:47 ` [PATCH v4 20/29] scsi: hpsa: " Vaibhav Gupta
2020-11-04 18:08 ` Don.Brace
2020-11-02 16:47 ` [PATCH v4 21/29] scsi: 3w-9xxx: Drop PCI Wakeup calls from .resume Vaibhav Gupta
2020-11-02 16:47 ` [PATCH v4 22/29] scsi: 3w-9xxx: use generic power management Vaibhav Gupta
2020-11-02 16:47 ` [PATCH v4 23/29] scsi: 3w-sas: Drop PCI Wakeup calls from .resume Vaibhav Gupta
2020-11-02 16:47 ` [PATCH v4 24/29] scsi: 3w-sas: use generic power management Vaibhav Gupta
2020-11-02 16:47 ` [PATCH v4 25/29] scsi: mvumi: Drop PCI Wakeup calls from .resume Vaibhav Gupta
2020-11-02 16:47 ` [PATCH v4 26/29] scsi: mvumi: use generic power management Vaibhav Gupta
2020-11-02 16:47 ` [PATCH v4 27/29] scsi: mvumi: update function description Vaibhav Gupta
2020-11-02 16:47 ` [PATCH v4 28/29] scsi: pmcraid: Drop PCI Wakeup calls from .resume Vaibhav Gupta
2020-11-02 16:47 ` [PATCH v4 29/29] scsi: pmcraid: use generic power management Vaibhav Gupta
2020-12-01 5:05 ` [PATCH v4 00/29] scsi: " Martin K. Petersen
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=20201102164730.324035-8-vaibhavgupta40@gmail.com \
--to=vaibhavgupta40@gmail.com \
--cc=MPT-FusionLinux.pdl@broadcom.com \
--cc=aacraid@microsemi.com \
--cc=aradford@gmail.com \
--cc=balsundar.p@microchip.com \
--cc=bhelgaas@google.com \
--cc=bjorn@helgaas.com \
--cc=chenxiang66@hisilicon.com \
--cc=dick.kennedy@broadcom.com \
--cc=don.brace@microsemi.com \
--cc=esc.storagedev@microsemi.com \
--cc=hare@suse.com \
--cc=helgaas@kernel.org \
--cc=james.smart@broadcom.com \
--cc=jejb@linux.ibm.com \
--cc=jinpu.wang@cloud.ionos.com \
--cc=john.garry@huawei.com \
--cc=kashyap.desai@broadcom.com \
--cc=linux-kernel-mentees@lists.linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=linuxdrivers@attotech.com \
--cc=martin.petersen@oracle.com \
--cc=megaraidlinux.pdl@broadcom.com \
--cc=sathya.prakash@broadcom.com \
--cc=shivasharan.srikanteshwara@broadcom.com \
--cc=skhan@linuxfoundation.org \
--cc=sreekanth.reddy@broadcom.com \
--cc=suganath-prabu.subramani@broadcom.com \
--cc=sumit.saxena@broadcom.com \
--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
all inboxes | Powered by JetHome®