lkml.org 
[lkml]   [2022]   [Oct]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 6.0 836/862] dmaengine: dw-edma: Remove runtime PM support
    Date
    From: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>

    [ Upstream commit a0188eb6e71c93ab7dd9bfa4305fac43c70db309 ]

    Currently, the dw-edma driver enables the runtime_pm for parent device
    (chip->dev) and increments/decrements the refcount during alloc/free
    chan resources callbacks.

    This leads to a problem when the eDMA driver has been probed, but the
    channels were not used. This scenario can happen when the DW PCIe driver
    probes eDMA driver successfully, but the PCI EPF driver decides not to
    use eDMA channels and use iATU instead for PCI transfers.

    In this case, the underlying device would be runtime suspended due to
    pm_runtime_enable() in dw_edma_probe() and the PCI EPF driver would have
    no knowledge of it.

    Ideally, the eDMA driver should not be the one doing the runtime PM of
    the parent device. The responsibility should instead belong to the client
    drivers like PCI EPF.

    So let's remove the runtime PM support from eDMA driver.

    Cc: Serge Semin <fancer.lancer@gmail.com>
    Cc: Frank Li <Frank.Li@nxp.com>
    Reviewed-by: Serge Semin <fancer.lancer@gmail.com>
    Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
    Link: https://lore.kernel.org/r/20220910054700.12205-1-manivannan.sadhasivam@linaro.org
    Signed-off-by: Vinod Koul <vkoul@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/dma/dw-edma/dw-edma-core.c | 12 ------------
    1 file changed, 12 deletions(-)

    diff --git a/drivers/dma/dw-edma/dw-edma-core.c b/drivers/dma/dw-edma/dw-edma-core.c
    index 07f756479663..c54b24ff5206 100644
    --- a/drivers/dma/dw-edma/dw-edma-core.c
    +++ b/drivers/dma/dw-edma/dw-edma-core.c
    @@ -9,7 +9,6 @@
    #include <linux/module.h>
    #include <linux/device.h>
    #include <linux/kernel.h>
    -#include <linux/pm_runtime.h>
    #include <linux/dmaengine.h>
    #include <linux/err.h>
    #include <linux/interrupt.h>
    @@ -682,15 +681,12 @@ static int dw_edma_alloc_chan_resources(struct dma_chan *dchan)
    if (chan->status != EDMA_ST_IDLE)
    return -EBUSY;

    - pm_runtime_get(chan->dw->chip->dev);
    -
    return 0;
    }

    static void dw_edma_free_chan_resources(struct dma_chan *dchan)
    {
    unsigned long timeout = jiffies + msecs_to_jiffies(5000);
    - struct dw_edma_chan *chan = dchan2dw_edma_chan(dchan);
    int ret;

    while (time_before(jiffies, timeout)) {
    @@ -703,8 +699,6 @@ static void dw_edma_free_chan_resources(struct dma_chan *dchan)

    cpu_relax();
    }
    -
    - pm_runtime_put(chan->dw->chip->dev);
    }

    static int dw_edma_channel_setup(struct dw_edma *dw, bool write,
    @@ -977,9 +971,6 @@ int dw_edma_probe(struct dw_edma_chip *chip)
    if (err)
    goto err_irq_free;

    - /* Power management */
    - pm_runtime_enable(dev);
    -
    /* Turn debugfs on */
    dw_edma_v0_core_debugfs_on(dw);

    @@ -1009,9 +1000,6 @@ int dw_edma_remove(struct dw_edma_chip *chip)
    for (i = (dw->nr_irqs - 1); i >= 0; i--)
    free_irq(chip->ops->irq_vector(dev, i), &dw->irq[i]);

    - /* Power management */
    - pm_runtime_disable(dev);
    -
    /* Deregister eDMA device */
    dma_async_device_unregister(&dw->wr_edma);
    list_for_each_entry_safe(chan, _chan, &dw->wr_edma.channels,
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-10-19 15:58    [W:4.026 / U:0.800 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site