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=-9.8 required=3.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham 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 8AC96C433E1 for ; Wed, 5 Aug 2020 17:21:26 +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 53BB722CF8 for ; Wed, 5 Aug 2020 17:21: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="psVRPR/s" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 53BB722CF8 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 32FB522731; Wed, 5 Aug 2020 17:21:26 +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 qOYez7+Pm7Uh; Wed, 5 Aug 2020 17:21:24 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by silver.osuosl.org (Postfix) with ESMTP id 63C1E22735; Wed, 5 Aug 2020 17:21:24 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 4F38EC088E; Wed, 5 Aug 2020 17:21:24 +0000 (UTC) Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by lists.linuxfoundation.org (Postfix) with ESMTP id A9896C004C for ; Wed, 5 Aug 2020 17:21:22 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 8D7DD843BB for ; Wed, 5 Aug 2020 17:21: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 mmpbOoTfvGpt for ; Wed, 5 Aug 2020 17:21:21 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pj1-f67.google.com (mail-pj1-f67.google.com [209.85.216.67]) by whitealder.osuosl.org (Postfix) with ESMTPS id BF51E810F6 for ; Wed, 5 Aug 2020 17:21:21 +0000 (UTC) Received: by mail-pj1-f67.google.com with SMTP id ha11so4663113pjb.1 for ; Wed, 05 Aug 2020 10:21: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=ClBxmhMDW8/EvqLNuXj7OToao++oyiDhHUE3TT7mBds=; b=psVRPR/sQ1D/EHzTjCqfMm49Kjs6jS5auCQQBuWbaa1ukcEDyAan+MKT7yZoc3sepE EoqGblTTU4cr4TCQeCPp/im62vToSQLewk0u5eMCamxeSnJNHMpiCoReUYZSxzRPngu1 1PUQ+MMFRGpA4CUuOiUzBNwZaxXTTuUauYeD2V3wKoQZwQ7bwQ8+2biTqpaPDNAgq8Rz 5+au1GfTD1+3fTUoK7IALQA/eUtFt+9W3E4iMiikKnnsD0Xhfw9N22U86G3kYHDISlAt o20tsTlfuuPQMKS2NMPO7rIyuXCOUHGemsNKMwJoCsjOrAoekgzG9GyjBezv50GGVbjT sX7w== 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=ClBxmhMDW8/EvqLNuXj7OToao++oyiDhHUE3TT7mBds=; b=nV/ThLi99KYbA3BdbAbf3Em/VNS/8LsfYOy1zSb2Ro7mkbLBj1gUiA9AA7GmuEhXsU 2Z29lB5Aq2DZLWOmTPe0B1bgHIAI1/BxO+s0LEXDkAzf0ghzHL0xE1kcTkYQSsq0Ia/9 qp6h2c5ipyOeMGwsMfUTDOUu2w9xAb7nw5IP1ULzhy64yhI52x3D+hWm48Y6c6koF4x+ mx4A35LiRyIJSt7CSMVEUDuX0gqf1bXQpy4UqTH38xVSL9MtLnXlmktWv661zVihOGBc 9LKRWm2beUQyszZfSdfaERppmGr9wgNm4ahtl1Yjzaxf6M9w+gOTqhJ22OlistarF80U SzCQ== X-Gm-Message-State: AOAM530R9De6qBnYnAXJfIu2AEVQTdRF3ooViV2xE9j2frB9+q/jYR9v odWc5kDg/ij59OpYQz0s498= X-Google-Smtp-Source: ABdhPJxzb/HUa4PssPf3WyZJk2/9fO9KwC5LbUHExxDSZz5HT6M3KGkwkKCGNwW8SVIKjQvLhzHLAw== X-Received: by 2002:a17:902:8495:: with SMTP id c21mr4240892plo.82.1596648081145; Wed, 05 Aug 2020 10:21:21 -0700 (PDT) Received: from gmail.com ([103.105.152.86]) by smtp.gmail.com with ESMTPSA id d24sm4850758pfq.72.2020.08.05.10.21.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Aug 2020 10:21:20 -0700 (PDT) Date: Wed, 5 Aug 2020 22:49:37 +0530 From: Vaibhav Gupta To: Bjorn Helgaas Message-ID: <20200805171937.GA85392@gmail.com> References: <20200805162154.GA3179@gmail.com> <20200805165611.GA516242@bjorn-Precision-5520> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200805165611.GA516242@bjorn-Precision-5520> Cc: Tomoya MORINAGA , Vaibhav Gupta , Linus Walleij , Tomoya MORINAGA , linux-kernel@vger.kernel.org, Ben Dooks , linux-i2c@vger.kernel.org, Bjorn Helgaas , linux-kernel-mentees@lists.linuxfoundation.org Subject: Re: [Linux-kernel-mentees] [PATCH v1] i2c: eg20t: 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 Wed, Aug 05, 2020 at 11:56:11AM -0500, Bjorn Helgaas wrote: > On Wed, Aug 05, 2020 at 09:51:54PM +0530, Vaibhav Gupta wrote: > > On Wed, Aug 05, 2020 at 10:28:32AM -0500, Bjorn Helgaas wrote: > > > On Wed, Aug 05, 2020 at 10:23:31AM -0500, Bjorn Helgaas wrote: > > > > On Mon, Jul 20, 2020 at 07:30:32PM +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_enable_wake() and pci_set_power_state() 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() and dev_get_drvdata() to get > > > > > "struct pci_dev*" variable and drv data. > > > > > > > > > > Compile-tested only. > > > > > > > > > > Signed-off-by: Vaibhav Gupta > > > > > --- > > > > > drivers/i2c/busses/i2c-eg20t.c | 39 ++++++++-------------------------- > > > > > 1 file changed, 9 insertions(+), 30 deletions(-) > > > > > > > > > > diff --git a/drivers/i2c/busses/i2c-eg20t.c b/drivers/i2c/busses/i2c-eg20t.c > > > > > index 73f139690e4e..c0ddc4cc2ce7 100644 > > > > > --- a/drivers/i2c/busses/i2c-eg20t.c > > > > > +++ b/drivers/i2c/busses/i2c-eg20t.c > > > > > @@ -846,11 +846,10 @@ static void pch_i2c_remove(struct pci_dev *pdev) > > > > > kfree(adap_info); > > > > > } > > > > > > > > > > -#ifdef CONFIG_PM > > > > > -static int pch_i2c_suspend(struct pci_dev *pdev, pm_message_t state) > > > > > +static int __maybe_unused pch_i2c_suspend(struct device *dev) > > > > > { > > > > > - int ret; > > > > > int i; > > > > > + struct pci_dev *pdev = to_pci_dev(dev); > > > > > struct adapter_info *adap_info = pci_get_drvdata(pdev); > > > > > > > > Why don't you use "adap_info = dev_get_drvdata(dev)" as you did below, > > > > so you don't need to_pci_dev()? > > > > > > Actually, line 870, pch_pci_dbg() again needs "struct pci_dev*" type > > pointer. Either way I had to use to_pci_dev(), so defined "pdev" > > which made less number of required changes in the code. > > OK. pch_pci_dbg() only needs the pdev in order to *get* the struct > device *, so it's all sort of in circles. But it's fine to do as you > did here. > > > > > > void __iomem *p = adap_info->pch_data[0].pch_base_address; > > > > > > > > > > @@ -872,34 +871,17 @@ static int pch_i2c_suspend(struct pci_dev *pdev, pm_message_t state) > > > > > ioread32(p + PCH_I2CSR), ioread32(p + PCH_I2CBUFSTA), > > > > > ioread32(p + PCH_I2CESRSTA)); > > > > > > > > > > - ret = pci_save_state(pdev); > > > > > - > > > > > - if (ret) { > > > > > - pch_pci_err(pdev, "pci_save_state\n"); > > > > > - return ret; > > > > > - } > > > > > - > > > > > - pci_enable_wake(pdev, PCI_D3hot, 0); > > > > > - pci_disable_device(pdev); > > > > > - pci_set_power_state(pdev, pci_choose_state(pdev, state)); > > > > > + device_wakeup_disable(dev); > > > > > > > > > > return 0; > > > > > } > > > > > > > > > > -static int pch_i2c_resume(struct pci_dev *pdev) > > > > > +static int __maybe_unused pch_i2c_resume(struct device *dev) > > > > > { > > > > > int i; > > > > > - struct adapter_info *adap_info = pci_get_drvdata(pdev); > > > > > - > > > > > - pci_set_power_state(pdev, PCI_D0); > > > > > - pci_restore_state(pdev); > > > > > + struct adapter_info *adap_info = dev_get_drvdata(dev); > > > > > > > > > > - if (pci_enable_device(pdev) < 0) { > > > > > - pch_pci_err(pdev, "pch_i2c_resume:pci_enable_device FAILED\n"); > > > > > - return -EIO; > > > > > - } > > > > > - > > > > > - pci_enable_wake(pdev, PCI_D3hot, 0); > > > > > + device_wakeup_disable(dev); > > > > > > > > It *looks* wrong to disable wakeup in both suspend and resume. I > > > > think the usual pattern is to enable wakeup in suspend and disable it > > > > in resume. > > > > > > > > But it looks like it's been that way since the driver was added by > > > > e9bc8fa5df1c ("i2c-eg20t: add driver for Intel EG20T"). > > > > > > > > If the device doesn't support wakeup, I would not expect the driver to > > > > mention wakeup at all. > > > > > > > > In any case, I think it's the right thing for *this* patch to preserve > > > > the previous wakeup behavior. Maybe we want a follow-up patch to just > > > > remove both device_wakeup_disable() calls? > > > > > > We have seen this issue earlier in other drivers too. I remember you even > > identified and listed them. > > The PCI core calls, pci_enable_wake(pci_dev, PCI_D0, false). And if the driver > > does not want to enable-wake on suspend, we discussed and concluded that the > > calls should be dropped. > > I am sending v2, to include dropping wakeup call. > > Personally, I think I would do this in two patches, and in the reverse > order than what I first suggested: > > 1) Drop pci_enable_wake() calls > 2) Convert to generic PM > > Doing them in that order means patch 2 will be slightly simpler, and > if there's any issue with removing the wakeup stuff, we can debug it > in the context of the original PCI PM code we've been using for years > without muddying the water with the additional generic PM changes. > Yeah, this seems more reasonable. Thanks Vaibhav Gupta > > > > > for (i = 0; i < adap_info->ch_num; i++) > > > > > pch_i2c_init(&adap_info->pch_data[i]); > > > > > @@ -908,18 +890,15 @@ static int pch_i2c_resume(struct pci_dev *pdev) > > > > > > > > > > return 0; > > > > > } > > > > > -#else > > > > > -#define pch_i2c_suspend NULL > > > > > -#define pch_i2c_resume NULL > > > > > -#endif > > > > > + > > > > > +static SIMPLE_DEV_PM_OPS(pch_i2c_pm_ops, pch_i2c_suspend, pch_i2c_resume); > > > > > > > > > > static struct pci_driver pch_pcidriver = { > > > > > .name = KBUILD_MODNAME, > > > > > .id_table = pch_pcidev_id, > > > > > .probe = pch_i2c_probe, > > > > > .remove = pch_i2c_remove, > > > > > - .suspend = pch_i2c_suspend, > > > > > - .resume = pch_i2c_resume > > > > > + .driver.pm = &pch_i2c_pm_ops, > > > > > }; > > > > > > > > > > module_pci_driver(pch_pcidriver); > > > > > -- > > > > > 2.27.0 > > > > > _______________________________________________ Linux-kernel-mentees mailing list Linux-kernel-mentees@lists.linuxfoundation.org https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees