From:   Clark Wang <xiaoning.wang@nxp.com>
To:     miquel.raynal@bootlin.com
Cc:     conor.culhane@silvaco.com, alexandre.belloni@bootlin.com,
        linux-i3c@lists.infradead.org, linux-kernel@vger.kernel.org
Subject: [PATCH V5 2/8] i3c: master: svc: fix atomic issue
Date:   Mon, 27 Dec 2021 15:45:23 +0800
Message-Id: <20211227074529.1660398-3-xiaoning.wang@nxp.com>
In-Reply-To: <20211227074529.1660398-1-xiaoning.wang@nxp.com>
References: <20211227074529.1660398-1-xiaoning.wang@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?N80L6sboLEZwnPZcZYuy+UzEFwL7tdK7PAY/BlY1RddWfE4OE49oyByKGOPv?=
 =?us-ascii?Q?OS3iNQrZ4ghtkhEFmgX5ytry6AmtRe74qDAhfyod85smiEjYWi3MFN9vIOCV?=
 =?us-ascii?Q?DlwVc6/cLpQnseeRZcbEaFAyu4aFmkaswO3Ajsyjaw/cPM8Ti2wXH7BGd1us?=
 =?us-ascii?Q?lbq+YsAkMuiq54kHuMcwild/DrhM91Zyu/D/QyNBMWvqEhohohY2iS+5ZI2d?=
 =?us-ascii?Q?iwkz3zQEc6hPK6VcPF5DfwQ9nWVS2RnhcpVpAfsKfEdXnp4n7pRp7NCntXYN?=
 =?us-ascii?Q?0bKfRogxeUz4B5JV0VEpkVfGHA+4bsJxiGl48WKiro/X1L7tnqp1w5msDLUT?=
 =?us-ascii?Q?F5b74BxkFdPEKkkgWutPxIcaZAuzTFgdK5qRiJWkgGY8Teh5NhzvxEZ+no6s?=
 =?us-ascii?Q?aardz5CL258U03a0TJoQhMlxBCCXzCM/L/U9If0FBPZwAXpvXA/uymascOia?=
 =?us-ascii?Q?XhR9++hsnSc6Bl5/TvhBSMzJcrIuPwRrp9ptz2VVMrMjB+0pIb1A3Jq65b5e?=
 =?us-ascii?Q?lJHKsLC2w8MaXL04Zpn1ZmirZmiZMjPFZ+EEvxxIts5ni5K0PRYXkFmpTd9d?=
 =?us-ascii?Q?7byPLPOjjzBggMAZl9WohKc7sRjJZwpm+WBVdW39uQtj7ogBEw7YTktk8YVI?=
 =?us-ascii?Q?fv9EnMHcGCu89vz0XWUGNqxVyl0Qu2NAoXGbiUy0wNpInaF3icg9aOrNgjEN?=
 =?us-ascii?Q?SGhlk5tYkhXK0gT74rN//rvItCfu6LIAPlMwkGUjMPRGE9Aczx2wmfREKiJR?=
 =?us-ascii?Q?kZ6cfVhe+BC5UaNbpqbssX6+pQvWYsZm5b/6EWLL6XpiZ/9bDgGiA8kUrjej?=
 =?us-ascii?Q?a3w2dTAwpCxS2DJ/o60hSEZm2Ubzbp+w4FFKIgydq3SvoV9QaMBRd0YTiJfY?=
 =?us-ascii?Q?IlEDJPYas+t+XFjO5yxxESop3CjbNCeHqqy2xlpTlebi1Ajd7MJwtCAEqNzc?=
 =?us-ascii?Q?C4RU0KSeW4jo42SNfGWMLi1t3emR3zCrkGFC6TQFNfWcuATh5EDQU9zDKkTh?=
 =?us-ascii?Q?nFEweWRhqk4kYag8wJzx+XDSsUc1ZTepnkXhAvV4DvwtgKGkRaU2ArdNn/Py?=
 =?us-ascii?Q?deRSND8su3sxpCqrCsR1xuwlJCn9tzPfGd5npTPlkmQn7ycTkrH/1pQeNPvj?=
 =?us-ascii?Q?3/527LGPyqsO0poUlshkqWXN81hJuQTX2BoXzE6BWdymunLpiSaRBGhFJHYu?=
 =?us-ascii?Q?eqp0Q78YDYCL6uxz+N4GrGmUVeBkXKyNzDdJbWxu0lx8NdpcICJexKK0rdBP?=
 =?us-ascii?Q?TmZnCUV2ZbVNAJ6WIxbI7DpZpQJy1YsEua9YjXm+f4P+o/iFt0KyxjASQouW?=
 =?us-ascii?Q?/iImSsfqTvd8DDluc6e/wIp1INi0CE+Mi3mv4kpmKwTxhX6HWuVZ3lDnAy6R?=
 =?us-ascii?Q?bg1JMwD8pEVjGyq1AM95zxzcj2UrTqe/1X+o79lptxZqamGEt6oJnNSxC/OM?=
 =?us-ascii?Q?HdTOp2x+ox7NegTWhgQnGDAVsrPW+NJFwlpkH90ogy7VA0ZTYtPqV1ZpkCJ/?=
 =?us-ascii?Q?52rhx09k/KwogqUfXJ5bpBtgEqIOXmlp06JuCiGl7CAC1MewD4rnKR24rYSr?=
 =?us-ascii?Q?dZJ9YKc9CHTQ+P51Hm47PNumpQUfHVZbeW6U9Ym9TRstlrjpL/42j59DzrXP?=
 =?us-ascii?Q?R2BTfWaq7QumIFb+GumuEmc=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 06c1b2ca-85ac-4346-db96-08d9c90d64e4
X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5631.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Dec 2021 07:49:21.5852
 (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: nLC/meowtXmj4R1Zt2bNPKD5imdHFP9mrKSa13e3satWfoaz9ghfnLSI/9f5ct8dSlzBX8KA2qXcF8ofzhnnKQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB5629
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

do_daa_locked() function is in a spin lock environment, use
readl_poll_timeout_atomic() to replace the origin
readl_poll_timeout().

Signed-off-by: Clark Wang <xiaoning.wang@nxp.com>
Reviewed-by: Miquel Raynal <miquel.raynal@bootlin.com>
Reviewed-by: Jun Li <jun.li@nxp.com>
---
V5:
No change.
---
 drivers/i3c/master/svc-i3c-master.c | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/drivers/i3c/master/svc-i3c-master.c b/drivers/i3c/master/svc-i3c-master.c
index c25a372f6820..47c02a60cf62 100644
--- a/drivers/i3c/master/svc-i3c-master.c
+++ b/drivers/i3c/master/svc-i3c-master.c
@@ -656,8 +656,10 @@ static int svc_i3c_master_readb(struct svc_i3c_master *master, u8 *dst,
 	u32 reg;
 
 	for (i = 0; i < len; i++) {
-		ret = readl_poll_timeout(master->regs + SVC_I3C_MSTATUS, reg,
-					 SVC_I3C_MSTATUS_RXPEND(reg), 0, 1000);
+		ret = readl_poll_timeout_atomic(master->regs + SVC_I3C_MSTATUS,
+						reg,
+						SVC_I3C_MSTATUS_RXPEND(reg),
+						0, 1000);
 		if (ret)
 			return ret;
 
@@ -687,10 +689,11 @@ static int svc_i3c_master_do_daa_locked(struct svc_i3c_master *master,
 		 * Either one slave will send its ID, or the assignment process
 		 * is done.
 		 */
-		ret = readl_poll_timeout(master->regs + SVC_I3C_MSTATUS, reg,
-					 SVC_I3C_MSTATUS_RXPEND(reg) |
-					 SVC_I3C_MSTATUS_MCTRLDONE(reg),
-					 1, 1000);
+		ret = readl_poll_timeout_atomic(master->regs + SVC_I3C_MSTATUS,
+						reg,
+						SVC_I3C_MSTATUS_RXPEND(reg) |
+						SVC_I3C_MSTATUS_MCTRLDONE(reg),
+						1, 1000);
 		if (ret)
 			return ret;
 
@@ -744,11 +747,12 @@ static int svc_i3c_master_do_daa_locked(struct svc_i3c_master *master,
 		}
 
 		/* Wait for the slave to be ready to receive its address */
-		ret = readl_poll_timeout(master->regs + SVC_I3C_MSTATUS, reg,
-					 SVC_I3C_MSTATUS_MCTRLDONE(reg) &&
-					 SVC_I3C_MSTATUS_STATE_DAA(reg) &&
-					 SVC_I3C_MSTATUS_BETWEEN(reg),
-					 0, 1000);
+		ret = readl_poll_timeout_atomic(master->regs + SVC_I3C_MSTATUS,
+						reg,
+						SVC_I3C_MSTATUS_MCTRLDONE(reg) &&
+						SVC_I3C_MSTATUS_STATE_DAA(reg) &&
+						SVC_I3C_MSTATUS_BETWEEN(reg),
+						0, 1000);
 		if (ret)
 			return ret;
 
-- 
2.25.1