Commit 0b45127a authored by Manivannan Sadhasivam's avatar Manivannan Sadhasivam Committed by Bjorn Helgaas

PCI: dwc: Refactor dw_pcie_edma_find_chip() API

In order to add support for Hyper DMA (HDMA), refactor the existing
dw_pcie_edma_find_chip() API by moving the common code to separate
functions.

No functional change.
Suggested-by: default avatarSerge Semin <fancer.lancer@gmail.com>
Link: https://lore.kernel.org/linux-pci/20240318-dw-hdma-v5-1-f04c5cdde760@linaro.orgSigned-off-by: default avatarManivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Signed-off-by: default avatarKrzysztof Wilczyński <kwilczynski@kernel.org>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarFrank Li <frank.li@nxp.com>
Reviewed-by: default avatarSerge Semin <fancer.lancer@gmail.com>
Reviewed-by: default avatarSiddharth Vadapalli <s-vadapalli@ti.com>
Reviewed-by: default avatarYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
parent 58d0d3e0
...@@ -880,7 +880,17 @@ static struct dw_edma_plat_ops dw_pcie_edma_ops = { ...@@ -880,7 +880,17 @@ static struct dw_edma_plat_ops dw_pcie_edma_ops = {
.irq_vector = dw_pcie_edma_irq_vector, .irq_vector = dw_pcie_edma_irq_vector,
}; };
static int dw_pcie_edma_find_chip(struct dw_pcie *pci) static void dw_pcie_edma_init_data(struct dw_pcie *pci)
{
pci->edma.dev = pci->dev;
if (!pci->edma.ops)
pci->edma.ops = &dw_pcie_edma_ops;
pci->edma.flags |= DW_EDMA_CHIP_LOCAL;
}
static int dw_pcie_edma_find_mf(struct dw_pcie *pci)
{ {
u32 val; u32 val;
...@@ -902,8 +912,6 @@ static int dw_pcie_edma_find_chip(struct dw_pcie *pci) ...@@ -902,8 +912,6 @@ static int dw_pcie_edma_find_chip(struct dw_pcie *pci)
if (val == 0xFFFFFFFF && pci->edma.reg_base) { if (val == 0xFFFFFFFF && pci->edma.reg_base) {
pci->edma.mf = EDMA_MF_EDMA_UNROLL; pci->edma.mf = EDMA_MF_EDMA_UNROLL;
val = dw_pcie_readl_dma(pci, PCIE_DMA_CTRL);
} else if (val != 0xFFFFFFFF) { } else if (val != 0xFFFFFFFF) {
pci->edma.mf = EDMA_MF_EDMA_LEGACY; pci->edma.mf = EDMA_MF_EDMA_LEGACY;
...@@ -912,12 +920,14 @@ static int dw_pcie_edma_find_chip(struct dw_pcie *pci) ...@@ -912,12 +920,14 @@ static int dw_pcie_edma_find_chip(struct dw_pcie *pci)
return -ENODEV; return -ENODEV;
} }
pci->edma.dev = pci->dev; return 0;
}
if (!pci->edma.ops) static int dw_pcie_edma_find_channels(struct dw_pcie *pci)
pci->edma.ops = &dw_pcie_edma_ops; {
u32 val;
pci->edma.flags |= DW_EDMA_CHIP_LOCAL; val = dw_pcie_readl_dma(pci, PCIE_DMA_CTRL);
pci->edma.ll_wr_cnt = FIELD_GET(PCIE_DMA_NUM_WR_CHAN, val); pci->edma.ll_wr_cnt = FIELD_GET(PCIE_DMA_NUM_WR_CHAN, val);
pci->edma.ll_rd_cnt = FIELD_GET(PCIE_DMA_NUM_RD_CHAN, val); pci->edma.ll_rd_cnt = FIELD_GET(PCIE_DMA_NUM_RD_CHAN, val);
...@@ -930,6 +940,19 @@ static int dw_pcie_edma_find_chip(struct dw_pcie *pci) ...@@ -930,6 +940,19 @@ static int dw_pcie_edma_find_chip(struct dw_pcie *pci)
return 0; return 0;
} }
static int dw_pcie_edma_find_chip(struct dw_pcie *pci)
{
int ret;
dw_pcie_edma_init_data(pci);
ret = dw_pcie_edma_find_mf(pci);
if (ret)
return ret;
return dw_pcie_edma_find_channels(pci);
}
static int dw_pcie_edma_irq_verify(struct dw_pcie *pci) static int dw_pcie_edma_irq_verify(struct dw_pcie *pci)
{ {
struct platform_device *pdev = to_platform_device(pci->dev); struct platform_device *pdev = to_platform_device(pci->dev);
......
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