From: Bjorn Helgaas <[email protected]>
Vaibhav converted several AGP drivers from legacy PCI power management to
generic power management [1]. This series converts the rest of them.
v1 posted at [2].
Changes from v1 to v2:
- Convert from SIMPLE_DEV_PM_OPS() (which is deprecated) to
DEFINE_SIMPLE_DEV_PM_OPS() and remove __maybe_unused annotations.
[1] https://lore.kernel.org/all/[email protected]/#t
[2] https://lore.kernel.org/all/[email protected]/
Bjorn Helgaas (8):
agp/efficeon: Convert to generic power management
agp/intel: Convert to generic power management
agp/amd-k7: Convert to generic power management
agp/ati: Convert to generic power management
agp/nvidia: Convert to generic power management
agp/amd64: Update to DEFINE_SIMPLE_DEV_PM_OPS()
agp/sis: Update to DEFINE_SIMPLE_DEV_PM_OPS()
agp/via: Update to DEFINE_SIMPLE_DEV_PM_OPS()
drivers/char/agp/amd-k7-agp.c | 24 ++++--------------------
drivers/char/agp/amd64-agp.c | 6 ++----
drivers/char/agp/ati-agp.c | 22 ++++------------------
drivers/char/agp/efficeon-agp.c | 16 ++++------------
drivers/char/agp/intel-agp.c | 11 +++++------
drivers/char/agp/nvidia-agp.c | 24 ++++--------------------
drivers/char/agp/sis-agp.c | 7 ++-----
drivers/char/agp/via-agp.c | 6 ++----
8 files changed, 27 insertions(+), 89 deletions(-)
--
2.25.1
From: Bjorn Helgaas <[email protected]>
As of 1a3c7bb08826 ("PM: core: Add new *_PM_OPS macros, deprecate old
ones"), SIMPLE_DEV_PM_OPS() is deprecated in favor of
DEFINE_SIMPLE_DEV_PM_OPS(), which has the advantage that the PM callbacks
don't need to be wrapped with #ifdef CONFIG_PM or tagged with
__maybe_unused.
Convert to DEFINE_SIMPLE_DEV_PM_OPS(). No functional change intended.
Signed-off-by: Bjorn Helgaas <[email protected]>
---
drivers/char/agp/amd64-agp.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/char/agp/amd64-agp.c b/drivers/char/agp/amd64-agp.c
index 84a4aa9312cf..ce8651436609 100644
--- a/drivers/char/agp/amd64-agp.c
+++ b/drivers/char/agp/amd64-agp.c
@@ -588,9 +588,7 @@ static void agp_amd64_remove(struct pci_dev *pdev)
agp_bridges_found--;
}
-#define agp_amd64_suspend NULL
-
-static int __maybe_unused agp_amd64_resume(struct device *dev)
+static int agp_amd64_resume(struct device *dev)
{
struct pci_dev *pdev = to_pci_dev(dev);
@@ -727,7 +725,7 @@ static const struct pci_device_id agp_amd64_pci_promisc_table[] = {
{ }
};
-static SIMPLE_DEV_PM_OPS(agp_amd64_pm_ops, agp_amd64_suspend, agp_amd64_resume);
+static DEFINE_SIMPLE_DEV_PM_OPS(agp_amd64_pm_ops, NULL, agp_amd64_resume);
static struct pci_driver agp_amd64_pci_driver = {
.name = "agpgart-amd64",
--
2.25.1
From: Bjorn Helgaas <[email protected]>
As of 1a3c7bb08826 ("PM: core: Add new *_PM_OPS macros, deprecate old
ones"), SIMPLE_DEV_PM_OPS() is deprecated in favor of
DEFINE_SIMPLE_DEV_PM_OPS(), which has the advantage that the PM callbacks
don't need to be wrapped with #ifdef CONFIG_PM or tagged with
__maybe_unused.
Convert to DEFINE_SIMPLE_DEV_PM_OPS(). No functional change intended.
Signed-off-by: Bjorn Helgaas <[email protected]>
---
drivers/char/agp/via-agp.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/char/agp/via-agp.c b/drivers/char/agp/via-agp.c
index b2f484f527fb..bc5140af2dcb 100644
--- a/drivers/char/agp/via-agp.c
+++ b/drivers/char/agp/via-agp.c
@@ -489,9 +489,7 @@ static void agp_via_remove(struct pci_dev *pdev)
agp_put_bridge(bridge);
}
-#define agp_via_suspend NULL
-
-static int __maybe_unused agp_via_resume(struct device *dev)
+static int agp_via_resume(struct device *dev)
{
struct agp_bridge_data *bridge = dev_get_drvdata(dev);
@@ -551,7 +549,7 @@ static const struct pci_device_id agp_via_pci_table[] = {
MODULE_DEVICE_TABLE(pci, agp_via_pci_table);
-static SIMPLE_DEV_PM_OPS(agp_via_pm_ops, agp_via_suspend, agp_via_resume);
+static DEFINE_SIMPLE_DEV_PM_OPS(agp_via_pm_ops, NULL, agp_via_resume);
static struct pci_driver agp_via_pci_driver = {
.name = "agpgart-via",
--
2.25.1
From: Bjorn Helgaas <[email protected]>
As of 1a3c7bb08826 ("PM: core: Add new *_PM_OPS macros, deprecate old
ones"), SIMPLE_DEV_PM_OPS() is deprecated in favor of
DEFINE_SIMPLE_DEV_PM_OPS(), which has the advantage that the PM callbacks
don't need to be wrapped with #ifdef CONFIG_PM or tagged with
__maybe_unused.
Convert to DEFINE_SIMPLE_DEV_PM_OPS(). No functional change intended.
Signed-off-by: Bjorn Helgaas <[email protected]>
---
drivers/char/agp/sis-agp.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/drivers/char/agp/sis-agp.c b/drivers/char/agp/sis-agp.c
index f8a02f4bef1b..484bb101c53b 100644
--- a/drivers/char/agp/sis-agp.c
+++ b/drivers/char/agp/sis-agp.c
@@ -217,10 +217,7 @@ static void agp_sis_remove(struct pci_dev *pdev)
agp_put_bridge(bridge);
}
-#define agp_sis_suspend NULL
-
-static int __maybe_unused agp_sis_resume(
- __attribute__((unused)) struct device *dev)
+static int agp_sis_resume(__attribute__((unused)) struct device *dev)
{
return sis_driver.configure();
}
@@ -407,7 +404,7 @@ static const struct pci_device_id agp_sis_pci_table[] = {
MODULE_DEVICE_TABLE(pci, agp_sis_pci_table);
-static SIMPLE_DEV_PM_OPS(agp_sis_pm_ops, agp_sis_suspend, agp_sis_resume);
+static DEFINE_SIMPLE_DEV_PM_OPS(agp_sis_pm_ops, NULL, agp_sis_resume);
static struct pci_driver agp_sis_pci_driver = {
.name = "agpgart-sis",
--
2.25.1
From: Bjorn Helgaas <[email protected]>
Convert agpgart-ati from legacy PCI power management to the generic power
management framework.
Previously agpgart-ati used legacy PCI power management, and
agp_ati_suspend() and agp_ati_resume() were responsible for both
device-specific things and generic PCI things like saving and restoring
config space and managing power state:
agp_ati_suspend
pci_save_state <-- generic PCI
pci_set_power_state(PCI_D3hot) <-- generic PCI
agp_ati_resume
pci_set_power_state(PCI_D0) <-- generic PCI
pci_restore_state <-- generic PCI
ati_configure <-- device-specific
With generic power management, the PCI bus PM methods do the generic PCI
things, and the driver needs only the device-specific part, i.e.,
suspend_devices_and_enter
dpm_suspend_start(PMSG_SUSPEND)
pci_pm_suspend # PCI bus .suspend() method
agp_ati_suspend <-- not needed at all; removed
suspend_enter
dpm_suspend_noirq(PMSG_SUSPEND)
pci_pm_suspend_noirq # PCI bus .suspend_noirq() method
pci_save_state <-- generic PCI
pci_prepare_to_sleep <-- generic PCI
pci_set_power_state
...
dpm_resume_end(PMSG_RESUME)
pci_pm_resume # PCI bus .resume() method
pci_restore_standard_config
pci_set_power_state(PCI_D0) <-- generic PCI
pci_restore_state <-- generic PCI
agp_ati_resume # driver->pm->resume
ati_configure <-- device-specific
Based on 0aeddbd0cb07 ("via-agp: convert to generic power management") by
Vaibhav Gupta <[email protected]>.
Signed-off-by: Bjorn Helgaas <[email protected]>
---
drivers/char/agp/ati-agp.c | 22 ++++------------------
1 file changed, 4 insertions(+), 18 deletions(-)
diff --git a/drivers/char/agp/ati-agp.c b/drivers/char/agp/ati-agp.c
index 6f5530482d83..3c1fce48aabe 100644
--- a/drivers/char/agp/ati-agp.c
+++ b/drivers/char/agp/ati-agp.c
@@ -238,23 +238,10 @@ static int ati_configure(void)
}
-#ifdef CONFIG_PM
-static int agp_ati_suspend(struct pci_dev *dev, pm_message_t state)
+static int agp_ati_resume(struct device *dev)
{
- pci_save_state(dev);
- pci_set_power_state(dev, PCI_D3hot);
-
- return 0;
-}
-
-static int agp_ati_resume(struct pci_dev *dev)
-{
- pci_set_power_state(dev, PCI_D0);
- pci_restore_state(dev);
-
return ati_configure();
}
-#endif
/*
*Since we don't need contiguous memory we just try
@@ -559,15 +546,14 @@ static const struct pci_device_id agp_ati_pci_table[] = {
MODULE_DEVICE_TABLE(pci, agp_ati_pci_table);
+static DEFINE_SIMPLE_DEV_PM_OPS(agp_ati_pm_ops, NULL, agp_ati_resume);
+
static struct pci_driver agp_ati_pci_driver = {
.name = "agpgart-ati",
.id_table = agp_ati_pci_table,
.probe = agp_ati_probe,
.remove = agp_ati_remove,
-#ifdef CONFIG_PM
- .suspend = agp_ati_suspend,
- .resume = agp_ati_resume,
-#endif
+ .driver.pm = &agp_ati_pm_ops,
};
static int __init agp_ati_init(void)
--
2.25.1
On Wed, 26 Oct 2022 at 06:39, Bjorn Helgaas <[email protected]> wrote:
>
> From: Bjorn Helgaas <[email protected]>
>
> Vaibhav converted several AGP drivers from legacy PCI power management to
> generic power management [1]. This series converts the rest of them.
Do you want to merge through the PCI tree?
Acked-by: Dave Airlie <[email protected]>
Dave.
>
> v1 posted at [2].
>
> Changes from v1 to v2:
> - Convert from SIMPLE_DEV_PM_OPS() (which is deprecated) to
> DEFINE_SIMPLE_DEV_PM_OPS() and remove __maybe_unused annotations.
>
> [1] https://lore.kernel.org/all/[email protected]/#t
> [2] https://lore.kernel.org/all/[email protected]/
>
> Bjorn Helgaas (8):
> agp/efficeon: Convert to generic power management
> agp/intel: Convert to generic power management
> agp/amd-k7: Convert to generic power management
> agp/ati: Convert to generic power management
> agp/nvidia: Convert to generic power management
> agp/amd64: Update to DEFINE_SIMPLE_DEV_PM_OPS()
> agp/sis: Update to DEFINE_SIMPLE_DEV_PM_OPS()
> agp/via: Update to DEFINE_SIMPLE_DEV_PM_OPS()
>
> drivers/char/agp/amd-k7-agp.c | 24 ++++--------------------
> drivers/char/agp/amd64-agp.c | 6 ++----
> drivers/char/agp/ati-agp.c | 22 ++++------------------
> drivers/char/agp/efficeon-agp.c | 16 ++++------------
> drivers/char/agp/intel-agp.c | 11 +++++------
> drivers/char/agp/nvidia-agp.c | 24 ++++--------------------
> drivers/char/agp/sis-agp.c | 7 ++-----
> drivers/char/agp/via-agp.c | 6 ++----
> 8 files changed, 27 insertions(+), 89 deletions(-)
>
> --
> 2.25.1
>
On Tue, Oct 25, 2022 at 03:38:44PM -0500, Bjorn Helgaas wrote:
> From: Bjorn Helgaas <[email protected]>
>
> Vaibhav converted several AGP drivers from legacy PCI power management to
> generic power management [1]. This series converts the rest of them.
>
> v1 posted at [2].
>
> Changes from v1 to v2:
> - Convert from SIMPLE_DEV_PM_OPS() (which is deprecated) to
> DEFINE_SIMPLE_DEV_PM_OPS() and remove __maybe_unused annotations.
>
> [1] https://lore.kernel.org/all/[email protected]/#t
> [2] https://lore.kernel.org/all/[email protected]/
>
> Bjorn Helgaas (8):
> agp/efficeon: Convert to generic power management
> agp/intel: Convert to generic power management
> agp/amd-k7: Convert to generic power management
> agp/ati: Convert to generic power management
> agp/nvidia: Convert to generic power management
> agp/amd64: Update to DEFINE_SIMPLE_DEV_PM_OPS()
> agp/sis: Update to DEFINE_SIMPLE_DEV_PM_OPS()
> agp/via: Update to DEFINE_SIMPLE_DEV_PM_OPS()
>
> drivers/char/agp/amd-k7-agp.c | 24 ++++--------------------
> drivers/char/agp/amd64-agp.c | 6 ++----
> drivers/char/agp/ati-agp.c | 22 ++++------------------
> drivers/char/agp/efficeon-agp.c | 16 ++++------------
> drivers/char/agp/intel-agp.c | 11 +++++------
> drivers/char/agp/nvidia-agp.c | 24 ++++--------------------
> drivers/char/agp/sis-agp.c | 7 ++-----
> drivers/char/agp/via-agp.c | 6 ++----
> 8 files changed, 27 insertions(+), 89 deletions(-)
Applied with Dave's ack to pci/pm-agp for v6.2.
On Wed, Oct 26, 2022 at 08:17:47AM +1000, Dave Airlie wrote:
> On Wed, 26 Oct 2022 at 06:39, Bjorn Helgaas <[email protected]> wrote:
> >
> > From: Bjorn Helgaas <[email protected]>
> >
> > Vaibhav converted several AGP drivers from legacy PCI power management to
> > generic power management [1]. This series converts the rest of them.
>
> Do you want to merge through the PCI tree?
>
> Acked-by: Dave Airlie <[email protected]>
Sure, will be happy to. Thanks!
> > v1 posted at [2].
> >
> > Changes from v1 to v2:
> > - Convert from SIMPLE_DEV_PM_OPS() (which is deprecated) to
> > DEFINE_SIMPLE_DEV_PM_OPS() and remove __maybe_unused annotations.
> >
> > [1] https://lore.kernel.org/all/[email protected]/#t
> > [2] https://lore.kernel.org/all/[email protected]/
> >
> > Bjorn Helgaas (8):
> > agp/efficeon: Convert to generic power management
> > agp/intel: Convert to generic power management
> > agp/amd-k7: Convert to generic power management
> > agp/ati: Convert to generic power management
> > agp/nvidia: Convert to generic power management
> > agp/amd64: Update to DEFINE_SIMPLE_DEV_PM_OPS()
> > agp/sis: Update to DEFINE_SIMPLE_DEV_PM_OPS()
> > agp/via: Update to DEFINE_SIMPLE_DEV_PM_OPS()
> >
> > drivers/char/agp/amd-k7-agp.c | 24 ++++--------------------
> > drivers/char/agp/amd64-agp.c | 6 ++----
> > drivers/char/agp/ati-agp.c | 22 ++++------------------
> > drivers/char/agp/efficeon-agp.c | 16 ++++------------
> > drivers/char/agp/intel-agp.c | 11 +++++------
> > drivers/char/agp/nvidia-agp.c | 24 ++++--------------------
> > drivers/char/agp/sis-agp.c | 7 ++-----
> > drivers/char/agp/via-agp.c | 6 ++----
> > 8 files changed, 27 insertions(+), 89 deletions(-)
> >
> > --
> > 2.25.1
> >