agp: convert to generic power management
Subsystems (2)
v3 cover agp: convert to generic power management
From: Bjorn Helgaas <[email protected]>
Vaibhav has converted around 180 drivers to generic power management, and over 100 of those conversions have made it upstream. If we can finish off the remaining ones, we'll be able to remove quite a bit of ugly legacy code from the PCI core.
This is a repost of Vaibhav's patches for AGP. I rebased them to v5.16-rc1 and updated the commit logs to try to make it easier to verify them.
In the most recent posting here:
https://lore.kernel.org/linux-pci/[email protected]/
my commit log updates were incorrect. This v3 has updates that I believe to be correct, but of course I'd be grateful for more corrections.
Vaibhav Gupta (3):
amd64-agp: convert to generic power management
sis-agp: convert to generic power management
via-agp: convert to generic power management
drivers/char/agp/amd64-agp.c | 24 ++++++------------------ drivers/char/agp/sis-agp.c | 25 ++++++------------------- drivers/char/agp/via-agp.c | 25 +++++-------------------- 3 files changed, 17 insertions(+), 57 deletions(-)
Signature · 6 lines
2.25.1 _______________________________________________ Linux-kernel-mentees mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees
PATCH v3 1/3 amd64-agp: convert to generic power management
From: Vaibhav Gupta <[email protected]>
Convert amd64-agp from legacy PCI power management to the generic power management framework.
Previously, amd64-agp used legacy PCI power management, and agp_amd64_suspend() and agp_amd64_resume() were responsible for both device-specific things and generic PCI things:
agp_amd64_suspend
pci_save_state(pdev) <-- generic PCI
pci_set_power_state(pdev, pci_choose_state(pdev, state)) <-- generic PCI
agp_amd64_resume
pci_set_power_state(pdev, PCI_D0) <-- generic PCI
pci_restore_state(pdev) <-- generic PCI
nforce3_agp_init() <-- device-specific
amd_8151_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_amd64_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_amd64_resume # dev->driver->pm->resume
nforce3_agp_init() <-- device-specific
amd_8151_configure() <-- device-specific
--- drivers/char/agp/amd64-agp.c | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-)
drivers/char/agp/amd64-agp.c +6 -18
@@ -588,20 +588,11 @@ static void agp_amd64_remove(struct pci_dev *pdev) agp_bridges_found--; } -#ifdef CONFIG_PM +#define agp_amd64_suspend NULL -static int agp_amd64_suspend (struct pci_dev *pdev,pm_message_t state) +static int __maybe_unused agp_amd64_resume (struct device *dev) { -pci_save_state (pdev); -pci_set_power_state (pdev,pci_choose_state (pdev, state)); - -return 0 ; -} - -static int agp_amd64_resume (struct pci_dev *pdev) -{ -pci_set_power_state (pdev,PCI_D0 ); -pci_restore_state (pdev); +struct pci_dev *pdev =to_pci_dev (dev);if (pdev->vendor ==PCI_VENDOR_ID_NVIDIA )nforce3_agp_init (pdev);
@@ -609,8 +600,6 @@ static int agp_amd64_resume(struct pci_dev *pdev)return amd_8151_configure (); } -#endif /* CONFIG_PM */ -static const struct pci_device_id agp_amd64_pci_table[] = { { .class = (PCI_CLASS_BRIDGE_HOST <<8 ),
@@ -738,15 +727,14 @@ 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 struct pci_driver agp_amd64_pci_driver = { .name ="agpgart-amd64" , .id_table = agp_amd64_pci_table, .probe = agp_amd64_probe, .remove = agp_amd64_remove, -#ifdef CONFIG_PM - .suspend = agp_amd64_suspend, - .resume = agp_amd64_resume, -#endif + .driver.pm = &agp_amd64_pm_ops, };
Signature · 6 lines
2.25.1 _______________________________________________ Linux-kernel-mentees mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees
PATCH v3 2/3 sis-agp: convert to generic power management
In reply to Bjorn HelgaasFrom: Vaibhav Gupta <[email protected]>
Convert sis-agp from legacy PCI power management to the generic power management framework.
Previously, sis-agp used legacy PCI power management, and agp_sis_suspend() and agp_sis_resume() were responsible for both device-specific things and generic PCI things:
agp_sis_suspend
pci_save_state(pdev) <-- generic PCI
pci_set_power_state(pdev, pci_choose_state(pdev, state)) <-- generic PCI
agp_sis_resume
pci_set_power_state(pdev, PCI_D0) <-- generic PCI
pci_restore_state(pdev) <-- generic PCI
sis_driver.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_sis_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_sis_resume # dev->driver->pm->resume
sis_driver.configure() <-- device-specific
--- drivers/char/agp/sis-agp.c | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-)
drivers/char/agp/sis-agp.c +6 -19
@@ -217,26 +217,14 @@ static void agp_sis_remove(struct pci_dev *pdev)agp_put_bridge (bridge); } -#ifdef CONFIG_PM +#define agp_sis_suspend NULL -static int agp_sis_suspend (struct pci_dev *pdev,pm_message_t state) +static int __maybe_unused agp_sis_resume ( + __attribute__((unused))struct device *dev) { -pci_save_state (pdev); -pci_set_power_state (pdev,pci_choose_state (pdev, state)); - -return 0 ; -} - -static int agp_sis_resume (struct pci_dev *pdev) -{ -pci_set_power_state (pdev,PCI_D0 ); -pci_restore_state (pdev); -return sis_driver.configure (); } -#endif /* CONFIG_PM */ -static const struct pci_device_id agp_sis_pci_table[] = { { .class = (PCI_CLASS_BRIDGE_HOST <<8 ),
@@ -419,15 +407,14 @@ 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 struct pci_driver agp_sis_pci_driver = { .name ="agpgart-sis" , .id_table = agp_sis_pci_table, .probe = agp_sis_probe, .remove = agp_sis_remove, -#ifdef CONFIG_PM - .suspend = agp_sis_suspend, - .resume = agp_sis_resume, -#endif + .driver.pm = &agp_sis_pm_ops, };static int __init agp_sis_init (void )
Signature · 6 lines
2.25.1 _______________________________________________ Linux-kernel-mentees mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees
PATCH v3 3/3 via-agp: convert to generic power management
In reply to Bjorn HelgaasFrom: Vaibhav Gupta <[email protected]>
Convert via-agp from legacy PCI power management to the generic power management framework.
Previously, via-agp used legacy PCI power management, and agp_via_suspend() and agp_via_resume() were responsible for both device-specific things and generic PCI things:
agp_via_suspend
pci_save_state(pdev) <-- generic PCI
pci_set_power_state(pdev, pci_choose_state(pdev, state)) <-- generic PCI
agp_via_resume
pci_set_power_state(pdev, PCI_D0) <-- generic PCI
pci_restore_state(pdev) <-- generic PCI
via_configure_agp3() <-- device-specific
via_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_via_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_via_resume # dev->driver->pm->resume
via_configure_agp3() <-- device-specific
via_configure() <-- device-specific
--- drivers/char/agp/via-agp.c | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-)
drivers/char/agp/via-agp.c +5 -20
@@ -492,22 +492,11 @@ static void agp_via_remove(struct pci_dev *pdev)agp_put_bridge (bridge); } -#ifdef CONFIG_PM +#define agp_via_suspend NULL -static int agp_via_suspend (struct pci_dev *pdev,pm_message_t state) +static int __maybe_unused agp_via_resume (struct device *dev) { -pci_save_state (pdev); -pci_set_power_state (pdev, PCI_D3hot); - -return 0 ; -} - -static int agp_via_resume (struct pci_dev *pdev) -{ -struct agp_bridge_data *bridge =pci_get_drvdata (pdev); - -pci_set_power_state (pdev,PCI_D0 ); -pci_restore_state (pdev); +struct agp_bridge_data *bridge =dev_get_drvdata (dev);if (bridge->driver == &via_agp3_driver)return via_configure_agp3 ();
@@ -517,8 +506,6 @@ static int agp_via_resume(struct pci_dev *pdev)return 0 ; } -#endif /* CONFIG_PM */ -/* must be the same order as name table above */ static const struct pci_device_id agp_via_pci_table[] = { #define ID(x) \
@@ -567,16 +554,14 @@ 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 struct pci_driver agp_via_pci_driver = { .name ="agpgart-via" , .id_table = agp_via_pci_table, .probe = agp_via_probe, .remove = agp_via_remove, -#ifdef CONFIG_PM - .suspend = agp_via_suspend, - .resume = agp_via_resume, -#endif + .driver.pm = &agp_via_pm_ops, };
Signature · 6 lines
2.25.1 _______________________________________________ Linux-kernel-mentees mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees
Quoted 10 lines · Bjorn Helgaas
From: Bjorn Helgaas <[email protected]>
Vaibhav has converted around 180 drivers to generic power management, and over 100 of those conversions have made it upstream. If we can finish off the remaining ones, we'll be able to remove quite a bit of ugly legacy code from the PCI core.
This is a repost of Vaibhav's patches for AGP. I rebased them to v5.16-rc1 and updated the commit logs to try to make it easier to verify them.
Quoted 6 lines
In the most recent posting here:
https://lore.kernel.org/linux-pci/[email protected]/
my commit log updates were incorrect. This v3 has updates that I believe to be correct, but of course I'd be grateful for more corrections.
Hi Bjorn,
Do you want to merge these via your tree?
if so,
Dave.
Quoted 12 lines
Vaibhav Gupta (3):
amd64-agp: convert to generic power management
sis-agp: convert to generic power management
via-agp: convert to generic power managementdrivers/char/agp/amd64-agp.c | 24 ++++++------------------ drivers/char/agp/sis-agp.c | 25 ++++++------------------- drivers/char/agp/via-agp.c | 25 +++++-------------------- 3 files changed, 17 insertions(+), 57 deletions(-)
Quoted 19 lines · Dave Airlie
Quoted 10 lines · Bjorn Helgaas
From: Bjorn Helgaas <[email protected]>
Vaibhav has converted around 180 drivers to generic power management, and over 100 of those conversions have made it upstream. If we can finish off the remaining ones, we'll be able to remove quite a bit of ugly legacy code from the PCI core.
This is a repost of Vaibhav's patches for AGP. I rebased them to v5.16-rc1 and updated the commit logs to try to make it easier to verify them.
Quoted 6 lines
In the most recent posting here:
https://lore.kernel.org/linux-pci/[email protected]/
my commit log updates were incorrect. This v3 has updates that I believe to be correct, but of course I'd be grateful for more corrections.
Quoted 6 lines
Hi Bjorn,
Do you want to merge these via your tree?
if so,
Acked-by Dave Airlie <[email protected]>
Either way is fine; I'll merge them to save you the trouble. I put them on pci/legacy-pm-removal for v5.17 with your ack. Thanks!
Quoted 11 lines
Quoted 11 lines
Vaibhav Gupta (3):
amd64-agp: convert to generic power management
sis-agp: convert to generic power management
via-agp: convert to generic power managementdrivers/char/agp/amd64-agp.c | 24 ++++++------------------ drivers/char/agp/sis-agp.c | 25 ++++++------------------- drivers/char/agp/via-agp.c | 25 +++++-------------------- 3 files changed, 17 insertions(+), 57 deletions(-)