Revert "net: gem: Add support for DMA coherent"

This reverts commit 455bb41aba6055b491ef3522966df7481c1eb2de.

Added this patch for backup. It can be used for CCI testing in u-boot.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/drivers/net/zynq_gem.c b/drivers/net/zynq_gem.c
index cf88de0875d86b8d1ff47d54758e23300f13ab53..0f46bd029f293b47c6f3b2b69f5a78290ec575b3 100644 (file)
--- a/drivers/net/zynq_gem.c
+++ b/drivers/net/zynq_gem.c
@@ -179,7 +179,6 @@ struct zynq_gem_priv {
        phy_interface_t interface;
        struct phy_device *phydev;
        struct mii_dev *bus;
-       int dma_coherent;
 };
 
 static inline int mdio_wait(struct zynq_gem_regs *regs)
@@ -416,14 +415,10 @@ static int zynq_gem_init(struct udevice *dev)
                dummy_rx_bd->addr = ZYNQ_GEM_RXBUF_WRAP_MASK |
                                ZYNQ_GEM_RXBUF_NEW_MASK;
                dummy_rx_bd->status = 0;
-               if (!priv->dma_coherent) {
-                       flush_dcache_range((ulong)&dummy_tx_bd,
-                                          (ulong)&dummy_tx_bd +
-                                          sizeof(dummy_tx_bd));
-                       flush_dcache_range((ulong)&dummy_rx_bd,
-                                          (ulong)&dummy_rx_bd +
-                                          sizeof(dummy_rx_bd));
-               }
+               flush_dcache_range((ulong)&dummy_tx_bd, (ulong)&dummy_tx_bd +
+                                  sizeof(dummy_tx_bd));
+               flush_dcache_range((ulong)&dummy_rx_bd, (ulong)&dummy_rx_bd +
+                                  sizeof(dummy_rx_bd));
 
                writel((ulong)dummy_tx_bd, &regs->transmit_q1_ptr);
                writel((ulong)dummy_rx_bd, &regs->receive_q1_ptr);
@@ -533,16 +528,13 @@ static int zynq_gem_send(struct udevice *dev, void *ptr, int len)
        addr = (ulong) ptr;
        addr &= ~(ARCH_DMA_MINALIGN - 1);
        size = roundup(len, ARCH_DMA_MINALIGN);
-       if (!priv->dma_coherent)
-               flush_dcache_range(addr, addr + size);
+       flush_dcache_range(addr, addr + size);
 
        addr = (ulong)priv->rxbuffers;
        addr &= ~(ARCH_DMA_MINALIGN - 1);
        size = roundup((RX_BUF * PKTSIZE_ALIGN), ARCH_DMA_MINALIGN);
-       if (!priv->dma_coherent) {
-               flush_dcache_range(addr, addr + size);
-               barrier();
-       }
+       flush_dcache_range(addr, addr + size);
+       barrier();
 
        /* Start transmit */
        setbits_le32(&regs->nwctrl, ZYNQ_GEM_NWCTRL_STARTTX_MASK);
@@ -652,9 +644,8 @@ static int zynq_gem_probe(struct udevice *dev)
 
        /* Align bd_space to MMU_SECTION_SHIFT */
        bd_space = memalign(1 << MMU_SECTION_SHIFT, BD_SPACE);
-       if (!priv->dma_coherent)
-               mmu_set_region_dcache_behaviour((phys_addr_t)bd_space,
-                                               BD_SPACE, DCACHE_OFF);
+       mmu_set_region_dcache_behaviour((phys_addr_t)bd_space,
+                                       BD_SPACE, DCACHE_OFF);
 
        /* Initialize the bd spaces for tx and rx bd's */
        priv->tx_bd = (struct emac_bd *)bd_space;
@@ -722,12 +713,8 @@ static int zynq_gem_ofdata_to_platdata(struct udevice *dev)
 
        priv->emio = fdtdec_get_bool(gd->fdt_blob, dev->of_offset, "xlnx,emio");
 
-       priv->dma_coherent = fdtdec_get_bool(gd->fdt_blob, dev->of_offset,
-                                            "dma-coherent");
-
-       printf("ZYNQ GEM: %lx, phyaddr %d, interface %s%s\n", (ulong)priv->iobase,
-              priv->phyaddr, phy_string_for_interface(priv->interface),
-              priv->dma_coherent ? ", coherent" : "");
+       printf("ZYNQ GEM: %lx, phyaddr %d, interface %s\n", (ulong)priv->iobase,
+              priv->phyaddr, phy_string_for_interface(priv->interface));
 
        return 0;
 }