From mboxrd@z Thu Jan 1 00:00:00 1970 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0466AC433FE for ; Sat, 25 Sep 2021 11:38:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DDF7F6127C for ; Sat, 25 Sep 2021 11:38:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244595AbhIYLk3 (ORCPT ); Sat, 25 Sep 2021 07:40:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37070 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230046AbhIYLk2 (ORCPT ); Sat, 25 Sep 2021 07:40:28 -0400 Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 202C1C061570; Sat, 25 Sep 2021 04:38:54 -0700 (PDT) Received: by mail-wr1-x436.google.com with SMTP id i24so19496065wrc.9; Sat, 25 Sep 2021 04:38:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=kxpv1Vy6pYbyF1BOQEj3cs5wBqi8pHepFHdqGdQ/R9M=; b=DPrpEgC0X7aTJh/sIZdIt5MciRnryOGZs90IJdyIGD9COAPJ5XjGHe9Yf0nPXONpGH z9AahC6xjKwrllYvKDocn2ryrkmg8D0YoA3AQqWhoXhlNbEcTK7zfVZ1lDMchUiU40QI eSafJvX3tthIsSieEmno0w1BOplCIF2GrOr4FZzyaXIl1dVI2dttLhANLE3QK8nZX8m2 FEn26ERfAnvpS4OdNd82IGJYl+1OJvKq50s8EQbDsiNi/0dWlLU1JUsNp29xDeGgW/ng t/TVu4qurByoIWZjZ/6cb88uCLFTOEDUi5WXfBuQ88h4H1aYOlQFTXRFuN12d4vSK/82 hcdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=kxpv1Vy6pYbyF1BOQEj3cs5wBqi8pHepFHdqGdQ/R9M=; b=Ne6OTim7OacZyxe+Z6XaCb9HGcd0uQ9zi427UlcbV5FDVt8TLY6ZDPifZGDFuRoXPI m/1a9K/6KIOkq8LP+/ou4mDGVXPN7MvWkX0p6wfskJAu13WDdmSvQFgW4K2advHv1bCy JMrj0wJA4ROd7EsKL1E0Gz9LJS/PQCAnmiXyQ5dRqth4nb+k5sTUmzq5xJZbf6QY3isY FWMoi4bsQqZFdeXX4GQQ/ENaNIPIt1yVzoRiDyd9+w6FmJAUJ7ANKloRwDLiFcuCHcem v3IwiUEj0/cIpHKQ0R13woC/Yi/CCoMTSY/NRg6VUqDPCz6Ls3ziRQtBGtnxO/HhSm+C 0k5g== X-Gm-Message-State: AOAM532ysLtirinBgc9ZetA/IcHImRg3v51OaN20zSN+t8TNp8PfQOU+ pJHsAjNizLpMxbwBnEBYUnViWu3F/EW9cA== X-Google-Smtp-Source: ABdhPJx5jxuJqVl7h+NXrefCqjyk/PMZB73LL/GOidROgSIeMPukjqukX7oDQO/z+a3T9T97hl1oxA== X-Received: by 2002:a5d:5903:: with SMTP id v3mr16644354wrd.232.1632569932758; Sat, 25 Sep 2021 04:38:52 -0700 (PDT) Received: from oci-gb-a1.vcn08061408.oraclevcn.com ([2603:c020:c001:7eff:7c7:9b76:193f:d476]) by smtp.googlemail.com with ESMTPSA id c4sm11033157wrt.23.2021.09.25.04.38.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Sep 2021 04:38:52 -0700 (PDT) From: Matthew Hagan Cc: Christian Lamparter , Florian Fainelli , Andrew Lunn , Matthew Hagan , Rob Herring , Ray Jui , Scott Branden , bcm-kernel-feedback-list@broadcom.com, =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= , "David S. Miller" , Jakub Kicinski , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH 1/2] net: bgmac-platform: handle mac-address deferral Date: Sat, 25 Sep 2021 11:36:27 +0000 Message-Id: <20210925113628.1044111-1-mnhagan88@gmail.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch is a replication of Christian Lamparter's "net: bgmac-bcma: handle deferred probe error due to mac-address" patch for the bgmac-platform driver [1]. As is the case with the bgmac-bcma driver, this change is to cover the scenario where the MAC address cannot yet be discovered due to reliance on an nvmem provider which is yet to be instantiated, resulting in a random address being assigned that has to be manually overridden. [1] https://lore.kernel.org/netdev/20210919115725.29064-1-chunkeey@gmail.com Signed-off-by: Matthew Hagan --- drivers/net/ethernet/broadcom/bgmac-platform.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/ethernet/broadcom/bgmac-platform.c b/drivers/net/ethernet/broadcom/bgmac-platform.c index 4ab5bf64d353..df8ff839cc62 100644 --- a/drivers/net/ethernet/broadcom/bgmac-platform.c +++ b/drivers/net/ethernet/broadcom/bgmac-platform.c @@ -192,6 +192,9 @@ static int bgmac_probe(struct platform_device *pdev) bgmac->dma_dev = &pdev->dev; ret = of_get_mac_address(np, bgmac->net_dev->dev_addr); + if (ret == -EPROBE_DEFER) + return ret; + if (ret) dev_warn(&pdev->dev, "MAC address not present in device tree\n"); -- 2.27.0 From mboxrd@z Thu Jan 1 00:00:00 1970 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3AF90C433F5 for ; Sat, 25 Sep 2021 11:41:28 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 020286127A for ; Sat, 25 Sep 2021 11:41:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 020286127A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=7GaK+0Cr4rMEjIGjNBvXASzKiUYleAVhK0aJkLne9XE=; b=UFYYRDZXYhJay4 fKIVJdn93PffFSlp6QKBz6ro92GWCVg+LFHU9s4sdbD+kQRtXWoOub0p/fK/56spMAMF2VIwuPjTJ dWo1c/HHEi+SbQ9eDXjhJMz1UsG+WOG8kcm1DFi+tXhuEEdP6nOYkgnRLzLnRVO4fz01Q6712D9qW 2lTqUpgIegTrhInKI4VhWxpM5+OEkR0y8k3l5ht+CmQZKJ2X31Aw1pXf4Q86w6MbQaiL4CVfYuuo8 KczQH1X5kO1Mu4O9MfdONwSsuuDnEf7UutbajXtIaF6eysbeqG12ejYe2mOGZ/eqA30bVlg7A+jmL n9YxcajB9/uWnL62zJUQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mU61P-00GUtt-9U; Sat, 25 Sep 2021 11:39:11 +0000 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mU61B-00GUrz-9J for linux-arm-kernel@lists.infradead.org; Sat, 25 Sep 2021 11:38:58 +0000 Received: by mail-wr1-x42b.google.com with SMTP id w17so35353618wrv.10 for ; Sat, 25 Sep 2021 04:38:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=kxpv1Vy6pYbyF1BOQEj3cs5wBqi8pHepFHdqGdQ/R9M=; b=DPrpEgC0X7aTJh/sIZdIt5MciRnryOGZs90IJdyIGD9COAPJ5XjGHe9Yf0nPXONpGH z9AahC6xjKwrllYvKDocn2ryrkmg8D0YoA3AQqWhoXhlNbEcTK7zfVZ1lDMchUiU40QI eSafJvX3tthIsSieEmno0w1BOplCIF2GrOr4FZzyaXIl1dVI2dttLhANLE3QK8nZX8m2 FEn26ERfAnvpS4OdNd82IGJYl+1OJvKq50s8EQbDsiNi/0dWlLU1JUsNp29xDeGgW/ng t/TVu4qurByoIWZjZ/6cb88uCLFTOEDUi5WXfBuQ88h4H1aYOlQFTXRFuN12d4vSK/82 hcdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=kxpv1Vy6pYbyF1BOQEj3cs5wBqi8pHepFHdqGdQ/R9M=; b=cF+bgN0TMSAQHurio+1uyQ4LuXTdfvv/Rt9B0rXqhextojeXY5iMtq3QEp1UdTeBaP gi8RDZJVwY71PuzNPzlBJlhWvKE3bWCVXOFd0HP9HzEZ/AmbOhgI2G1gbL04NjQvOb4h JVtFk9hJkbwFyT+vt5CWqALkrEudx+RFhy6VeEXMNAMW4o82FVy48EGHqNgHoKXR6n+M 26XGAl7r/gkKOa3bpPfvsv8DFIoR6G0bDJNh2TBiwoSZVe7VXwUcFsj6urRN9UxoJOMC IhOWDor8UUUtvJPtOwN6caN8a14LzLUWixiIecBlj4hs/v4iw8kGQLW+JXMo5AKahMln B7Uw== X-Gm-Message-State: AOAM533CMHeRAN1EPYh3SrCa4roOUYx2pJagbnTGQCxn1oaQVh+WFJzJ +ttbBK6dqfxF0mwUc/RiTb8= X-Google-Smtp-Source: ABdhPJx5jxuJqVl7h+NXrefCqjyk/PMZB73LL/GOidROgSIeMPukjqukX7oDQO/z+a3T9T97hl1oxA== X-Received: by 2002:a5d:5903:: with SMTP id v3mr16644354wrd.232.1632569932758; Sat, 25 Sep 2021 04:38:52 -0700 (PDT) Received: from oci-gb-a1.vcn08061408.oraclevcn.com ([2603:c020:c001:7eff:7c7:9b76:193f:d476]) by smtp.googlemail.com with ESMTPSA id c4sm11033157wrt.23.2021.09.25.04.38.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Sep 2021 04:38:52 -0700 (PDT) From: Matthew Hagan To: Cc: Christian Lamparter , Florian Fainelli , Andrew Lunn , Matthew Hagan , Rob Herring , Ray Jui , Scott Branden , bcm-kernel-feedback-list@broadcom.com, =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= , "David S. Miller" , Jakub Kicinski , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH 1/2] net: bgmac-platform: handle mac-address deferral Date: Sat, 25 Sep 2021 11:36:27 +0000 Message-Id: <20210925113628.1044111-1-mnhagan88@gmail.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210925_043857_352834_D944F4C5 X-CRM114-Status: GOOD ( 14.39 ) 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org This patch is a replication of Christian Lamparter's "net: bgmac-bcma: handle deferred probe error due to mac-address" patch for the bgmac-platform driver [1]. As is the case with the bgmac-bcma driver, this change is to cover the scenario where the MAC address cannot yet be discovered due to reliance on an nvmem provider which is yet to be instantiated, resulting in a random address being assigned that has to be manually overridden. [1] https://lore.kernel.org/netdev/20210919115725.29064-1-chunkeey@gmail.com Signed-off-by: Matthew Hagan --- drivers/net/ethernet/broadcom/bgmac-platform.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/ethernet/broadcom/bgmac-platform.c b/drivers/net/ethernet/broadcom/bgmac-platform.c index 4ab5bf64d353..df8ff839cc62 100644 --- a/drivers/net/ethernet/broadcom/bgmac-platform.c +++ b/drivers/net/ethernet/broadcom/bgmac-platform.c @@ -192,6 +192,9 @@ static int bgmac_probe(struct platform_device *pdev) bgmac->dma_dev = &pdev->dev; ret = of_get_mac_address(np, bgmac->net_dev->dev_addr); + if (ret == -EPROBE_DEFER) + return ret; + if (ret) dev_warn(&pdev->dev, "MAC address not present in device tree\n"); -- 2.27.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel