Commit 56f66ce1 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'bluetooth-fixes-from-next' 

Cherry-pick what looks like safe fixes from the bluetooth
net-next PR. The other changes will have to wait for 6.6

Link: https://lore.kernel.org/all/20230627191004.2586540-1-luiz.dentz@gmail.com/


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 046f753d 2be22f19

drivers/bluetooth/btqca.c

+1 −1
Original line number Diff line number Diff line
@@ -637,7 +637,7 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate, 
		snprintf(config.fwname, sizeof(config.fwname),

			 "qca/%s", firmware_name);

	else if (qca_is_wcn399x(soc_type)) {

		if (ver.soc_id == QCA_WCN3991_SOC_ID) {

		if (le32_to_cpu(ver.soc_id) == QCA_WCN3991_SOC_ID) {

			snprintf(config.fwname, sizeof(config.fwname),

				 "qca/crnv%02xu.bin", rom_ver);

		} else {

drivers/bluetooth/btrtl.c

+16 −2
Original line number Diff line number Diff line
@@ -1367,14 +1367,30 @@ MODULE_FIRMWARE("rtl_bt/rtl8723cs_vf_fw.bin"); 
MODULE_FIRMWARE("rtl_bt/rtl8723cs_vf_config.bin");

MODULE_FIRMWARE("rtl_bt/rtl8723cs_xx_fw.bin");

MODULE_FIRMWARE("rtl_bt/rtl8723cs_xx_config.bin");

MODULE_FIRMWARE("rtl_bt/rtl8723d_fw.bin");

MODULE_FIRMWARE("rtl_bt/rtl8723d_config.bin");

MODULE_FIRMWARE("rtl_bt/rtl8723ds_fw.bin");

MODULE_FIRMWARE("rtl_bt/rtl8723ds_config.bin");

MODULE_FIRMWARE("rtl_bt/rtl8761a_fw.bin");

MODULE_FIRMWARE("rtl_bt/rtl8761a_config.bin");

MODULE_FIRMWARE("rtl_bt/rtl8761b_fw.bin");

MODULE_FIRMWARE("rtl_bt/rtl8761b_config.bin");

MODULE_FIRMWARE("rtl_bt/rtl8761bu_fw.bin");

MODULE_FIRMWARE("rtl_bt/rtl8761bu_config.bin");

MODULE_FIRMWARE("rtl_bt/rtl8821a_fw.bin");

MODULE_FIRMWARE("rtl_bt/rtl8821a_config.bin");

MODULE_FIRMWARE("rtl_bt/rtl8821c_fw.bin");

MODULE_FIRMWARE("rtl_bt/rtl8821c_config.bin");

MODULE_FIRMWARE("rtl_bt/rtl8821cs_fw.bin");

MODULE_FIRMWARE("rtl_bt/rtl8821cs_config.bin");

MODULE_FIRMWARE("rtl_bt/rtl8822b_fw.bin");

MODULE_FIRMWARE("rtl_bt/rtl8822b_config.bin");

MODULE_FIRMWARE("rtl_bt/rtl8822cs_fw.bin");

MODULE_FIRMWARE("rtl_bt/rtl8822cs_config.bin");

MODULE_FIRMWARE("rtl_bt/rtl8822cu_fw.bin");

MODULE_FIRMWARE("rtl_bt/rtl8822cu_config.bin");

MODULE_FIRMWARE("rtl_bt/rtl8851bu_fw.bin");

MODULE_FIRMWARE("rtl_bt/rtl8851bu_config.bin");

MODULE_FIRMWARE("rtl_bt/rtl8852au_fw.bin");

MODULE_FIRMWARE("rtl_bt/rtl8852au_config.bin");

MODULE_FIRMWARE("rtl_bt/rtl8852bs_fw.bin");
@@ -1383,5 +1399,3 @@ MODULE_FIRMWARE("rtl_bt/rtl8852bu_fw.bin"); 
MODULE_FIRMWARE("rtl_bt/rtl8852bu_config.bin");

MODULE_FIRMWARE("rtl_bt/rtl8852cu_fw.bin");

MODULE_FIRMWARE("rtl_bt/rtl8852cu_config.bin");
 
MODULE_FIRMWARE("rtl_bt/rtl8851bu_fw.bin");

MODULE_FIRMWARE("rtl_bt/rtl8851bu_config.bin");

drivers/bluetooth/btusb.c

+5 −0
Original line number Diff line number Diff line
@@ -613,6 +613,9 @@ static const struct usb_device_id blacklist_table[] = { 
	{ USB_DEVICE(0x0489, 0xe0d9), .driver_info = BTUSB_MEDIATEK |

						     BTUSB_WIDEBAND_SPEECH |

						     BTUSB_VALID_LE_STATES },

	{ USB_DEVICE(0x0489, 0xe0f5), .driver_info = BTUSB_MEDIATEK |

						     BTUSB_WIDEBAND_SPEECH |

						     BTUSB_VALID_LE_STATES },

	{ USB_DEVICE(0x13d3, 0x3568), .driver_info = BTUSB_MEDIATEK |

						     BTUSB_WIDEBAND_SPEECH |

						     BTUSB_VALID_LE_STATES },
@@ -655,6 +658,8 @@ static const struct usb_device_id blacklist_table[] = { 
						     BTUSB_WIDEBAND_SPEECH },

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

						     BTUSB_WIDEBAND_SPEECH },

	{ USB_DEVICE(0x6655, 0x8771), .driver_info = BTUSB_REALTEK |

						     BTUSB_WIDEBAND_SPEECH },

	{ USB_DEVICE(0x7392, 0xc611), .driver_info = BTUSB_REALTEK |

						     BTUSB_WIDEBAND_SPEECH },

	{ USB_DEVICE(0x2b89, 0x8761), .driver_info = BTUSB_REALTEK |

drivers/bluetooth/hci_bcm.c

+2 −1
Original line number Diff line number Diff line
@@ -643,6 +643,7 @@ static int bcm_setup(struct hci_uart *hu) 
	 * Allow the bootloader to set a valid address through the

	 * device tree.

	 */

	if (test_bit(HCI_QUIRK_INVALID_BDADDR, &hu->hdev->quirks))

		set_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hu->hdev->quirks);



	if (!bcm_request_irq(bcm))

include/net/bluetooth/bluetooth.h

+1 −1
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ struct bt_iso_ucast_qos { 
struct bt_iso_bcast_qos {

	__u8  big;

	__u8  bis;

	__u8  sync_interval;

	__u8  sync_factor;

	__u8  packing;

	__u8  framing;

	struct bt_iso_io_qos in;