From: andrew@lunn•ch (Andrew Lunn)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH RESEND v3] ARM: kirkwood: retain MAC address for DT ethernet
Date: Fri, 4 Oct 2013 15:28:47 +0200 [thread overview]
Message-ID: <20131004132847.GE23809@lunn.ch> (raw)
In-Reply-To: <1380881842-24605-1-git-send-email-sebastian.hesselbarth@gmail.com>
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
>
next prev parent reply other threads:[~2013-10-04 13:28 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
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:50 ` Ezequiel Garcia
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
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-03 19:44 ` Jason Gunthorpe
2013-10-03 20:14 ` Sebastian Hesselbarth
2013-10-03 20:24 ` Andrew Lunn
2013-10-04 10:13 ` [PATCH v3] ARM: kirkwood: remove ethernet clock gate workaround 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
2013-10-04 13:28 ` Andrew Lunn [this message]
2013-10-07 20:25 ` [PATCH v4] " Sebastian Hesselbarth
2013-10-07 23:30 ` Mike Turquette
2013-10-08 17:03 ` Jason Cooper
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20131004132847.GE23809@lunn.ch \
--to=andrew@lunn$(echo .)ch \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox