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 E90AE48165C for ; Thu, 6 Aug 2026 14:39:14 +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=1786027157; cv=none; b=YEueRrgRFGPid1Zu9zlQwrRyfZF+bepgYangqyKbtg9VtltsPlkuiCoX8tM3vCl5sXwYqrS3gWSHBNxxSV+Uv51ctyl8KUTWh5IfylNhJmJp7jzEbvjrxB8WsHWTyYBSSuayoMJqIZJI+BOd7uq/pVPb9uY0ndxoAsfGzxu+mx0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786027157; c=relaxed/simple; bh=uhpDyIoGXajFOzs4zO0R7BhqrSY1CyahIEnZEYC/lAU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=cQ1w4BuESMD8XlXxbLFzdOX7dlNzjYrlVtim2xDTLi5w/+5r2u4uRxCx1g4yKEz6uWEkJN7ZCxlIgVNePzzYAihcaWIV6MGfb4Htv4lt6lQs8tY0ttpvOqafATWbs/3fn0BLumVZrBwC+OlT4+ZoExqbOiMnhdlqeTjXDBgtHhk= 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=TCzLLmkl; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=PmBrBW2t; 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="TCzLLmkl"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="PmBrBW2t" Received: from pps.filterd (m0279865.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 6769nlFL2105033 for ; Thu, 6 Aug 2026 14:39:14 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= SkfAnMQDHbMi2DKEw9B9JDdOl1z4aZR7BlMrHcVf2Tg=; b=TCzLLmklckCWLwgB EHmYTcVuGsmvFTyYFnSJeCxCLQJ4cT+eu3toRPVOpxU3lxdHUXKeiUTwLqUpi6y9 YGuaUrGGuF9QVIJwepkptpeGyt8G+gXfl2rHLev9I9kjYGL6leKvPQbyPonCPABG ZPbjCurLPaAEbQV12DzbHbXdYEkF8X8lLbA94Oy2tegml44YUetmI12iwazbkUBr O7ddWPxxQE53onXqoZW1MfPNtzNkViLMx6nvuTIflNX9qHKuIA3KtAklrLjUUiIr 3vlWgSe6X22uw3ZX+bJfHln4mIkT6qie1Viq9gguvrikNOZEU3Z6++RV25ZPeRhp eVGZAg== Received: from mail-qt1-f200.google.com (mail-qt1-f200.google.com [209.85.160.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4fvq731kpp-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 06 Aug 2026 14:39:13 +0000 (GMT) Received: by mail-qt1-f200.google.com with SMTP id d75a77b69052e-5174a236220so21691061cf.3 for ; Thu, 06 Aug 2026 07:39:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1786027149; x=1786631949; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=SkfAnMQDHbMi2DKEw9B9JDdOl1z4aZR7BlMrHcVf2Tg=; b=PmBrBW2tG3cjzuiC1TuxN2PZ3WaLR2xk/SV2DR3Vf22AhAek47ZmXI0BzdFxmVvGZY V3TYH1S2wxAqO9Sz8VrlhLxgqefbg6EV884fXugHRJ9QOF8haHwIt7+AyPnMGW3VRY8V 6kjnZiw6C5LDfmAlo/jX8sDRCeGTsb1ZsXt96t0+feRpWA/yPzzea13iy1h0ZcBMq7fx ikmAwH/M9Itsw1FOTOEZWzNaT3gsy8H1E/TJJTAdNqF1laEFWoqdTH9vi2QDXmXQk/cJ guA14LRhpmWJQzCqJoC3v5mAGjDHDuoufvyxeuJX7FTRNj5obKI7gpYEiLr3MK+XkbDO hlNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786027149; x=1786631949; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=SkfAnMQDHbMi2DKEw9B9JDdOl1z4aZR7BlMrHcVf2Tg=; b=sHQl7oOJ5VbNhGkO/eLt796Gy+kd/ciGoPiqnCBDxuBuCUisfcGGXG19clKSHH9+qe oSzmIk5QiQAxrVxnIEPXu7/aQPc2DGQhHyb/CUeiwxib23+VO0voI4mOCsHVXri4jjkl j1KkcmHB/+Lsp6VJXVXJIBz8LOYAKhDIkPYZgUybslzdOsuXWIzX6o5MFpYkiOMnEOvr 506KHxeCKTsk1vRaCdzzaArm1L31JCy02XMDmp1FnPueyxhoCG0ExpIK3bU5yyUBCl3D kWOQb2pTNQsNREfB9yWIn3vFZr4f27U5NY4Z/xilO6oi96KOofGr3rf/y5zRF5EVDAps ElOw== X-Forwarded-Encrypted: i=1; AHgh+RrgQUxejB61K575d2kVnZ7Avz71SktNvjJ/hghuh1nqiQ6iT8PWNEF2479Dnrsq5TPw13YwFeo=@vger.kernel.org X-Gm-Message-State: AOJu0YyXpkkcXTgs64vj2PNdzow5Ui8NVl/wDRxNbEBjWAprcIzke5oZ fOOWP9v8BcJpIXLh9RjupXBa5TlsesBg1oWiAo/MjjwfCgrD6bmFrl1rQRQKlpNHYeDX7iJKpjh TV4rsQCOIC3mF50bHmQG2/PuPulrFAIwpWn/vfXhBb0MOzwJloYfwR1V3s24= X-Gm-Gg: AR+sD104VlCbfT7ry2yfqbKIjTUAj6fxijyNzpfboyrKzmCCGJt3rsCwfQSyaelEXae d90k7d7Ml55nuDaJrytCqqvDpbtVUAVkIaCqcG5NUYZbf8fqiolvZoF31xvpiKV0Twd/uQdEe6t 5DTx5FI9if5LobwQH0pa/T0xPLGRsYorb9UDYfswfjeOxbIErmJPDK6pblAiyTS5/4r6A1xnkco j+oDsiLhImunzdMHV3hiBVMvUsAyLnLq/ss9SMYwK7V6G+wLbiDbrBVHpGbXTut5GHjKFnBC/pv PFqTeAvHFASmqXuo7UYZdnbtp/lR0f0BgbrfUsc6GHmvOcExwskP7CScR+K8jbWJN0eyS1QcEEJ wNFk+7en6thSvwPlFOqH2eMcpEWHEc5wJDZR0WSnp4CmEKKsQHPL0QO6gdZzlnjhOlKvyF8vrHg rK0OQbZcoQO3slmZt9hGAnSO77oiryHdiGgealY2em6gjsAW88RA== X-Received: by 2002:a05:622a:1ccc:b0:51c:9b44:c59e with SMTP id d75a77b69052e-52ce60d3fd2mr170035201cf.22.1786027148386; Thu, 06 Aug 2026 07:39:08 -0700 (PDT) X-Received: by 2002:a05:622a:1ccc:b0:51c:9b44:c59e with SMTP id d75a77b69052e-52ce60d3fd2mr170034201cf.22.1786027147897; Thu, 06 Aug 2026 07:39:07 -0700 (PDT) Received: from QCOM-eG0v1AUPpu.na.qualcomm.com ([90.85.108.51]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-c2036276e58sm270552166b.28.2026.08.06.07.39.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Aug 2026 07:39:07 -0700 (PDT) From: Loic Poulain Date: Thu, 06 Aug 2026 16:38:41 +0200 Subject: [PATCH v10 08/10] Bluetooth: hci_sync: Add NVMEM-backed BD address retrieval Precedence: bulk X-Mailing-List: netdev@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: <20260806-block-as-nvmem-v10-8-be598b2a5606@oss.qualcomm.com> References: <20260806-block-as-nvmem-v10-0-be598b2a5606@oss.qualcomm.com> In-Reply-To: <20260806-block-as-nvmem-v10-0-be598b2a5606@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 , Christian Marangi 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 , Bartosz Golaszewski , Piotr Kwapulinski X-Mailer: b4 0.14.2 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODA2MDExNCBTYWx0ZWRfX4EfI7x+YVGse vxeEgM1wcyQFTyVifXooyF4w81Beefwr321Rb3jR7XmW+04H18+GDfN1MBCzzWJjYlccIP30Wi9 oqVty6qc3tE5AwfWjXfXJa3CJiioNtYr8M7LhPGkKoFf7rgzlX7ww4CNq2/eDoBNgjknNF+bNhb ygnOoKJ7KMmhRfnpgWpApT83ugGIpDMGIfNu+tIKc/jTC7WD617a/ps4eNqv5hY4DA9YBYkFSu6 Yl6y1h20vkcv6+o60YCb7aZPn75AJeVp1NmsC2CBsnXJEPNU/kRwGIfaUPogZv6hT/f9Sm82afV 0YE6tY3pBNSFDSm8d4fqiqAbnZw8Y0XZohFbZqpigpXgpSi9k2Kb+qgF2F5UPVpC/p3Ixe/8Ajs Pk2gcmLT2NSiBzW3FGZv2SDyT53I6Sb/YNVsWfevoOXSlaWE5+WK75/k40VJZTgxqOC9x8qnAbN lisGOoUq02ag1e2irjA== X-Proofpoint-Spam-Info: AW1haW4tMjYwODA2MDExNCBTYWx0ZWRfX6zrdR6knGE+f ykBdgk/qovbETzb6dSUiKCBqnPRylOsgM90dK7+9RiGQSm32Y+hhs2NZBADFri+Js8a4ew5jWQ9 WZscVMhrqaQze+ZLaXRDxbXouaSgpuc= X-Authority-Analysis: v=2.4 cv=EeH4hvmC c=1 sm=1 tr=0 ts=6a749c91 cx=c_pps a=JbAStetqSzwMeJznSMzCyw==:117 a=JDRa4Jy4r6/BpSpxP2cCow==:17 a=IkcTkHD0fZMA:10 a=Sv0fKeRqtYgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=Um2Pa8k9VHT-vaBCBUpS:22 a=EUspDBNiAAAA:8 a=QyXUC8HyAAAA:8 a=ZruV3ba3MPUC-7CJ7xEA:9 a=QEXdDO2ut3YA:10 a=uxP6HrT_eTzRwkO_Te1X:22 X-Proofpoint-ORIG-GUID: eHPwFgvFHn9kOW2Gxe-THTJV5WQ-76YK X-Proofpoint-GUID: eHPwFgvFHn9kOW2Gxe-THTJV5WQ-76YK X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-08-05_06,2026-08-05_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 priorityscore=1501 suspectscore=0 adultscore=0 impostorscore=0 lowpriorityscore=0 spamscore=0 bulkscore=0 clxscore=1015 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608060114 Some devices store the Bluetooth BD address in non-volatile memory, which can be accessed through the NVMEM framework. Similar to Ethernet or WiFi MAC addresses, add support for reading the BD address from a 'local-bd-address' NVMEM cell. As with the device-tree provided BD address, add a quirk to indicate whether a device or platform should attempt to read the address from NVMEM when no valid in-chip address is present. Also add a quirk to indicate if the address is stored in big-endian byte order. Reviewed-by: Bartosz Golaszewski Reviewed-by: Piotr Kwapulinski Signed-off-by: Loic Poulain --- include/net/bluetooth/hci.h | 18 ++++++++++++++++++ net/bluetooth/hci_sync.c | 41 ++++++++++++++++++++++++++++++++++++++++- net/bluetooth/mgmt.c | 6 ++++-- 3 files changed, 62 insertions(+), 3 deletions(-) diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h index 38186a245f14dbd2a26cbc331e7f1b3e72f1a607..145ab94e51482f903f4c9133d8c97561ac1c1e00 100644 --- a/include/net/bluetooth/hci.h +++ b/include/net/bluetooth/hci.h @@ -161,6 +161,24 @@ enum { */ HCI_QUIRK_BDADDR_PROPERTY_BROKEN, + /* When this quirk is set, the public Bluetooth address + * initially reported by HCI Read BD Address command + * is considered invalid. The public BD Address can be + * retrieved via a 'local-bd-address' NVMEM cell. + * + * This quirk can be set before hci_register_dev is called or + * during the hdev->setup vendor callback. + */ + HCI_QUIRK_USE_BDADDR_NVMEM, + + /* When this quirk is set, the Bluetooth Device Address provided by + * the 'local-bd-address' NVMEM is stored in big-endian order. + * + * This quirk can be set before hci_register_dev is called or + * during the hdev->setup vendor callback. + */ + HCI_QUIRK_BDADDR_NVMEM_BE, + /* When this quirk is set, the duplicate filtering during * scanning is based on Bluetooth devices addresses. To allow * RSSI based updates, restart scanning if needed. diff --git a/net/bluetooth/hci_sync.c b/net/bluetooth/hci_sync.c index 3be8c3581c6caadeeea56e14e09d4123deb4ec03..c0ed7fb14d19bd79429a6892ec1c7cc89bc7ab3a 100644 --- a/net/bluetooth/hci_sync.c +++ b/net/bluetooth/hci_sync.c @@ -7,6 +7,7 @@ */ #include +#include #include #include @@ -3593,6 +3594,39 @@ int hci_powered_update_sync(struct hci_dev *hdev) return 0; } +/** + * hci_dev_get_bd_addr_from_nvmem - Get the Bluetooth Device Address + * (BD_ADDR) for a HCI device from + * an NVMEM cell. + * @hdev: The HCI device + * + * Search for 'local-bd-address' NVMEM cell in the device firmware node. + * + * All-zero BD addresses are rejected (unprovisioned). + * + * Return: 0 on success, or a negative error code on failure. + */ +static int hci_dev_get_bd_addr_from_nvmem(struct hci_dev *hdev) +{ + struct device_node *np = dev_of_node(hdev->dev.parent); + u8 ba[sizeof(bdaddr_t)]; + int err; + + if (!np) + return -ENODEV; + + err = of_get_nvmem_eui48(np, "local-bd-address", ba); + if (err) + return err; + + if (hci_test_quirk(hdev, HCI_QUIRK_BDADDR_NVMEM_BE)) + baswap(&hdev->public_addr, (bdaddr_t *)ba); + else + bacpy(&hdev->public_addr, (bdaddr_t *)ba); + + return 0; +} + /** * hci_dev_get_bd_addr_from_property - Get the Bluetooth Device Address * (BD_ADDR) for a HCI device from @@ -5072,12 +5106,17 @@ static int hci_dev_setup_sync(struct hci_dev *hdev) * its setup callback. */ invalid_bdaddr = hci_test_quirk(hdev, HCI_QUIRK_INVALID_BDADDR) || - hci_test_quirk(hdev, HCI_QUIRK_USE_BDADDR_PROPERTY); + hci_test_quirk(hdev, HCI_QUIRK_USE_BDADDR_PROPERTY) || + hci_test_quirk(hdev, HCI_QUIRK_USE_BDADDR_NVMEM); if (!ret) { if (hci_test_quirk(hdev, HCI_QUIRK_USE_BDADDR_PROPERTY) && !bacmp(&hdev->public_addr, BDADDR_ANY)) hci_dev_get_bd_addr_from_property(hdev); + if (hci_test_quirk(hdev, HCI_QUIRK_USE_BDADDR_NVMEM) && + !bacmp(&hdev->public_addr, BDADDR_ANY)) + hci_dev_get_bd_addr_from_nvmem(hdev); + if (invalid_bdaddr && bacmp(&hdev->public_addr, BDADDR_ANY) && hdev->set_bdaddr) { ret = hdev->set_bdaddr(hdev, &hdev->public_addr); diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c index d23ca1dd089365fe4606600c68475dceb561e5ee..42b6866f96a4c81850d98041b34b7fcb0f9d0e47 100644 --- a/net/bluetooth/mgmt.c +++ b/net/bluetooth/mgmt.c @@ -614,7 +614,8 @@ static bool is_configured(struct hci_dev *hdev) return false; if ((hci_test_quirk(hdev, HCI_QUIRK_INVALID_BDADDR) || - hci_test_quirk(hdev, HCI_QUIRK_USE_BDADDR_PROPERTY)) && + hci_test_quirk(hdev, HCI_QUIRK_USE_BDADDR_PROPERTY) || + hci_test_quirk(hdev, HCI_QUIRK_USE_BDADDR_NVMEM)) && !bacmp(&hdev->public_addr, BDADDR_ANY)) return false; @@ -630,7 +631,8 @@ static __le32 get_missing_options(struct hci_dev *hdev) options |= MGMT_OPTION_EXTERNAL_CONFIG; if ((hci_test_quirk(hdev, HCI_QUIRK_INVALID_BDADDR) || - hci_test_quirk(hdev, HCI_QUIRK_USE_BDADDR_PROPERTY)) && + hci_test_quirk(hdev, HCI_QUIRK_USE_BDADDR_PROPERTY) || + hci_test_quirk(hdev, HCI_QUIRK_USE_BDADDR_NVMEM)) && !bacmp(&hdev->public_addr, BDADDR_ANY)) options |= MGMT_OPTION_PUBLIC_ADDRESS; -- 2.34.1