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 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7B093CD98DA for ; Fri, 12 Jun 2026 08:01:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Lvc67ivqzYsfGJfUI0cq507Su8kYip0CuV2o8EsqOy8=; b=tpE75/2GoLYgzg mKS45khg3ZzrEx8yYRG7BMu8kfmtRC8aIFPLF/+RWc/RB6jfIj7E5H/AOHkR0UJcGwTqLwRNpN7AB UgI6QqoWoCL3kA5AqF3YAFI48p1T3uLnAsiqK0VjIEp9KZNWxqMp/e4d8zmQYD2IyhC+hRNAnQPGg n2HLE5UjcuPZd2/6qsxpiKS1djdlCGPqYtUg0QCOmPR8fAhLkzzt86kTZzcQNbvaJ0GtBnC4AwraF lQcgMHljeoVwFX+cL+H7LBwnp0Tv8AqELJMhxasPKWN5pqZcWfff1tFWbyLSfqMHeayi2EeefNMi9 X/BSrMVek2LqXyu77AJA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wXwpc-0000000AXCA-1427; Fri, 12 Jun 2026 08:01:36 +0000 Received: from mgamail.intel.com ([192.198.163.15]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1wXwpZ-0000000AX9a-3HFh for linux-i3c@lists.infradead.org; Fri, 12 Jun 2026 08:01:35 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1781251294; x=1812787294; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=G2VBF5I/3bIyjAMmUNuVtyX/GsrjWjgY6P1OhlTSmq4=; b=CKPWC0PLDgi28eHjGMI7FrFnqBn1XsG1x5VQ9PoQw8W6OqOxHVr+eKrJ nG0mpgliAqf4BLqnXawPqyBQ6IL6RnoBWaEP0KUiSALTcYwtMyEOWxyRl Xv/KCbPzIAsTLqHNrtx4HbR22Lh7Io7jCabIICwAFslbVHbtDO+d24rCg sjB4oWgXom5//vD7JloDrNR/huP5l3i9w4hd17zhZg5WwTw9FWR68fLYU rmtp99vgJSHErRoRcV+oSXFAXdjSByeRhL6XEEK6cSgQqNYPUPmP3MS59 xFXu8IF7ZDkt10lFpVeVbH7QGJj4/95WL0LhFS7xHnpOd1xCb1qMIked8 w==; X-CSE-ConnectionGUID: Tmw2bz7ZSQ+XBPRqvbKADw== X-CSE-MsgGUID: AY10s9JuQsO1jEHrE/iQBg== X-IronPort-AV: E=McAfee;i="6800,10657,11813"; a="82186744" X-IronPort-AV: E=Sophos;i="6.24,200,1774335600"; d="scan'208";a="82186744" Received: from orviesa008.jf.intel.com ([10.64.159.148]) by fmvoesa109.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jun 2026 01:01:24 -0700 X-CSE-ConnectionGUID: S1XQ1QMXRdKtTu+WkU70Jg== X-CSE-MsgGUID: 72FjTA67QIS9rO+DBe+HDg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.24,200,1774335600"; d="scan'208";a="246630355" Received: from vpanait-mobl.ger.corp.intel.com (HELO ahunter6-desk) ([10.245.245.41]) by orviesa008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jun 2026 01:01:22 -0700 From: Adrian Hunter To: alexandre.belloni@bootlin.com Cc: Frank.Li@nxp.com, linux-i3c@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH V4 3/7] i3c: master: Prevent reuse of dynamic address on device add failure Date: Fri, 12 Jun 2026 11:01:03 +0300 Message-ID: <20260612080107.11606-4-adrian.hunter@intel.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260612080107.11606-1-adrian.hunter@intel.com> References: <20260612080107.11606-1-adrian.hunter@intel.com> MIME-Version: 1.0 Organization: Intel Finland Oy, Registered Address: c/o Alberga Business Park, 6 krs, Bertel Jungin Aukio 5, 02600 Espoo, Business Identity Code: 0357606 - 4, Domiciled in Helsinki X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260612_010133_858470_79A7AB01 X-CRM114-Status: GOOD ( 14.97 ) X-BeenThere: linux-i3c@lists.infradead.org X-Mailman-Version: 2.1.34 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 Sender: "linux-i3c" Errors-To: linux-i3c-bounces+linux-i3c=archiver.kernel.org@lists.infradead.org i3c_master_add_i3c_dev_locked() is called after a device has already been assigned a dynamic address. If the function fails, the address remains marked as free and may be reallocated to another device, leading to address conflicts on the bus. Ensure the address is not marked as free on failure, by updating the address slot state to prevent the address from being re-used. Emit an error message to inform of the failure. Opportunistically remove the !master check because it is impossible. Note, directly resetting the device's dynamic address is no longer an option, since Direct RSTDAA was deprecated from I3C starting from version 1.1 and v1.1 (or later) target devices are meant to NACK it. Fixes: 3a379bbcea0af ("i3c: Add core I3C infrastructure") Signed-off-by: Adrian Hunter Reviewed-by: Frank Li --- Changes in V4: Add Frank's Rev'd-by Changes in V3: Add note to commit message about Direct RSTDAA deprecation Changes in V2: Fix 'if (IS_ERR(newdev)' error path. Be defensive and do not change the addr_slot_status if it is not free, and update commit message accordingly. Amend commit message to note removal of unnecesary 'if (!master)' check. Add Fixes tag. drivers/i3c/master.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/drivers/i3c/master.c b/drivers/i3c/master.c index f87bf0099d3c..7b60b0c7f646 100644 --- a/drivers/i3c/master.c +++ b/drivers/i3c/master.c @@ -2345,12 +2345,11 @@ int i3c_master_add_i3c_dev_locked(struct i3c_master_controller *master, bool enable_ibi = false; int ret; - if (!master) - return -EINVAL; - newdev = i3c_master_alloc_i3c_dev(master, &info); - if (IS_ERR(newdev)) - return PTR_ERR(newdev); + if (IS_ERR(newdev)) { + ret = PTR_ERR(newdev); + goto err_prevent_addr_reuse; + } ret = i3c_master_attach_i3c_dev(master, newdev); if (ret) @@ -2472,6 +2471,16 @@ int i3c_master_add_i3c_dev_locked(struct i3c_master_controller *master, err_free_dev: i3c_master_free_i3c_dev(newdev); +err_prevent_addr_reuse: + /* + * Although the device has not been added, the address has been + * assigned. Prevent the address from being used again. + */ + if (i3c_bus_get_addr_slot_status(&master->bus, addr) == I3C_ADDR_SLOT_FREE) + i3c_bus_set_addr_slot_status(&master->bus, addr, I3C_ADDR_SLOT_I3C_DEV); + + dev_err(&master->dev, "Failed to add I3C device at address %u, error %d\n", addr, ret); + return ret; } EXPORT_SYMBOL_GPL(i3c_master_add_i3c_dev_locked); -- 2.51.0 -- linux-i3c mailing list linux-i3c@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-i3c