| Message ID | 20210926150657.v4.4.I257ac5cfaf955d15670479efc311bbab702397f4@changeid (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v4,1/4] Bluetooth: aosp: Support AOSP Bluetooth Quality Report | expand |
| Context | Check | Description |
|---|---|---|
| tedd_an/checkpatch | success | Checkpatch PASS |
| tedd_an/gitlint | success | Gitlint PASS |
Hi Joseph, > This patch enables Mediatek MT7921 to support the AOSP extension. > > Reviewed-by: Miao-chen Chou <mcchou@chromium.org> > Signed-off-by: Joseph Hwang <josephsih@chromium.org> > > --- > > Changes in v4: > - Call hci_set_aosp_capable in the driver. > - This patch is added in this Series-changes 4. > > drivers/bluetooth/btusb.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c > index da85cc14f931..de0228e2245b 100644 > --- a/drivers/bluetooth/btusb.c > +++ b/drivers/bluetooth/btusb.c > @@ -60,6 +60,7 @@ static struct usb_driver btusb_driver; > #define BTUSB_VALID_LE_STATES 0x800000 > #define BTUSB_QCA_WCN6855 0x1000000 > #define BTUSB_INTEL_BROKEN_INITIAL_NCMD 0x4000000 > +#define BTUSB_AOSP 0x8000000 > > static const struct usb_device_id btusb_table[] = { > /* Generic Bluetooth USB device */ > @@ -394,6 +395,7 @@ static const struct usb_device_id blacklist_table[] = { > /* MediaTek Bluetooth devices */ > { USB_VENDOR_AND_INTERFACE_INFO(0x0e8d, 0xe0, 0x01, 0x01), > .driver_info = BTUSB_MEDIATEK | > + BTUSB_AOSP | > BTUSB_WIDEBAND_SPEECH | > BTUSB_VALID_LE_STATES }, > > @@ -407,6 +409,7 @@ static const struct usb_device_id blacklist_table[] = { > > /* Additional MediaTek MT7921 Bluetooth devices */ > { USB_DEVICE(0x04ca, 0x3802), .driver_info = BTUSB_MEDIATEK | > + BTUSB_AOSP | > BTUSB_WIDEBAND_SPEECH | > BTUSB_VALID_LE_STATES }, > { USB_DEVICE(0x13d3, 0x3563), .driver_info = BTUSB_MEDIATEK | > @@ -3867,6 +3870,9 @@ static int btusb_probe(struct usb_interface *intf, > hdev->set_bdaddr = btusb_set_bdaddr_mtk; > set_bit(HCI_QUIRK_NON_PERSISTENT_SETUP, &hdev->quirks); > data->recv_acl = btusb_recv_acl_mtk; > + > + if (id->driver_info & BTUSB_AOSP) > + hci_set_aosp_capable(hdev); > } so I don’t like this. Do we have Mediatek devices that don’t support the AOSP extensions and can’t we determine via some vendor command what features are supported? I do not want to clutter btusb.c any further. The vendor specific setup should be able to figure out what the hardware supports and what it doesn’t. Regards Marcel
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index da85cc14f931..de0228e2245b 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -60,6 +60,7 @@ static struct usb_driver btusb_driver; #define BTUSB_VALID_LE_STATES 0x800000 #define BTUSB_QCA_WCN6855 0x1000000 #define BTUSB_INTEL_BROKEN_INITIAL_NCMD 0x4000000 +#define BTUSB_AOSP 0x8000000 static const struct usb_device_id btusb_table[] = { /* Generic Bluetooth USB device */ @@ -394,6 +395,7 @@ static const struct usb_device_id blacklist_table[] = { /* MediaTek Bluetooth devices */ { USB_VENDOR_AND_INTERFACE_INFO(0x0e8d, 0xe0, 0x01, 0x01), .driver_info = BTUSB_MEDIATEK | + BTUSB_AOSP | BTUSB_WIDEBAND_SPEECH | BTUSB_VALID_LE_STATES }, @@ -407,6 +409,7 @@ static const struct usb_device_id blacklist_table[] = { /* Additional MediaTek MT7921 Bluetooth devices */ { USB_DEVICE(0x04ca, 0x3802), .driver_info = BTUSB_MEDIATEK | + BTUSB_AOSP | BTUSB_WIDEBAND_SPEECH | BTUSB_VALID_LE_STATES }, { USB_DEVICE(0x13d3, 0x3563), .driver_info = BTUSB_MEDIATEK | @@ -3867,6 +3870,9 @@ static int btusb_probe(struct usb_interface *intf, hdev->set_bdaddr = btusb_set_bdaddr_mtk; set_bit(HCI_QUIRK_NON_PERSISTENT_SETUP, &hdev->quirks); data->recv_acl = btusb_recv_acl_mtk; + + if (id->driver_info & BTUSB_AOSP) + hci_set_aosp_capable(hdev); } if (id->driver_info & BTUSB_SWAVE) {