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 6513B352F85 for ; Mon, 8 Jun 2026 10:51:01 +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=1780915863; cv=none; b=BjXFjBYi9yjWBE1lLYDdrSWA3TM6kR9ijkS9aPJ+smRorhtw2/cICohrvnCForIQeqkaEQyNYvLSXjD112xRLzTFIZTkdod0azD/sCOECW7eou3EZfZuEA8K5rkUwqf8UQ9Pji6bi1otAHDiznQjHiP1L7naiGWADpje3adbbuU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780915863; c=relaxed/simple; bh=bf+fGbp3y5sGKr3yiqtRUsXOaqQPcivjwUqgTaaStbM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=DFEiUtB+pPM3oKGG93ExFNQjrXPSiNyCb95Dde0KhCbOQpVlDyHeWg/ubUpZrg69DNCRHC9QMC93IvZH1luRHa/Bo0G2tao7yYAZKght4cOkBCbuDOHj9VMvuVVGHjX8HES49f4ihqnT5kEFA/GyJ4rEPMMgjBJsXPUE/PxYcEc= 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=oSQbd58T; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=Cd3eMqiS; 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="oSQbd58T"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="Cd3eMqiS" Received: from pps.filterd (m0279862.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 65892KWh2677806 for ; Mon, 8 Jun 2026 10:51:01 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= qrd8MOMRQbi5cop8RgeayKocEI5pMrJ+hTvcAwk0fUw=; b=oSQbd58TS3J4fPkh D8NBgfSqRE4G0ju5YPyk+rMa9ZL50PhSoGPPrFDDTcZhYBJDZEHkCnYuwgTMaYL4 pjyrt9NcmgY7izp4qSZiL96gHSu/39EgZVUcTY/mQ7dtlF994wYMaBgULVGyyINL cST6PqqkX56lHDjQ29ZOstQ64nLHTtjSDmkf0UUjxxcK00WQaVUKDXf3StdVFNM7 lqfpuRjiaPZ111Q1iRkcG8e0jN/7YtRnHTTmVU6M3l7EEEzzUzYBChpcrjshQPMX xA/Lop3FruBRkStXGV4C35JvHQ8SjJFhR2ncI8PEpNUVvo1dhNXaToiaV+CDYVpT UGb2kQ== Received: from mail-qt1-f198.google.com (mail-qt1-f198.google.com [209.85.160.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4entrkrff4-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 08 Jun 2026 10:51:00 +0000 (GMT) Received: by mail-qt1-f198.google.com with SMTP id d75a77b69052e-5177f07ea82so105957951cf.3 for ; Mon, 08 Jun 2026 03:51:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1780915860; x=1781520660; 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=qrd8MOMRQbi5cop8RgeayKocEI5pMrJ+hTvcAwk0fUw=; b=Cd3eMqiSdB+j+xd0Nxj5EnZKXfL1RuP11PxjMymYdCo6qtcgPXV4P7x12Kq2lo8KY0 1IVA+IW7jlw1NwvzwwzFASm7HsUzcTAe1oDxxB6wBha9GV2uxyXebNZo3oAPwbzXMPhT esKw3ayrDKf958vGUbNEyT+ZmvUHR5FpE20kH/bS5hnmcd+C23eQauHyc/+ZcCJ98e02 EYpcseaE8zeWVJhDFJDEG6S+Hv06GiiquAxEgh37z84SLLVr88yg/a0lyfQmImpK2YMP qT5mOJAsuN3UULKbVnzMvXszTqHyn2j+CM+NqkSknT8Bt1AQvhbiPnpNLPGSEdSmQFLs N++g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780915860; x=1781520660; 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=qrd8MOMRQbi5cop8RgeayKocEI5pMrJ+hTvcAwk0fUw=; b=eFBtWGSAXBI64dYTOkDT6SDY6IIYrILL3LlzDh23iaTrIKQrLPxV+hA9v9KJkKx25p ysjT74qTWU/Ucp98z2gP84CkQU41xG8MszzGArmfY9/gDiftkZ7Ww8tzdHV23Is4FZZ0 bsMJUTiaMCLHFrYYDz0YKZ3dXvZPuaQPZ78SkoIXE3tyaQ+8w3Z27meweF/CK2UF7T0L 3MO2RL9UxxnAie3ZPD9JL05W5SinDJDc/AFgGnMBEqZ8nra6i7OXysOohXosscqtOzdO xcAb69SYRWmIeAWvhdJ/SXNqApDS0iVRbY5uPsCYWye/vW+YS6bav1fkMHLv6CvcKspn GpgQ== X-Forwarded-Encrypted: i=1; AFNElJ8a/1KN1S+0dbtCz2W5wxS1RE8TrDJSbtNVHTIgD9StZAXs/GzTaql3XlchyfS7VnpmsmHwvT98mYHLgjI=@vger.kernel.org X-Gm-Message-State: AOJu0YyXgLrgXFUzWR1ksoYAEHHaNToBH3I9zQHXlrBTZC6WpHNl3Yc/ MNQAgH9YEvvqHQAOjqRiQqZbykqN5Z6L/nN8K1BzHjPB/YFqqpPHIr0PmoG7lzPXf3JqlA/eyPe fSo/gdzFKo21OXNC3K5L1Dt3FuzR/ypA984mTzfPbTf99ds0u8reuPZKYo9Ac+qgEOwk= X-Gm-Gg: Acq92OG4iIYxMV4uGOvrMLQS87r97jUUyTXevbAHK9ok+d4gkayGB64MIM2k8lAwjGk Hg+DsK9QkeqT1bVd2W/P/VBTFpTuvhWqKvt7p5Xi/UfeGKRPgTKn7dnTHXSSKeXkp/eTnsQzkmO GJDM4X1TQDqybmG7eOb9kK5taayAJiNYppnp5fKbqgu6c9QbnJWHxkxEu+w3MxImOPaYDkPonv4 282a0hAWre7hu2ako9FnAdUCQfzUC97qWLVxTJSZuukeUl7eBGGr9pjDZfcdxwg7Frto0dkvCxI 1T/Tudk5Ex6vnR6W0qI+oNGvM/E/mwDgjTQeUVR71EbGzOleu1nXlodsD8ozFWV0H9GmWNDO8fk xJUtgXECkqIkS63vpacD/s1NlhFbSfwiOolFKZaGdUncKzYZX6qGJnYBKvggZhfTJMkZ5IN31a7 6nNqQoDkyATOjBtOjsiZhbV5d4NyIY/qAjYp7aBk8kH/02MGN8J9mBnhe1irblHVn25DeqJSmQq 7c2fXnhFzwn X-Received: by 2002:a05:622a:514:b0:50f:6415:1eb4 with SMTP id d75a77b69052e-51795bbf29bmr200722561cf.49.1780915859596; Mon, 08 Jun 2026 03:50:59 -0700 (PDT) X-Received: by 2002:a05:622a:514:b0:50f:6415:1eb4 with SMTP id d75a77b69052e-51795bbf29bmr200721871cf.49.1780915859023; Mon, 08 Jun 2026 03:50:59 -0700 (PDT) Received: from QCOM-eG0v1AUPpu.na.qualcomm.com ([2a01:e0a:830:450:cc96:22ae:323b:9eff]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-bf051e9aa33sm850399866b.24.2026.06.08.03.50.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Jun 2026 03:50:58 -0700 (PDT) From: Loic Poulain Date: Mon, 08 Jun 2026 12:50:44 +0200 Subject: [PATCH v3 7/7] Bluetooth: qca: Set NVMEM BD address quirks when address is invalid 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: <20260608-block-as-nvmem-v3-7-82681f50aa35@oss.qualcomm.com> References: <20260608-block-as-nvmem-v3-0-82681f50aa35@oss.qualcomm.com> In-Reply-To: <20260608-block-as-nvmem-v3-0-82681f50aa35@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 , Bartosz Golaszewski X-Mailer: b4 0.14.2 X-Proofpoint-ORIG-GUID: K3qEp4iCn6-wwUMKE_VP7j2h0dNXyFSD X-Authority-Analysis: v=2.4 cv=Z+3c2nRA c=1 sm=1 tr=0 ts=6a269e94 cx=c_pps a=mPf7EqFMSY9/WdsSgAYMbA==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=FelO9ux0wxsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=_K5XuSEh1TEqbUxoQ0s3:22 a=EUspDBNiAAAA:8 a=lrwsl_vcuUQb-XtIoRIA:9 a=QEXdDO2ut3YA:10 a=dawVfQjAaf238kedN5IG:22 X-Proofpoint-GUID: K3qEp4iCn6-wwUMKE_VP7j2h0dNXyFSD X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjA4MDEwMSBTYWx0ZWRfX+6H1qZE2f1rE nq+dJHPOYEc4xVUpaGqo0cSjFCfXDrTl2+16OiqRYRhe7DdOCXWWROEGq3GJWEUJ1DXhotZSNeu nXDY1Iag9HR7BRSuusN7Z5J/STUmSh44mi8zXZiClxwXadaNZab6pY2PEZ38Z9PL2476yunrNk8 LNKFPk9VVeTyV/qK9N1fJ2yxUTXNIYRImFM/v9nJ/tMB3lEacKMFZxOQ7vxXhcQk5bFrNBMGRt1 Mo4clALsx9ClPenuo/zM1l5C/m6MLoP8dpTd9E8M9tESdwXnmQibYvfDySH0Mebw/g2wCiANiMC aplINGjA87nMru/tFVGFC/gxql+dCn/xrCeTtgO5XCPKRm/9XSfjqCE//We+tYp5JgIQJFFfO6N NgHSENv1zoetDdgIR/kZjWudJGxlnBI03kntylfEWwSq1O0XrzxeihO4+xot/abzjBgqdfkO78H mFryPI4aSeQg52j7dvw== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.125,FMLib:17.12.100.49 definitions=2026-06-08_02,2026-06-05_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 bulkscore=0 malwarescore=0 suspectscore=0 clxscore=1015 adultscore=0 priorityscore=1501 spamscore=0 impostorscore=0 lowpriorityscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605210000 definitions=main-2606080101 When the controller BD address is invalid (zero or default), set the NVMEM quirks to allow retrieving the address from a 'local-bd-address' NVMEM cell. The BD address is often stored alongside the WiFi MAC address in big-endian format, so also set the big-endian quirk. Reviewed-by: Bartosz Golaszewski Signed-off-by: Loic Poulain --- arch/arm64/boot/dts/qcom/qrb2210-arduino-imola.dts | 39 ++++++++++++++++++++++ drivers/bluetooth/btqca.c | 5 ++- 2 files changed, 43 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/qcom/qrb2210-arduino-imola.dts b/arch/arm64/boot/dts/qcom/qrb2210-arduino-imola.dts index bf088fa9807f040f0c8f405f9111b01790b09377..128c7a7e76b5b089044745f5d6407d6391055fc2 100644 --- a/arch/arm64/boot/dts/qcom/qrb2210-arduino-imola.dts +++ b/arch/arm64/boot/dts/qcom/qrb2210-arduino-imola.dts @@ -409,7 +409,40 @@ &sdhc_1 { no-sdio; no-sd; + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; + + card@0 { + compatible = "mmc-card"; + reg = <0>; + + partitions-boot1 { + compatible = "fixed-partitions"; + + #address-cells = <1>; + #size-cells = <1>; + + nvmem-layout { + compatible = "fixed-layout"; + #address-cells = <1>; + #size-cells = <1>; + + wifi_mac_addr: mac-addr@4400 { + compatible = "mac-base"; + reg = <0x4400 0x6>; + #nvmem-cell-cells = <1>; + }; + + bd_addr: bd-addr@5400 { + compatible = "mac-base"; + reg = <0x5400 0x6>; + #nvmem-cell-cells = <1>; + }; + }; + }; + }; }; &spi5 { @@ -512,6 +545,9 @@ bluetooth { vddch0-supply = <&pm4125_l22>; enable-gpios = <&tlmm 87 GPIO_ACTIVE_HIGH>; max-speed = <3000000>; + + nvmem-cells = <&bd_addr 0>; + nvmem-cell-names = "local-bd-address"; }; }; @@ -557,6 +593,9 @@ &wifi { qcom,ath10k-calibration-variant = "ArduinoImola"; firmware-name = "qcm2290"; + nvmem-cells = <&wifi_mac_addr 0>; + nvmem-cell-names = "mac-address"; + status = "okay"; }; diff --git a/drivers/bluetooth/btqca.c b/drivers/bluetooth/btqca.c index dda76365726f0bfe0e80e05fe04859fa4f0592e1..df33eacfd29fa680f393f90215150743e6001d5b 100644 --- a/drivers/bluetooth/btqca.c +++ b/drivers/bluetooth/btqca.c @@ -721,8 +721,11 @@ static int qca_check_bdaddr(struct hci_dev *hdev, const struct qca_fw_config *co } bda = (struct hci_rp_read_bd_addr *)skb->data; - if (!bacmp(&bda->bdaddr, &config->bdaddr)) + if (!bacmp(&bda->bdaddr, &config->bdaddr)) { hci_set_quirk(hdev, HCI_QUIRK_USE_BDADDR_PROPERTY); + hci_set_quirk(hdev, HCI_QUIRK_USE_BDADDR_NVMEM); + hci_set_quirk(hdev, HCI_QUIRK_BDADDR_NVMEM_BE); + } kfree_skb(skb); -- 2.34.1