From patchwork Fri Nov 10 18:11:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 163928 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b129:0:b0:403:3b70:6f57 with SMTP id q9csp1324200vqs; Fri, 10 Nov 2023 11:07:52 -0800 (PST) X-Google-Smtp-Source: AGHT+IHDyzLr63Te/Ncg+8CN83X1PTuyn+awWFSKrpYdhJ9fqgjwgaWjZjBSI7PG1m3qcW0bsxIw X-Received: by 2002:a05:6870:4d0d:b0:1e9:934d:514c with SMTP id pn13-20020a0568704d0d00b001e9934d514cmr67878oab.50.1699643272020; Fri, 10 Nov 2023 11:07:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699643272; cv=none; d=google.com; s=arc-20160816; b=Sra8sILiF8raGxJsVuQkyC1ntArH3jTyy3EtpotZHi8fMMN/fV9XeBeDf2eU05bEAF 46gl9R8McY6qtZnSLNxwlruZdCB3RFqpVRrN+DaLRYJCsPX3uwBoVUsOJ7W7DmhZqQTX WaC1ki96pR/ezJ+9GsUndvGfJ9CbLYUIhCEbLg/b3SFqijsJqIdNrctKhfcAOArVKrbD meHqoYqB7E3tGuqL/JTfH9kdiA/V2Nh91eMJOQOSxW8QXr6TrU6844znEB03y6l+Y20g XT/N5wm5MApYP0b1KF0HGCRKcHszhywawQbyoI+mVEZengmGoTuT7Nl7kXCzBLsL7XEE 2D2g== 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=XU/ZVb8f4wveZF8hFd/B+RQxCnxK+2DYyXaTZ4alqRY=; fh=oqZDtrV02dtzkTHSBiwo+TWR13WhTCI6t34Q5J0VV5o=; b=zoNltR36Qgl2c8jCqvDt1SWiOk9RNizl6jcBq4tXrB0agiQAXC2w1LbPQ6SzfQQw3d cWF51qMyErbixn4ZxWiFwYUQXD9J2EPAWIVraDMs4Gp1W3jLwk/bGnX7tpth/G8tC8vc nDjrVDe0E2Mj/T95pTRZ4lai62HU9zWCgjd4EVkvbo3QNlJYbpZrIYEh1lcevHBUZ6Km X47dzdlMN2uA+MnajttRZYtT5e01Nu0eBluXJ0vb05iS9mfq728cnSgS9716ulD8sk5C wrmSe5yGRhUa5y46+s3sZUIwlCaDnE8jH+1TklvUsAqPYbDRq/lyRju0MvzxjxKgnp9P CLnQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=RsK4Aog9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id h19-20020a056870171300b001e1e36afb87si72651oae.112.2023.11.10.11.07.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Nov 2023 11:07:52 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=RsK4Aog9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (Postfix) with ESMTP id 7AFD880291C6; Fri, 10 Nov 2023 11:07:13 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345123AbjKJTHF (ORCPT + 29 others); Fri, 10 Nov 2023 14:07:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49360 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345168AbjKJTGq (ORCPT ); Fri, 10 Nov 2023 14:06:46 -0500 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.100]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 28EEC1288FE; Fri, 10 Nov 2023 10:31:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1699641063; x=1731177063; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=So8kYJoKij+VCNKaGUL34AujAf1NZ1x9lxbojhvLPXI=; b=RsK4Aog9zMwUU+woRGZ+AdPBuQl6F3QgfwgzLEryLxv6Fz4ZMpasgxJc fAZY6IN0iiw5mTQU2cmKur7zx8BxDhXP8p5F4+DlbwHIjwieNMy6cukhN F9C3qv7pPViKyHURwcU/nVqyuAgfq9zkPX/qMVdP9amgXef3HfC2uFhQd kIJ7L4FvMgTnF6rl518aZb4fqxHw6G1GaEG21bBGTkxAVwKnyFqq6Uor9 X753nvHDj2HUvCvO0wGWPLeR9VFuBDemBiEqRGQB4dlm2HUcdv+jSJv7W pZBtAWE+QVgTyUP0HzeoiGeEk8KVBIRHV48xYBKpfl4dpDQgHfC/cnVFi A==; X-IronPort-AV: E=McAfee;i="6600,9927,10890"; a="456715051" X-IronPort-AV: E=Sophos;i="6.03,291,1694761200"; d="scan'208";a="456715051" 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:39 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10890"; a="763808231" X-IronPort-AV: E=Sophos;i="6.03,291,1694761200"; d="scan'208";a="763808231" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga002.jf.intel.com with ESMTP; 10 Nov 2023 10:29:36 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id 9068C7E7; Fri, 10 Nov 2023 20:23:07 +0200 (EET) From: Andy Shevchenko To: Jarkko Nikula , Mario Limonciello , 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 , Hans de Goede Subject: [PATCH v3 05/25] i2c: designware: Fix lock probe call order in dw_i2c_plat_probe() Date: Fri, 10 Nov 2023 20:11:25 +0200 Message-ID: <20231110182304.3894319-6-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 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net 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 (snail.vger.email [0.0.0.0]); Fri, 10 Nov 2023 11:07:13 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782205143726253662 X-GMAIL-MSGID: 1782205143726253662 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") 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)