lkml.org 
[lkml]   [2022]   [Jun]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 022/411] spi: spi-rspi: Remove setting {src,dst}_{addr,addr_width} based on DMA direction
    Date
    From: Biju Das <biju.das.jz@bp.renesas.com>

    [ Upstream commit 6f381481a5b236cb53d6de2c49c6ef83a4d0f432 ]

    The direction field in the DMA config is deprecated. The rspi driver
    sets {src,dst}_{addr,addr_width} based on the DMA direction and
    it results in dmaengine_slave_config() failure as RZ DMAC driver
    validates {src,dst}_addr_width values independent of DMA direction.

    This patch fixes the issue by passing both {src,dst}_{addr,addr_width}
    values independent of DMA direction.

    Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
    Suggested-by: Vinod Koul <vkoul@kernel.org>
    Reviewed-by: Vinod Koul <vkoul@kernel.org>
    Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
    Tested-by: Geert Uytterhoeven <geert+renesas@glider.be>
    Link: https://lore.kernel.org/r/20220411173115.6619-1-biju.das.jz@bp.renesas.com
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/spi/spi-rspi.c | 15 ++++++---------
    1 file changed, 6 insertions(+), 9 deletions(-)

    diff --git a/drivers/spi/spi-rspi.c b/drivers/spi/spi-rspi.c
    index 7222c7689c3c..0524741d73b9 100644
    --- a/drivers/spi/spi-rspi.c
    +++ b/drivers/spi/spi-rspi.c
    @@ -1044,14 +1044,11 @@ static struct dma_chan *rspi_request_dma_chan(struct device *dev,
    }

    memset(&cfg, 0, sizeof(cfg));
    + cfg.dst_addr = port_addr + RSPI_SPDR;
    + cfg.src_addr = port_addr + RSPI_SPDR;
    + cfg.dst_addr_width = DMA_SLAVE_BUSWIDTH_1_BYTE;
    + cfg.src_addr_width = DMA_SLAVE_BUSWIDTH_1_BYTE;
    cfg.direction = dir;
    - if (dir == DMA_MEM_TO_DEV) {
    - cfg.dst_addr = port_addr;
    - cfg.dst_addr_width = DMA_SLAVE_BUSWIDTH_1_BYTE;
    - } else {
    - cfg.src_addr = port_addr;
    - cfg.src_addr_width = DMA_SLAVE_BUSWIDTH_1_BYTE;
    - }

    ret = dmaengine_slave_config(chan, &cfg);
    if (ret) {
    @@ -1082,12 +1079,12 @@ static int rspi_request_dma(struct device *dev, struct spi_controller *ctlr,
    }

    ctlr->dma_tx = rspi_request_dma_chan(dev, DMA_MEM_TO_DEV, dma_tx_id,
    - res->start + RSPI_SPDR);
    + res->start);
    if (!ctlr->dma_tx)
    return -ENODEV;

    ctlr->dma_rx = rspi_request_dma_chan(dev, DMA_DEV_TO_MEM, dma_rx_id,
    - res->start + RSPI_SPDR);
    + res->start);
    if (!ctlr->dma_rx) {
    dma_release_channel(ctlr->dma_tx);
    ctlr->dma_tx = NULL;
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-06-13 12:58    [W:4.094 / U:0.864 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site