Commit 89eb6e09 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'for-upstream' of... 

Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next



Johan Hedberg says:

====================
pull request: bluetooth-next 2019-04-25

Here's the main bluetooth-next pull request for the 5.2 kernel.

 - Added support for Mediatek SDIO controllers
 - Added support for Broadcom BCM2076B1 UART controller
 - Added support for Marvel SD8987 chipset
 - Fix buffer overflow bug in hidp protocol
 - Various other smaller fixes & improvements

Please let me know if there are any issues pulling. Thanks.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 8b448365 d5bb334a

drivers/bluetooth/Kconfig

+13 −2
Original line number Diff line number Diff line
@@ -336,7 +336,7 @@ config BT_MRVL 
	  The core driver to support Marvell Bluetooth devices.



	  This driver is required if you want to support

	  Marvell Bluetooth devices, such as 8688/8787/8797/8887/8897/8977/8997.

	  Marvell Bluetooth devices, such as 8688/8787/8797/8887/8897/8977/8987/8997.



	  Say Y here to compile Marvell Bluetooth driver

	  into the kernel or say M to compile it as module.
@@ -350,7 +350,7 @@ config BT_MRVL_SDIO 
	  The driver for Marvell Bluetooth chipsets with SDIO interface.



	  This driver is required if you want to use Marvell Bluetooth

	  devices with SDIO interface. Currently SD8688/SD8787/SD8797/SD8887/SD8897/SD8977/SD8997

	  devices with SDIO interface. Currently SD8688/SD8787/SD8797/SD8887/SD8897/SD8977/SD8987/SD8997

	  chipsets are supported.



	  Say Y here to compile support for Marvell BT-over-SDIO driver
@@ -379,6 +379,17 @@ config BT_WILINK 
	  Say Y here to compile support for Texas Instrument's WiLink7 driver

	  into the kernel or say M to compile it as module (btwilink).



config BT_MTKSDIO

	tristate "MediaTek HCI SDIO driver"

	depends on MMC

	help

	  MediaTek Bluetooth HCI SDIO driver.

	  This driver is required if you want to use MediaTek Bluetooth

	  with SDIO interface.



	  Say Y here to compile support for MediaTek Bluetooth SDIO devices

	  into the kernel or say M to compile it as module (btmtksdio).



config BT_MTKUART

	tristate "MediaTek HCI UART driver"

	depends on SERIAL_DEV_BUS

drivers/bluetooth/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ obj-$(CONFIG_BT_ATH3K) += ath3k.o 
obj-$(CONFIG_BT_MRVL)		+= btmrvl.o

obj-$(CONFIG_BT_MRVL_SDIO)	+= btmrvl_sdio.o

obj-$(CONFIG_BT_WILINK)		+= btwilink.o

obj-$(CONFIG_BT_MTKSDIO)	+= btmtksdio.o

obj-$(CONFIG_BT_MTKUART)	+= btmtkuart.o

obj-$(CONFIG_BT_QCOMSMD)	+= btqcomsmd.o

obj-$(CONFIG_BT_BCM)		+= btbcm.o

drivers/bluetooth/btbcm.c

+4 −1
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 
#define BDADDR_BCM43430A0 (&(bdaddr_t) {{0xac, 0x1f, 0x12, 0xa0, 0x43, 0x43}})

#define BDADDR_BCM4324B3 (&(bdaddr_t) {{0x00, 0x00, 0x00, 0xb3, 0x24, 0x43}})

#define BDADDR_BCM4330B1 (&(bdaddr_t) {{0x00, 0x00, 0x00, 0xb1, 0x30, 0x43}})

#define BDADDR_BCM43341B (&(bdaddr_t) {{0xac, 0x1f, 0x00, 0x1b, 0x34, 0x43}})



int btbcm_check_bdaddr(struct hci_dev *hdev)

{
@@ -82,7 +83,8 @@ int btbcm_check_bdaddr(struct hci_dev *hdev) 
	    !bacmp(&bda->bdaddr, BDADDR_BCM20702A1) ||

	    !bacmp(&bda->bdaddr, BDADDR_BCM4324B3) ||

	    !bacmp(&bda->bdaddr, BDADDR_BCM4330B1) ||

	    !bacmp(&bda->bdaddr, BDADDR_BCM43430A0)) {

	    !bacmp(&bda->bdaddr, BDADDR_BCM43430A0) ||

	    !bacmp(&bda->bdaddr, BDADDR_BCM43341B)) {

		bt_dev_info(hdev, "BCM: Using default device address (%pMR)",

			    &bda->bdaddr);

		set_bit(HCI_QUIRK_INVALID_BDADDR, &hdev->quirks);
@@ -333,6 +335,7 @@ struct bcm_subver_table { 
static const struct bcm_subver_table bcm_uart_subver_table[] = {

	{ 0x4103, "BCM4330B1"	},	/* 002.001.003 */

	{ 0x410e, "BCM43341B0"	},	/* 002.001.014 */

	{ 0x4204, "BCM2076B1"	},	/* 002.002.004 */

	{ 0x4406, "BCM4324B3"	},	/* 002.004.006 */

	{ 0x6109, "BCM4335C0"	},	/* 003.001.009 */

	{ 0x610c, "BCM4354"	},	/* 003.001.012 */

drivers/bluetooth/btmrvl_sdio.c

+36 −0
Original line number Diff line number Diff line
@@ -235,6 +235,29 @@ static const struct btmrvl_sdio_card_reg btmrvl_reg_8977 = { 
	.fw_dump_end = 0xf8,

};



static const struct btmrvl_sdio_card_reg btmrvl_reg_8987 = {

	.cfg = 0x00,

	.host_int_mask = 0x08,

	.host_intstatus = 0x0c,

	.card_status = 0x5c,

	.sq_read_base_addr_a0 = 0xf8,

	.sq_read_base_addr_a1 = 0xf9,

	.card_revision = 0xc8,

	.card_fw_status0 = 0xe8,

	.card_fw_status1 = 0xe9,

	.card_rx_len = 0xea,

	.card_rx_unit = 0xeb,

	.io_port_0 = 0xe4,

	.io_port_1 = 0xe5,

	.io_port_2 = 0xe6,

	.int_read_to_clear = true,

	.host_int_rsr = 0x04,

	.card_misc_cfg = 0xd8,

	.fw_dump_ctrl = 0xf0,

	.fw_dump_start = 0xf1,

	.fw_dump_end = 0xf8,

};



static const struct btmrvl_sdio_card_reg btmrvl_reg_8997 = {

	.cfg = 0x00,

	.host_int_mask = 0x08,
@@ -312,6 +335,15 @@ static const struct btmrvl_sdio_device btmrvl_sdio_sd8977 = { 
	.supports_fw_dump = true,

};



static const struct btmrvl_sdio_device btmrvl_sdio_sd8987 = {

	.helper		= NULL,

	.firmware	= "mrvl/sd8987_uapsta.bin",

	.reg		= &btmrvl_reg_8987,

	.support_pscan_win_report = true,

	.sd_blksz_fw_dl	= 256,

	.supports_fw_dump = true,

};



static const struct btmrvl_sdio_device btmrvl_sdio_sd8997 = {

	.helper         = NULL,

	.firmware       = "mrvl/sd8997_uapsta.bin",
@@ -343,6 +375,9 @@ static const struct sdio_device_id btmrvl_sdio_ids[] = { 
	/* Marvell SD8977 Bluetooth device */

	{ SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, 0x9146),

			.driver_data = (unsigned long)&btmrvl_sdio_sd8977 },

	/* Marvell SD8987 Bluetooth device */

	{ SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, 0x914A),

			.driver_data = (unsigned long)&btmrvl_sdio_sd8987 },

	/* Marvell SD8997 Bluetooth device */

	{ SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, 0x9142),

			.driver_data = (unsigned long)&btmrvl_sdio_sd8997 },
@@ -1797,4 +1832,5 @@ MODULE_FIRMWARE("mrvl/sd8797_uapsta.bin"); 
MODULE_FIRMWARE("mrvl/sd8887_uapsta.bin");

MODULE_FIRMWARE("mrvl/sd8897_uapsta.bin");

MODULE_FIRMWARE("mrvl/sd8977_uapsta.bin");

MODULE_FIRMWARE("mrvl/sd8987_uapsta.bin");

MODULE_FIRMWARE("mrvl/sd8997_uapsta.bin");

drivers/bluetooth/btmtksdio.c

0 → 100644
+1101 −0

File added.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE