| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Mon, 10 May 2021 22:46:01 +0530
From: gubbaven@...eaurora.org
To: Marcel Holtmann <marcel@...tmann.org>
Cc: Johan Hedberg <johan.hedberg@...il.com>,
devicetree@...r.kernel.org, mka@...omium.org,
linux-kernel@...r.kernel.org, linux-bluetooth@...r.kernel.org,
hemantg@...eaurora.org, linux-arm-msm@...r.kernel.org,
bgodavar@...eaurora.org, rjliao@...eaurora.org,
hbandi@...eaurora.org, abhishekpandit@...omium.org
Subject: Re: [PATCH v3 2/5] Bluetooth: btqca: Add support for firmware image
with mbn type for WCN6750
Hi Marcel,
On 2021-05-07 12:30, Marcel Holtmann wrote:
> Hi Venkata,
>
>> 1. Added support to download firmware image with mbn type for wcn6750
>> as it supports mbn type image.
>> 2. If mbn type image is not present then check for tlv type image.
>> 3. Added debug logs for mbn type image.
>>
>> Signed-off-by: Venkata Lakshmi Narayana Gubba
>> <gubbaven@...eaurora.org>
>> ---
>> drivers/bluetooth/btqca.c | 69
>> +++++++++++++++++++++++++++++++++++------------
>> drivers/bluetooth/btqca.h | 3 ++-
>> 2 files changed, 54 insertions(+), 18 deletions(-)
>>
>> diff --git a/drivers/bluetooth/btqca.c b/drivers/bluetooth/btqca.c
>> index fce808c..320c555 100644
>> --- a/drivers/bluetooth/btqca.c
>> +++ b/drivers/bluetooth/btqca.c
>> @@ -182,7 +182,8 @@ int qca_send_pre_shutdown_cmd(struct hci_dev
>> *hdev)
>> }
>> EXPORT_SYMBOL_GPL(qca_send_pre_shutdown_cmd);
>>
>> -static void qca_tlv_check_data(struct qca_fw_config *config,
>> +static void qca_tlv_check_data(struct hci_dev *hdev,
>> + struct qca_fw_config *config,
>> const struct firmware *fw, enum qca_btsoc_type soc_type)
>> {
>> const u8 *data;
>> @@ -194,19 +195,21 @@ static void qca_tlv_check_data(struct
>> qca_fw_config *config,
>> struct tlv_type_nvm *tlv_nvm;
>> uint8_t nvm_baud_rate = config->user_baud_rate;
>>
>> - tlv = (struct tlv_type_hdr *)fw->data;
>> -
>> - type_len = le32_to_cpu(tlv->type_len);
>> - length = (type_len >> 8) & 0x00ffffff;
>> -
>> - BT_DBG("TLV Type\t\t : 0x%x", type_len & 0x000000ff);
>> - BT_DBG("Length\t\t : %d bytes", length);
>> -
>> config->dnld_mode = QCA_SKIP_EVT_NONE;
>> config->dnld_type = QCA_SKIP_EVT_NONE;
>>
>> switch (config->type) {
>> + case ELF_TYPE_PATCH:
>> + config->dnld_mode = QCA_SKIP_EVT_VSE_CC;
>> + config->dnld_type = QCA_SKIP_EVT_VSE_CC;
>> +
>> + bt_dev_dbg(hdev, "File Class : 0x%x", fw->data[4]);
>> + bt_dev_dbg(hdev, "Data Encoding : 0x%x", fw->data[5]);
>> + bt_dev_dbg(hdev, "File version : 0x%x", fw->data[6]);
>> + break;
>> case TLV_TYPE_PATCH:
>> + tlv = (struct tlv_type_hdr *)fw->data;
>
> Is this casting always necessary.
>
[Venkata]:
I see that this casting is required.
>> + type_len = le32_to_cpu(tlv->type_len);
>> tlv_patch = (struct tlv_type_patch *)tlv->data;
>>
>> /* For Rome version 1.1 to 3.1, all segment commands
>> @@ -218,6 +221,7 @@ static void qca_tlv_check_data(struct
>> qca_fw_config *config,
>> config->dnld_mode = tlv_patch->download_mode;
>> config->dnld_type = config->dnld_mode;
>>
>> + BT_DBG("TLV Type\t\t : 0x%x", type_len & 0x000000ff);
>> BT_DBG("Total Length : %d bytes",
>> le32_to_cpu(tlv_patch->total_size));
>> BT_DBG("Patch Data Length : %d bytes",
>> @@ -243,6 +247,14 @@ static void qca_tlv_check_data(struct
>> qca_fw_config *config,
>> break;
>>
>> case TLV_TYPE_NVM:
>> + tlv = (struct tlv_type_hdr *)fw->data;
>> +
>> + type_len = le32_to_cpu(tlv->type_len);
>> + length = (type_len >> 8) & 0x00ffffff;
>> +
>> + BT_DBG("TLV Type\t\t : 0x%x", type_len & 0x000000ff);
>> + BT_DBG("Length\t\t : %d bytes", length);
>> +
>> idx = 0;
>> data = tlv->data;
>> while (idx < length) {
>> @@ -387,7 +399,8 @@ static int qca_inject_cmd_complete_event(struct
>> hci_dev *hdev)
>>
>> static int qca_download_firmware(struct hci_dev *hdev,
>> struct qca_fw_config *config,
>> - enum qca_btsoc_type soc_type)
>> + enum qca_btsoc_type soc_type,
>> + u8 rom_ver)
>> {
>> const struct firmware *fw;
>> const u8 *segment;
>> @@ -397,12 +410,30 @@ static int qca_download_firmware(struct hci_dev
>> *hdev,
>>
>> ret = request_firmware(&fw, config->fwname, &hdev->dev);
>> if (ret) {
>> - bt_dev_err(hdev, "QCA Failed to request file: %s (%d)",
>> - config->fwname, ret);
>> - return ret;
>> + /* For WCN6750, if mbn file is not present then check for
>> + * tlv file.
>> + */
>> + if (soc_type == QCA_WCN6750 && config->type == ELF_TYPE_PATCH) {
>> + bt_dev_dbg(hdev, "QCA Failed to request file: %s (%d)",
>> + config->fwname, ret);
>> + config->type = TLV_TYPE_PATCH;
>> + snprintf(config->fwname, sizeof(config->fwname),
>> + "qca/msbtfw%02x.tlv", rom_ver);
>> + bt_dev_info(hdev, "QCA Downloading %s", config->fwname);
>> + ret = request_firmware(&fw, config->fwname, &hdev->dev);
>> + if (ret) {
>> + bt_dev_err(hdev, "QCA Failed to request file: %s (%d)",
>> + config->fwname, ret);
>> + return ret;
>> + }
>> + } else {
>> + bt_dev_err(hdev, "QCA Failed to request file: %s (%d)",
>> + config->fwname, ret);
>> + return ret;
>> + }
>> }
>>
>> - qca_tlv_check_data(config, fw, soc_type);
>> + qca_tlv_check_data(hdev, config, fw, soc_type);
>>
>> segment = fw->data;
>> remain = fw->size;
>> @@ -520,14 +551,18 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t
>> baudrate,
>> } else if (soc_type == QCA_WCN6750) {
>> rom_ver = ((soc_ver & 0x00000f00) >> 0x04) |
>> (soc_ver & 0x0000000f);
>> + /* Choose mbn file by default.If mbn file is not found
>> + * then choose tlv file
>> + */
>> + config.type = ELF_TYPE_PATCH;
>> snprintf(config.fwname, sizeof(config.fwname),
>> - "qca/msbtfw%02x.tlv", rom_ver);
>> + "qca/msbtfw%02x.mbn", rom_ver);
>> } else {
>> snprintf(config.fwname, sizeof(config.fwname),
>> "qca/rampatch_%08x.bin", soc_ver);
>> }
>>
>> - err = qca_download_firmware(hdev, &config, soc_type);
>> + 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;
>> @@ -560,7 +595,7 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t
>> baudrate,
>> snprintf(config.fwname, sizeof(config.fwname),
>> "qca/nvm_%08x.bin", soc_ver);
>>
>> - err = qca_download_firmware(hdev, &config, soc_type);
>> + 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;
>> diff --git a/drivers/bluetooth/btqca.h b/drivers/bluetooth/btqca.h
>> index dd82d2c..5a5e699 100644
>> --- a/drivers/bluetooth/btqca.h
>> +++ b/drivers/bluetooth/btqca.h
>> @@ -80,7 +80,8 @@ enum qca_tlv_dnld_mode {
>>
>> enum qca_tlv_type {
>> TLV_TYPE_PATCH = 1,
>> - TLV_TYPE_NVM
>> + TLV_TYPE_NVM,
>> + ELF_TYPE_PATCH
>> };
>
> If you end the enum in a , then future diffs only show a single line
> of addition. So please ELF_TYPE_PATCH,.
>
[Venkata]:
Sure, I will update in next patchset.
> Regards
>
> Marcel
Regards,
Lakshmi Narayana.
Powered by blists - more mailing lists