Commit 4bb540db 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 2020-07-31

Here's the main bluetooth-next pull request for 5.9:

 - Fix firmware filenames for Marvell chipsets
 - Several suspend-related fixes
 - Addedd mgmt commands for runtime configuration
 - Multiple fixes for Qualcomm-based controllers
 - Add new monitoring feature for mgmt
 - Fix handling of legacy cipher (E4) together with security level 4
 - Add support for Realtek 8822CE controller
 - Fix issues with Chinese controllers using fake VID/PID values
 - Multiple other smaller fixes & improvements
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents bd69058f 075f7732

Documentation/devicetree/bindings/net/realtek-bluetooth.yaml

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ examples: 
    uart1 {

        pinctrl-names = "default";

        pinctrl-0 = <&uart1_pins>, <&uart1_rts_cts_pins>;

        uart-has-rtscts = <1>;

        uart-has-rtscts;



        bluetooth {

            compatible = "realtek,rtl8723bs-bt";

drivers/bluetooth/bcm203x.c

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ static void bcm203x_complete(struct urb *urb) 
		}



		data->state = BCM203X_LOAD_FIRMWARE;

		/* fall through */

		fallthrough;

	case BCM203X_LOAD_FIRMWARE:

		if (data->fw_sent == data->fw_size) {

			usb_fill_int_urb(urb, udev, usb_rcvintpipe(udev, BCM203X_IN_EP),

drivers/bluetooth/bluecard_cs.c

+0 −2
Original line number Diff line number Diff line
@@ -295,7 +295,6 @@ static void bluecard_write_wakeup(struct bluecard_info *info) 
				baud_reg = REG_CONTROL_BAUD_RATE_115200;

				break;

			case PKT_BAUD_RATE_57600:

				/* Fall through... */

			default:

				baud_reg = REG_CONTROL_BAUD_RATE_57600;

				break;
@@ -585,7 +584,6 @@ static int bluecard_hci_set_baud_rate(struct hci_dev *hdev, int baud) 
		hci_skb_pkt_type(skb) = PKT_BAUD_RATE_115200;

		break;

	case 57600:

		/* Fall through... */

	default:

		cmd[4] = 0x03;

		hci_skb_pkt_type(skb) = PKT_BAUD_RATE_57600;

drivers/bluetooth/btintel.c

+59 −0
Original line number Diff line number Diff line
@@ -754,6 +754,65 @@ void btintel_reset_to_bootloader(struct hci_dev *hdev) 
}

EXPORT_SYMBOL_GPL(btintel_reset_to_bootloader);



int btintel_read_debug_features(struct hci_dev *hdev,

				struct intel_debug_features *features)

{

	struct sk_buff *skb;

	u8 page_no = 1;



	/* Intel controller supports two pages, each page is of 128-bit

	 * feature bit mask. And each bit defines specific feature support

	 */

	skb = __hci_cmd_sync(hdev, 0xfca6, sizeof(page_no), &page_no,

			     HCI_INIT_TIMEOUT);

	if (IS_ERR(skb)) {

		bt_dev_err(hdev, "Reading supported features failed (%ld)",

			   PTR_ERR(skb));

		return PTR_ERR(skb);

	}



	if (skb->len != (sizeof(features->page1) + 3)) {

		bt_dev_err(hdev, "Supported features event size mismatch");

		kfree_skb(skb);

		return -EILSEQ;

	}



	memcpy(features->page1, skb->data + 3, sizeof(features->page1));



	/* Read the supported features page2 if required in future.

	 */

	kfree_skb(skb);

	return 0;

}

EXPORT_SYMBOL_GPL(btintel_read_debug_features);



int btintel_set_debug_features(struct hci_dev *hdev,

			       const struct intel_debug_features *features)

{

	u8 mask[11] = { 0x0a, 0x92, 0x02, 0x07, 0x00, 0x00, 0x00, 0x00,

			0x00, 0x00, 0x00 };

	struct sk_buff *skb;



	if (!features)

		return -EINVAL;



	if (!(features->page1[0] & 0x3f)) {

		bt_dev_info(hdev, "Telemetry exception format not supported");

		return 0;

	}



	skb = __hci_cmd_sync(hdev, 0xfc8b, 11, mask, HCI_INIT_TIMEOUT);

	if (IS_ERR(skb)) {

		bt_dev_err(hdev, "Setting Intel telemetry ddc write event mask failed (%ld)",

			   PTR_ERR(skb));

		return PTR_ERR(skb);

	}



	kfree_skb(skb);

	return 0;

}

EXPORT_SYMBOL_GPL(btintel_set_debug_features);



MODULE_AUTHOR("Marcel Holtmann <marcel@holtmann.org>");

MODULE_DESCRIPTION("Bluetooth support for Intel devices ver " VERSION);

MODULE_VERSION(VERSION);

drivers/bluetooth/btintel.h

+21 −0
Original line number Diff line number Diff line
@@ -62,6 +62,10 @@ struct intel_reset { 
	__le32   boot_param;

} __packed;



struct intel_debug_features {

	__u8    page1[16];

} __packed;



#if IS_ENABLED(CONFIG_BT_INTEL)



int btintel_check_bdaddr(struct hci_dev *hdev);
@@ -88,6 +92,10 @@ int btintel_read_boot_params(struct hci_dev *hdev, 
int btintel_download_firmware(struct hci_dev *dev, const struct firmware *fw,

			      u32 *boot_param);

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);

#else



static inline int btintel_check_bdaddr(struct hci_dev *hdev)
@@ -186,4 +194,17 @@ static inline int btintel_download_firmware(struct hci_dev *dev, 
static inline void btintel_reset_to_bootloader(struct hci_dev *hdev)

{

}



static inline int btintel_read_debug_features(struct hci_dev *hdev,

					      struct intel_debug_features *features)

{

	return -EOPNOTSUPP;

}



static inline int btintel_set_debug_features(struct hci_dev *hdev,

					     const struct intel_debug_features *features)

{

	return -EOPNOTSUPP;

}



#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE