Message ID | 20231110182304.3894319-3-andriy.shevchenko@linux.intel.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b129:0:b0:403:3b70:6f57 with SMTP id q9csp1324184vqs; Fri, 10 Nov 2023 11:07:49 -0800 (PST) X-Google-Smtp-Source: AGHT+IEvccRHDgQI0INnKrkg1aSa1rAmfeDXhLD5dz5WaK0u6sx6Wmrho3TIJRSlLoux3jmisJym X-Received: by 2002:a05:6a00:2911:b0:6c4:d13e:333b with SMTP id cg17-20020a056a00291100b006c4d13e333bmr3733476pfb.23.1699643269118; Fri, 10 Nov 2023 11:07:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699643269; cv=none; d=google.com; s=arc-20160816; b=ivsOahy+xqGHA5XyBmZ+0DTCto1QmnFihlm10ltwdsYh5/dK3EcDSg4E9kO6nuSouV JKVKhkqrjTeGHpM7zGPPu8WNqFdSHOccdKp+kl4mvxEH4auewtNc5gb0ypRD3KCXWg2w 3yNeIEqOdEzqRWlbhNoqdlPeYNcbNbjA2ONh+uzkZQnKWF34LJz1kJONyZtOw9WIb2kG ZbCdEL+aBub91wXEkiNk008wgMKsSHzvh1si9lVaqHgCefjj//SxfMK4hDxhqGM2K4NN PmzpnmdK8QhdFqpD7Pb5Xi4YQ8INR8Ng7c3wOnARtywx5x48imYYUThjISk4E648MkF2 UfcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=oFejuWDWpfj4X0YpmGTI/g3SPWMAQ+Nd6+XHAtQ/hAI=; fh=oqZDtrV02dtzkTHSBiwo+TWR13WhTCI6t34Q5J0VV5o=; b=cynNJiyh6OQ8dKC5WOhySnWuxZQSPbglq4tTbwf+7pQHn3UfYfbtP0wD1GatUTmG28 75OiXDRF15vQn6QXYPBHHvS1Gzmgd7kSVI5/QqnrgWKVqQq0eEmIBjAnAcwjzhxOiVAf rQ0T0PJejujlVFmQM28kx2uP0tWpSehEzYy1Ubna5os+QyDyY9XfZ80ODuBCEbfajIyO 4zVCpuxiEKhuaJsqTFyZJvggRQVsT4RMvMvWmxjBuUcZMtQOeJUPLksj/8w2p3gnnWz2 LfmlrAmd0gQQ8inNUcu94b/rtOdEXCPewj/Sf3A9ncJ5NYmMhvfp5eeN59nLFGYuk5Pj 02MA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=IaVcnqaD; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from lipwig.vger.email (lipwig.vger.email. [23.128.96.33]) by mx.google.com with ESMTPS id f19-20020a056a00239300b006c3077a340dsi57581pfc.285.2023.11.10.11.07.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Nov 2023 11:07:49 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=IaVcnqaD; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id EA6A182A21DA; Fri, 10 Nov 2023 11:07:44 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229920AbjKJTH2 (ORCPT <rfc822;heyuhang3455@gmail.com> + 29 others); Fri, 10 Nov 2023 14:07:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35444 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229524AbjKJTHL (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Fri, 10 Nov 2023 14:07:11 -0500 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.100]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4DA4A69B50; Fri, 10 Nov 2023 10:31:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1699641092; x=1731177092; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ZW/QTtMTJOHD7YAVCGqQfN6rvkOgtMt7/eliDRM3ikM=; b=IaVcnqaDyvMWpJMZsSyV/bKNaq5pOv7gMvDAC0VjrZzStHwLWnab/BXq urx+PvGzo2PCIHS6YDjyZ35GMAyPzI99V9oqNxeslnpl+Xat0EN9RaDvx dBAU7MPZ+YlqwuCv1md3OGnQ4Tp7g2ynkcRV5zZAo0DX2wSy2dOQaZCeM KgJZF4nLLfR7SltDaJ5U6SFqmA8H06BOyZDa21wZAvkBJNTNztEtFsWcf 1IYs102G8dTSuSqViOUH+xRsFcTzNt2sBcbUw/cwOWvpnR+MewvTDj8Ix ++EFw1uIjUjPFXpzqq9k1bxi2GmeXr7NjznIJ3uDqOYgGuQBVX1uY+uYy g==; X-IronPort-AV: E=McAfee;i="6600,9927,10890"; a="456715060" X-IronPort-AV: E=Sophos;i="6.03,291,1694761200"; d="scan'208";a="456715060" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Nov 2023 10:29:43 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10890"; a="763808265" X-IronPort-AV: E=Sophos;i="6.03,291,1694761200"; d="scan'208";a="763808265" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga002.jf.intel.com with ESMTP; 10 Nov 2023 10:29:40 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id 63DEE76D; Fri, 10 Nov 2023 20:23:07 +0200 (EET) From: Andy Shevchenko <andriy.shevchenko@linux.intel.com> To: Jarkko Nikula <jarkko.nikula@linux.intel.com>, Mario Limonciello <mario.limonciello@amd.com>, Herbert Xu <herbert@gondor.apana.org.au>, Andy Shevchenko <andriy.shevchenko@linux.intel.com>, Wolfram Sang <wsa@kernel.org>, linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Mika Westerberg <mika.westerberg@linux.intel.com>, Jan Dabros <jsd@semihalf.com>, Andi Shyti <andi.shyti@kernel.org>, Philipp Zabel <p.zabel@pengutronix.de>, Hans de Goede <hdegoede@redhat.com> Subject: [PATCH v3 02/25] i2c: designware: Fix PM calls order in dw_i2c_plat_probe() Date: Fri, 10 Nov 2023 20:11:22 +0200 Message-ID: <20231110182304.3894319-3-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.43.0.rc1.1.gbec44491f096 In-Reply-To: <20231110182304.3894319-1-andriy.shevchenko@linux.intel.com> References: <20231110182304.3894319-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Fri, 10 Nov 2023 11:07:45 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782205140411453847 X-GMAIL-MSGID: 1782205140411453847 |
Series |
i2c: designware: code consolidation & cleanups
|
|
Commit Message
Andy Shevchenko
Nov. 10, 2023, 6:11 p.m. UTC
We should not mix managed calls with non-managed. This will break
the calls order at the error path and ->remove() stages. Fix this
by wrapping PM ops to become managed one.
Fixes: 36d48fb5766a ("i2c: designware-platdrv: enable RuntimePM before registering to the core")
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/i2c/busses/i2c-designware-platdrv.c | 28 ++++++++++++---------
1 file changed, 16 insertions(+), 12 deletions(-)
Comments
On 11/10/23 20:11, Andy Shevchenko wrote: > We should not mix managed calls with non-managed. This will break > the calls order at the error path and ->remove() stages. Fix this > by wrapping PM ops to become managed one. > > Fixes: 36d48fb5766a ("i2c: designware-platdrv: enable RuntimePM before registering to the core") > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> I fail to see what was broken in above commit and how this patch fixes it? > --- > drivers/i2c/busses/i2c-designware-platdrv.c | 28 ++++++++++++--------- > 1 file changed, 16 insertions(+), 12 deletions(-) > > diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/busses/i2c-designware-platdrv.c > index 855b698e99c0..8b0099e1bc26 100644 > --- a/drivers/i2c/busses/i2c-designware-platdrv.c > +++ b/drivers/i2c/busses/i2c-designware-platdrv.c > @@ -177,14 +177,26 @@ static int txgbe_i2c_request_regs(struct dw_i2c_dev *dev) > return 0; > } > > -static void dw_i2c_plat_pm_cleanup(struct dw_i2c_dev *dev) > +static void dw_i2c_plat_pm_cleanup(void *data) > { > + struct dw_i2c_dev *dev = data; > + > pm_runtime_disable(dev->dev); > > if (dev->shared_with_punit) > pm_runtime_put_noidle(dev->dev); > } > > +static int dw_i2c_plat_pm_setup(struct dw_i2c_dev *dev) > +{ > + if (dev->shared_with_punit) > + pm_runtime_get_noresume(dev->dev); > + > + pm_runtime_enable(dev->dev); > + > + return devm_add_action_or_reset(dev->dev, dw_i2c_plat_pm_cleanup, dev); > +} > + > static int dw_i2c_plat_request_regs(struct dw_i2c_dev *dev) > { > struct platform_device *pdev = to_platform_device(dev->dev); > @@ -381,19 +393,12 @@ static int dw_i2c_plat_probe(struct platform_device *pdev) > pm_runtime_use_autosuspend(&pdev->dev); > pm_runtime_set_active(&pdev->dev); > > - if (dev->shared_with_punit) > - pm_runtime_get_noresume(&pdev->dev); > - > - pm_runtime_enable(&pdev->dev); > - > - ret = i2c_dw_probe(dev); > + ret = dw_i2c_plat_pm_setup(dev); > if (ret) > - goto exit_probe; > + goto exit_reset; > > - return ret; > + return i2c_dw_probe(dev); > > -exit_probe: > - dw_i2c_plat_pm_cleanup(dev); > exit_reset: > reset_control_assert(dev->rst); > return ret; Is it intended change the reset isn't asserted after this patch in case i2c_dw_probe() fails?
On Wed, Nov 15, 2023 at 01:14:36PM +0200, Jarkko Nikula wrote: > On 11/10/23 20:11, Andy Shevchenko wrote: > > We should not mix managed calls with non-managed. This will break > > the calls order at the error path and ->remove() stages. Fix this > > by wrapping PM ops to become managed one. > > > > Fixes: 36d48fb5766a ("i2c: designware-platdrv: enable RuntimePM before registering to the core") > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > > I fail to see what was broken in above commit and how this patch fixes it? The order of the unwiding probed flow is broken now as devm_*() mixed with non-devm_*() calls. This makes all non-devm_*() calls that interleave devm_*() ones to be also devm_*()-wrapped. ... > Is it intended change the reset isn't asserted after this patch in case > i2c_dw_probe() fails? Did you miss that this is become managed with this patch and hence the above is false scenario?
On Wed, Nov 15, 2023 at 03:48:20PM +0200, Andy Shevchenko wrote: > On Wed, Nov 15, 2023 at 01:14:36PM +0200, Jarkko Nikula wrote: > > On 11/10/23 20:11, Andy Shevchenko wrote: ... > > Is it intended change the reset isn't asserted after this patch in case > > i2c_dw_probe() fails? > > Did you miss that this is become managed with this patch and hence the above > is false scenario? Ah, I see now what you mean. Sorry, I though about next patch in mind. Indeed, I need to amend this one.
diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/busses/i2c-designware-platdrv.c index 855b698e99c0..8b0099e1bc26 100644 --- a/drivers/i2c/busses/i2c-designware-platdrv.c +++ b/drivers/i2c/busses/i2c-designware-platdrv.c @@ -177,14 +177,26 @@ static int txgbe_i2c_request_regs(struct dw_i2c_dev *dev) return 0; } -static void dw_i2c_plat_pm_cleanup(struct dw_i2c_dev *dev) +static void dw_i2c_plat_pm_cleanup(void *data) { + struct dw_i2c_dev *dev = data; + pm_runtime_disable(dev->dev); if (dev->shared_with_punit) pm_runtime_put_noidle(dev->dev); } +static int dw_i2c_plat_pm_setup(struct dw_i2c_dev *dev) +{ + if (dev->shared_with_punit) + pm_runtime_get_noresume(dev->dev); + + pm_runtime_enable(dev->dev); + + return devm_add_action_or_reset(dev->dev, dw_i2c_plat_pm_cleanup, dev); +} + static int dw_i2c_plat_request_regs(struct dw_i2c_dev *dev) { struct platform_device *pdev = to_platform_device(dev->dev); @@ -381,19 +393,12 @@ static int dw_i2c_plat_probe(struct platform_device *pdev) pm_runtime_use_autosuspend(&pdev->dev); pm_runtime_set_active(&pdev->dev); - if (dev->shared_with_punit) - pm_runtime_get_noresume(&pdev->dev); - - pm_runtime_enable(&pdev->dev); - - ret = i2c_dw_probe(dev); + ret = dw_i2c_plat_pm_setup(dev); if (ret) - goto exit_probe; + goto exit_reset; - return ret; + return i2c_dw_probe(dev); -exit_probe: - dw_i2c_plat_pm_cleanup(dev); exit_reset: reset_control_assert(dev->rst); return ret; @@ -411,7 +416,6 @@ static void dw_i2c_plat_remove(struct platform_device *pdev) pm_runtime_dont_use_autosuspend(&pdev->dev); pm_runtime_put_sync(&pdev->dev); - dw_i2c_plat_pm_cleanup(dev); i2c_dw_remove_lock_support(dev);