tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

i3c: master: Replace hard code 2 with macro I3C_ADDR_SLOT_STATUS_BITS

Browse Source 
[ Upstream commit 16aed0a6520ba01b7d22c32e193fc1ec674f92d4 ]

Replace the hardcoded value 2, which indicates 2 bits for I3C address
status, with the predefined macro I3C_ADDR_SLOT_STATUS_BITS.

Improve maintainability and extensibility of the code.

Reviewed-by: Miquel Raynal <miquel.raynal@bootlin.com>
Signed-off-by: Frank Li <Frank.Li@nxp.com>
Link: https://lore.kernel.org/r/20241021-i3c_dts_assign-v8-1-4098b8bde01e@nxp.com
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Stable-dep-of: 851bd21cdb55 ("i3c: master: Fix dynamic address leak when 'assigned-address' is present")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Frank Li
2024-10-21 11:45:06 -04:00
committed by Greg Kroah-Hartman
parent 8e9fec7f79
commit 815d8f0e52
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/i3c/master.c
+2 -2
View File
@@ -348,7 +348,7 @@ static enum i3c_addr_slot_status
i3c_bus_get_addr_slot_status(struct i3c_bus *bus, u16 addr) i3c_bus_get_addr_slot_status(struct i3c_bus *bus, u16 addr)
{ {
unsigned long status; unsigned long status;
int bitpos = addr * 2; int bitpos = addr * I3C_ADDR_SLOT_STATUS_BITS;
if (addr > I2C_MAX_ADDR) if (addr > I2C_MAX_ADDR)
return I3C_ADDR_SLOT_RSVD; return I3C_ADDR_SLOT_RSVD;
@@ -362,7 +362,7 @@ i3c_bus_get_addr_slot_status(struct i3c_bus *bus, u16 addr)
static void i3c_bus_set_addr_slot_status(struct i3c_bus *bus, u16 addr, static void i3c_bus_set_addr_slot_status(struct i3c_bus *bus, u16 addr,
enum i3c_addr_slot_status status) enum i3c_addr_slot_status status)
{ {
int bitpos = addr * 2; int bitpos = addr * I3C_ADDR_SLOT_STATUS_BITS;
unsigned long *ptr; unsigned long *ptr;
if (addr > I2C_MAX_ADDR) if (addr > I2C_MAX_ADDR)
include/linux/i3c/master.h
+3 -1
View File
@@ -313,6 +313,8 @@ enum i3c_addr_slot_status {
I3C_ADDR_SLOT_STATUS_MASK = 3, I3C_ADDR_SLOT_STATUS_MASK = 3,
}; };
#define I3C_ADDR_SLOT_STATUS_BITS 2
/** /**
* struct i3c_bus - I3C bus object * struct i3c_bus - I3C bus object
* @cur_master: I3C master currently driving the bus. Since I3C is multi-master * @cur_master: I3C master currently driving the bus. Since I3C is multi-master
@@ -354,7 +356,7 @@ enum i3c_addr_slot_status {
struct i3c_bus { struct i3c_bus {
struct i3c_dev_desc *cur_master; struct i3c_dev_desc *cur_master;
int id; int id;
unsigned long addrslots[((I2C_MAX_ADDR + 1) * 2) / BITS_PER_LONG]; unsigned long addrslots[((I2C_MAX_ADDR + 1) * I3C_ADDR_SLOT_STATUS_BITS) / BITS_PER_LONG];
enum i3c_bus_mode mode; enum i3c_bus_mode mode;
struct { struct {
unsigned long i3c; unsigned long i3c;