agp: Convert to generic power management
cover agp: Convert to generic power management
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.
[1] https://lore.kernel.org/all/[email protected]/#t
Bjorn Helgaas (5):
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
drivers/char/agp/amd-k7-agp.c | 24 ++++-------------------- 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 ++++-------------------- 5 files changed, 21 insertions(+), 76 deletions(-)
Signature · 1 line
2.25.1
PATCH 1/5 agp/efficeon: Convert to generic power management
From: Bjorn Helgaas <[email protected]>
Convert agpgart-efficeon from legacy PCI power management to the generic power management framework.
Previously agpgart-efficeon used legacy PCI power management, which means agp_efficeon_suspend() and agp_efficeon_resume() were responsible for both device-specific things and generic PCI things like saving and restoring config space and managing power state.
In this case, agp_efficeon_suspend() was empty, and agp_efficeon_resume() already did only device-specific things, so the conversion is trivial.
Based on 0aeddbd0cb07 ("via-agp: convert to generic power management") by Vaibhav Gupta <[email protected]>.
--- drivers/char/agp/efficeon-agp.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-)
drivers/char/agp/efficeon-agp.c +4 -12
@@ -412,18 +412,11 @@ static void agp_efficeon_remove(struct pci_dev *pdev)agp_put_bridge (bridge); } -#ifdef CONFIG_PM -static int agp_efficeon_suspend (struct pci_dev *dev,pm_message_t state) -{ -return 0 ; -} - -static int agp_efficeon_resume (struct pci_dev *pdev) +static int __maybe_unused agp_efficeon_resume (struct device *dev) { printk(KERN_DEBUG PFX "agp_efficeon_resume()\n");return efficeon_configure (); } -#endif static const struct pci_device_id agp_efficeon_pci_table[] = { {
@@ -437,6 +430,8 @@ static const struct pci_device_id agp_efficeon_pci_table[] = { { } }; +static SIMPLE_DEV_PM_OPS(agp_efficeon_pm_ops, NULL, agp_efficeon_resume); +MODULE_DEVICE_TABLE (pci, agp_efficeon_pci_table);static struct pci_driver agp_efficeon_pci_driver = {
@@ -444,10 +439,7 @@ static struct pci_driver agp_efficeon_pci_driver = { .id_table = agp_efficeon_pci_table, .probe = agp_efficeon_probe, .remove = agp_efficeon_remove, -#ifdef CONFIG_PM - .suspend = agp_efficeon_suspend, - .resume = agp_efficeon_resume, -#endif + .driver.pm = &agp_efficeon_pm_ops, };static int __init agp_efficeon_init (void )
Signature · 1 line
2.25.1
PATCH 2/5 agp/intel: Convert to generic power management
In reply to Bjorn HelgaasFrom: Bjorn Helgaas <[email protected]>
Convert agpgart-intel from legacy PCI power management to the generic power management framework.
Previously agpgart-intel used legacy PCI power management, and agp_intel_resume() was responsible for both device-specific things and generic PCI things like saving and restoring config space and managing power state.
In this case, agp_intel_suspend() was empty, and agp_intel_resume() already did only device-specific things, so the conversion is trivial.
Based on 0aeddbd0cb07 ("via-agp: convert to generic power management") by Vaibhav Gupta <[email protected]>.
--- drivers/char/agp/intel-agp.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
drivers/char/agp/intel-agp.c +5 -6
@@ -817,16 +817,15 @@ static void agp_intel_remove(struct pci_dev *pdev)agp_put_bridge (bridge); } -#ifdef CONFIG_PM -static int agp_intel_resume (struct pci_dev *pdev) +static int __maybe_unused agp_intel_resume (struct device *dev) { +struct pci_dev *pdev =to_pci_dev (dev);struct agp_bridge_data *bridge =pci_get_drvdata (pdev); bridge->driver->configure ();return 0 ; } -#endif static const struct pci_device_id agp_intel_pci_table[] = { #define ID(x) \
@@ -895,14 +894,14 @@ static const struct pci_device_id agp_intel_pci_table[] = {MODULE_DEVICE_TABLE (pci, agp_intel_pci_table); +static SIMPLE_DEV_PM_OPS(agp_intel_pm_ops, NULL, agp_intel_resume); +static struct pci_driver agp_intel_pci_driver = { .name ="agpgart-intel" , .id_table = agp_intel_pci_table, .probe = agp_intel_probe, .remove = agp_intel_remove, -#ifdef CONFIG_PM - .resume = agp_intel_resume, -#endif + .driver.pm = &agp_intel_pm_ops, };static int __init agp_intel_init (void )
Signature · 1 line
2.25.1
PATCH 3/5 agp/amd-k7: Convert to generic power management
In reply to Bjorn HelgaasFrom: Bjorn Helgaas <[email protected]>
Convert agpgart-amdk7 from legacy PCI power management to the generic power management framework.
Previously agpgart-amdk7 used legacy PCI power management, and agp_amdk7_suspend() and agp_amdk7_resume() were responsible for both device-specific things and generic PCI things like saving and restoring config space and managing power state:
agp_amdk7_suspend
pci_save_state <-- generic PCI
pci_set_power_state <-- generic PCI
agp_amdk7_resume
pci_set_power_state(PCI_D0) <-- generic PCI
pci_restore_state <-- generic PCI
amd_irongate_driver.configure <-- device-specificConvert to generic power management where 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_amdk7_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_amdk7_resume # driver->pm->resume
amd_irongate_driver.configure <-- device-specific
Based on 0aeddbd0cb07 ("via-agp: convert to generic power management") by Vaibhav Gupta <[email protected]>.
--- drivers/char/agp/amd-k7-agp.c | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-)
drivers/char/agp/amd-k7-agp.c +4 -20
@@ -488,26 +488,11 @@ static void agp_amdk7_remove(struct pci_dev *pdev)agp_put_bridge (bridge); } -#ifdef CONFIG_PM - -static int agp_amdk7_suspend (struct pci_dev *pdev,pm_message_t state) +static int __maybe_unused agp_amdk7_resume (struct device *dev) { -pci_save_state (pdev); -pci_set_power_state (pdev,pci_choose_state (pdev, state)); - -return 0 ; -} - -static int agp_amdk7_resume (struct pci_dev *pdev) -{ -pci_set_power_state (pdev,PCI_D0 ); -pci_restore_state (pdev); -return amd_irongate_driver.configure (); } -#endif /* CONFIG_PM */ -/* must be the same order as name table above */ static const struct pci_device_id agp_amdk7_pci_table[] = { {
@@ -539,15 +524,14 @@ static const struct pci_device_id agp_amdk7_pci_table[] = {MODULE_DEVICE_TABLE (pci, agp_amdk7_pci_table); +static SIMPLE_DEV_PM_OPS(agp_amdk7_pm_ops, NULL, agp_amdk7_resume); +static struct pci_driver agp_amdk7_pci_driver = { .name ="agpgart-amdk7" , .id_table = agp_amdk7_pci_table, .probe = agp_amdk7_probe, .remove = agp_amdk7_remove, -#ifdef CONFIG_PM - .suspend = agp_amdk7_suspend, - .resume = agp_amdk7_resume, -#endif + .driver.pm = &agp_amdk7_pm_ops, };static int __init agp_amdk7_init (void )
Signature · 1 line
2.25.1
PATCH 4/5 agp/ati: Convert to generic power management
In reply to Bjorn HelgaasFrom: 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-specificWith 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]>.
--- drivers/char/agp/ati-agp.c | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-)
drivers/char/agp/ati-agp.c +4 -18
@@ -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 __maybe_unused 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 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 )
Signature · 1 line
2.25.1
PATCH 5/5 agp/nvidia: Convert to generic power management
In reply to Bjorn HelgaasFrom: Bjorn Helgaas <[email protected]>
Convert agpgart-nvidia from legacy PCI power management to the generic power management framework.
Previously agpgart-nvidia used legacy PCI power management, and agp_nvidia_suspend() and agp_nvidia_resume() were responsible for both device-specific things and generic PCI things:
agp_nvidia_suspend
pci_save_state <-- generic PCI
pci_set_power_state(PCI_D3hot) <-- generic PCI
agp_nvidia_resume
pci_set_power_state(PCI_D0) <-- generic PCI
pci_restore_state <-- generic PCI
nvidia_configure <-- device-specificConvert to generic power management where 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_nvidia_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_nvidia_resume # driver->pm->resume
nvidia_configure <-- device-specific
Based on 0aeddbd0cb07 ("via-agp: convert to generic power management") by Vaibhav Gupta <[email protected]>.
--- drivers/char/agp/nvidia-agp.c | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-)
drivers/char/agp/nvidia-agp.c +4 -20
@@ -404,28 +404,13 @@ static void agp_nvidia_remove(struct pci_dev *pdev)agp_put_bridge (bridge); } -#ifdef CONFIG_PM -static int agp_nvidia_suspend (struct pci_dev *pdev,pm_message_t state) +static int __maybe_unused agp_nvidia_resume (struct device *dev) { -pci_save_state (pdev); -pci_set_power_state (pdev, PCI_D3hot); - -return 0 ; -} - -static int agp_nvidia_resume (struct pci_dev *pdev) -{ -/* set power state 0 and restore PCI space */ -pci_set_power_state (pdev,PCI_D0 ); -pci_restore_state (pdev); -/* reconfigure AGP hardware again */ nvidia_configure ();return 0 ; } -#endif -static const struct pci_device_id agp_nvidia_pci_table[] = { {
@@ -449,15 +434,14 @@ static const struct pci_device_id agp_nvidia_pci_table[] = {MODULE_DEVICE_TABLE (pci, agp_nvidia_pci_table); +static SIMPLE_DEV_PM_OPS(agp_nvidia_pm_ops, NULL, agp_nvidia_resume); +static struct pci_driver agp_nvidia_pci_driver = { .name ="agpgart-nvidia" , .id_table = agp_nvidia_pci_table, .probe = agp_nvidia_probe, .remove = agp_nvidia_remove, -#ifdef CONFIG_PM - .suspend = agp_nvidia_suspend, - .resume = agp_nvidia_resume, -#endif + .driver.pm = &agp_nvidia_pm_ops, };static int __init agp_nvidia_init (void )
Signature · 1 line
2.25.1