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 5CF22C433E2 for ; Tue, 8 Sep 2020 17:05:00 +0000 (UTC) Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (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 E1A29207DE for ; Tue, 8 Sep 2020 17:04:59 +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="DVD2soSn" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E1A29207DE 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 silver.osuosl.org (Postfix) with ESMTP id 5D8CE2E0F7; Tue, 8 Sep 2020 17:04:59 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id bV1D4t++2Zcu; Tue, 8 Sep 2020 17:04:57 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by silver.osuosl.org (Postfix) with ESMTP id 60A47274ED; Tue, 8 Sep 2020 17:04:56 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 569ECC0052; Tue, 8 Sep 2020 17:04:56 +0000 (UTC) Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by lists.linuxfoundation.org (Postfix) with ESMTP id B2929C0051 for ; Tue, 8 Sep 2020 17:04:55 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 9F92486C9D for ; Tue, 8 Sep 2020 17:04:55 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 1LbZLBtneRiy for ; Tue, 8 Sep 2020 17:04:54 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pf1-f195.google.com (mail-pf1-f195.google.com [209.85.210.195]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 8E93086C8D for ; Tue, 8 Sep 2020 17:04:54 +0000 (UTC) Received: by mail-pf1-f195.google.com with SMTP id d6so4418570pfn.9 for ; Tue, 08 Sep 2020 10:04:54 -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=nLvMa69ZLRrk/1Hr1af3qjhJpj5ly4AIz3/QMzbtwUA=; b=DVD2soSntXaW2di71MBvvpyjCx20yxXde7mgXtwhJnxJfChrnwVm4vY8H/cPU4B505 4BTgeo+kICGZJ+t4rMI6xQa6dYqJvlWDZQqrXlZOHcIYNrJwOwqROnuhODmYhFHMRlS9 lmSBwSmaLyB0eyiGZ+w9zLhzQDVlIXWsZFPgXYtjg26rUDkMbKWqmzaJ5chGB86kciKk ONFI4u+ZWp7tM1sdO/qrnKDIuR9rT2gxgtqjuEXkPNinmRBVCtubyuayPBc1Od3kMcNk C/AA6ziylVuiT7mbYvgp7Nf8/oJXvYAi65z+EPiQzO+V40EU6JZtZAYZkQx5P5TESSRE Plcg== 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=nLvMa69ZLRrk/1Hr1af3qjhJpj5ly4AIz3/QMzbtwUA=; b=RNjpW0ushaS/1cSgafftrY4vTtKkUxCbnlaHr4G8oUyM2tYo2bDkWBWnjXljT9iTzA SjrdsucOLviOL/HWsEnUjOk0kBpIzgIao4fmm/J2FfuQvlFNW29KUunYtYu1fjUTOlIp e1CyqligbBDzLFqnJcHCHb9sUMK0uLTC8ODlsD6K3xy6X2MP/R6tx/s5FQYiBGFLErEz UwUh/zX9Z0SfI/3zIt/eEsDsB6Mjba6xtQ6+ltjssnjaERVMWG7tp5cFEWHxDWPo+TAw tRwm7Z/DHI/IOHz6AvAyjeH5h3SSxhQmQkgBWBz1nQCp3dcDfKGR3C47A1D5ZL39iKc+ CeEg== X-Gm-Message-State: AOAM531G5ogTeEapROGWDKZNNPeKWb3X/jpDqFTyjxLOlYAs3WQSJO3p S+d7IarX8kONRwKYKz5dvaE= X-Google-Smtp-Source: ABdhPJyMteFblgM382FF0Yb22pgyWQ9XRkDAe//oQSklvk0IRqe1xkykCOOETNvdSW59J2ZQFe1qDg== X-Received: by 2002:aa7:94a4:: with SMTP id a4mr25981589pfl.49.1599584694103; Tue, 08 Sep 2020 10:04:54 -0700 (PDT) Received: from gmail.com ([106.201.26.241]) by smtp.gmail.com with ESMTPSA id a138sm21406pfd.19.2020.09.08.10.04.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Sep 2020 10:04:53 -0700 (PDT) Date: Tue, 8 Sep 2020 22:33:00 +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: <20200908170300.GI9948@gmail.com> References: <20200720133427.454400-1-vaibhavgupta40@gmail.com> <20200720133427.454400-9-vaibhavgupta40@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200720133427.454400-9-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 08/15] scsi: mpt3sas_scsih: 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:21PM +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 > --- > drivers/scsi/mpt3sas/mpt3sas_scsih.c | 36 +++++++++++----------------- > 1 file changed, 14 insertions(+), 22 deletions(-) > > diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c > index 08fc4b381056..f3c6e68b2921 100644 > --- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c > +++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c > @@ -10829,44 +10829,40 @@ _scsih_probe(struct pci_dev *pdev, const struct pci_device_id *id) > return rv; > } > > -#ifdef CONFIG_PM > /** > * scsih_suspend - power management suspend main entry point > - * @pdev: PCI device struct > - * @state: PM state change to (usually PCI_D3) > + * @dev: Device struct > * > * Return: 0 success, anything else error. > */ > -static int > -scsih_suspend(struct pci_dev *pdev, pm_message_t state) > +static int __maybe_unused > +scsih_suspend(struct device *dev) > { > + struct pci_dev *pdev = to_pci_dev(dev); > struct Scsi_Host *shost = pci_get_drvdata(pdev); > struct MPT3SAS_ADAPTER *ioc = shost_priv(shost); > - pci_power_t device_state; > > mpt3sas_base_stop_watchdog(ioc); > flush_scheduled_work(); > scsi_block_requests(shost); > _scsih_nvme_shutdown(ioc); > - device_state = pci_choose_state(pdev, state); > - ioc_info(ioc, "pdev=0x%p, slot=%s, entering operating state [D%d]\n", > - pdev, pci_name(pdev), device_state); > + ioc_info(ioc, "pdev=0x%p, slot=%s, entering suspended state\n", > + pdev, pci_name(pdev)); > > - pci_save_state(pdev); > mpt3sas_base_free_resources(ioc); > - pci_set_power_state(pdev, device_state); > return 0; > } > > /** > * scsih_resume - power management resume main entry point > - * @pdev: PCI device struct > + * @dev: Device struct > * > * Return: 0 success, anything else error. > */ > -static int > -scsih_resume(struct pci_dev *pdev) > +static int __maybe_unused > +scsih_resume(struct device *dev) > { > + struct pci_dev *pdev = to_pci_dev(dev); > struct Scsi_Host *shost = pci_get_drvdata(pdev); > struct MPT3SAS_ADAPTER *ioc = shost_priv(shost); > pci_power_t device_state = pdev->current_state; > @@ -10875,9 +10871,7 @@ scsih_resume(struct pci_dev *pdev) > ioc_info(ioc, "pdev=0x%p, slot=%s, previous operating state [D%d]\n", > pdev, pci_name(pdev), device_state); > > - pci_set_power_state(pdev, PCI_D0); > - pci_enable_wake(pdev, PCI_D0, 0); > - pci_restore_state(pdev); > + device_wakeup_disable(dev); > ioc->pdev = pdev; > r = mpt3sas_base_map_resources(ioc); > if (r) > @@ -10888,7 +10882,6 @@ scsih_resume(struct pci_dev *pdev) > mpt3sas_base_start_watchdog(ioc); > return 0; > } > -#endif /* CONFIG_PM */ > > /** > * scsih_pci_error_detected - Called when a PCI error is detected. > @@ -11162,6 +11155,8 @@ static struct pci_error_handlers _mpt3sas_err_handler = { > .resume = scsih_pci_resume, > }; > > +static SIMPLE_DEV_PM_OPS(scsih_pm_ops, scsih_suspend, scsih_resume); > + > static struct pci_driver mpt3sas_driver = { > .name = MPT3SAS_DRIVER_NAME, > .id_table = mpt3sas_pci_table, > @@ -11169,10 +11164,7 @@ static struct pci_driver mpt3sas_driver = { > .remove = scsih_remove, > .shutdown = scsih_shutdown, > .err_handler = &_mpt3sas_err_handler, > -#ifdef CONFIG_PM > - .suspend = scsih_suspend, > - .resume = scsih_resume, > -#endif > + .driver.pm = &scsih_pm_ops, > }; > > /** > -- > 2.27.0 > . _______________________________________________ Linux-kernel-mentees mailing list Linux-kernel-mentees@lists.linuxfoundation.org https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees