From: Mingkai Hu <Mingkai.Hu@freescale.com>
Date: Tue, 18 Aug 2015 21:06:26 +0000 (-0700)
Subject: net: e1000: Support 64-bit physical address
X-Git-Tag: v2025.01-rc5-pxa1908~11940^2~7
X-Git-Url: http://git.dujemihanovic.xyz/img/static/%7B%7B%20%24style.RelPermalink%20%7D%7D?a=commitdiff_plain;h=6497e37;p=u-boot.git

net: e1000: Support 64-bit physical address

High 32-bit address is needed when u-boot runs in 64-bit space.
Tested on armv8-based LS2085ARDB.

Signed-off-by: Mingkai Hu <Mingkai.Hu@freescale.com>
Signed-off-by: York Sun <yorksun@freescale.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
---

diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c
index d5d48b1e7d..e81641054d 100644
--- a/drivers/net/e1000.c
+++ b/drivers/net/e1000.c
@@ -4980,8 +4980,8 @@ e1000_configure_tx(struct e1000_hw *hw)
 	unsigned long tipg, tarc;
 	uint32_t ipgr1, ipgr2;
 
-	E1000_WRITE_REG(hw, TDBAL, (unsigned long)tx_base);
-	E1000_WRITE_REG(hw, TDBAH, 0);
+	E1000_WRITE_REG(hw, TDBAL, (unsigned long)tx_base & 0xffffffff);
+	E1000_WRITE_REG(hw, TDBAH, (unsigned long)tx_base >> 32);
 
 	E1000_WRITE_REG(hw, TDLEN, 128);
 
@@ -5124,8 +5124,8 @@ e1000_configure_rx(struct e1000_hw *hw)
 		E1000_WRITE_FLUSH(hw);
 	}
 	/* Setup the Base and Length of the Rx Descriptor Ring */
-	E1000_WRITE_REG(hw, RDBAL, (unsigned long)rx_base);
-	E1000_WRITE_REG(hw, RDBAH, 0);
+	E1000_WRITE_REG(hw, RDBAL, (unsigned long)rx_base & 0xffffffff);
+	E1000_WRITE_REG(hw, RDBAH, (unsigned long)rx_base >> 32);
 
 	E1000_WRITE_REG(hw, RDLEN, 128);