* [PATCH 2/2] ARM: kirkwood: remove ethernet clock gate workaround
2013-10-03 12:44 [PATCH 1/2] ARM: kirkwood: retain MAC address for DT ethernet Sebastian Hesselbarth
@ 2013-10-03 12:44 ` Sebastian Hesselbarth
2013-10-03 13:50 ` Ezequiel Garcia
2013-10-03 13:47 ` [PATCH 1/2] ARM: kirkwood: retain MAC address for DT ethernet Andrew Lunn
2013-10-03 18:56 ` [PATCH v2 " Sebastian Hesselbarth
2 siblings, 1 reply; 18+ messages in thread
From: Sebastian Hesselbarth @ 2013-10-03 12:44 UTC (permalink / raw)
To: linux-arm-kernel
With a proper fix for Kirkwood ethernet IP MAC address clock gating
issue, we can now remove the clock gating workaround that always
enabled ethernet clocks.
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
---
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
Cc: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Cc: linux-arm-kernel at lists.infradead.org
Cc: linux-kernel at vger.kernel.org
---
arch/arm/mach-kirkwood/board-dt.c | 14 --------------
1 file changed, 14 deletions(-)
diff --git a/arch/arm/mach-kirkwood/board-dt.c b/arch/arm/mach-kirkwood/board-dt.c
index a2974ad..a3bf0c7 100644
--- a/arch/arm/mach-kirkwood/board-dt.c
+++ b/arch/arm/mach-kirkwood/board-dt.c
@@ -41,7 +41,6 @@ static void __init kirkwood_legacy_clk_init(void)
struct device_node *np = of_find_compatible_node(
NULL, NULL, "marvell,kirkwood-gating-clock");
struct of_phandle_args clkspec;
- struct clk *clk;
clkspec.np = np;
clkspec.args_count = 1;
@@ -53,19 +52,6 @@ static void __init kirkwood_legacy_clk_init(void)
clkspec.args[0] = CGC_BIT_PEX1;
orion_clkdev_add("1", "pcie",
of_clk_get_from_provider(&clkspec));
-
- /*
- * The ethernet interfaces forget the MAC address assigned by
- * u-boot if the clocks are turned off. Until proper DT support
- * is available we always enable them for now.
- */
- clkspec.args[0] = CGC_BIT_GE0;
- clk = of_clk_get_from_provider(&clkspec);
- clk_prepare_enable(clk);
-
- clkspec.args[0] = CGC_BIT_GE1;
- clk = of_clk_get_from_provider(&clkspec);
- clk_prepare_enable(clk);
}
#define MV643XX_ETH_MAC_ADDR_LOW 0x0414
--
1.7.10.4
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH 2/2] ARM: kirkwood: remove ethernet clock gate workaround
2013-10-03 12:44 ` [PATCH 2/2] ARM: kirkwood: remove ethernet clock gate workaround Sebastian Hesselbarth
@ 2013-10-03 13:50 ` Ezequiel Garcia
0 siblings, 0 replies; 18+ messages in thread
From: Ezequiel Garcia @ 2013-10-03 13:50 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Oct 03, 2013 at 02:44:54PM +0200, Sebastian Hesselbarth wrote:
> With a proper fix for Kirkwood ethernet IP MAC address clock gating
> issue, we can now remove the clock gating workaround that always
> enabled ethernet clocks.
>
> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
> ---
> Cc: Jason Cooper <jason@lakedaemon.net>
> Cc: Andrew Lunn <andrew@lunn.ch>
> Cc: Russell King <linux@arm.linux.org.uk>
> Cc: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
> Cc: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
> Cc: linux-arm-kernel at lists.infradead.org
> Cc: linux-kernel at vger.kernel.org
> ---
> arch/arm/mach-kirkwood/board-dt.c | 14 --------------
> 1 file changed, 14 deletions(-)
>
> diff --git a/arch/arm/mach-kirkwood/board-dt.c b/arch/arm/mach-kirkwood/board-dt.c
> index a2974ad..a3bf0c7 100644
> --- a/arch/arm/mach-kirkwood/board-dt.c
> +++ b/arch/arm/mach-kirkwood/board-dt.c
> @@ -41,7 +41,6 @@ static void __init kirkwood_legacy_clk_init(void)
> struct device_node *np = of_find_compatible_node(
> NULL, NULL, "marvell,kirkwood-gating-clock");
> struct of_phandle_args clkspec;
> - struct clk *clk;
>
> clkspec.np = np;
> clkspec.args_count = 1;
> @@ -53,19 +52,6 @@ static void __init kirkwood_legacy_clk_init(void)
> clkspec.args[0] = CGC_BIT_PEX1;
> orion_clkdev_add("1", "pcie",
> of_clk_get_from_provider(&clkspec));
> -
> - /*
> - * The ethernet interfaces forget the MAC address assigned by
> - * u-boot if the clocks are turned off. Until proper DT support
> - * is available we always enable them for now.
> - */
> - clkspec.args[0] = CGC_BIT_GE0;
> - clk = of_clk_get_from_provider(&clkspec);
> - clk_prepare_enable(clk);
> -
> - clkspec.args[0] = CGC_BIT_GE1;
> - clk = of_clk_get_from_provider(&clkspec);
> - clk_prepare_enable(clk);
> }
>
> #define MV643XX_ETH_MAC_ADDR_LOW 0x0414
> --
> 1.7.10.4
>
Good!
And if this works, this patch effectively removes the
kirkwood_legacy_clk_init() call from this file.
I'll certainly give this a test later (not soon though).
Nice job!
--
Ezequiel Garc?a, Free Electrons
Embedded Linux, Kernel and Android Engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH 1/2] ARM: kirkwood: retain MAC address for DT ethernet
2013-10-03 12:44 [PATCH 1/2] ARM: kirkwood: retain MAC address for DT ethernet Sebastian Hesselbarth
2013-10-03 12:44 ` [PATCH 2/2] ARM: kirkwood: remove ethernet clock gate workaround Sebastian Hesselbarth
@ 2013-10-03 13:47 ` Andrew Lunn
2013-10-03 15:15 ` Sebastian Hesselbarth
2013-10-03 18:56 ` [PATCH v2 " Sebastian Hesselbarth
2 siblings, 1 reply; 18+ messages in thread
From: Andrew Lunn @ 2013-10-03 13:47 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Oct 03, 2013 at 02:44:53PM +0200, Sebastian Hesselbarth wrote:
> Ethernet IP on Kirkwood SoCs loose their MAC address register content
> if clock gated. To allow modular ethernet driver setups and gated clocks
> also on non-DT capable bootloaders, we fixup port device nodes with no
> valid MAC address property. This patch copies MAC address register
> contents set up by bootloaders early, notably before ethernet clocks
> are gated. While at it, also reorder call sequence in _dt_init.
>
> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
> ---
> - Added Benjamin and Grant who where part of the discussion last time
> and gave valuable input on DT fixups.
> - Patches are based on v3.12-rc1 and depend on latest mv643xx_eth
> fixes applied yesterday by David Miller [1].
>
> [1] https://git.kernel.org/cgit/linux/kernel/git/davem/net.git/commit/?id=569943d0639c85a451ea853087cbd5f738247dd9
>
> Cc: Jason Cooper <jason@lakedaemon.net>
> Cc: Andrew Lunn <andrew@lunn.ch>
> Cc: Russell King <linux@arm.linux.org.uk>
> Cc: Grant Likely <grant.likely@linaro.org>
> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
> Cc: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
> Cc: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
> Cc: linux-arm-kernel at lists.infradead.org
> Cc: linux-kernel at vger.kernel.org
> ---
> arch/arm/mach-kirkwood/board-dt.c | 72 +++++++++++++++++++++++++++++++++++--
> 1 file changed, 69 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm/mach-kirkwood/board-dt.c b/arch/arm/mach-kirkwood/board-dt.c
> index 82d3ad8..a2974ad 100644
> --- a/arch/arm/mach-kirkwood/board-dt.c
> +++ b/arch/arm/mach-kirkwood/board-dt.c
> @@ -13,6 +13,8 @@
> #include <linux/kernel.h>
> #include <linux/init.h>
> #include <linux/of.h>
> +#include <linux/of_address.h>
> +#include <linux/of_net.h>
> #include <linux/of_platform.h>
> #include <linux/clk-provider.h>
> #include <linux/clocksource.h>
> @@ -66,6 +68,71 @@ static void __init kirkwood_legacy_clk_init(void)
> clk_prepare_enable(clk);
> }
>
> +#define MV643XX_ETH_MAC_ADDR_LOW 0x0414
> +#define MV643XX_ETH_MAC_ADDR_HIGH 0x0418
> +
> +static void __init kirkwood_dt_eth_fixup(void)
> +{
> + struct device_node *np;
> +
> + /*
> + * The ethernet interfaces forget the MAC address assigned by u-boot
> + * if the clocks are turned off. Usually, u-boot on kirkwood boards
> + * has no DT support to properly set local-mac-address property.
> + * As a workaround, we get the MAC address from mv643xx_eth registers
> + * and update the port device node if no valid MAC address is set.
> + */
> + for_each_compatible_node(np, NULL, "marvell,kirkwood-eth-port") {
> + struct device_node *pnp = of_get_parent(np);
> + struct property *pmac;
> + void __iomem *io;
> + u8 *macaddr;
> + u32 reg;
> +
> + if (!pnp || !of_device_is_available(pnp))
> + continue;
> +
> + if (of_get_mac_address(np))
> + continue;
> +
> + pr_err(FW_BUG "%s: local-mac-address is not set\n",
> + np->full_name);
> +
> + io = of_iomap(pnp, 0);
> + if (!io)
> + continue;
> +
> + pmac = kzalloc(sizeof(*pmac) + 6, GFP_KERNEL);
> + if (!pmac) {
> + iounmap(io);
> + continue;
> + }
> +
> + pmac->value = pmac + 1;
> + pmac->length = 6;
> + pmac->name = kstrdup("local-mac-address", GFP_KERNEL);
> + if (!pmac->name) {
> + kfree(pmac);
> + iounmap(io);
> + continue;
> + }
> +
> + macaddr = pmac->value;
> + reg = readl(io + MV643XX_ETH_MAC_ADDR_HIGH);
> + macaddr[0] = (reg >> 24) & 0xff;
> + macaddr[1] = (reg >> 16) & 0xff;
> + macaddr[2] = (reg >> 8) & 0xff;
> + macaddr[3] = reg & 0xff;
Hi Sebastian
What happens if at this point, the ethernet clock is gated off? I
assume the CPU locks solid, requiring a power cycle.
It would be a bit of an odd situation, u-boot has disabled the clock,
yet we have a DT node for the device and no valid local-mac-address.
We do however know that Jason Gunthorpe u-boot does gate the second
ethernet for his board, so it is not completely impossible to hit this
situation, particularly when bringing up a new board.
Are we too early in the boot to actually use the clock information in
the node to find it, and clk_prepare_enable() it before making the
access?
Andrew
^ permalink raw reply [flat|nested] 18+ messages in thread* [PATCH 1/2] ARM: kirkwood: retain MAC address for DT ethernet
2013-10-03 13:47 ` [PATCH 1/2] ARM: kirkwood: retain MAC address for DT ethernet Andrew Lunn
@ 2013-10-03 15:15 ` Sebastian Hesselbarth
0 siblings, 0 replies; 18+ messages in thread
From: Sebastian Hesselbarth @ 2013-10-03 15:15 UTC (permalink / raw)
To: linux-arm-kernel
On October 3, 2013 3:47:24 PM Andrew Lunn <andrew@lunn.ch> wrote:
> On Thu, Oct 03, 2013 at 02:44:53PM +0200, Sebastian Hesselbarth wrote:
> > Ethernet IP on Kirkwood SoCs loose their MAC address register content
> > if clock gated. To allow modular ethernet driver setups and gated clocks
> > also on non-DT capable bootloaders, we fixup port device nodes with no
> > valid MAC address property. This patch copies MAC address register
> > contents set up by bootloaders early, notably before ethernet clocks
> > are gated. While at it, also reorder call sequence in _dt_init.
> > Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
> > ---
> > - Added Benjamin and Grant who where part of the discussion last time
> > and gave valuable input on DT fixups.
> > - Patches are based on v3.12-rc1 and depend on latest mv643xx_eth
> > fixes applied yesterday by David Miller [1].
> > [1]
> https://git.kernel.org/cgit/linux/kernel/git/davem/net.git/commit/?id=569943d0639c85a451ea853087cbd5f738247dd9
> > Cc: Jason Cooper <jason@lakedaemon.net>
> > Cc: Andrew Lunn <andrew@lunn.ch>
> > Cc: Russell King <linux@arm.linux.org.uk>
> > Cc: Grant Likely <grant.likely@linaro.org>
> > Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
> > Cc: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
> > Cc: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
> > Cc: linux-arm-kernel at lists.infradead.org
> > Cc: linux-kernel at vger.kernel.org
> > ---
> > arch/arm/mach-kirkwood/board-dt.c | 72
> +++++++++++++++++++++++++++++++++++--
> > 1 file changed, 69 insertions(+), 3 deletions(-)
> > diff --git a/arch/arm/mach-kirkwood/board-dt.c
> b/arch/arm/mach-kirkwood/board-dt.c
> > index 82d3ad8..a2974ad 100644
> > --- a/arch/arm/mach-kirkwood/board-dt.c
> > +++ b/arch/arm/mach-kirkwood/board-dt.c
> > @@ -13,6 +13,8 @@
> > #include <linux/kernel.h>
> > #include <linux/init.h>
> > #include <linux/of.h>
> > +#include <linux/of_address.h>
> > +#include <linux/of_net.h>
> > #include <linux/of_platform.h>
> > #include <linux/clk-provider.h>
> > #include <linux/clocksource.h>
> > @@ -66,6 +68,71 @@ static void __init kirkwood_legacy_clk_init(void)
> > clk_prepare_enable(clk);
> > }
> > +#define MV643XX_ETH_MAC_ADDR_LOW 0x0414
> > +#define MV643XX_ETH_MAC_ADDR_HIGH 0x0418
> > +
> > +static void __init kirkwood_dt_eth_fixup(void)
> > +{
> > + struct device_node *np;
> > +
> > + /*
> > + * The ethernet interfaces forget the MAC address assigned by u-boot
> > + * if the clocks are turned off. Usually, u-boot on kirkwood boards
> > + * has no DT support to properly set local-mac-address property.
> > + * As a workaround, we get the MAC address from mv643xx_eth registers
> > + * and update the port device node if no valid MAC address is set.
> > + */
> > + for_each_compatible_node(np, NULL, "marvell,kirkwood-eth-port") {
> > + struct device_node *pnp = of_get_parent(np);
> > + struct property *pmac;
> > + void __iomem *io;
> > + u8 *macaddr;
> > + u32 reg;
> > +
> > + if (!pnp || !of_device_is_available(pnp))
> > + continue;
> > +
> > + if (of_get_mac_address(np))
> > + continue;
> > +
> > + pr_err(FW_BUG "%s: local-mac-address is not set\n",
> > + np->full_name);
> > +
> > + io = of_iomap(pnp, 0);
> > + if (!io)
> > + continue;
> > +
> > + pmac = kzalloc(sizeof(*pmac) + 6, GFP_KERNEL);
> > + if (!pmac) {
> > + iounmap(io);
> > + continue;
> > + }
> > +
> > + pmac->value = pmac + 1;
> > + pmac->length = 6;
> > + pmac->name = kstrdup("local-mac-address", GFP_KERNEL);
> > + if (!pmac->name) {
> > + kfree(pmac);
> > + iounmap(io);
> > + continue;
> > + }
> > +
> > + macaddr = pmac->value;
> > + reg = readl(io + MV643XX_ETH_MAC_ADDR_HIGH);
> > + macaddr[0] = (reg >> 24) & 0xff;
> > + macaddr[1] = (reg >> 16) & 0xff;
> > + macaddr[2] = (reg >> 8) & 0xff;
> > + macaddr[3] = reg & 0xff;
>
> Hi Sebastian
>
> What happens if at this point, the ethernet clock is gated off? I
> assume the CPU locks solid, requiring a power cycle.
>
> It would be a bit of an odd situation, u-boot has disabled the clock,
> yet we have a DT node for the device and no valid local-mac-address.
> We do however know that Jason Gunthorpe u-boot does gate the second
> ethernet for his board, so it is not completely impossible to hit this
> situation, particularly when bringing up a new board.
>
> Are we too early in the boot to actually use the clock information in
> the node to find it, and clk_prepare_enable() it before making the
> access?
Ccframework is up when calling this. I suggest to call clk_is_enabled and
also skip the fixup if it isn't. Clk_prepare_enable ist quite useless, as
register contents will suffer what this workaround is about. I send an
updated v2 later but someone will have to test as I don't have kirkwood
around till next week.
> Andrew
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH v2 1/2] ARM: kirkwood: retain MAC address for DT ethernet
2013-10-03 12:44 [PATCH 1/2] ARM: kirkwood: retain MAC address for DT ethernet Sebastian Hesselbarth
2013-10-03 12:44 ` [PATCH 2/2] ARM: kirkwood: remove ethernet clock gate workaround Sebastian Hesselbarth
2013-10-03 13:47 ` [PATCH 1/2] ARM: kirkwood: retain MAC address for DT ethernet Andrew Lunn
@ 2013-10-03 18:56 ` Sebastian Hesselbarth
2013-10-03 19:02 ` Ezequiel Garcia
` (2 more replies)
2 siblings, 3 replies; 18+ messages in thread
From: Sebastian Hesselbarth @ 2013-10-03 18:56 UTC (permalink / raw)
To: linux-arm-kernel
Ethernet IP on Kirkwood SoCs loose their MAC address register content
if clock gated. To allow modular ethernet driver setups and gated clocks
also on non-DT capable bootloaders, we fixup port device nodes with no
valid MAC address property. This patch copies MAC address register
contents set up by bootloaders early, notably before ethernet clocks
are gated. While at it, also reorder call sequence in _dt_init.
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
---
Changelog:
v1->v2:
- check for gated clock before accessing eth registers
(Suggested by Andrew Lunn)
TBH, as there is no "official" clk_is_enabled but just the __clk_is_enabled
one, this is close to abuse of CCF API. Actually, there should either be an
clk_is_enabled or we enable the clock, copy a possible invalid MAC address
and disable the clock again. (Added Mike, who might have an opinion about
clk_is_enabled)
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Grant Likely <grant.likely@linaro.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
Cc: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Cc: Mike Turquette <mturquette@linaro.org>
Cc: linux-arm-kernel at lists.infradead.org
Cc: linux-kernel at vger.kernel.org
---
arch/arm/mach-kirkwood/board-dt.c | 77 +++++++++++++++++++++++++++++++++++--
1 file changed, 74 insertions(+), 3 deletions(-)
diff --git a/arch/arm/mach-kirkwood/board-dt.c b/arch/arm/mach-kirkwood/board-dt.c
index 82d3ad8..f5f35bb 100644
--- a/arch/arm/mach-kirkwood/board-dt.c
+++ b/arch/arm/mach-kirkwood/board-dt.c
@@ -13,6 +13,8 @@
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/of.h>
+#include <linux/of_address.h>
+#include <linux/of_net.h>
#include <linux/of_platform.h>
#include <linux/clk-provider.h>
#include <linux/clocksource.h>
@@ -66,6 +68,76 @@ static void __init kirkwood_legacy_clk_init(void)
clk_prepare_enable(clk);
}
+#define MV643XX_ETH_MAC_ADDR_LOW 0x0414
+#define MV643XX_ETH_MAC_ADDR_HIGH 0x0418
+
+static void __init kirkwood_dt_eth_fixup(void)
+{
+ struct device_node *np;
+
+ /*
+ * The ethernet interfaces forget the MAC address assigned by u-boot
+ * if the clocks are turned off. Usually, u-boot on kirkwood boards
+ * has no DT support to properly set local-mac-address property.
+ * As a workaround, we get the MAC address from mv643xx_eth registers
+ * and update the port device node if no valid MAC address is set.
+ */
+ for_each_compatible_node(np, NULL, "marvell,kirkwood-eth-port") {
+ struct device_node *pnp = of_get_parent(np);
+ struct clk *clk;
+ struct property *pmac;
+ void __iomem *io;
+ u8 *macaddr;
+ u32 reg;
+
+ if (!pnp || !of_device_is_available(pnp))
+ continue;
+
+ clk = of_clk_get(pnp, 0);
+ if (!__clk_is_enabled(clk) || of_get_mac_address(np)) {
+ clk_put(clk);
+ continue;
+ }
+ clk_put(clk);
+
+ pr_err(FW_BUG "%s: local-mac-address is not set\n",
+ np->full_name);
+
+ io = of_iomap(pnp, 0);
+ if (!io)
+ continue;
+
+ pmac = kzalloc(sizeof(*pmac) + 6, GFP_KERNEL);
+ if (!pmac) {
+ iounmap(io);
+ continue;
+ }
+
+ pmac->value = pmac + 1;
+ pmac->length = 6;
+ pmac->name = kstrdup("local-mac-address", GFP_KERNEL);
+ if (!pmac->name) {
+ kfree(pmac);
+ iounmap(io);
+ continue;
+ }
+
+ macaddr = pmac->value;
+ reg = readl(io + MV643XX_ETH_MAC_ADDR_HIGH);
+ macaddr[0] = (reg >> 24) & 0xff;
+ macaddr[1] = (reg >> 16) & 0xff;
+ macaddr[2] = (reg >> 8) & 0xff;
+ macaddr[3] = reg & 0xff;
+
+ reg = readl(io + MV643XX_ETH_MAC_ADDR_LOW);
+ macaddr[4] = (reg >> 8) & 0xff;
+ macaddr[5] = reg & 0xff;
+
+ of_update_property(np, pmac);
+ iounmap(io);
+ }
+}
+
static void __init kirkwood_dt_time_init(void)
{
of_clk_init(NULL);
@@ -97,11 +169,10 @@ static void __init kirkwood_dt_init(void)
kirkwood_l2_init();
kirkwood_cpufreq_init();
-
+ kirkwood_cpuidle_init();
/* Setup clocks for legacy devices */
kirkwood_legacy_clk_init();
-
- kirkwood_cpuidle_init();
+ kirkwood_dt_eth_fixup();
#ifdef CONFIG_KEXEC
kexec_reinit = kirkwood_enable_pcie;
--
1.7.10.4
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH v2 1/2] ARM: kirkwood: retain MAC address for DT ethernet
2013-10-03 18:56 ` [PATCH v2 " Sebastian Hesselbarth
@ 2013-10-03 19:02 ` Ezequiel Garcia
2013-10-03 19:04 ` Jason Cooper
2013-10-04 10:13 ` [PATCH v3] ARM: kirkwood: remove ethernet clock gate workaround Sebastian Hesselbarth
2013-10-04 10:17 ` [PATCH RESEND v3] ARM: kirkwood: retain MAC address for DT ethernet Sebastian Hesselbarth
2 siblings, 1 reply; 18+ messages in thread
From: Ezequiel Garcia @ 2013-10-03 19:02 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Oct 03, 2013 at 08:56:08PM +0200, Sebastian Hesselbarth wrote:
> Ethernet IP on Kirkwood SoCs loose their MAC address register content
> if clock gated. To allow modular ethernet driver setups and gated clocks
> also on non-DT capable bootloaders, we fixup port device nodes with no
> valid MAC address property. This patch copies MAC address register
> contents set up by bootloaders early, notably before ethernet clocks
> are gated. While at it, also reorder call sequence in _dt_init.
>
> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
> ---
> Changelog:
> v1->v2:
> - check for gated clock before accessing eth registers
> (Suggested by Andrew Lunn)
>
> TBH, as there is no "official" clk_is_enabled but just the __clk_is_enabled
> one, this is close to abuse of CCF API. Actually, there should either be an
> clk_is_enabled or we enable the clock, copy a possible invalid MAC address
> and disable the clock again. (Added Mike, who might have an opinion about
> clk_is_enabled)
>
> Cc: Jason Cooper <jason@lakedaemon.net>
> Cc: Andrew Lunn <andrew@lunn.ch>
> Cc: Russell King <linux@arm.linux.org.uk>
> Cc: Grant Likely <grant.likely@linaro.org>
> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
> Cc: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
> Cc: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
> Cc: Mike Turquette <mturquette@linaro.org>
> Cc: linux-arm-kernel at lists.infradead.org
> Cc: linux-kernel at vger.kernel.org
> ---
> arch/arm/mach-kirkwood/board-dt.c | 77 +++++++++++++++++++++++++++++++++++--
> 1 file changed, 74 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm/mach-kirkwood/board-dt.c b/arch/arm/mach-kirkwood/board-dt.c
> index 82d3ad8..f5f35bb 100644
> --- a/arch/arm/mach-kirkwood/board-dt.c
> +++ b/arch/arm/mach-kirkwood/board-dt.c
> @@ -13,6 +13,8 @@
> #include <linux/kernel.h>
> #include <linux/init.h>
> #include <linux/of.h>
> +#include <linux/of_address.h>
> +#include <linux/of_net.h>
> #include <linux/of_platform.h>
> #include <linux/clk-provider.h>
> #include <linux/clocksource.h>
> @@ -66,6 +68,76 @@ static void __init kirkwood_legacy_clk_init(void)
> clk_prepare_enable(clk);
> }
>
> +#define MV643XX_ETH_MAC_ADDR_LOW 0x0414
> +#define MV643XX_ETH_MAC_ADDR_HIGH 0x0418
> +
> +static void __init kirkwood_dt_eth_fixup(void)
> +{
> + struct device_node *np;
> +
> + /*
> + * The ethernet interfaces forget the MAC address assigned by u-boot
> + * if the clocks are turned off. Usually, u-boot on kirkwood boards
> + * has no DT support to properly set local-mac-address property.
> + * As a workaround, we get the MAC address from mv643xx_eth registers
> + * and update the port device node if no valid MAC address is set.
> + */
> + for_each_compatible_node(np, NULL, "marvell,kirkwood-eth-port") {
> + struct device_node *pnp = of_get_parent(np);
> + struct clk *clk;
> + struct property *pmac;
> + void __iomem *io;
> + u8 *macaddr;
> + u32 reg;
> +
> + if (!pnp || !of_device_is_available(pnp))
> + continue;
> +
> + clk = of_clk_get(pnp, 0);
> + if (!__clk_is_enabled(clk) || of_get_mac_address(np)) {
Mm.. just as you say this usage of __clk_is_enabled is awkard to say the
least.
I'm wondering: is the clock really disabled if the device is not
available (i.e. status == 'ok')? In other words: isn't the
!of_device_is_available() test enough?
Or maybe I'm missing something?
--
Ezequiel Garc?a, Free Electrons
Embedded Linux, Kernel and Android Engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 18+ messages in thread* [PATCH v2 1/2] ARM: kirkwood: retain MAC address for DT ethernet
2013-10-03 19:02 ` Ezequiel Garcia
@ 2013-10-03 19:04 ` Jason Cooper
2013-10-03 19:44 ` Jason Gunthorpe
0 siblings, 1 reply; 18+ messages in thread
From: Jason Cooper @ 2013-10-03 19:04 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Oct 03, 2013 at 04:02:02PM -0300, Ezequiel Garcia wrote:
> On Thu, Oct 03, 2013 at 08:56:08PM +0200, Sebastian Hesselbarth wrote:
> > Ethernet IP on Kirkwood SoCs loose their MAC address register content
> > if clock gated. To allow modular ethernet driver setups and gated clocks
> > also on non-DT capable bootloaders, we fixup port device nodes with no
> > valid MAC address property. This patch copies MAC address register
> > contents set up by bootloaders early, notably before ethernet clocks
> > are gated. While at it, also reorder call sequence in _dt_init.
> >
> > Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
> > ---
> > Changelog:
> > v1->v2:
> > - check for gated clock before accessing eth registers
> > (Suggested by Andrew Lunn)
> >
> > TBH, as there is no "official" clk_is_enabled but just the __clk_is_enabled
> > one, this is close to abuse of CCF API. Actually, there should either be an
> > clk_is_enabled or we enable the clock, copy a possible invalid MAC address
> > and disable the clock again. (Added Mike, who might have an opinion about
> > clk_is_enabled)
> >
> > Cc: Jason Cooper <jason@lakedaemon.net>
> > Cc: Andrew Lunn <andrew@lunn.ch>
> > Cc: Russell King <linux@arm.linux.org.uk>
> > Cc: Grant Likely <grant.likely@linaro.org>
> > Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
> > Cc: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
> > Cc: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
> > Cc: Mike Turquette <mturquette@linaro.org>
> > Cc: linux-arm-kernel at lists.infradead.org
> > Cc: linux-kernel at vger.kernel.org
> > ---
> > arch/arm/mach-kirkwood/board-dt.c | 77 +++++++++++++++++++++++++++++++++++--
> > 1 file changed, 74 insertions(+), 3 deletions(-)
> >
> > diff --git a/arch/arm/mach-kirkwood/board-dt.c b/arch/arm/mach-kirkwood/board-dt.c
> > index 82d3ad8..f5f35bb 100644
> > --- a/arch/arm/mach-kirkwood/board-dt.c
> > +++ b/arch/arm/mach-kirkwood/board-dt.c
> > @@ -13,6 +13,8 @@
> > #include <linux/kernel.h>
> > #include <linux/init.h>
> > #include <linux/of.h>
> > +#include <linux/of_address.h>
> > +#include <linux/of_net.h>
> > #include <linux/of_platform.h>
> > #include <linux/clk-provider.h>
> > #include <linux/clocksource.h>
> > @@ -66,6 +68,76 @@ static void __init kirkwood_legacy_clk_init(void)
> > clk_prepare_enable(clk);
> > }
> >
> > +#define MV643XX_ETH_MAC_ADDR_LOW 0x0414
> > +#define MV643XX_ETH_MAC_ADDR_HIGH 0x0418
> > +
> > +static void __init kirkwood_dt_eth_fixup(void)
> > +{
> > + struct device_node *np;
> > +
> > + /*
> > + * The ethernet interfaces forget the MAC address assigned by u-boot
> > + * if the clocks are turned off. Usually, u-boot on kirkwood boards
> > + * has no DT support to properly set local-mac-address property.
> > + * As a workaround, we get the MAC address from mv643xx_eth registers
> > + * and update the port device node if no valid MAC address is set.
> > + */
> > + for_each_compatible_node(np, NULL, "marvell,kirkwood-eth-port") {
> > + struct device_node *pnp = of_get_parent(np);
> > + struct clk *clk;
> > + struct property *pmac;
> > + void __iomem *io;
> > + u8 *macaddr;
> > + u32 reg;
> > +
> > + if (!pnp || !of_device_is_available(pnp))
> > + continue;
> > +
> > + clk = of_clk_get(pnp, 0);
> > + if (!__clk_is_enabled(clk) || of_get_mac_address(np)) {
>
> Mm.. just as you say this usage of __clk_is_enabled is awkard to say the
> least.
>
> I'm wondering: is the clock really disabled if the device is not
> available (i.e. status == 'ok')? In other words: isn't the
> !of_device_is_available() test enough?
Well, this stemmed from JasonG's scenario where the second iface is
shut off by the bootloader. Although one could argue that the
bootloader should then update the dtb to mark that node as disabled...
thx,
Jason.
^ permalink raw reply [flat|nested] 18+ messages in thread* [PATCH v2 1/2] ARM: kirkwood: retain MAC address for DT ethernet
2013-10-03 19:04 ` Jason Cooper
@ 2013-10-03 19:44 ` Jason Gunthorpe
2013-10-03 20:14 ` Sebastian Hesselbarth
2013-10-03 20:24 ` Andrew Lunn
0 siblings, 2 replies; 18+ messages in thread
From: Jason Gunthorpe @ 2013-10-03 19:44 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Oct 03, 2013 at 03:04:37PM -0400, Jason Cooper wrote:
> > I'm wondering: is the clock really disabled if the device is not
> > available (i.e. status == 'ok')? In other words: isn't the
> > !of_device_is_available() test enough?
>
> Well, this stemmed from JasonG's scenario where the second iface is
> shut off by the bootloader. Although one could argue that the
> bootloader should then update the dtb to mark that node as disabled...
Right, that is what we do here, only the first eth is present in the
dt, the second is gated and powered down (noting that Linux doesn't
know how to power it up :()
This check is only to prevent CPU lockup if the firmware has included
a DT node for ethernet, not included the MAC address and turned off
the clock.
Sebastian, does __clk_enabled work properly for the mvebu clock
provider? I don't see a clk_ops.is_enabled for mvebu.. (don't know
much about clk)
Also, I think you should move the pr_err above the clock test, or make
a special pr_err for the clock test as well. Having the clock gated,
no mac address and a dt node is still a fw bug.
Regards,
Jason
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH v2 1/2] ARM: kirkwood: retain MAC address for DT ethernet
2013-10-03 19:44 ` Jason Gunthorpe
@ 2013-10-03 20:14 ` Sebastian Hesselbarth
2013-10-03 20:24 ` Andrew Lunn
1 sibling, 0 replies; 18+ messages in thread
From: Sebastian Hesselbarth @ 2013-10-03 20:14 UTC (permalink / raw)
To: linux-arm-kernel
On 10/03/2013 09:44 PM, Jason Gunthorpe wrote:
> On Thu, Oct 03, 2013 at 03:04:37PM -0400, Jason Cooper wrote:
>
>>> I'm wondering: is the clock really disabled if the device is not
>>> available (i.e. status == 'ok')? In other words: isn't the
>>> !of_device_is_available() test enough?
>>
>> Well, this stemmed from JasonG's scenario where the second iface is
>> shut off by the bootloader. Although one could argue that the
>> bootloader should then update the dtb to mark that node as disabled...
>
> Right, that is what we do here, only the first eth is present in the
> dt, the second is gated and powered down (noting that Linux doesn't
> know how to power it up :()
>
> This check is only to prevent CPU lockup if the firmware has included
> a DT node for ethernet, not included the MAC address and turned off
> the clock.
>
> Sebastian, does __clk_enabled work properly for the mvebu clock
> provider? I don't see a clk_ops.is_enabled for mvebu.. (don't know
> much about clk)
(joint answer for all three above)
A node with status != "okay" means "hardware/board does not allow you
to use that port at all, i.e. no ethernet jack"; disabling the clock
just means "I don't expect _all_ users want to use this jack, but it
is connected". So there _is_ a difference here.
clk-gate, which is the underlying clk provider for our gates, does
provide .is_enabled and reads the register. I haven't tested this,
due to no KW hardware available right now, but it should test for
disabled clocks as expected.
> Also, I think you should move the pr_err above the clock test, or make
> a special pr_err for the clock test as well. Having the clock gated,
> no mac address and a dt node is still a fw bug.
Well, we have 4 cases here:
- status != "okay": skip
- of_get_mac_address() != NULL: skip (no registers read)
- !__clk_is_enabled(): skip and warn with FW_BUG about disabled
clocks but no valid MAC address set.
- else, read registers, store MAC in DT, warn with FW_BUG about
enabled clocks and no valid MAC address set.
Leaves missing public clk_is_enabled(), which I can provide a
patch for if Mike agrees (and I haven't missed anything without
really looking into CCF).
Sebastian
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH v2 1/2] ARM: kirkwood: retain MAC address for DT ethernet
2013-10-03 19:44 ` Jason Gunthorpe
2013-10-03 20:14 ` Sebastian Hesselbarth
@ 2013-10-03 20:24 ` Andrew Lunn
1 sibling, 0 replies; 18+ messages in thread
From: Andrew Lunn @ 2013-10-03 20:24 UTC (permalink / raw)
To: linux-arm-kernel
> Sebastian, does __clk_enabled work properly for the mvebu clock
> provider? I don't see a clk_ops.is_enabled for mvebu.. (don't know
> much about clk)
Hi Jason
It is implemented in drivers/clk/clk-gate.c, which is what mvebu is
using.
Andrew
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH v3] ARM: kirkwood: remove ethernet clock gate workaround
2013-10-03 18:56 ` [PATCH v2 " Sebastian Hesselbarth
2013-10-03 19:02 ` Ezequiel Garcia
@ 2013-10-04 10:13 ` Sebastian Hesselbarth
2013-10-04 10:14 ` Sebastian Hesselbarth
2013-10-04 10:17 ` [PATCH RESEND v3] ARM: kirkwood: retain MAC address for DT ethernet Sebastian Hesselbarth
2 siblings, 1 reply; 18+ messages in thread
From: Sebastian Hesselbarth @ 2013-10-04 10:13 UTC (permalink / raw)
To: linux-arm-kernel
With a proper fix for Kirkwood ethernet IP MAC address clock gating
issue, we can now remove the clock gating workaround that always
enabled ethernet clocks.
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
---
Changelog:
v2->v3:
- make use of new public clk_is_enabled, adds dependency to [1]
- add warning about gated clock && missing MAC property
(Suggested by Jason Gunthorpe)
v1->v2:
- check for gated clock before accessing eth registers
(Suggested by Andrew Lunn)
[1] http://www.spinics.net/lists/arm-kernel/msg277392.html
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Grant Likely <grant.likely@linaro.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
Cc: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Cc: Mike Turquette <mturquette@linaro.org>
Cc: linux-arm-kernel at lists.infradead.org
Cc: linux-kernel at vger.kernel.org
---
arch/arm/mach-kirkwood/board-dt.c | 14 --------------
1 file changed, 14 deletions(-)
diff --git a/arch/arm/mach-kirkwood/board-dt.c b/arch/arm/mach-kirkwood/board-dt.c
index 28e952b..6925de8 100644
--- a/arch/arm/mach-kirkwood/board-dt.c
+++ b/arch/arm/mach-kirkwood/board-dt.c
@@ -41,7 +41,6 @@ static void __init kirkwood_legacy_clk_init(void)
struct device_node *np = of_find_compatible_node(
NULL, NULL, "marvell,kirkwood-gating-clock");
struct of_phandle_args clkspec;
- struct clk *clk;
clkspec.np = np;
clkspec.args_count = 1;
@@ -53,19 +52,6 @@ static void __init kirkwood_legacy_clk_init(void)
clkspec.args[0] = CGC_BIT_PEX1;
orion_clkdev_add("1", "pcie",
of_clk_get_from_provider(&clkspec));
-
- /*
- * The ethernet interfaces forget the MAC address assigned by
- * u-boot if the clocks are turned off. Until proper DT support
- * is available we always enable them for now.
- */
- clkspec.args[0] = CGC_BIT_GE0;
- clk = of_clk_get_from_provider(&clkspec);
- clk_prepare_enable(clk);
-
- clkspec.args[0] = CGC_BIT_GE1;
- clk = of_clk_get_from_provider(&clkspec);
- clk_prepare_enable(clk);
}
#define MV643XX_ETH_MAC_ADDR_LOW 0x0414
--
1.7.10.4
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH v3] ARM: kirkwood: remove ethernet clock gate workaround
2013-10-04 10:13 ` [PATCH v3] ARM: kirkwood: remove ethernet clock gate workaround Sebastian Hesselbarth
@ 2013-10-04 10:14 ` Sebastian Hesselbarth
0 siblings, 0 replies; 18+ messages in thread
From: Sebastian Hesselbarth @ 2013-10-04 10:14 UTC (permalink / raw)
To: linux-arm-kernel
On 10/04/2013 12:13 PM, Sebastian Hesselbarth wrote:
> With a proper fix for Kirkwood ethernet IP MAC address clock gating
> issue, we can now remove the clock gating workaround that always
> enabled ethernet clocks.
>
> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Damn, wrong patch.
> ---
> Changelog:
> v2->v3:
> - make use of new public clk_is_enabled, adds dependency to [1]
> - add warning about gated clock && missing MAC property
> (Suggested by Jason Gunthorpe)
> v1->v2:
> - check for gated clock before accessing eth registers
> (Suggested by Andrew Lunn)
>
> [1] http://www.spinics.net/lists/arm-kernel/msg277392.html
>
> Cc: Jason Cooper <jason@lakedaemon.net>
> Cc: Andrew Lunn <andrew@lunn.ch>
> Cc: Russell King <linux@arm.linux.org.uk>
> Cc: Grant Likely <grant.likely@linaro.org>
> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
> Cc: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
> Cc: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
> Cc: Mike Turquette <mturquette@linaro.org>
> Cc: linux-arm-kernel at lists.infradead.org
> Cc: linux-kernel at vger.kernel.org
> ---
> arch/arm/mach-kirkwood/board-dt.c | 14 --------------
> 1 file changed, 14 deletions(-)
>
> diff --git a/arch/arm/mach-kirkwood/board-dt.c b/arch/arm/mach-kirkwood/board-dt.c
> index 28e952b..6925de8 100644
> --- a/arch/arm/mach-kirkwood/board-dt.c
> +++ b/arch/arm/mach-kirkwood/board-dt.c
> @@ -41,7 +41,6 @@ static void __init kirkwood_legacy_clk_init(void)
> struct device_node *np = of_find_compatible_node(
> NULL, NULL, "marvell,kirkwood-gating-clock");
> struct of_phandle_args clkspec;
> - struct clk *clk;
>
> clkspec.np = np;
> clkspec.args_count = 1;
> @@ -53,19 +52,6 @@ static void __init kirkwood_legacy_clk_init(void)
> clkspec.args[0] = CGC_BIT_PEX1;
> orion_clkdev_add("1", "pcie",
> of_clk_get_from_provider(&clkspec));
> -
> - /*
> - * The ethernet interfaces forget the MAC address assigned by
> - * u-boot if the clocks are turned off. Until proper DT support
> - * is available we always enable them for now.
> - */
> - clkspec.args[0] = CGC_BIT_GE0;
> - clk = of_clk_get_from_provider(&clkspec);
> - clk_prepare_enable(clk);
> -
> - clkspec.args[0] = CGC_BIT_GE1;
> - clk = of_clk_get_from_provider(&clkspec);
> - clk_prepare_enable(clk);
> }
>
> #define MV643XX_ETH_MAC_ADDR_LOW 0x0414
>
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH RESEND v3] ARM: kirkwood: retain MAC address for DT ethernet
2013-10-03 18:56 ` [PATCH v2 " Sebastian Hesselbarth
2013-10-03 19:02 ` Ezequiel Garcia
2013-10-04 10:13 ` [PATCH v3] ARM: kirkwood: remove ethernet clock gate workaround Sebastian Hesselbarth
@ 2013-10-04 10:17 ` Sebastian Hesselbarth
2013-10-04 13:28 ` Andrew Lunn
2013-10-07 20:25 ` [PATCH v4] " Sebastian Hesselbarth
2 siblings, 2 replies; 18+ messages in thread
From: Sebastian Hesselbarth @ 2013-10-04 10:17 UTC (permalink / raw)
To: linux-arm-kernel
Ethernet IP on Kirkwood SoCs loose their MAC address register content
if clock gated. To allow modular ethernet driver setups and gated clocks
also on non-DT capable bootloaders, we fixup port device nodes with no
valid MAC address property. This patch copies MAC address register
contents set up by bootloaders early, notably before ethernet clocks
are gated. While at it, also reorder call sequence in _dt_init.
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
---
Changelog:
v2->v3:
- make use of new public clk_is_enabled (adds dependency [1])
- add warning about gated clock && missing MAC property
(Suggested by Jason Gunthorpe)
v1->v2:
- check for gated clock before accessing eth registers
(Suggested by Andrew Lunn)
[1] http://www.spinics.net/lists/arm-kernel/msg277392.html
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Grant Likely <grant.likely@linaro.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
Cc: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Cc: Mike Turquette <mturquette@linaro.org>
Cc: linux-arm-kernel at lists.infradead.org
Cc: linux-kernel at vger.kernel.org
---
arch/arm/mach-kirkwood/board-dt.c | 85 +++++++++++++++++++++++++++++++++++--
1 file changed, 82 insertions(+), 3 deletions(-)
diff --git a/arch/arm/mach-kirkwood/board-dt.c b/arch/arm/mach-kirkwood/board-dt.c
index 82d3ad8..28e952b 100644
--- a/arch/arm/mach-kirkwood/board-dt.c
+++ b/arch/arm/mach-kirkwood/board-dt.c
@@ -13,6 +13,8 @@
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/of.h>
+#include <linux/of_address.h>
+#include <linux/of_net.h>
#include <linux/of_platform.h>
#include <linux/clk-provider.h>
#include <linux/clocksource.h>
@@ -66,6 +68,84 @@ static void __init kirkwood_legacy_clk_init(void)
clk_prepare_enable(clk);
}
+#define MV643XX_ETH_MAC_ADDR_LOW 0x0414
+#define MV643XX_ETH_MAC_ADDR_HIGH 0x0418
+
+static void __init kirkwood_dt_eth_fixup(void)
+{
+ struct device_node *np;
+
+ /*
+ * The ethernet interfaces forget the MAC address assigned by u-boot
+ * if the clocks are turned off. Usually, u-boot on kirkwood boards
+ * has no DT support to properly set local-mac-address property.
+ * As a workaround, we get the MAC address from mv643xx_eth registers
+ * and update the port device node if no valid MAC address is set.
+ */
+ for_each_compatible_node(np, NULL, "marvell,kirkwood-eth-port") {
+ struct device_node *pnp = of_get_parent(np);
+ struct clk *clk;
+ struct property *pmac;
+ void __iomem *io;
+ u8 *macaddr;
+ u32 reg;
+
+ if (!pnp)
+ continue;
+
+ /* skip disabled nodes or nodes with valid MAC address*/
+ if (!of_device_is_available(pnp) || of_get_mac_address(np))
+ continue;
+
+ /* skip already gated ports, spill warning about missing MAC */
+ clk = of_clk_get(pnp, 0);
+ if (!clk_is_enabled(clk)) {
+ pr_err(FW_BUG "%s: gated port has no local-mac-address set\n",
+ np->full_name);
+ clk_put(clk);
+ continue;
+ }
+ clk_put(clk);
+
+ /* store MAC address register contents in local-mac-address */
+ pr_err(FW_BUG "%s: local-mac-address is not set\n",
+ np->full_name);
+
+ io = of_iomap(pnp, 0);
+ if (!io)
+ continue;
+
+ pmac = kzalloc(sizeof(*pmac) + 6, GFP_KERNEL);
+ if (!pmac) {
+ iounmap(io);
+ continue;
+ }
+
+ pmac->value = pmac + 1;
+ pmac->length = 6;
+ pmac->name = kstrdup("local-mac-address", GFP_KERNEL);
+ if (!pmac->name) {
+ kfree(pmac);
+ iounmap(io);
+ continue;
+ }
+
+ macaddr = pmac->value;
+ reg = readl(io + MV643XX_ETH_MAC_ADDR_HIGH);
+ macaddr[0] = (reg >> 24) & 0xff;
+ macaddr[1] = (reg >> 16) & 0xff;
+ macaddr[2] = (reg >> 8) & 0xff;
+ macaddr[3] = reg & 0xff;
+
+ reg = readl(io + MV643XX_ETH_MAC_ADDR_LOW);
+ macaddr[4] = (reg >> 8) & 0xff;
+ macaddr[5] = reg & 0xff;
+
+ of_update_property(np, pmac);
+ iounmap(io);
+ }
+}
+
static void __init kirkwood_dt_time_init(void)
{
of_clk_init(NULL);
@@ -97,11 +177,10 @@ static void __init kirkwood_dt_init(void)
kirkwood_l2_init();
kirkwood_cpufreq_init();
-
+ kirkwood_cpuidle_init();
/* Setup clocks for legacy devices */
kirkwood_legacy_clk_init();
-
- kirkwood_cpuidle_init();
+ kirkwood_dt_eth_fixup();
#ifdef CONFIG_KEXEC
kexec_reinit = kirkwood_enable_pcie;
--
1.7.10.4
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH RESEND v3] ARM: kirkwood: retain MAC address for DT ethernet
2013-10-04 10:17 ` [PATCH RESEND v3] ARM: kirkwood: retain MAC address for DT ethernet Sebastian Hesselbarth
@ 2013-10-04 13:28 ` Andrew Lunn
2013-10-07 20:25 ` [PATCH v4] " Sebastian Hesselbarth
1 sibling, 0 replies; 18+ messages in thread
From: Andrew Lunn @ 2013-10-04 13:28 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Oct 04, 2013 at 12:17:22PM +0200, Sebastian Hesselbarth wrote:
> Ethernet IP on Kirkwood SoCs loose their MAC address register content
> if clock gated. To allow modular ethernet driver setups and gated clocks
> also on non-DT capable bootloaders, we fixup port device nodes with no
> valid MAC address property. This patch copies MAC address register
> contents set up by bootloaders early, notably before ethernet clocks
> are gated. While at it, also reorder call sequence in _dt_init.
>
> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
> ---
> Changelog:
> v2->v3:
> - make use of new public clk_is_enabled (adds dependency [1])
> - add warning about gated clock && missing MAC property
> (Suggested by Jason Gunthorpe)
> v1->v2:
> - check for gated clock before accessing eth registers
> (Suggested by Andrew Lunn)
>
> [1] http://www.spinics.net/lists/arm-kernel/msg277392.html
>
> Cc: Jason Cooper <jason@lakedaemon.net>
> Cc: Andrew Lunn <andrew@lunn.ch>
> Cc: Russell King <linux@arm.linux.org.uk>
> Cc: Grant Likely <grant.likely@linaro.org>
> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
> Cc: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
> Cc: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
> Cc: Mike Turquette <mturquette@linaro.org>
> Cc: linux-arm-kernel at lists.infradead.org
> Cc: linux-kernel at vger.kernel.org
> ---
> arch/arm/mach-kirkwood/board-dt.c | 85 +++++++++++++++++++++++++++++++++++--
> 1 file changed, 82 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm/mach-kirkwood/board-dt.c b/arch/arm/mach-kirkwood/board-dt.c
> index 82d3ad8..28e952b 100644
> --- a/arch/arm/mach-kirkwood/board-dt.c
> +++ b/arch/arm/mach-kirkwood/board-dt.c
> @@ -13,6 +13,8 @@
> #include <linux/kernel.h>
> #include <linux/init.h>
> #include <linux/of.h>
> +#include <linux/of_address.h>
> +#include <linux/of_net.h>
> #include <linux/of_platform.h>
> #include <linux/clk-provider.h>
> #include <linux/clocksource.h>
> @@ -66,6 +68,84 @@ static void __init kirkwood_legacy_clk_init(void)
> clk_prepare_enable(clk);
> }
>
> +#define MV643XX_ETH_MAC_ADDR_LOW 0x0414
> +#define MV643XX_ETH_MAC_ADDR_HIGH 0x0418
> +
> +static void __init kirkwood_dt_eth_fixup(void)
> +{
> + struct device_node *np;
> +
> + /*
> + * The ethernet interfaces forget the MAC address assigned by u-boot
> + * if the clocks are turned off. Usually, u-boot on kirkwood boards
> + * has no DT support to properly set local-mac-address property.
> + * As a workaround, we get the MAC address from mv643xx_eth registers
> + * and update the port device node if no valid MAC address is set.
> + */
> + for_each_compatible_node(np, NULL, "marvell,kirkwood-eth-port") {
> + struct device_node *pnp = of_get_parent(np);
> + struct clk *clk;
> + struct property *pmac;
> + void __iomem *io;
> + u8 *macaddr;
> + u32 reg;
> +
> + if (!pnp)
> + continue;
> +
> + /* skip disabled nodes or nodes with valid MAC address*/
> + if (!of_device_is_available(pnp) || of_get_mac_address(np))
> + continue;
> +
> + /* skip already gated ports, spill warning about missing MAC */
> + clk = of_clk_get(pnp, 0);
> + if (!clk_is_enabled(clk)) {
> + pr_err(FW_BUG "%s: gated port has no local-mac-address set\n",
> + np->full_name);
> + clk_put(clk);
> + continue;
> + }
> + clk_put(clk);
> +
> + /* store MAC address register contents in local-mac-address */
> + pr_err(FW_BUG "%s: local-mac-address is not set\n",
> + np->full_name);
Hi Sebastian
I've tested on Kirkwood with a modular build. Works as expected.
My only question is the pr_err(FW_BUF above. My guess is, 99% of
orion5x, kirkwood, and Dove systems will never get a U-boot with DT
support, which sets the local-mac-address property. I would drop it
down to FW_INFO, or drop the message altogether.
Otherwise,
Tested-by: Andrew Lunn <andrew@lunn.ch>
Andrew
> +
> + io = of_iomap(pnp, 0);
> + if (!io)
> + continue;
> +
> + pmac = kzalloc(sizeof(*pmac) + 6, GFP_KERNEL);
> + if (!pmac) {
> + iounmap(io);
> + continue;
> + }
> +
> + pmac->value = pmac + 1;
> + pmac->length = 6;
> + pmac->name = kstrdup("local-mac-address", GFP_KERNEL);
> + if (!pmac->name) {
> + kfree(pmac);
> + iounmap(io);
> + continue;
> + }
> +
> + macaddr = pmac->value;
> + reg = readl(io + MV643XX_ETH_MAC_ADDR_HIGH);
> + macaddr[0] = (reg >> 24) & 0xff;
> + macaddr[1] = (reg >> 16) & 0xff;
> + macaddr[2] = (reg >> 8) & 0xff;
> + macaddr[3] = reg & 0xff;
> +
> + reg = readl(io + MV643XX_ETH_MAC_ADDR_LOW);
> + macaddr[4] = (reg >> 8) & 0xff;
> + macaddr[5] = reg & 0xff;
> +
> + of_update_property(np, pmac);
> + iounmap(io);
> + }
> +}
> +
> static void __init kirkwood_dt_time_init(void)
> {
> of_clk_init(NULL);
> @@ -97,11 +177,10 @@ static void __init kirkwood_dt_init(void)
> kirkwood_l2_init();
>
> kirkwood_cpufreq_init();
> -
> + kirkwood_cpuidle_init();
> /* Setup clocks for legacy devices */
> kirkwood_legacy_clk_init();
> -
> - kirkwood_cpuidle_init();
> + kirkwood_dt_eth_fixup();
>
> #ifdef CONFIG_KEXEC
> kexec_reinit = kirkwood_enable_pcie;
> --
> 1.7.10.4
>
^ permalink raw reply [flat|nested] 18+ messages in thread* [PATCH v4] ARM: kirkwood: retain MAC address for DT ethernet
2013-10-04 10:17 ` [PATCH RESEND v3] ARM: kirkwood: retain MAC address for DT ethernet Sebastian Hesselbarth
2013-10-04 13:28 ` Andrew Lunn
@ 2013-10-07 20:25 ` Sebastian Hesselbarth
2013-10-07 23:30 ` Mike Turquette
2013-10-08 17:03 ` Jason Cooper
1 sibling, 2 replies; 18+ messages in thread
From: Sebastian Hesselbarth @ 2013-10-07 20:25 UTC (permalink / raw)
To: linux-arm-kernel
Ethernet IP on Kirkwood SoCs loose their MAC address register content
if clock gated. To allow modular ethernet driver setups and gated clocks
also on non-DT capable bootloaders, we fixup port device nodes with no
valid MAC address property. This patch copies MAC address register
contents set up by bootloaders early, notably before ethernet clocks
are gated. While at it, also reorder call sequence in _dt_init.
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Reviewed-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
Reviewed-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Tested-by: Andrew Lunn <andrew@lunn.ch>
---
Just to make sure they don't get lost this time:
Added Jason's and Ezequiel's Reviewed-by to honor their constant reviews,
and Andrew's last Tested-by because I know he will be testing again.
Changelog:
v3->v4:
- drop clk_is_enabled (and dependency) due to possible abuse of the
new function; enable/disable clk instead, remove gated clock warning
(Suggested by Andrew Lunn, Uwe Kleine-Koenig, Mike Turquette)
- reduce FW_BUG to FW_INFO (Suggested by Andrew Lunn)
- proper cleanup of iomap, clk, nodes
v2->v3:
- make use of new public clk_is_enabled (adds dependency)
- add warning about gated clock && missing MAC property
(Suggested by Jason Gunthorpe)
v1->v2:
- check for gated clock before accessing eth registers
(Suggested by Andrew Lunn)
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Grant Likely <grant.likely@linaro.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
Cc: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Cc: Mike Turquette <mturquette@linaro.org>
Cc: linux-arm-kernel at lists.infradead.org
Cc: linux-kernel at vger.kernel.org
---
arch/arm/mach-kirkwood/board-dt.c | 86 +++++++++++++++++++++++++++++++++++--
1 file changed, 83 insertions(+), 3 deletions(-)
diff --git a/arch/arm/mach-kirkwood/board-dt.c b/arch/arm/mach-kirkwood/board-dt.c
index 82d3ad8..3ddd194 100644
--- a/arch/arm/mach-kirkwood/board-dt.c
+++ b/arch/arm/mach-kirkwood/board-dt.c
@@ -13,6 +13,8 @@
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/of.h>
+#include <linux/of_address.h>
+#include <linux/of_net.h>
#include <linux/of_platform.h>
#include <linux/clk-provider.h>
#include <linux/clocksource.h>
@@ -66,6 +68,85 @@ static void __init kirkwood_legacy_clk_init(void)
clk_prepare_enable(clk);
}
+#define MV643XX_ETH_MAC_ADDR_LOW 0x0414
+#define MV643XX_ETH_MAC_ADDR_HIGH 0x0418
+
+static void __init kirkwood_dt_eth_fixup(void)
+{
+ struct device_node *np;
+
+ /*
+ * The ethernet interfaces forget the MAC address assigned by u-boot
+ * if the clocks are turned off. Usually, u-boot on kirkwood boards
+ * has no DT support to properly set local-mac-address property.
+ * As a workaround, we get the MAC address from mv643xx_eth registers
+ * and update the port device node if no valid MAC address is set.
+ */
+ for_each_compatible_node(np, NULL, "marvell,kirkwood-eth-port") {
+ struct device_node *pnp = of_get_parent(np);
+ struct clk *clk;
+ struct property *pmac;
+ void __iomem *io;
+ u8 *macaddr;
+ u32 reg;
+
+ if (!pnp)
+ continue;
+
+ /* skip disabled nodes or nodes with valid MAC address*/
+ if (!of_device_is_available(pnp) || of_get_mac_address(np))
+ goto eth_fixup_skip;
+
+ clk = of_clk_get(pnp, 0);
+ if (IS_ERR(clk))
+ goto eth_fixup_skip;
+
+ io = of_iomap(pnp, 0);
+ if (!io)
+ goto eth_fixup_no_map;
+
+ /* ensure port clock is not gated to not hang CPU */
+ clk_prepare_enable(clk);
+
+ /* store MAC address register contents in local-mac-address */
+ pr_err(FW_INFO "%s: local-mac-address is not set\n",
+ np->full_name);
+
+ pmac = kzalloc(sizeof(*pmac) + 6, GFP_KERNEL);
+ if (!pmac)
+ goto eth_fixup_no_mem;
+
+ pmac->value = pmac + 1;
+ pmac->length = 6;
+ pmac->name = kstrdup("local-mac-address", GFP_KERNEL);
+ if (!pmac->name) {
+ kfree(pmac);
+ goto eth_fixup_no_mem;
+ }
+
+ macaddr = pmac->value;
+ reg = readl(io + MV643XX_ETH_MAC_ADDR_HIGH);
+ macaddr[0] = (reg >> 24) & 0xff;
+ macaddr[1] = (reg >> 16) & 0xff;
+ macaddr[2] = (reg >> 8) & 0xff;
+ macaddr[3] = reg & 0xff;
+
+ reg = readl(io + MV643XX_ETH_MAC_ADDR_LOW);
+ macaddr[4] = (reg >> 8) & 0xff;
+ macaddr[5] = reg & 0xff;
+
+ of_update_property(np, pmac);
+
+eth_fixup_no_mem:
+ iounmap(io);
+ clk_disable_unprepare(clk);
+eth_fixup_no_map:
+ clk_put(clk);
+eth_fixup_skip:
+ of_node_put(pnp);
+ }
+}
+
static void __init kirkwood_dt_time_init(void)
{
of_clk_init(NULL);
@@ -97,11 +178,10 @@ static void __init kirkwood_dt_init(void)
kirkwood_l2_init();
kirkwood_cpufreq_init();
-
+ kirkwood_cpuidle_init();
/* Setup clocks for legacy devices */
kirkwood_legacy_clk_init();
-
- kirkwood_cpuidle_init();
+ kirkwood_dt_eth_fixup();
#ifdef CONFIG_KEXEC
kexec_reinit = kirkwood_enable_pcie;
--
1.7.10.4
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH v4] ARM: kirkwood: retain MAC address for DT ethernet
2013-10-07 20:25 ` [PATCH v4] " Sebastian Hesselbarth
@ 2013-10-07 23:30 ` Mike Turquette
2013-10-08 17:03 ` Jason Cooper
1 sibling, 0 replies; 18+ messages in thread
From: Mike Turquette @ 2013-10-07 23:30 UTC (permalink / raw)
To: linux-arm-kernel
Quoting Sebastian Hesselbarth (2013-10-07 13:25:11)
> Ethernet IP on Kirkwood SoCs loose their MAC address register content
> if clock gated. To allow modular ethernet driver setups and gated clocks
> also on non-DT capable bootloaders, we fixup port device nodes with no
> valid MAC address property. This patch copies MAC address register
> contents set up by bootloaders early, notably before ethernet clocks
> are gated. While at it, also reorder call sequence in _dt_init.
>
> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
> Reviewed-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
> Reviewed-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
> Tested-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Mike Turquette <mturquette@linaro.org>
Regards,
Mike
> ---
> Just to make sure they don't get lost this time:
> Added Jason's and Ezequiel's Reviewed-by to honor their constant reviews,
> and Andrew's last Tested-by because I know he will be testing again.
>
> Changelog:
> v3->v4:
> - drop clk_is_enabled (and dependency) due to possible abuse of the
> new function; enable/disable clk instead, remove gated clock warning
> (Suggested by Andrew Lunn, Uwe Kleine-Koenig, Mike Turquette)
> - reduce FW_BUG to FW_INFO (Suggested by Andrew Lunn)
> - proper cleanup of iomap, clk, nodes
> v2->v3:
> - make use of new public clk_is_enabled (adds dependency)
> - add warning about gated clock && missing MAC property
> (Suggested by Jason Gunthorpe)
> v1->v2:
> - check for gated clock before accessing eth registers
> (Suggested by Andrew Lunn)
>
> Cc: Jason Cooper <jason@lakedaemon.net>
> Cc: Andrew Lunn <andrew@lunn.ch>
> Cc: Russell King <linux@arm.linux.org.uk>
> Cc: Grant Likely <grant.likely@linaro.org>
> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
> Cc: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
> Cc: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
> Cc: Mike Turquette <mturquette@linaro.org>
> Cc: linux-arm-kernel at lists.infradead.org
> Cc: linux-kernel at vger.kernel.org
> ---
> arch/arm/mach-kirkwood/board-dt.c | 86 +++++++++++++++++++++++++++++++++++--
> 1 file changed, 83 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm/mach-kirkwood/board-dt.c b/arch/arm/mach-kirkwood/board-dt.c
> index 82d3ad8..3ddd194 100644
> --- a/arch/arm/mach-kirkwood/board-dt.c
> +++ b/arch/arm/mach-kirkwood/board-dt.c
> @@ -13,6 +13,8 @@
> #include <linux/kernel.h>
> #include <linux/init.h>
> #include <linux/of.h>
> +#include <linux/of_address.h>
> +#include <linux/of_net.h>
> #include <linux/of_platform.h>
> #include <linux/clk-provider.h>
> #include <linux/clocksource.h>
> @@ -66,6 +68,85 @@ static void __init kirkwood_legacy_clk_init(void)
> clk_prepare_enable(clk);
> }
>
> +#define MV643XX_ETH_MAC_ADDR_LOW 0x0414
> +#define MV643XX_ETH_MAC_ADDR_HIGH 0x0418
> +
> +static void __init kirkwood_dt_eth_fixup(void)
> +{
> + struct device_node *np;
> +
> + /*
> + * The ethernet interfaces forget the MAC address assigned by u-boot
> + * if the clocks are turned off. Usually, u-boot on kirkwood boards
> + * has no DT support to properly set local-mac-address property.
> + * As a workaround, we get the MAC address from mv643xx_eth registers
> + * and update the port device node if no valid MAC address is set.
> + */
> + for_each_compatible_node(np, NULL, "marvell,kirkwood-eth-port") {
> + struct device_node *pnp = of_get_parent(np);
> + struct clk *clk;
> + struct property *pmac;
> + void __iomem *io;
> + u8 *macaddr;
> + u32 reg;
> +
> + if (!pnp)
> + continue;
> +
> + /* skip disabled nodes or nodes with valid MAC address*/
> + if (!of_device_is_available(pnp) || of_get_mac_address(np))
> + goto eth_fixup_skip;
> +
> + clk = of_clk_get(pnp, 0);
> + if (IS_ERR(clk))
> + goto eth_fixup_skip;
> +
> + io = of_iomap(pnp, 0);
> + if (!io)
> + goto eth_fixup_no_map;
> +
> + /* ensure port clock is not gated to not hang CPU */
> + clk_prepare_enable(clk);
> +
> + /* store MAC address register contents in local-mac-address */
> + pr_err(FW_INFO "%s: local-mac-address is not set\n",
> + np->full_name);
> +
> + pmac = kzalloc(sizeof(*pmac) + 6, GFP_KERNEL);
> + if (!pmac)
> + goto eth_fixup_no_mem;
> +
> + pmac->value = pmac + 1;
> + pmac->length = 6;
> + pmac->name = kstrdup("local-mac-address", GFP_KERNEL);
> + if (!pmac->name) {
> + kfree(pmac);
> + goto eth_fixup_no_mem;
> + }
> +
> + macaddr = pmac->value;
> + reg = readl(io + MV643XX_ETH_MAC_ADDR_HIGH);
> + macaddr[0] = (reg >> 24) & 0xff;
> + macaddr[1] = (reg >> 16) & 0xff;
> + macaddr[2] = (reg >> 8) & 0xff;
> + macaddr[3] = reg & 0xff;
> +
> + reg = readl(io + MV643XX_ETH_MAC_ADDR_LOW);
> + macaddr[4] = (reg >> 8) & 0xff;
> + macaddr[5] = reg & 0xff;
> +
> + of_update_property(np, pmac);
> +
> +eth_fixup_no_mem:
> + iounmap(io);
> + clk_disable_unprepare(clk);
> +eth_fixup_no_map:
> + clk_put(clk);
> +eth_fixup_skip:
> + of_node_put(pnp);
> + }
> +}
> +
> static void __init kirkwood_dt_time_init(void)
> {
> of_clk_init(NULL);
> @@ -97,11 +178,10 @@ static void __init kirkwood_dt_init(void)
> kirkwood_l2_init();
>
> kirkwood_cpufreq_init();
> -
> + kirkwood_cpuidle_init();
> /* Setup clocks for legacy devices */
> kirkwood_legacy_clk_init();
> -
> - kirkwood_cpuidle_init();
> + kirkwood_dt_eth_fixup();
>
> #ifdef CONFIG_KEXEC
> kexec_reinit = kirkwood_enable_pcie;
> --
> 1.7.10.4
^ permalink raw reply [flat|nested] 18+ messages in thread* [PATCH v4] ARM: kirkwood: retain MAC address for DT ethernet
2013-10-07 20:25 ` [PATCH v4] " Sebastian Hesselbarth
2013-10-07 23:30 ` Mike Turquette
@ 2013-10-08 17:03 ` Jason Cooper
1 sibling, 0 replies; 18+ messages in thread
From: Jason Cooper @ 2013-10-08 17:03 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Oct 07, 2013 at 10:25:11PM +0200, Sebastian Hesselbarth wrote:
> Ethernet IP on Kirkwood SoCs loose their MAC address register content
> if clock gated. To allow modular ethernet driver setups and gated clocks
> also on non-DT capable bootloaders, we fixup port device nodes with no
> valid MAC address property. This patch copies MAC address register
> contents set up by bootloaders early, notably before ethernet clocks
> are gated. While at it, also reorder call sequence in _dt_init.
>
> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
> Reviewed-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
> Reviewed-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
> Tested-by: Andrew Lunn <andrew@lunn.ch>
> ---
> Just to make sure they don't get lost this time:
> Added Jason's and Ezequiel's Reviewed-by to honor their constant reviews,
> and Andrew's last Tested-by because I know he will be testing again.
>
> Changelog:
> v3->v4:
> - drop clk_is_enabled (and dependency) due to possible abuse of the
> new function; enable/disable clk instead, remove gated clock warning
> (Suggested by Andrew Lunn, Uwe Kleine-Koenig, Mike Turquette)
> - reduce FW_BUG to FW_INFO (Suggested by Andrew Lunn)
> - proper cleanup of iomap, clk, nodes
> v2->v3:
> - make use of new public clk_is_enabled (adds dependency)
> - add warning about gated clock && missing MAC property
> (Suggested by Jason Gunthorpe)
> v1->v2:
> - check for gated clock before accessing eth registers
> (Suggested by Andrew Lunn)
>
> Cc: Jason Cooper <jason@lakedaemon.net>
> Cc: Andrew Lunn <andrew@lunn.ch>
> Cc: Russell King <linux@arm.linux.org.uk>
> Cc: Grant Likely <grant.likely@linaro.org>
> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
> Cc: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
> Cc: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
> Cc: Mike Turquette <mturquette@linaro.org>
> Cc: linux-arm-kernel at lists.infradead.org
> Cc: linux-kernel at vger.kernel.org
> ---
> arch/arm/mach-kirkwood/board-dt.c | 86 +++++++++++++++++++++++++++++++++++--
> 1 file changed, 83 insertions(+), 3 deletions(-)
Applied to mvebu/soc with Mike's Reviewed-by:
thx,
Jason.
^ permalink raw reply [flat|nested] 18+ messages in thread