Skip to contentSkip to conversation

drivers/net/designware - respect "bus mode" register contents on SW reset

PATCH New Alexey Brodkin 2 participants 2 messages Sep 25, 2013 – Sep 26, 2013 Network drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drivers/net/designware - respect "bus mode" register contents on SW reset

"bus mode" register contains lots of fields and some of them don't expect to be written with 0 (zero). So since we're only interested in resetting MAC (which is done with setting the least significant bit of this register with "0") I believe it's better to modify only 1 bit of the register.

---
 drivers/net/designware.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/designware.c +1 -1
index 46f6601..f11cb0b 100644
@@ -112,7 +112,7 @@ static int mac_reset(struct eth_device *dev)
 	ulong start;
 	int timeout = CONFIG_MACRESET_TIMEOUT;
 
-	writel(DMAMAC_SRST, &dma_p->busmode);
+	writel(readl(&dma_p->busmode) | DMAMAC_SRST, &dma_p->busmode);
 
 	if (priv->interface != PHY_INTERFACE_MODE_RGMII)
 		writel(MII_PORTSELECT, &mac_p->conf);
Signature · 1 line
1.8.1.2
#1 lore raw

PATCH 1/1 drivers/net/designware - respect "bus mode" register contents on SW reset

Quoted 16 lines · Alexey Brodkin

"bus mode" register contains lots of fields and some of them don't expect to be written with 0 (zero). So since we're only interested in resetting MAC (which is done with setting the least significant bit of this register with "0") I believe it's better to modify only 1 bit of the register.

---
  drivers/net/designware.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/designware.c +0 -0
index 46f6601..f11cb0b 100644

drivers/net/designware.c static int mac_reset(struct eth_device *dev) · line 116

Quoted 6 lines
drivers/net/designware.c +1 -1
@@ -112,7 +112,7 @@ static int mac_reset(struct eth_device *dev)
  	ulong start;
  	int timeout = CONFIG_MACRESET_TIMEOUT;
 
-	writel(DMAMAC_SRST,&dma_p->busmode);
+	writel(readl(&dma_p->busmode) | DMAMAC_SRST,&dma_p->busmode);