Commit 0d484db6 authored by Max Chou's avatar Max Chou Committed by Marcel Holtmann
Browse files

Bluetooth: btusb: btrtl: Add support for RTL8852A 



Add the support for RTL8852A BT controller on USB interface.
The necessary firmware will be submitted to linux-firmware project.

The device info from /sys/kernel/debug/usb/devices as below.

T:  Bus=02 Lev=02 Prnt=02 Port=05 Cnt=01 Dev#= 10 Spd=12   MxCh= 0
D:  Ver= 1.00 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs=  1
P:  Vendor=0bda ProdID=c852 Rev= 0.00
S:  Manufacturer=Realtek
S:  Product=Bluetooth Radio
S:  SerialNumber=00e04c000001
C:* #Ifs= 2 Cfg#= 1 Atr=e0 MxPwr=500mA
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=1ms
E:  Ad=02(O) Atr=02(Bulk) MxPS=  64 Ivl=0ms
E:  Ad=82(I) Atr=02(Bulk) MxPS=  64 Ivl=0ms
I:* If#= 1 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
E:  Ad=03(O) Atr=01(Isoc) MxPS=   0 Ivl=1ms
E:  Ad=83(I) 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=03(O) Atr=01(Isoc) MxPS=   9 Ivl=1ms
E:  Ad=83(I) 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=03(O) Atr=01(Isoc) MxPS=  17 Ivl=1ms
E:  Ad=83(I) 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=03(O) Atr=01(Isoc) MxPS=  25 Ivl=1ms
E:  Ad=83(I) 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=03(O) Atr=01(Isoc) MxPS=  33 Ivl=1ms
E:  Ad=83(I) 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=03(O) Atr=01(Isoc) MxPS=  49 Ivl=1ms
E:  Ad=83(I) Atr=01(Isoc) MxPS=  49 Ivl=1ms

Signed-off-by: default avatarMax Chou <max.chou@realtek.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 3a567b95

drivers/bluetooth/btrtl.c

+12 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#define RTL_ROM_LMP_8821A	0x8821

#define RTL_ROM_LMP_8761A	0x8761

#define RTL_ROM_LMP_8822B	0x8822

#define RTL_ROM_LMP_8852A	0x8852

#define RTL_CONFIG_MAGIC	0x8723ab55



#define IC_MATCH_FL_LMPSUBV	(1 << 0)
@@ -143,6 +144,13 @@ static const struct id_table ic_id_table[] = { 
	  .has_rom_version = true,

	  .fw_name  = "rtl_bt/rtl8822b_fw.bin",

	  .cfg_name = "rtl_bt/rtl8822b_config" },



	/* 8852A */

	{ IC_INFO(RTL_ROM_LMP_8852A, 0xa, 0xb, HCI_USB),

	  .config_needed = false,

	  .has_rom_version = true,

	  .fw_name  = "rtl_bt/rtl8852au_fw.bin",

	  .cfg_name = "rtl_bt/rtl8852au_config" },

	};



static const struct id_table *btrtl_match_ic(u16 lmp_subver, u16 hci_rev,
@@ -250,6 +258,7 @@ static int rtlbt_parse_firmware(struct hci_dev *hdev, 
		{ RTL_ROM_LMP_8821A, 10 },	/* 8821C */

		{ RTL_ROM_LMP_8822B, 13 },	/* 8822C */

		{ RTL_ROM_LMP_8761A, 14 },	/* 8761B */

		{ RTL_ROM_LMP_8852A, 18 },	/* 8852A */

	};



	min_size = sizeof(struct rtl_epatch_header) + sizeof(extension_sig) + 3;
@@ -679,6 +688,7 @@ int btrtl_download_firmware(struct hci_dev *hdev, 
	case RTL_ROM_LMP_8821A:

	case RTL_ROM_LMP_8761A:

	case RTL_ROM_LMP_8822B:

	case RTL_ROM_LMP_8852A:

		return btrtl_setup_rtl8723b(hdev, btrtl_dev);

	default:

		rtl_dev_info(hdev, "assuming no firmware upload needed");
@@ -854,3 +864,5 @@ MODULE_FIRMWARE("rtl_bt/rtl8821a_fw.bin"); 
MODULE_FIRMWARE("rtl_bt/rtl8821a_config.bin");

MODULE_FIRMWARE("rtl_bt/rtl8822b_fw.bin");

MODULE_FIRMWARE("rtl_bt/rtl8822b_config.bin");

MODULE_FIRMWARE("rtl_bt/rtl8852au_fw.bin");

MODULE_FIRMWARE("rtl_bt/rtl8852au_config.bin");

drivers/bluetooth/btusb.c

+4 −0
Original line number Diff line number Diff line
@@ -386,6 +386,10 @@ static const struct usb_device_id blacklist_table[] = { 
	{ USB_DEVICE(0x0bda, 0xb00c), .driver_info = BTUSB_REALTEK |

						     BTUSB_WIDEBAND_SPEECH },



	/* Realtek 8852AE Bluetooth devices */

	{ USB_DEVICE(0x0bda, 0xc852), .driver_info = BTUSB_REALTEK |

						     BTUSB_WIDEBAND_SPEECH },



	/* Realtek Bluetooth devices */

	{ USB_VENDOR_AND_INTERFACE_INFO(0x0bda, 0xe0, 0x01, 0x01),

	  .driver_info = BTUSB_REALTEK },