From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.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 D858747A890 for ; Thu, 6 Aug 2026 14:39:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786027154; cv=none; b=eC8CTR/PGHSGsVAvBI5TyslQgqibR1sR1jd0b8lFHHdzppfyYkTVhMUfvKcA4NMJoaWir3ECAVQ29NOkapa9wO6G5m+svFrlXiMhUnOCfKNgZOsrZM5CbcYMVP6lAkDybrm+idfW2GMec52mqDSLEHbJqLcsiKPfv+ArszURw1Q= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786027154; c=relaxed/simple; bh=uhpDyIoGXajFOzs4zO0R7BhqrSY1CyahIEnZEYC/lAU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=o8+78DrjbC2xX+qGC80AyPiVQpif2kdk11BogATVEw+pxjjB8AB1WF1pwD+h7CUrq7dqmi5HNM1jKsttMh50aH2foRW7qTtsYGxIkeJRca98pOtVDD4ZLJ1QJ0VhYBP2Ke+m5NQVna7gUZ5ryOKNIZ+iiZ1boj10gm0RpuHGbyQ= 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=XVmwEFea; arc=none smtp.client-ip=205.220.180.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="XVmwEFea" Received: from pps.filterd (m0279872.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 6769ncAj1308819 for ; Thu, 6 Aug 2026 14:39:09 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-f197.google.com (mail-qt1-f197.google.com [209.85.160.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4fvp729vg1-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 06 Aug 2026 14:39:09 +0000 (GMT) Received: by mail-qt1-f197.google.com with SMTP id d75a77b69052e-51c12e43b98so25634721cf.1 for ; Thu, 06 Aug 2026 07:39:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1786027148; x=1786631948; 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=XVmwEFeazEPoEuahMRKpFvWyNu0YfUYhrOzM0hgOAJ0y10nmLJir1+7JnEGWfhyVV4 fcWPz81ok4ZSxpeAUqQFTqkUEu8QhB4fwb5vZrPKYAy1MXTHW5WEEcCC8tG1HDGaEPSB f7pWdoNlgnTEohFVFJ/wApRcR5n5nWSTI3qeI3BMXFvlNv4WDTMRidCrtUmuSqmlSnAO aNQytgxmb+f0vQkOpl/tWpUgEZ07Uik9eEga6rQnpoZh44FesTx9uClxMkzO8/xSVXdV UPNry3fqKLJN4QiiRc91099VMXoR/SCY194BpugKJ1v0XW8AggJ8a5vPNsRr13gHwMwJ 3+iQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786027148; x=1786631948; 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=k86ll41yFfnQ3AI4e0dEKHeP7LgNTgSrdvFxmi7FcizX7Fm34ka39wocueSP8usi9t BbAplDMWY0J924vHclc5dw9hOG1s2YxAAMLlAwq1T7CfQ9fc17VclT0X0ijY+0j33G7T /VQSZCq9zOHQFJJfYobpVPaL4dgGu+4gXcFYlWJQzl/Am9dv0TjwI6bsEpy1yt1uDb2r +/UwFRbel2CQiJpuEUNkuLnpveHZFrGHOViRljBummXt6xKohaTS6f+hydGYWGxp6jcu gAlZDzGJIxJFnR85YWO+9/T8jf9oOvP0LQxQt6aWGDZBGfma7Q8v0jW8GxSRnhxc1Avf Iv0Q== X-Forwarded-Encrypted: i=1; AHgh+Rq3YNmOPdBVYXQB60M9/brTFuMsc0lJqCViofBvMfXm8+igt0305DZO+d6Dts93WjbkPwNrLqc16UvKTfU=@vger.kernel.org X-Gm-Message-State: AOJu0YxQAVcoB8mSI4LcWl5fnHSx4R9E2/aEaS3IsCR0owKTw7cNPT55 H+Bi4i+Boc/Xg6gxh+PQadV6cNwiY3WoxMLodNzfC6HaUNj7ZWBmsdSTY4VTs3IaSQqiNLLMHrn GTxPbsVVAZ3kVnX5xN/5360I+zM7MUBQbAYTmsJQsv5FZOrcdLtZWNiZFiRdhJobWsRU= X-Gm-Gg: AR+sD116jp+ITcjCVvNpbE7YgQudRb/OgvY0oKOXmIJUINB8Zr/j2gLy1dpUtnf1aoC 8iWmI7+p6nQz6maVa9mrRZuJvPn6ZEPZnwKvTrWGrlECRWbTgQHD0GZkicUCyBh3Rme7chAGVg9 x+zNrtZ1InyWVWkYh2+ZJjdoGl2LJDSr8q0o8nkONNST2vxna687strMEeemmu2rZ8H8p/u9+nJ 9/zlxuYv4IudPxHLbcwlwxYrDMpqRuRiGLlcK9b5bmFnFx4x+6pese7IBx8anKANY7NjhaKipTY 9Gxp1TXo+bGRYiHcnYMpot9VvwteS8kEZOy5rHUvumDEIgC/soGAFdl1wQEW+9cVkEF/fBRtA08 wRSfHMHDr0/qpG1EZNDS9pcD7L5KMm2gjLzQ3gxJyDPmR1gI3yUpFuM7CvBdsGqF8kaP9puQu7x D8ulDO2bDxg6dSD6Of3ImJKK3Oi925CTSrGZO+wmpfFEbbpCdjeA== X-Received: by 2002:a05:622a:1ccc:b0:51c:9b44:c59e with SMTP id d75a77b69052e-52ce60d3fd2mr170035591cf.22.1786027148470; 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: linux-kernel@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-ORIG-GUID: 7VWl_upN_FER32VOheGuTbdswonPLg8P X-Authority-Analysis: v=2.4 cv=JYCMa0KV c=1 sm=1 tr=0 ts=6a749c8d cx=c_pps a=EVbN6Ke/fEF3bsl7X48z0g==:117 a=JDRa4Jy4r6/BpSpxP2cCow==:17 a=IkcTkHD0fZMA:10 a=Sv0fKeRqtYgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=yx91gb_oNiZeI1HMLzn7:22 a=EUspDBNiAAAA:8 a=QyXUC8HyAAAA:8 a=ZruV3ba3MPUC-7CJ7xEA:9 a=QEXdDO2ut3YA:10 a=a_PwQJl-kcHnX1M80qC6:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODA2MDExNCBTYWx0ZWRfX3DiL4UhuYdx0 M9Iq1U8gq5ZbzZ6VLedhIj9LJiG5VTPTiAT6ZWG1sEprubme6841ml1+TWlEc5pnObpNNZAP5G2 iUmdY+CS1SxaIjWDqaCZDoXzjIBXrn/bmDMDS+1n4HdOZkKQwCpR63ev3zbqYz9XNwfEZi29ej8 cPRy3H1dLmSCJAVRtS5SJsOD7+L1WrPh25FQzQzhtsqHsqSYyiVWU5DdEDem3nd8O1fFfvFwy5A Jl1HuDSaisE7B5EqQRps+r6IzXHKcscxL8ghL8d+kA1/eyZ82iVwHJCPJwa5y/lermN+AU/l98O DtSu605dqiEYJPTWBie9VDXDvKRxIIlf13VACEecbXwdK69+PhBlc1ogkN420ONg9Q4AqxqW9LB YCuCWy4HzZqOSsmSjy8tpatTbbzY6+F+R1vLJLenBIZSjg53iFOLcbxqbS+9AmbSfuGr+EPxuZa H2kge9NYZ7bFrHF70Yw== X-Proofpoint-Spam-Info: AW1haW4tMjYwODA2MDExNCBTYWx0ZWRfX4O56moRl0fa2 2y82qmhqYTt73jzqySfoJxmu1diG8dnzXwo/XLn5b0l3QHWcQUfrlPQb6+vMnsy8Kg7L9zvUuYo ccsAt/e/m4wKaHtlxHclPQXZA1GAotY= X-Proofpoint-GUID: 7VWl_upN_FER32VOheGuTbdswonPLg8P 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 bulkscore=0 impostorscore=0 priorityscore=1501 phishscore=0 adultscore=0 malwarescore=0 lowpriorityscore=0 spamscore=0 suspectscore=0 clxscore=1015 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