From: Alex Lu <[email protected]> Realtek Bluetooth controller provides a BT_DIS reset pin for hardware reset of it. The cmd_timeout is helpful on Realtek bluetooth controller where the firmware gets stuck.
Signed-off-by: Alex Lu <[email protected]> --- drivers/bluetooth/btusb.c | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index 31d3febed187..a626de3a3f4c 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -489,16 +489,19 @@ struct btusb_data { int (*setup_on_usb)(struct hci_dev *hdev); int oob_wake_irq; /* irq for out-of-band wake-on-bt */ - unsigned cmd_timeout_cnt; + unsigned int cmd_timeout_cnt; + unsigned int cmd_timeout_max; + unsigned int reset_msecs; + int reset_gpio_value; }; -static void btusb_intel_cmd_timeout(struct hci_dev *hdev) +static void btusb_cmd_timeout(struct hci_dev *hdev) { struct btusb_data *data = hci_get_drvdata(hdev); struct gpio_desc *reset_gpio = data->reset_gpio; - if (++data->cmd_timeout_cnt < 5) + if (++data->cmd_timeout_cnt < data->cmd_timeout_max) return; if (!reset_gpio) { @@ -519,9 +522,9 @@ static void btusb_intel_cmd_timeout(struct hci_dev *hdev) } bt_dev_err(hdev, "Initiating HW reset via gpio"); - gpiod_set_value_cansleep(reset_gpio, 1); - msleep(100); - gpiod_set_value_cansleep(reset_gpio, 0); + gpiod_set_value_cansleep(reset_gpio, data->reset_gpio_value); + msleep(data->reset_msecs); + gpiod_set_value_cansleep(reset_gpio, !data->reset_gpio_value); } static inline void btusb_free_frags(struct btusb_data *data) @@ -3723,7 +3726,10 @@ static int btusb_probe(struct usb_interface *intf, hdev->shutdown = btusb_shutdown_intel; hdev->set_diag = btintel_set_diag_mfg; hdev->set_bdaddr = btintel_set_bdaddr; - hdev->cmd_timeout = btusb_intel_cmd_timeout; + hdev->cmd_timeout = btusb_cmd_timeout; + data->cmd_timeout_max = 5; + data->reset_msecs = 100; + data->reset_gpio_value = 1; set_bit(HCI_QUIRK_STRICT_DUPLICATE_FILTER, &hdev->quirks); set_bit(HCI_QUIRK_SIMULTANEOUS_DISCOVERY, &hdev->quirks); set_bit(HCI_QUIRK_NON_PERSISTENT_DIAG, &hdev->quirks); @@ -3737,7 +3743,10 @@ static int btusb_probe(struct usb_interface *intf, hdev->hw_error = btintel_hw_error; hdev->set_diag = btintel_set_diag; hdev->set_bdaddr = btintel_set_bdaddr; - hdev->cmd_timeout = btusb_intel_cmd_timeout; + hdev->cmd_timeout = btusb_cmd_timeout; + data->cmd_timeout_max = 5; + data->reset_msecs = 100; + data->reset_gpio_value = 1; set_bit(HCI_QUIRK_STRICT_DUPLICATE_FILTER, &hdev->quirks); set_bit(HCI_QUIRK_SIMULTANEOUS_DISCOVERY, &hdev->quirks); set_bit(HCI_QUIRK_NON_PERSISTENT_DIAG, &hdev->quirks); @@ -3783,6 +3792,10 @@ static int btusb_probe(struct usb_interface *intf, if (id->driver_info & BTUSB_REALTEK) { hdev->setup = btrtl_setup_realtek; hdev->shutdown = btrtl_shutdown_realtek; + hdev->cmd_timeout = btusb_cmd_timeout; + data->cmd_timeout_max = 5; + data->reset_msecs = 200; + data->reset_gpio_value = 0; /* Realtek devices lose their updated firmware over global * suspend that means host doesn't send SET_FEATURE -- 2.21.0
