hw/ssi: imx_spi: Fix various bugs in the imx_spi model
v2 cover hw/ssi: imx_spi: Fix various bugs in the imx_spi model
From: Bin Meng <[email protected]>
This series fixes a bunch of bugs in current implementation of the imx spi controller, including the following issues:
- chip select signal was not lower down when spi controller is reset
- transfer incorrect data when the burst length is larger than 32 bit
- spi controller tx and rx fifo endianness is incorrect
Tested with upstream U-Boot v2020.10 (polling mode) and VxWorks 7 (interrupt mode).
Changes in v2:
- Fix the "Fixes" tag in the commit message
- Use ternary operator as Philippe suggested
Bin Meng (3):
hw/ssi: imx_spi: Use a macro for number of chip selects supported hw/ssi: imx_spi: Correct the burst length > 32 bit transfer logic hw/ssi: imx_spi: Correct tx and rx fifo endianness
Xuzhou Cheng (1):
hw/ssi: imx_spi: Disable chip selects in imx_spi_reset()
include/hw/ssi/imx_spi.h | 5 ++++- hw/ssi/imx_spi.c | 27 ++++++++++++++++++++------- 2 files changed, 24 insertions(+), 8 deletions(-)
Signature · 1 line
2.25.1
PATCH v2 1/4 hw/ssi: imx_spi: Use a macro for number of chip selects supported
From: Bin Meng <[email protected]>
Avoid using a magic number (4) everywhere for the number of chip selects supported.
---
(no changes since v1)
include/hw/ssi/imx_spi.h | 5 ++++- hw/ssi/imx_spi.c | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-)
include/hw/ssi/imx_spi.h +4 -1
@@ -77,6 +77,9 @@#define EXTRACT (value, name) extract32(value, name##_SHIFT, name##_LENGTH) +/* number of chip selects supported */ +#define ECSPI_NUM_CS 4 +#define TYPE_IMX_SPI "imx.spi"OBJECT_DECLARE_SIMPLE_TYPE (IMXSPIState,IMX_SPI )
@@ -89,7 +92,7 @@ struct IMXSPIState {qemu_irq irq; -qemu_irq cs_lines[4 ]; +qemu_irq cs_lines[ECSPI_NUM_CS ];SSIBus *bus;
hw/ssi/imx_spi.c +2 -2
@@ -361,7 +361,7 @@ static void imx_spi_write(void *opaque, hwaddr offset, uint64_t value,/* We are in master mode */ -for (i =0 ; i <4 ; i++) { +for (i =0 ; i <ECSPI_NUM_CS ; i++) {qemu_set_irq (s->cs_lines[i], i ==imx_spi_selected_channel (s) ?0 :1 ); }
@@ -424,7 +424,7 @@ static void imx_spi_realize(DeviceState *dev, Error **errp)sysbus_init_mmio (SYS_BUS_DEVICE (dev), &s->iomem);sysbus_init_irq (SYS_BUS_DEVICE (dev), &s->irq); -for (i =0 ; i <4 ; ++i) { +for (i =0 ; i <ECSPI_NUM_CS ; ++i) {sysbus_init_irq (SYS_BUS_DEVICE (dev), &s->cs_lines[i]); }
Signature · 1 line
2.25.1
PATCH v2 2/4 hw/ssi: imx_spi: Disable chip selects in imx_spi_reset()
In reply to Bin MengFrom: Xuzhou Cheng <[email protected]>
When a write to ECSPI_CONREG register to disable the SPI controller, imx_spi_reset() is called to reset the controller, during which CS lines should have been disabled, otherwise the state machine of any devices (e.g.: SPI flashes) connected to the SPI master is stuck to its last state and responds incorrectly to any follow-up commands.
---
Changes in v2:
- Fix the "Fixes" tag in the commit message
hw/ssi/imx_spi.c | 5 +++++ 1 file changed, 5 insertions(+)
hw/ssi/imx_spi.c +5 -0
@@ -231,6 +231,7 @@ static void imx_spi_flush_txfifo(IMXSPIState *s)static void imx_spi_reset (DeviceState *dev) {IMXSPIState *s =IMX_SPI (dev); +int i;DPRINTF ("\n" );
@@ -243,6 +244,10 @@ static void imx_spi_reset(DeviceState *dev)imx_spi_update_irq (s); +for (i =0 ; i <ECSPI_NUM_CS ; i++) { +qemu_set_irq (s->cs_lines[i],1 ); + } + s->burst_length =0 ; }
Signature · 1 line
2.25.1
PATCH v2 3/4 hw/ssi: imx_spi: Correct the burst length > 32 bit transfer logic
In reply to Bin MengFrom: Bin Meng <[email protected]>
For the ECSPIx_CONREG register BURST_LENGTH field, the manual says:
0x020 A SPI burst contains the 1 LSB in first word and all 32 bits in second word. 0x021 A SPI burst contains the 2 LSB in first word and all 32 bits in second word.
Current logic uses either s->burst_length or 32, whichever smaller, to determine how many bits it should read from the tx fifo each time. For example, for a 48 bit burst length, current logic transfers the first 32 bit from the first word in the tx fifo, followed by a 16 bit from the second word in the tx fifo, which is wrong. The correct logic should be: transfer the first 16 bit from the first word in the tx fifo, followed by a 32 bit from the second word in the tx fifo.
With this change, SPI flash can be successfully probed by U-Boot on imx6 sabrelite board.
=> sf probe
SF: Detected sst25vf016b with page size 256 Bytes, erase size 4 KiB, total 2 MiB
---
Changes in v2:
- Use ternary operator as Philippe suggested
hw/ssi/imx_spi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
hw/ssi/imx_spi.c +1 -1
@@ -178,7 +178,7 @@ static void imx_spi_flush_txfifo(IMXSPIState *s)DPRINTF ("data tx:0x%08x\n" , tx); - tx_burst =MIN (s->burst_length,32 ); + tx_burst = (s->burst_length %32 ) ? :32 ; rx =0 ;
Signature · 1 line
2.25.1
PATCH v2 4/4 hw/ssi: imx_spi: Correct tx and rx fifo endianness
In reply to Bin MengFrom: Bin Meng <[email protected]>
The endianness of data exchange between tx and rx fifo is incorrect. Earlier bytes are supposed to show up on MSB and later bytes on LSB,
ie: in big endian. The manual does not explicitly say this, but the U-Boot and Linux driver codes have a swap on the data transferred to tx fifo and from rx fifo.
With this change, U-Boot read from / write to SPI flash tests pass.
=> sf test 1ff000 1000
SPI flash test:
0 erase: 0 ticks, 4096000 KiB/s 32768.000 Mbps
1 check: 3 ticks, 1333 KiB/s 10.664 Mbps
2 write: 235 ticks, 17 KiB/s 0.136 Mbps
3 read: 2 ticks, 2000 KiB/s 16.000 Mbps
Test passed
0 erase: 0 ticks, 4096000 KiB/s 32768.000 Mbps
1 check: 3 ticks, 1333 KiB/s 10.664 Mbps
2 write: 235 ticks, 17 KiB/s 0.136 Mbps
3 read: 2 ticks, 2000 KiB/s 16.000 Mbps
---
(no changes since v1)
hw/ssi/imx_spi.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
hw/ssi/imx_spi.c +12 -4
@@ -156,13 +156,14 @@ static void imx_spi_flush_txfifo(IMXSPIState *s) {uint32_t tx;uint32_t rx; +uint32_t data; +uint8_t byte;DPRINTF ("Begin: TX Fifo Size = %d, RX Fifo Size = %d\n" ,fifo32_num_used (&s->tx_fifo),fifo32_num_used (&s->rx_fifo));while (!fifo32_is_empty (&s->tx_fifo)) {int tx_burst =0 ; -int index =0 ;if (s->burst_length <=0 ) { s->burst_length =imx_spi_burst_length (s);
@@ -180,10 +181,18 @@ static void imx_spi_flush_txfifo(IMXSPIState *s) tx_burst = (s->burst_length %32 ) ? :32 ; + data =0 ; +for (int i =0 ; i < tx_burst /8 ; i++) { + byte = tx &0xff ; + tx = tx >>8 ; + data = (data <<8 ) | byte; + } + tx = data; + rx =0 ;while (tx_burst >0 ) { -uint8_t byte = tx &0xff ; + byte = tx &0xff ;DPRINTF ("writing 0x%02x\n" , (uint32_t )byte);
@@ -193,12 +202,11 @@ static void imx_spi_flush_txfifo(IMXSPIState *s)DPRINTF ("0x%02x read\n" , (uint32_t )byte); tx = tx >>8 ; - rx |= (byte << (index *8 )); + rx = (rx <<8 ) | byte;/* Remove 8 bits from the actual burst */ tx_burst -=8 ; s->burst_length -=8 ; - index++; }DPRINTF ("data rx:0x%08x\n" , rx);
Signature · 1 line
2.25.1