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: Re: [Linux-kernel-mentees] [PATCH v2 06/15] scsi: esas2r: use generic power management
Date: Tue, 8 Sep 2020 22:31:44 +0530	[thread overview]
Message-ID: <20200908170058.GG9948@gmail.com> (raw)
In-Reply-To: <20200720133427.454400-7-vaibhavgupta40@gmail.com>

On Mon, Jul 20, 2020 at 07:04:19PM +0530, Vaibhav Gupta wrote:
> 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>
> ---
>  drivers/scsi/esas2r/esas2r.h      |  5 ++--
>  drivers/scsi/esas2r/esas2r_init.c | 48 +++++++++----------------------
>  drivers/scsi/esas2r/esas2r_main.c |  3 +-
>  3 files changed, 18 insertions(+), 38 deletions(-)
> 
> diff --git a/drivers/scsi/esas2r/esas2r.h b/drivers/scsi/esas2r/esas2r.h
> index 7f43b95f4e94..6ad3e0871ef0 100644
> --- a/drivers/scsi/esas2r/esas2r.h
> +++ b/drivers/scsi/esas2r/esas2r.h
> @@ -996,8 +996,9 @@ void esas2r_adapter_tasklet(unsigned long context);
>  irqreturn_t esas2r_interrupt(int irq, void *dev_id);
>  irqreturn_t esas2r_msi_interrupt(int irq, void *dev_id);
>  void esas2r_kickoff_timer(struct esas2r_adapter *a);
> -int esas2r_suspend(struct pci_dev *pcid, pm_message_t state);
> -int esas2r_resume(struct pci_dev *pcid);
> +
> +extern const struct dev_pm_ops esas2r_pm_ops;
> +
>  void esas2r_fw_event_off(struct esas2r_adapter *a);
>  void esas2r_fw_event_on(struct esas2r_adapter *a);
>  bool esas2r_nvram_write(struct esas2r_adapter *a, struct esas2r_request *rq,
> diff --git a/drivers/scsi/esas2r/esas2r_init.c b/drivers/scsi/esas2r/esas2r_init.c
> index eb7d139ffc00..6c5854969791 100644
> --- a/drivers/scsi/esas2r/esas2r_init.c
> +++ b/drivers/scsi/esas2r/esas2r_init.c
> @@ -640,53 +640,31 @@ void esas2r_kill_adapter(int i)
>  	}
>  }
>  
> -int esas2r_suspend(struct pci_dev *pdev, pm_message_t state)
> +static int __maybe_unused esas2r_suspend(struct device *dev)
>  {
> -	struct Scsi_Host *host = pci_get_drvdata(pdev);
> -	u32 device_state;
> +	struct Scsi_Host *host = dev_get_drvdata(dev);
>  	struct esas2r_adapter *a = (struct esas2r_adapter *)host->hostdata;
>  
> -	esas2r_log_dev(ESAS2R_LOG_INFO, &(pdev->dev), "suspending adapter()");
> +	esas2r_log_dev(ESAS2R_LOG_INFO, dev, "suspending adapter()");
>  	if (!a)
>  		return -ENODEV;
>  
>  	esas2r_adapter_power_down(a, 1);
> -	device_state = pci_choose_state(pdev, state);
> -	esas2r_log_dev(ESAS2R_LOG_INFO, &(pdev->dev),
> -		       "pci_save_state() called");
> -	pci_save_state(pdev);
> -	esas2r_log_dev(ESAS2R_LOG_INFO, &(pdev->dev),
> -		       "pci_disable_device() called");
> -	pci_disable_device(pdev);
> -	esas2r_log_dev(ESAS2R_LOG_INFO, &(pdev->dev),
> -		       "pci_set_power_state() called");
> -	pci_set_power_state(pdev, device_state);
> -	esas2r_log_dev(ESAS2R_LOG_INFO, &(pdev->dev), "esas2r_suspend(): 0");
> +	esas2r_log_dev(ESAS2R_LOG_INFO, dev, "esas2r_suspend(): 0");
>  	return 0;
>  }
>  
> -int esas2r_resume(struct pci_dev *pdev)
> +static int __maybe_unused esas2r_resume(struct device *dev)
>  {
> -	struct Scsi_Host *host = pci_get_drvdata(pdev);
> +	struct Scsi_Host *host = dev_get_drvdata(dev);
>  	struct esas2r_adapter *a = (struct esas2r_adapter *)host->hostdata;
> -	int rez;
> +	int rez = 0;
>  
> -	esas2r_log_dev(ESAS2R_LOG_INFO, &(pdev->dev), "resuming adapter()");
> -	esas2r_log_dev(ESAS2R_LOG_INFO, &(pdev->dev),
> -		       "pci_set_power_state(PCI_D0) "
> +	esas2r_log_dev(ESAS2R_LOG_INFO, dev, "resuming adapter()");
> +	esas2r_log_dev(ESAS2R_LOG_INFO, dev,
> +		       "device_wakeup_disable() "
>  		       "called");
> -	pci_set_power_state(pdev, PCI_D0);
> -	esas2r_log_dev(ESAS2R_LOG_INFO, &(pdev->dev),
> -		       "pci_enable_wake(PCI_D0, 0) "
> -		       "called");
> -	pci_enable_wake(pdev, PCI_D0, 0);
> -	esas2r_log_dev(ESAS2R_LOG_INFO, &(pdev->dev),
> -		       "pci_restore_state() called");
> -	pci_restore_state(pdev);
> -	esas2r_log_dev(ESAS2R_LOG_INFO, &(pdev->dev),
> -		       "pci_enable_device() called");
> -	rez = pci_enable_device(pdev);
> -	pci_set_master(pdev);
> +	device_wakeup_disable(dev);
>  
>  	if (!a) {
>  		rez = -ENODEV;
> @@ -730,11 +708,13 @@ int esas2r_resume(struct pci_dev *pdev)
>  	}
>  
>  error_exit:
> -	esas2r_log_dev(ESAS2R_LOG_CRIT, &(pdev->dev), "esas2r_resume(): %d",
> +	esas2r_log_dev(ESAS2R_LOG_CRIT, dev, "esas2r_resume(): %d",
>  		       rez);
>  	return rez;
>  }
>  
> +SIMPLE_DEV_PM_OPS(esas2r_pm_ops, esas2r_suspend, esas2r_resume);
> +
>  bool esas2r_set_degraded_mode(struct esas2r_adapter *a, char *error_str)
>  {
>  	set_bit(AF_DEGRADED_MODE, &a->flags);
> diff --git a/drivers/scsi/esas2r/esas2r_main.c b/drivers/scsi/esas2r/esas2r_main.c
> index 7b49e2e9fcde..aab3ea580e6b 100644
> --- a/drivers/scsi/esas2r/esas2r_main.c
> +++ b/drivers/scsi/esas2r/esas2r_main.c
> @@ -346,8 +346,7 @@ static struct pci_driver
>  	.id_table	= esas2r_pci_table,
>  	.probe		= esas2r_probe,
>  	.remove		= esas2r_remove,
> -	.suspend	= esas2r_suspend,
> -	.resume		= esas2r_resume,
> +	.driver.pm	= &esas2r_pm_ops,
>  };
>  
>  static int esas2r_probe(struct pci_dev *pcid,
> -- 
> 2.27.0
> 
.
_______________________________________________
Linux-kernel-mentees mailing list
Linux-kernel-mentees@lists.linuxfoundation.org
https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees

  reply	other threads:[~2020-09-08 17:03 UTC|newest]

Thread overview: 42+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-20 13:34 [Linux-kernel-mentees] [PATCH v2 00/15] scsi: " Vaibhav Gupta
2020-07-20 13:34 ` [Linux-kernel-mentees] [PATCH v2 01/15] scsi: megaraid_sas: " Vaibhav Gupta
2020-09-08 16:57   ` Vaibhav Gupta
2020-09-08 17:32   ` Bjorn Helgaas
2020-09-09 10:03     ` Vaibhav Gupta
2020-09-09 13:23       ` Bjorn Helgaas
2020-09-09 15:20         ` Vaibhav Gupta
2020-09-09 16:21           ` Bjorn Helgaas
2020-07-20 13:34 ` [Linux-kernel-mentees] [PATCH v2 02/15] scsi: aacraid: " Vaibhav Gupta
2020-07-23  6:58   ` Balsundar.P--- via Linux-kernel-mentees
2020-09-08 16:58   ` Vaibhav Gupta
2020-07-20 13:34 ` [Linux-kernel-mentees] [PATCH v2 03/15] scsi: aic7xxx: " Vaibhav Gupta
2020-09-08 16:59   ` Vaibhav Gupta
2020-07-20 13:34 ` [Linux-kernel-mentees] [PATCH v2 04/15] scsi: aic79xx: " Vaibhav Gupta
2020-09-08 16:59   ` Vaibhav Gupta
2020-07-20 13:34 ` [Linux-kernel-mentees] [PATCH v2 05/15] scsi: arcmsr: " Vaibhav Gupta
2020-09-08 17:00   ` Vaibhav Gupta
2020-07-20 13:34 ` [Linux-kernel-mentees] [PATCH v2 06/15] scsi: esas2r: " Vaibhav Gupta
2020-09-08 17:01   ` Vaibhav Gupta [this message]
2020-07-20 13:34 ` [Linux-kernel-mentees] [PATCH v2 07/15] scsi: hisi_sas_v3_hw: " Vaibhav Gupta
2020-07-21  1:36   ` chenxiang (M)
2020-09-08 17:02   ` Vaibhav Gupta
2020-07-20 13:34 ` [Linux-kernel-mentees] [PATCH v2 08/15] scsi: mpt3sas_scsih: " Vaibhav Gupta
2020-09-08 17:03   ` Vaibhav Gupta
2020-07-20 13:34 ` [Linux-kernel-mentees] [PATCH v2 09/15] scsi: lpfc: " Vaibhav Gupta
2020-09-08 17:03   ` Vaibhav Gupta
2020-07-20 13:34 ` [Linux-kernel-mentees] [PATCH v2 10/15] scsi: pm_8001: " Vaibhav Gupta
2020-07-23  7:02   ` Jinpu Wang
2020-09-08 17:04   ` Vaibhav Gupta
2020-07-20 13:34 ` [Linux-kernel-mentees] [PATCH v2 11/15] scsi: hpsa: " Vaibhav Gupta
2020-07-20 22:23   ` Don.Brace--- via Linux-kernel-mentees
2020-09-08 17:05   ` Vaibhav Gupta
2020-07-20 13:34 ` [Linux-kernel-mentees] [PATCH v2 12/15] scsi: 3w-9xxx: " Vaibhav Gupta
2020-09-08 17:05   ` Vaibhav Gupta
2020-07-20 13:34 ` [Linux-kernel-mentees] [PATCH v2 13/15] scsi: 3w-sas: " Vaibhav Gupta
2020-09-08 17:06   ` Vaibhav Gupta
2020-07-20 13:34 ` [Linux-kernel-mentees] [PATCH v2 14/15] scsi: mvumi: " Vaibhav Gupta
2020-09-08 17:07   ` Vaibhav Gupta
2020-07-20 13:34 ` [Linux-kernel-mentees] [PATCH v2 15/15] scsi: pmcraid: " Vaibhav Gupta
2020-09-08 17:08   ` Vaibhav Gupta
2020-08-17  8:16 ` [Linux-kernel-mentees] [PATCH v2 00/15] scsi: " Vaibhav Gupta
2020-09-08 16:54 ` 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=20200908170058.GG9948@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 \
    --subject='Re: [Linux-kernel-mentees] [PATCH v2 06/15] scsi: esas2r: use generic power management' \
    /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

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).