Commit f29fd331 authored by Vitor Soares's avatar Vitor Soares Committed by Boris Brezillon
Browse files

i3c: master: dw-i3c-master: fix i3c_attach/reattach 



This patch fix i3c_attach/reattach functions.

During the i3c_attach the driver ignores the static address used for
SETDASA CCC command.

During the i3c_reattach the driver doesn't update master->addrs[data->index]
with new address if old_dyn_addr = 0.

Fixes: 1dd728f5 ("i3c: master: Add driver for Synopsys DesignWare IP")
Signed-off-by: default avatarVitor Soares <vitor.soares@synopsys.com>
Signed-off-by: default avatarBoris Brezillon <bbrezillon@kernel.org>
parent 0fac32f2

drivers/i3c/master/dw-i3c-master.c

+2 −5
Original line number Diff line number Diff line
@@ -901,9 +901,6 @@ static int dw_i3c_master_reattach_i3c_dev(struct i3c_dev_desc *dev, 
	       master->regs +

	       DEV_ADDR_TABLE_LOC(master->datstartaddr, data->index));



	if (!old_dyn_addr)

		return 0;



	master->addrs[data->index] = dev->info.dyn_addr;



	return 0;
@@ -925,11 +922,11 @@ static int dw_i3c_master_attach_i3c_dev(struct i3c_dev_desc *dev) 
		return -ENOMEM;



	data->index = pos;

	master->addrs[pos] = dev->info.dyn_addr;

	master->addrs[pos] = dev->info.dyn_addr ? : dev->info.static_addr;

	master->free_pos &= ~BIT(pos);

	i3c_dev_set_master_data(dev, data);



	writel(DEV_ADDR_TABLE_DYNAMIC_ADDR(dev->info.dyn_addr),

	writel(DEV_ADDR_TABLE_DYNAMIC_ADDR(master->addrs[pos]),

	       master->regs +

	       DEV_ADDR_TABLE_LOC(master->datstartaddr, data->index));