From patchwork Thu Dec 7 14:13:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 175143 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp4811176vqy; Thu, 7 Dec 2023 06:17:19 -0800 (PST) X-Google-Smtp-Source: AGHT+IF5nd6Fp4G6M31YW90z1NhsL9APyol5DJaR8aMjH3fRS/EeT1gs9eXeFQZF2gxBssUb0XqB X-Received: by 2002:a17:902:da91:b0:1d0:6ffe:1e64 with SMTP id j17-20020a170902da9100b001d06ffe1e64mr2427380plx.71.1701958639347; Thu, 07 Dec 2023 06:17:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701958639; cv=none; d=google.com; s=arc-20160816; b=gBFXY4l07B3GrWk0OX7bGLe5g42FeXVQEe7uyoiIH4IMsM/y8stLAW54VaOFySOkXp EP2YLpp1ChLfEZ7kK73FgeAhNMSYhwx4HrGNUYRpMCuNMiojNgaGIcDQH9bZzcsZ5C4U WBa2PJwciyC6v8I/Z5eA33QUJp8FwXAgT2HuWtwVh5cb+dHX9CKnfUUG4mGKshfMSsuz /On1NoHkLPT25D9T9pNXE3hFKHTZa1+zPL66F0ughcQsRpZIlPP3kfVqAcmOGkvZdSui vso+h4MxZ5eKntTkIKvdtg86M6H/yfdz1i2TZU0Ysy29oaTekSwRgDC8KsMXgtFzDPUd ELPw== 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=X8S5zVctma3SdjSf1Dhs+ct1zp0MZBjnKzOFEN3WVww=; fh=2EyuYZuFv7pvbWODgXyYvSVo1Jt/nOD9U4n59BuOM5Q=; b=PmJdq4Zbmgd+CNceNjAQ4el0JeMmAuawP/v2LRe4YWwFAs5XYG5v2cA+/n1N2cJssf wrQCURThJ/AHqLl7462xVdX3YqBZEN9N/VIg9X/MqDwUi+pLzeV6c8wjhGkXSaaFK2A9 bXP4/GwDoI9Z8jACLbN3Lu4Y/ag/yLQlE18ITCzDTsyfRMV00OPqWqZputUB+TUWP2Wa twwgH8TI+zm4EkaCNHuQrd1of9dUl5VJYoVMyPKkWT+2ed/S0UBQa5aUnaud3H3ZTyKU HK20eRI/2WsOIW2IS2zgzF9iswQ9pyjHIl6NBKqSaaoYrfkVpFVli/Y6e0cu+Z3rLafU 7SHQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=HBxnT5oJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 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 morse.vger.email (morse.vger.email. [2620:137:e000::3:1]) by mx.google.com with ESMTPS id iz17-20020a170902ef9100b001cf50ffd38dsi1153758plb.164.2023.12.07.06.17.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Dec 2023 06:17:19 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) client-ip=2620:137:e000::3:1; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=HBxnT5oJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 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 morse.vger.email (Postfix) with ESMTP id AFBE7803B350; Thu, 7 Dec 2023 06:17:14 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1443149AbjLGORD (ORCPT + 99 others); Thu, 7 Dec 2023 09:17:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41932 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1443061AbjLGORC (ORCPT ); Thu, 7 Dec 2023 09:17:02 -0500 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.100]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3532D10DA; Thu, 7 Dec 2023 06:17:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1701958628; x=1733494628; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Pz+b7NxYFQNKKQhTbcI/vJ6DmuTfQ7/BGG0xBHn4/mQ=; b=HBxnT5oJ7gcTEI9jNbKDho3Lk3LVsfcgJiw6u2qMLwT0surt04wkAT4h m1cFp5ieATsTnR7EMGpqNtVBacwr4yokuJchv8FTP5hn6OnNOctycr/sX lG9aER5ax9J8c4yS0U1efp50g05b+WmW/BsbmeuQ/pKntc7eZllXdOuUL Djp4Wu5wKRcrS8YYwMBYzGg3vskpJ2qMrxstAVxxkYkcY5lD321C6QHCH 9AK0RAH6aw/+oNKS8EyByqbmBK5+vQpUnON+Htyo1xPGOR72KOvARhM+o H/7t1+6Ir6BByigEIUwWh2geEFja/+/wM+s5rRbk1w0vlQCJrZp/F5kZS w==; X-IronPort-AV: E=McAfee;i="6600,9927,10917"; a="460726050" X-IronPort-AV: E=Sophos;i="6.04,256,1695711600"; d="scan'208";a="460726050" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Dec 2023 06:17:06 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10917"; a="889756045" X-IronPort-AV: E=Sophos;i="6.04,256,1695711600"; d="scan'208";a="889756045" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga002.fm.intel.com with ESMTP; 07 Dec 2023 06:17:03 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id AA07565E; Thu, 7 Dec 2023 16:17:02 +0200 (EET) From: Andy Shevchenko To: Mario Limonciello , Jarkko Nikula , Herbert Xu , Andy Shevchenko , Wolfram Sang , Andi Shyti , linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Mika Westerberg , Jan Dabros , Philipp Zabel , Serge Semin Subject: [PATCH v5 04/24] i2c: designware: Fix lock probe call order in dw_i2c_plat_probe() Date: Thu, 7 Dec 2023 16:13:44 +0200 Message-ID: <20231207141653.2785124-5-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.43.0.rc1.1.gbec44491f096 In-Reply-To: <20231207141653.2785124-1-andriy.shevchenko@linux.intel.com> References: <20231207141653.2785124-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 morse.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 (morse.vger.email [0.0.0.0]); Thu, 07 Dec 2023 06:17:14 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784632982468946241 X-GMAIL-MSGID: 1784632982468946241 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 lock probe to become managed one. Fixes: 78d5e9e299e3 ("i2c: designware: Add AMD PSP I2C bus support") Reviewed-by: Andi Shyti Tested-by: Serge Semin Acked-by: Jarkko Nikula Link: https://lore.kernel.org/r/20231120144641.1660574-5-andriy.shevchenko@linux.intel.com Signed-off-by: Andy Shevchenko --- drivers/i2c/busses/i2c-designware-platdrv.c | 24 ++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/busses/i2c-designware-platdrv.c index 648fb84e574d..63cc3cdca2c7 100644 --- a/drivers/i2c/busses/i2c-designware-platdrv.c +++ b/drivers/i2c/busses/i2c-designware-platdrv.c @@ -243,6 +243,17 @@ static const struct i2c_dw_semaphore_callbacks i2c_dw_semaphore_cb_table[] = { {} }; +static void i2c_dw_remove_lock_support(void *data) +{ + struct dw_i2c_dev *dev = data; + + if (dev->semaphore_idx < 0) + return; + + if (i2c_dw_semaphore_cb_table[dev->semaphore_idx].remove) + i2c_dw_semaphore_cb_table[dev->semaphore_idx].remove(dev); +} + static int i2c_dw_probe_lock_support(struct dw_i2c_dev *dev) { const struct i2c_dw_semaphore_callbacks *ptr; @@ -273,16 +284,7 @@ static int i2c_dw_probe_lock_support(struct dw_i2c_dev *dev) break; } - return 0; -} - -static void i2c_dw_remove_lock_support(struct dw_i2c_dev *dev) -{ - if (dev->semaphore_idx < 0) - return; - - if (i2c_dw_semaphore_cb_table[dev->semaphore_idx].remove) - i2c_dw_semaphore_cb_table[dev->semaphore_idx].remove(dev); + return devm_add_action_or_reset(dev->dev, i2c_dw_remove_lock_support, dev); } static void dw_i2c_plat_assert_reset(void *data) @@ -428,8 +430,6 @@ static void dw_i2c_plat_remove(struct platform_device *pdev) pm_runtime_dont_use_autosuspend(&pdev->dev); pm_runtime_put_sync(&pdev->dev); - - i2c_dw_remove_lock_support(dev); } static int dw_i2c_plat_prepare(struct device *dev)