From patchwork Thu Oct 3 18:56:08 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Hesselbarth X-Patchwork-Id: 2985371 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 1D1A8BFF0B for ; Thu, 3 Oct 2013 19:02:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DD12420304 for ; Thu, 3 Oct 2013 19:02:19 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id F379620306 for ; Thu, 3 Oct 2013 19:02:14 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VRoA7-0005xe-5r; Thu, 03 Oct 2013 19:02:11 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VRo5B-0005LO-Mi; Thu, 03 Oct 2013 18:57:05 +0000 Received: from mail-bk0-x22b.google.com ([2a00:1450:4008:c01::22b]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VRo58-0005K3-R8 for linux-arm-kernel@lists.infradead.org; Thu, 03 Oct 2013 18:57:04 +0000 Received: by mail-bk0-f43.google.com with SMTP id mz13so1099268bkb.2 for ; Thu, 03 Oct 2013 11:56:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=EkZXgQb8KXZ1jT0f/dEy0cVT89XVc/q0WHRfteIDei4=; b=kO2pO7rLYB5SwlXqL9YGEVeQ6piQA59H8edouK8l2BO91Cj6xtRkhZkJl7NAOZXOsn PshnkoUB02ImLKGr0TeWEYApTtl6bYuVduZVJJL1E9U6S4qqyQlI3TomyPPU/uUyMPqa 26TPytz93ZzSFkdulYZqpFrv8kiFFVytwzse3lvujKo2at2KqRHyYA3IiZRQaVp9mnsN 7xzM8seb2zmtvTpr9DTrerDXuKyviHiFIT37ytJ48GQQi+BSehk9oJiJmQFS8nytTfxd 9vDFyneXR5DBh9m+XNUZjLZjc1kH6wffFrN704kh3HNzn/hAw/g3BHYOjanW8x3Rx97n JGjA== X-Received: by 10.204.121.201 with SMTP id i9mr9303878bkr.13.1380826597499; Thu, 03 Oct 2013 11:56:37 -0700 (PDT) Received: from topkick.lan (dslc-082-083-247-252.pools.arcor-ip.net. [82.83.247.252]) by mx.google.com with ESMTPSA id pn6sm5624017bkb.14.1969.12.31.16.00.00 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 03 Oct 2013 11:56:36 -0700 (PDT) From: Sebastian Hesselbarth To: Sebastian Hesselbarth Subject: [PATCH v2 1/2] ARM: kirkwood: retain MAC address for DT ethernet Date: Thu, 3 Oct 2013 20:56:08 +0200 Message-Id: <1380826568-18587-1-git-send-email-sebastian.hesselbarth@gmail.com> In-Reply-To: <1380804294-13726-1-git-send-email-sebastian.hesselbarth@gmail.com> References: <1380804294-13726-1-git-send-email-sebastian.hesselbarth@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131003_145703_042080_E8E75653 X-CRM114-Status: GOOD ( 17.88 ) X-Spam-Score: 1.4 (+) Cc: Andrew Lunn , Russell King , Jason Cooper , Benjamin Herrenschmidt , linux-kernel@vger.kernel.org, Jason Gunthorpe , Ezequiel Garcia , Grant Likely , Mike Turquette , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-1.3 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, KHOP_BIG_TO_CC, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=no version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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 Cc: Andrew Lunn Cc: Russell King Cc: Grant Likely Cc: Benjamin Herrenschmidt Cc: Jason Gunthorpe Cc: Ezequiel Garcia Cc: Mike Turquette Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@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 #include #include +#include +#include #include #include #include @@ -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;