From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EE9B341B355 for ; Wed, 5 Aug 2026 10:01:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.42 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785924109; cv=none; b=T2wS/lNLzXuWELj/fXr2nQipbQ/4ENLNQBjmYDqv25GnOZsM8ZpIhBNdaBXGoFCr9tNs16/JQLTJ+FOhtiMUwl0p4leczZL1Ke3eHz3KPhoxwsLkpx1yJxc0J3AQvhZFONuzLwiXoWLLBTuS3iTCON5VuiW92jedRlxtrSOg+is= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785924109; c=relaxed/simple; bh=+qT+t8J7JMGOegi9oh4bKCVpPiuuhIEnoiBx9me7+Y4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=t+nGK+8PNZXHs2qyFQPJRpknIvjh/PM0Fo9WjE8rMImUIo2htRWMJGhm19yNb4iVbgH34KKTnSLuv3XUhI3ceksiBqMbZq/edcj6/Y6+/fVw4vMiefzltb9pDH528JjhocRL97Mf6rxswhgtkO9SLDNkg9TG5zaH9MI6+a/qI8k= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=EJsG3KzU; arc=none smtp.client-ip=209.85.128.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="EJsG3KzU" Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-498028b3d5eso7381625e9.1 for ; Wed, 05 Aug 2026 03:01:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785924106; x=1786528906; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=egdlNU3NVgRD08dI5V72nyvU+UH9dXnlAAmwjEI5qno=; b=EJsG3KzU85ktMGlhsuKG2qgfXO1qHRn9OiV0x85eBg8UJYgZDbpfodbKXxp9KbuWaj Rtye8QisE50IPFc/tJWD8JH1Flvy3Ce3sEtN991FYaCEqB/YmEpW6/KmP0v42fNEpT2l DAVj0ySf35NSU2vfhhPYbOh19skTcHpwmlxVdmMo9qe7pbp/BKjouc0SxgyM3TSjAZkO 8PI+ZmGppidQeLuCHTMXB2Z0WE59lLT2VLM+6rh+DJw3+r00rkCpDlQc3ll+TqZHDF1a 9ykpq3Zf4xMDmC5iIbpgFGHKpyqO+nMuYE6sINbMLGNAcz0Vrok3A4DuBPCiLM1TfAYM DBYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785924106; x=1786528906; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=egdlNU3NVgRD08dI5V72nyvU+UH9dXnlAAmwjEI5qno=; b=WmCpZVawRLck6m7NLMiV9WBvvetITFcifk5GENo/iJN8AZ7HFfLawAPN+eRCIxyjHl PPSuoQCYo3AJeriLfsk8dSWv5LEex4ZhviamFnOI0gqslLkU4uVI3Eit+a0bFDE2gs0h R4bO738t0cFlS4NTS01kocAKY09BEnBlL8S5XxF9oDfl0hSGGkE/ofEkoEXIdFDKsvAK 8uVwYK7IDhCbHQ7GPH1mm3mR7dRAabum4PQMljrRrlDtZ1/ct95+P1o50n8B6EJ2gXd2 Tp8fuEMxB1jSGZX6dDTbcywufLr1fiBJVfvE8/A14v/CfZsZEviFR4nRHWsEFYWZOqTi 190Q== X-Gm-Message-State: AOJu0Yy4VTY1dzR/tIAMt+mdSjer9i/7RLfjbejvoMsMkPt01w13GG9F tN6sh7Mriuf73CSd1Yq4DWzeH4UreUzo3uRTWjzyUCokpOH5nlI3/b53 X-Gm-Gg: AR+sD13UqdQIrnIenDF09Z8EDslbzT4vzlVB2iaQmO6b16QrBXXJ3cvRdiXdj3svS1s 4v1Ca/SHOZVuSlK4SBfF7a3KIBDj4XRIliQqVDZs2fjZgGQi09i8F1RgyGZ49bEFB8hKa/jJSRx W8gw1Rwj5nZ21md2amfHbnAYq+61+WC0nXWPjhRltuMV5kUOqWNf6JM+twZ7w15lqw1bXAOjACi bq0ZZG4sIzvJuuDSQIXszijnq9RoGdQBBV3DUl9QccDT1zeH+oX2Ha85tQQXpxXob4ANUuc6Bsv ydCDnvknD/Oda+AzIUOmemmHhd3An5snbYs1EGQGPGbHNE5fERll/Y6A21nb3hJ8FgOyrRresSJ fmVXSZ7otNfK6ZyPCFd+L2fkiIrX5B957NQmqjjPwrtTjzYY/2gGo5byRWE81YEHh9AW9UuiXU/ zYAtzbCyD5g6gR5A4SbYnZPjOKqVHAMt88Df3H3DV3MbFM1gXHRsc59oafb0b5RN06QkaMtCkQd CyS X-Received: by 2002:a05:600c:a597:b0:499:4d50:7230 with SMTP id 5b1f17b1804b1-4994e7d9c03mr39020955e9.18.1785924105995; Wed, 05 Aug 2026 03:01:45 -0700 (PDT) Received: from arbab-X395.dbs.corp ([110.93.227.54]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-47fec249a5fsm7344776f8f.33.2026.08.05.03.01.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Aug 2026 03:01:45 -0700 (PDT) From: Arbab Haider To: stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Rosen Penev , Simon Horman , Jakub Kicinski Subject: [PATCH 7.0.y 2/5] net: mvneta: support EPROBE_DEFER when reading MAC address Date: Wed, 5 Aug 2026 15:01:33 +0500 Message-ID: <20260805100136.59101-2-arbabhaider649@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260805100136.59101-1-arbabhaider649@gmail.com> References: <20260805100136.59101-1-arbabhaider649@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Rosen Penev If nvmem loads after the ethernet driver, mac address assignments will not take effect. of_get_ethdev_address returns EPROBE_DEFER in such a case so we need to handle that to avoid eth_hw_addr_random. Add extra goto section to just free stats as they are allocated right above. Signed-off-by: Rosen Penev Reviewed-by: Simon Horman Link: https://patch.msgid.link/20260307031709.640141-1-rosenp@gmail.com Signed-off-by: Jakub Kicinski [ Upstream commit 73a864352570fd30d942652f05bfe9340d7a2055 ] --- drivers/net/ethernet/marvell/mvneta.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c index 22da95d46bef..744d6585a949 100644 --- a/drivers/net/ethernet/marvell/mvneta.c +++ b/drivers/net/ethernet/marvell/mvneta.c @@ -5620,6 +5620,8 @@ static int mvneta_probe(struct platform_device *pdev) } err = of_get_ethdev_address(dn, dev); + if (err == -EPROBE_DEFER) + goto err_free_stats; if (!err) { mac_from = "device tree"; } else { @@ -5755,6 +5757,7 @@ static int mvneta_probe(struct platform_device *pdev) 1 << pp->id); mvneta_bm_put(pp->bm_priv); } +err_free_stats: free_percpu(pp->stats); err_free_ports: free_percpu(pp->ports); -- 2.53.0