From patchwork Thu Oct 3 12:44:53 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Hesselbarth X-Patchwork-Id: 2982671 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 4B95C9F245 for ; Thu, 3 Oct 2013 12:46:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 90794201EF for ; Thu, 3 Oct 2013 12:46:41 +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 A03EC2018A for ; Thu, 3 Oct 2013 12:46:36 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VRiI8-0003RI-6Q; Thu, 03 Oct 2013 12:46:04 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VRiI2-0001Zr-Vj; Thu, 03 Oct 2013 12:45:59 +0000 Received: from mail-bk0-x236.google.com ([2a00:1450:4008:c01::236]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VRiHt-0001Y0-4r for linux-arm-kernel@lists.infradead.org; Thu, 03 Oct 2013 12:45:50 +0000 Received: by mail-bk0-f54.google.com with SMTP id mz12so916043bkb.13 for ; Thu, 03 Oct 2013 05:45:26 -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; bh=DDB1FRz+aKF40tn6zdUPtK4IDmlVflcJvp3AWuoJz58=; b=HKN5+iKakgQ1YmSoUpA8k8Jx/u5wI7xvhiJKVzatSfxAqDC0nZMrhSC351mJ+2KPmn XNmOvxaUue3Fhp6/+UjFifK7VhRMGVfLQn+8eJa9hTPnMlOJ2T/gENcqwFQhemL+NK2a SPnmNL8BHamywFikJMAJLDYLpkUaGQZi9Gy/+j08UCEZtoT15gBHVXgsZP34zLFGEt3j VHX0KcdNROsLiKhE5G2/o3YxMsNwhZErXewLLs1TUlOqy9B2+JIiizbGt2C5yQxagUkW NwflJJT6KrZ/JA05wHQi97SZd7xy73jIsVJLnAEXFQMrGgXLm2YCdtipVNsetTLWiSth wg0w== X-Received: by 10.205.22.71 with SMTP id qv7mr7459477bkb.20.1380804326201; Thu, 03 Oct 2013 05:45:26 -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 kk2sm4623024bkb.10.1969.12.31.16.00.00 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 03 Oct 2013 05:45:25 -0700 (PDT) From: Sebastian Hesselbarth To: Sebastian Hesselbarth Subject: [PATCH 1/2] ARM: kirkwood: retain MAC address for DT ethernet Date: Thu, 3 Oct 2013 14:44:53 +0200 Message-Id: <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_084549_373019_2E760A26 X-CRM114-Status: GOOD ( 16.08 ) X-Spam-Score: -2.0 (--) Cc: Andrew Lunn , Russell King , Jason Cooper , Benjamin Herrenschmidt , linux-kernel@vger.kernel.org, Jason Gunthorpe , Ezequiel Garcia , Grant Likely , 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=-4.7 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable 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 --- - 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 Cc: Andrew Lunn Cc: Russell King Cc: Grant Likely Cc: Benjamin Herrenschmidt Cc: Jason Gunthorpe Cc: Ezequiel Garcia Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@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 #include #include +#include +#include #include #include #include @@ -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; + + 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 +164,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;