linux-kernel-mentees.lists.linuxfoundation.org archive mirror
 help / color / mirror / Atom feed
From: Vaibhav Gupta <vaibhavgupta40@gmail.com>
To: Bjorn Helgaas <helgaas@kernel.org>,
	Bjorn Helgaas <bhelgaas@google.com>,
	Bjorn Helgaas <bjorn@helgaas.com>,
	Vaibhav Gupta <vaibhav.varodek@gmail.com>,
	Adam Radford <aradford@gmail.com>,
	"James E.J. Bottomley" <jejb@linux.ibm.com>,
	"Martin K. Petersen" <martin.petersen@oracle.com>,
	Adaptec OEM Raid Solutions <aacraid@microsemi.com>,
	Hannes Reinecke <hare@suse.com>,
	Bradley Grove <linuxdrivers@attotech.com>,
	John Garry <john.garry@huawei.com>,
	Don Brace <don.brace@microsemi.com>,
	James Smart <james.smart@broadcom.com>,
	Dick Kennedy <dick.kennedy@broadcom.com>,
	Kashyap Desai <kashyap.desai@broadcom.com>,
	Sumit Saxena <sumit.saxena@broadcom.com>,
	Shivasharan S <shivasharan.srikanteshwara@broadcom.com>,
	Sathya Prakash <sathya.prakash@broadcom.com>,
	Sreekanth Reddy <sreekanth.reddy@broadcom.com>,
	Suganath Prabu Subramani <suganath-prabu.subramani@broadcom.com>,
	Jack Wang <jinpu.wang@cloud.ionos.com>
Cc: linux-scsi@vger.kernel.org, MPT-FusionLinux.pdl@broadcom.com,
	esc.storagedev@microsemi.com, linux-kernel@vger.kernel.org,
	linux-kernel-mentees@lists.linuxfoundation.org,
	megaraidlinux.pdl@broadcom.com
Subject: [Linux-kernel-mentees] [PATCH v3 21/28] scsi: 3w-9xxx: use generic power management
Date: Thu,  1 Oct 2020 17:55:04 +0530	[thread overview]
Message-ID: <20201001122511.1075420-22-vaibhavgupta40@gmail.com> (raw)
In-Reply-To: <20201001122511.1075420-1-vaibhavgupta40@gmail.com>

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.

Signed-off-by: Vaibhav Gupta <vaibhavgupta40@gmail.com>
---
 drivers/scsi/3w-9xxx.c | 29 +++++++----------------------
 1 file changed, 7 insertions(+), 22 deletions(-)

diff --git a/drivers/scsi/3w-9xxx.c b/drivers/scsi/3w-9xxx.c
index e458e99ff161..b4718a1b2bd6 100644
--- a/drivers/scsi/3w-9xxx.c
+++ b/drivers/scsi/3w-9xxx.c
@@ -2191,10 +2191,10 @@ static void twa_remove(struct pci_dev *pdev)
 	twa_device_extension_count--;
 } /* End twa_remove() */
 
-#ifdef CONFIG_PM
 /* This function is called on PCI suspend */
-static int twa_suspend(struct pci_dev *pdev, pm_message_t state)
+static int __maybe_unused twa_suspend(struct device *dev)
 {
+	struct pci_dev *pdev = to_pci_dev(dev);
 	struct Scsi_Host *host = pci_get_drvdata(pdev);
 	TW_Device_Extension *tw_dev = (TW_Device_Extension *)host->hostdata;
 
@@ -2214,31 +2214,19 @@ static int twa_suspend(struct pci_dev *pdev, pm_message_t state)
 	}
 	TW_CLEAR_ALL_INTERRUPTS(tw_dev);
 
-	pci_save_state(pdev);
-	pci_disable_device(pdev);
-	pci_set_power_state(pdev, pci_choose_state(pdev, state));
-
 	return 0;
 } /* End twa_suspend() */
 
 /* This function is called on PCI resume */
-static int twa_resume(struct pci_dev *pdev)
+static int __maybe_unused twa_resume(struct device *dev)
 {
 	int retval = 0;
+	struct pci_dev *pdev = to_pci_dev(dev);
 	struct Scsi_Host *host = pci_get_drvdata(pdev);
 	TW_Device_Extension *tw_dev = (TW_Device_Extension *)host->hostdata;
 
 	printk(KERN_WARNING "3w-9xxx: Resuming host %d.\n", tw_dev->host->host_no);
-	pci_set_power_state(pdev, PCI_D0);
-	pci_restore_state(pdev);
 
-	retval = pci_enable_device(pdev);
-	if (retval) {
-		TW_PRINTK(tw_dev->host, TW_DRIVER, 0x39, "Enable device failed during resume");
-		return retval;
-	}
-
-	pci_set_master(pdev);
 	pci_try_set_mwi(pdev);
 
 	retval = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));
@@ -2276,11 +2264,9 @@ static int twa_resume(struct pci_dev *pdev)
 
 out_disable_device:
 	scsi_remove_host(host);
-	pci_disable_device(pdev);
 
 	return retval;
 } /* End twa_resume() */
-#endif
 
 /* PCI Devices supported by this driver */
 static struct pci_device_id twa_pci_tbl[] = {
@@ -2296,16 +2282,15 @@ static struct pci_device_id twa_pci_tbl[] = {
 };
 MODULE_DEVICE_TABLE(pci, twa_pci_tbl);
 
+static SIMPLE_DEV_PM_OPS(twa_pm_ops, twa_suspend, twa_resume);
+
 /* pci_driver initializer */
 static struct pci_driver twa_driver = {
 	.name		= "3w-9xxx",
 	.id_table	= twa_pci_tbl,
 	.probe		= twa_probe,
 	.remove		= twa_remove,
-#ifdef CONFIG_PM
-	.suspend	= twa_suspend,
-	.resume		= twa_resume,
-#endif
+	.driver.pm	= &twa_pm_ops,
 	.shutdown	= twa_shutdown
 };
 
-- 
2.28.0

_______________________________________________
Linux-kernel-mentees mailing list
Linux-kernel-mentees@lists.linuxfoundation.org
https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees

  parent reply	other threads:[~2020-10-01 12:31 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-01 12:24 [Linux-kernel-mentees] [PATCH v3 00/28] scsi: use generic power management Vaibhav Gupta
2020-10-01 12:24 ` [Linux-kernel-mentees] [PATCH v3 01/28] scsi: megaraid_sas: Drop PCI wakeup calls from .resume Vaibhav Gupta
2020-10-01 12:24 ` [Linux-kernel-mentees] [PATCH v3 02/28] scsi: megaraid_sas: use generic power management Vaibhav Gupta
2020-10-01 12:24 ` [Linux-kernel-mentees] [PATCH v3 03/28] scsi: megaraid_sas: update function description Vaibhav Gupta
2020-10-01 12:24 ` [Linux-kernel-mentees] [PATCH v3 04/28] scsi: aacraid: Drop pci_enable_wake() from .resume Vaibhav Gupta
2020-10-01 12:24 ` [Linux-kernel-mentees] [PATCH v3 05/28] scsi: aacraid: use generic power management Vaibhav Gupta
2020-10-01 12:24 ` [Linux-kernel-mentees] [PATCH v3 06/28] scsi: aic7xxx: " Vaibhav Gupta
2020-10-01 12:24 ` [Linux-kernel-mentees] [PATCH v3 07/28] scsi: aic79xx: " Vaibhav Gupta
2020-10-01 12:24 ` [Linux-kernel-mentees] [PATCH v3 08/28] scsi: arcmsr: Drop PCI wakeup calls from .resume Vaibhav Gupta
2020-10-01 12:24 ` [Linux-kernel-mentees] [PATCH v3 09/28] scsi: arcmsr: use generic power management Vaibhav Gupta
2020-10-01 12:24 ` [Linux-kernel-mentees] [PATCH v3 10/28] scsi: esas2r: Drop PCI Wakeup calls from .resume Vaibhav Gupta
2020-10-01 12:24 ` [Linux-kernel-mentees] [PATCH v3 11/28] scsi: esas2r: use generic power management Vaibhav Gupta
2020-10-01 12:24 ` [Linux-kernel-mentees] [PATCH v3 12/28] scsi: hisi_sas_v3_hw: Drop PCI Wakeup calls from .resume Vaibhav Gupta
2020-10-01 12:24 ` [Linux-kernel-mentees] [PATCH v3 13/28] scsi: hisi_sas_v3_hw: use generic power management Vaibhav Gupta
2020-10-27 17:11   ` John Garry
2020-10-01 12:24 ` [Linux-kernel-mentees] [PATCH v3 14/28] scsi: mpt3sas_scsih: Drop PCI Wakeup calls from .resume Vaibhav Gupta
2020-10-01 12:24 ` [Linux-kernel-mentees] [PATCH v3 15/28] scsi: mpt3sas_scsih: use generic power management Vaibhav Gupta
2020-10-01 12:24 ` [Linux-kernel-mentees] [PATCH v3 16/28] scsi: lpfc: " Vaibhav Gupta
2020-10-01 12:25 ` [Linux-kernel-mentees] [PATCH v3 17/28] scsi: pm_8001: Drop PCI Wakeup calls from .resume Vaibhav Gupta
2020-10-01 12:53   ` Jinpu Wang
2020-10-01 12:25 ` [Linux-kernel-mentees] [PATCH v3 18/28] scsi: pm_8001: use generic power management Vaibhav Gupta
2020-10-01 12:25 ` [Linux-kernel-mentees] [PATCH v3 19/28] scsi: hpsa: " Vaibhav Gupta
2020-10-27 16:16   ` Don.Brace--- via Linux-kernel-mentees
2020-10-01 12:25 ` [Linux-kernel-mentees] [PATCH v3 20/28] scsi: 3w-9xxx: Drop PCI Wakeup calls from .resume Vaibhav Gupta
2020-10-01 12:25 ` Vaibhav Gupta [this message]
2020-10-01 12:25 ` [Linux-kernel-mentees] [PATCH v3 22/28] scsi: 3w-sas: " Vaibhav Gupta
2020-10-01 12:25 ` [Linux-kernel-mentees] [PATCH v3 23/28] scsi: 3w-sas: use generic power management Vaibhav Gupta
2020-10-01 12:25 ` [Linux-kernel-mentees] [PATCH v3 24/28] scsi: mvumi: Drop PCI Wakeup calls from .resume Vaibhav Gupta
2020-10-01 12:25 ` [Linux-kernel-mentees] [PATCH v3 25/28] scsi: mvumi: use generic power management Vaibhav Gupta
2020-10-01 12:25 ` [Linux-kernel-mentees] [PATCH v3 26/28] scsi: mvumi: update function description Vaibhav Gupta
2020-10-01 12:25 ` [Linux-kernel-mentees] [PATCH v3 27/28] scsi: pmcraid: Drop PCI Wakeup calls from .resume Vaibhav Gupta
2020-10-01 12:25 ` [Linux-kernel-mentees] [PATCH v3 28/28] scsi: pmcraid: use generic power management Vaibhav Gupta
2020-10-01 12:33 ` [Linux-kernel-mentees] [PATCH v3 00/28] scsi: " Vaibhav Gupta

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201001122511.1075420-22-vaibhavgupta40@gmail.com \
    --to=vaibhavgupta40@gmail.com \
    --cc=MPT-FusionLinux.pdl@broadcom.com \
    --cc=aacraid@microsemi.com \
    --cc=aradford@gmail.com \
    --cc=bhelgaas@google.com \
    --cc=bjorn@helgaas.com \
    --cc=dick.kennedy@broadcom.com \
    --cc=don.brace@microsemi.com \
    --cc=esc.storagedev@microsemi.com \
    --cc=hare@suse.com \
    --cc=helgaas@kernel.org \
    --cc=james.smart@broadcom.com \
    --cc=jejb@linux.ibm.com \
    --cc=jinpu.wang@cloud.ionos.com \
    --cc=john.garry@huawei.com \
    --cc=kashyap.desai@broadcom.com \
    --cc=linux-kernel-mentees@lists.linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-scsi@vger.kernel.org \
    --cc=linuxdrivers@attotech.com \
    --cc=martin.petersen@oracle.com \
    --cc=megaraidlinux.pdl@broadcom.com \
    --cc=sathya.prakash@broadcom.com \
    --cc=shivasharan.srikanteshwara@broadcom.com \
    --cc=sreekanth.reddy@broadcom.com \
    --cc=suganath-prabu.subramani@broadcom.com \
    --cc=sumit.saxena@broadcom.com \
    --cc=vaibhav.varodek@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).