* [v2019.04-aspeed, v1 0/1] net: ftgmac100: Read and retain MAC address
@ 2020-12-10 23:11 Hongwei Zhang
2020-12-10 23:11 ` [v2019.04-aspeed, v1 1/1] " Hongwei Zhang
0 siblings, 1 reply; 3+ messages in thread
From: Hongwei Zhang @ 2020-12-10 23:11 UTC (permalink / raw)
To: u-boot
Dear Reviewer,
Add ftgmac100_get_mac() so the driver read and retain MAC address
accross flash and QEMU support.
Hongwei Zhang (1):
net: ftgmac100: Read and retain MAC address
drivers/net/ftgmac100.c | 32 ++++++++++++++++++++++++++++++++
net/eth-uclass.c | 2 +-
2 files changed, 33 insertions(+), 1 deletion(-)
--
2.17.1
^ permalink raw reply [flat|nested] 3+ messages in thread
* [v2019.04-aspeed, v1 1/1] net: ftgmac100: Read and retain MAC address
2020-12-10 23:11 [v2019.04-aspeed, v1 0/1] net: ftgmac100: Read and retain MAC address Hongwei Zhang
@ 2020-12-10 23:11 ` Hongwei Zhang
2021-01-19 20:01 ` Tom Rini
0 siblings, 1 reply; 3+ messages in thread
From: Hongwei Zhang @ 2020-12-10 23:11 UTC (permalink / raw)
To: u-boot
Read and retain MAC address across flash and QEMU support.
Signed-off-by: Hongwei Zhang <hongweiz@ami.com>
---
drivers/net/ftgmac100.c | 32 ++++++++++++++++++++++++++++++++
net/eth-uclass.c | 2 +-
2 files changed, 33 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ftgmac100.c b/drivers/net/ftgmac100.c
index 999941de14..951d99cfe0 100644
--- a/drivers/net/ftgmac100.c
+++ b/drivers/net/ftgmac100.c
@@ -275,6 +275,28 @@ static int ftgmac100_set_mac(struct ftgmac100_data *priv,
return 0;
}
+/*
+ * Get MAC address
+ */
+static int ftgmac100_get_mac(struct ftgmac100_data *priv,
+ unsigned char *mac)
+{
+ struct ftgmac100 *ftgmac100 = priv->iobase;
+ unsigned int maddr = readl(&ftgmac100->mac_madr);
+ unsigned int laddr = readl(&ftgmac100->mac_ladr);
+
+ debug("%s(%x %x)\n", __func__, maddr, laddr);
+
+ mac[0] = (maddr >> 8) & 0xff;
+ mac[1] = maddr & 0xff;
+ mac[2] = (laddr >> 24) & 0xff;
+ mac[3] = (laddr >> 16) & 0xff;
+ mac[4] = (laddr >> 8) & 0xff;
+ mac[5] = laddr & 0xff;
+
+ return 0;
+}
+
/*
* disable transmitter, receiver
*/
@@ -532,6 +554,14 @@ static int ftgmac100_write_hwaddr(struct udevice *dev)
return ftgmac100_set_mac(priv, pdata->enetaddr);
}
+static int ftgmac_read_hwaddr(struct udevice *dev)
+{
+ struct eth_pdata *pdata = dev_get_platdata(dev);
+ struct ftgmac100_data *priv = dev_get_priv(dev);
+
+ return ftgmac100_get_mac(priv, pdata->enetaddr);
+}
+
static int ftgmac100_ofdata_to_platdata(struct udevice *dev)
{
struct eth_pdata *pdata = dev_get_platdata(dev);
@@ -613,6 +643,8 @@ static int ftgmac100_probe(struct udevice *dev)
goto out;
}
+ ftgmac_read_hwaddr(dev);
+
out:
if (ret)
clk_release_bulk(&priv->clks);
diff --git a/net/eth-uclass.c b/net/eth-uclass.c
index a7f8792710..19d7e0cb3b 100644
--- a/net/eth-uclass.c
+++ b/net/eth-uclass.c
@@ -514,7 +514,7 @@ static int eth_post_probe(struct udevice *dev)
memcpy(pdata->enetaddr, env_enetaddr, ARP_HLEN);
} else if (is_valid_ethaddr(pdata->enetaddr)) {
eth_env_set_enetaddr_by_index("eth", dev->seq, pdata->enetaddr);
- printf("\nWarning: %s using MAC address from ROM\n",
+ printf("\nWarning: %s using MAC address from ROM/MAC Reg\n",
dev->name);
} else if (is_zero_ethaddr(pdata->enetaddr) ||
!is_valid_ethaddr(pdata->enetaddr)) {
--
2.17.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [v2019.04-aspeed, v1 1/1] net: ftgmac100: Read and retain MAC address
2020-12-10 23:11 ` [v2019.04-aspeed, v1 1/1] " Hongwei Zhang
@ 2021-01-19 20:01 ` Tom Rini
0 siblings, 0 replies; 3+ messages in thread
From: Tom Rini @ 2021-01-19 20:01 UTC (permalink / raw)
To: u-boot
On Thu, Dec 10, 2020 at 06:11:09PM -0500, Hongwei Zhang wrote:
> Read and retain MAC address across flash and QEMU support.
>
> Signed-off-by: Hongwei Zhang <hongweiz@ami.com>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20210119/5ce44740/attachment.sig>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-01-19 20:01 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-10 23:11 [v2019.04-aspeed, v1 0/1] net: ftgmac100: Read and retain MAC address Hongwei Zhang
2020-12-10 23:11 ` [v2019.04-aspeed, v1 1/1] " Hongwei Zhang
2021-01-19 20:01 ` Tom Rini
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.