| Message ID | 20200513204111.1.I68404fc395a3dbc57c8a89ca02490013e8003a87@changeid (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Marcel Holtmann |
| Headers | show |
| Series | Bluetooth: hci_qca: Enable WBS support for wcn3991 | expand |
Hi Abhishek, On Wed, May 13, 2020 at 08:41:25PM -0700, Abhishek Pandit-Subedi wrote: > WCN3991 supports transparent WBS (host encoded mSBC). Add a flag to the > device match data to show WBS is supported. In general this looks good to me, a few nits inside. > This requires the matching firmware for WCN3991 in linux-firmware: > 1a8b0dc00f77 (qca: Enable transparent WBS for WCN3991) > > Signed-off-by: Abhishek Pandit-Subedi <abhishekpandit@chromium.org> > --- > > drivers/bluetooth/hci_qca.c | 23 +++++++++++++++++------ > 1 file changed, 17 insertions(+), 6 deletions(-) > > diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c > index b3fd07a6f8127..305976c4dcf42 100644 > --- a/drivers/bluetooth/hci_qca.c > +++ b/drivers/bluetooth/hci_qca.c > @@ -75,6 +75,9 @@ enum qca_flags { > QCA_HW_ERROR_EVENT > }; > > +enum qca_driver_flags { > + QCA_DRV_WIDEBAND_SPEECH_SUPPORTED = 0x1, s/0x1/BIT(0)/ > +}; The 'driver'/'DRV' midfix is a bit misleading. WBS support is a device capability, it's not something the driver supports or doesn't. Maybe name it 'qca_capabilities' or similar. > /* HCI_IBS transmit side sleep protocol states */ > enum tx_ibs_states { > @@ -187,10 +190,11 @@ struct qca_vreg { > unsigned int load_uA; > }; > > -struct qca_vreg_data { > +struct qca_device_data { > enum qca_btsoc_type soc_type; > struct qca_vreg *vregs; > size_t num_vregs; > + uint32_t flags; capabilities?
Hi, On Thu, May 14, 2020 at 9:30 AM Matthias Kaehlcke <mka@chromium.org> wrote: > > Hi Abhishek, > > On Wed, May 13, 2020 at 08:41:25PM -0700, Abhishek Pandit-Subedi wrote: > > WCN3991 supports transparent WBS (host encoded mSBC). Add a flag to the > > device match data to show WBS is supported. > > In general this looks good to me, a few nits inside. > > > This requires the matching firmware for WCN3991 in linux-firmware: > > 1a8b0dc00f77 (qca: Enable transparent WBS for WCN3991) > > > > Signed-off-by: Abhishek Pandit-Subedi <abhishekpandit@chromium.org> > > --- > > > > drivers/bluetooth/hci_qca.c | 23 +++++++++++++++++------ > > 1 file changed, 17 insertions(+), 6 deletions(-) > > > > diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c > > index b3fd07a6f8127..305976c4dcf42 100644 > > --- a/drivers/bluetooth/hci_qca.c > > +++ b/drivers/bluetooth/hci_qca.c > > @@ -75,6 +75,9 @@ enum qca_flags { > > QCA_HW_ERROR_EVENT > > }; > > > > +enum qca_driver_flags { > > + QCA_DRV_WIDEBAND_SPEECH_SUPPORTED = 0x1, > > s/0x1/BIT(0)/ Will change in next version. > > > +}; > > The 'driver'/'DRV' midfix is a bit misleading. WBS support is a device > capability, it's not something the driver supports or doesn't. Maybe > name it 'qca_capabilities' or similar. > > > /* HCI_IBS transmit side sleep protocol states */ > > enum tx_ibs_states { > > @@ -187,10 +190,11 @@ struct qca_vreg { > > unsigned int load_uA; > > }; > > > > -struct qca_vreg_data { > > +struct qca_device_data { > > enum qca_btsoc_type soc_type; > > struct qca_vreg *vregs; > > size_t num_vregs; > > + uint32_t flags; > > capabilities? Capabilities sounds good to me. Thanks for the feedback. Abhishek
diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c index b3fd07a6f8127..305976c4dcf42 100644 --- a/drivers/bluetooth/hci_qca.c +++ b/drivers/bluetooth/hci_qca.c @@ -75,6 +75,9 @@ enum qca_flags { QCA_HW_ERROR_EVENT }; +enum qca_driver_flags { + QCA_DRV_WIDEBAND_SPEECH_SUPPORTED = 0x1, +}; /* HCI_IBS transmit side sleep protocol states */ enum tx_ibs_states { @@ -187,10 +190,11 @@ struct qca_vreg { unsigned int load_uA; }; -struct qca_vreg_data { +struct qca_device_data { enum qca_btsoc_type soc_type; struct qca_vreg *vregs; size_t num_vregs; + uint32_t flags; }; /* @@ -1691,7 +1695,7 @@ static const struct hci_uart_proto qca_proto = { .dequeue = qca_dequeue, }; -static const struct qca_vreg_data qca_soc_data_wcn3990 = { +static const struct qca_device_data qca_soc_data_wcn3990 = { .soc_type = QCA_WCN3990, .vregs = (struct qca_vreg []) { { "vddio", 15000 }, @@ -1702,7 +1706,7 @@ static const struct qca_vreg_data qca_soc_data_wcn3990 = { .num_vregs = 4, }; -static const struct qca_vreg_data qca_soc_data_wcn3991 = { +static const struct qca_device_data qca_soc_data_wcn3991 = { .soc_type = QCA_WCN3991, .vregs = (struct qca_vreg []) { { "vddio", 15000 }, @@ -1711,9 +1715,10 @@ static const struct qca_vreg_data qca_soc_data_wcn3991 = { { "vddch0", 450000 }, }, .num_vregs = 4, + .flags = QCA_DRV_WIDEBAND_SPEECH_SUPPORTED, }; -static const struct qca_vreg_data qca_soc_data_wcn3998 = { +static const struct qca_device_data qca_soc_data_wcn3998 = { .soc_type = QCA_WCN3998, .vregs = (struct qca_vreg []) { { "vddio", 10000 }, @@ -1724,7 +1729,7 @@ static const struct qca_vreg_data qca_soc_data_wcn3998 = { .num_vregs = 4, }; -static const struct qca_vreg_data qca_soc_data_qca6390 = { +static const struct qca_device_data qca_soc_data_qca6390 = { .soc_type = QCA_QCA6390, .num_vregs = 0, }; @@ -1860,7 +1865,7 @@ static int qca_serdev_probe(struct serdev_device *serdev) { struct qca_serdev *qcadev; struct hci_dev *hdev; - const struct qca_vreg_data *data; + const struct qca_device_data *data; int err; bool power_ctrl_enabled = true; @@ -1948,6 +1953,12 @@ static int qca_serdev_probe(struct serdev_device *serdev) hdev->shutdown = qca_power_off; } + /* Wideband speech support must be set per driver since it can't be + * queried via hci. + */ + if (data && (data->flags & QCA_DRV_WIDEBAND_SPEECH_SUPPORTED)) + set_bit(HCI_QUIRK_WIDEBAND_SPEECH_SUPPORTED, &hdev->quirks); + return 0; }
WCN3991 supports transparent WBS (host encoded mSBC). Add a flag to the device match data to show WBS is supported. This requires the matching firmware for WCN3991 in linux-firmware: 1a8b0dc00f77 (qca: Enable transparent WBS for WCN3991) Signed-off-by: Abhishek Pandit-Subedi <abhishekpandit@chromium.org> --- drivers/bluetooth/hci_qca.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-)