Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 973bb97e authored by Marcel Holtmann's avatar Marcel Holtmann
Browse files

Bluetooth: btintel: Add generic function for handling hardware errors 



The handling of hardware error has support for providing a vendor
specific callback to deal with the error. Move the Intel specific
function out of the USB driver into the generic module so that it
can also be utilized by the UART driver.

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

drivers/bluetooth/btintel.c

+34 −0
Original line number Diff line number Diff line
@@ -89,6 +89,40 @@ int btintel_set_bdaddr(struct hci_dev *hdev, const bdaddr_t *bdaddr) 
}

EXPORT_SYMBOL_GPL(btintel_set_bdaddr);



void btintel_hw_error(struct hci_dev *hdev, u8 code)

{

	struct sk_buff *skb;

	u8 type = 0x00;



	BT_ERR("%s: Hardware error 0x%2.2x", hdev->name, code);



	skb = __hci_cmd_sync(hdev, HCI_OP_RESET, 0, NULL, HCI_INIT_TIMEOUT);

	if (IS_ERR(skb)) {

		BT_ERR("%s: Reset after hardware error failed (%ld)",

		       hdev->name, PTR_ERR(skb));

		return;

	}

	kfree_skb(skb);



	skb = __hci_cmd_sync(hdev, 0xfc22, 1, &type, HCI_INIT_TIMEOUT);

	if (IS_ERR(skb)) {

		BT_ERR("%s: Retrieving Intel exception info failed (%ld)",

		       hdev->name, PTR_ERR(skb));

		return;

	}



	if (skb->len != 13) {

		BT_ERR("%s: Exception info size mismatch", hdev->name);

		kfree_skb(skb);

		return;

	}



	BT_ERR("%s: Exception info %s", hdev->name, (char *)(skb->data + 1));



	kfree_skb(skb);

}

EXPORT_SYMBOL_GPL(btintel_hw_error);



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

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

MODULE_VERSION(VERSION);

drivers/bluetooth/btintel.h

+5 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ struct intel_secure_send_result { 


int btintel_check_bdaddr(struct hci_dev *hdev);

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

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



#else
@@ -86,4 +87,8 @@ static inline int btintel_set_bdaddr(struct hci_dev *hdev, const bdaddr_t *bdadd 
	return -EOPNOTSUPP;

}



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

{

}



#endif