Revert "pcie-brcmstb: Changes for BCM2711"

This reverts commit 1dab5de.
raspberrypi · Mar 11, 2020 · 1282936 · 1282936
1 parent 6851ffc
commit 1282936
Show file tree

Hide file tree

Showing 7 changed files with 115 additions and 991 deletions.
diff --git a/drivers/dma/bcm2835-dma.c b/drivers/dma/bcm2835-dma.c
@@ -64,17 +64,6 @@ struct bcm2835_dma_cb {
 	uint32_t pad[2];
 };
 
-struct bcm2838_dma40_scb {
-	uint32_t ti;
-	uint32_t src;
-	uint32_t srci;
-	uint32_t dst;
-	uint32_t dsti;
-	uint32_t len;
-	uint32_t next_cb;
-	uint32_t rsvd;
-};
-
 struct bcm2835_cb_entry {
 	struct bcm2835_dma_cb *cb;
 	dma_addr_t paddr;
@@ -191,45 +180,6 @@ struct bcm2835_desc {
 #define MAX_DMA_LEN SZ_1G
 #define MAX_LITE_DMA_LEN (SZ_64K - 4)
 
-/* 40-bit DMA support */
-#define BCM2838_DMA40_CS	0x00
-#define BCM2838_DMA40_CB	0x04
-#define BCM2838_DMA40_DEBUG	0x0c
-#define BCM2858_DMA40_TI	0x10
-#define BCM2838_DMA40_SRC	0x14
-#define BCM2838_DMA40_SRCI	0x18
-#define BCM2838_DMA40_DEST	0x1c
-#define BCM2838_DMA40_DESTI	0x20
-#define BCM2838_DMA40_LEN	0x24
-#define BCM2838_DMA40_NEXT_CB	0x28
-#define BCM2838_DMA40_DEBUG2	0x2c
-
-#define BCM2838_DMA40_CS_ACTIVE	BIT(0)
-#define BCM2838_DMA40_CS_END	BIT(1)
-
-#define BCM2838_DMA40_CS_QOS(x)	(((x) & 0x1f) << 16)
-#define BCM2838_DMA40_CS_PANIC_QOS(x)	(((x) & 0x1f) << 20)
-#define BCM2838_DMA40_CS_WRITE_WAIT	BIT(28)
-
-#define BCM2838_DMA40_BURST_LEN(x)	((((x) - 1) & 0xf) << 8)
-#define BCM2838_DMA40_INC		BIT(12)
-#define BCM2838_DMA40_SIZE_128	(2 << 13)
-
-#define BCM2838_DMA40_MEMCPY_QOS \
-	(BCM2838_DMA40_CS_QOS(0x0) | \
-	 BCM2838_DMA40_CS_PANIC_QOS(0x0) | \
-	 BCM2838_DMA40_CS_WRITE_WAIT)
-
-#define BCM2838_DMA40_MEMCPY_XFER_INFO \
-	(BCM2838_DMA40_SIZE_128 | \
-	 BCM2838_DMA40_INC | \
-	 BCM2838_DMA40_BURST_LEN(16))
-
-static void __iomem *memcpy_chan;
-static struct bcm2838_dma40_scb *memcpy_scb;
-static dma_addr_t memcpy_scb_dma;
-DEFINE_SPINLOCK(memcpy_lock);
-
 static inline size_t bcm2835_dma_max_frame_length(struct bcm2835_chan *c)
 {
 	/* lite and normal channels have different max frame length */
@@ -916,56 +866,6 @@ static void bcm2835_dma_free(struct bcm2835_dmadev *od)
 			     DMA_TO_DEVICE, DMA_ATTR_SKIP_CPU_SYNC);
 }
 
-int bcm2838_dma40_memcpy_init(struct device *dev)
-{
-	if (memcpy_scb)
-		return 0;
-
-	memcpy_scb = dma_alloc_coherent(dev, sizeof(*memcpy_scb),
-					&memcpy_scb_dma, GFP_KERNEL);
-
-	if (!memcpy_scb) {
-		pr_err("bcm2838_dma40_memcpy_init failed!\n");
-		return -ENOMEM;
-	}
-
-	return 0;
-}
-EXPORT_SYMBOL(bcm2838_dma40_memcpy_init);
-
-void bcm2838_dma40_memcpy(dma_addr_t dst, dma_addr_t src, size_t size)
-{
-	struct bcm2838_dma40_scb *scb = memcpy_scb;
-	unsigned long flags;
-
-	if (!scb) {
-		pr_err("bcm2838_dma40_memcpy not initialised!\n");
-		return;
-	}
-
-	spin_lock_irqsave(&memcpy_lock, flags);
-
-	scb->ti = 0;
-	scb->src = lower_32_bits(src);
-	scb->srci = upper_32_bits(src) | BCM2838_DMA40_MEMCPY_XFER_INFO;
-	scb->dst = lower_32_bits(dst);
-	scb->dsti = upper_32_bits(dst) | BCM2838_DMA40_MEMCPY_XFER_INFO;
-	scb->len = size;
-	scb->next_cb = 0;
-
-	writel((u32)(memcpy_scb_dma >> 5), memcpy_chan + BCM2838_DMA40_CB);
-	writel(BCM2838_DMA40_MEMCPY_QOS + BCM2838_DMA40_CS_ACTIVE,
-	       memcpy_chan + BCM2838_DMA40_CS);
-	/* Poll for completion */
-	while (!(readl(memcpy_chan + BCM2838_DMA40_CS) & BCM2838_DMA40_CS_END))
-		cpu_relax();
-
-	writel(BCM2838_DMA40_CS_END, memcpy_chan + BCM2838_DMA40_CS);
-
-	spin_unlock_irqrestore(&memcpy_lock, flags);
-}
-EXPORT_SYMBOL(bcm2838_dma40_memcpy);
-
 static const struct of_device_id bcm2835_dma_of_match[] = {
 	{ .compatible = "brcm,bcm2835-dma", },
 	{},
@@ -1071,13 +971,6 @@ static int bcm2835_dma_probe(struct platform_device *pdev)
 	/* Channel 0 is used by the legacy API */
 	chans_available &= ~BCM2835_DMA_BULK_MASK;
 
-	/* We can't use channels 11-13 yet */
-	chans_available &= ~(BIT(11) | BIT(12) | BIT(13));
-
-	/* Grab channel 14 for the 40-bit DMA memcpy */
-	chans_available &= ~BIT(14);
-	memcpy_chan = BCM2835_DMA_CHANIO(base, 14);
-
 	/* get irqs for each channel that we support */
 	for (i = 0; i <= BCM2835_DMA_MAX_DMA_CHAN_SUPPORTED; i++) {
 		/* skip masked out channels */

diff --git a/drivers/pci/controller/Makefile b/drivers/pci/controller/Makefile
@@ -30,10 +30,6 @@ obj-$(CONFIG_PCIE_MEDIATEK) += pcie-mediatek.o
 obj-$(CONFIG_PCIE_MOBIVEIL) += pcie-mobiveil.o
 obj-$(CONFIG_PCIE_TANGO_SMP8759) += pcie-tango.o
 obj-$(CONFIG_PCIE_BRCMSTB) += pcie-brcmstb.o
-ifdef CONFIG_ARM
-obj-$(CONFIG_PCIE_BRCMSTB) += pcie-brcmstb-bounce.o
-endif
-
 obj-$(CONFIG_VMD) += vmd.o
 # pcie-hisi.o quirks are needed even without CONFIG_PCIE_DW
 obj-y				+= dwc/