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 06/29] scsi: aic7xxx: use generic power management
Date: Mon, 2 Nov 2020 22:17:07 +0530 [thread overview]
Message-ID: <20201102164730.324035-7-vaibhavgupta40@gmail.com> (raw)
In-Reply-To: <20201102164730.324035-1-vaibhavgupta40@gmail.com>
use generic power management
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/aic7xxx.h | 10 ++----
drivers/scsi/aic7xxx/aic7xxx_core.c | 6 ++--
drivers/scsi/aic7xxx/aic7xxx_osm_pci.c | 46 ++++++--------------------
drivers/scsi/aic7xxx/aic7xxx_pci.c | 4 +--
4 files changed, 17 insertions(+), 49 deletions(-)
diff --git a/drivers/scsi/aic7xxx/aic7xxx.h b/drivers/scsi/aic7xxx/aic7xxx.h
index 88b90f9806c9..11a09798e6b5 100644
--- a/drivers/scsi/aic7xxx/aic7xxx.h
+++ b/drivers/scsi/aic7xxx/aic7xxx.h
@@ -1134,9 +1134,7 @@ const struct ahc_pci_identity *ahc_find_pci_device(ahc_dev_softc_t);
int ahc_pci_config(struct ahc_softc *,
const struct ahc_pci_identity *);
int ahc_pci_test_register_access(struct ahc_softc *);
-#ifdef CONFIG_PM
-void ahc_pci_resume(struct ahc_softc *ahc);
-#endif
+void __maybe_unused ahc_pci_resume(struct ahc_softc *ahc);
/*************************** EISA/VL Front End ********************************/
struct aic7770_identity *aic7770_find_device(uint32_t);
@@ -1160,10 +1158,8 @@ int ahc_chip_init(struct ahc_softc *ahc);
int ahc_init(struct ahc_softc *ahc);
void ahc_intr_enable(struct ahc_softc *ahc, int enable);
void ahc_pause_and_flushwork(struct ahc_softc *ahc);
-#ifdef CONFIG_PM
-int ahc_suspend(struct ahc_softc *ahc);
-int ahc_resume(struct ahc_softc *ahc);
-#endif
+int __maybe_unused ahc_suspend(struct ahc_softc *ahc);
+int __maybe_unused ahc_resume(struct ahc_softc *ahc);
void ahc_set_unit(struct ahc_softc *, int);
void ahc_set_name(struct ahc_softc *, char *);
void ahc_free(struct ahc_softc *ahc);
diff --git a/drivers/scsi/aic7xxx/aic7xxx_core.c b/drivers/scsi/aic7xxx/aic7xxx_core.c
index 725bb7f58054..4ef7af8c0f55 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_core.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_core.c
@@ -5590,8 +5590,7 @@ ahc_pause_and_flushwork(struct ahc_softc *ahc)
ahc->flags &= ~AHC_ALL_INTERRUPTS;
}
-#ifdef CONFIG_PM
-int
+int __maybe_unused
ahc_suspend(struct ahc_softc *ahc)
{
@@ -5617,7 +5616,7 @@ ahc_suspend(struct ahc_softc *ahc)
return (0);
}
-int
+int __maybe_unused
ahc_resume(struct ahc_softc *ahc)
{
@@ -5626,7 +5625,6 @@ ahc_resume(struct ahc_softc *ahc)
ahc_restart(ahc);
return (0);
}
-#endif
/************************** Busy Target Table *********************************/
/*
* Return the untagged transaction id for a given target/channel lun.
diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c b/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
index 9b293b1f0b71..a07e94fac673 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
@@ -121,47 +121,23 @@ static const struct pci_device_id ahc_linux_pci_id_table[] = {
MODULE_DEVICE_TABLE(pci, ahc_linux_pci_id_table);
-#ifdef CONFIG_PM
-static int
-ahc_linux_pci_dev_suspend(struct pci_dev *pdev, pm_message_t mesg)
+static int __maybe_unused
+ahc_linux_pci_dev_suspend(struct device *dev)
{
- struct ahc_softc *ahc = pci_get_drvdata(pdev);
- int rc;
-
- if ((rc = ahc_suspend(ahc)))
- return rc;
+ struct ahc_softc *ahc = dev_get_drvdata(dev);
- pci_save_state(pdev);
- pci_disable_device(pdev);
-
- if (mesg.event & PM_EVENT_SLEEP)
- pci_set_power_state(pdev, PCI_D3hot);
-
- return rc;
+ return ahc_suspend(ahc);
}
-static int
-ahc_linux_pci_dev_resume(struct pci_dev *pdev)
+static int __maybe_unused
+ahc_linux_pci_dev_resume(struct device *dev)
{
- struct ahc_softc *ahc = 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 ahc_softc *ahc = dev_get_drvdata(dev);
ahc_pci_resume(ahc);
return (ahc_resume(ahc));
}
-#endif
static void
ahc_linux_pci_dev_remove(struct pci_dev *pdev)
@@ -319,14 +295,14 @@ ahc_pci_write_config(ahc_dev_softc_t pci, int reg, uint32_t value, int width)
}
}
+static SIMPLE_DEV_PM_OPS(ahc_linux_pci_dev_pm_ops,
+ ahc_linux_pci_dev_suspend,
+ ahc_linux_pci_dev_resume);
static struct pci_driver aic7xxx_pci_driver = {
.name = "aic7xxx",
.probe = ahc_linux_pci_dev_probe,
-#ifdef CONFIG_PM
- .suspend = ahc_linux_pci_dev_suspend,
- .resume = ahc_linux_pci_dev_resume,
-#endif
+ .driver.pm = &ahc_linux_pci_dev_pm_ops,
.remove = ahc_linux_pci_dev_remove,
.id_table = ahc_linux_pci_id_table
};
diff --git a/drivers/scsi/aic7xxx/aic7xxx_pci.c b/drivers/scsi/aic7xxx/aic7xxx_pci.c
index 656f680c7802..dab3a6d12c4d 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_pci.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_pci.c
@@ -2008,8 +2008,7 @@ ahc_pci_chip_init(struct ahc_softc *ahc)
return (ahc_chip_init(ahc));
}
-#ifdef CONFIG_PM
-void
+void __maybe_unused
ahc_pci_resume(struct ahc_softc *ahc)
{
/*
@@ -2040,7 +2039,6 @@ ahc_pci_resume(struct ahc_softc *ahc)
ahc_release_seeprom(&sd);
}
}
-#endif
static int
ahc_aic785X_setup(struct ahc_softc *ahc)
--
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 ` Vaibhav Gupta [this message]
2020-11-02 16:47 ` [PATCH v4 07/29] scsi: aic79xx: " Vaibhav Gupta
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-7-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®