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.9 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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 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 21442C2D0E0 for ; Tue, 8 Sep 2020 17:02:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D51852087C for ; Tue, 8 Sep 2020 17:02:08 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="lPE/zjb/" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732020AbgIHRCF (ORCPT ); Tue, 8 Sep 2020 13:02:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36268 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731816AbgIHRBx (ORCPT ); Tue, 8 Sep 2020 13:01:53 -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 640E1C061573; Tue, 8 Sep 2020 10:01:53 -0700 (PDT) Received: by mail-pf1-x444.google.com with SMTP id d6so4410381pfn.9; Tue, 08 Sep 2020 10:01:53 -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=vzAjbkXx9hrfKPFCUT3q6o3FbYgiDnBxRlYM5oOC7UM=; b=lPE/zjb/wZpMT9ZM/91DXgkkwUjSR1p5O/C6Wh3hWxgKaxXMtyHHlmQu+sEPmSYu+K 4lS6PAOSy8MQP5BCThO9ts92ESFHzgOFfCbKttsKHsrQaJglGBOdp+28eFRi9pdLDP6+ GrEJitfWcDgwQ5d5GvDDPQz9Np712hXZvCWO6PpgqEYtQFGcmIlJbWuyB9TUp57c6ngN 3kqzIeJgQevapLW2+gWFUh9z8e1Q/WvTlG14MN2bTEOsvsrWuWcrmzdImWP1kDiS7K5W PGRUkP/2jdkuewe153SElWVkqkB1RXMwcnaP1YGHd4KJNMwYOsEwDuSBDfn3/SMQYEzX yp7g== 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=vzAjbkXx9hrfKPFCUT3q6o3FbYgiDnBxRlYM5oOC7UM=; b=R5SexEUaxd/SIhGgnh8LiRCAQNPbQe9DN6SbWOy6xpCVkfYNQpl6uf4l3+f9CfkIIw q5qnUOw3IIReFecWGr0k/7Myvao4x1NTvRKVUmwykpEGF4L2q3MNzaBmGUzTnkvdEWZX LrbLz+mGNBlPOqzLM7jpcxWkkUIxk7rK0P2kUdpPdlEbfaVAOSCGTVM81RpkggzXey/c KVuXINa1Qe1VLnVEIB68naZxYV9mvoTXKPu4oTUFt5wW7ZGDryQT2lpWjgX84NUg3Otu OlSYsJ1Qc7GHY4kt5IDblVGdxHoSUOW40wzsTtu7KF/IzHKoC3Z3BT4HuolBotNq+PRr P6KQ== X-Gm-Message-State: AOAM533JvbTHFswwtUxyU/2oKLtXdxnFogy+Cy1UoPYSPp8BipsLVZbf WAE34dAtWhVLijQu/GuMlXg= X-Google-Smtp-Source: ABdhPJyFGTMRyuLCFx1jU570pVgnMhQDPgZIIhFIS8orI9niXe0EGK1uaRhOnqmQXLdaqfgr5ODw9w== X-Received: by 2002:a17:902:fe15:: with SMTP id g21mr24955756plj.22.1599584512862; Tue, 08 Sep 2020 10:01:52 -0700 (PDT) Received: from gmail.com ([106.201.26.241]) by smtp.gmail.com with ESMTPSA id n2sm18860051pfa.182.2020.09.08.10.01.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Sep 2020 10:01:52 -0700 (PDT) Date: Tue, 8 Sep 2020 22:29:58 +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 Cc: Shuah Khan , linux-kernel@vger.kernel.org, linux-kernel-mentees@lists.linuxfoundation.org, linux-scsi@vger.kernel.org, esc.storagedev@microsemi.com, megaraidlinux.pdl@broadcom.com, MPT-FusionLinux.pdl@broadcom.com Subject: Re: [PATCH v2 04/15] scsi: aic79xx: use generic power management Message-ID: <20200908165958.GE9948@gmail.com> References: <20200720133427.454400-1-vaibhavgupta40@gmail.com> <20200720133427.454400-5-vaibhavgupta40@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20200720133427.454400-5-vaibhavgupta40@gmail.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Jul 20, 2020 at 07:04:17PM +0530, Vaibhav Gupta wrote: > With legacy PM hooks, it was the responsibility of a driver to manage PCI > states and also the device's power state. The generic approach is to let > the PCI core handle the work. > > PCI core passes "struct device*" as an argument to the .suspend() and > .resume() callbacks. > > Driver was using PCI helper functions like pci_save/restore_state(), > pci_disable/enable_device(), pci_set_power_state() and pci_enable_wake(). > They should not be invoked by the driver. > > Also, .suspend() and .resume() were invoking other functions for PM, which > were againg bounded by "#ifdef CONFIG_PM" directive. Remove them and mark > them as "__maybe_unused". > > Compile-tested only. > > Signed-off-by: Vaibhav Gupta > --- > drivers/scsi/aic7xxx/aic79xx.h | 12 +++---- > drivers/scsi/aic7xxx/aic79xx_core.c | 8 ++--- > drivers/scsi/aic7xxx/aic79xx_osm_pci.c | 43 +++++++------------------- > drivers/scsi/aic7xxx/aic79xx_pci.c | 6 ++-- > 4 files changed, 20 insertions(+), 49 deletions(-) > > diff --git a/drivers/scsi/aic7xxx/aic79xx.h b/drivers/scsi/aic7xxx/aic79xx.h > index 9a515551641c..dd5dfd4f30a5 100644 > --- a/drivers/scsi/aic7xxx/aic79xx.h > +++ b/drivers/scsi/aic7xxx/aic79xx.h > @@ -1330,10 +1330,8 @@ const struct ahd_pci_identity *ahd_find_pci_device(ahd_dev_softc_t); > int ahd_pci_config(struct ahd_softc *, > const struct ahd_pci_identity *); > int ahd_pci_test_register_access(struct ahd_softc *); > -#ifdef CONFIG_PM > -void ahd_pci_suspend(struct ahd_softc *); > -void ahd_pci_resume(struct ahd_softc *); > -#endif > +void __maybe_unused ahd_pci_suspend(struct ahd_softc *); > +void __maybe_unused ahd_pci_resume(struct ahd_softc *); > > /************************** SCB and SCB queue management **********************/ > void ahd_qinfifo_requeue_tail(struct ahd_softc *ahd, > @@ -1344,10 +1342,8 @@ struct ahd_softc *ahd_alloc(void *platform_arg, char *name); > int ahd_softc_init(struct ahd_softc *); > void ahd_controller_info(struct ahd_softc *ahd, char *buf); > int ahd_init(struct ahd_softc *ahd); > -#ifdef CONFIG_PM > -int ahd_suspend(struct ahd_softc *ahd); > -void ahd_resume(struct ahd_softc *ahd); > -#endif > +int __maybe_unused ahd_suspend(struct ahd_softc *ahd); > +void __maybe_unused ahd_resume(struct ahd_softc *ahd); > int ahd_default_config(struct ahd_softc *ahd); > int ahd_parse_vpddata(struct ahd_softc *ahd, > struct vpd_config *vpd); > diff --git a/drivers/scsi/aic7xxx/aic79xx_core.c b/drivers/scsi/aic7xxx/aic79xx_core.c > index e4a09b93d00c..06ee7abd0f8f 100644 > --- a/drivers/scsi/aic7xxx/aic79xx_core.c > +++ b/drivers/scsi/aic7xxx/aic79xx_core.c > @@ -7880,11 +7880,9 @@ ahd_pause_and_flushwork(struct ahd_softc *ahd) > ahd->flags &= ~AHD_ALL_INTERRUPTS; > } > > -#ifdef CONFIG_PM > -int > +int __maybe_unused > ahd_suspend(struct ahd_softc *ahd) > { > - > ahd_pause_and_flushwork(ahd); > > if (LIST_FIRST(&ahd->pending_scbs) != NULL) { > @@ -7895,15 +7893,13 @@ ahd_suspend(struct ahd_softc *ahd) > return (0); > } > > -void > +void __maybe_unused > ahd_resume(struct ahd_softc *ahd) > { > - > ahd_reset(ahd, /*reinit*/TRUE); > ahd_intr_enable(ahd, TRUE); > ahd_restart(ahd); > } > -#endif > > /************************** Busy Target Table *********************************/ > /* > diff --git a/drivers/scsi/aic7xxx/aic79xx_osm_pci.c b/drivers/scsi/aic7xxx/aic79xx_osm_pci.c > index 8b891a05d9e7..07b670b80f1b 100644 > --- a/drivers/scsi/aic7xxx/aic79xx_osm_pci.c > +++ b/drivers/scsi/aic7xxx/aic79xx_osm_pci.c > @@ -74,11 +74,10 @@ static const struct pci_device_id ahd_linux_pci_id_table[] = { > > MODULE_DEVICE_TABLE(pci, ahd_linux_pci_id_table); > > -#ifdef CONFIG_PM > -static int > -ahd_linux_pci_dev_suspend(struct pci_dev *pdev, pm_message_t mesg) > +static int __maybe_unused > +ahd_linux_pci_dev_suspend(struct device *dev) > { > - struct ahd_softc *ahd = pci_get_drvdata(pdev); > + struct ahd_softc *ahd = dev_get_drvdata(dev); > int rc; > > if ((rc = ahd_suspend(ahd))) > @@ -86,39 +85,20 @@ ahd_linux_pci_dev_suspend(struct pci_dev *pdev, pm_message_t mesg) > > ahd_pci_suspend(ahd); > > - pci_save_state(pdev); > - pci_disable_device(pdev); > - > - if (mesg.event & PM_EVENT_SLEEP) > - pci_set_power_state(pdev, PCI_D3hot); > - > return rc; > } > > -static int > -ahd_linux_pci_dev_resume(struct pci_dev *pdev) > +static int __maybe_unused > +ahd_linux_pci_dev_resume(struct device *dev) > { > - struct ahd_softc *ahd = pci_get_drvdata(pdev); > - int rc; > - > - pci_set_power_state(pdev, PCI_D0); > - pci_restore_state(pdev); > - > - if ((rc = pci_enable_device(pdev))) { > - dev_printk(KERN_ERR, &pdev->dev, > - "failed to enable device after resume (%d)\n", rc); > - return rc; > - } > - > - pci_set_master(pdev); > + struct ahd_softc *ahd = dev_get_drvdata(dev); > > ahd_pci_resume(ahd); > > ahd_resume(ahd); > > - return rc; > + return 0; > } > -#endif > > static void > ahd_linux_pci_dev_remove(struct pci_dev *pdev) > @@ -224,13 +204,14 @@ ahd_linux_pci_dev_probe(struct pci_dev *pdev, const struct pci_device_id *ent) > return (0); > } > > +static SIMPLE_DEV_PM_OPS(ahd_linux_pci_dev_pm_ops, > + ahd_linux_pci_dev_suspend, > + ahd_linux_pci_dev_resume); > + > static struct pci_driver aic79xx_pci_driver = { > .name = "aic79xx", > .probe = ahd_linux_pci_dev_probe, > -#ifdef CONFIG_PM > - .suspend = ahd_linux_pci_dev_suspend, > - .resume = ahd_linux_pci_dev_resume, > -#endif > + .driver.pm = &ahd_linux_pci_dev_pm_ops, > .remove = ahd_linux_pci_dev_remove, > .id_table = ahd_linux_pci_id_table > }; > diff --git a/drivers/scsi/aic7xxx/aic79xx_pci.c b/drivers/scsi/aic7xxx/aic79xx_pci.c > index 8397ae93f7dd..2f0bdb9225a4 100644 > --- a/drivers/scsi/aic7xxx/aic79xx_pci.c > +++ b/drivers/scsi/aic7xxx/aic79xx_pci.c > @@ -377,8 +377,7 @@ ahd_pci_config(struct ahd_softc *ahd, const struct ahd_pci_identity *entry) > return ahd_pci_map_int(ahd); > } > > -#ifdef CONFIG_PM > -void > +void __maybe_unused > ahd_pci_suspend(struct ahd_softc *ahd) > { > /* > @@ -394,7 +393,7 @@ ahd_pci_suspend(struct ahd_softc *ahd) > > } > > -void > +void __maybe_unused > ahd_pci_resume(struct ahd_softc *ahd) > { > ahd_pci_write_config(ahd->dev_softc, DEVCONFIG, > @@ -404,7 +403,6 @@ ahd_pci_resume(struct ahd_softc *ahd) > ahd_pci_write_config(ahd->dev_softc, CSIZE_LATTIME, > ahd->suspend_state.pci_state.csize_lattime, /*bytes*/1); > } > -#endif > > /* > * Perform some simple tests that should catch situations where > -- > 2.27.0 > . 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 53091C433E2 for ; Tue, 8 Sep 2020 17:01:58 +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 DF9ED2080C for ; Tue, 8 Sep 2020 17:01:57 +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="lPE/zjb/" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DF9ED2080C 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 57C9886D58; Tue, 8 Sep 2020 17:01:57 +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 01qW+cCTjmHD; Tue, 8 Sep 2020 17:01:55 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by whitealder.osuosl.org (Postfix) with ESMTP id E049386AEF; Tue, 8 Sep 2020 17:01:55 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id CF229C0052; Tue, 8 Sep 2020 17:01:55 +0000 (UTC) Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by lists.linuxfoundation.org (Postfix) with ESMTP id 7ACB9C0051 for ; Tue, 8 Sep 2020 17:01:54 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 76D9186D58 for ; Tue, 8 Sep 2020 17:01:54 +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 PYO4geLmXMIO for ; Tue, 8 Sep 2020 17:01:53 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pf1-f196.google.com (mail-pf1-f196.google.com [209.85.210.196]) by whitealder.osuosl.org (Postfix) with ESMTPS id 569EA86AEF for ; Tue, 8 Sep 2020 17:01:53 +0000 (UTC) Received: by mail-pf1-f196.google.com with SMTP id w7so11476651pfi.4 for ; Tue, 08 Sep 2020 10:01:53 -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=vzAjbkXx9hrfKPFCUT3q6o3FbYgiDnBxRlYM5oOC7UM=; b=lPE/zjb/wZpMT9ZM/91DXgkkwUjSR1p5O/C6Wh3hWxgKaxXMtyHHlmQu+sEPmSYu+K 4lS6PAOSy8MQP5BCThO9ts92ESFHzgOFfCbKttsKHsrQaJglGBOdp+28eFRi9pdLDP6+ GrEJitfWcDgwQ5d5GvDDPQz9Np712hXZvCWO6PpgqEYtQFGcmIlJbWuyB9TUp57c6ngN 3kqzIeJgQevapLW2+gWFUh9z8e1Q/WvTlG14MN2bTEOsvsrWuWcrmzdImWP1kDiS7K5W PGRUkP/2jdkuewe153SElWVkqkB1RXMwcnaP1YGHd4KJNMwYOsEwDuSBDfn3/SMQYEzX yp7g== 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=vzAjbkXx9hrfKPFCUT3q6o3FbYgiDnBxRlYM5oOC7UM=; b=Rc8Wisodn0flmJv2+ing6/qRnPNbccptdqzFjOiskkJMBAU2BDlkpjajpbzRrpsdSP MF/+bcuQRRO7JLKqkU54J+wGrZz4wBrfaAtRMh8Li2f9LaEmw6nU1wNBVzekO4BT16tr g5PsrSyKjONmJWikymBHn1DAu2MoINspJlIOZLPcw7igEQhEytbCxL1txNJe9X5JmIFw tfepXE1Q2Fir2vN1HjwGjmBQoopV+o3gOVseEUa7YTd0PFwoA2W0f0zZ2VrmZl6g/rS9 vgDLN5lWYgrj7ij66RzF0NoNEsFtioklCJ/BZN62hKJZ1ktoIctbuID0ntsjmIZBZFw8 /D6A== X-Gm-Message-State: AOAM530dFnBBzbH4PQQGInUpqEg8t7Y8j77Pn2I/nT0fKV9+TKPqMn1c xCLk0BAOyVlkBoxzmkBkEes= X-Google-Smtp-Source: ABdhPJyFGTMRyuLCFx1jU570pVgnMhQDPgZIIhFIS8orI9niXe0EGK1uaRhOnqmQXLdaqfgr5ODw9w== X-Received: by 2002:a17:902:fe15:: with SMTP id g21mr24955756plj.22.1599584512862; Tue, 08 Sep 2020 10:01:52 -0700 (PDT) Received: from gmail.com ([106.201.26.241]) by smtp.gmail.com with ESMTPSA id n2sm18860051pfa.182.2020.09.08.10.01.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Sep 2020 10:01:52 -0700 (PDT) Date: Tue, 8 Sep 2020 22:29:58 +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: <20200908165958.GE9948@gmail.com> References: <20200720133427.454400-1-vaibhavgupta40@gmail.com> <20200720133427.454400-5-vaibhavgupta40@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200720133427.454400-5-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 04/15] scsi: aic79xx: 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:17PM +0530, Vaibhav Gupta wrote: > With legacy PM hooks, it was the responsibility of a driver to manage PCI > states and also the device's power state. The generic approach is to let > the PCI core handle the work. > > PCI core passes "struct device*" as an argument to the .suspend() and > .resume() callbacks. > > Driver was using PCI helper functions like pci_save/restore_state(), > pci_disable/enable_device(), pci_set_power_state() and pci_enable_wake(). > They should not be invoked by the driver. > > Also, .suspend() and .resume() were invoking other functions for PM, which > were againg bounded by "#ifdef CONFIG_PM" directive. Remove them and mark > them as "__maybe_unused". > > Compile-tested only. > > Signed-off-by: Vaibhav Gupta > --- > drivers/scsi/aic7xxx/aic79xx.h | 12 +++---- > drivers/scsi/aic7xxx/aic79xx_core.c | 8 ++--- > drivers/scsi/aic7xxx/aic79xx_osm_pci.c | 43 +++++++------------------- > drivers/scsi/aic7xxx/aic79xx_pci.c | 6 ++-- > 4 files changed, 20 insertions(+), 49 deletions(-) > > diff --git a/drivers/scsi/aic7xxx/aic79xx.h b/drivers/scsi/aic7xxx/aic79xx.h > index 9a515551641c..dd5dfd4f30a5 100644 > --- a/drivers/scsi/aic7xxx/aic79xx.h > +++ b/drivers/scsi/aic7xxx/aic79xx.h > @@ -1330,10 +1330,8 @@ const struct ahd_pci_identity *ahd_find_pci_device(ahd_dev_softc_t); > int ahd_pci_config(struct ahd_softc *, > const struct ahd_pci_identity *); > int ahd_pci_test_register_access(struct ahd_softc *); > -#ifdef CONFIG_PM > -void ahd_pci_suspend(struct ahd_softc *); > -void ahd_pci_resume(struct ahd_softc *); > -#endif > +void __maybe_unused ahd_pci_suspend(struct ahd_softc *); > +void __maybe_unused ahd_pci_resume(struct ahd_softc *); > > /************************** SCB and SCB queue management **********************/ > void ahd_qinfifo_requeue_tail(struct ahd_softc *ahd, > @@ -1344,10 +1342,8 @@ struct ahd_softc *ahd_alloc(void *platform_arg, char *name); > int ahd_softc_init(struct ahd_softc *); > void ahd_controller_info(struct ahd_softc *ahd, char *buf); > int ahd_init(struct ahd_softc *ahd); > -#ifdef CONFIG_PM > -int ahd_suspend(struct ahd_softc *ahd); > -void ahd_resume(struct ahd_softc *ahd); > -#endif > +int __maybe_unused ahd_suspend(struct ahd_softc *ahd); > +void __maybe_unused ahd_resume(struct ahd_softc *ahd); > int ahd_default_config(struct ahd_softc *ahd); > int ahd_parse_vpddata(struct ahd_softc *ahd, > struct vpd_config *vpd); > diff --git a/drivers/scsi/aic7xxx/aic79xx_core.c b/drivers/scsi/aic7xxx/aic79xx_core.c > index e4a09b93d00c..06ee7abd0f8f 100644 > --- a/drivers/scsi/aic7xxx/aic79xx_core.c > +++ b/drivers/scsi/aic7xxx/aic79xx_core.c > @@ -7880,11 +7880,9 @@ ahd_pause_and_flushwork(struct ahd_softc *ahd) > ahd->flags &= ~AHD_ALL_INTERRUPTS; > } > > -#ifdef CONFIG_PM > -int > +int __maybe_unused > ahd_suspend(struct ahd_softc *ahd) > { > - > ahd_pause_and_flushwork(ahd); > > if (LIST_FIRST(&ahd->pending_scbs) != NULL) { > @@ -7895,15 +7893,13 @@ ahd_suspend(struct ahd_softc *ahd) > return (0); > } > > -void > +void __maybe_unused > ahd_resume(struct ahd_softc *ahd) > { > - > ahd_reset(ahd, /*reinit*/TRUE); > ahd_intr_enable(ahd, TRUE); > ahd_restart(ahd); > } > -#endif > > /************************** Busy Target Table *********************************/ > /* > diff --git a/drivers/scsi/aic7xxx/aic79xx_osm_pci.c b/drivers/scsi/aic7xxx/aic79xx_osm_pci.c > index 8b891a05d9e7..07b670b80f1b 100644 > --- a/drivers/scsi/aic7xxx/aic79xx_osm_pci.c > +++ b/drivers/scsi/aic7xxx/aic79xx_osm_pci.c > @@ -74,11 +74,10 @@ static const struct pci_device_id ahd_linux_pci_id_table[] = { > > MODULE_DEVICE_TABLE(pci, ahd_linux_pci_id_table); > > -#ifdef CONFIG_PM > -static int > -ahd_linux_pci_dev_suspend(struct pci_dev *pdev, pm_message_t mesg) > +static int __maybe_unused > +ahd_linux_pci_dev_suspend(struct device *dev) > { > - struct ahd_softc *ahd = pci_get_drvdata(pdev); > + struct ahd_softc *ahd = dev_get_drvdata(dev); > int rc; > > if ((rc = ahd_suspend(ahd))) > @@ -86,39 +85,20 @@ ahd_linux_pci_dev_suspend(struct pci_dev *pdev, pm_message_t mesg) > > ahd_pci_suspend(ahd); > > - pci_save_state(pdev); > - pci_disable_device(pdev); > - > - if (mesg.event & PM_EVENT_SLEEP) > - pci_set_power_state(pdev, PCI_D3hot); > - > return rc; > } > > -static int > -ahd_linux_pci_dev_resume(struct pci_dev *pdev) > +static int __maybe_unused > +ahd_linux_pci_dev_resume(struct device *dev) > { > - struct ahd_softc *ahd = pci_get_drvdata(pdev); > - int rc; > - > - pci_set_power_state(pdev, PCI_D0); > - pci_restore_state(pdev); > - > - if ((rc = pci_enable_device(pdev))) { > - dev_printk(KERN_ERR, &pdev->dev, > - "failed to enable device after resume (%d)\n", rc); > - return rc; > - } > - > - pci_set_master(pdev); > + struct ahd_softc *ahd = dev_get_drvdata(dev); > > ahd_pci_resume(ahd); > > ahd_resume(ahd); > > - return rc; > + return 0; > } > -#endif > > static void > ahd_linux_pci_dev_remove(struct pci_dev *pdev) > @@ -224,13 +204,14 @@ ahd_linux_pci_dev_probe(struct pci_dev *pdev, const struct pci_device_id *ent) > return (0); > } > > +static SIMPLE_DEV_PM_OPS(ahd_linux_pci_dev_pm_ops, > + ahd_linux_pci_dev_suspend, > + ahd_linux_pci_dev_resume); > + > static struct pci_driver aic79xx_pci_driver = { > .name = "aic79xx", > .probe = ahd_linux_pci_dev_probe, > -#ifdef CONFIG_PM > - .suspend = ahd_linux_pci_dev_suspend, > - .resume = ahd_linux_pci_dev_resume, > -#endif > + .driver.pm = &ahd_linux_pci_dev_pm_ops, > .remove = ahd_linux_pci_dev_remove, > .id_table = ahd_linux_pci_id_table > }; > diff --git a/drivers/scsi/aic7xxx/aic79xx_pci.c b/drivers/scsi/aic7xxx/aic79xx_pci.c > index 8397ae93f7dd..2f0bdb9225a4 100644 > --- a/drivers/scsi/aic7xxx/aic79xx_pci.c > +++ b/drivers/scsi/aic7xxx/aic79xx_pci.c > @@ -377,8 +377,7 @@ ahd_pci_config(struct ahd_softc *ahd, const struct ahd_pci_identity *entry) > return ahd_pci_map_int(ahd); > } > > -#ifdef CONFIG_PM > -void > +void __maybe_unused > ahd_pci_suspend(struct ahd_softc *ahd) > { > /* > @@ -394,7 +393,7 @@ ahd_pci_suspend(struct ahd_softc *ahd) > > } > > -void > +void __maybe_unused > ahd_pci_resume(struct ahd_softc *ahd) > { > ahd_pci_write_config(ahd->dev_softc, DEVCONFIG, > @@ -404,7 +403,6 @@ ahd_pci_resume(struct ahd_softc *ahd) > ahd_pci_write_config(ahd->dev_softc, CSIZE_LATTIME, > ahd->suspend_state.pci_state.csize_lattime, /*bytes*/1); > } > -#endif > > /* > * Perform some simple tests that should catch situations where > -- > 2.27.0 > . _______________________________________________ Linux-kernel-mentees mailing list Linux-kernel-mentees@lists.linuxfoundation.org https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees