Commit a507ea32 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'for-net-next-2022-09-30' of... 

Merge tag 'for-net-next-2022-09-30' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next

Luiz Augusto von Dentz says:

====================
bluetooth-next pull request for net-next

 - Add RTL8761BUV device (Edimax BT-8500)
 - Add a new PID/VID 13d3/3583 for MT7921
 - Add Realtek RTL8852C support ID 0x13D3:0x3592
 - Add VID/PID 0489/e0e0 for MediaTek MT7921
 - Add a new VID/PID 0e8d/0608 for MT7921
 - Add a new PID/VID 13d3/3578 for MT7921
 - Add BT device 0cb8:c549 from RTW8852AE
 - Add support for Intel Magnetor

* tag 'for-net-next-2022-09-30' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next: (49 commits)
  Bluetooth: hci_sync: Fix not indicating power state
  Bluetooth: L2CAP: Fix user-after-free
  Bluetooth: Call shutdown for HCI_USER_CHANNEL
  Bluetooth: Prevent double register of suspend
  Bluetooth: hci_core: Fix not handling link timeouts propertly
  Bluetooth: hci_event: Make sure ISO events don't affect non-ISO connections
  Bluetooth: hci_debugfs: Fix not checking conn->debugfs
  Bluetooth: hci_sysfs: Fix attempting to call device_add multiple times
  Bluetooth: MGMT: fix zalloc-simple.cocci warnings
  Bluetooth: hci_{ldisc,serdev}: check percpu_init_rwsem() failure
  Bluetooth: use hdev->workqueue when queuing hdev->{cmd,ncmd}_timer works
  Bluetooth: L2CAP: initialize delayed works at l2cap_chan_create()
  Bluetooth: RFCOMM: Fix possible deadlock on socket shutdown/release
  Bluetooth: hci_sync: allow advertise when scan without RPA
  Bluetooth: btusb: Add a new VID/PID 0e8d/0608 for MT7921
  Bluetooth: btusb: Add a new PID/VID 13d3/3583 for MT7921
  Bluetooth: avoid hci_dev_test_and_set_flag() in mgmt_init_hdev()
  Bluetooth: btintel: Mark Intel controller to support LE_STATES quirk
  Bluetooth: btintel: Add support for Magnetor
  Bluetooth: btusb: Add a new PID/VID 13d3/3578 for MT7921
  ...
====================

Link: https://lore.kernel.org/r/20221001004602.297366-1-luiz.dentz@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents cff2d762 6abf0dae

drivers/bluetooth/btintel.c

+11 −9
Original line number Diff line number Diff line
@@ -449,6 +449,7 @@ static int btintel_version_info_tlv(struct hci_dev *hdev, 
	case 0x17:	/* TyP */

	case 0x18:	/* Slr */

	case 0x19:	/* Slr-F */

	case 0x1b:      /* Mgr */

		break;

	default:

		bt_dev_err(hdev, "Unsupported Intel hardware variant (0x%x)",
@@ -2330,6 +2331,7 @@ static void btintel_set_msft_opcode(struct hci_dev *hdev, u8 hw_variant) 
	case 0x17:

	case 0x18:

	case 0x19:

	case 0x1b:

		hci_set_msft_opcode(hdev, 0xFC1E);

		break;

	default:
@@ -2439,15 +2441,20 @@ static int btintel_setup_combined(struct hci_dev *hdev) 
					       INTEL_ROM_LEGACY_NO_WBS_SUPPORT))

				set_bit(HCI_QUIRK_WIDEBAND_SPEECH_SUPPORTED,

					&hdev->quirks);

			if (ver.hw_variant == 0x08 && ver.fw_variant == 0x22)

				set_bit(HCI_QUIRK_VALID_LE_STATES,

					&hdev->quirks);



			err = btintel_legacy_rom_setup(hdev, &ver);

			break;

		case 0x0b:      /* SfP */

		case 0x0c:      /* WsP */

		case 0x11:      /* JfP */

		case 0x12:      /* ThP */

		case 0x13:      /* HrP */

		case 0x14:      /* CcP */

			set_bit(HCI_QUIRK_VALID_LE_STATES, &hdev->quirks);

			fallthrough;

		case 0x0c:	/* WsP */

			/* Apply the device specific HCI quirks

			 *

			 * All Legacy bootloader devices support WBS
@@ -2455,11 +2462,6 @@ static int btintel_setup_combined(struct hci_dev *hdev) 
			set_bit(HCI_QUIRK_WIDEBAND_SPEECH_SUPPORTED,

				&hdev->quirks);



			/* Valid LE States quirk for JfP/ThP familiy */

			if (ver.hw_variant == 0x11 || ver.hw_variant == 0x12)

				set_bit(HCI_QUIRK_VALID_LE_STATES,

					&hdev->quirks);



			/* Setup MSFT Extension support */

			btintel_set_msft_opcode(hdev, ver.hw_variant);
@@ -2530,8 +2532,7 @@ static int btintel_setup_combined(struct hci_dev *hdev) 
		 */

		set_bit(HCI_QUIRK_WIDEBAND_SPEECH_SUPPORTED, &hdev->quirks);



		/* Valid LE States quirk for JfP/ThP familiy */

		if (ver.hw_variant == 0x11 || ver.hw_variant == 0x12)

		/* Set Valid LE States quirk */

		set_bit(HCI_QUIRK_VALID_LE_STATES, &hdev->quirks);



		/* Setup MSFT Extension support */
@@ -2542,6 +2543,7 @@ static int btintel_setup_combined(struct hci_dev *hdev) 
	case 0x17:

	case 0x18:

	case 0x19:

	case 0x1b:

		/* Display version information of TLV type */

		btintel_version_info_tlv(hdev, &ver_tlv);

drivers/bluetooth/btusb.c

+33 −5
Original line number Diff line number Diff line
@@ -426,6 +426,8 @@ static const struct usb_device_id blacklist_table[] = { 
						     BTUSB_WIDEBAND_SPEECH },

	{ USB_DEVICE(0x04ca, 0x4006), .driver_info = BTUSB_REALTEK |

						     BTUSB_WIDEBAND_SPEECH },

	{ USB_DEVICE(0x0cb8, 0xc549), .driver_info = BTUSB_REALTEK |

						     BTUSB_WIDEBAND_SPEECH },



	/* Realtek 8852CE Bluetooth devices */

	{ USB_DEVICE(0x04ca, 0x4007), .driver_info = BTUSB_REALTEK |
@@ -438,6 +440,8 @@ static const struct usb_device_id blacklist_table[] = { 
						     BTUSB_WIDEBAND_SPEECH },

	{ USB_DEVICE(0x13d3, 0x3586), .driver_info = BTUSB_REALTEK |

						     BTUSB_WIDEBAND_SPEECH },

	{ USB_DEVICE(0x13d3, 0x3592), .driver_info = BTUSB_REALTEK |

						     BTUSB_WIDEBAND_SPEECH },



	/* Realtek Bluetooth devices */

	{ USB_VENDOR_AND_INTERFACE_INFO(0x0bda, 0xe0, 0x01, 0x01),
@@ -466,6 +470,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, 0xe0e0), .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 },
@@ -478,9 +485,18 @@ static const struct usb_device_id blacklist_table[] = { 
	{ USB_DEVICE(0x13d3, 0x3567), .driver_info = BTUSB_MEDIATEK |

						     BTUSB_WIDEBAND_SPEECH |

						     BTUSB_VALID_LE_STATES },

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

						     BTUSB_WIDEBAND_SPEECH |

						     BTUSB_VALID_LE_STATES },

	{ USB_DEVICE(0x13d3, 0x3583), .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(0x0e8d, 0x0608), .driver_info = BTUSB_MEDIATEK |

						     BTUSB_WIDEBAND_SPEECH |

						     BTUSB_VALID_LE_STATES },



	/* MediaTek MT7922A Bluetooth devices */

	{ USB_DEVICE(0x0489, 0xe0d8), .driver_info = BTUSB_MEDIATEK |
@@ -516,19 +532,17 @@ static const struct usb_device_id blacklist_table[] = { 
	{ USB_DEVICE(0x0bda, 0xb009), .driver_info = BTUSB_REALTEK },

	{ USB_DEVICE(0x2ff8, 0xb011), .driver_info = BTUSB_REALTEK },



	/* Additional Realtek 8761B Bluetooth devices */

	/* Additional Realtek 8761BUV Bluetooth devices */

	{ USB_DEVICE(0x2357, 0x0604), .driver_info = BTUSB_REALTEK |

						     BTUSB_WIDEBAND_SPEECH },



	/* Additional Realtek 8761BU Bluetooth devices */

	{ USB_DEVICE(0x0b05, 0x190e), .driver_info = BTUSB_REALTEK |

	  					     BTUSB_WIDEBAND_SPEECH },

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

						     BTUSB_WIDEBAND_SPEECH },



	/* Additional Realtek 8761BUV Bluetooth devices */

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

						     BTUSB_WIDEBAND_SPEECH },

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

						     BTUSB_WIDEBAND_SPEECH },



	/* Additional Realtek 8821AE Bluetooth devices */

	{ USB_DEVICE(0x0b05, 0x17dc), .driver_info = BTUSB_REALTEK },
@@ -2477,15 +2491,29 @@ static int btusb_mtk_hci_wmt_sync(struct hci_dev *hdev, 


	set_bit(BTUSB_TX_WAIT_VND_EVT, &data->flags);



	/* WMT cmd/event doesn't follow up the generic HCI cmd/event handling,

	 * it needs constantly polling control pipe until the host received the

	 * WMT event, thus, we should require to specifically acquire PM counter

	 * on the USB to prevent the interface from entering auto suspended

	 * while WMT cmd/event in progress.

	 */

	err = usb_autopm_get_interface(data->intf);

	if (err < 0)

		goto err_free_wc;



	err = __hci_cmd_send(hdev, 0xfc6f, hlen, wc);



	if (err < 0) {

		clear_bit(BTUSB_TX_WAIT_VND_EVT, &data->flags);

		usb_autopm_put_interface(data->intf);

		goto err_free_wc;

	}



	/* Submit control IN URB on demand to process the WMT event */

	err = btusb_mtk_submit_wmt_recv_urb(hdev);



	usb_autopm_put_interface(data->intf);



	if (err < 0)

		goto err_free_wc;

drivers/bluetooth/hci_ldisc.c

+5 −2
Original line number Diff line number Diff line
@@ -493,6 +493,11 @@ static int hci_uart_tty_open(struct tty_struct *tty) 
		BT_ERR("Can't allocate control structure");

		return -ENFILE;

	}

	if (percpu_init_rwsem(&hu->proto_lock)) {

		BT_ERR("Can't allocate semaphore structure");

		kfree(hu);

		return -ENOMEM;

	}



	tty->disc_data = hu;

	hu->tty = tty;
@@ -505,8 +510,6 @@ static int hci_uart_tty_open(struct tty_struct *tty) 
	INIT_WORK(&hu->init_ready, hci_uart_init_work);

	INIT_WORK(&hu->write_work, hci_uart_write_work);



	percpu_init_rwsem(&hu->proto_lock);



	/* Flush any pending characters in the driver */

	tty_driver_flush_buffer(tty);

drivers/bluetooth/hci_serdev.c

+7 −3
Original line number Diff line number Diff line
@@ -310,11 +310,12 @@ int hci_uart_register_device(struct hci_uart *hu, 


	serdev_device_set_client_ops(hu->serdev, &hci_serdev_client_ops);



	if (percpu_init_rwsem(&hu->proto_lock))

		return -ENOMEM;



	err = serdev_device_open(hu->serdev);

	if (err)

		return err;



	percpu_init_rwsem(&hu->proto_lock);

		goto err_rwsem;



	err = p->open(hu);

	if (err)
@@ -389,6 +390,8 @@ int hci_uart_register_device(struct hci_uart *hu, 
	p->close(hu);

err_open:

	serdev_device_close(hu->serdev);

err_rwsem:

	percpu_free_rwsem(&hu->proto_lock);

	return err;

}

EXPORT_SYMBOL_GPL(hci_uart_register_device);
@@ -410,5 +413,6 @@ void hci_uart_unregister_device(struct hci_uart *hu) 
		clear_bit(HCI_UART_PROTO_READY, &hu->flags);

		serdev_device_close(hu->serdev);

	}

	percpu_free_rwsem(&hu->proto_lock);

}

EXPORT_SYMBOL_GPL(hci_uart_unregister_device);

include/net/bluetooth/bluetooth.h

+1 −0
Original line number Diff line number Diff line
@@ -627,6 +627,7 @@ static inline bool iso_enabled(void) 


int mgmt_init(void);

void mgmt_exit(void);

void mgmt_cleanup(struct sock *sk);



void bt_sock_reclassify_lock(struct sock *sk, int proto);