Bluetooth: hci_qca: Refactor HFP hardware offload capability handling

Replace SoC-specific check with capability-based approach for HFP
hardware offload configuration. Add QCA_CAP_HFP_HW_OFFLOAD capability
flag and support_hfp_hw_offload field to qca_serdev structure. Add
QCA_CAP_HFP_HW_OFFLOAD capability flag to QCA2066 device data
structures.

Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Signed-off-by: Mengshi Wu <mengshi.wu@oss.qualcomm.com>
Acked-by: Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c
index a3c217571c3c45fe614755687bc8a87977f35da4..7cd4c1078fa9fa79ec59ab910dd64dae89561014 100644 (file)
--- a/drivers/bluetooth/hci_qca.c
+++ b/drivers/bluetooth/hci_qca.c
@@ -87,6 +87,7 @@ enum qca_flags {
 enum qca_capabilities {
        QCA_CAP_WIDEBAND_SPEECH = BIT(0),
        QCA_CAP_VALID_LE_STATES = BIT(1),
+       QCA_CAP_HFP_HW_OFFLOAD  = BIT(2),
 };
 
 /* HCI_IBS transmit side sleep protocol states */
@@ -229,6 +230,7 @@ struct qca_serdev {
        u32 init_speed;
        u32 oper_speed;
        bool bdaddr_property_broken;
+       bool support_hfp_hw_offload;
        const char *firmware_name[2];
 };
 
@@ -1912,7 +1914,7 @@ static int qca_setup(struct hci_uart *hu)
        const char *rampatch_name = qca_get_rampatch_name(hu);
        int ret;
        struct qca_btsoc_version ver;
-       struct qca_serdev *qcadev;
+       struct qca_serdev *qcadev = serdev_device_get_drvdata(hu->serdev);
        const char *soc_name;
 
        ret = qca_check_speeds(hu);
@@ -1976,7 +1978,6 @@ retry:
        case QCA_WCN6750:
        case QCA_WCN6855:
        case QCA_WCN7850:
-               qcadev = serdev_device_get_drvdata(hu->serdev);
                if (qcadev->bdaddr_property_broken)
                        hci_set_quirk(hdev, HCI_QUIRK_BDADDR_PROPERTY_BROKEN);
 
@@ -2066,7 +2067,7 @@ out:
        else
                hu->hdev->set_bdaddr = qca_set_bdaddr;
 
-       if (soc_type == QCA_QCA2066)
+       if (qcadev->support_hfp_hw_offload)
                qca_configure_hfp_offload(hdev);
 
        qca->fw_version = le16_to_cpu(ver.patch_ver);
@@ -2150,7 +2151,8 @@ static const struct qca_device_data qca_soc_data_wcn3998 __maybe_unused = {
 static const struct qca_device_data qca_soc_data_qca2066 __maybe_unused = {
        .soc_type = QCA_QCA2066,
        .num_vregs = 0,
-       .capabilities = QCA_CAP_WIDEBAND_SPEECH | QCA_CAP_VALID_LE_STATES,
+       .capabilities = QCA_CAP_WIDEBAND_SPEECH | QCA_CAP_VALID_LE_STATES |
+                       QCA_CAP_HFP_HW_OFFLOAD,
 };
 
 static const struct qca_device_data qca_soc_data_qca6390 __maybe_unused = {
@@ -2535,6 +2537,9 @@ static int qca_serdev_probe(struct serdev_device *serdev)
 
                if (!(data->capabilities & QCA_CAP_VALID_LE_STATES))
                        hci_set_quirk(hdev, HCI_QUIRK_BROKEN_LE_STATES);
+
+               if (data->capabilities & QCA_CAP_HFP_HW_OFFLOAD)
+                       qcadev->support_hfp_hw_offload = true;
        }
 
        return 0;