mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-07-05 18:56:15 +09:00
spi: fsl_qspi: Fix qspi_op_rdid memcpy issue
In current driver everytime we memcpy 4 bytes to the dest memory regardless of the remaining length. This patch adds checking the remaining length before memcpy. If the length is shorter than 4 bytes, memcpy the actual length of data to the dest memory. Signed-off-by: Gong Qianyu <Qianyu.Gong@freescale.com> Reviewed-by: York Sun <york.sun@nxp.com>
This commit is contained in:
parent
c2a4cb17b4
commit
5207014deb
|
@ -477,8 +477,8 @@ static void qspi_op_rdbank(struct fsl_qspi_priv *priv, u8 *rxbuf, u32 len)
|
||||||
static void qspi_op_rdid(struct fsl_qspi_priv *priv, u32 *rxbuf, u32 len)
|
static void qspi_op_rdid(struct fsl_qspi_priv *priv, u32 *rxbuf, u32 len)
|
||||||
{
|
{
|
||||||
struct fsl_qspi_regs *regs = priv->regs;
|
struct fsl_qspi_regs *regs = priv->regs;
|
||||||
u32 mcr_reg, rbsr_reg, data;
|
u32 mcr_reg, rbsr_reg, data, size;
|
||||||
int i, size;
|
int i;
|
||||||
|
|
||||||
mcr_reg = qspi_read32(priv->flags, ®s->mcr);
|
mcr_reg = qspi_read32(priv->flags, ®s->mcr);
|
||||||
qspi_write32(priv->flags, ®s->mcr,
|
qspi_write32(priv->flags, ®s->mcr,
|
||||||
|
@ -494,15 +494,15 @@ static void qspi_op_rdid(struct fsl_qspi_priv *priv, u32 *rxbuf, u32 len)
|
||||||
;
|
;
|
||||||
|
|
||||||
i = 0;
|
i = 0;
|
||||||
size = len;
|
while ((RX_BUFFER_SIZE >= len) && (len > 0)) {
|
||||||
while ((RX_BUFFER_SIZE >= size) && (size > 0)) {
|
|
||||||
rbsr_reg = qspi_read32(priv->flags, ®s->rbsr);
|
rbsr_reg = qspi_read32(priv->flags, ®s->rbsr);
|
||||||
if (rbsr_reg & QSPI_RBSR_RDBFL_MASK) {
|
if (rbsr_reg & QSPI_RBSR_RDBFL_MASK) {
|
||||||
data = qspi_read32(priv->flags, ®s->rbdr[i]);
|
data = qspi_read32(priv->flags, ®s->rbdr[i]);
|
||||||
data = qspi_endian_xchg(data);
|
data = qspi_endian_xchg(data);
|
||||||
memcpy(rxbuf, &data, 4);
|
size = (len < 4) ? len : 4;
|
||||||
|
memcpy(rxbuf, &data, size);
|
||||||
|
len -= size;
|
||||||
rxbuf++;
|
rxbuf++;
|
||||||
size -= 4;
|
|
||||||
i++;
|
i++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user