* [PATCH v1] scsi: isci: Don't use PCI helper functions
@ 2020-11-07 10:04 Vaibhav Gupta
2020-11-07 10:05 ` Vaibhav Gupta
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Vaibhav Gupta @ 2020-11-07 10:04 UTC (permalink / raw)
To: Artur Paszkiewicz, James E.J. Bottomley, Martin K. Petersen
Cc: Vaibhav Gupta, Intel SCU Linux support, linux-scsi, linux-kernel
PCI helper functions such as pci_enable/disable_device(),
pci_save/restore_state(), pci_set_power_state(), etc. were used by the
legacy framework to perform standard operations related to PCI PM.
This driver is using the generic framework and thus calls for those
functions should be dropped as those tasks are now performed by the PCI
core.
Signed-off-by: Vaibhav Gupta <vaibhavgupta40@gmail.com>
---
drivers/scsi/isci/init.c | 18 +-----------------
1 file changed, 1 insertion(+), 17 deletions(-)
diff --git a/drivers/scsi/isci/init.c b/drivers/scsi/isci/init.c
index 93bc9019667f..c452849e7bb4 100644
--- a/drivers/scsi/isci/init.c
+++ b/drivers/scsi/isci/init.c
@@ -715,10 +715,6 @@ static int isci_suspend(struct device *dev)
isci_host_deinit(ihost);
}
- pci_save_state(pdev);
- pci_disable_device(pdev);
- pci_set_power_state(pdev, PCI_D3hot);
-
return 0;
}
@@ -726,19 +722,7 @@ static int isci_resume(struct device *dev)
{
struct pci_dev *pdev = to_pci_dev(dev);
struct isci_host *ihost;
- int rc, i;
-
- pci_set_power_state(pdev, PCI_D0);
- pci_restore_state(pdev);
-
- rc = pcim_enable_device(pdev);
- if (rc) {
- dev_err(&pdev->dev,
- "enabling device failure after resume(%d)\n", rc);
- return rc;
- }
-
- pci_set_master(pdev);
+ int i;
for_each_isci_host(i, ihost, pdev) {
sas_prep_resume_ha(&ihost->sas_ha);
--
2.28.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v1] scsi: isci: Don't use PCI helper functions
2020-11-07 10:04 [PATCH v1] scsi: isci: Don't use PCI helper functions Vaibhav Gupta
@ 2020-11-07 10:05 ` Vaibhav Gupta
2020-11-09 13:38 ` Artur Paszkiewicz
2020-11-11 4:08 ` Martin K. Petersen
2 siblings, 0 replies; 4+ messages in thread
From: Vaibhav Gupta @ 2020-11-07 10:05 UTC (permalink / raw)
To: Artur Paszkiewicz, James E.J. Bottomley, Martin K. Petersen
Cc: Intel SCU Linux support, linux-scsi, linux-kernel
On Sat, Nov 07, 2020 at 03:34:19PM +0530, Vaibhav Gupta wrote:
> PCI helper functions such as pci_enable/disable_device(),
> pci_save/restore_state(), pci_set_power_state(), etc. were used by the
> legacy framework to perform standard operations related to PCI PM.
>
> This driver is using the generic framework and thus calls for those
> functions should be dropped as those tasks are now performed by the PCI
> core.
>
> Signed-off-by: Vaibhav Gupta <vaibhavgupta40@gmail.com>
> ---
> drivers/scsi/isci/init.c | 18 +-----------------
> 1 file changed, 1 insertion(+), 17 deletions(-)
>
> diff --git a/drivers/scsi/isci/init.c b/drivers/scsi/isci/init.c
> index 93bc9019667f..c452849e7bb4 100644
> --- a/drivers/scsi/isci/init.c
> +++ b/drivers/scsi/isci/init.c
> @@ -715,10 +715,6 @@ static int isci_suspend(struct device *dev)
> isci_host_deinit(ihost);
> }
>
> - pci_save_state(pdev);
> - pci_disable_device(pdev);
> - pci_set_power_state(pdev, PCI_D3hot);
> -
> return 0;
> }
>
> @@ -726,19 +722,7 @@ static int isci_resume(struct device *dev)
> {
> struct pci_dev *pdev = to_pci_dev(dev);
> struct isci_host *ihost;
> - int rc, i;
> -
> - pci_set_power_state(pdev, PCI_D0);
> - pci_restore_state(pdev);
> -
> - rc = pcim_enable_device(pdev);
> - if (rc) {
> - dev_err(&pdev->dev,
> - "enabling device failure after resume(%d)\n", rc);
> - return rc;
> - }
> -
> - pci_set_master(pdev);
> + int i;
>
> for_each_isci_host(i, ihost, pdev) {
> sas_prep_resume_ha(&ihost->sas_ha);
> --
> 2.28.0
>
The patch is compile-tested only.
--Vaibhav
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v1] scsi: isci: Don't use PCI helper functions
2020-11-07 10:04 [PATCH v1] scsi: isci: Don't use PCI helper functions Vaibhav Gupta
2020-11-07 10:05 ` Vaibhav Gupta
@ 2020-11-09 13:38 ` Artur Paszkiewicz
2020-11-11 4:08 ` Martin K. Petersen
2 siblings, 0 replies; 4+ messages in thread
From: Artur Paszkiewicz @ 2020-11-09 13:38 UTC (permalink / raw)
To: Vaibhav Gupta, James E.J. Bottomley, Martin K. Petersen
Cc: Intel SCU Linux support, linux-scsi, linux-kernel
On 11/7/20 11:04 AM, Vaibhav Gupta wrote:
> PCI helper functions such as pci_enable/disable_device(),
> pci_save/restore_state(), pci_set_power_state(), etc. were used by the
> legacy framework to perform standard operations related to PCI PM.
>
> This driver is using the generic framework and thus calls for those
> functions should be dropped as those tasks are now performed by the PCI
> core.
>
> Signed-off-by: Vaibhav Gupta <vaibhavgupta40@gmail.com>
> ---
Acked-by: Artur Paszkiewicz <artur.paszkiewicz@intel.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v1] scsi: isci: Don't use PCI helper functions
2020-11-07 10:04 [PATCH v1] scsi: isci: Don't use PCI helper functions Vaibhav Gupta
2020-11-07 10:05 ` Vaibhav Gupta
2020-11-09 13:38 ` Artur Paszkiewicz
@ 2020-11-11 4:08 ` Martin K. Petersen
2 siblings, 0 replies; 4+ messages in thread
From: Martin K. Petersen @ 2020-11-11 4:08 UTC (permalink / raw)
To: Vaibhav Gupta
Cc: Artur Paszkiewicz, James E.J. Bottomley, Martin K. Petersen,
Intel SCU Linux support, linux-scsi, linux-kernel
Vaibhav,
> PCI helper functions such as pci_enable/disable_device(),
> pci_save/restore_state(), pci_set_power_state(), etc. were used by the
> legacy framework to perform standard operations related to PCI PM.
>
> This driver is using the generic framework and thus calls for those
> functions should be dropped as those tasks are now performed by the PCI
> core.
Applied to 5.11/scsi-staging, thanks!
--
Martin K. Petersen Oracle Linux Engineering
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-11-11 4:08 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-07 10:04 [PATCH v1] scsi: isci: Don't use PCI helper functions Vaibhav Gupta
2020-11-07 10:05 ` Vaibhav Gupta
2020-11-09 13:38 ` Artur Paszkiewicz
2020-11-11 4:08 ` Martin K. Petersen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).