[PATCH v2 6/6][SRU][OEM-5.13/H] UBUNTU: SAUCE: Bluetooth: btusb: Add support for Foxconn Mediatek Chip

[Stefan Bader]

On 11.08.21 12:47, You-Sheng Yang wrote:
> On Wed, Aug 11, 2021 at 4:11 PM Stefan Bader <stefan.bader at canonical.com> wrote:
>>
>> On 22.07.21 13:18, You-Sheng Yang wrote:
>>> From: Aaron Ma <aaron.ma at canonical.com>
>>>
>>> BugLink: https://bugs.launchpad.net/bugs/1937004
>>>
>>> Add support for another Foxconn / Hon Hai device with MT7921 chip.
>>>
>>> T:  Bus=05 Lev=01 Prnt=01 Port=03 Cnt=02 Dev#=  3 Spd=480  MxCh= 0
>>> D:  Ver= 2.10 Cls=ef(misc ) Sub=02 Prot=01 MxPS=64 #Cfgs=  1
>>> P:  Vendor=0489 ProdID=e0cd Rev= 1.00
>>> S:  Manufacturer=MediaTek Inc.
>>> S:  Product=Wireless_Device
>>> S:  SerialNumber=000000000
>>> C:* #Ifs= 3 Cfg#= 1 Atr=e0 MxPwr=100mA
>>> A:  FirstIf#= 0 IfCount= 3 Cls=e0(wlcon) Sub=01 Prot=01
>>> I:* If#= 0 Alt= 0 #EPs= 3 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
>>> E:  Ad=81(I) Atr=03(Int.) MxPS=  16 Ivl=125us
>>> E:  Ad=82(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
>>> E:  Ad=02(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
>>> I:* If#= 1 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
>>> E:  Ad=83(I) Atr=01(Isoc) MxPS=   0 Ivl=1ms
>>> E:  Ad=03(O) Atr=01(Isoc) MxPS=   0 Ivl=1ms
>>> I:  If#= 1 Alt= 1 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
>>> E:  Ad=83(I) Atr=01(Isoc) MxPS=   9 Ivl=1ms
>>> E:  Ad=03(O) Atr=01(Isoc) MxPS=   9 Ivl=1ms
>>> I:  If#= 1 Alt= 2 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
>>> E:  Ad=83(I) Atr=01(Isoc) MxPS=  17 Ivl=1ms
>>> E:  Ad=03(O) Atr=01(Isoc) MxPS=  17 Ivl=1ms
>>> I:  If#= 1 Alt= 3 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
>>> E:  Ad=83(I) Atr=01(Isoc) MxPS=  25 Ivl=1ms
>>> E:  Ad=03(O) Atr=01(Isoc) MxPS=  25 Ivl=1ms
>>> I:  If#= 1 Alt= 4 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
>>> E:  Ad=83(I) Atr=01(Isoc) MxPS=  33 Ivl=1ms
>>> E:  Ad=03(O) Atr=01(Isoc) MxPS=  33 Ivl=1ms
>>> I:  If#= 1 Alt= 5 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
>>> E:  Ad=83(I) Atr=01(Isoc) MxPS=  49 Ivl=1ms
>>> E:  Ad=03(O) Atr=01(Isoc) MxPS=  49 Ivl=1ms
>>> I:  If#= 1 Alt= 6 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
>>> E:  Ad=83(I) Atr=01(Isoc) MxPS=  63 Ivl=1ms
>>> E:  Ad=03(O) Atr=01(Isoc) MxPS=  63 Ivl=1ms
>>> I:* If#= 2 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=(none)
>>> E:  Ad=8a(I) Atr=03(Int.) MxPS=  64 Ivl=125us
>>> E:  Ad=0a(O) Atr=03(Int.) MxPS=  64 Ivl=125us
>>> I:  If#= 2 Alt= 1 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=(none)
>>> E:  Ad=8a(I) Atr=03(Int.) MxPS= 512 Ivl=125us
>>> E:  Ad=0a(O) Atr=03(Int.) MxPS= 512 Ivl=125us
>>>
>> - Link: https://lore.kernel.org/lkml/20210708131214.695458-1-aaron.ma@canonical.com/
>>> Signed-off-by: Aaron Ma <aaron.ma at canonical.com>
>> Signed-off-by: Marcel Holtmann <marcel at holtmann.org>
>> (backported from 64832df2ac056f111b51aaebbe54a996e0fce7f1 linux-next)
>> Signed-off-by: Aaron Ma <aaron.ma at canonical.com
>>> ---
>>
>> No longer SAUCE. I doubt it can be cherry picked because in linux-next it is
>> between some other entries and the other two additional entries are not in
>> linux-next. Feels a bit odd? Did they get lost?
> 
> It happens Aaron and I were sending only the required ID separately
> for our own assignments to upstream, and the SRU patch here are those
> integrated together. The SRU patches here are sorted by id
> numerically, so there might be some difference in comparison to
> upstream.

For inclusion into stable releases I would prefer to have things done as they 
are upstream. And the other 2 patches still did not appear in linux-next. At 
least not under the same title. Aaron, do you know what keeps them from arriving?

-Stefan

> 
>>>    drivers/bluetooth/btusb.c | 3 +++
>>>    1 file changed, 3 insertions(+)
>>>
>>> diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
>>> index 9c0e93cbbfa7..465889886832 100644
>>> --- a/drivers/bluetooth/btusb.c
>>> +++ b/drivers/bluetooth/btusb.c
>>> @@ -413,6 +413,9 @@ static const struct usb_device_id blacklist_table[] = {
>>>        { USB_DEVICE(0x0489, 0xe0c8), .driver_info = BTUSB_MEDIATEK |
>>>                                                     BTUSB_WIDEBAND_SPEECH |
>>>                                                     BTUSB_VALID_LE_STATES },
>>> +     { USB_DEVICE(0x0489, 0xe0cd), .driver_info = BTUSB_MEDIATEK |
>>> +                                                  BTUSB_WIDEBAND_SPEECH |
>>> +                                                  BTUSB_VALID_LE_STATES },
>>>        { USB_DEVICE(0x04ca, 0x3802), .driver_info = BTUSB_MEDIATEK |
>>>                                                     BTUSB_WIDEBAND_SPEECH |
>>>                                                     BTUSB_VALID_LE_STATES },
>>>
>>
>>
> 
> 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: OpenPGP_signature
Type: application/pgp-signature
Size: 833 bytes
Desc: OpenPGP digital signature
URL: <https://lists.ubuntu.com/archives/kernel-team/attachments/20210819/d2e673a6/attachment.sig>