x86: ich-spi: Fix a bug of reading from a non-64 bytes aligned address
PATCH RESEND 1/1 x86: ich-spi: Fix a bug of reading from a non-64 bytes aligned address
The ich spi controller driver spi_xfer() tries to align reading address to 64 bytes when doing spi data in, which causes a bug of either infinite loop or a huge size memcpy().
Actually the ich spi controller does not have such requirement of 64 bytes alignment when reading data from spi slave devices.
---
RESEND Notes:
Simon, this patch can be applied now as it does not require any dependency to Jagan's recent patch series, nor my x86 patch series.
drivers/spi/ich.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-)
drivers/spi/ich.c +2 -15
@@ -484,8 +484,6 @@ int spi_xfer(struct spi_slave *slave, unsigned int bitlen, const void *dout,struct spi_trans *trans = &ich->trans;unsigned type = flags & (SPI_XFER_BEGIN |SPI_XFER_END );int using_cmd =0 ; -/* Align read transactions to 64-byte boundaries */ -char buff[ctlr.databytes];/* Ee don't support writing partial bytes. */ if (bitlen %8 ) {
@@ -633,14 +631,9 @@ int spi_xfer(struct spi_slave *slave, unsigned int bitlen, const void *dout,*/ while (trans->bytesout || trans->bytesin) {uint32_t data_length; -uint32_t aligned_offset; -uint32_t diff; - - aligned_offset = trans->offset & ~(ctlr.databytes -1 ); - diff = trans->offset - aligned_offset;/* SPI addresses are 24 bit only */ -ich_writel (aligned_offset &0x00FFFFFF , ctlr.addr); +ich_writel (trans->offset &0x00FFFFFF , ctlr.addr);if (trans->bytesout) data_length =min (trans->bytesout, ctlr.databytes);
@@ -674,13 +667,7 @@ int spi_xfer(struct spi_slave *slave, unsigned int bitlen, const void *dout, }if (trans->bytesin) { -if (diff) { - data_length -= diff; -read_reg (ctlr.data, buff, ctlr.databytes); -memcpy (trans->in, buff + diff, data_length); - }else { -read_reg (ctlr.data, trans->in, data_length); - } +read_reg (ctlr.data, trans->in, data_length);spi_use_in (trans, data_length);if (with_address) trans->offset += data_length;
Signature · 1 line
1.8.2.1
Simon Glass
AppliedPATCH RESEND 1/1 x86: ich-spi: Fix a bug of reading from a non-64 bytes aligned address
Quoted 7 lines · Bin Meng
The ich spi controller driver
spi_xfer()tries to align reading address to 64 bytes when doing spi data in, which causes a bug of either infinite loop or a huge sizememcpy().Actually the ich spi controller does not have such requirement of 64 bytes alignment when reading data from spi slave devices.
Quoted 8 lines
Signed-off-by Bin Meng <[email protected]>Acked-by Simon Glass <[email protected]>Tested-by Simon Glass <[email protected]>---
RESEND Notes:
Simon, this patch can be applied now as it does not require any dependency to Jagan's recent patch series, nor my x86 patch series.
Applied to x86 - thanks!
- Simon