From patchwork Mon Nov 20 14:41:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 167189 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9910:0:b0:403:3b70:6f57 with SMTP id i16csp2251884vqn; Mon, 20 Nov 2023 06:47:57 -0800 (PST) X-Google-Smtp-Source: AGHT+IHIs93o/iHGZrNmoYZqFutSGM3vMKiiKAC+UNm4oqI5qx8mOyTIbwLOiLMXn4t7S/QcDQaf X-Received: by 2002:a05:6a00:399c:b0:6b2:2a2d:7a26 with SMTP id fi28-20020a056a00399c00b006b22a2d7a26mr6440002pfb.28.1700491677106; Mon, 20 Nov 2023 06:47:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700491677; cv=none; d=google.com; s=arc-20160816; b=t1t87n99NfJNLNI/uCvIPJmxAu7/tJjrvmkEAtc5QzwNKuOiqAiDMF8bKPYUn7h/EY w0r/BkUKRRa3fq/gj03I+JRuBvuxOO3DMf0RNgZ8wJQ1XAHYYu5jaC071RHJUWS20Scm YDi77GbiNZVXPy7U7v+iTNQtpwoENbeIFMWI0iyi++NGrOKFT1bG2oQEZCmpQlEaN3Js yVSOgXOURqtvoeIWMyjOztq5WDTLiT96fw00ThO6qdpsovOmCQt4p3Opn8aitVIWFqKE wo0fF7ThgVIAjuOB2KOBmU+Pm5eXIiJ4T7Mvml13h6NMg/vE0FwzAQj4L4X7Mkz7LMwJ ZV7Q== 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=KUYv9LH471R5ZUsitfMVPmxWkzzc5+bmQz42G3Cn0SE=; fh=g3amdiifXhwL/mTWljo4oOX/iLvH3RCBC8SWsJqOWek=; b=VOpOld3o33+wTXXSVN+q4vpuCi4JjoYYM1/UnawETrn4x0X6OtKCkwiy3kKHKdSFqv QnCgdvsqlHGVJAqHaz/Dy0s91/fSRKjP06/jn58dI7TRBkCbYU6jikIkoNib69RK2n8p 9ut7fNhBjTIe5OwvkTPMFaEYkqfNaDjQ6FEQ9oKMitPIFKaQEpNH8zniU0Bjnhx3Mhp/ f8W0lCvKndY9x/cBsapDAJOstAHCK/NKA0SAJn9bU/j9owHMUxTbgnIhgOBXTSQi+Kg+ WOTgzcbs6OTp46PXQTOukp3ldKQrMosYWuRsCgcTATDiduyG/f1oXzSId9Kpx++ds/8b mimQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=e4ZMUp0S; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 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 fry.vger.email (fry.vger.email. [2620:137:e000::3:8]) by mx.google.com with ESMTPS id fc23-20020a056a002e1700b006c1222c5eaasi8582267pfb.175.2023.11.20.06.47.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Nov 2023 06:47:57 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=e4ZMUp0S; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 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 fry.vger.email (Postfix) with ESMTP id 5CE5180A9ABE; Mon, 20 Nov 2023 06:47:41 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233765AbjKTOq6 (ORCPT + 27 others); Mon, 20 Nov 2023 09:46:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47002 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229906AbjKTOqx (ORCPT ); Mon, 20 Nov 2023 09:46:53 -0500 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.31]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 04FEDED; Mon, 20 Nov 2023 06:46:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1700491610; x=1732027610; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Q74ZR11NZl+PRDfKRQssfNbi5b3tAivgbT0UCKwiVes=; b=e4ZMUp0SWsh6cXIuvQxGNtcR+5dGR24P4geXs1z7GkFcWxbMZsrGPBhT tEb1PDcN7w8SByl1FL3jXLmhmpKLXXQlG6baGHU+sIbteujqsesVZJ4JC orai+iUwI7MotMGAGI+NdIA3UtDyVrzHzRPP8mRY5lqOePgOPVsvsS6v/ cnQgy59ySrCr3bMs9Y2SvPwUKCe2bfG/QN81SffG7Bzyu5hIHXI+wIy+G Lk5UPcqBpCYap0JY/LxJaCA4/nqNCAz0nnr5pwOGgxwGGh7OSNVcztsmo VBFsjlIm1EfoGaHdqLnnVDovHfpP/hsyoZYWb9miQmWZr1IAI4YArvr0Z g==; X-IronPort-AV: E=McAfee;i="6600,9927,10900"; a="455956424" X-IronPort-AV: E=Sophos;i="6.04,214,1695711600"; d="scan'208";a="455956424" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Nov 2023 06:46:48 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10900"; a="801193124" X-IronPort-AV: E=Sophos;i="6.04,214,1695711600"; d="scan'208";a="801193124" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga001.jf.intel.com with ESMTP; 20 Nov 2023 06:46:45 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id 2E61568; Mon, 20 Nov 2023 16:46:44 +0200 (EET) From: Andy Shevchenko To: Mario Limonciello , Jarkko Nikula , Herbert Xu , Andy Shevchenko , Wolfram Sang , linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Mika Westerberg , Jan Dabros , Andi Shyti , Philipp Zabel Subject: [PATCH v4 01/24] i2c: designware: Fix PM calls order in dw_i2c_plat_probe() Date: Mon, 20 Nov 2023 16:41:43 +0200 Message-ID: <20231120144641.1660574-2-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.43.0.rc1.1.gbec44491f096 In-Reply-To: <20231120144641.1660574-1-andriy.shevchenko@linux.intel.com> References: <20231120144641.1660574-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 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 fry.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Mon, 20 Nov 2023 06:47:41 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783094760793770137 X-GMAIL-MSGID: 1783094760793770137 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. Signed-off-by: Andy Shevchenko Reviewed-by: Andi Shyti --- drivers/i2c/busses/i2c-designware-platdrv.c | 26 ++++++++++++++------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/busses/i2c-designware-platdrv.c index 855b698e99c0..fd3cd65f9c88 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,16 @@ 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 = dw_i2c_plat_pm_setup(dev); + if (ret) + goto exit_reset; ret = i2c_dw_probe(dev); if (ret) - goto exit_probe; + goto exit_reset; return ret; -exit_probe: - dw_i2c_plat_pm_cleanup(dev); exit_reset: reset_control_assert(dev->rst); return ret; @@ -411,7 +420,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);