Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) client-ip=23.128.96.31;
From:   Frank Li <Frank.Li@nxp.com>
To:     miquel.raynal@bootlin.com, conor.culhane@silvaco.com,
        alexandre.belloni@bootlin.com, joe@perches.com,
        linux-i3c@lists.infradead.org, linux-kernel@vger.kernel.org,
        imx@lists.linux.dev
Subject: [PATCH 2/6] i3c: master: svc: fix wrong data return when IBI happen during start frame
Date:   Mon, 16 Oct 2023 11:32:28 -0400
Message-Id: <20231016153232.2851095-3-Frank.Li@nxp.com>
In-Reply-To: <20231016153232.2851095-1-Frank.Li@nxp.com>
References: <20231016153232.2851095-1-Frank.Li@nxp.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?VWlrK1lobmJScVpmSE9UR3Nuajl3VlM5NGVac3haYUQzbVBLV2dxNlhjTlFJ?=
 =?utf-8?B?Tm92U2dIV2JrUkNEdmVaUEJQS1YxeVhLTXVRTkQ0UnpXeXM1KzNsSGFzL212?=
 =?utf-8?B?cXRUQkpyMnEwcGlIaGNlYVNJa2YrYlNTTjQ1eHhzVWFxc0JDdVdYUjQ4eFZw?=
 =?utf-8?B?TjlFQzVBOSt1OW9Nc2cvbUVnWlB4aER0enhRQ1o0T09jV2ljZTJkUm80eWlP?=
 =?utf-8?B?TnpCQlVPRUxPdEsvQjl0ZWFsTmI0bGpqNDVHcVRzTThYWW9QZkF6LzVPTmpj?=
 =?utf-8?B?dWRCdkpPMzNhSkhGVld5VmRTM056N0tscWUzSHBJVnFMZFdRWlhUWXRQc1dl?=
 =?utf-8?B?SFhzcG5rTmM5K0JSWWU1VTZDYmx5M1Nac0I5bVQwT0Q4RGRkTUZFQWxPQVZu?=
 =?utf-8?B?L3d3Z1RXeUJFWXArZ1FxWFJiMWhVQTZYdG1ndzZYeUtwelJldVRrV1Q0bTlR?=
 =?utf-8?B?cktlSlVyVVN0QVZSV1QxazRINUwramhLWUgwRk9va1dSb0J4Zm9HQVdLRjZL?=
 =?utf-8?B?dVNiR1l6WDhHcEpXSjNQRnRiZ0FSZGk5SHFIckN2ZzV0TENvWWd3d0ZyZGRm?=
 =?utf-8?B?Tlg0TWFuSjFkMG9ISEtUSDBDRlcyb0FJYUE5a01nUkJJcDV1amwzV1JsdXlD?=
 =?utf-8?B?aUJvbFhIQnJNaDlDSXpJTE5RL3Z3ZXhRK3pQdDd0ZXFwZnEwcElDS3NFOUlt?=
 =?utf-8?B?czBtQXl1SDI1MnNlUFJTSXRoOENSbEliYnNSaldWQ1JHOTJHaG1yT0diUTV1?=
 =?utf-8?B?cFdmckVBU1VFTU1RYU9pUVVqZEd2cWI0a1JRYzliK21xQ1pSZk0yVDlNTkhX?=
 =?utf-8?B?REQvSnlqMUx4eWdsZnJ3U0J2Yi9CR3VRbmdBbUVoOEZ3RDFtcTRYSlZOOEVY?=
 =?utf-8?B?VEdDMld3bmpvRmttZjVqYk1MN0FYOGtnc3ZvbU5iMTN0NURqUUh0TGt6OG1j?=
 =?utf-8?B?clJocnFIQzVQbHNsMzRhUVVwZ1JLemdEbkJ4Sm51VlZ4cVFJRWd2VDE1MjZn?=
 =?utf-8?B?a1c3dzlEMm96M0tLNlhQVTBwa0RSZFBlMCtEM3h4UDhxYmNtamN1b2xaUVZS?=
 =?utf-8?B?WlV2eDMwWU9GL0JkWTJWSGd2b1ZLUWJhUUU5Z2QvNXRWUHVIVWJ1SFB6R0Z0?=
 =?utf-8?B?NTJ4b0Y5d2c2SlVWWG52UHFYdWxDYU1DQjU4UnZudGdLWkdyR1B3ekZaVXE0?=
 =?utf-8?B?UmhJamlBMTNUMzRGY1NvdWxjTUhiM3M5QVB2SWN0d0ZtbHZoZFBVcVhJU0Np?=
 =?utf-8?B?SkJNTEYyVjNEOGk5Y1VMbkdpbmY2dnJ4RmU4STRCY3dNelVlWjRiYUhwOVZ0?=
 =?utf-8?B?VThJdmhCVlNGWGlMZllJV25DN1BRNWhMM3p1STBCNVNwSitabjR2MmRzd2JC?=
 =?utf-8?B?amVMTkQ0WnoxWEJRTndBRk8wRVNyNm4vOERsUHZIUC9HS0V6TTFHQUtZQ1I1?=
 =?utf-8?B?ZnY3dXJFNEd2ZjNtZVV2SVZRUlhMbFRqclc3UktRQ0UwSlZRMk1FZEJjditQ?=
 =?utf-8?B?T1h2OXBaaU96QTVKeThCSVQ3dllHa2FPRDRmRGF3ZUJuYUtoaXVoTWRIaGFL?=
 =?utf-8?B?UEhra05QdXgycDNkNkFGTkZRa211cWlDYXE1ZWQ4OElpZjlLTlAzbFBKUC9a?=
 =?utf-8?B?UlloOWZ0cElEK0RPV1haeVNlN1djT3RRU083ZEVCQ25JS3NNSEVNbUdqdXpp?=
 =?utf-8?B?aVpid0dRRW1JYnhqZ0NwaEhzeUZ3VmF3YjhNZG5WL2pyelZlY0x2eUk0WG9O?=
 =?utf-8?B?eVRIQk9pZXJvWmJ4VjQzNFA1UDFyaG1IQjJLNVd2aGI4VWVuNUVrTUZyUDBW?=
 =?utf-8?B?MVpWM3NOM3M1aGhxRDBFY1Exb21lcWlqMDkzc3FDYTIxbGtBb1JVRmp1Unc4?=
 =?utf-8?B?b3E0Y3ZmQ2ZTdSs3Zkc4bFVGZHdpY2VSWnVEL3VSZ1pJazdSeTBkSTZncHpn?=
 =?utf-8?B?cGMzMXpCQS9SZlREZG5tRlMzV1k0NnRqNVBEeVdOMTBqMTFnNnlpb3RLY3U1?=
 =?utf-8?B?VUg2bnF5TXBGMnExLzZvdXRpSHNSaXYrS3hKYzEwdzJOZWJEalNYbzNMOURs?=
 =?utf-8?B?SFYrY1BJSStNOTMvdjdOVTlvbzhVcVJDSXBzNHFJMmR3T3pjZDZ3THB6dXdz?=
 =?utf-8?Q?0oA0=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 2bba315f-0fe9-4cbd-5aa3-08dbce5d280b
X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB4838.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Oct 2023 15:32:50.3807
 (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: ULMIngN0t84bbebWLfXv0QzBaEJuC2xkOy/Txofu01yrltD6TSf0nnYFIieoQ4adtEcl4ZDDYKYqrBOTa3IrOw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB7592
X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
	DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,
	SPF_HELO_NONE,SPF_PASS 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: <linux-kernel.vger.kernel.org>
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]); Mon, 16 Oct 2023 08:33:24 -0700 (PDT)

     ┌─────┐     ┏──┐  ┏──┐  ┏──┐  ┏──┐  ┏──┐  ┏──┐  ┏──┐  ┏──┐  ┌─────
SCL: ┘     └─────┛  └──┛  └──┛  └──┛  └──┛  └──┛  └──┛  └──┛  └──┘
     ───┐                       ┌─────┐     ┌─────┐     ┌───────────┐
SDA:    └───────────────────────┘     └─────┘     └─────┘           └─────
     xxx╱    ╲╱                                        ╲╱    ╲╱    ╲╱    ╲
   : xxx╲IBI ╱╲               Addr(0x0a)               ╱╲ RW ╱╲NACK╱╲ S  ╱

In-Band Interrupt (IBI) occurred and IBI work thread may not to be
scheduled. When svc_i3c_master_priv_xfers() initiates the I3C transfer
frame and attempts to send address 0x7e, the target interprets it as an
IBI handler and returns the target address 0x0a.

However, svc_i3c_master_priv_xfers() does not handle this case and proceeds
with other transfers, resulting in incorrect data being returned.

IBIWON check has been added in svc_i3c_master_xfer(). In case this
situation occurs, a failure is now returned to the driver.

Fixes: dd3c52846d59 ("i3c: master: svc: Add Silvaco I3C master driver")
Cc: stable@vger.kernel.org
Signed-off-by: Frank Li <Frank.Li@nxp.com>
---
 drivers/i3c/master/svc-i3c-master.c | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/drivers/i3c/master/svc-i3c-master.c b/drivers/i3c/master/svc-i3c-master.c
index ebdb3ea1af9d..0f57a5f75e39 100644
--- a/drivers/i3c/master/svc-i3c-master.c
+++ b/drivers/i3c/master/svc-i3c-master.c
@@ -1009,6 +1009,9 @@ static int svc_i3c_master_xfer(struct svc_i3c_master *master,
 	u32 reg;
 	int ret;
 
+	/* clean SVC_I3C_MINT_IBIWON w1c bits */
+	writel(SVC_I3C_MINT_IBIWON, master->regs + SVC_I3C_MSTATUS);
+
 	writel(SVC_I3C_MCTRL_REQUEST_START_ADDR |
 	       xfer_type |
 	       SVC_I3C_MCTRL_IBIRESP_NACK |
@@ -1027,6 +1030,23 @@ static int svc_i3c_master_xfer(struct svc_i3c_master *master,
 		goto emit_stop;
 	}
 
+	/*
+	 * According to I3C spec ver 1.1.1, 5.1.2.2.3 Consequence of Controller Starting a Frame
+	 * with I3C Target Address.
+	 *
+	 * The I3C Controller normally should start a Frame, the Address may be arbitrated, and so
+	 * the Controller shall monitor to see whether an In-Band Interrupt request, a Controller
+	 * Role Request (i.e., Secondary Controller requests to become the Active Controller), or
+	 * a Hot-Join Request has been made.
+	 *
+	 * If missed IBIWON check, the wrong data will be return. When IBIWON happen, return falure
+	 * and yeild the above events handler.
+	 */
+	if (SVC_I3C_MSTATUS_IBIWON(reg)) {
+		ret = -ENXIO;
+		goto emit_stop;
+	}
+
 	if (rnw)
 		ret = svc_i3c_master_read(master, in, xfer_len);
 	else
-- 
2.34.1