Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
IronPort-SDR: RkJkO0T171DVzCEbxJMLTt/Sq9E/vLMI3L4e9lgtL3FqZbJAl5kgJVRech5JK4c3QXdSPbsMhj
 fDirVRkpxt84BM92lVZAVk3pwR8wWGLveHnQJYMbgti8kL1i+rUjrxIDlxSIQkw7B4kIGRruAw
 2k7VEa+jMOYoZ7Fwf8THP7u3EHc1cSLNOOmqC9gAjBpjU3omQhT3wP0aRrGs3hf8EBWRGs9AXg
 Ae/n01b2bCM15XZ7o4rIpsxVke0ze1yE6qHHnd68OrzvS6ko9+K1Rimm+yCiOwdQOSHb0qTp8q
 cxI=
From:   Damien Le Moal <Damien.LeMoal@wdc.com>
To:     Vaibhav Gupta <vaibhavgupta40@gmail.com>,
        Bjorn Helgaas <helgaas@kernel.org>,
        Bjorn Helgaas <bhelgaas@google.com>,
        Bjorn Helgaas <bjorn@helgaas.com>,
        Vaibhav Gupta <vaibhav.varodek@gmail.com>,
        Jens Axboe <axboe@kernel.dk>,
        Joshua Morris <josh.h.morris@us.ibm.com>,
        Philip Kelleher <pjk1939@linux.ibm.com>
CC:     "linux-block@vger.kernel.org" <linux-block@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "linux-kernel-mentees@lists.linuxfoundation.org" 
        <linux-kernel-mentees@lists.linuxfoundation.org>,
        Shuah Khan <skhan@linuxfoundation.org>
Subject: Re: [PATCH v1 3/3] skd: use generic power management
Thread-Topic: [PATCH v1 3/3] skd: use generic power management
Thread-Index: AQHWXBHK3yyvSpv7dkelMB844h700w==
Date:   Mon, 20 Jul 2020 12:52:14 +0000
Message-ID: <CY4PR04MB37516C5544A7DCAD84921937E77B0@CY4PR04MB3751.namprd04.prod.outlook.com>
References: <20200717080910.342741-1-vaibhavgupta40@gmail.com>
 <20200717080910.342741-4-vaibhavgupta40@gmail.com>
Accept-Language: en-US
Content-Language: en-US
wdcipoutbound: EOP-TRUE
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: 57e251df-62e9-4c4d-0d15-08d82cabb9d5
X-MS-Exchange-CrossTenant-originalarrivaltime: 20 Jul 2020 12:52:14.0662
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: b61c8803-16f3-4c35-9b17-6f65f441df86
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: ugbjO/jMHvBQFVf05F8UOFw8dG8lJ0hO6+99qLTWF6gNHzJ0P7MpP0aicUO/9Go3kPhhe72a82fu8aitFW/Wrg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR04MB1256
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 2020/07/17 17:10, Vaibhav Gupta wrote:=0A=
> Drivers using legacy PM have to manage PCI states and device's PM states=
=0A=
> themselves. They also need to take care of configuration registers.=0A=
> =0A=
> With improved and powerful support of generic PM, PCI Core takes care of=
=0A=
> above mentioned, device-independent, jobs.=0A=
> =0A=
> This driver makes use of PCI helper functions like=0A=
> pci_save/restore_state(), pci_enable/disable_device(),=0A=
> pci_request/release_regions(), pci_set_power_state() and=0A=
> pci_set_master() to do required operations. In generic mode, they are no=
=0A=
> longer needed.=0A=
> =0A=
> Change function parameter in both .suspend() and .resume() to=0A=
> "struct device*" type. Use to_pci_dev() to get "struct pci_dev*" variable=
.=0A=
> =0A=
> Compile-tested only.=0A=
=0A=
I do not think this belongs into the commit message. This was mentioned in =
the=0A=
cover letter.=0A=
=0A=
> =0A=
> Signed-off-by: Vaibhav Gupta <vaibhavgupta40@gmail.com>=0A=
> ---=0A=
>  drivers/block/skd_main.c | 36 ++++++++++--------------------------=0A=
>  1 file changed, 10 insertions(+), 26 deletions(-)=0A=
> =0A=
> diff --git a/drivers/block/skd_main.c b/drivers/block/skd_main.c=0A=
> index 51569c199a6c..d8d1042e7338 100644=0A=
> --- a/drivers/block/skd_main.c=0A=
> +++ b/drivers/block/skd_main.c=0A=
> @@ -3315,12 +3315,12 @@ static void skd_pci_remove(struct pci_dev *pdev)=
=0A=
>  	return;=0A=
>  }=0A=
>  =0A=
> -static int skd_pci_suspend(struct pci_dev *pdev, pm_message_t state)=0A=
> +static int __maybe_unused skd_pci_suspend(struct device *dev)=0A=
>  {=0A=
>  	int i;=0A=
> -	struct skd_device *skdev;=0A=
> +	struct pci_dev *pdev =3D to_pci_dev(dev);=0A=
> +	struct skd_device *skdev =3D pci_get_drvdata(pdev);=0A=
=0A=
You can just add the pdev declaration here. The other 2 changes are not nee=
ded.=0A=
=0A=
>  =0A=
> -	skdev =3D pci_get_drvdata(pdev);=0A=
=0A=
You can keep this as is.=0A=
=0A=
>  	if (!skdev) {=0A=
>  		dev_err(&pdev->dev, "no device data for PCI\n");=0A=
>  		return -EIO;=0A=
> @@ -3337,35 +3337,23 @@ static int skd_pci_suspend(struct pci_dev *pdev, =
pm_message_t state)=0A=
>  	if (skdev->pcie_error_reporting_is_enabled)=0A=
>  		pci_disable_pcie_error_reporting(pdev);=0A=
>  =0A=
> -	pci_release_regions(pdev);=0A=
> -	pci_save_state(pdev);=0A=
> -	pci_disable_device(pdev);=0A=
> -	pci_set_power_state(pdev, pci_choose_state(pdev, state));=0A=
>  	return 0;=0A=
>  }=0A=
>  =0A=
> -static int skd_pci_resume(struct pci_dev *pdev)=0A=
> +static int __maybe_unused skd_pci_resume(struct device *dev)=0A=
>  {=0A=
>  	int i;=0A=
>  	int rc =3D 0;=0A=
> -	struct skd_device *skdev;=0A=
>  =0A=
> -	skdev =3D pci_get_drvdata(pdev);=0A=
=0A=
Same comment as above. Keep these as is and add only pdev declaration.=0A=
=0A=
> +	struct pci_dev *pdev =3D to_pci_dev(dev);=0A=
> +	struct skd_device *skdev =3D pci_get_drvdata(pdev);=0A=
>  	if (!skdev) {=0A=
>  		dev_err(&pdev->dev, "no device data for PCI\n");=0A=
>  		return -1;=0A=
>  	}=0A=
>  =0A=
> -	pci_set_power_state(pdev, PCI_D0);=0A=
> -	pci_enable_wake(pdev, PCI_D0, 0);=0A=
> -	pci_restore_state(pdev);=0A=
> +	device_wakeup_disable(dev);=0A=
>  =0A=
> -	rc =3D pci_enable_device(pdev);=0A=
> -	if (rc)=0A=
> -		return rc;=0A=
> -	rc =3D pci_request_regions(pdev, DRV_NAME);=0A=
> -	if (rc)=0A=
> -		goto err_out;=0A=
>  	rc =3D dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));=0A=
>  	if (rc)=0A=
>  		rc =3D dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));=0A=
> @@ -3374,7 +3362,6 @@ static int skd_pci_resume(struct pci_dev *pdev)=0A=
>  		goto err_out_regions;=0A=
>  	}=0A=
>  =0A=
> -	pci_set_master(pdev);=0A=
>  	rc =3D pci_enable_pcie_error_reporting(pdev);=0A=
>  	if (rc) {=0A=
>  		dev_err(&pdev->dev,=0A=
> @@ -3427,10 +3414,6 @@ static int skd_pci_resume(struct pci_dev *pdev)=0A=
>  		pci_disable_pcie_error_reporting(pdev);=0A=
>  =0A=
>  err_out_regions:=0A=
> -	pci_release_regions(pdev);=0A=
> -=0A=
> -err_out:=0A=
> -	pci_disable_device(pdev);=0A=
>  	return rc;=0A=
>  }=0A=
>  =0A=
> @@ -3450,13 +3433,14 @@ static void skd_pci_shutdown(struct pci_dev *pdev=
)=0A=
>  	skd_stop_device(skdev);=0A=
>  }=0A=
>  =0A=
> +static SIMPLE_DEV_PM_OPS(skd_pci_pm_ops, skd_pci_suspend, skd_pci_resume=
);=0A=
> +=0A=
>  static struct pci_driver skd_driver =3D {=0A=
>  	.name		=3D DRV_NAME,=0A=
>  	.id_table	=3D skd_pci_tbl,=0A=
>  	.probe		=3D skd_pci_probe,=0A=
>  	.remove		=3D skd_pci_remove,=0A=
> -	.suspend	=3D skd_pci_suspend,=0A=
> -	.resume		=3D skd_pci_resume,=0A=
> +	.driver.pm	=3D &skd_pci_pm_ops,=0A=
>  	.shutdown	=3D skd_pci_shutdown,=0A=
>  };=0A=
>  =0A=
> =0A=
=0A=
=0A=
-- =0A=
Damien Le Moal=0A=
Western Digital Research=0A=