From patchwork Wed Oct 2 14:50:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Li X-Patchwork-Id: 13819885 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2077.outbound.protection.outlook.com [40.107.21.77]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5130D1D1E89 for ; Wed, 2 Oct 2024 14:51:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.21.77 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727880675; cv=fail; b=QSY1GInFh/ByX+TPa23ftQYz2aVntmRkN9MmQkil4PMZjeXP9UPV8f+jZZRFs5aQSODy/V+oNuL8pdiSt0+pf6hgibSggDodP0YPwCTuEBFWJjit+BzKhOwMydFpMJncpblP006Uu8IvtNu9UUQtnWMOXXKXAAQX8Lh2e1R1RBU= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727880675; c=relaxed/simple; bh=mTP2BQfrL2ajg1eLnU3vD3yNZnTqEe/2FbB25MGO4Kg=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=EGfAjx7NJMoy8+0luKGJiQdXzVKpeVtSgagHgMEjY7mKHWZGMAtPzijpLKqIXUVGCIWyMpAOYcImWGeCnKd2a4d0jIC+itDgJVs7yg7W62OgXyd7re+lNfPeuKg91Gl1lxxZfgQPx1ar6ex6h69r90/lTpbAntv7JIR1CF+cECA= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com; spf=pass smtp.mailfrom=nxp.com; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b=L0G+Cpc5; arc=fail smtp.client-ip=40.107.21.77 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b="L0G+Cpc5" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=KDpFlRKOfqscIwMUlv7EmR0JPzXfERhf5kzhGgvzgfuglacLItBOphybdR2wGm9qnLTqQBF+WaWDEN76TAUhVmpKyWj7KRRnwWGtFUZ/ZsQLaD4FF2i2/REGYQVziBEb5VSAavARVHM96xq4E7Zb6KoEPugMYQsNVMjYNiFjFUOUHeBLurd+A6Jr+LdpYYffnMaQDO33Kmnc8K8L0VSNMyE6gDvVDQTAo0iK8HAsitvwFqt4EtlkQxWX5Cm37+hJeS346FTXlbejNeSeRPs0BeJQOONJvZ8QfXIB4dBiQfzNasknDfLGGrfhhopALeKtmwAZadeNtUH/cZri1x/Evw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=pG/i8HsPY7XlHxdpjxt1xiQs79KpN78+7TFWBBmUyn4=; b=jxEEVW8MphB3BXTuBR8FpkTTR+mWupxlrp3fQri/sBjRbd1Ks/IWJay7FkFRKf/dN/++Rtnoxf3usMfkGKhFbhFN0GgcBtrpQAmJuJMTk4+RoH/Y+QeLNzI1A9DybRwgDbfIwV67ccA3tNbPf0OUdDhuNiWjhtTjrLygrbXcGdr9znxYlEhLlrD1T0VavfUR7b70A5c5B8V4pP9qv/je2zi4AUVOPw1mGVp3FN8528Oi/96roDzmO4TyHjhJ/1+7gjE0Tkx5UeLfGxGH9jfmb3AanHoMYYPvzc+HgiPI+hJhJYwKsKsUuHvvisqFew7v16VmMaKOgzECH7zmCUpo5Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=pG/i8HsPY7XlHxdpjxt1xiQs79KpN78+7TFWBBmUyn4=; b=L0G+Cpc5QKvJ7BH2Kn8+2DTYUrWO731v3SHmSCgxqZw9gliH8iSJhwJNad0x208PGFvIOWJvH8rMLEPuwZWdm40/0aqIK6+UgAle03nAx+BTN/GM0abssWPlHvcqvEqmW6Xw8hkQeiY/T+VvLEvZ5Xu712au3YIclXRgtxEKObLUDd6OOx+60PNgjZpttXlT3C0eS8H4m+Y8+mrPB0OzL4GhSQMhVqXWhBIy76te5XmvOC/o+04Cx9h9/2FV7M6wh2nn/bA4JH5twsFAFvehVsHzItIlsj0GNIwNGEjAXpagvdXhaf1a7w22+sy6yxLyVJrcJhMtoddS6ZAuMT2jkg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from PAXPR04MB9642.eurprd04.prod.outlook.com (2603:10a6:102:240::14) by AS1PR04MB9699.eurprd04.prod.outlook.com (2603:10a6:20b:482::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8005.27; Wed, 2 Oct 2024 14:51:06 +0000 Received: from PAXPR04MB9642.eurprd04.prod.outlook.com ([fe80::9126:a61e:341d:4b06]) by PAXPR04MB9642.eurprd04.prod.outlook.com ([fe80::9126:a61e:341d:4b06%4]) with mapi id 15.20.8005.024; Wed, 2 Oct 2024 14:51:06 +0000 From: Frank Li Date: Wed, 02 Oct 2024 10:50:38 -0400 Subject: [PATCH v6 6/6] i3c: master: svc: fix possible assignment of the same address to two devices Message-Id: <20241002-svc-i3c-hj-v6-6-7e6e1d3569ae@nxp.com> References: <20241002-svc-i3c-hj-v6-0-7e6e1d3569ae@nxp.com> In-Reply-To: <20241002-svc-i3c-hj-v6-0-7e6e1d3569ae@nxp.com> To: Miquel Raynal , Conor Culhane , Alexandre Belloni Cc: linux-i3c@lists.infradead.org, linux-kernel@vger.kernel.org, imx@lists.linux.dev, Frank Li , stable@kernel.org X-Mailer: b4 0.13-dev-e586c X-Developer-Signature: v=1; a=ed25519-sha256; t=1727880649; l=3214; i=Frank.Li@nxp.com; s=20240130; h=from:subject:message-id; bh=mTP2BQfrL2ajg1eLnU3vD3yNZnTqEe/2FbB25MGO4Kg=; b=/j4Z1kpOPNXOtRhpr8OSpnJ12IrkyS73HdhZikRFyEIZYibXeJA60RWSmusqukin5vvXGJLfy O4s91/3DMDaDl4843Cf4eMchhEJFNT4Zbg9ubDnITeTjYzQ9qwBkgQC X-Developer-Key: i=Frank.Li@nxp.com; a=ed25519; pk=I0L1sDUfPxpAkRvPKy7MdauTuSENRq+DnA+G4qcS94Q= X-ClientProxiedBy: SJ0PR13CA0177.namprd13.prod.outlook.com (2603:10b6:a03:2c7::32) To PAXPR04MB9642.eurprd04.prod.outlook.com (2603:10a6:102:240::14) Precedence: bulk X-Mailing-List: imx@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB9642:EE_|AS1PR04MB9699:EE_ X-MS-Office365-Filtering-Correlation-Id: 4417582f-8a88-49e5-3935-08dce2f1a4a1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|1800799024|52116014|366016|38350700014; X-Microsoft-Antispam-Message-Info: =?utf-8?q?FjubGUGi3uJOepWT3rC46PHUmICIqMS?= =?utf-8?q?JQ5/kaQtJpFRjRJ36xvCbxKMME+h4TujE8ZZU6n0+jbXiS7RjP6C9ct7ztDoSN56J?= =?utf-8?q?SV0Eftfzl65f5+Tftd7eVP+hnn9FcuLyyIJppEuZkSFiaSiECSqAlg9nh43PV8tCk?= =?utf-8?q?Q2fqOk17PL4wIwDV0p2Gen8cIF0MbxUkbHP0OW06cg1WbOIJjiMFGwTGCpVc50C2s?= =?utf-8?q?kSkEvWLeDU7KheGBqIqz8n1wFxFQE9m2ejS00L1X4E+KToZDvTnjR+LOOcKeYtIDs?= =?utf-8?q?P53iJ8L9wDdRu/MWRQoLX0Avza3nk6AzdPOw+9fDRnCDE8rk0MNnUhFgZ71ZusJK6?= =?utf-8?q?3cMDJ7Aqf5qEArBePHHs4G6CjTA72kYMasu/eAiXQUN6pwj9zPcFrMEHEGcS8VYt3?= =?utf-8?q?ksVgoe/ej4GKGYwttEE/+woQlpQHcpRCPxcORU+BqiNBdWZqDFJ10bcwL4dGszpUV?= =?utf-8?q?+/VOSyK8Bjs0p7ofuePU/MqYMTEFCsj2xK8l8c2vBMHczwqMPNTe+mW5lRFdOlA9t?= =?utf-8?q?WWu1y9GM8RewNubzdJRlvc2c3TK6e3Xys7jBQEoLrTbWHdi8GjGrPYdhrupQpYEzO?= =?utf-8?q?ycaRYXUg+1wiFclW+EFz6+8pPhlORy+szY41oToar5M15kfZWLJpcTPLkuQ4MLjzP?= =?utf-8?q?8fJp6UC8vJmHxzilhUvnm3KCQ5zp3pZ+DhICx2MI7INQ+DKShfoKv57ooQQ3JqW4P?= =?utf-8?q?GHudImgFzvpyFwdzMVR4oZX3CkWy3PirXpPQR0KiXoA5eW4s8N272XUKUjrpuBhTP?= =?utf-8?q?BJoX8ladokXyzwvWWfAslS58X7ryRQKG5RQ+5f/YZqp3YSl6ng1XhFkWrC6FtaA9l?= =?utf-8?q?NoCbXPgY/FQTMRtErYePZIBYTHEhq+KjJNQqiC9KLY+VfYcc0rmBpP2XBwsPPo+z1?= =?utf-8?q?sXZVZdErHbS109UgY/rblqA1/RmdBC7kObgC1izZp1Pm2wBwxFKS1ojdsssVN0AOC?= =?utf-8?q?YSzQBKTLH+l7xHBxV+03M71qHLSrAHNh/vL4w7qm0QieMJ3MNYGfJ3bEpltvmiPqS?= =?utf-8?q?xPWykHSzDmO75FiJ7BWnydQ2a/LHLfdCJ5KeplJgTLTWj2PeM4WEp8tTD54i1A/ea?= =?utf-8?q?HE5WBCORZpxd9cpU513ZraAgINxQBEJUIqhhkCQ5TPSAWe8C6yXY2xragADV2x1ep?= =?utf-8?q?iBauUhlwlm6Lx1D2eSxWTNM4GUb/XrjzRRPKrVwEucDS6CAZgWxs5luCQbP5p66xJ?= =?utf-8?q?uFupwr2wzUf0IGJ0Rtck4unUqfGUDU/NOr1qu0sh8XXtJe1fF9/5087kba7b65dEF?= =?utf-8?q?HCdu3W/eTiUg4pC8x4fmhzJAkVgKb5XVqZw=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PAXPR04MB9642.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(1800799024)(52116014)(366016)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?EZQU6cP24CUVUBhgidL1Pw0aA0j9?= =?utf-8?q?gCe9E00+eRM291d0oHXYpo/h9t6adMS3DZDI40kmlmcRqOgZ8yNKWvXukV/vAX5pN?= =?utf-8?q?+iRMSWNfDQCgjlsv0Y9/Z/h0dZOohnJUW6n2OCStN3Vlb5ejxuyoj9gyd+BPI2X7W?= =?utf-8?q?QGkUBx7Zrh0Tv0WN0RqLEZivjRGxUI3womyN36HsRCdqjx9maloRiEBUF7NVe3t5o?= =?utf-8?q?W5mi9rvpYDgNnK8EZ3W0EAblOCbvwnGQgoqRkV1eP76pLWMMsKaagpDPa1mfzIeAD?= =?utf-8?q?Lysn+bYK3YmDb8o7n3Zongq5MLedb0WAPyJmFfSkIHjIGHaQzBXguMMlZRnFl8pJh?= =?utf-8?q?4abJuTh+VcCwDP99b097ZPHlnleF2lRTUlgTgFF0EITs7dkr+K5SD+ng1cMnMrWYm?= =?utf-8?q?t6ptUTuCVeR7uuVyNnl1ARpup8Cmk+BzG3XqnRvyZyZ1CtoSjD/FAMD0VPCaflLp9?= =?utf-8?q?UadFNf5FYxUKEscoSQrNqrywXHreF2PG2gjU+rN47XLdv2KhRvJUqbeQYJJkK08Xi?= =?utf-8?q?EU1aXq3BW+ymcGZ7zjUMnk8pMYTzv51FvkgtQ/OdrrqLELRlWg8ppgQVEkj9fKMeM?= =?utf-8?q?VMuknXaHINRVL+ryrFGyWTNidyb3fCa8MhciwqVZyHKxcpEJjXEHNo4Ze/L+kYEJF?= =?utf-8?q?qV/+mZI1Y1nAvyg6a+/DpWcrAn+KD9WgW16qXhVizeq/lPz9ka+TWWVAMUrFTR7v3?= =?utf-8?q?U2E9ywS278vQfGhNo3w/f1c4hCQCAvJUxy0LeDq9eYkbFuTX3wKPCf7/TQP+/vA2L?= =?utf-8?q?KemrZccERYnKApZqTkJaqK7q/rYM7fyQykUvziie+6Fcgngh94BQMLoMYSdPHpBde?= =?utf-8?q?fS4Tx6f3ivBMrdo1xZStI57cMNWOarIthU/bsTN1q+2LckO6DuFJABYd/Zw90le8l?= =?utf-8?q?2a6/V4MmGG0dJo5/mm0gj672421uKC0kU10haflm5fo9KWmjNDt32DbvtJO6G1XDl?= =?utf-8?q?QK2yMqG+ZmP6kL+MPtExIaqUCtnWGpyKKl3VD0sXckyROObFGevH/jCyUq5+2ekSW?= =?utf-8?q?Lk2xfhLzD0EcH1kYM9xxJrPmp39iEtcUryrRr27tFsmylYAlbVc4wZstrrbtSYLn5?= =?utf-8?q?N9PmJUkF/cStEkzp7W+RcSkDUcW7C6C/9NK8qU5euNGOWu1sRHAcNn8GwWMFQK45s?= =?utf-8?q?ya2HUZm7RaZ2A1p/n8iXWFM0OKva+yrDmhn8G1e2/TazNegc8QtcYvIvPUb2NHOA2?= =?utf-8?q?85wm2RMaoCj6Uy60rhMI2zZjP7i0ntyTG7nR6cdt70aaR25PnMQq18tsH+9hoYT9Y?= =?utf-8?q?7OUPvIAczmO7GwzytxLdCMuuuwB+KjaORBbimozRRS9uRK+gtMlBS+l1IjHRoaZv8?= =?utf-8?q?WeFQ0KA2Ggo9dZtHcWm8KB3TzJlURo17uzLU1fjx8SgXehTHdLf+rE8vohnxMc6oa?= =?utf-8?q?DkPw/PtG0vTp9FcLZJGnBWJ2DY/IjfXelLz8vUL9rN9AmqB9L6/rRKm21AsSWjYTJ?= =?utf-8?q?6jdx0wLagTcWWU5excWeANMs2gTlAbfV3LhryUjfP9wJUCkX7guR5jmbObwqv9MWj?= =?utf-8?q?y52iTudqCP9n?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4417582f-8a88-49e5-3935-08dce2f1a4a1 X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9642.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Oct 2024 14:51:05.7505 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: BUUt7pytChGHV8EOUenVS2yxr5bhQsjm5AXpNcVWdH0WiuzfH80YMGHg4NyqFa7R4lqd9wJPSD/XjOytB84qgQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS1PR04MB9699 svc_i3c_master_do_daa() { ... for (i = 0; i < dev_nb; i++) { ret = i3c_master_add_i3c_dev_locked(m, addrs[i]); if (ret) goto rpm_out; } } If two devices (A and B) are detected in DAA and address 0xa is assigned to device A and 0xb to device B, a failure in i3c_master_add_i3c_dev_locked() for device A (addr: 0xa) could prevent device B (addr: 0xb) from being registered on the bus. The I3C stack might still consider 0xb a free address. If a subsequent Hotjoin occurs, 0xb might be assigned to Device A, causing both devices A and B to use the same address 0xb, violating the I3C specification. The return value for i3c_master_add_i3c_dev_locked() should not be checked because subsequent steps will scan the entire I3C bus, independent of whether i3c_master_add_i3c_dev_locked() returns success. If device A registration fails, there is still a chance to register device B. i3c_master_add_i3c_dev_locked() can reset DAA if a failure occurs while retrieving device information. Cc: stable@kernel.org Fixes: 317bacf960a4 ("i3c: master: add enable(disable) hot join in sys entry") Reviewed-by: Miquel Raynal Signed-off-by: Frank Li --- change from v4 to v6 - none change from v3 to v4 - add comments about not check return value - add miquel's review tag --- drivers/i3c/master/svc-i3c-master.c | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/drivers/i3c/master/svc-i3c-master.c b/drivers/i3c/master/svc-i3c-master.c index 7ef7e50b4b916..e9c8e340d861b 100644 --- a/drivers/i3c/master/svc-i3c-master.c +++ b/drivers/i3c/master/svc-i3c-master.c @@ -1103,12 +1103,27 @@ static int svc_i3c_master_do_daa(struct i3c_master_controller *m) if (ret) goto rpm_out; - /* Register all devices who participated to the core */ - for (i = 0; i < dev_nb; i++) { - ret = i3c_master_add_i3c_dev_locked(m, addrs[i]); - if (ret) - goto rpm_out; - } + /* + * Register all devices who participated to the core + * + * If two devices (A and B) are detected in DAA and address 0xa is assigned to + * device A and 0xb to device B, a failure in i3c_master_add_i3c_dev_locked() + * for device A (addr: 0xa) could prevent device B (addr: 0xb) from being + * registered on the bus. The I3C stack might still consider 0xb a free + * address. If a subsequent Hotjoin occurs, 0xb might be assigned to Device A, + * causing both devices A and B to use the same address 0xb, violating the I3C + * specification. + * + * The return value for i3c_master_add_i3c_dev_locked() should not be checked + * because subsequent steps will scan the entire I3C bus, independent of + * whether i3c_master_add_i3c_dev_locked() returns success. + * + * If device A registration fails, there is still a chance to register device + * B. i3c_master_add_i3c_dev_locked() can reset DAA if a failure occurs while + * retrieving device information. + */ + for (i = 0; i < dev_nb; i++) + i3c_master_add_i3c_dev_locked(m, addrs[i]); /* Configure IBI auto-rules */ ret = svc_i3c_update_ibirules(master);