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 385E0353888 for ; Tue, 18 Nov 2025 13:45:05 +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=1763473507; cv=none; b=mwY152HyIjtECzfiLr49pHG6Ce5MUahu0rmI9J2PWWvsMdcr71SeLcLmCthT1SkH0cIc91QbBuWEO55wjn5Y3iUxNZCKaJrfRD10wwJL42MUD8iHPRushss52x7LzqmhwGr+Y6sIoSwEluwFUVewgBb2c3lp5bQ1nTxOfi+Z5+Y= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763473507; c=relaxed/simple; bh=aClZuHcSb9Uhnv2j+qNn5O+e/8TzQ6va/JR7DCbHMQA=; h=Message-ID:Date:MIME-Version:From:Subject:To:Cc:References: In-Reply-To:Content-Type; b=L/ZdVeVmPpxX+MJJj5esC86nFD+VOo6ARwHOEdTvtmBqS0xBYZxF5N18h7rkybaQLIs2pt1HKShuzqIXQZ+LNdLptn3QYfv2I4/ACQF6qYB/OC+pUpl+qIOVtByD6PP0EosaGtfuJD/kklFhxYXurr2eQrkqGwEILg1zhO2nI3s= 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=WZKjXymQ; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=NTOe76Bk; 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="WZKjXymQ"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="NTOe76Bk" 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 5AIDN4Xa384608 for ; Tue, 18 Nov 2025 13:45:05 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= 03mXH2egLzCuH4ma2sa+Fb+8aa+ix6ARFLQH5PW+zhw=; b=WZKjXymQpK2hrkE1 W9FgV6Rfv2AJsNd8h0TmkNeeSeLPbeBJkCiLvyX5CN0Q2Ph1rUOque+/ElSFysdR X5CmxFqnwCLjkvaMZaET3rjkWx1c+0bPFU37Jk3T/pMivPEcaCaKTaXYN2BPz7aU eYd/fzbt6UGlRJAW618FZ2dj13C322PUfmQzEvG46p0Oiy+I34kge0/sHCA7uAeB +IzorHNAaJXR2pPHHwRMfA2B/yrtikAZ+VCx0CxdufYdazKW0Y6dLQBRSeZ8PZpc 9nCgJJuHNops+PmOaQh2IzdFe/IKK1V8OAUqZf3omiTPuvEhzt9HQVM5CtPoPCiT 2a5C1Q== Received: from mail-pj1-f69.google.com (mail-pj1-f69.google.com [209.85.216.69]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4agag8jmaa-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 18 Nov 2025 13:45:05 +0000 (GMT) Received: by mail-pj1-f69.google.com with SMTP id 98e67ed59e1d1-343d73e159aso12242736a91.3 for ; Tue, 18 Nov 2025 05:45:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1763473505; x=1764078305; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:content-language:references :cc:to:subject:from:user-agent:mime-version:date:message-id:from:to :cc:subject:date:message-id:reply-to; bh=03mXH2egLzCuH4ma2sa+Fb+8aa+ix6ARFLQH5PW+zhw=; b=NTOe76BkATuxw1wcupHIJEAJVnnM6li++WV18eBy3qorOcmbtuvDh9VYlYOqZ8zg2c HvgM9XbjR+dfdQf9MkhAgDPMxTeXHAb4jlRyWOHwI93qez7Eol7f6JL0EsHqpE535lN3 3gMXYXgZ1Tdm+E5Re2LQVY2vzFrDXIxN2UYD7M+OJmz2VCK9TMqy51KG8fYNUBVPAtXU KZNyNDBLMas8UrE/W1bYRfpiw8KETA/exYIlsHMGGzpwLP3INmCtb0AwNh0S/TpOS563 YXvJ1e/ZHckP0DkNlHdPTXAFSDzUxJxDdQ7ULOGAybv+ZtlJlG5/iAawD1Jm61bME3Si ZBAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763473505; x=1764078305; h=content-transfer-encoding:in-reply-to:content-language:references :cc:to:subject:from:user-agent:mime-version:date:message-id:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=03mXH2egLzCuH4ma2sa+Fb+8aa+ix6ARFLQH5PW+zhw=; b=vF6un/G5lF5mPh1jbvO9P6Qdr30cjEoFm9foxRYKiG7EkR/Ez5hziVO22HjV9I2Pnu DpKHvuGQN15Q9ztVfQhs+3X+GnR9xgfJTkm75/WABbRtukQfHNF8BslJhaiW8A9bPmQj ok7hccC64Rc2KeEcmfR2TeY18JN8XxJcJioRTOigPUhpwyxHCCDVaqAxCzjnSxpuEPTP 4iYI6kXeTJzB6ng3Bm4Leamy6XSHOwrBF2KvN6lQb1tdgeqLIlmB5e3Un+O+6eCrSQow 0ohKYJ4ha3rBPek1j2FGJ/eCZB0Nd8rSTc3wDm3X4bovZrpKFG3AS/UBpIIb5wocLwET w34A== X-Forwarded-Encrypted: i=1; AJvYcCUb0dlhqdq9+8fZR+9/rAOHcO8X9iIav2lWrhmDG3ZQDz5WqMRN/b9XOMsLrVsE5SweED8Sj7Gj+kJcZT0=@vger.kernel.org X-Gm-Message-State: AOJu0Ywxh87Pur4tIWtkoMBCi5jceBofYtGH39ow2e2JKgm5SI5FSKdQ RSiYZZAKxPUHBxz3d1IwZVk3KOdkAnj0J6HdLuqNQ8QZwXmp2mPLBwyn77l3g7GZQPDDBIUiE6d lBIIcB4ehUCjr2XSnUxuWxI8h3Dmt5onblnORcpXpVyvwY586nBooUoqMM9mTkbaOV/k= X-Gm-Gg: ASbGnctj9E49j4kUUACWVqDR7ZN11iAza7Fuj1OChTypEzUsb1ADEZ2jxvf8haknIrQ YLD3U32r54g3p0pTB8T3LTlkXmYZ/rWy3DUlLF1MIz5gK+p4nphBVrHmyDksDHAVt3g7acrQLwE nHVA6O51agDzFhCMJ0KfoAJGWKqxBH/maurS5y1rH8qpbAIZ1wm4KXHX255c0g33Xbm4wDHAT9D YcavaZgOlHRzD/ULN9xHSlMpPxVdugwosyM5k4NF/DpFkMC9nNNYGUPD9qfrzxZt+Uk7wAWY2tU LyUovacObMy/MhirFRj7bfk7LPEsEUwqN0o5GKbIgjgB+2soEJQWG+PFpo7uwhHDwEFVkoVUf2w zOzcWJe0EeMd+44lQ+0vNwVsn86LzK9P8hCqrfCJcOppO6CrxARfZYcCptD/rvkAxpA== X-Received: by 2002:a17:90b:1dc9:b0:330:84c8:92d0 with SMTP id 98e67ed59e1d1-343fa52bd92mr18759456a91.24.1763473504783; Tue, 18 Nov 2025 05:45:04 -0800 (PST) X-Google-Smtp-Source: AGHT+IHqJn4PqsJV/rc1vAoylUumkDkSJ61qLBRTKe/MRB06FrArotHhlndxnoK/QPxamBdfEmWSrA== X-Received: by 2002:a17:90b:1dc9:b0:330:84c8:92d0 with SMTP id 98e67ed59e1d1-343fa52bd92mr18759427a91.24.1763473504295; Tue, 18 Nov 2025 05:45:04 -0800 (PST) Received: from [10.110.92.187] (i-global254.qualcomm.com. [199.106.103.254]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3456513d0b4sm13133199a91.5.2025.11.18.05.45.01 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 18 Nov 2025 05:45:03 -0800 (PST) Message-ID: <76edfe9c-1302-4e63-8bcd-ee7dd55a128d@oss.qualcomm.com> Date: Tue, 18 Nov 2025 21:44:57 +0800 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird From: Shuai Zhang Subject: Re: [PATCH v3 1/1] Bluetooth: btqca: Add WCN6855 firmware priority selection feature To: Bartosz Golaszewski , Marcel Holtmann , Luiz Augusto von Dentz Cc: linux-arm-msm@vger.kernel.org, linux-bluetooth@vger.kernel.org, linux-kernel@vger.kernel.org, cheng.jiang@oss.qualcomm.com, quic_chezhou@quicinc.com, wei.deng@oss.qualcomm.com References: <20251117021645.712753-1-shuai.zhang@oss.qualcomm.com> <20251117021645.712753-2-shuai.zhang@oss.qualcomm.com> Content-Language: en-US In-Reply-To: <20251117021645.712753-2-shuai.zhang@oss.qualcomm.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Proofpoint-GUID: 7Av6qNkqHT61p04WYczV2JkqeHaFKs7Y X-Proofpoint-ORIG-GUID: 7Av6qNkqHT61p04WYczV2JkqeHaFKs7Y X-Authority-Analysis: v=2.4 cv=G6sR0tk5 c=1 sm=1 tr=0 ts=691c7861 cx=c_pps a=vVfyC5vLCtgYJKYeQD43oA==:117 a=JYp8KDb2vCoCEuGobkYCKw==:17 a=IkcTkHD0fZMA:10 a=6UeiqGixMTsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=EUspDBNiAAAA:8 a=UPmepWTotxaAIdI3lfQA:9 a=QEXdDO2ut3YA:10 a=rl5im9kqc5Lf4LNbBjHf:22 a=HhbK4dLum7pmb74im6QT:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMTE4MDExMCBTYWx0ZWRfXy7eAmtd4ZiV1 lYzN4QK/9KeU3NaEyevCgy8VZIF/bzZpX8QgkoiRUj3rQ2IWeBvFVAvB5A/2cSzL2V4407bYI5/ ksmCwWp5u7gUGtLa0Sb5Ofd7hG2Kp7B4YV7K5G42jYmPaYjHghHeolEBK5HtPBSgBiJRsgdnr32 ccj/doiwWqdqxzTclC6jAZU8+3D5Spp1Ri32LT6i4qmj9LME35iSxttgWlMzhm/yDbaVZM8utq/ QBj2oqakyRgAHQM84ogsArwEVDN5lhhbKbOm7QF6JPU75ZdXYdOjV0OE6ZjZi+KZ75I2ZmyOkn8 jgbQymtMhFjjtUhSJ5fwLmwWbvuAjDUsfiV5Vms6M1HnIMID2ufEHB05cNvDKBoOTm/pJSycQWb 1vcikPasT6zfxaQdjIOm0mp2Erj0VA== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.100.49 definitions=2025-11-17_04,2025-11-18_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 phishscore=0 impostorscore=0 lowpriorityscore=0 clxscore=1015 bulkscore=0 malwarescore=0 adultscore=0 spamscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2510240001 definitions=main-2511180110 Dear On 11/17/2025 10:16 AM, Shuai Zhang wrote: > Historically, WCN685x and QCA2066 shared the same firmware files. > Now, changes are planned for the firmware that will make it incompatible > with QCA2066, so a new firmware name is required for WCN685x. > > Test Steps: > - Boot device > - Check the BTFW loading status via dmesg > > Sanity pass and Test Log: > QCA Downloading qca/wcnhpbftfw21.tlv > Direct firmware load for qca/wcnhpbftfw21.tlv failed with error -2 > QCA Downloading qca/hpbftfw21.tlv > > Signed-off-by: Shuai Zhang > --- > drivers/bluetooth/btqca.c | 22 ++++++++++++++++++++-- > 1 file changed, 20 insertions(+), 2 deletions(-) > > diff --git a/drivers/bluetooth/btqca.c b/drivers/bluetooth/btqca.c > index 7c958d606..8e0004ef7 100644 > --- a/drivers/bluetooth/btqca.c > +++ b/drivers/bluetooth/btqca.c > @@ -847,8 +847,12 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate, > "qca/msbtfw%02x.mbn", rom_ver); > break; > case QCA_WCN6855: > + /* Due to historical reasons, WCN685x chip has been using firmware > + * without the "wcn" prefix. The mapping between the chip and its > + * corresponding firmware has now been corrected. > + */ > snprintf(config.fwname, sizeof(config.fwname), > - "qca/hpbtfw%02x.tlv", rom_ver); > + "qca/wcnhpbtfw%02x.tlv", rom_ver); > break; > case QCA_WCN7850: > snprintf(config.fwname, sizeof(config.fwname), > @@ -861,6 +865,13 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate, > } > > err = qca_download_firmware(hdev, &config, soc_type, rom_ver); > + > + if (!rampatch_name && err < 0 && soc_type == QCA_WCN6855) { > + snprintf(config.fwname, sizeof(config.fwname), > + "qca/hpbtfw%02x.tlv", rom_ver); > + err = qca_download_firmware(hdev, &config, soc_type, rom_ver); > + } > + > if (err < 0) { > bt_dev_err(hdev, "QCA Failed to download patch (%d)", err); > return err; > @@ -923,7 +934,7 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate, > case QCA_WCN6855: > qca_read_fw_board_id(hdev, &boardid); > qca_get_nvm_name_by_board(config.fwname, sizeof(config.fwname), > - "hpnv", soc_type, ver, rom_ver, boardid); > + "wcnhpnv", soc_type, ver, rom_ver, boardid); > break; > case QCA_WCN7850: > qca_get_nvm_name_by_board(config.fwname, sizeof(config.fwname), > @@ -936,6 +947,13 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate, > } > > err = qca_download_firmware(hdev, &config, soc_type, rom_ver); > + > + if (!firmware_name && err < 0 && soc_type == QCA_WCN6855) { > + qca_get_nvm_name_by_board(config.fwname, sizeof(config.fwname), > + "hpnv", soc_type, ver, rom_ver, boardid); > + err = qca_download_firmware(hdev, &config, soc_type, rom_ver); > + } > + > if (err < 0) { > bt_dev_err(hdev, "QCA Failed to download NVM (%d)", err); > return err; Could you confirm if it has already been accepted? Kindly,regard Shuai