lkml.org 
[lkml]   [2022]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.16 0403/1039] spi: qcom: geni: handle timeout for gpi mode
    Date
    From: Vinod Koul <vkoul@kernel.org>

    [ Upstream commit f8039ea55d4ccac2238a247a574f0acb3bc1dc4b ]

    We missed adding handle_err for gpi mode, so add a new function
    spi_geni_handle_err() which would call handle_fifo_timeout() or newly
    added handle_gpi_timeout() based on mode

    Fixes: b59c122484ec ("spi: spi-geni-qcom: Add support for GPI dma")
    Reported-by: Douglas Anderson <dianders@chromium.org>
    Reviewed-by: Douglas Anderson <dianders@chromium.org>
    Signed-off-by: Vinod Koul <vkoul@kernel.org>
    Link: https://lore.kernel.org/r/20220103071118.27220-2-vkoul@kernel.org
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/spi/spi-geni-qcom.c | 26 +++++++++++++++++++++++++-
    1 file changed, 25 insertions(+), 1 deletion(-)

    diff --git a/drivers/spi/spi-geni-qcom.c b/drivers/spi/spi-geni-qcom.c
    index 69e71aac85129..079d0cb783ee3 100644
    --- a/drivers/spi/spi-geni-qcom.c
    +++ b/drivers/spi/spi-geni-qcom.c
    @@ -168,6 +168,30 @@ static void handle_fifo_timeout(struct spi_master *spi,
    }
    }

    +static void handle_gpi_timeout(struct spi_master *spi, struct spi_message *msg)
    +{
    + struct spi_geni_master *mas = spi_master_get_devdata(spi);
    +
    + dmaengine_terminate_sync(mas->tx);
    + dmaengine_terminate_sync(mas->rx);
    +}
    +
    +static void spi_geni_handle_err(struct spi_master *spi, struct spi_message *msg)
    +{
    + struct spi_geni_master *mas = spi_master_get_devdata(spi);
    +
    + switch (mas->cur_xfer_mode) {
    + case GENI_SE_FIFO:
    + handle_fifo_timeout(spi, msg);
    + break;
    + case GENI_GPI_DMA:
    + handle_gpi_timeout(spi, msg);
    + break;
    + default:
    + dev_err(mas->dev, "Abort on Mode:%d not supported", mas->cur_xfer_mode);
    + }
    +}
    +
    static bool spi_geni_is_abort_still_pending(struct spi_geni_master *mas)
    {
    struct geni_se *se = &mas->se;
    @@ -926,7 +950,7 @@ static int spi_geni_probe(struct platform_device *pdev)
    spi->can_dma = geni_can_dma;
    spi->dma_map_dev = dev->parent;
    spi->auto_runtime_pm = true;
    - spi->handle_err = handle_fifo_timeout;
    + spi->handle_err = spi_geni_handle_err;
    spi->use_gpio_descriptors = true;

    init_completion(&mas->cs_done);
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-01-25 01:11    [W:4.018 / U:0.572 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site