Commit 57af75a8 authored by Marcel Holtmann's avatar Marcel Holtmann Committed by Johan Hedberg
Browse files

Bluetooth: Add workaround for buggy max_page features page value 



Some controllers list the max_page value from the extended features
response as 0 when SSP has not yet been enabled. To workaround this
issue, force the max_page value to 1 when SSP support has been
detected.

Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
parent dfb826a8

net/bluetooth/hci_core.c

+8 −0
Original line number Diff line number Diff line
@@ -834,6 +834,14 @@ static void hci_init2_req(struct hci_request *req, unsigned long opt) 
		hci_req_add(req, HCI_OP_READ_LOCAL_COMMANDS, 0, NULL);



	if (lmp_ssp_capable(hdev)) {

		/* When SSP is available, then the host features page

		 * should also be available as well. However some

		 * controllers list the max_page as 0 as long as SSP

		 * has not been enabled. To achieve proper debugging

		 * output, force the minimum max_page to 1 at least.

		 */

		hdev->max_page = 0x01;



		if (test_bit(HCI_SSP_ENABLED, &hdev->dev_flags)) {

			u8 mode = 0x01;

			hci_req_add(req, HCI_OP_WRITE_SSP_MODE,

net/bluetooth/hci_event.c

+2 −1
Original line number Diff line number Diff line
@@ -555,6 +555,7 @@ static void hci_cc_read_local_ext_features(struct hci_dev *hdev, 
	if (rp->status)

		return;



	if (hdev->max_page < rp->max_page)

		hdev->max_page = rp->max_page;



	if (rp->page < HCI_MAX_PAGES)

CRA Git | Maintained and supported by SUSTech CRA and CCSE