char: use generic power management
cover char: use generic power management
Linux Kernel Mentee: Remove Legacy Power Management.
The purpose of this patch series is to upgrade power management in char drivers. This has been done by upgrading .suspend() and .resume() callbacks.
The upgrade makes sure that the involvement of PCI Core does not change the order of operations executed in a driver. Thus, does not change its behavior.
In general, drivers with legacy PM, .suspend() and .resume() make use of PCI helper functions like pci_enable/disable_device_mem(), pci_set_power_state(), pci_save/restore_state(), pci_enable/disable_device(), etc. to complete their job.
The conversion requires the removal of those function calls, change the callbacks' definition accordingly and make use of dev_pm_ops structure.
All patches are compile-tested only.
Test tools:
- Compiler: gcc (GCC) 10.1.0
- allmodconfig build: make -j$(nproc) W=1 all
Vaibhav Gupta (3):
amd64-agp: use generic power management
sis-agp: use generic power management
via-agp: use 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 · 1 line
2.27.0
PATCH 1/3 amd64-agp: use generic power management
Drivers using legacy PM have to manage PCI states and device's PM states themselves. They also need to take care of configuration registers.
With improved and powerful support of generic PM, PCI Core takes care of above mentioned, device-independent, jobs.
This driver makes use of PCI helper functions like pci_save/restore_state() and pci_set_power_state() to do required operations. In generic mode, they are no longer needed.
Change function parameter in .resume() to "struct device*" type. Use to_pci_dev() to get "struct pci_dev*" variable.
After upgrading, .suspend() became an empty-body function, hence defined as NULL.
Compile-tested only.
--- 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 · 1 line
2.27.0
PATCH 2/3 sis-agp: use generic power management
In reply to Vaibhav GuptaDrivers using legacy PM have to manage PCI states and device's PM states themselves. They also need to take care of configuration registers.
With improved and powerful support of generic PM, PCI Core takes care of above mentioned, device-independent, jobs.
This driver makes use of PCI helper functions like pci_save/restore_state() and pci_set_power_state() to do required operations. In generic mode, they are no longer needed.
Change function parameter in .resume() to "struct device*" type. Use to_pci_dev() to get "struct pci_dev*" variable.
After upgrading, .suspend() became an empty-body function, hence defined as NULL.
Compile-tested only.
--- 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 · 1 line
2.27.0
PATCH 3/3 via-agp: use generic power management
In reply to Vaibhav GuptaDrivers using legacy PM have to manage PCI states and device's PM states themselves. They also need to take care of configuration registers.
With improved and powerful support of generic PM, PCI Core takes care of above mentioned, device-independent, jobs.
This driver makes use of PCI helper functions like pci_save/restore_state() and pci_set_power_state() to do required operations. In generic mode, they are no longer needed.
Change function parameter in .resume() to "struct device*" type. Use to_pci_dev() to get "struct pci_dev*" variable.
After upgrading, .suspend() became an empty-body function, hence defined as NULL.
Compile-tested only.
--- 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.27.0 _______________________________________________ Linux-kernel-mentees mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees
Quoted 27 lines · Vaibhav Gupta
Linux Kernel Mentee: Remove Legacy Power Management.
The purpose of this patch series is to upgrade power management in char drivers. This has been done by upgrading .suspend() and .resume() callbacks.
The upgrade makes sure that the involvement of PCI Core does not change the order of operations executed in a driver. Thus, does not change its behavior.
In general, drivers with legacy PM, .suspend() and .resume() make use of PCI helper functions like pci_enable/disable_device_mem(),
pci_set_power_state(), pci_save/restore_state(), pci_enable/disable_device(), etc. to complete their job.The conversion requires the removal of those function calls, change the callbacks' definition accordingly and make use of
dev_pm_opsstructure.All patches are compile-tested only.
Test tools:
- Compiler: gcc (GCC) 10.1.0
- allmodconfig build: make -j$(nproc) W=1 allVaibhav Gupta (3):
amd64-agp: use generic power management
sis-agp: use generic power management
via-agp: use generic power management
Quoted 8 lines
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 · 1 line
2.27.0
_______________________________________________
Linux-kernel-mentees mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees
v2 cover char: use generic power management
In reply to Vaibhav GuptaLinux Kernel Mentee: Remove Legacy Power Management.
The purpose of this patch series is to upgrade power management in char drivers. This has been done by upgrading .suspend() and .resume() callbacks.
The upgrade makes sure that the involvement of PCI Core does not change the order of operations executed in a driver. Thus, does not change its behavior.
In general, drivers with legacy PM, .suspend() and .resume() make use of PCI helper functions like pci_enable/disable_device_mem(), pci_set_power_state(), pci_save/restore_state(), pci_enable/disable_device(), etc. to complete their job.
The conversion requires the removal of those function calls, change the callbacks' definition accordingly and make use of dev_pm_ops structure.
All patches are compile-tested only.
Test tools:
- Compiler: gcc (GCC) 10.2.0
- allmodconfig build: make -j$(nproc) W=1 all
v2: patch-set rebased.
Vaibhav Gupta (3):
amd64-agp: use generic power management
sis-agp: use generic power management
via-agp: use 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.30.0 _______________________________________________ Linux-kernel-mentees mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees
PATCH v2 1/3 amd64-agp: 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.
After upgrading, .suspend() became an empty-body function, hence defined as NULL.
--- 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.30.0 _______________________________________________ Linux-kernel-mentees mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees
PATCH v2 2/3 sis-agp: use generic power management
In reply to Vaibhav GuptaDrivers 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.
After upgrading, .suspend() became an empty-body function, hence defined as NULL.
--- 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.30.0 _______________________________________________ Linux-kernel-mentees mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees
PATCH v2 3/3 via-agp: use generic power management
In reply to Vaibhav GuptaDrivers 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.
After upgrading, .suspend() became an empty-body function, hence defined as NULL.
--- 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.30.0 _______________________________________________ Linux-kernel-mentees mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees