lkml.org 
[lkml]   [2022]   [Apr]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 311/338] spi: bcm-qspi: fix MSPI only access with bcm_qspi_exec_mem_op()
    Date
    From: Kamal Dasu <kdasu.kdev@gmail.com>

    [ Upstream commit 2c7d1b281286c46049cd22b43435cecba560edde ]

    This fixes case where MSPI controller is used to access spi-nor
    flash and BSPI block is not present.

    Fixes: 5f195ee7d830 ("spi: bcm-qspi: Implement the spi_mem interface")
    Signed-off-by: Kamal Dasu <kdasu.kdev@gmail.com>
    Acked-by: Florian Fainelli <f.fainelli@gmail.com>
    Link: https://lore.kernel.org/r/20220328142442.7553-1-kdasu.kdev@gmail.com
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/spi/spi-bcm-qspi.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/spi/spi-bcm-qspi.c b/drivers/spi/spi-bcm-qspi.c
    index 82c24c85f45b..3f291db7b39a 100644
    --- a/drivers/spi/spi-bcm-qspi.c
    +++ b/drivers/spi/spi-bcm-qspi.c
    @@ -970,7 +970,7 @@ static int bcm_qspi_exec_mem_op(struct spi_mem *mem,
    addr = op->addr.val;
    len = op->data.nbytes;

    - if (bcm_qspi_bspi_ver_three(qspi) == true) {
    + if (has_bspi(qspi) && bcm_qspi_bspi_ver_three(qspi) == true) {
    /*
    * The address coming into this function is a raw flash offset.
    * But for BSPI <= V3, we need to convert it to a remapped BSPI
    @@ -989,7 +989,7 @@ static int bcm_qspi_exec_mem_op(struct spi_mem *mem,
    len < 4)
    mspi_read = true;

    - if (mspi_read)
    + if (!has_bspi(qspi) || mspi_read)
    return bcm_qspi_mspi_exec_mem_op(spi, op);

    ret = bcm_qspi_bspi_set_mode(qspi, op, 0);
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-04-14 16:14    [W:4.194 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site