| Message ID | 20230812065230.8839-4-francis_yuu@stu.pku.edu.cn |
|---|---|
| State | New |
| Headers | show |
| Series | hw/i2c/aspeed: Fix Tx and Rx error | expand |
On 8/12/23 08:52, Hang Yu wrote: > Added support for the buffer organization option in pool buffer control > register.when set to 1,The buffer is split into two parts: Lower 16 bytes > for Tx and higher 16 bytes for Rx. > > Signed-off-by: Hang Yu <francis_yuu@stu.pku.edu.cn> Reviewed-by: Cédric Le Goater <clg@kaod.org> Thanks, C. > --- > v2-->v3: > 1. Fixed typos > 2. Simplified the judgment logic of buffer organization. > 3. Change the buffer organization field to a shared field, and move it > from I2CC_POOL_CTRL to I2CD_POOL_CTRL. > > hw/i2c/aspeed_i2c.c | 3 +++ > include/hw/i2c/aspeed_i2c.h | 1 + > 2 files changed, 4 insertions(+) > > diff --git a/hw/i2c/aspeed_i2c.c b/hw/i2c/aspeed_i2c.c > index 44905d7899..5d84797027 100644 > --- a/hw/i2c/aspeed_i2c.c > +++ b/hw/i2c/aspeed_i2c.c > @@ -297,6 +297,9 @@ static void aspeed_i2c_bus_recv(AspeedI2CBus *bus) > > if (SHARED_ARRAY_FIELD_EX32(bus->regs, reg_cmd, RX_BUFF_EN)) { > uint8_t *pool_base = aic->bus_pool_base(bus); > + if (SHARED_ARRAY_FIELD_EX32(bus->regs, reg_pool_ctrl, BUF_ORGANIZATION)) { > + pool_base += 16; > + } > > for (i = 0; i < pool_rx_count; i++) { > pool_base[i] = i2c_recv(bus->bus); > diff --git a/include/hw/i2c/aspeed_i2c.h b/include/hw/i2c/aspeed_i2c.h > index 2e1e15aaf0..a064479e59 100644 > --- a/include/hw/i2c/aspeed_i2c.h > +++ b/include/hw/i2c/aspeed_i2c.h > @@ -143,6 +143,7 @@ REG32(I2CD_POOL_CTRL, 0x1C) /* Pool Buffer Control */ > SHARED_FIELD(RX_SIZE, 16, 5) > SHARED_FIELD(TX_COUNT, 8, 5) > FIELD(I2CD_POOL_CTRL, OFFSET, 2, 6) /* AST2400 */ > + SHARED_FIELD(BUF_ORGANIZATION, 0, 1) /* AST2600 */ > REG32(I2CD_BYTE_BUF, 0x20) /* Transmit/Receive Byte Buffer */ > SHARED_FIELD(RX_BUF, 8, 8) > SHARED_FIELD(TX_BUF, 0, 8)
diff --git a/hw/i2c/aspeed_i2c.c b/hw/i2c/aspeed_i2c.c index 44905d7899..5d84797027 100644 --- a/hw/i2c/aspeed_i2c.c +++ b/hw/i2c/aspeed_i2c.c @@ -297,6 +297,9 @@ static void aspeed_i2c_bus_recv(AspeedI2CBus *bus) if (SHARED_ARRAY_FIELD_EX32(bus->regs, reg_cmd, RX_BUFF_EN)) { uint8_t *pool_base = aic->bus_pool_base(bus); + if (SHARED_ARRAY_FIELD_EX32(bus->regs, reg_pool_ctrl, BUF_ORGANIZATION)) { + pool_base += 16; + } for (i = 0; i < pool_rx_count; i++) { pool_base[i] = i2c_recv(bus->bus); diff --git a/include/hw/i2c/aspeed_i2c.h b/include/hw/i2c/aspeed_i2c.h index 2e1e15aaf0..a064479e59 100644 --- a/include/hw/i2c/aspeed_i2c.h +++ b/include/hw/i2c/aspeed_i2c.h @@ -143,6 +143,7 @@ REG32(I2CD_POOL_CTRL, 0x1C) /* Pool Buffer Control */ SHARED_FIELD(RX_SIZE, 16, 5) SHARED_FIELD(TX_COUNT, 8, 5) FIELD(I2CD_POOL_CTRL, OFFSET, 2, 6) /* AST2400 */ + SHARED_FIELD(BUF_ORGANIZATION, 0, 1) /* AST2600 */ REG32(I2CD_BYTE_BUF, 0x20) /* Transmit/Receive Byte Buffer */ SHARED_FIELD(RX_BUF, 8, 8) SHARED_FIELD(TX_BUF, 0, 8)
Added support for the buffer organization option in pool buffer control register.when set to 1,The buffer is split into two parts: Lower 16 bytes for Tx and higher 16 bytes for Rx. Signed-off-by: Hang Yu <francis_yuu@stu.pku.edu.cn> --- v2-->v3: 1. Fixed typos 2. Simplified the judgment logic of buffer organization. 3. Change the buffer organization field to a shared field, and move it from I2CC_POOL_CTRL to I2CD_POOL_CTRL. hw/i2c/aspeed_i2c.c | 3 +++ include/hw/i2c/aspeed_i2c.h | 1 + 2 files changed, 4 insertions(+)