Re: [PATCH v2 03/15] scsi: aic7xxx: use generic power management
On Mon, Jul 20, 2020 at 07:04:16PM +0530, Vaibhav Gupta wrote:
> With legacy PM hooks, it was the responsibility of a driver to manage PCI
> states and also the device's power state. The generic approach is to let
> the PCI core handle the work.
>
> PCI core passes "struct device*" as an argument to the .suspend() and
> .resume() callbacks.
>
> Driver was using PCI helper functions like pci_save/restore_state(),
> pci_disable/enable_device(), pci_set_power_state() and pci_enable_wake().
> They should not be invoked by the driver.
>
> Also, .suspend() and .resume() are invoking other functions for PM, which
> were againg bounded by "#ifdef CONFIG_PM" directive. Remove the directive
> and mark those functions as "__maybe_unused".
>
> Compile-tested only.
>
> Signed-off-by: Vaibhav Gupta
> ---
> 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_unusedahc_suspend(struct ahc_softc *ahc);
> +int __maybe_unusedahc_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 3d4df906fa4f..c7eb238a9599 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, >dev,
> -"failed to enable device
[PATCH v2 03/15] scsi: aic7xxx: use generic power management
With legacy PM hooks, it was the responsibility of a driver to manage PCI
states and also the device's power state. The generic approach is to let
the PCI core handle the work.
PCI core passes "struct device*" as an argument to the .suspend() and
.resume() callbacks.
Driver was using PCI helper functions like pci_save/restore_state(),
pci_disable/enable_device(), pci_set_power_state() and pci_enable_wake().
They should not be invoked by the driver.
Also, .suspend() and .resume() are invoking other functions for PM, which
were againg bounded by "#ifdef CONFIG_PM" directive. Remove the directive
and mark those functions as "__maybe_unused".
Compile-tested only.
Signed-off-by: Vaibhav Gupta
---
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
-voidahc_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);
voidahc_intr_enable(struct ahc_softc *ahc, int enable);
voidahc_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);
voidahc_set_unit(struct ahc_softc *, int);
voidahc_set_name(struct ahc_softc *, char *);
voidahc_free(struct ahc_softc *ahc);
diff --git a/drivers/scsi/aic7xxx/aic7xxx_core.c
b/drivers/scsi/aic7xxx/aic7xxx_core.c
index 3d4df906fa4f..c7eb238a9599 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, >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
