From patchwork Mon Sep 30 21:59:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 13817140 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 162E1CEB2C9 for ; Mon, 30 Sep 2024 22:01:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=H8lj0dfqyPPvWHebEmTfcImeYIRwlGH+HAdhUNWftjs=; b=BjIQTbNbV+SE5N+m7dlSaMddcy GjrMvrlQPutrDStpC7Noteeov7eiOeBBQH2anh1ZO7qmuXjUWY1mdtgbaDzPgCxT/2wsogNxqkCtR J+Y1ANMXlCNVkA3gfSUBsxvzjxJs4DCnZ8ZsCcE9tgS7jdhN2e7Rsj45siOG3JRp9+TcnK9KNrynP 5T4Fo+qE1IYbu3/0xqLTxr/XTY9ZtqZykO0b3RE1rADSMYCiyz4Cwr6kZ6liKFzgE14TAVbsvFq9s TNUubIcaAwX5XQO7kWy8fTXJqpBX++2D771YlxPeZzUIXXt2Ir356v80Y4/6ec4RQg24eK1tyGoY2 MD1T4ECg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1svORq-00000000yfX-0S50; Mon, 30 Sep 2024 22:00:54 +0000 Received: from mail-pf1-x42a.google.com ([2607:f8b0:4864:20::42a]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1svOQc-00000000yTG-1xS1 for linux-arm-kernel@lists.infradead.org; Mon, 30 Sep 2024 21:59:39 +0000 Received: by mail-pf1-x42a.google.com with SMTP id d2e1a72fcca58-71b070ff24dso4309297b3a.2 for ; Mon, 30 Sep 2024 14:59:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1727733577; x=1728338377; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=H8lj0dfqyPPvWHebEmTfcImeYIRwlGH+HAdhUNWftjs=; b=GFEooKTc/Pi78ATXdtiR32d8k0f0YIsuJM0PTX061AU7ivni7PVECQKYDKdyp1dupE ze540bVQQl/LBgMpbdKUuqCR6Ka9azxjLwBoDqfYGaYt1i5JT8n5lBN1zSxEOgazZejE +JvOetlPLGijfoN8ierhxyPFwk5sfNAGBn1RteYPR+Qbb+PcsUbimsG5/LhTWk1Owdox qkm4vo4ZKyudjpWxuecUMkUtG+05i4HX4y+woLPD9Q0dk5SzLQAYMtbliQwVs3gtzCEW Re8gbiWi2IqcS29YN+5cJ4uvXkJh5bKcvRURk9c1OU0LZzGS8JsEFX2vBlAIrz6oqd0E xKaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727733577; x=1728338377; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=H8lj0dfqyPPvWHebEmTfcImeYIRwlGH+HAdhUNWftjs=; b=brSBc8EMB+4of3bFNLEBPBVsqG/ByiTRTn5/V6lEvYYdk95ehLmG6an6DZqd7wG+z7 FRRRgimXp1b2aPR1FYuf5rG2Zs/PoOw/OFCwv5bsVllK0rQviIda/7rCgya8eS4VZc0o 38M3XTvFUx5Z8Oci2kRz14Idjz/inVMp8zs4ajcAyingFpXL940BoWK9S99rg80MmGFS AxDJ4BmUGbntj3s7aQPSpwD9nutDv6ukeDvgSXxsT4O6MMMQ8HE7YNSU/3SLFCqik37m XKEqDGwKRMyKRHojnOBUnbzITjc8HArE9FIgoNkTNp5SmaD/zwrokywFwIdIW5lxg8lJ Jq3w== X-Gm-Message-State: AOJu0Yx3wVhGaU9YQKswyxQI66x5MQr3NG1NtPMCpJyAQpZ17TUXx/D9 fyaVARqqrhi1yrm/zXIJZE4YNJyOVq49xxyu8vETd4E1Z/m3c/Zw7wli3qQS X-Google-Smtp-Source: AGHT+IGKsg4OsP+n4AvNB7ctmpO6LHFL2OlNBf/sZi+dH08XeZM9kPUPnH7R/0ZbqDt13tYgfRQ9Dg== X-Received: by 2002:a05:6a00:3cce:b0:714:2533:1b82 with SMTP id d2e1a72fcca58-71b260776d3mr23076022b3a.23.1727733576696; Mon, 30 Sep 2024 14:59:36 -0700 (PDT) Received: from ryzen.lan ([2601:644:8200:dab8::a86]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71b26529d61sm6961024b3a.171.2024.09.30.14.59.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Sep 2024 14:59:36 -0700 (PDT) From: Rosen Penev To: linux-arm-kernel@lists.infradead.org Cc: andrew@lunn.ch, gregory.clement@bootlin.com, sebastian.hesselbarth@gmail.com, linux@armlinux.org.uk, linux-kernel@vger.kernel.org Subject: [PATCH] arch: arm: kirkwood: support nvmem mac address Date: Mon, 30 Sep 2024 14:59:34 -0700 Message-ID: <20240930215934.349238-1-rosenp@gmail.com> X-Mailer: git-send-email 2.46.2 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240930_145938_526264_A1B1CA92 X-CRM114-Status: GOOD ( 12.45 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org of_get_ethdev_address gets called too early for nvmem. If EPROBE_DEFER gets called, skip so that the ethernet driver can adjust the MAC address through nvmem. Signed-off-by: Rosen Penev --- arch/arm/mach-mvebu/kirkwood.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-mvebu/kirkwood.c b/arch/arm/mach-mvebu/kirkwood.c index 73b2a86d6489..da347f66900b 100644 --- a/arch/arm/mach-mvebu/kirkwood.c +++ b/arch/arm/mach-mvebu/kirkwood.c @@ -86,13 +86,18 @@ static void __init kirkwood_dt_eth_fixup(void) void __iomem *io; u8 *macaddr; u32 reg; + int err; if (!pnp) continue; - /* skip disabled nodes or nodes with valid MAC address*/ - if (!of_device_is_available(pnp) || - !of_get_mac_address(np, tmpmac)) + /* skip disabled nodes */ + if (!of_device_is_available(pnp)) + goto eth_fixup_skip; + + /* skip nodes with valid MAC address*/ + err = of_get_mac_address(np, tmpmac); + if (err == -EPROBE_DEFER || !err) goto eth_fixup_skip; clk = of_clk_get(pnp, 0);