hw/ssi: imx_spi: Use a macro for number of chip selects supported
PATCH 1/2 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.
---
hw/ssi/imx_spi.c | 4 ++-- include/hw/ssi/imx_spi.h | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-)
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]); }
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;
Signature · 1 line
2.7.4
PATCH 2/2 hw/ssi: imx_spi: Disable chip selects in imx_spi_reset()
From: 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.
Fixes c906a3a01582: ("i.MX: Add the Freescale SPI Controller")
---
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.7.4
Re: [PATCH 2/2] hw/ssi: imx_spi: Disable chip selects in imx_spi_reset()
Quoted 9 lines · Bin Meng
From: Xuzhou Cheng <[email protected]>
When a write to
ECSPI_CONREGregister 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.
Quoted 3 lines
Fixes
c906a3a01582: ("i.MX: Add the Freescale SPI Controller")Signed-off-by Xuzhou Cheng <[email protected]>Signed-off-by Bin Meng <[email protected]>
Alistair
Quoted 33 lines
---
hw/ssi/imx_spi.c | 5 +++++ 1 file changed, 5 insertions(+)hw/ssi/imx_spi.c +5
-1@@ -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 ; } --2.7.4
Quoted 7 lines · Bin Meng
From: Bin Meng <[email protected]>
Avoid using a magic number (4) everywhere for the number of chip selects supported.
Signed-off-by Bin Meng <[email protected]>
Alistair
Quoted 55 lines
---
hw/ssi/imx_spi.c | 4 ++-- include/hw/ssi/imx_spi.h | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-)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]); }include/hw/ssi/imx_spi.h +4
-2@@ -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; --2.7.4