net: stmmac: Only enable enhanced addressing mode when needed

Enhanced addressing mode is only required when more than 32 bits need to
be addressed. Add a DMA configuration parameter to enable this mode only
when needed.

Signed-off-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c
index 53c4a40d8386b5bd974c0bd8e411d676542c3db1..19ef037393dd8a57d47482e801ca5fe7942335b4 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c
@@ -27,7 +27,10 @@ static void dwxgmac2_dma_init(void __iomem *ioaddr,
        if (dma_cfg->aal)
                value |= XGMAC_AAL;
 
-       writel(value | XGMAC_EAME, ioaddr + XGMAC_DMA_SYSBUS_MODE);
+       if (dma_cfg->eame)
+               value |= XGMAC_EAME;
+
+       writel(value, ioaddr + XGMAC_DMA_SYSBUS_MODE);
 }
 
 static void dwxgmac2_dma_init_chan(void __iomem *ioaddr,

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index d3232738fb257d960713738f23273886cdeeb645..2da1f77bb604adb5e520d7a3105be61f7506623f 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -4514,6 +4514,13 @@ int stmmac_dvr_probe(struct device *device,
                if (!ret) {
                        dev_info(priv->device, "Using %d bits DMA width\n",
                                 priv->dma_cap.addr64);
+
+                       /*
+                        * If more than 32 bits can be addressed, make sure to
+                        * enable enhanced addressing mode.
+                        */
+                       if (IS_ENABLED(CONFIG_ARCH_DMA_ADDR_T_64BIT))
+                               priv->plat->dma_cfg->eame = true;
                } else {
                        ret = dma_set_mask_and_coherent(device, DMA_BIT_MASK(32));
                        if (ret) {

diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h
index dc60d03c4b606399c3ee016bf765bc94a061efff..86f9464c3f5deef9279d129c7738628cac4f6497 100644 (file)
--- a/include/linux/stmmac.h
+++ b/include/linux/stmmac.h
@@ -92,6 +92,7 @@ struct stmmac_dma_cfg {
        int fixed_burst;
        int mixed_burst;
        bool aal;
+       bool eame;
 };
 
 #define AXI_BLEN       7