From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 659FB466B76 for ; Thu, 7 May 2026 15:25:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778167508; cv=none; b=M8uY10M53I+DcbjeBYL7PF7nGIeOYMgS97u+je97qM2sQVKPpesLGnVh/RvtBeHWOBseVXkI0tHcUOMjYLSMhZIr4F9vHaXvXai/ajdYeVJsPYGsq0Su2rwTa0Nj1zqzr9c1b8jMSyrllD55KJvOsiyEzkf64fhrhVEaTyGdhDM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778167508; c=relaxed/simple; bh=PTkmvq/Q7QJ06WLt1N+U7YrHr9PbicR5yuKr0MktND8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=aQxLr8FIb28U99ZRJgSuGcSZQeWxqY8dpH58RjJpAbqRg3jtd/J5qT5sihvOGUM31/WuuoSFu+PM7ZEOQeTtext7EyYj3DR22D+kPyVRYDv2BIDWBza0HnqyUVfL3ocDSqefdGK+o5PKjHGlfK6PlxroNreMWcvXNF/65qHMQf4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=GQGKmWwP; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=BoiEoIEG; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="GQGKmWwP"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="BoiEoIEG" Received: from pps.filterd (m0279864.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 647C5X3Q1971721 for ; Thu, 7 May 2026 15:25:00 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= uk7Oe1xq0TlLuceyYysifE8TQzhLGFxXPLlz8g3T7ak=; b=GQGKmWwPpcYT7z52 bh2TBhD3xN2aVw+NnsWrysEnuoLLqDCOscuj7MW+9REwKMoW7mY5/4nq9ouPjv/g thwhVWE3ViIlDkCt1ycf1AQFZ1cGZ6NmEpXCVrtcQnVpGRxU3RQxdHtKryWF6KTx K+xYI7lTzBNnoOWbnW+5KGwx1fJchODrvLFvjUD14mh/H0p4TxPqRr84WwFrh27f 8N9KTX/ztpP9EOfYjCzV1eoVEbr61V9zen0za/2MVIw/iZ5PXTf+/ZK+7484+EIw Cm7l3M9dBPTFL56gluoApthPugAaLSFg/qxw+RHO+JWjyxvQoRxJcadQFKuQf+xk 3Wj1hw== Received: from mail-ua1-f70.google.com (mail-ua1-f70.google.com [209.85.222.70]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4e0tej8stf-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 07 May 2026 15:24:59 +0000 (GMT) Received: by mail-ua1-f70.google.com with SMTP id a1e0cc1a2514c-94d6c5433a0so1188915241.1 for ; Thu, 07 May 2026 08:24:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1778167499; x=1778772299; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=uk7Oe1xq0TlLuceyYysifE8TQzhLGFxXPLlz8g3T7ak=; b=BoiEoIEGSFg2nLyqYhoAS3ipSziX+Bf0RWodsXs3iufy/Qa5PRuz7MUHqznU+dHm0/ CqCfhVboEOvao6bgt8qedh76exBuQnXexVSN5oyVY0J4XngL5MWXWqxuvqrvcovefsDi 38NyygRbYNg08ggM+KVxvhyMY5loN1lk8prlnui30qmnvBnG6GaXU/Pbd1pGWh68BpnP NtLiMrx8YmEkEXBoTRuvWGd9nYVoXNbJreQ6RAP6DvEk7RJMf6wb40CF1bFe2tUeiOvK Vd2epm1UVYz5f9qY8KAc/0Qxe0AHlFmHw6+TE4xzWYAUVsZjhDAlx7bHp74J0vDwYHOm Wb0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778167499; x=1778772299; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=uk7Oe1xq0TlLuceyYysifE8TQzhLGFxXPLlz8g3T7ak=; b=jYz6wHMtc15yvDtywVvuLFwkWe1k5uwytXXPgXU5OPUIQHEMKaM1MMmuKkKnnwnI6n nCHa3l71SdtAQ9gXEN8HkUB+goBTdNBmYoH8O5VvWieckYJ93sFgodfj0fcsfSTLQKmq I+BpK9oKG4Gfq45T/V8zXIfXs5hSNgVoGOeXXcYcv44aOvbIah60nbl4EtZm3hAMmiOY 0vR8ZG1WeGxyqi/8A8mMdLObep4tELKLNg1P1pDKPzJBLsWzcR9ZCL3882MkiS4rloZ8 hJL8ozDyaGPtOXSmxn0K/LE1+jS096c23+5fzXxUhXZ/Xmjluuo0FzW3H9xBMiyORmEc dikg== X-Gm-Message-State: AOJu0Yzm08JNFuuDyVyNW4nfh1F2FctptcitZa2Q4qV0oJLHrMIU9rOZ YVbn7x2PquWCXC1tYq5jwod6KsUE4JUNXNLDqvPJllrKwx4boNRe9Q08WXuYBb9U2L7luu6RkdD GDPVlozslXrI2gNQ3s0X+Ta8Bhe4QGyrueeMoo1p8amd68PMP6OaaCYWeGFbDSyw= X-Gm-Gg: AeBDievArG0WN7eDzfZGLOsZnO4yHeCbTr2qq+hRI5ouB9Gdi/EsRsrk+kVd64cb5jB Cm3Q8xVSG6TE+ahoNXS+/abfTRl7wPy8JcZy0DJ8rhhYgVELU/FiuDEU1YVsXhOFtQqZawxTih3 ap8qxyH5YS64Q7zz4sJRRD3EXaznB5rrkYzeLgjDutRP9c/jN7w+yWn0tUn5UAJpxq/8ckaCTc/ QiyueWsBMolcnTQxGcHFN7xckj0vSKRyY0+MGwimaWbObJ0A2+Z7IjW2j7+QwtZfdU7yiL25tFc tjbh/v9CBP2WGLjFFQUPxbR32qV+vC5styqnbJEk0Q9Jblula9RU3tgVNg+QS8oYIokS2xutq4W xoHgN/2kNcLzGfK370AN8RkSLZOH/9WITnux28v9NmyZ2FMngcqQ6xstodl9BhLGgOKwi06jE5X 1iE1s/OyCSLGf11JbglROmdAwtu44= X-Received: by 2002:a05:6122:1822:b0:56f:6add:9029 with SMTP id 71dfb90a1353d-575593aea76mr5335416e0c.1.1778167498691; Thu, 07 May 2026 08:24:58 -0700 (PDT) X-Received: by 2002:a05:6122:1822:b0:56f:6add:9029 with SMTP id 71dfb90a1353d-575593aea76mr5335377e0c.1.1778167498276; Thu, 07 May 2026 08:24:58 -0700 (PDT) Received: from QCOM-eG0v1AUPpu.na.qualcomm.com ([2a01:e0a:830:450:b16a:3475:ec42:bcfa]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-bca583dd7e4sm240966b.58.2026.05.07.08.24.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 May 2026 08:24:56 -0700 (PDT) From: Loic Poulain Date: Thu, 07 May 2026 17:24:40 +0200 Subject: [PATCH v2 5/8] net: of_net: Add of_get_nvmem_eui48() helper for EUI-48 lookup Precedence: bulk X-Mailing-List: linux-mmc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260507-block-as-nvmem-v2-5-bf17edd5134e@oss.qualcomm.com> References: <20260507-block-as-nvmem-v2-0-bf17edd5134e@oss.qualcomm.com> In-Reply-To: <20260507-block-as-nvmem-v2-0-bf17edd5134e@oss.qualcomm.com> To: Ulf Hansson , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Bjorn Andersson , Konrad Dybcio , Jens Axboe , Johannes Berg , Jeff Johnson , Bartosz Golaszewski , Marcel Holtmann , Luiz Augusto von Dentz , Balakrishna Godavarthi , Rocky Liao , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Srinivas Kandagatla , Andrew Lunn , Heiner Kallweit , Russell King , Saravana Kannan Cc: linux-mmc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-block@vger.kernel.org, linux-wireless@vger.kernel.org, ath10k@lists.infradead.org, linux-bluetooth@vger.kernel.org, netdev@vger.kernel.org, daniel@makrotopia.org, Loic Poulain X-Mailer: b4 0.14.2 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTA3MDE1NCBTYWx0ZWRfXyBifbzo/TwZN mtBBLtAFxg6coi8ib/1vZhlpckcvdIwHrP/TJW1EOP366+xYhK0BViepURRbI1sCFGDc3I8T1BY FNZuguIKioETp9piWKNk3qWH1xyyqSKAXtsGaQ4PaZDReYg7KlHNIBjDDhUfyxmClI7UKmTGQV6 zPJERrIk1XkFDoMPSlRz3M9QfvG/FMUB9tPPRf3YftMNU3CoHufi1jguuGKyKX8K+OzEZpCHJzy GroQW8HBtGULA5JY49qsQmhktVe/HJyVFDkcQyExtDiFqCv9ZcYtslrHl9HtwzwAqnamVafjwcC lhRAWWqYMIc8uaolaKxTaZPLrCdBjGbm0OCr6uv6YKYpr2vTsNreXXsCQfx4z/inhKV5c8nj3gv xhppYMdSM37dHKOEuumDQ4N9ZoYPq7RZl1udV2FlqoD5aH9+9qtSlF53h60uH312c9zZswggDVI m/GW2ug7cId2zB5VIxA== X-Proofpoint-GUID: PGSZzeuB5FjK_xMw8OsBaIqWKuPkMaux X-Authority-Analysis: v=2.4 cv=VNbtWdPX c=1 sm=1 tr=0 ts=69fcaecb cx=c_pps a=R6oCqFB+Yf/t2GF8e0/dFg==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=NGcC8JguVDcA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=DJpcGTmdVt4CTyJn9g5Z:22 a=EUspDBNiAAAA:8 a=C98JESGoZJZpJ7w8-ywA:9 a=QEXdDO2ut3YA:10 a=TD8TdBvy0hsOASGTdmB-:22 X-Proofpoint-ORIG-GUID: PGSZzeuB5FjK_xMw8OsBaIqWKuPkMaux X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-05-07_01,2026-05-06_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 spamscore=0 impostorscore=0 priorityscore=1501 malwarescore=0 bulkscore=0 lowpriorityscore=0 phishscore=0 suspectscore=0 adultscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2604200000 definitions=main-2605070154 Factor out the common NVMEM EUI-48 retrieval logic from of_get_mac_address_nvmem() into a new of_get_nvmem_eui48() helper that accepts the NVMEM cell name as a parameter. This allows other subsystems (e.g. Bluetooth) to reuse the same lookup-validate-copy pattern with a different cell name, without duplicating code. of_get_mac_address_nvmem() is updated to call of_get_nvmem_eui48() with "mac-address", preserving its existing behavior. Signed-off-by: Loic Poulain --- include/linux/of_net.h | 7 +++++++ net/core/of_net.c | 47 +++++++++++++++++++++++++++++++++++------------ 2 files changed, 42 insertions(+), 12 deletions(-) diff --git a/include/linux/of_net.h b/include/linux/of_net.h index d88715a0b3a52f87af23d47791bea3baf5be5200..7854ba555d9a55f3d020a37fe00a27ae52e0e5dc 100644 --- a/include/linux/of_net.h +++ b/include/linux/of_net.h @@ -15,6 +15,7 @@ struct net_device; extern int of_get_phy_mode(struct device_node *np, phy_interface_t *interface); extern int of_get_mac_address(struct device_node *np, u8 *mac); extern int of_get_mac_address_nvmem(struct device_node *np, u8 *mac); +int of_get_nvmem_eui48(struct device_node *np, const char *cell_name, u8 *addr); int of_get_ethdev_address(struct device_node *np, struct net_device *dev); extern struct net_device *of_find_net_device_by_node(struct device_node *np); #else @@ -34,6 +35,12 @@ static inline int of_get_mac_address_nvmem(struct device_node *np, u8 *mac) return -ENODEV; } +static inline int of_get_nvmem_eui48(struct device_node *np, + const char *cell_name, u8 *addr) +{ + return -ENODEV; +} + static inline int of_get_ethdev_address(struct device_node *np, struct net_device *dev) { return -ENODEV; diff --git a/net/core/of_net.c b/net/core/of_net.c index 93ea425b9248a23f4f95a336e9cdbf0053248e32..79b289de0f16aa5f8724e84d6f2300648c25b6c4 100644 --- a/net/core/of_net.c +++ b/net/core/of_net.c @@ -61,9 +61,6 @@ static int of_get_mac_addr(struct device_node *np, const char *name, u8 *addr) int of_get_mac_address_nvmem(struct device_node *np, u8 *addr) { struct platform_device *pdev = of_find_device_by_node(np); - struct nvmem_cell *cell; - const void *mac; - size_t len; int ret; /* Try lookup by device first, there might be a nvmem_cell_lookup @@ -75,27 +72,53 @@ int of_get_mac_address_nvmem(struct device_node *np, u8 *addr) return ret; } - cell = of_nvmem_cell_get(np, "mac-address"); + ret = of_get_nvmem_eui48(np, "mac-address", addr); + if (ret) + return ret; + + if (!is_valid_ether_addr(addr)) + return -EINVAL; + + return 0; +} +EXPORT_SYMBOL(of_get_mac_address_nvmem); + +/** + * of_get_nvmem_eui48 - Read a 6-byte EUI-48 address from a named NVMEM cell. + * @np: Device node to look up the NVMEM cell from. + * @cell_name: Name of the NVMEM cell (e.g. "mac-address", "local-bd-address"). + * @addr: Output buffer for the 6-byte address. + * + * Reads the named NVMEM cell and validates that it contains a non-zero 6-byte + * address. Returns 0 on success, negative errno on failure. + */ +int of_get_nvmem_eui48(struct device_node *np, const char *cell_name, u8 *addr) +{ + struct nvmem_cell *cell; + const void *eui48; + size_t len; + + cell = of_nvmem_cell_get(np, cell_name); if (IS_ERR(cell)) return PTR_ERR(cell); - mac = nvmem_cell_read(cell, &len); + eui48 = nvmem_cell_read(cell, &len); nvmem_cell_put(cell); - if (IS_ERR(mac)) - return PTR_ERR(mac); + if (IS_ERR(eui48)) + return PTR_ERR(eui48); - if (len != ETH_ALEN || !is_valid_ether_addr(mac)) { - kfree(mac); + if (len != ETH_ALEN || !memchr_inv(eui48, 0, ETH_ALEN)) { + kfree(eui48); return -EINVAL; } - memcpy(addr, mac, ETH_ALEN); - kfree(mac); + memcpy(addr, eui48, ETH_ALEN); + kfree(eui48); return 0; } -EXPORT_SYMBOL(of_get_mac_address_nvmem); +EXPORT_SYMBOL_GPL(of_get_nvmem_eui48); /** * of_get_mac_address() -- 2.34.1