From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B5A83C433E0 for ; Mon, 20 Jul 2020 13:17:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 877C420729 for ; Mon, 20 Jul 2020 13:17:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="R0ui4TpP" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726483AbgGTNRw (ORCPT ); Mon, 20 Jul 2020 09:17:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45144 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725815AbgGTNRv (ORCPT ); Mon, 20 Jul 2020 09:17:51 -0400 Received: from mail-pf1-x444.google.com (mail-pf1-x444.google.com [IPv6:2607:f8b0:4864:20::444]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7B15EC061794; Mon, 20 Jul 2020 06:17:51 -0700 (PDT) Received: by mail-pf1-x444.google.com with SMTP id z3so9028619pfn.12; Mon, 20 Jul 2020 06:17:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=jpqacO9zR8Sudu9v86DTJ18b9fTO/xwUaLJoU6HeOnQ=; b=R0ui4TpPof2AriYTCWbS8iHic8pxOPEHnGSG+YT6BFLtxIoqKSRidzHy1pW6OA7lxo zdYkGpzT/qq/sfkeOcDOE70IFOe53/6UK52YIkZ13ukqHRiC9KL/rLvB1F+lj5NvZSWu FzV3yynUcBBkP1AtV5LEYVZLx/7AuzPx7FfzrqxWSJ5c4bqrhOXvjBPmHXGNICgLT/P9 DDAMl8hNn8wt2mI015uRH7VbcjmoS4NcoH3Vnvy6o8AyhGPXBnr5aveTDGaajzV38Rpv DZIXA0Go38ZVnQI/Z2DKoqWlxUb719PvS77COBeVxlxCUc5k5UopSUYWQQHw/LJXlP3W JjHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=jpqacO9zR8Sudu9v86DTJ18b9fTO/xwUaLJoU6HeOnQ=; b=uHr/LKc0AWAjlVGv+U4Nu57P7oR0E6Fa884l6ARBRxsLbm/84r1lDIBtKz+y2ciEAl c3RV9QKeOHR++i6FjKTlGj6zP0vvtwIqDCP4s5azcs4aWqjZWdYDA331mZZB3WwToq7Y /vo+Jn8efgoXqEn+Z/GFd02ubIbAVZ7YU8fkbl5DdnZfidO59AicxCcWGEq8WVLZJ3g1 Wdbnsb3xCAmo/EpULCxFBdggRVs7HT69wPWWKC1axRfw42rpXAul11mFKVBsxDz888kq UvPI1IL8c9ApBMRDTVzEx5QKsoaQ/yQGZ1FU3Aq/YERmU0wqP5NnKPwnqCySwf8kVDrK 1+Lg== X-Gm-Message-State: AOAM533L7PuAy5B87AplBFEhrTaUJp+keqITfOBRizk8/X/xc+MDlty1 CU81xHV2D+0Wu0mPw8WPmik= X-Google-Smtp-Source: ABdhPJzHaYOEgfYDopwh9TCSfXW1Smf+I09CCvOI+1aQoH/z6Hqobtgavp24UW3I4VSKtGEU85UO3A== X-Received: by 2002:a05:6a00:1514:: with SMTP id q20mr20002025pfu.243.1595251070925; Mon, 20 Jul 2020 06:17:50 -0700 (PDT) Received: from gmail.com ([103.105.153.67]) by smtp.gmail.com with ESMTPSA id w20sm16729302pfn.44.2020.07.20.06.17.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jul 2020 06:17:50 -0700 (PDT) Date: Mon, 20 Jul 2020 18:46:27 +0530 From: Vaibhav Gupta To: Damien Le Moal Cc: Bjorn Helgaas , Bjorn Helgaas , Bjorn Helgaas , Vaibhav Gupta , Jens Axboe , Joshua Morris , Philip Kelleher , "linux-block@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "linux-kernel-mentees@lists.linuxfoundation.org" , Shuah Khan Subject: Re: [PATCH v1 3/3] skd: use generic power management Message-ID: <20200720131627.GA447599@gmail.com> References: <20200717080910.342741-1-vaibhavgupta40@gmail.com> <20200717080910.342741-4-vaibhavgupta40@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org On Mon, Jul 20, 2020 at 12:52:14PM +0000, Damien Le Moal wrote: > On 2020/07/17 17:10, Vaibhav Gupta wrote: > > Drivers using legacy PM have to manage PCI states and device's PM states > > themselves. They also need to take care of configuration registers. > > > > With improved and powerful support of generic PM, PCI Core takes care of > > above mentioned, device-independent, jobs. > > > > This driver makes use of PCI helper functions like > > pci_save/restore_state(), pci_enable/disable_device(), > > pci_request/release_regions(), pci_set_power_state() and > > pci_set_master() to do required operations. In generic mode, they are no > > longer needed. > > > > Change function parameter in both .suspend() and .resume() to > > "struct device*" type. Use to_pci_dev() to get "struct pci_dev*" variable. > > > > Compile-tested only. > > I do not think this belongs into the commit message. This was mentioned in the > cover letter. > The messages in cover letter and commit message are bit similar. But the commit message has patch specific changes mentioned in it. > > > > Signed-off-by: Vaibhav Gupta > > --- > > drivers/block/skd_main.c | 36 ++++++++++-------------------------- > > 1 file changed, 10 insertions(+), 26 deletions(-) > > > > diff --git a/drivers/block/skd_main.c b/drivers/block/skd_main.c > > index 51569c199a6c..d8d1042e7338 100644 > > --- a/drivers/block/skd_main.c > > +++ b/drivers/block/skd_main.c > > @@ -3315,12 +3315,12 @@ static void skd_pci_remove(struct pci_dev *pdev) > > return; > > } > > > > -static int skd_pci_suspend(struct pci_dev *pdev, pm_message_t state) > > +static int __maybe_unused skd_pci_suspend(struct device *dev) > > { > > int i; > > - struct skd_device *skdev; > > + struct pci_dev *pdev = to_pci_dev(dev); > > + struct skd_device *skdev = pci_get_drvdata(pdev); > > You can just add the pdev declaration here. The other 2 changes are not needed. > Okay. > > > > - skdev = pci_get_drvdata(pdev); > > You can keep this as is. > > > if (!skdev) { > > dev_err(&pdev->dev, "no device data for PCI\n"); > > return -EIO; > > @@ -3337,35 +3337,23 @@ static int skd_pci_suspend(struct pci_dev *pdev, pm_message_t state) > > if (skdev->pcie_error_reporting_is_enabled) > > pci_disable_pcie_error_reporting(pdev); > > > > - pci_release_regions(pdev); > > - pci_save_state(pdev); > > - pci_disable_device(pdev); > > - pci_set_power_state(pdev, pci_choose_state(pdev, state)); > > return 0; > > } > > > > -static int skd_pci_resume(struct pci_dev *pdev) > > +static int __maybe_unused skd_pci_resume(struct device *dev) > > { > > int i; > > int rc = 0; > > - struct skd_device *skdev; > > > > - skdev = pci_get_drvdata(pdev); > > Same comment as above. Keep these as is and add only pdev declaration. > Okay. Sending v2 with suggested changes. --Vaibhav Gupta > > + struct pci_dev *pdev = to_pci_dev(dev); > > + struct skd_device *skdev = pci_get_drvdata(pdev); > > if (!skdev) { > > dev_err(&pdev->dev, "no device data for PCI\n"); > > return -1; > > } > > > > - pci_set_power_state(pdev, PCI_D0); > > - pci_enable_wake(pdev, PCI_D0, 0); > > - pci_restore_state(pdev); > > + device_wakeup_disable(dev); > > > > - rc = pci_enable_device(pdev); > > - if (rc) > > - return rc; > > - rc = pci_request_regions(pdev, DRV_NAME); > > - if (rc) > > - goto err_out; > > rc = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64)); > > if (rc) > > rc = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)); > > @@ -3374,7 +3362,6 @@ static int skd_pci_resume(struct pci_dev *pdev) > > goto err_out_regions; > > } > > > > - pci_set_master(pdev); > > rc = pci_enable_pcie_error_reporting(pdev); > > if (rc) { > > dev_err(&pdev->dev, > > @@ -3427,10 +3414,6 @@ static int skd_pci_resume(struct pci_dev *pdev) > > pci_disable_pcie_error_reporting(pdev); > > > > err_out_regions: > > - pci_release_regions(pdev); > > - > > -err_out: > > - pci_disable_device(pdev); > > return rc; > > } > > > > @@ -3450,13 +3433,14 @@ static void skd_pci_shutdown(struct pci_dev *pdev) > > skd_stop_device(skdev); > > } > > > > +static SIMPLE_DEV_PM_OPS(skd_pci_pm_ops, skd_pci_suspend, skd_pci_resume); > > + > > static struct pci_driver skd_driver = { > > .name = DRV_NAME, > > .id_table = skd_pci_tbl, > > .probe = skd_pci_probe, > > .remove = skd_pci_remove, > > - .suspend = skd_pci_suspend, > > - .resume = skd_pci_resume, > > + .driver.pm = &skd_pci_pm_ops, > > .shutdown = skd_pci_shutdown, > > }; > > > > > > > -- > Damien Le Moal > Western Digital Research