From: Vaibhav Gupta <vaibhav.varodek@gmail.com>
To: "chenxiang (M)" <chenxiang66@hisilicon.com>
Cc: Don Brace <don.brace@microsemi.com>,
Vaibhav Gupta <vaibhavgupta40@gmail.com>,
Bjorn Helgaas <bhelgaas@google.com>,
Hannes Reinecke <hare@suse.com>,
Bradley Grove <linuxdrivers@attotech.com>,
linux-scsi@vger.kernel.org,
Sathya Prakash <sathya.prakash@broadcom.com>,
esc.storagedev@microsemi.com,
James Smart <james.smart@broadcom.com>,
Kashyap Desai <kashyap.desai@broadcom.com>,
Bjorn Helgaas <helgaas@kernel.org>,
Jack Wang <jinpu.wang@cloud.ionos.com>,
linux-kernel-mentees@lists.linuxfoundation.org,
Dick Kennedy <dick.kennedy@broadcom.com>,
Suganath Prabu Subramani <suganath-prabu.subramani@broadcom.com>,
"James E.J. Bottomley" <jejb@linux.ibm.com>,
John Garry <john.garry@huawei.com>,
Adam Radford <aradford@gmail.com>,
Adaptec OEM Raid Solutions <aacraid@microsemi.com>,
megaraidlinux.pdl@broadcom.com,
Sreekanth Reddy <sreekanth.reddy@broadcom.com>,
"Martin K. Petersen" <martin.petersen@oracle.com>,
Shivasharan S <shivasharan.srikanteshwara@broadcom.com>,
MPT-FusionLinux.pdl@broadcom.com, linux-kernel@vger.kernel.org,
Sumit Saxena <sumit.saxena@broadcom.com>
Subject: Re: [Linux-kernel-mentees] [PATCH v1 07/15] scsi: hisi_sas_v3_hw: use generic power management
Date: Mon, 20 Jul 2020 12:02:53 +0530 [thread overview]
Message-ID: <20200720063253.GA4237@gmail.com> (raw)
In-Reply-To: <367bd5d3-f0a6-2bd7-2945-3095c827dbe6@hisilicon.com>
On Mon, Jul 20, 2020 at 02:16:45PM +0800, chenxiang (M) wrote:
> Hi Vaibhav,
>
> 在 2020/7/17 14:34, Vaibhav Gupta 写道:
> > With legacy PM, drivers themselves were responsible for managing the
> > device's power states and takes care of register states.
> >
> > After upgrading to the generic structure, PCI core will take care of
> > required tasks and drivers should do only device-specific operations.
> >
> > The driver was calling pci_save/restore_state(), pci_choose_state(),
> > pci_enable/disable_device() and pci_set_power_state() which is no more
> > needed.
> >
> > Compile-tested only.
> >
> > Signed-off-by: Vaibhav Gupta <vaibhavgupta40@gmail.com>
>
> Reviewed-by: Xiang Chen <chenxiang66@hisilicon.com>
> Just a small comment, below.
>
> > ---
> > drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 32 ++++++++------------------
> > 1 file changed, 10 insertions(+), 22 deletions(-)
> >
> > diff --git a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
> > index 55e2321a65bc..45605a520bc8 100644
> > --- a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
> > +++ b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
> > @@ -3374,13 +3374,13 @@ enum {
> > hip08,
> > };
> > -static int hisi_sas_v3_suspend(struct pci_dev *pdev, pm_message_t state)
> > +static int __maybe_unused hisi_sas_v3_suspend(struct device *dev_d)
> > {
> > + struct pci_dev *pdev = to_pci_dev(dev_d);
> > struct sas_ha_struct *sha = pci_get_drvdata(pdev);
> > struct hisi_hba *hisi_hba = sha->lldd_ha;
> > struct device *dev = hisi_hba->dev;
> > struct Scsi_Host *shost = hisi_hba->shost;
> > - pci_power_t device_state;
> > int rc;
> > if (!pdev->pm_cap) {
> > @@ -3406,21 +3406,15 @@ static int hisi_sas_v3_suspend(struct pci_dev *pdev, pm_message_t state)
> > hisi_sas_init_mem(hisi_hba);
> > - device_state = pci_choose_state(pdev, state);
> > - dev_warn(dev, "entering operating state [D%d]\n",
> > - device_state);
>
> Please retain above print to keep consistence with the print in function
> hisi_sas_v3_resume().
>
Okay, Thanks for the review :)
This is will be fixed in v2 patch-series along with other changes.
-- Vaibhav Gupta
> > - pci_save_state(pdev);
> > - pci_disable_device(pdev);
> > - pci_set_power_state(pdev, device_state);
> > -
> > hisi_sas_release_tasks(hisi_hba);
> > sas_suspend_ha(sha);
> > return 0;
> > }
> > -static int hisi_sas_v3_resume(struct pci_dev *pdev)
> > +static int __maybe_unused hisi_sas_v3_resume(struct device *dev_d)
> > {
> > + struct pci_dev *pdev = to_pci_dev(dev_d);
> > struct sas_ha_struct *sha = pci_get_drvdata(pdev);
> > struct hisi_hba *hisi_hba = sha->lldd_ha;
> > struct Scsi_Host *shost = hisi_hba->shost;
> > @@ -3430,16 +3424,8 @@ static int hisi_sas_v3_resume(struct pci_dev *pdev)
> > dev_warn(dev, "resuming from operating state [D%d]\n",
> > device_state);
> > - pci_set_power_state(pdev, PCI_D0);
> > - pci_enable_wake(pdev, PCI_D0, 0);
> > - pci_restore_state(pdev);
> > - rc = pci_enable_device(pdev);
> > - if (rc) {
> > - dev_err(dev, "enable device failed during resume (%d)\n", rc);
> > - return rc;
> > - }
> > + device_wakeup_disable(dev_d);
> > - pci_set_master(pdev);
> > scsi_unblock_requests(shost);
> > clear_bit(HISI_SAS_REJECT_CMD_BIT, &hisi_hba->flags);
> > @@ -3447,7 +3433,6 @@ static int hisi_sas_v3_resume(struct pci_dev *pdev)
> > rc = hw_init_v3_hw(hisi_hba);
> > if (rc) {
> > scsi_remove_host(shost);
> > - pci_disable_device(pdev);
> > return rc;
> > }
> > hisi_hba->hw->phys_init(hisi_hba);
> > @@ -3468,13 +3453,16 @@ static const struct pci_error_handlers hisi_sas_err_handler = {
> > .reset_done = hisi_sas_reset_done_v3_hw,
> > };
> > +static SIMPLE_DEV_PM_OPS(hisi_sas_v3_pm_ops,
> > + hisi_sas_v3_suspend,
> > + hisi_sas_v3_resume);
> > +
> > static struct pci_driver sas_v3_pci_driver = {
> > .name = DRV_NAME,
> > .id_table = sas_v3_pci_table,
> > .probe = hisi_sas_v3_probe,
> > .remove = hisi_sas_v3_remove,
> > - .suspend = hisi_sas_v3_suspend,
> > - .resume = hisi_sas_v3_resume,
> > + .driver.pm = &hisi_sas_v3_pm_ops,
> > .err_handler = &hisi_sas_err_handler,
> > };
>
>
_______________________________________________
Linux-kernel-mentees mailing list
Linux-kernel-mentees@lists.linuxfoundation.org
https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees
next prev parent reply other threads:[~2020-07-20 6:34 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-17 6:34 [Linux-kernel-mentees] [PATCH v1 00/15] scsi: use generic power management Vaibhav Gupta
2020-07-17 6:34 ` [Linux-kernel-mentees] [PATCH v1 01/15] scsi: megaraid_sas: " Vaibhav Gupta
2020-07-17 6:34 ` [Linux-kernel-mentees] [PATCH v1 02/15] scsi: aacraid: " Vaibhav Gupta
2020-07-17 6:34 ` [Linux-kernel-mentees] [PATCH v1 03/15] scsi: aic7xxx: " Vaibhav Gupta
2020-07-17 6:34 ` [Linux-kernel-mentees] [PATCH v1 04/15] scsi: aic79xx: " Vaibhav Gupta
2020-07-17 6:34 ` [Linux-kernel-mentees] [PATCH v1 05/15] scsi: arcmsr: " Vaibhav Gupta
2020-07-17 6:34 ` [Linux-kernel-mentees] [PATCH v1 06/15] scsi: esas2r: " Vaibhav Gupta
2020-07-17 6:34 ` [Linux-kernel-mentees] [PATCH v1 07/15] scsi: hisi_sas_v3_hw: " Vaibhav Gupta
2020-07-20 6:16 ` chenxiang (M)
2020-07-20 6:32 ` Vaibhav Gupta [this message]
2020-07-17 6:34 ` [Linux-kernel-mentees] [PATCH v1 08/15] scsi: mpt3sas_scsih: " Vaibhav Gupta
2020-07-17 6:34 ` [Linux-kernel-mentees] [PATCH v1 09/15] scsi: lpfc: " Vaibhav Gupta
2020-07-17 6:34 ` [Linux-kernel-mentees] [PATCH v1 10/15] scsi: pm_8001: " Vaibhav Gupta
2020-07-17 6:34 ` [Linux-kernel-mentees] [PATCH v1 11/15] scsi: hpsa: " Vaibhav Gupta
2020-07-17 6:34 ` [Linux-kernel-mentees] [PATCH v1 12/15] scsi: 3w-9xxx: " Vaibhav Gupta
2020-07-17 6:34 ` [Linux-kernel-mentees] [PATCH v1 13/15] scsi: 3w-sas: " Vaibhav Gupta
2020-07-17 6:34 ` [Linux-kernel-mentees] [PATCH v1 14/15] scsi: mvumi: " Vaibhav Gupta
2020-07-17 6:34 ` [Linux-kernel-mentees] [PATCH v1 15/15] scsi: pmcraid: " 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=20200720063253.GA4237@gmail.com \
--to=vaibhav.varodek@gmail.com \
--cc=MPT-FusionLinux.pdl@broadcom.com \
--cc=aacraid@microsemi.com \
--cc=aradford@gmail.com \
--cc=bhelgaas@google.com \
--cc=chenxiang66@hisilicon.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=vaibhavgupta40@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).