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

Merge tag 'for-net-next-2021-08-19' of... 

Merge tag 'for-net-next-2021-08-19' 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 Foxconn Mediatek Chip
 - Add support for LG LGSBWAC92/TWCM-K505D
 - hci_h5 flow control fixes and suspend support
 - Switch to use lock_sock for SCO and RFCOMM
 - Various fixes for extended advertising
 - Reword Intel's setup on btusb unifying the supported generations
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 815cc21d 61969ef8

drivers/bluetooth/btbcm.c

+1 −0
Original line number Diff line number Diff line
@@ -387,6 +387,7 @@ struct bcm_subver_table { 
};



static const struct bcm_subver_table bcm_uart_subver_table[] = {

	{ 0x1111, "BCM4362A2"	},	/* 000.017.017 */

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

	{ 0x410d, "BCM4334B0"	},	/* 002.001.013 */

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

drivers/bluetooth/btintel.c

+1249 −65

File changed.

Preview size limit exceeded, changes collapsed.

drivers/bluetooth/btintel.h

+53 −66
Original line number Diff line number Diff line
@@ -138,6 +138,49 @@ struct intel_debug_features { 
#define INTEL_CNVX_TOP_STEP(cnvx_top)	(((cnvx_top) & 0x0f000000) >> 24)

#define INTEL_CNVX_TOP_PACK_SWAB(t, s)	__swab16(((__u16)(((t) << 4) | (s))))



enum {

	INTEL_BOOTLOADER,

	INTEL_DOWNLOADING,

	INTEL_FIRMWARE_LOADED,

	INTEL_FIRMWARE_FAILED,

	INTEL_BOOTING,

	INTEL_BROKEN_INITIAL_NCMD,

	INTEL_BROKEN_LED,

	INTEL_ROM_LEGACY,



	__INTEL_NUM_FLAGS,

};



struct btintel_data {

	DECLARE_BITMAP(flags, __INTEL_NUM_FLAGS);

};



#define btintel_set_flag(hdev, nr)					\

	do {								\

		struct btintel_data *intel = hci_get_priv((hdev));	\

		set_bit((nr), intel->flags);				\

	} while (0)



#define btintel_clear_flag(hdev, nr)					\

	do {								\

		struct btintel_data *intel = hci_get_priv((hdev));	\

		clear_bit((nr), intel->flags);				\

	} while (0)



#define btintel_wake_up_flag(hdev, nr)					\

	do {								\

		struct btintel_data *intel = hci_get_priv((hdev));	\

		wake_up_bit(intel->flags, (nr));			\

	} while (0)



#define btintel_get_flag(hdev)						\

	(((struct btintel_data *)hci_get_priv(hdev))->flags)



#define btintel_test_flag(hdev, nr)	test_bit((nr), btintel_get_flag(hdev))

#define btintel_test_and_clear_flag(hdev, nr) test_and_clear_bit((nr), btintel_get_flag(hdev))

#define btintel_wait_on_flag_timeout(hdev, nr, m, to)			\

		wait_on_bit_timeout(btintel_get_flag(hdev), (nr), m, to)



#if IS_ENABLED(CONFIG_BT_INTEL)



int btintel_check_bdaddr(struct hci_dev *hdev);
@@ -145,19 +188,11 @@ int btintel_enter_mfg(struct hci_dev *hdev); 
int btintel_exit_mfg(struct hci_dev *hdev, bool reset, bool patched);

int btintel_set_bdaddr(struct hci_dev *hdev, const bdaddr_t *bdaddr);

int btintel_set_diag(struct hci_dev *hdev, bool enable);

int btintel_set_diag_mfg(struct hci_dev *hdev, bool enable);

void btintel_hw_error(struct hci_dev *hdev, u8 code);



int btintel_version_info(struct hci_dev *hdev, struct intel_version *ver);

int btintel_version_info_tlv(struct hci_dev *hdev, struct intel_version_tlv *version);

int btintel_secure_send(struct hci_dev *hdev, u8 fragment_type, u32 plen,

			const void *param);

int btintel_load_ddc_config(struct hci_dev *hdev, const char *ddc_name);

int btintel_set_event_mask(struct hci_dev *hdev, bool debug);

int btintel_set_event_mask_mfg(struct hci_dev *hdev, bool debug);

int btintel_read_version(struct hci_dev *hdev, struct intel_version *ver);

int btintel_read_version_tlv(struct hci_dev *hdev, struct intel_version_tlv *ver);



struct regmap *btintel_regmap_init(struct hci_dev *hdev, u16 opcode_read,

				   u16 opcode_write);

int btintel_send_intel_reset(struct hci_dev *hdev, u32 boot_param);
@@ -165,16 +200,10 @@ int btintel_read_boot_params(struct hci_dev *hdev, 
			     struct intel_boot_params *params);

int btintel_download_firmware(struct hci_dev *dev, struct intel_version *ver,

			      const struct firmware *fw, u32 *boot_param);

int btintel_download_firmware_newgen(struct hci_dev *hdev,

				     struct intel_version_tlv *ver,

				     const struct firmware *fw,

				     u32 *boot_param, u8 hw_variant,

				     u8 sbe_type);

void btintel_reset_to_bootloader(struct hci_dev *hdev);

int btintel_read_debug_features(struct hci_dev *hdev,

				struct intel_debug_features *features);

int btintel_set_debug_features(struct hci_dev *hdev,

			       const struct intel_debug_features *features);

int btintel_configure_setup(struct hci_dev *hdev);

void btintel_bootup(struct hci_dev *hdev, const void *ptr, unsigned int len);

void btintel_secure_send_result(struct hci_dev *hdev,

				const void *ptr, unsigned int len);

#else



static inline int btintel_check_bdaddr(struct hci_dev *hdev)
@@ -202,44 +231,18 @@ static inline int btintel_set_diag(struct hci_dev *hdev, bool enable) 
	return -EOPNOTSUPP;

}



static inline int btintel_set_diag_mfg(struct hci_dev *hdev, bool enable)

{

	return -EOPNOTSUPP;

}



static inline void btintel_hw_error(struct hci_dev *hdev, u8 code)

{

}



static inline int btintel_version_info(struct hci_dev *hdev,

				       struct intel_version *ver)

{

	return -EOPNOTSUPP;

}



static inline int btintel_version_info_tlv(struct hci_dev *hdev,

					   struct intel_version_tlv *version)

{

	return -EOPNOTSUPP;

}



static inline int btintel_secure_send(struct hci_dev *hdev, u8 fragment_type,

				      u32 plen, const void *param)

{

	return -EOPNOTSUPP;

}



static inline int btintel_load_ddc_config(struct hci_dev *hdev,

					  const char *ddc_name)

{

	return -EOPNOTSUPP;

}



static inline int btintel_set_event_mask(struct hci_dev *hdev, bool debug)

{

	return -EOPNOTSUPP;

}



static inline int btintel_set_event_mask_mfg(struct hci_dev *hdev, bool debug)

{

	return -EOPNOTSUPP;
@@ -251,12 +254,6 @@ static inline int btintel_read_version(struct hci_dev *hdev, 
	return -EOPNOTSUPP;

}



static inline int btintel_read_version_tlv(struct hci_dev *hdev,

					   struct intel_version_tlv *ver)

{

	return -EOPNOTSUPP;

}



static inline struct regmap *btintel_regmap_init(struct hci_dev *hdev,

						 u16 opcode_read,

						 u16 opcode_write)
@@ -283,28 +280,18 @@ static inline int btintel_download_firmware(struct hci_dev *dev, 
	return -EOPNOTSUPP;

}



static inline int btintel_download_firmware_newgen(struct hci_dev *hdev,

						   const struct firmware *fw,

						   u32 *boot_param,

						   u8 hw_variant, u8 sbe_type)

{

	return -EOPNOTSUPP;

}



static inline void btintel_reset_to_bootloader(struct hci_dev *hdev)

static inline int btintel_configure_setup(struct hci_dev *hdev)

{

	return -ENODEV;

}



static inline int btintel_read_debug_features(struct hci_dev *hdev,

					      struct intel_debug_features *features)

static inline void btintel_bootup(struct hci_dev *hdev,

				  const void *ptr, unsigned int len)

{

	return -EOPNOTSUPP;

}



static inline int btintel_set_debug_features(struct hci_dev *hdev,

					     const struct intel_debug_features *features)

static inline void btintel_secure_send_result(struct hci_dev *hdev,

				const void *ptr, unsigned int len)

{

	return -EOPNOTSUPP;

}



#endif

drivers/bluetooth/btmrvl_sdio.c

+14 −15
Original line number Diff line number Diff line
@@ -1350,6 +1350,7 @@ static void btmrvl_sdio_coredump(struct device *dev) 
	u8 *dbg_ptr, *end_ptr, *fw_dump_data, *fw_dump_ptr;

	u8 dump_num = 0, idx, i, read_reg, doneflag = 0;

	u32 memory_size, fw_dump_len = 0;

	int size = 0;



	card = sdio_get_drvdata(func);

	priv = card->priv;
@@ -1493,20 +1494,18 @@ static void btmrvl_sdio_coredump(struct device *dev) 
		struct memory_type_mapping *entry = &mem_type_mapping_tbl[idx];



		if (entry->mem_ptr) {

			strcpy(fw_dump_ptr, "========Start dump ");

			fw_dump_ptr += strlen("========Start dump ");



			strcpy(fw_dump_ptr, entry->mem_name);

			fw_dump_ptr += strlen(entry->mem_name);



			strcpy(fw_dump_ptr, "========\n");

			fw_dump_ptr += strlen("========\n");

			size += scnprintf(fw_dump_ptr + size,

					  fw_dump_len + 1 - size,

					  "========Start dump %s========\n",

					  entry->mem_name);



			memcpy(fw_dump_ptr, entry->mem_ptr, entry->mem_size);

			fw_dump_ptr += entry->mem_size;

			memcpy(fw_dump_ptr + size, entry->mem_ptr,

			       entry->mem_size);

			size += entry->mem_size;



			strcpy(fw_dump_ptr, "\n========End dump========\n");

			fw_dump_ptr += strlen("\n========End dump========\n");

			size += scnprintf(fw_dump_ptr + size,

					  fw_dump_len + 1 - size,

					  "\n========End dump========\n");



			vfree(mem_type_mapping_tbl[idx].mem_ptr);

			mem_type_mapping_tbl[idx].mem_ptr = NULL;

drivers/bluetooth/btrsi.c

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

/*

 * Copyright (c) 2017 Redpine Signals Inc.

 *

 * Permission to use, copy, modify, and/or distribute this software for any