Commit 0a781172 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'for-net-next-2022-01-28' of... 

Merge tag 'for-net-next-2022-01-28' 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 support for RTL8822C hci_ver 0x08
 - Add support for RTL8852AE part 0bda:2852
 - Fix WBS setting for Intel legacy ROM products
 - Enable SCO over I2S ib mt7921s
 - Increment management interface revision

* tag 'for-net-next-2022-01-28' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next: (30 commits)
  Bluetooth: Increment management interface revision
  Bluetooth: hci_sync: Fix queuing commands when HCI_UNREGISTER is set
  Bluetooth: hci_h5: Add power reset via gpio in h5_btrtl_open
  Bluetooth: btrtl: Add support for RTL8822C hci_ver 0x08
  Bluetooth: hci_event: Fix HCI_EV_VENDOR max_len
  Bluetooth: hci_core: Rate limit the logging of invalid SCO handle
  Bluetooth: hci_event: Ignore multiple conn complete events
  Bluetooth: msft: fix null pointer deref on msft_monitor_device_evt
  Bluetooth: btmtksdio: mask out interrupt status
  Bluetooth: btmtksdio: run sleep mode by default
  Bluetooth: btmtksdio: lower log level in btmtksdio_runtime_[resume|suspend]()
  Bluetooth: mt7921s: fix btmtksdio_[drv|fw]_pmctrl()
  Bluetooth: mt7921s: fix bus hang with wrong privilege
  Bluetooth: btmtksdio: refactor btmtksdio_runtime_[suspend|resume]()
  Bluetooth: mt7921s: fix firmware coredump retrieve
  Bluetooth: hci_serdev: call init_rwsem() before p->open()
  Bluetooth: Remove kernel-doc style comment block
  Bluetooth: btusb: Whitespace fixes for btusb_setup_csr()
  Bluetooth: btusb: Add one more Bluetooth part for the Realtek RTL8852AE
  Bluetooth: btintel: Fix WBS setting for Intel legacy ROM products
  ...
====================

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


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents b76bbb34 91cb4c19

drivers/bluetooth/btintel.c

+8 −3
Original line number Diff line number Diff line
@@ -2428,10 +2428,15 @@ static int btintel_setup_combined(struct hci_dev *hdev) 


			/* Apply the device specific HCI quirks

			 *

			 * WBS for SdP - SdP and Stp have a same hw_varaint but

			 * different fw_variant

			 */

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

			 * WBS for SdP - For the Legacy ROM products, only SdP

			 * supports the WBS. But the version information is not

			 * enough to use here because the StP2 and SdP have same

			 * hw_variant and fw_variant. So, this flag is set by

			 * the transport driver (btusb) based on the HW info

			 * (idProduct)

			 */

			if (!btintel_test_flag(hdev,

					       INTEL_ROM_LEGACY_NO_WBS_SUPPORT))

				set_bit(HCI_QUIRK_WIDEBAND_SPEECH_SUPPORTED,

					&hdev->quirks);

drivers/bluetooth/btintel.h

+1 −0
Original line number Diff line number Diff line
@@ -152,6 +152,7 @@ enum { 
	INTEL_BROKEN_INITIAL_NCMD,

	INTEL_BROKEN_SHUTDOWN_LED,

	INTEL_ROM_LEGACY,

	INTEL_ROM_LEGACY_NO_WBS_SUPPORT,



	__INTEL_NUM_FLAGS,

};

drivers/bluetooth/btmrvl_debugfs.c

+1 −1
Original line number Diff line number Diff line 
/**

/*

 * Marvell Bluetooth driver: debugfs related functions

 *

 * Copyright (C) 2009, Marvell International Ltd.

drivers/bluetooth/btmrvl_sdio.c

+1 −1
Original line number Diff line number Diff line 
/**

/*

 * Marvell BT-over-SDIO driver: SDIO interface related functions.

 *

 * Copyright (C) 2009, Marvell International Ltd.

drivers/bluetooth/btmtk.h

+35 −0
Original line number Diff line number Diff line
@@ -7,8 +7,12 @@ 


#define HCI_WMT_MAX_EVENT_SIZE		64



#define BTMTK_WMT_REG_WRITE 0x1

#define BTMTK_WMT_REG_READ 0x2



#define MT7921_PINMUX_0 0x70005050

#define MT7921_PINMUX_1 0x70005054



enum {

	BTMTK_WMT_PATCH_DWNLD = 0x1,

	BTMTK_WMT_TEST = 0x2,
@@ -68,6 +72,37 @@ struct btmtk_tci_sleep { 
	u8 time_compensation;

} __packed;



struct btmtk_wakeon {

	u8 mode;

	u8 gpo;

	u8 active_high;

	__le16 enable_delay;

	__le16 wakeup_delay;

} __packed;



struct btmtk_sco {

	u8 clock_config;

	u8 transmit_format_config;

	u8 channel_format_config;

	u8 channel_select_config;

} __packed;



struct reg_read_cmd {

	u8 type;

	u8 rsv;

	u8 num;

	__le32 addr;

} __packed;



struct reg_write_cmd {

	u8 type;

	u8 rsv;

	u8 num;

	__le32 addr;

	__le32 data;

	__le32 mask;

} __packed;



struct btmtk_hci_wmt_params {

	u8 op;

	u8 flag;