]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
PCI: dwc: Skip finding eDMA channels count for HDMA platforms
authorManivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Mon, 18 Mar 2024 06:04:26 +0000 (11:34 +0530)
committerBjorn Helgaas <bhelgaas@google.com>
Tue, 28 May 2024 14:51:17 +0000 (09:51 -0500)
In the case of Hyper DMA (HDMA) present in DWC controllers, there is no way
the drivers can auto detect the number of read/write channels as like its
predecessor embedded DMA (eDMA). So the glue drivers making use of HDMA
have to pass the channels count during probe.

To accommodate that, skip the existing auto detection of channels count
procedure for HDMA based platforms. If the channels count passed by the
glue drivers were wrong in any form, then the existing sanity check will
catch it.

Suggested-by: Serge Semin <fancer.lancer@gmail.com>
Link: https://lore.kernel.org/linux-pci/20240318-dw-hdma-v5-2-f04c5cdde760@linaro.org
Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Signed-off-by: Krzysztof WilczyƄski <kwilczynski@kernel.org>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Frank Li <frank.li@nxp.com>
Reviewed-by: Serge Semin <fancer.lancer@gmail.com>
Reviewed-by: Siddharth Vadapalli <s-vadapalli@ti.com>
Reviewed-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
drivers/pci/controller/dwc/pcie-designware.c

index e591c1cd1efb735f3e81ed4f2922b39ffb5050b9..d17549f67e72e8623aa51333846fc450cdf4c30b 100644 (file)
@@ -927,10 +927,18 @@ static int dw_pcie_edma_find_channels(struct dw_pcie *pci)
 {
        u32 val;
 
-       val = dw_pcie_readl_dma(pci, PCIE_DMA_CTRL);
+       /*
+        * Autodetect the read/write channels count only for non-HDMA platforms.
+        * HDMA platforms with native CSR mapping doesn't support autodetect,
+        * so the glue drivers should've passed the valid count already. If not,
+        * the below sanity check will catch it.
+        */
+       if (pci->edma.mf != EDMA_MF_HDMA_NATIVE) {
+               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_rd_cnt = FIELD_GET(PCIE_DMA_NUM_RD_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);
+       }
 
        /* Sanity check the channels count if the mapping was incorrect */
        if (!pci->edma.ll_wr_cnt || pci->edma.ll_wr_cnt > EDMA_MAX_WR_CH ||