* [PATCH net-next v3 0/3] net: mvpp2: improve the mac address retrieval logic
@ 2017-09-02 9:06 Antoine Tenart
2017-09-02 9:06 ` [PATCH net-next v3 1/3] net: mvpp2: move the mac retrieval/copy logic into its own function Antoine Tenart
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Antoine Tenart @ 2017-09-02 9:06 UTC (permalink / raw)
To: davem
Cc: Antoine Tenart, andrew, gregory.clement, thomas.petazzoni,
nadavh, linux, linux-kernel, mw, stefanc, netdev
Hi all,
This series aims at fixing the logic behind the MAC address retrieval in the
PPv2 driver. A possible issue is also fixed in patch 3/3 to introduce fallbacks
when the address given in the device tree isn't valid.
Thanks!
Antoine
Since v2:
- Patch 1/4 from v2 was applied on net (and net was merged in net-next).
- Rebased on net-next.
Since v1:
- Rebased onto net (was on net-next).
Antoine Tenart (3):
net: mvpp2: move the mac retrieval/copy logic into its own function
net: mvpp2: fix use of the random mac address for PPv2.2
net: mvpp2: fallback using h/w and random mac if the dt one isn't
valid
drivers/net/ethernet/marvell/mvpp2.c | 48 ++++++++++++++++++++++--------------
1 file changed, 30 insertions(+), 18 deletions(-)
--
2.13.5
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH net-next v3 1/3] net: mvpp2: move the mac retrieval/copy logic into its own function
2017-09-02 9:06 [PATCH net-next v3 0/3] net: mvpp2: improve the mac address retrieval logic Antoine Tenart
@ 2017-09-02 9:06 ` Antoine Tenart
2017-09-02 9:06 ` [PATCH net-next v3 2/3] net: mvpp2: fix use of the random mac address for PPv2.2 Antoine Tenart
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Antoine Tenart @ 2017-09-02 9:06 UTC (permalink / raw)
To: davem
Cc: Antoine Tenart, andrew, gregory.clement, thomas.petazzoni,
nadavh, linux, linux-kernel, mw, stefanc, netdev
The MAC retrieval has a quite complicated logic (which is broken). Moves
it to its own function to prepare for patches fixing its logic, so that
reviews are easier.
Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
---
drivers/net/ethernet/marvell/mvpp2.c | 45 +++++++++++++++++++++---------------
1 file changed, 27 insertions(+), 18 deletions(-)
diff --git a/drivers/net/ethernet/marvell/mvpp2.c b/drivers/net/ethernet/marvell/mvpp2.c
index d5624894152e..a702e60ba70d 100644
--- a/drivers/net/ethernet/marvell/mvpp2.c
+++ b/drivers/net/ethernet/marvell/mvpp2.c
@@ -7465,6 +7465,31 @@ static bool mvpp2_port_has_tx_irqs(struct mvpp2 *priv,
return true;
}
+static void mvpp2_port_copy_mac_addr(struct net_device *dev, struct mvpp2 *priv,
+ struct device_node *port_node,
+ char **mac_from)
+{
+ struct mvpp2_port *port = netdev_priv(dev);
+ char hw_mac_addr[ETH_ALEN] = {0};
+ const char *dt_mac_addr;
+
+ dt_mac_addr = of_get_mac_address(port_node);
+ if (dt_mac_addr && is_valid_ether_addr(dt_mac_addr)) {
+ *mac_from = "device tree";
+ ether_addr_copy(dev->dev_addr, dt_mac_addr);
+ } else {
+ if (priv->hw_version == MVPP21)
+ mvpp21_get_mac_address(port, hw_mac_addr);
+ if (is_valid_ether_addr(hw_mac_addr)) {
+ *mac_from = "hardware";
+ ether_addr_copy(dev->dev_addr, hw_mac_addr);
+ } else {
+ *mac_from = "random";
+ eth_hw_addr_random(dev);
+ }
+ }
+}
+
/* Ports initialization */
static int mvpp2_port_probe(struct platform_device *pdev,
struct device_node *port_node,
@@ -7476,9 +7501,7 @@ static int mvpp2_port_probe(struct platform_device *pdev,
struct mvpp2_port_pcpu *port_pcpu;
struct net_device *dev;
struct resource *res;
- const char *dt_mac_addr;
- const char *mac_from;
- char hw_mac_addr[ETH_ALEN] = {0};
+ char *mac_from = "";
unsigned int ntxqs, nrxqs;
bool has_tx_irqs;
u32 id;
@@ -7587,21 +7610,7 @@ static int mvpp2_port_probe(struct platform_device *pdev,
goto err_free_irq;
}
- dt_mac_addr = of_get_mac_address(port_node);
- if (dt_mac_addr && is_valid_ether_addr(dt_mac_addr)) {
- mac_from = "device tree";
- ether_addr_copy(dev->dev_addr, dt_mac_addr);
- } else {
- if (priv->hw_version == MVPP21)
- mvpp21_get_mac_address(port, hw_mac_addr);
- if (is_valid_ether_addr(hw_mac_addr)) {
- mac_from = "hardware";
- ether_addr_copy(dev->dev_addr, hw_mac_addr);
- } else {
- mac_from = "random";
- eth_hw_addr_random(dev);
- }
- }
+ mvpp2_port_copy_mac_addr(dev, priv, port_node, &mac_from);
port->tx_ring_size = MVPP2_MAX_TXD;
port->rx_ring_size = MVPP2_MAX_RXD;
--
2.13.5
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH net-next v3 2/3] net: mvpp2: fix use of the random mac address for PPv2.2
2017-09-02 9:06 [PATCH net-next v3 0/3] net: mvpp2: improve the mac address retrieval logic Antoine Tenart
2017-09-02 9:06 ` [PATCH net-next v3 1/3] net: mvpp2: move the mac retrieval/copy logic into its own function Antoine Tenart
@ 2017-09-02 9:06 ` Antoine Tenart
2017-09-02 9:06 ` [PATCH net-next v3 3/3] net: mvpp2: fallback using h/w and random mac if the dt one isn't valid Antoine Tenart
2017-09-04 3:17 ` [PATCH net-next v3 0/3] net: mvpp2: improve the mac address retrieval logic David Miller
3 siblings, 0 replies; 5+ messages in thread
From: Antoine Tenart @ 2017-09-02 9:06 UTC (permalink / raw)
To: davem
Cc: Antoine Tenart, andrew, gregory.clement, thomas.petazzoni,
nadavh, linux, linux-kernel, mw, stefanc, netdev
The MAC retrieval logic is using a variable to store an h/w stored mac
address and checks this mac against invalid ones before using it. But
the mac address is only read from h/w when using PPv2.1. So when using
PPv2.2 it defaults to its init state.
This patches fixes the logic to only check if the h/w mac is valid when
actually retrieving a mac from h/w.
Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
---
drivers/net/ethernet/marvell/mvpp2.c | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/drivers/net/ethernet/marvell/mvpp2.c b/drivers/net/ethernet/marvell/mvpp2.c
index a702e60ba70d..c6003508f166 100644
--- a/drivers/net/ethernet/marvell/mvpp2.c
+++ b/drivers/net/ethernet/marvell/mvpp2.c
@@ -7478,15 +7478,17 @@ static void mvpp2_port_copy_mac_addr(struct net_device *dev, struct mvpp2 *priv,
*mac_from = "device tree";
ether_addr_copy(dev->dev_addr, dt_mac_addr);
} else {
- if (priv->hw_version == MVPP21)
+ if (priv->hw_version == MVPP21) {
mvpp21_get_mac_address(port, hw_mac_addr);
- if (is_valid_ether_addr(hw_mac_addr)) {
- *mac_from = "hardware";
- ether_addr_copy(dev->dev_addr, hw_mac_addr);
- } else {
- *mac_from = "random";
- eth_hw_addr_random(dev);
+ if (is_valid_ether_addr(hw_mac_addr)) {
+ *mac_from = "hardware";
+ ether_addr_copy(dev->dev_addr, hw_mac_addr);
+ return;
+ }
}
+
+ *mac_from = "random";
+ eth_hw_addr_random(dev);
}
}
--
2.13.5
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH net-next v3 3/3] net: mvpp2: fallback using h/w and random mac if the dt one isn't valid
2017-09-02 9:06 [PATCH net-next v3 0/3] net: mvpp2: improve the mac address retrieval logic Antoine Tenart
2017-09-02 9:06 ` [PATCH net-next v3 1/3] net: mvpp2: move the mac retrieval/copy logic into its own function Antoine Tenart
2017-09-02 9:06 ` [PATCH net-next v3 2/3] net: mvpp2: fix use of the random mac address for PPv2.2 Antoine Tenart
@ 2017-09-02 9:06 ` Antoine Tenart
2017-09-04 3:17 ` [PATCH net-next v3 0/3] net: mvpp2: improve the mac address retrieval logic David Miller
3 siblings, 0 replies; 5+ messages in thread
From: Antoine Tenart @ 2017-09-02 9:06 UTC (permalink / raw)
To: davem
Cc: Antoine Tenart, andrew, gregory.clement, thomas.petazzoni,
nadavh, linux, linux-kernel, mw, stefanc, netdev
When using a mac address described in the device tree, a check is made
to see if it is valid. When it's not, no fallback is defined. This
patches tries to get the mac address from h/w (or use a random one if
the h/w one isn't valid) when the dt mac address isn't valid.
Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
---
drivers/net/ethernet/marvell/mvpp2.c | 23 ++++++++++++-----------
1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/drivers/net/ethernet/marvell/mvpp2.c b/drivers/net/ethernet/marvell/mvpp2.c
index c6003508f166..dd0ee2691c86 100644
--- a/drivers/net/ethernet/marvell/mvpp2.c
+++ b/drivers/net/ethernet/marvell/mvpp2.c
@@ -7477,19 +7477,20 @@ static void mvpp2_port_copy_mac_addr(struct net_device *dev, struct mvpp2 *priv,
if (dt_mac_addr && is_valid_ether_addr(dt_mac_addr)) {
*mac_from = "device tree";
ether_addr_copy(dev->dev_addr, dt_mac_addr);
- } else {
- if (priv->hw_version == MVPP21) {
- mvpp21_get_mac_address(port, hw_mac_addr);
- if (is_valid_ether_addr(hw_mac_addr)) {
- *mac_from = "hardware";
- ether_addr_copy(dev->dev_addr, hw_mac_addr);
- return;
- }
- }
+ return;
+ }
- *mac_from = "random";
- eth_hw_addr_random(dev);
+ if (priv->hw_version == MVPP21) {
+ mvpp21_get_mac_address(port, hw_mac_addr);
+ if (is_valid_ether_addr(hw_mac_addr)) {
+ *mac_from = "hardware";
+ ether_addr_copy(dev->dev_addr, hw_mac_addr);
+ return;
+ }
}
+
+ *mac_from = "random";
+ eth_hw_addr_random(dev);
}
/* Ports initialization */
--
2.13.5
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH net-next v3 0/3] net: mvpp2: improve the mac address retrieval logic
2017-09-02 9:06 [PATCH net-next v3 0/3] net: mvpp2: improve the mac address retrieval logic Antoine Tenart
` (2 preceding siblings ...)
2017-09-02 9:06 ` [PATCH net-next v3 3/3] net: mvpp2: fallback using h/w and random mac if the dt one isn't valid Antoine Tenart
@ 2017-09-04 3:17 ` David Miller
3 siblings, 0 replies; 5+ messages in thread
From: David Miller @ 2017-09-04 3:17 UTC (permalink / raw)
To: antoine.tenart
Cc: andrew, gregory.clement, thomas.petazzoni, nadavh, linux,
linux-kernel, mw, stefanc, netdev
From: Antoine Tenart <antoine.tenart@free-electrons.com>
Date: Sat, 2 Sep 2017 11:06:46 +0200
> This series aims at fixing the logic behind the MAC address retrieval in the
> PPv2 driver. A possible issue is also fixed in patch 3/3 to introduce fallbacks
> when the address given in the device tree isn't valid.
...
> Since v2:
> - Patch 1/4 from v2 was applied on net (and net was merged in net-next).
> - Rebased on net-next.
>
> Since v1:
> - Rebased onto net (was on net-next).
Series applied, thank you.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-09-04 3:17 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-09-02 9:06 [PATCH net-next v3 0/3] net: mvpp2: improve the mac address retrieval logic Antoine Tenart
2017-09-02 9:06 ` [PATCH net-next v3 1/3] net: mvpp2: move the mac retrieval/copy logic into its own function Antoine Tenart
2017-09-02 9:06 ` [PATCH net-next v3 2/3] net: mvpp2: fix use of the random mac address for PPv2.2 Antoine Tenart
2017-09-02 9:06 ` [PATCH net-next v3 3/3] net: mvpp2: fallback using h/w and random mac if the dt one isn't valid Antoine Tenart
2017-09-04 3:17 ` [PATCH net-next v3 0/3] net: mvpp2: improve the mac address retrieval logic David Miller
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.