Commit 4aa69cf7 authored by Jie Hai's avatar Jie Hai Committed by Vinod Koul

dmaengine: hisilicon: Use macros instead of magic number

readl_relaxed_poll_timeout() uses magic numbers 10 and 1000, which
indicate maximum time to sleep between reads in us and timeout in us,
respectively.

Use macros HISI_DMA_POLL_Q_STS_DELAY_US and
HISI_DMA_POLL_Q_STS_TIME_OUT_US instead of these two numbers.
Signed-off-by: default avatarJie Hai <haijie1@huawei.com>
Acked-by: default avatarZhou Wang <wangzhou1@hisilicon.com>
Link: https://lore.kernel.org/r/20220830062251.52993-5-haijie1@huawei.comSigned-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent 2cbb9588
...@@ -36,6 +36,9 @@ ...@@ -36,6 +36,9 @@
#define PCI_BAR_2 2 #define PCI_BAR_2 2
#define HISI_DMA_POLL_Q_STS_DELAY_US 10
#define HISI_DMA_POLL_Q_STS_TIME_OUT_US 1000
enum hisi_dma_mode { enum hisi_dma_mode {
EP = 0, EP = 0,
RC, RC,
...@@ -185,15 +188,19 @@ static void hisi_dma_reset_or_disable_hw_chan(struct hisi_dma_chan *chan, ...@@ -185,15 +188,19 @@ static void hisi_dma_reset_or_disable_hw_chan(struct hisi_dma_chan *chan,
{ {
struct hisi_dma_dev *hdma_dev = chan->hdma_dev; struct hisi_dma_dev *hdma_dev = chan->hdma_dev;
u32 index = chan->qp_num, tmp; u32 index = chan->qp_num, tmp;
void __iomem *addr;
int ret; int ret;
hisi_dma_pause_dma(hdma_dev, index, true); hisi_dma_pause_dma(hdma_dev, index, true);
hisi_dma_enable_dma(hdma_dev, index, false); hisi_dma_enable_dma(hdma_dev, index, false);
hisi_dma_mask_irq(hdma_dev, index); hisi_dma_mask_irq(hdma_dev, index);
ret = readl_relaxed_poll_timeout(hdma_dev->base + addr = hdma_dev->base +
HISI_DMA_Q_FSM_STS + index * HISI_DMA_OFFSET, tmp, HISI_DMA_Q_FSM_STS + index * HISI_DMA_OFFSET;
FIELD_GET(HISI_DMA_FSM_STS_MASK, tmp) != RUN, 10, 1000);
ret = readl_relaxed_poll_timeout(addr, tmp,
FIELD_GET(HISI_DMA_FSM_STS_MASK, tmp) != RUN,
HISI_DMA_POLL_Q_STS_DELAY_US, HISI_DMA_POLL_Q_STS_TIME_OUT_US);
if (ret) { if (ret) {
dev_err(&hdma_dev->pdev->dev, "disable channel timeout!\n"); dev_err(&hdma_dev->pdev->dev, "disable channel timeout!\n");
WARN_ON(1); WARN_ON(1);
...@@ -208,9 +215,9 @@ static void hisi_dma_reset_or_disable_hw_chan(struct hisi_dma_chan *chan, ...@@ -208,9 +215,9 @@ static void hisi_dma_reset_or_disable_hw_chan(struct hisi_dma_chan *chan,
hisi_dma_unmask_irq(hdma_dev, index); hisi_dma_unmask_irq(hdma_dev, index);
} }
ret = readl_relaxed_poll_timeout(hdma_dev->base + ret = readl_relaxed_poll_timeout(addr, tmp,
HISI_DMA_Q_FSM_STS + index * HISI_DMA_OFFSET, tmp, FIELD_GET(HISI_DMA_FSM_STS_MASK, tmp) == IDLE,
FIELD_GET(HISI_DMA_FSM_STS_MASK, tmp) == IDLE, 10, 1000); HISI_DMA_POLL_Q_STS_DELAY_US, HISI_DMA_POLL_Q_STS_TIME_OUT_US);
if (ret) { if (ret) {
dev_err(&hdma_dev->pdev->dev, "reset channel timeout!\n"); dev_err(&hdma_dev->pdev->dev, "reset channel timeout!\n");
WARN_ON(1); WARN_ON(1);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment