From patchwork Tue Oct 1 16:02:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Li X-Patchwork-Id: 13818333 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2075.outbound.protection.outlook.com [40.107.21.75]) (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 1AEC81CBE82 for ; Tue, 1 Oct 2024 16:03:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.21.75 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727798632; cv=fail; b=f3AAiBcApvxbXPVcdFHnoH7kyWfq8gPDsC8vPYg85beZCfbg8ORryVNtbzX/lLCJ7SSjPQS2E8x4zV5n97td5r7QKB2ljl4WZpbAm7g6F1jm3frDUXiMJPUDq5YBUGdQ1s8+pdsd38f60So4W1XuZ07H4/6hy8GNVPdUFn0isw8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727798632; c=relaxed/simple; bh=pwmMPQ+ocskT4O4TSE+gJnxlQ1bipztOKdsbjLcczOM=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=pGoMCIuE3hgMHHkF7bOv89mCV+eOdmp0Jy0v7F2L2YNfRJwpRQzYjPZxJqPOQSD2fl4HIdzMeo2v4FphoFHmcGGqqR0ggvTWskTx6pNMPtbXejsIjcoshxWVd0zd2vank6BER7CpLLYzVsha88IfC14GztNYcIYDqrbJyRajx9Y= 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=WEaLVngP; arc=fail smtp.client-ip=40.107.21.75 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="WEaLVngP" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=dnmbQX7IFixK+5S2jn2hldzmxwqYWdbuJoPfH1cT61Qsud/73tfEsF3CxFUx9GLrbW/jLLhqJG2K3RS2+dzr7HEh5XD9LjPXI95dXUEPviudHdIlySaiQlB3pVJECz+S/H32Q0MBCbt5iaKegANlzEpPBK8sxx8xOl6uCvmXHVOsG/vVz72dF7rWU16/9f4m/ZBCVBksIJ3ExZcG3vacWkcAk4fPW8q5pCn4XcxkMys7mukHhRz94d6vrsw8RXgwh5q0EjtXa56qrDb1JnQvxvoqasFf7ydtBKC2cPfKCACHCmdyiEpxOlKAxQy3ecMKvwNuSG/GK+EkQGiLu7ypRQ== 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=i+OzaKZA6ebzx86iqa64+hJKH2qCqmdVir1M259mJ4c=; b=WWhaZ+QpLkbfH5q+GxURcCAnJE9eLOsP5OpgX3aWVxGGC58gwVcTTLA2CX3T1Fi8p6t2W/VWIkH+Ncswpbg9QjK4iPVy8kHCHvbc5yoraJ9wbCffxq1XEL2BGCQi/mWkpaawfDtpU7B/9fQo5ny9qeVK80nJ8tVp52xLQOWURYTVVrp1O+LVvTh0szvWLxix0i86MBPwET+AbJhyQ8JlpBsTL6T41a+1xM5X64iBRJ6y6zS3X89UXZF5ZyWM9R9nxjQ41/ly40E4denq6W0stRDt8bZcRp0iC9ycl1EH5JRNYlR+Cf4XDg7+IYMyP42m8Hw/mYIVmEb/UnRwRCAcsg== 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=i+OzaKZA6ebzx86iqa64+hJKH2qCqmdVir1M259mJ4c=; b=WEaLVngPa2qsT8oxqluRd1UDjeFzXXI4GQ8uHLyaGmca9olqmtiXNcN0j7a2JjlJiv0jLpHjpLkm9ND9fLg4EiRVsMR9mYoG1fOAodpAWgHGFQxMhpmk9aIJqyAVBpvBVk318T9PmEBOx7CZlRFQEbwsMGzGWR64I6OA50ZKFfKq0GArplQNzREiR/rkdBZkuEbd23X8ABVSW062b3uDVLdkIFfwJs7kEh9t1dsuvNeLho0OKCDPC68AVDjTVCLffXEYvYWAjO4MHMdJcgtJx4aQyZc3PLP57HHjbHNauJUR+jPxvxQFMo/alesH7QMSzGY00v+szs0E2b9B1Pwxpg== 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 VI0PR04MB10437.eurprd04.prod.outlook.com (2603:10a6:800:216::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8005.27; Tue, 1 Oct 2024 16:03:45 +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; Tue, 1 Oct 2024 16:03:45 +0000 From: Frank Li Date: Tue, 01 Oct 2024 12:02:54 -0400 Subject: [PATCH v5 5/6] i3c: master: svc: wait for Manual ACK/NACK Done before next step Message-Id: <20241001-svc-i3c-hj-v5-5-480ab8aed849@nxp.com> References: <20241001-svc-i3c-hj-v5-0-480ab8aed849@nxp.com> In-Reply-To: <20241001-svc-i3c-hj-v5-0-480ab8aed849@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 X-Mailer: b4 0.13-dev-e586c X-Developer-Signature: v=1; a=ed25519-sha256; t=1727798616; l=3288; i=Frank.Li@nxp.com; s=20240130; h=from:subject:message-id; bh=pwmMPQ+ocskT4O4TSE+gJnxlQ1bipztOKdsbjLcczOM=; b=pnkIDMq8WXknCTRdmARsA1Ks+epfrvLNkLd3IlcLWzautELYeEsYtsbCbbRgqtyYydHsPARA+ sY6vVAsoEbrDmDLJunWpSFdTvavXysaLaPNn5BYvYQTywkPHolNFaEX X-Developer-Key: i=Frank.Li@nxp.com; a=ed25519; pk=I0L1sDUfPxpAkRvPKy7MdauTuSENRq+DnA+G4qcS94Q= X-ClientProxiedBy: SA1P222CA0045.NAMP222.PROD.OUTLOOK.COM (2603:10b6:806:2d0::22) 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_|VI0PR04MB10437:EE_ X-MS-Office365-Filtering-Correlation-Id: 70597d2c-eecb-4a3e-03da-08dce232a0d5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|52116014|376014|1800799024|366016|38350700014; X-Microsoft-Antispam-Message-Info: =?utf-8?q?4F+oLT4WXoAlHiNOYTpLJH6m+8dRbba?= =?utf-8?q?N0TJ3R5/cN8K4N25xtOOeeSHfi7kx9o2crRdupnKcW3mnxf3bDXfOz0E0jEDPeW4G?= =?utf-8?q?SHWfDX0VbIClBJA+8ycfk4yOfMBzxAzWxxinZ8O99Pxs3kk0QFvNb3wKSuPb7AZsH?= =?utf-8?q?5VHCzGIMBjawjvRaBFKAyUhzhivejkS3XQCDUWBkQULMIW/HXNIGWInfIty/SErY3?= =?utf-8?q?AcrRam/DyrWgBeGUJ0q00zxdm2/TbGB6atOeX76HfYNyeVaZf0osTqlYh84H52hgZ?= =?utf-8?q?IuLXxQJOE3QrAjRGv+h/bCSIuPrH5sLny+V9Q3MoNG3KMHqDUGGMvMnOMGB7oRGTK?= =?utf-8?q?bnHA9L4P1cQWocOIgYcDK10PMPvVK6WQRcdToa/dvUWe5YaSA2OGVpyZXYIGR85ck?= =?utf-8?q?x2LcFrQZy6h2SKyrEMipV2ifPu119lrkUimVRqrBgsqGzY9cU8JcZC/0bKm/lBquH?= =?utf-8?q?FPBhDzRSgCeRmc2R9fS4fdVVtXfTUyB54FirAyJdb0ENgeWEzXlDoP81St5MViziK?= =?utf-8?q?K6RLq2BekdR+iCX3IlXGvP9st+9dt6BcsQUfAKH/2kdAxzeE4VYJ0h8+sD5zCRWju?= =?utf-8?q?FsTDGVtHukGmuZU+VxN0QJpn8wmcZk3BaUkgobNwhwyIif9A2UbeRAv3XVe91l4fp?= =?utf-8?q?TgXTHNAEEAYN0WR83hxTeiX0PzMQKpzO4j9VLCUXABlIrDZUHOm6uA+4US+uUUaBS?= =?utf-8?q?bL9DH+319pUTmudxN5/sBi1UrYDsJ363evjmvcCEBAl0A6vY6BUxHgJ0KqiGZaRDm?= =?utf-8?q?JuWh8hRcAJUI3+892jFTPC6K62Qt5OcoIUE1R3QMBOIQ6iudxSShG221Z0UvUD8Ny?= =?utf-8?q?oDUoBTVi+Hlb0nheANJij4QIU9h/eFLpiPB8A4tyrAsJIAKj5MpcMl611iUuG4UE/?= =?utf-8?q?Vj063n6Qv/9zdV3+Mh6p6s+M1Lzyc2iIehxUJXEcULeynRcJidqO7Q1CeHR4qEGlv?= =?utf-8?q?UIe9WsUA1QhgoelzVWG4pndNtcgXZPd14vH66yIHUvGDpMNOmMi3VfAbAN8wYteRq?= =?utf-8?q?IrDtZwRPktfvx/qkJtI6wMDEQZDKMJkPTg43bfejRu+0Hc8SEAa4j92NgwDO5WfT3?= =?utf-8?q?FJ7n9tSWb1yKtRs/bLtpO8hAYOBM4wLK4/K8HSt6d5td+49t73YHSW+9r7JjQVcYl?= =?utf-8?q?0zISK1AL89zqnNb98wIq1b3WEDiovyhsLuIzX0hZuS/SedbmWeWUt+hNlJxCoWd0y?= =?utf-8?q?oLtHMcH3X1+S9GmUa6w2w0VKC2jI0i+z6NyNaCJwvQRNtSdJzBkPjfomco4mOoHvG?= =?utf-8?q?ohVY88PKi0POd5wufkrKsAjZZ7Oa9OrCfS34T/ONPPo/vlcq8ROTZQIn643IJGUJY?= =?utf-8?q?6lRpa7JifmVt/BHTfbK66IS9jTKSijkXYg=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)(52116014)(376014)(1800799024)(366016)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?9Uv0Eyp4MK6G331JhC9XbiN6Axbj?= =?utf-8?q?pjrn03fXInnFOVhcHt5mZhrS+XRmihc4D7kuijk/AuUVyGf2qyVKK/wgIRfu5NvxO?= =?utf-8?q?U+Gy1YNJMj0nowgiula0qqbzjaiiXSveQ7u36AZWwJ1u/Tz/p3MW+42l2vhK0QBGs?= =?utf-8?q?nPYkxM8knvygZFSUe3Om2iTjfXHVMpHd1+bwvWh61TU9TM3zv0+0QB8FYtyDQ1meU?= =?utf-8?q?YYiHRHNU/TTJVP9sxrbEpAsGZDttA43kSRsp6dY9XJNxYS+En88vp9NQXgz4Moilx?= =?utf-8?q?Rm15QDfOXkrhbY0s4VDWqtyQQNB0WvzCOshSn1qgx3HGtH+RgycFt7xzLxcQ+6oGP?= =?utf-8?q?VF0eZB+OTZR8NpdNoDoHG5AztynIHfNZOPRz6vDWyhQPv9YLtluSJZalZWFMJ0a06?= =?utf-8?q?GJ0CF9zlt9L2r8V/AfOFW1wU53aFK6kKTXlWxMW57nYvgaDy5ffUuiCmesP1G4r5h?= =?utf-8?q?unbSVXrA50iiG0cpp4Jn0PX0J2KE/w7KxY6NyITVGICB/ZE1vDt5VFshbkyb7z1OH?= =?utf-8?q?+Sr5Xp6GFfhlJWczejqxgI7HDl6FWn5vNdVFKwoFfXgSySpQIn+XWOJ+70z3aJ3Zi?= =?utf-8?q?xbsRDkxvquhaeScHoSaoK2W8ae6ycbJDpNFtQro4AJbHpbEe1IR0VRWwz2QCMAwfa?= =?utf-8?q?m2mGtueyvzPk/UjEgVvOm+uiMAlRnQoqjLOIRD7ONeHNdsPialVI9vBfJfuPyyHA2?= =?utf-8?q?z52hP7xqqaDyK9eaG4RobvXKMMsKRrIBaQNqqQyQJQLfjoWF73Rk/HakDNQnX6uGL?= =?utf-8?q?xqow5fyvihdTDdaPP8V3mIDKEHpjAA16Ruhcix+4OI0N5gcjk4Kov3ggGy9oY61C9?= =?utf-8?q?sA5mS4DpT2w/ASL2rTweDfKjnzs+OIvymIPaXzthw2Z0Q4HASW8eTjcRbgxoyucw1?= =?utf-8?q?oSX9WmYNNx+VwqRmf09lECXVm6bOOaLbjNzeA2pqKWs8kMr50oh5MqBqlqpwtemM7?= =?utf-8?q?7JqIsfqt0gmSP8D+9f4y8WS/iJCtZCz9c/stQ4+ZTEavd1zBUwRpL0DJs+mJkpg+L?= =?utf-8?q?3fW1WIDpZtbkgHSjdGqDKtdq4xP16WVTZWNKY4ypQSvfxh7mFj+iVJ7oqLU++hPhv?= =?utf-8?q?Q64uEcOEfTM19PqtfYBdk7nsCnkd7G0qMcvKBI0Jel5aYoeyJh81nqF8kn/lfHuL3?= =?utf-8?q?E7CBCW/tYs1jbjbA08ai+I+6yNuWz3CagD6+5WZOUZclksYKnozkFFdxW0uggolCB?= =?utf-8?q?jRTd1ACen7Ef0S2aZery+fj166UmqPTRCp1ybsnJky7um9Yt/afFJXAa/+AznO9WX?= =?utf-8?q?qkyDaWI6LAqXAVTMuWpUHt4siZSunewtPzlEVgnDzhrNJWkEkuhvAgm/PqF9Y0XTb?= =?utf-8?q?vuNmvZYC2mf678zc32pJM07hdBIJSor14zaCtrAM+pyf7Ubtp4+KYMwN5loCEs7bd?= =?utf-8?q?rtXVDyURvn6hCByLx0sLFm2lug6N84Rji0ISxGWiugVSm7DhY8iu6DBLAym3hXGb5?= =?utf-8?q?//gkZ7SWWgW7t/BiaYq0pZhfOIw0RWzVb9Y/HwivdQ9juQwIMDdpSsew=3D?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 70597d2c-eecb-4a3e-03da-08dce232a0d5 X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9642.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Oct 2024 16:03:45.5321 (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: UNqwfkAxW/8lnJMcUZP1gsUcwURx8VnYcXtHFEB3DRu3D7ami5i0KFPEbIm3jTrV2iRsAUtiTnD7KsAzXp8xrA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI0PR04MB10437 Wait for the controller to complete emitting ACK/NACK, otherwise the next command may be omitted by the hardware. A "command done" check in svc_i3c_master_nack(ack)_ibi() and change the return type to int to flag possible timeouts. Reviewed-by: Miquel Raynal Signed-off-by: Frank Li --- Change from v3 to v4 - rework commit message - add miquel's review tag - directly return readl(...) --- drivers/i3c/master/svc-i3c-master.c | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/drivers/i3c/master/svc-i3c-master.c b/drivers/i3c/master/svc-i3c-master.c index 1ee6ce186195c..3388c9af63fcc 100644 --- a/drivers/i3c/master/svc-i3c-master.c +++ b/drivers/i3c/master/svc-i3c-master.c @@ -388,10 +388,11 @@ static int svc_i3c_master_handle_ibi(struct svc_i3c_master *master, return 0; } -static void svc_i3c_master_ack_ibi(struct svc_i3c_master *master, +static int svc_i3c_master_ack_ibi(struct svc_i3c_master *master, bool mandatory_byte) { unsigned int ibi_ack_nack; + u32 reg; ibi_ack_nack = SVC_I3C_MCTRL_REQUEST_IBI_ACKNACK; if (mandatory_byte) @@ -400,18 +401,30 @@ static void svc_i3c_master_ack_ibi(struct svc_i3c_master *master, ibi_ack_nack |= SVC_I3C_MCTRL_IBIRESP_ACK_WITHOUT_BYTE; writel(ibi_ack_nack, master->regs + SVC_I3C_MCTRL); + + return readl_poll_timeout_atomic(master->regs + SVC_I3C_MSTATUS, reg, + SVC_I3C_MSTATUS_MCTRLDONE(reg), 1, 1000); + } -static void svc_i3c_master_nack_ibi(struct svc_i3c_master *master) +static int svc_i3c_master_nack_ibi(struct svc_i3c_master *master) { + int ret; + u32 reg; + writel(SVC_I3C_MCTRL_REQUEST_IBI_ACKNACK | SVC_I3C_MCTRL_IBIRESP_NACK, master->regs + SVC_I3C_MCTRL); + + ret = readl_poll_timeout_atomic(master->regs + SVC_I3C_MSTATUS, reg, + SVC_I3C_MSTATUS_MCTRLDONE(reg), 1, 1000); + return ret; } static int svc_i3c_master_handle_ibi_won(struct svc_i3c_master *master, u32 mstatus) { u32 ibitype; + int ret = 0; ibitype = SVC_I3C_MSTATUS_IBITYPE(mstatus); @@ -421,10 +434,10 @@ static int svc_i3c_master_handle_ibi_won(struct svc_i3c_master *master, u32 msta switch (ibitype) { case SVC_I3C_MSTATUS_IBITYPE_HOT_JOIN: case SVC_I3C_MSTATUS_IBITYPE_MASTER_REQUEST: - svc_i3c_master_nack_ibi(master); + ret = svc_i3c_master_nack_ibi(master); } - return 0; + return ret; } static void svc_i3c_master_ibi_work(struct work_struct *work) @@ -935,7 +948,9 @@ static int svc_i3c_master_do_daa_locked(struct svc_i3c_master *master, if (ret) break; } else if (SVC_I3C_MSTATUS_IBIWON(reg)) { - svc_i3c_master_handle_ibi_won(master, reg); + ret = svc_i3c_master_handle_ibi_won(master, reg); + if (ret) + break; continue; } else if (SVC_I3C_MSTATUS_MCTRLDONE(reg)) { if (SVC_I3C_MSTATUS_STATE_IDLE(reg) && @@ -1209,7 +1224,9 @@ static int svc_i3c_master_xfer(struct svc_i3c_master *master, * start. */ if (SVC_I3C_MSTATUS_IBIWON(reg)) { - svc_i3c_master_handle_ibi_won(master, reg); + ret = svc_i3c_master_handle_ibi_won(master, reg); + if (ret) + goto emit_stop; continue; }