Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36;
From:   Frank Li <Frank.Li@nxp.com>
To:     miquel.raynal@bootlin.com
Cc:     Frank.Li@nxp.com, alexandre.belloni@bootlin.com,
        conor.culhane@silvaco.com, imx@lists.linux.dev, joe@perches.com,
        linux-i3c@lists.infradead.org, linux-kernel@vger.kernel.org
Subject: [PATCH v2 Resent 2/6] i3c: master: svc: fix wrong data return when IBI happen during start frame
Date:   Wed, 18 Oct 2023 11:59:22 -0400
Message-Id: <20231018155926.3305476-3-Frank.Li@nxp.com>
In-Reply-To: <20231018155926.3305476-1-Frank.Li@nxp.com>
References: <20231018155926.3305476-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?VDdYUDFlMmwxb21DK25wU3RQMklDMTl6S0tib29la1BmYVRkL25lK09TWjh3?=
 =?utf-8?B?cWxvaU1WZ2M4NUZKUVp4THJHdlZHQVBwR3RIWHNJQXBjU2xIdUdXL2xMWjdt?=
 =?utf-8?B?L1hLMDI1c1NuTVRzU2NTSkllbEdzb2ZyMzRRSnp4UjM0bnVtbTBDUUhkVlNG?=
 =?utf-8?B?VDQvQnFZaGVMQllTTERZcmxVNmY3UTJtYWV2VmdqTnlsdUNPS3VjRTA5cGo4?=
 =?utf-8?B?VXVLT29aMk9zbHFvVEMrcEhKN0NVUHFlSG9aRlhoYlY3WXFST3JvSlYyYS91?=
 =?utf-8?B?ZlVYcXQrQWt0eEkyRjg4Q1FFUkZkUElKaVVSV1dhcjlHT1E2YkFIeEI5dUlE?=
 =?utf-8?B?U0ttdktyWWwyWFJGQzRVY1NCS2ppMVZNZUkzSzhkU3RKKzJTUnp2UmxvSkVS?=
 =?utf-8?B?NGVtZ2YrcU95VkVDRUNKYm83c1F4c21uY0loK2hHTlcxYVBvTDh5NjNRSGZL?=
 =?utf-8?B?MzZ4UWZ3RUkwN1FzVlMyTnBianEyVFJUWFJEc2lSaENZdUFiYlpEdnZ4bGNp?=
 =?utf-8?B?VG85bEVsa04rTHFueExsNnhHV2dSYThCMzNKS3BBZ25PNGdEOXdqVUtNVktp?=
 =?utf-8?B?dFVCTnBTVlRpUlIxWEpVZk4vUTZCNHUyUjN3ZGNVZk9HSnAreGxWMm14VGgv?=
 =?utf-8?B?MS8wajV1Z2R1V3hKN0JzRDJORXptSkk3ZjYzN2ZRSC9jVG9lRXlqdWFnNDBD?=
 =?utf-8?B?anBDRkE3RWRTUUxKN3k2MDI1Z1JEZnlPN3IvUE9wbFZNbkE0N016dGFXN2pu?=
 =?utf-8?B?VHBLajdSVkJEcDNOa0IwNTNJdmlMWTVjWUFZcmsyUFBJVnRodlArWkxLSERj?=
 =?utf-8?B?cnpkTWR5MkZ3UW9WMlZpanBqQnFMamY4Qys0dkhaU01Bb1hKOHdUUGtLYTBK?=
 =?utf-8?B?TGhmT1Z6R1pYc3kzWllpQzhCSXRrdUI0NUpVVHNUNGdvYUJpZzM5eU9QY3o5?=
 =?utf-8?B?dFRIN0xMU1E5cUE3QjY0elVZbGVaYTE2bGt3aFozZUk4aDY0Nm15TXVvU0h4?=
 =?utf-8?B?Z212TFF6bUxYMW1JZGdWN1dwVWdpcDd5NXJob2lxWGlZZVZSWEpwTGxoeTI5?=
 =?utf-8?B?TEx4N1IvT2V0RHpVc0ViMXJCd1hXWjdMQWRwbTJpOGdHcy9tcndST3g4Z3hp?=
 =?utf-8?B?NHFJOVpTV2Y4ZTZDQWN6UlZmb2twSnFFS05KMVJyWVgya0ZxcDRDRXp1UlR2?=
 =?utf-8?B?S3Q1Z3NvdHFvUjdrWEM4d2NXUXJqRC9QRUNGaXFKeHUyYkRBQnVIMjU1WGpR?=
 =?utf-8?B?ckpMeWdkNXJkMmh4amdDb3Q3b0lpV2sxRHdGaE1zMlRNdEpwUHYvQlI3TDZi?=
 =?utf-8?B?QWljQkpxSGxQMGdjY0I2cUtrTEtXeUZQUmE1bStnRzJTZzdsNFJzTWlmamt5?=
 =?utf-8?B?VitZNGJlR3MyL3JLckgycmdKMmxHODdXb2JtNXRXb0pVOUFtdk5BYWZLMFNH?=
 =?utf-8?B?cEU1bVBPRCsyQnJKYmxmWUQ5bjg1dUhDT0NsM0RmeTJHMXV6U3QxejB5cWhv?=
 =?utf-8?B?ZTd2WE5lOG90R3hrZ2c1K3FXUzY5V3FwQ3ROVmtGZFhTbGNjakNtU0duWWpQ?=
 =?utf-8?B?bFZhOGcrcFdnZ0RXbExVdlpRbFZUL3ZwQm5Hd1l6UWtGRFV3QnhvZUpMUHJj?=
 =?utf-8?B?UE40bDViNHFYM3VCOFVBdGZZVXRrOCt4K2tncFNFM0RFRU94a25GVXVENnJh?=
 =?utf-8?B?NkFaZFFsWFJveGIzenNJcjRqeVNFbHJCMmM0WkhPSUtOb2tFOGxOR1JTUTNh?=
 =?utf-8?B?ZlZzd0ZkTVJIWlU3dzcrd2xLSEF0emZqK0FlNlg0bG9NVHVTRHRndGRMOXJk?=
 =?utf-8?B?aUlnSGFtRW9iOU5QN09GcE1pVmdpZlJNVkNLWERVUWswRWIvemxGK2ZwNDg5?=
 =?utf-8?B?ZTFVRFV6VHJuZi92czFLZTQxNEMyTEFRTFo3dTVEVFdBTHM2cWV2S1VSM0hp?=
 =?utf-8?B?U2ZLV1VPRWplVVVKM0VzUFpQRlZYTXA3M0NkSjJFcllBRFZNTDdUaDRoRjlE?=
 =?utf-8?B?QzJ3aWJpWDBTR08vQkUxc0IrOGVTZGFodWljQzZZOTdSN0RNaWNDSGdGd2Ja?=
 =?utf-8?B?aW9MeGF6azlUS1lyd3dTWkhKMTdISGZKTEtRLzRHODhXNGJ5YjFwaUdWbUtP?=
 =?utf-8?Q?QgzfW1/VOEPaNgb8FzLp548+1?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: b3668cf9-f417-4413-0618-08dbcff34133
X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB4838.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Oct 2023 15:59:48.2273
 (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: QRsBa7JWfzK+YweX5EuEKX7chQbGcC9JZ5hku/S09EdEHmxrHjmRdQRqP6HzUZzLUXaUrmhI+Hx+VEVuYgCBjQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB7694
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 pete.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 (pete.vger.email [0.0.0.0]); Wed, 18 Oct 2023 09:00:23 -0700 (PDT)

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

If an In-Band Interrupt (IBI) occurs and IBI work thread is not immediately
scheduled, When svc_i3c_master_priv_xfers() initiates the I3C transfer 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.

Add IBIWON check in svc_i3c_master_xfer(). In case this situation occurs,
return a failure to the driver.

Fixes: dd3c52846d59 ("i3c: master: svc: Add Silvaco I3C master driver")
Cc: stable@vger.kernel.org
Reviewed-by: Miquel Raynal <miquel.raynal@bootlin.com>
Signed-off-by: Frank Li <Frank.Li@nxp.com>
---

Notes:
    Change from v1 to v2
    - update commit message
    - fix typo yeild and falure

 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 8cd708c965085..abebef666b2bb 100644
--- a/drivers/i3c/master/svc-i3c-master.c
+++ b/drivers/i3c/master/svc-i3c-master.c
@@ -1010,6 +1010,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 |
@@ -1028,6 +1031,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 failure
+	 * and yield 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