Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp350950pxk; Wed, 9 Sep 2020 07:06:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzThvTN81xwRbOl/cY0cJoF7CzgnI2ruYgYkXfcF8I3eFHTujoBtUJZEk1T9wQCWMC6qKAU X-Received: by 2002:a17:906:2f02:: with SMTP id v2mr3541638eji.465.1599660416669; Wed, 09 Sep 2020 07:06:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1599660416; cv=none; d=google.com; s=arc-20160816; b=LsMBCu4p+cUmoevRgTJaSo0iFzFHRpsHgoy+yQyj+1LJF52STFbRvAIilvmRysUoqD gUArS+5ghVURyd2Fwa1Y+/YHKdRrPefOTP5dru3D8P6R2AqIXf2a2ob1rBaPegqN4uwE Ds0BEGechYiBug26qO5JBTKfInNTeKWb0Sbba1QJ7qmR61/OSH5nJqZfzO4S9LVTggMI ZdGCXHOxF+7lPMD8oNYHwJ1MOrrrjyZQEIdrnPn8QVecHN6kRPuMEQyrhhii8Cy5OCEC PQZWL0lA7E068+9pnohTEapzOXEmoGlPTfOxa7AajEIWRjrWbpBOgMLzWaG0dYJTh0P2 qwQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:in-reply-to:content-disposition :mime-version:message-id:subject:cc:to:from:date:dkim-signature; bh=ds797lqtD3E5kT40rYhZEwhiSmX7xG5Vu0d8BwGdFbc=; b=WJ20bLucEbxXguTkZI8SJR7EUdALyl9HgIRiDKRAj1ll1QXyH+I4HNyq/8fAKUkK2Z +SfHdOoMutjR2b9B5sMSaUkIv6Op58RHpYPamH0MIjpUMTsIxhzJhp0/NgZRlZsAk9BH Izr6idcmx5GU/dfiX+g0dZpAZ8VqlryCxI+JB47iQFiGCfMnFmu1Nj89zg3Mfm1IIbFJ gYyoLwCdcFRS9bhk7Rb0vSm1c2aVS5amcISCPXvzxJjxtvmlO973QyBdTmpnRPNI4cBy bcUFcRzrH/2miUjrygRfLuLGLI6dv90NG0Ed0bYoZuPekyG9tcp/T4Quy09GG0uDZBEh srBg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=NnNoII6t; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id k20si1376443eje.105.2020.09.09.07.06.30; Wed, 09 Sep 2020 07:06:56 -0700 (PDT) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=NnNoII6t; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730477AbgIINw1 (ORCPT + 99 others); Wed, 9 Sep 2020 09:52:27 -0400 Received: from mail.kernel.org ([198.145.29.99]:38320 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730236AbgIINX6 (ORCPT ); Wed, 9 Sep 2020 09:23:58 -0400 Received: from localhost (52.sub-72-107-123.myvzw.com [72.107.123.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6B71B2087C; Wed, 9 Sep 2020 13:23:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599657813; bh=9SV+/keZQaLlsbt6dY6GLxcu53/x0HY3jCvWzsM40EU=; h=Date:From:To:Cc:Subject:In-Reply-To:From; b=NnNoII6trox+kORTlYP8POR6Q5+c/+Nm5eQVS706pe6Ta0P53Jc40DO1fkCBVvIpe VgISw0Dkv3b7E95vQdGdQW1IbvU6zuTGNpQIjncw0D5+v32sc6R2x1cdunqq3Hs7e6 OWmhLCkOtCLDYGDqNAuGsFr4WIeLcJOspvrBSvFY= Date: Wed, 9 Sep 2020 08:23:32 -0500 From: Bjorn Helgaas To: Vaibhav Gupta Cc: 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 , 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 01/15] scsi: megaraid_sas: use generic power management Message-ID: <20200909132332.GA696701@bjorn-Precision-5520> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200909100315.GA13015@gmail.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Sep 09, 2020 at 03:33:15PM +0530, Vaibhav Gupta wrote: > On Tue, Sep 08, 2020 at 12:32:09PM -0500, Bjorn Helgaas wrote: > > On Mon, Jul 20, 2020 at 07:04:14PM +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. As the .suspend() work with "struct instance*", > > > extract it from "struct device*" using dev_get_drv_data(). > > > > > > Driver was also 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. > > > > > > Compile-tested only. > > > > > > Signed-off-by: Vaibhav Gupta > > > --- > > > drivers/scsi/megaraid/megaraid_sas_base.c | 61 ++++++----------------- > > > 1 file changed, 16 insertions(+), 45 deletions(-) > > > > > > diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c > > > index 00668335c2af..4a6ee7778977 100644 > > > --- a/drivers/scsi/megaraid/megaraid_sas_base.c > > > +++ b/drivers/scsi/megaraid/megaraid_sas_base.c > > > @@ -7539,25 +7539,21 @@ static void megasas_shutdown_controller(struct megasas_instance *instance, > > > megasas_return_cmd(instance, cmd); > > > } > > > > > > -#ifdef CONFIG_PM > > > /** > > > * megasas_suspend - driver suspend entry point > > > - * @pdev: PCI device structure > > > - * @state: PCI power state to suspend routine > > > + * @dev: Device structure > > > */ > > > -static int > > > -megasas_suspend(struct pci_dev *pdev, pm_message_t state) > > > +static int __maybe_unused > > > +megasas_suspend(struct device *dev) > > > { > > > - struct megasas_instance *instance; > > > - > > > - instance = pci_get_drvdata(pdev); > > > + struct megasas_instance *instance = dev_get_drvdata(dev); > > > > > > if (!instance) > > > return 0; > > > > > > instance->unload = 1; > > > > > > - dev_info(&pdev->dev, "%s is called\n", __func__); > > > + dev_info(dev, "%s is called\n", __func__); > > > > > > /* Shutdown SR-IOV heartbeat timer */ > > > if (instance->requestorId && !instance->skip_heartbeat_timer_del) > > > @@ -7579,7 +7575,7 @@ megasas_suspend(struct pci_dev *pdev, pm_message_t state) > > > > > > tasklet_kill(&instance->isr_tasklet); > > > > > > - pci_set_drvdata(instance->pdev, instance); > > > + dev_set_drvdata(dev, instance); > > > > It *might* be correct to replace "instance->pdev" with "dev", but it's > > not obvious and deserves some explanation. It's true that you can > > replace &pdev->dev with dev, but I don't know anything about > > instance->dev. Sorry, I meant "instance->pdev" here. > > I don't think this change is actually necessary, is it? > > "instance->pdev" is still a pci_dev pointer, so pci_set_drvdata() > > should work fine. ... > > > There is no instance->dev . The 'dev' passed dev_set_drvdata() is > same &pdev->dev. Yes, it's true that "dev" here is the same as the "&pdev->dev" we had previously. But we passed "instance->pdev" (not "pdev") to pci_set_drvdata(). So the question is whether instance->pdev->dev == dev. They *might* be the same, but I don't think it's obvious. > The dev pointer used here, points to same value. > > pci_get_drvdata() and pci_set_drvdata() invoke dev_get_drvdata() and > dev_set_drvdata() respectively. And they do nothing else. Seems like > additional unnecessary function calls and operations.