From f18f98110f2b179792cb70d85cba697320a3790f Mon Sep 17 00:00:00 2001

From: Jamie Iles <quic_jiles@quicinc.com>

Date: Wed, 22 Sep 2021 17:56:00 +0100

Subject: [PATCH] i3c: fix incorrect address slot lookup on 64-bit

Git-commit: f18f98110f2b179792cb70d85cba697320a3790f

Patch-mainline: v5.17-rc1

References: git-fixes

The address slot bitmap is an array of unsigned long's which are the

same size as an int on 32-bit platforms but not 64-bit.  Loading the

bitmap into an int could result in the incorrect status being returned

for a slot and slots being reported as the wrong status.

Fixes: 3a379bbcea0a ("i3c: Add core I3C infrastructure")

Cc: Boris Brezillon <bbrezillon@kernel.org>

Cc: Alexandre Belloni <alexandre.belloni@bootlin.com>

Signed-off-by: Jamie Iles <quic_jiles@quicinc.com>

Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>

Link: https://lore.kernel.org/r/20210922165600.179394-1-quic_jiles@quicinc.com

Acked-by: Takashi Iwai <tiwai@suse.de>

---

 drivers/i3c/master.c | 3 ++-

 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/i3c/master.c b/drivers/i3c/master.c

index c3b4c677b442..dfe18dcd008d 100644

--- a/drivers/i3c/master.c

+++ b/drivers/i3c/master.c

@@ -343,7 +343,8 @@ struct bus_type i3c_bus_type = {

 static enum i3c_addr_slot_status

 i3c_bus_get_addr_slot_status(struct i3c_bus *bus, u16 addr)

 {

-	int status, bitpos = addr * 2;

+	unsigned long status;

+	int bitpos = addr * 2;

 	if (addr > I2C_MAX_ADDR)

 		return I3C_ADDR_SLOT_RSVD;

-- 

2.31.1