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=-6.6 required=3.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, FSL_HELO_FAKE,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no 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 C8EDEC433E2 for ; Tue, 8 Sep 2020 17:09:26 +0000 (UTC) Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 52FF5207DE for ; Tue, 8 Sep 2020 17:09:26 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="kmIG7UoG" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 52FF5207DE Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linux-kernel-mentees-bounces@lists.linuxfoundation.org Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 26F8486D94; Tue, 8 Sep 2020 17:09:26 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7RDUZ6bpTqOc; Tue, 8 Sep 2020 17:09:23 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by whitealder.osuosl.org (Postfix) with ESMTP id 7D05B86D76; Tue, 8 Sep 2020 17:09:23 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 6CB4AC0052; Tue, 8 Sep 2020 17:09:23 +0000 (UTC) Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by lists.linuxfoundation.org (Postfix) with ESMTP id 598DAC0051 for ; Tue, 8 Sep 2020 17:09:22 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 55ABF86D76 for ; Tue, 8 Sep 2020 17:09:22 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Lkj3-gJw-VqZ for ; Tue, 8 Sep 2020 17:09:21 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pg1-f193.google.com (mail-pg1-f193.google.com [209.85.215.193]) by whitealder.osuosl.org (Postfix) with ESMTPS id A620B86AEF for ; Tue, 8 Sep 2020 17:09:21 +0000 (UTC) Received: by mail-pg1-f193.google.com with SMTP id j34so5086698pgi.7 for ; Tue, 08 Sep 2020 10:09:21 -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=VVR+JzkOTyWwsNAoJBX58DCmkSh7PCwgOHMkPoIcLb4=; b=kmIG7UoG4eyCrmI34A0VLVY6+Xmc5KvRcgvFlbDNDyDkvI8iPh8gPtMd+j9xoavOjm CCI4rWA0zwwjz0QPNHBbQuVuQPJWQkj3JAhdGF33eFAaUQZUPgNIv8BjFLY28wRatggf gCXtrS2Qmgzn2CxTEj4oFRjA3qKXNn9W7gVTCH7w3jyD0/RzW9NwnrVRqESUn3mj3z8d SOljJEg7PLlkmXQl2SSxuE6AkaIzQdw3z48/4dwwPd/tsiS8odl8RED5ktwcfVp+H7oD mSn1ufc20l0EG4cu3ymhqQqMO/OkoPE7UGa2hnShcLqMcDHqlRv6TJTpOTRV+4h8WDXI XIVA== 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=VVR+JzkOTyWwsNAoJBX58DCmkSh7PCwgOHMkPoIcLb4=; b=CGQRbLM59an3Vy+SWmDpuz3Ab5gOeKwUoIV80VYqCsYUsDQZS1iIad8W4vigALzOC6 pgwu/TdeniVQ5rJZIRCQQGT1/Y9j9yIXhDoPHbf2QNuylWEUPMNFkPTgWPt4U3Z1nDMR tE17+kUCljZbfLYBfizB11tubhJPLipPhwPbLlIOir3QpT7kZm0I3U/k162EPRc66gwU /a3IaZgXwFCiKUkZGGUZ7mkVkTZHVcQ8pTCGc+Qgz2QJfk04KTH943Z1/t7IgdSFF413 y+QMV5+re9h+GLS7tlbICWaqhoAcKgQFwmgFeWCWb9Q6MbjQwlpq0EF/jvJY8SMlSxep o0eA== X-Gm-Message-State: AOAM532BcCtNVCzy+Qz5w6IPH8+inb6ydH/Fh87kid4Lt1HOXd54+Sgw ONCfnKJUTWY55uyMYxTtWmA= X-Google-Smtp-Source: ABdhPJwBFZKiTPtRmcJ/LEq2URqgcqPKdOAofksD1/UvcLL+ZRRxxc1PV9Xo/bzmlrg/UD4km8tRAg== X-Received: by 2002:a63:6dc2:: with SMTP id i185mr12418823pgc.297.1599584960999; Tue, 08 Sep 2020 10:09:20 -0700 (PDT) Received: from gmail.com ([106.201.26.241]) by smtp.gmail.com with ESMTPSA id s16sm12584037pgl.78.2020.09.08.10.09.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Sep 2020 10:09:20 -0700 (PDT) Date: Tue, 8 Sep 2020 22:37:21 +0530 From: Vaibhav Gupta To: Bjorn Helgaas , Bjorn Helgaas , Bjorn Helgaas , Vaibhav Gupta , Adam Radford , "James E.J. Bottomley" , "Martin K. Petersen" , Adaptec OEM Raid Solutions , Hannes Reinecke , Bradley Grove , John Garry , Don Brace , James Smart , Dick Kennedy , Kashyap Desai , Sumit Saxena , Shivasharan S , Sathya Prakash , Sreekanth Reddy , Suganath Prabu Subramani , Jack Wang Message-ID: <20200908170721.GO9948@gmail.com> References: <20200720133427.454400-1-vaibhavgupta40@gmail.com> <20200720133427.454400-15-vaibhavgupta40@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200720133427.454400-15-vaibhavgupta40@gmail.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 14/15] scsi: mvumi: use generic power management X-BeenThere: linux-kernel-mentees@lists.linuxfoundation.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: linux-kernel-mentees-bounces@lists.linuxfoundation.org Sender: "Linux-kernel-mentees" On Mon, Jul 20, 2020 at 07:04:27PM +0530, 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_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 dev_get_drvdata() to get drv data. > > Compile-tested only. > > Signed-off-by: Vaibhav Gupta > --- > drivers/scsi/mvumi.c | 49 ++++++++++---------------------------------- > 1 file changed, 11 insertions(+), 38 deletions(-) > > diff --git a/drivers/scsi/mvumi.c b/drivers/scsi/mvumi.c > index 8906aceda4c4..7a6ef8264e47 100644 > --- a/drivers/scsi/mvumi.c > +++ b/drivers/scsi/mvumi.c > @@ -2558,7 +2558,7 @@ static void mvumi_detach_one(struct pci_dev *pdev) > > /** > * mvumi_shutdown - Shutdown entry point > - * @device: Generic device structure > + * @pdev: PCI device structure > */ > static void mvumi_shutdown(struct pci_dev *pdev) > { > @@ -2567,47 +2567,28 @@ static void mvumi_shutdown(struct pci_dev *pdev) > mvumi_flush_cache(mhba); > } > > -static int __maybe_unused mvumi_suspend(struct pci_dev *pdev, pm_message_t state) > +static int __maybe_unused mvumi_suspend(struct device *dev) > { > - struct mvumi_hba *mhba = NULL; > + struct pci_dev *pdev = to_pci_dev(dev); > > - mhba = pci_get_drvdata(pdev); > + struct mvumi_hba *mhba = pci_get_drvdata(pdev); > mvumi_flush_cache(mhba); > > - pci_set_drvdata(pdev, mhba); > mhba->instancet->disable_intr(mhba); > - free_irq(mhba->pdev->irq, mhba); > mvumi_unmap_pci_addr(pdev, mhba->base_addr); > - 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 __maybe_unused mvumi_resume(struct pci_dev *pdev) > +static int __maybe_unused mvumi_resume(struct device *dev) > { > int ret; > - struct mvumi_hba *mhba = NULL; > - > - mhba = pci_get_drvdata(pdev); > - > - pci_set_power_state(pdev, PCI_D0); > - pci_enable_wake(pdev, PCI_D0, 0); > - pci_restore_state(pdev); > + struct pci_dev *pdev = to_pci_dev(dev); > + struct mvumi_hba *mhba = pci_get_drvdata(pdev); > > - ret = pci_enable_device(pdev); > - if (ret) { > - dev_err(&pdev->dev, "enable device failed\n"); > - return ret; > - } > + device_wakeup_disable(dev); > > - ret = mvumi_pci_set_master(pdev); > ret = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32)); > - if (ret) > - goto fail; > - ret = pci_request_regions(mhba->pdev, MV_DRIVER_NAME); > if (ret) > goto fail; > ret = mvumi_map_pci_addr(mhba->pdev, mhba->base_addr); > @@ -2627,12 +2608,6 @@ static int __maybe_unused mvumi_resume(struct pci_dev *pdev) > goto unmap_pci_addr; > } > > - ret = request_irq(mhba->pdev->irq, mvumi_isr_handler, IRQF_SHARED, > - "mvumi", mhba); > - if (ret) { > - dev_err(&pdev->dev, "failed to register IRQ\n"); > - goto unmap_pci_addr; > - } > mhba->instancet->enable_intr(mhba); > > return 0; > @@ -2642,11 +2617,12 @@ static int __maybe_unused mvumi_resume(struct pci_dev *pdev) > release_regions: > pci_release_regions(pdev); > fail: > - pci_disable_device(pdev); > > return ret; > } > > +static SIMPLE_DEV_PM_OPS(mvumi_pm_ops, mvumi_suspend, mvumi_resume); > + > static struct pci_driver mvumi_pci_driver = { > > .name = MV_DRIVER_NAME, > @@ -2654,10 +2630,7 @@ static struct pci_driver mvumi_pci_driver = { > .probe = mvumi_probe_one, > .remove = mvumi_detach_one, > .shutdown = mvumi_shutdown, > -#ifdef CONFIG_PM > - .suspend = mvumi_suspend, > - .resume = mvumi_resume, > -#endif > + .driver.pm = &mvumi_pm_ops, > }; > > module_pci_driver(mvumi_pci_driver); > -- > 2.27.0 > . _______________________________________________ Linux-kernel-mentees mailing list Linux-kernel-mentees@lists.linuxfoundation.org https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees