aspeed: i2c: Fix DMA len write-enable bit handling
PATCH 1/1 aspeed: i2c: Fix DMA len write-enable bit handling
I noticed i2c rx transfers were getting shortened to "1" on Zephyr. It seems to be because the Zephyr i2c driver sets the RX DMA len with the RX field write-enable bit set (bit 31) to avoid a read-modify-write. [1]
/* 0x1C : I2CM Master DMA Transfer Length Register */
I think we should be checking the write-enable bits on the incoming value, not checking the register array. I'm not sure we're even writing the write-enable bits to the register array, actually.
--- hw/i2c/aspeed_i2c.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
hw/i2c/aspeed_i2c.c +4 -4
@@ -644,18 +644,18 @@ static void aspeed_i2c_bus_new_write(AspeedI2CBus *bus, hwaddr offset, RX_BUF_LEN) + 1;break ;case A_I2CM_DMA_LEN : - w1t =ARRAY_FIELD_EX32 (bus->regs,I2CM_DMA_LEN ,RX_BUF_LEN_W1T ) || -ARRAY_FIELD_EX32 (bus->regs,I2CM_DMA_LEN ,TX_BUF_LEN_W1T ); + w1t =FIELD_EX32 (value,I2CM_DMA_LEN ,RX_BUF_LEN_W1T ) || +FIELD_EX32 (value,I2CM_DMA_LEN ,TX_BUF_LEN_W1T );/* If none of the w1t bits are set, just write to the reg as normal. */ if (!w1t) { bus->regs[R_I2CM_DMA_LEN ] = value;break ; } -if (ARRAY_FIELD_EX32 (bus->regs,I2CM_DMA_LEN ,RX_BUF_LEN_W1T )) { +if (FIELD_EX32 (value,I2CM_DMA_LEN ,RX_BUF_LEN_W1T )) {ARRAY_FIELD_DP32 (bus->regs,I2CM_DMA_LEN ,RX_BUF_LEN ,FIELD_EX32 (value,I2CM_DMA_LEN ,RX_BUF_LEN )); } -if (ARRAY_FIELD_EX32 (bus->regs,I2CM_DMA_LEN ,TX_BUF_LEN_W1T )) { +if (FIELD_EX32 (value,I2CM_DMA_LEN ,TX_BUF_LEN_W1T )) {ARRAY_FIELD_DP32 (bus->regs,I2CM_DMA_LEN ,TX_BUF_LEN ,FIELD_EX32 (value,I2CM_DMA_LEN ,TX_BUF_LEN )); }
Signature · 1 line
2.30.2
Quoted 8 lines · Peter Delevoryas
I noticed i2c rx transfers were getting shortened to "1" on Zephyr. It seems to be because the Zephyr i2c driver sets the RX DMA len with the RX field write-enable bit set (bit 31) to avoid a read-modify-write. [1]
Quoted 7 lines
/*
0x1C: I2CM Master DMA Transfer Length Register */I think we should be checking the write-enable bits on the incoming value, not checking the register array. I'm not sure we're even writing the write-enable bits to the register array, actually.
Arg, forgot this:
Should I resend as v2?
Thanks,
Peter
Quoted 36 lines
Signed-off-by Peter Delevoryas <[email protected]>---
hw/i2c/aspeed_i2c.c| 8 ++++----1 file changed, 4 insertions(+), 4 deletions(-)hw/i2c/aspeed_i2c.c +4
-4@@ -644,18 +644,18 @@ static void aspeed_i2c_bus_new_write(AspeedI2CBus *bus, hwaddr offset, RX_BUF_LEN) + 1;break ;case A_I2CM_DMA_LEN : - w1t =ARRAY_FIELD_EX32 (bus->regs,I2CM_DMA_LEN ,RX_BUF_LEN_W1T ) || -ARRAY_FIELD_EX32 (bus->regs,I2CM_DMA_LEN ,TX_BUF_LEN_W1T ); + w1t =FIELD_EX32 (value,I2CM_DMA_LEN ,RX_BUF_LEN_W1T ) || +FIELD_EX32 (value,I2CM_DMA_LEN ,TX_BUF_LEN_W1T );/* If none of the w1t bits are set, just write to the reg as normal. */ if (!w1t) { bus->regs[R_I2CM_DMA_LEN ] = value;break ; } -if (ARRAY_FIELD_EX32 (bus->regs,I2CM_DMA_LEN ,RX_BUF_LEN_W1T )) { +if (FIELD_EX32 (value,I2CM_DMA_LEN ,RX_BUF_LEN_W1T )) {ARRAY_FIELD_DP32 (bus->regs,I2CM_DMA_LEN ,RX_BUF_LEN ,FIELD_EX32 (value,I2CM_DMA_LEN ,RX_BUF_LEN )); } -if (ARRAY_FIELD_EX32 (bus->regs,I2CM_DMA_LEN ,TX_BUF_LEN_W1T )) { +if (FIELD_EX32 (value,I2CM_DMA_LEN ,TX_BUF_LEN_W1T )) {ARRAY_FIELD_DP32 (bus->regs,I2CM_DMA_LEN ,TX_BUF_LEN ,FIELD_EX32 (value,I2CM_DMA_LEN ,TX_BUF_LEN )); }Signature · 1 line
2.30.2
Quoted 14 lines · Peter Delevoryas
Quoted 14 lines · Peter Delevoryas
I noticed i2c rx transfers were getting shortened to "1" on Zephyr. It seems to be because the Zephyr i2c driver sets the RX DMA len with the RX field write-enable bit set (bit 31) to avoid a read-modify-write. [1]
/*
0x1C: I2CM Master DMA Transfer Length Register */I think we should be checking the write-enable bits on the incoming value, not checking the register array. I'm not sure we're even writing the write-enable bits to the register array, actually.
Quoted 7 lines
Quoted 1 line
Arg, forgot this:
Fixes ba2cccd64e90f34 ("aspeed: i2c: Add new mode support”)Should I resend as v2?
No. patchwork did it :
http://patchwork.ozlabs.org/project/qemu-devel/patch/[email protected]/
Thanks,
C.
Quoted 40 lines
Thanks,
PeterQuoted 36 lines
Signed-off-by Peter Delevoryas <[email protected]>---
hw/i2c/aspeed_i2c.c| 8 ++++----1 file changed, 4 insertions(+), 4 deletions(-)hw/i2c/aspeed_i2c.c +4
-4@@ -644,18 +644,18 @@ static void aspeed_i2c_bus_new_write(AspeedI2CBus *bus, hwaddr offset, RX_BUF_LEN) + 1;break ;case A_I2CM_DMA_LEN : - w1t =ARRAY_FIELD_EX32 (bus->regs,I2CM_DMA_LEN ,RX_BUF_LEN_W1T ) || -ARRAY_FIELD_EX32 (bus->regs,I2CM_DMA_LEN ,TX_BUF_LEN_W1T ); + w1t =FIELD_EX32 (value,I2CM_DMA_LEN ,RX_BUF_LEN_W1T ) || +FIELD_EX32 (value,I2CM_DMA_LEN ,TX_BUF_LEN_W1T );/* If none of the w1t bits are set, just write to the reg as normal. */ if (!w1t) { bus->regs[R_I2CM_DMA_LEN ] = value;break ; } -if (ARRAY_FIELD_EX32 (bus->regs,I2CM_DMA_LEN ,RX_BUF_LEN_W1T )) { +if (FIELD_EX32 (value,I2CM_DMA_LEN ,RX_BUF_LEN_W1T )) {ARRAY_FIELD_DP32 (bus->regs,I2CM_DMA_LEN ,RX_BUF_LEN ,FIELD_EX32 (value,I2CM_DMA_LEN ,RX_BUF_LEN )); } -if (ARRAY_FIELD_EX32 (bus->regs,I2CM_DMA_LEN ,TX_BUF_LEN_W1T )) { +if (FIELD_EX32 (value,I2CM_DMA_LEN ,TX_BUF_LEN_W1T )) {ARRAY_FIELD_DP32 (bus->regs,I2CM_DMA_LEN ,TX_BUF_LEN ,FIELD_EX32 (value,I2CM_DMA_LEN ,TX_BUF_LEN )); }Signature · 1 line
2.30.2