On Wed, Jul 26, 2023 at 01:22:45PM +0800, Tim Jiang wrote:
> This patch adds support for QCA2066 firmware patch and NVM downloading.
> as the RF performance of QCA2066 SOC chip from different foundries may
> vary. Therefore we use different NVM to configure them based on board ID.
>
> Signed-off-by: Tim Jiang <quic_tjiang@xxxxxxxxxxx>
> ---
> drivers/bluetooth/btqca.c | 76 ++++++++++++++++++++++++++++++++++++-
> drivers/bluetooth/btqca.h | 3 +-
> drivers/bluetooth/hci_qca.c | 7 ++++
> 3 files changed, 83 insertions(+), 3 deletions(-)
> +static void qca_generate_nvm_name(struct hci_dev *hdev, char *fwname,
> + size_t max_size, struct qca_btsoc_version ver, u16 bid)
> +{
> + u8 rom_ver;
> + u32 soc_ver;
> + const char *variant;
> +
> + soc_ver = get_soc_ver(ver.soc_id, ver.rom_ver);
> + rom_ver = ((soc_ver & 0x00000f00) >> 0x04) | (soc_ver & 0x0000000f);
> +
> + if ((le32_to_cpu(ver.soc_id) & 0x0000ff00) == QCA_HSP_GF_SOC_ID) /* hsp gf chip */
> + variant = "g";
> + else
> + variant = "";
> +
> + if (bid == 0x0)
> + snprintf(fwname, max_size, "qca/hpnv%02x%s.bin", rom_ver, variant);
> + else
> + snprintf(fwname, max_size, "qca/hpnv%02x%s.%x", rom_ver, variant, bid);
> +
> + bt_dev_dbg(hdev, "%s: nvm name is %s", __func__, fwname);
no need for "nvme name is" if you keep __func__ as a prefix
> +}
> +
> int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate,
> enum qca_btsoc_type soc_type, struct qca_btsoc_version ver,
> const char *firmware_name)
> @@ -582,6 +645,7 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate,
> int err;
> u8 rom_ver = 0;
> u32 soc_ver;
> + u16 boardid = 0;
>
> bt_dev_dbg(hdev, "QCA setup on UART");
> diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c
> index 453000df7aec..353c775f53ef 100644
> --- a/drivers/bluetooth/hci_qca.c
> +++ b/drivers/bluetooth/hci_qca.c
> @@ -1939,6 +1939,11 @@ static const struct qca_device_data qca_soc_data_qca6390 __maybe_unused = {
> .num_vregs = 0,
> };
>
> +static const struct qca_device_data qca_soc_data_qca2066 __maybe_unused = {
> + .soc_type = QCA_QCA2066,
> + .num_vregs = 0,
> +};
Add before qca_soc_data_qca6390 to maintain some order.
> +
> static const struct qca_device_data qca_soc_data_wcn6750 __maybe_unused = {
> .soc_type = QCA_WCN6750,
> .vregs = (struct qca_vreg []) {
> @@ -2429,6 +2434,7 @@ static const struct of_device_id qca_bluetooth_of_match[] = {
> { .compatible = "qcom,wcn3998-bt", .data = &qca_soc_data_wcn3998},
> { .compatible = "qcom,wcn6750-bt", .data = &qca_soc_data_wcn6750},
> { .compatible = "qcom,wcn6855-bt", .data = &qca_soc_data_wcn6855},
> + { .compatible = "qcom,qca2066-bt", .data = &qca_soc_data_qca2066},
Keep the entries sorted by compatible.
Johan
