net: stmmac: Add additional registers for dwmac1000_dma ethtool

tthayer-intel · davem330 · commit 77b0d3617738 · 2017-06-29T12:49:54.000-04:00
Version 3.70a of the Designware has additional DMA registers so
add those to the ethtool DMA Register dump.
Offset 9  - Receive Interrupt Watchdog Timer Register
Offset 10 - AXI Bus Mode Register
Offset 11 - AHB or AXI Status Register
Offset 22 - HW Feature Register

Signed-off-by: Thor Thayer &lt;thor.thayer@linux.intel.com&gt;
Acked-by: Giuseppe Cavallaro &lt;peppe.cavallaro@st.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac1000_dma.c b/drivers/net/ethernet/stmicro/stmmac/dwmac1000_dma.c
@@ -205,8 +205,8 @@ static void dwmac1000_dump_dma_regs(void __iomem *ioaddr, u32 *reg_space)
 {
 	int i;
 
-	for (i = 0; i < 22; i++)
-		if ((i < 9) || (i > 17))
+	for (i = 0; i < 23; i++)
+		if ((i < 12) || (i > 17))
 			reg_space[DMA_BUS_MODE / 4 + i] =
 				readl(ioaddr + DMA_BUS_MODE + i * 4);
 }
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
@@ -29,7 +29,7 @@
 #include "stmmac.h"
 #include "dwmac_dma.h"
 
-#define REG_SPACE_SIZE	0x1054
+#define REG_SPACE_SIZE	0x1060
 #define MAC100_ETHTOOL_NAME	"st_mac100"
 #define GMAC_ETHTOOL_NAME	"st_gmac"
 

Original file line number	Diff line number	Diff line change
`@@ -205,8 +205,8 @@ static void dwmac1000_dump_dma_regs(void __iomem ioaddr, u32 reg_space)`
`205`	`205`	`{`
`206`	`206`	`int i;`
`207`	`207`
`208`		`- for (i = 0; i < 22; i++)`
`209`		`- if ((i < 9) \|\| (i > 17))`
	`208`	`+ for (i = 0; i < 23; i++)`
	`209`	`+ if ((i < 12) \|\| (i > 17))`
`210`	`210`	`reg_space[DMA_BUS_MODE / 4 + i] =`
`211`	`211`	`readl(ioaddr + DMA_BUS_MODE + i * 4);`
`212`	`212`	`}`