Linux-Bluetooth Archive on lore.kernel.org
 help / color / Atom feed
* [PATCH] Bluetooth: btusb: Trigger Intel FW download error recovery
@ 2019-09-26  6:43 Amit K Bag
  2019-09-27  6:38 ` Marcel Holtmann
  0 siblings, 1 reply; 7+ messages in thread
From: Amit K Bag @ 2019-09-26  6:43 UTC (permalink / raw)
  To: linux-bluetooth
  Cc: ravishankar.srivatsa, chethan.tumkur.narayan, Amit K Bag, Raghuram Hegde

Sometimes during FW data download stage, in case of an error is
encountered the controller device could not be recovered. To recover
from such failures send Intel hard Reset to re-trigger FW download in
following error scenarios:

1. Intel Read version command error
2. Firmware download timeout
3. Failure in Intel Soft Reset for switching to operational FW
4. Boot timeout for switching to operaional FW

Signed-off-by: Raghuram Hegde <raghuram.hegde@intel.com>
Signed-off-by: Chethan T N <chethan.tumkur.narayan@intel.com>
Signed-off-by: Amit K Bag <amit.k.bag@intel.com>
---
 drivers/bluetooth/btintel.c | 39 +++++++++++++++++++++++++++++++++++++++
 drivers/bluetooth/btintel.h |  6 ++++++
 drivers/bluetooth/btusb.c   | 20 ++++++++++++++++----
 3 files changed, 61 insertions(+), 4 deletions(-)

diff --git a/drivers/bluetooth/btintel.c b/drivers/bluetooth/btintel.c
index bb99c8653aab..fdec9c53b48d 100644
--- a/drivers/bluetooth/btintel.c
+++ b/drivers/bluetooth/btintel.c
@@ -709,6 +709,45 @@ int btintel_download_firmware(struct hci_dev *hdev, const struct firmware *fw,
 }
 EXPORT_SYMBOL_GPL(btintel_download_firmware);
 
+void btintel_retry_fw_download(struct hci_dev *hdev)
+{
+	/* Send Intel Reset command. This will result in
+	 * re-enumeration of BT controller.
+	 *
+	 * Intel Reset parameter description:
+	 * reset_param[0] => reset_type : 0x01 (Hard reset),
+					  0x00 (Soft reset)
+	 * reset_param[1] => patch_enable : 0x01 (Enable),
+	 *				    0x00 (Do not enable)
+	 * reset_param[2] => ddc_reload : 0x01 (Reload),
+	 *				  0x00 (Do not reload)
+	 * reset_param[3] => boot_option: 0x00 (Current image),
+					  0x01 (Specified boot address)
+	 * reset_param[4] to reset_param[7] => Boot address
+	 *
+	 */
+	static const u8 reset_param[] = { 0x01, 0x01, 0x01, 0x00,
+					0x00, 0x00, 0x00, 0x00 };
+	struct sk_buff *skb;
+
+	skb = __hci_cmd_sync(hdev, 0xfc01, sizeof(reset_param),
+				reset_param, HCI_INIT_TIMEOUT);
+	if (IS_ERR(skb)) {
+		bt_dev_err(hdev, "FW download error recovery failed (%ld)",
+				PTR_ERR(skb));
+		return;
+	}
+	bt_dev_info(hdev, "Intel reset sent to retry FW download");
+	kfree_skb(skb);
+	/* Current Intel BT controllers(ThP/JfP) hold the USB reset
+	 * lines for 2ms when it receives Intel Reset in bootloader mode.
+	 * Whereas, the upcoming Intel BT controllers will hold USB reset
+	 * for 150ms. To keep the delay generic, 150ms is chosen here.
+	 */
+	msleep(150);
+}
+EXPORT_SYMBOL_GPL(btintel_retry_fw_download);
+
 MODULE_AUTHOR("Marcel Holtmann <marcel@holtmann.org>");
 MODULE_DESCRIPTION("Bluetooth support for Intel devices ver " VERSION);
 MODULE_VERSION(VERSION);
diff --git a/drivers/bluetooth/btintel.h b/drivers/bluetooth/btintel.h
index 3d846190f2bf..d04d3c7cb513 100644
--- a/drivers/bluetooth/btintel.h
+++ b/drivers/bluetooth/btintel.h
@@ -87,6 +87,7 @@ int btintel_read_boot_params(struct hci_dev *hdev,
 			     struct intel_boot_params *params);
 int btintel_download_firmware(struct hci_dev *dev, const struct firmware *fw,
 			      u32 *boot_param);
+void btintel_retry_fw_download(struct hci_dev *hdev);
 #else
 
 static inline int btintel_check_bdaddr(struct hci_dev *hdev)
@@ -181,4 +182,9 @@ static inline int btintel_download_firmware(struct hci_dev *dev,
 {
 	return -EOPNOTSUPP;
 }
+
+static inline void btintel_retry_fw_download(struct hci_dev *hdev)
+{
+	return -EOPNOTSUPP;
+}
 #endif
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index a9c35ebb30f8..7a763bd856ba 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -1846,8 +1846,11 @@ static int btusb_setup_intel(struct hci_dev *hdev)
 	 * firmware variant, revision and build number.
 	 */
 	err = btintel_read_version(hdev, &ver);
-	if (err)
+	if (err) {
+		bt_dev_err(hdev, "Intel Read version failed (%d)", err);
+		btintel_retry_fw_download(hdev);
 		return err;
+	}
 
 	bt_dev_info(hdev, "read Intel version: %02x%02x%02x%02x%02x%02x%02x%02x%02x",
 		    ver.hw_platform, ver.hw_variant, ver.hw_revision,
@@ -2326,9 +2329,13 @@ static int btusb_setup_intel_new(struct hci_dev *hdev)
 
 	/* Start firmware downloading and get boot parameter */
 	err = btintel_download_firmware(hdev, fw, &boot_param);
-	if (err < 0)
+	if (err < 0) {
+		/* When FW download fails, send Intel Reset to retry
+		 * FW download.
+		 */
+		btintel_retry_fw_download(hdev);
 		goto done;
-
+	}
 	set_bit(BTUSB_FIRMWARE_LOADED, &data->flags);
 
 	bt_dev_info(hdev, "Waiting for firmware download to complete");
@@ -2355,6 +2362,7 @@ static int btusb_setup_intel_new(struct hci_dev *hdev)
 	if (err) {
 		bt_dev_err(hdev, "Firmware loading timeout");
 		err = -ETIMEDOUT;
+		btintel_retry_fw_download(hdev);
 		goto done;
 	}
 
@@ -2381,8 +2389,11 @@ static int btusb_setup_intel_new(struct hci_dev *hdev)
 	set_bit(BTUSB_BOOTING, &data->flags);
 
 	err = btintel_send_intel_reset(hdev, boot_param);
-	if (err)
+	if (err) {
+		bt_dev_err(hdev, "Intel Soft Reset failed (%d)", err);
+		btintel_retry_fw_download(hdev);
 		return err;
+	}
 
 	/* The bootloader will not indicate when the device is ready. This
 	 * is done by the operational firmware sending bootup notification.
@@ -2404,6 +2415,7 @@ static int btusb_setup_intel_new(struct hci_dev *hdev)
 
 	if (err) {
 		bt_dev_err(hdev, "Device boot timeout");
+		btintel_retry_fw_download(hdev);
 		return -ETIMEDOUT;
 	}
 
-- 
2.7.4


^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH] Bluetooth: btusb: Trigger Intel FW download error recovery
  2019-09-26  6:43 [PATCH] Bluetooth: btusb: Trigger Intel FW download error recovery Amit K Bag
@ 2019-09-27  6:38 ` Marcel Holtmann
  2019-09-27  7:27   ` Bag, Amit K
  0 siblings, 1 reply; 7+ messages in thread
From: Marcel Holtmann @ 2019-09-27  6:38 UTC (permalink / raw)
  To: Amit K Bag
  Cc: linux-bluetooth, ravishankar.srivatsa, chethan.tumkur.narayan,
	Raghuram Hegde

Hi Amit,

> Sometimes during FW data download stage, in case of an error is
> encountered the controller device could not be recovered. To recover
> from such failures send Intel hard Reset to re-trigger FW download in
> following error scenarios:
> 
> 1. Intel Read version command error
> 2. Firmware download timeout
> 3. Failure in Intel Soft Reset for switching to operational FW
> 4. Boot timeout for switching to operaional FW
> 
> Signed-off-by: Raghuram Hegde <raghuram.hegde@intel.com>
> Signed-off-by: Chethan T N <chethan.tumkur.narayan@intel.com>
> Signed-off-by: Amit K Bag <amit.k.bag@intel.com>
> ---
> drivers/bluetooth/btintel.c | 39 +++++++++++++++++++++++++++++++++++++++
> drivers/bluetooth/btintel.h |  6 ++++++
> drivers/bluetooth/btusb.c   | 20 ++++++++++++++++----
> 3 files changed, 61 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/bluetooth/btintel.c b/drivers/bluetooth/btintel.c
> index bb99c8653aab..fdec9c53b48d 100644
> --- a/drivers/bluetooth/btintel.c
> +++ b/drivers/bluetooth/btintel.c
> @@ -709,6 +709,45 @@ int btintel_download_firmware(struct hci_dev *hdev, const struct firmware *fw,
> }
> EXPORT_SYMBOL_GPL(btintel_download_firmware);
> 
> +void btintel_retry_fw_download(struct hci_dev *hdev)
> +{
> +	/* Send Intel Reset command. This will result in
> +	 * re-enumeration of BT controller.
> +	 *
> +	 * Intel Reset parameter description:
> +	 * reset_param[0] => reset_type : 0x01 (Hard reset),
> +					  0x00 (Soft reset)
> +	 * reset_param[1] => patch_enable : 0x01 (Enable),
> +	 *				    0x00 (Do not enable)
> +	 * reset_param[2] => ddc_reload : 0x01 (Reload),
> +	 *				  0x00 (Do not reload)
> +	 * reset_param[3] => boot_option: 0x00 (Current image),
> +					  0x01 (Specified boot address)
> +	 * reset_param[4] to reset_param[7] => Boot address
> +	 *
> +	 */
> +	static const u8 reset_param[] = { 0x01, 0x01, 0x01, 0x00,
> +					0x00, 0x00, 0x00, 0x00 };

please use intel_reset structure and add the comments when assigning the fields.

> +	struct sk_buff *skb;
> +
> +	skb = __hci_cmd_sync(hdev, 0xfc01, sizeof(reset_param),
> +				reset_param, HCI_INIT_TIMEOUT);

please align the second line according to the coding style.

> +	if (IS_ERR(skb)) {
> +		bt_dev_err(hdev, "FW download error recovery failed (%ld)",
> +				PTR_ERR(skb));

Same as above.

> +		return;
> +	}
> +	bt_dev_info(hdev, "Intel reset sent to retry FW download");
> +	kfree_skb(skb);

Extra empty line here.

> +	/* Current Intel BT controllers(ThP/JfP) hold the USB reset
> +	 * lines for 2ms when it receives Intel Reset in bootloader mode.
> +	 * Whereas, the upcoming Intel BT controllers will hold USB reset
> +	 * for 150ms. To keep the delay generic, 150ms is chosen here.
> +	 */
> +	msleep(150);
> +}
> +EXPORT_SYMBOL_GPL(btintel_retry_fw_download);
> +

I do not like the name here. Using btintel_reset_to_bootloader would be better. Since the function itself is not going to do the firmware retry. It will just drop you back into boot loader.

However the more important question is what happens if you send this command. Is the device re-enumerating on USB? Or after the 150ms we just have to redo the firmware download.

> MODULE_AUTHOR("Marcel Holtmann <marcel@holtmann.org>");
> MODULE_DESCRIPTION("Bluetooth support for Intel devices ver " VERSION);
> MODULE_VERSION(VERSION);
> diff --git a/drivers/bluetooth/btintel.h b/drivers/bluetooth/btintel.h
> index 3d846190f2bf..d04d3c7cb513 100644
> --- a/drivers/bluetooth/btintel.h
> +++ b/drivers/bluetooth/btintel.h
> @@ -87,6 +87,7 @@ int btintel_read_boot_params(struct hci_dev *hdev,
> 			     struct intel_boot_params *params);
> int btintel_download_firmware(struct hci_dev *dev, const struct firmware *fw,
> 			      u32 *boot_param);
> +void btintel_retry_fw_download(struct hci_dev *hdev);
> #else
> 
> static inline int btintel_check_bdaddr(struct hci_dev *hdev)
> @@ -181,4 +182,9 @@ static inline int btintel_download_firmware(struct hci_dev *dev,
> {
> 	return -EOPNOTSUPP;
> }
> +
> +static inline void btintel_retry_fw_download(struct hci_dev *hdev)
> +{
> +	return -EOPNOTSUPP;
> +}
> #endif
> diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
> index a9c35ebb30f8..7a763bd856ba 100644
> --- a/drivers/bluetooth/btusb.c
> +++ b/drivers/bluetooth/btusb.c
> @@ -1846,8 +1846,11 @@ static int btusb_setup_intel(struct hci_dev *hdev)
> 	 * firmware variant, revision and build number.
> 	 */
> 	err = btintel_read_version(hdev, &ver);
> -	if (err)
> +	if (err) {
> +		bt_dev_err(hdev, "Intel Read version failed (%d)", err);
> +		btintel_retry_fw_download(hdev);
> 		return err;
> +	}
> 
> 	bt_dev_info(hdev, "read Intel version: %02x%02x%02x%02x%02x%02x%02x%02x%02x",
> 		    ver.hw_platform, ver.hw_variant, ver.hw_revision,
> @@ -2326,9 +2329,13 @@ static int btusb_setup_intel_new(struct hci_dev *hdev)
> 
> 	/* Start firmware downloading and get boot parameter */
> 	err = btintel_download_firmware(hdev, fw, &boot_param);
> -	if (err < 0)
> +	if (err < 0) {
> +		/* When FW download fails, send Intel Reset to retry
> +		 * FW download.
> +		 */
> +		btintel_retry_fw_download(hdev);
> 		goto done;

Is this actually going to work? If you jump to done, then you end up sending intel soft reset and then waiting for the device to boot. If you are lucky it times out, if not, then you end up loading DCC now.

If the device re-enumerates on USB, then we need an extra jump point to just release the firmware memory and then just exit hdev->setup. If are suppose to just retry, then we need to actually start over.

So have you actually tested this by randomly failing each step in the firmware download process.

Regards

Marcel


^ permalink raw reply	[flat|nested] 7+ messages in thread

* RE: [PATCH] Bluetooth: btusb: Trigger Intel FW download error recovery
  2019-09-27  6:38 ` Marcel Holtmann
@ 2019-09-27  7:27   ` Bag, Amit K
  2019-09-30 10:40     ` Marcel Holtmann
  0 siblings, 1 reply; 7+ messages in thread
From: Bag, Amit K @ 2019-09-27  7:27 UTC (permalink / raw)
  To: Marcel Holtmann
  Cc: linux-bluetooth, Srivatsa, Ravishankar, Tumkur Narayan, Chethan,
	Hegde, Raghuram

>Hi Amit,
>
>> Sometimes during FW data download stage, in case of an error is 
>> encountered the controller device could not be recovered. To recover 
>> from such failures send Intel hard Reset to re-trigger FW download in 
>> following error scenarios:
>> 
>> 1. Intel Read version command error
>> 2. Firmware download timeout
>> 3. Failure in Intel Soft Reset for switching to operational FW 4. Boot 
>> timeout for switching to operaional FW
>> 
>> Signed-off-by: Raghuram Hegde <raghuram.hegde@intel.com>
>> Signed-off-by: Chethan T N <chethan.tumkur.narayan@intel.com>
>> Signed-off-by: Amit K Bag <amit.k.bag@intel.com>
>> ---
>> drivers/bluetooth/btintel.c | 39 
>> +++++++++++++++++++++++++++++++++++++++
>> drivers/bluetooth/btintel.h |  6 ++++++
>> drivers/bluetooth/btusb.c   | 20 ++++++++++++++++----
>> 3 files changed, 61 insertions(+), 4 deletions(-)
>> 
>> diff --git a/drivers/bluetooth/btintel.c b/drivers/bluetooth/btintel.c 
>> index bb99c8653aab..fdec9c53b48d 100644
>> --- a/drivers/bluetooth/btintel.c
>> +++ b/drivers/bluetooth/btintel.c
>> @@ -709,6 +709,45 @@ int btintel_download_firmware(struct hci_dev 
>> *hdev, const struct firmware *fw, } 
>> EXPORT_SYMBOL_GPL(btintel_download_firmware);
>> 
>> +void btintel_retry_fw_download(struct hci_dev *hdev) {
>> +	/* Send Intel Reset command. This will result in
>> +	 * re-enumeration of BT controller.
>> +	 *
>> +	 * Intel Reset parameter description:
>> +	 * reset_param[0] => reset_type : 0x01 (Hard reset),
>> +					  0x00 (Soft reset)
>> +	 * reset_param[1] => patch_enable : 0x01 (Enable),
>> +	 *				    0x00 (Do not enable)
>> +	 * reset_param[2] => ddc_reload : 0x01 (Reload),
>> +	 *				  0x00 (Do not reload)
>> +	 * reset_param[3] => boot_option: 0x00 (Current image),
>> +					  0x01 (Specified boot address)
>> +	 * reset_param[4] to reset_param[7] => Boot address
>> +	 *
>> +	 */
>> +	static const u8 reset_param[] = { 0x01, 0x01, 0x01, 0x00,
>> +					0x00, 0x00, 0x00, 0x00 };

pplease use intel_reset structure and add the comments when assigning the fields.

>> +	struct sk_buff *skb;
>> +
>> +	skb = __hci_cmd_sync(hdev, 0xfc01, sizeof(reset_param),
>> +				reset_param, HCI_INIT_TIMEOUT);

pplease align the second line according to the coding style.

>> +	if (IS_ERR(skb)) {
>> +		bt_dev_err(hdev, "FW download error recovery failed (%ld)",
>> +				PTR_ERR(skb));

SSame as above.

>> +		return;
>> +	}
>> +	bt_dev_info(hdev, "Intel reset sent to retry FW download");
>> +	kfree_skb(skb);

EExtra empty line here.

>> +	/* Current Intel BT controllers(ThP/JfP) hold the USB reset
>> +	 * lines for 2ms when it receives Intel Reset in bootloader mode.
>> +	 * Whereas, the upcoming Intel BT controllers will hold USB reset
>> +	 * for 150ms. To keep the delay generic, 150ms is chosen here.
>> +	 */
>> +	msleep(150);
>> +}
>> +EXPORT_SYMBOL_GPL(btintel_retry_fw_download);
>> +

II do not like the name here. Using btintel_reset_to_bootloader would be better. Since the function itself is not going to do the firmware retry. It will just drop you back into boot loader.

HHowever the more important question is what happens if you send this command. Is the device re-enumerating on USB? Or after the 150ms we just have to redo the firmware download.

>> MODULE_AUTHOR("Marcel Holtmann <marcel@holtmann.org>"); 
>> MODULE_DESCRIPTION("Bluetooth support for Intel devices ver " 
>> VERSION); MODULE_VERSION(VERSION); diff --git 
>> a/drivers/bluetooth/btintel.h b/drivers/bluetooth/btintel.h index 
>> 3d846190f2bf..d04d3c7cb513 100644
>> --- a/drivers/bluetooth/btintel.h
>> +++ b/drivers/bluetooth/btintel.h
>> @@ -87,6 +87,7 @@ int btintel_read_boot_params(struct hci_dev *hdev,
>> 			     struct intel_boot_params *params); int 
>> btintel_download_firmware(struct hci_dev *dev, const struct firmware *fw,
>> 			      u32 *boot_param);
>> +void btintel_retry_fw_download(struct hci_dev *hdev);
>> #else
>> 
>> static inline int btintel_check_bdaddr(struct hci_dev *hdev) @@ -181,4 
>> +182,9 @@ static inline int btintel_download_firmware(struct hci_dev 
>> *dev, {
>> 	return -EOPNOTSUPP;
>> }
>> +
>> +static inline void btintel_retry_fw_download(struct hci_dev *hdev) {
>> +	return -EOPNOTSUPP;
>> +}
>> #endif
>> diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c 
>> index a9c35ebb30f8..7a763bd856ba 100644
>> --- a/drivers/bluetooth/btusb.c
>> +++ b/drivers/bluetooth/btusb.c
>> @@ -1846,8 +1846,11 @@ static int btusb_setup_intel(struct hci_dev *hdev)
>> 	 * firmware variant, revision and build number.
>> 	 */
>> 	err = btintel_read_version(hdev, &ver);
>> -	if (err)
>> +	if (err) {
>> +		bt_dev_err(hdev, "Intel Read version failed (%d)", err);
>> +		btintel_retry_fw_download(hdev);
>> 		return err;
>> +	}
>> 
>> 	bt_dev_info(hdev, "read Intel version: %02x%02x%02x%02x%02x%02x%02x%02x%02x",
>> 		    ver.hw_platform, ver.hw_variant, ver.hw_revision, @@ -2326,9 
>> +2329,13 @@ static int btusb_setup_intel_new(struct hci_dev *hdev)
>> 
>> 	/* Start firmware downloading and get boot parameter */
>> 	err = btintel_download_firmware(hdev, fw, &boot_param);
>> -	if (err < 0)
>> +	if (err < 0) {
>> +		/* When FW download fails, send Intel Reset to retry
>> +		 * FW download.
>> +		 */
>> +		btintel_retry_fw_download(hdev);
>> 		goto done;
>
>Is this actually going to work? If you jump to done, then you end up sending intel soft reset and then waiting for the device to boot. If you are lucky it times out, if not, then you end up loading DCC now.
>
>If the device re-enumerates on USB, then we need an extra jump point to just release the firmware memory and then just exit hdev->setup. If are suppose to just retry, then we need to actually start over.
>
>So have you actually tested this by randomly failing each step in the firmware download process.
>
We send hard reset which will re-emumerates BT USB device and  initialize usb driver. 
We have tested all the scenario and its working fine.

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH] Bluetooth: btusb: Trigger Intel FW download error recovery
  2019-09-27  7:27   ` Bag, Amit K
@ 2019-09-30 10:40     ` Marcel Holtmann
  2019-09-30 11:13       ` Bag, Amit K
  0 siblings, 1 reply; 7+ messages in thread
From: Marcel Holtmann @ 2019-09-30 10:40 UTC (permalink / raw)
  To: Bag, Amit K
  Cc: linux-bluetooth, Srivatsa, Ravishankar, Tumkur Narayan, Chethan,
	Hegde, Raghuram

Hi Amit,

>>> Sometimes during FW data download stage, in case of an error is 
>>> encountered the controller device could not be recovered. To recover 
>>> from such failures send Intel hard Reset to re-trigger FW download in 
>>> following error scenarios:
>>> 
>>> 1. Intel Read version command error
>>> 2. Firmware download timeout
>>> 3. Failure in Intel Soft Reset for switching to operational FW 4. Boot 
>>> timeout for switching to operaional FW
>>> 
>>> Signed-off-by: Raghuram Hegde <raghuram.hegde@intel.com>
>>> Signed-off-by: Chethan T N <chethan.tumkur.narayan@intel.com>
>>> Signed-off-by: Amit K Bag <amit.k.bag@intel.com>
>>> ---
>>> drivers/bluetooth/btintel.c | 39 
>>> +++++++++++++++++++++++++++++++++++++++
>>> drivers/bluetooth/btintel.h |  6 ++++++
>>> drivers/bluetooth/btusb.c   | 20 ++++++++++++++++----
>>> 3 files changed, 61 insertions(+), 4 deletions(-)
>>> 
>>> diff --git a/drivers/bluetooth/btintel.c b/drivers/bluetooth/btintel.c 
>>> index bb99c8653aab..fdec9c53b48d 100644
>>> --- a/drivers/bluetooth/btintel.c
>>> +++ b/drivers/bluetooth/btintel.c
>>> @@ -709,6 +709,45 @@ int btintel_download_firmware(struct hci_dev 
>>> *hdev, const struct firmware *fw, } 
>>> EXPORT_SYMBOL_GPL(btintel_download_firmware);
>>> 
>>> +void btintel_retry_fw_download(struct hci_dev *hdev) {
>>> +	/* Send Intel Reset command. This will result in
>>> +	 * re-enumeration of BT controller.
>>> +	 *
>>> +	 * Intel Reset parameter description:
>>> +	 * reset_param[0] => reset_type : 0x01 (Hard reset),
>>> +					  0x00 (Soft reset)
>>> +	 * reset_param[1] => patch_enable : 0x01 (Enable),
>>> +	 *				    0x00 (Do not enable)
>>> +	 * reset_param[2] => ddc_reload : 0x01 (Reload),
>>> +	 *				  0x00 (Do not reload)
>>> +	 * reset_param[3] => boot_option: 0x00 (Current image),
>>> +					  0x01 (Specified boot address)
>>> +	 * reset_param[4] to reset_param[7] => Boot address
>>> +	 *
>>> +	 */
>>> +	static const u8 reset_param[] = { 0x01, 0x01, 0x01, 0x00,
>>> +					0x00, 0x00, 0x00, 0x00 };
> 
> pplease use intel_reset structure and add the comments when assigning the fields.
> 
>>> +	struct sk_buff *skb;
>>> +
>>> +	skb = __hci_cmd_sync(hdev, 0xfc01, sizeof(reset_param),
>>> +				reset_param, HCI_INIT_TIMEOUT);
> 
> pplease align the second line according to the coding style.
> 
>>> +	if (IS_ERR(skb)) {
>>> +		bt_dev_err(hdev, "FW download error recovery failed (%ld)",
>>> +				PTR_ERR(skb));
> 
> SSame as above.
> 
>>> +		return;
>>> +	}
>>> +	bt_dev_info(hdev, "Intel reset sent to retry FW download");
>>> +	kfree_skb(skb);
> 
> EExtra empty line here.
> 
>>> +	/* Current Intel BT controllers(ThP/JfP) hold the USB reset
>>> +	 * lines for 2ms when it receives Intel Reset in bootloader mode.
>>> +	 * Whereas, the upcoming Intel BT controllers will hold USB reset
>>> +	 * for 150ms. To keep the delay generic, 150ms is chosen here.
>>> +	 */
>>> +	msleep(150);
>>> +}
>>> +EXPORT_SYMBOL_GPL(btintel_retry_fw_download);
>>> +
> 
> II do not like the name here. Using btintel_reset_to_bootloader would be better. Since the function itself is not going to do the firmware retry. It will just drop you back into boot loader.
> 
> HHowever the more important question is what happens if you send this command. Is the device re-enumerating on USB? Or after the 150ms we just have to redo the firmware download.
> 
>>> MODULE_AUTHOR("Marcel Holtmann <marcel@holtmann.org>"); 
>>> MODULE_DESCRIPTION("Bluetooth support for Intel devices ver " 
>>> VERSION); MODULE_VERSION(VERSION); diff --git 
>>> a/drivers/bluetooth/btintel.h b/drivers/bluetooth/btintel.h index 
>>> 3d846190f2bf..d04d3c7cb513 100644
>>> --- a/drivers/bluetooth/btintel.h
>>> +++ b/drivers/bluetooth/btintel.h
>>> @@ -87,6 +87,7 @@ int btintel_read_boot_params(struct hci_dev *hdev,
>>> 			     struct intel_boot_params *params); int 
>>> btintel_download_firmware(struct hci_dev *dev, const struct firmware *fw,
>>> 			      u32 *boot_param);
>>> +void btintel_retry_fw_download(struct hci_dev *hdev);
>>> #else
>>> 
>>> static inline int btintel_check_bdaddr(struct hci_dev *hdev) @@ -181,4 
>>> +182,9 @@ static inline int btintel_download_firmware(struct hci_dev 
>>> *dev, {
>>> 	return -EOPNOTSUPP;
>>> }
>>> +
>>> +static inline void btintel_retry_fw_download(struct hci_dev *hdev) {
>>> +	return -EOPNOTSUPP;
>>> +}
>>> #endif
>>> diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c 
>>> index a9c35ebb30f8..7a763bd856ba 100644
>>> --- a/drivers/bluetooth/btusb.c
>>> +++ b/drivers/bluetooth/btusb.c
>>> @@ -1846,8 +1846,11 @@ static int btusb_setup_intel(struct hci_dev *hdev)
>>> 	 * firmware variant, revision and build number.
>>> 	 */
>>> 	err = btintel_read_version(hdev, &ver);
>>> -	if (err)
>>> +	if (err) {
>>> +		bt_dev_err(hdev, "Intel Read version failed (%d)", err);
>>> +		btintel_retry_fw_download(hdev);
>>> 		return err;
>>> +	}
>>> 
>>> 	bt_dev_info(hdev, "read Intel version: %02x%02x%02x%02x%02x%02x%02x%02x%02x",
>>> 		    ver.hw_platform, ver.hw_variant, ver.hw_revision, @@ -2326,9 
>>> +2329,13 @@ static int btusb_setup_intel_new(struct hci_dev *hdev)
>>> 
>>> 	/* Start firmware downloading and get boot parameter */
>>> 	err = btintel_download_firmware(hdev, fw, &boot_param);
>>> -	if (err < 0)
>>> +	if (err < 0) {
>>> +		/* When FW download fails, send Intel Reset to retry
>>> +		 * FW download.
>>> +		 */
>>> +		btintel_retry_fw_download(hdev);
>>> 		goto done;
>> 
>> Is this actually going to work? If you jump to done, then you end up sending intel soft reset and then waiting for the device to boot. If you are lucky it times out, if not, then you end up loading DCC now.
>> 
>> If the device re-enumerates on USB, then we need an extra jump point to just release the firmware memory and then just exit hdev->setup. If are suppose to just retry, then we need to actually start over.
>> 
>> So have you actually tested this by randomly failing each step in the firmware download process.
>> 
> We send hard reset which will re-emumerates BT USB device and  initialize usb driver. 
> We have tested all the scenario and its working fine.

that is fine. However when this happens we should try to exit without sending any further commands. So we will need a separate exit path then.

Regards

Marcel


^ permalink raw reply	[flat|nested] 7+ messages in thread

* RE: [PATCH] Bluetooth: btusb: Trigger Intel FW download error recovery
  2019-09-30 10:40     ` Marcel Holtmann
@ 2019-09-30 11:13       ` Bag, Amit K
  2019-09-30 11:46         ` Marcel Holtmann
  0 siblings, 1 reply; 7+ messages in thread
From: Bag, Amit K @ 2019-09-30 11:13 UTC (permalink / raw)
  To: Marcel Holtmann
  Cc: linux-bluetooth, Srivatsa, Ravishankar, Tumkur Narayan, Chethan,
	Hegde, Raghuram

>Hi Amit,
>
>>>> Sometimes during FW data download stage, in case of an error is 
>>>> encountered the controller device could not be recovered. To recover 
>>>> from such failures send Intel hard Reset to re-trigger FW download 
>>>> in following error scenarios:
>>>> 
>>>> 1. Intel Read version command error
>>>> 2. Firmware download timeout
>>>> 3. Failure in Intel Soft Reset for switching to operational FW 4. 
>>>> Boot timeout for switching to operaional FW
>>>> 
>>>> Signed-off-by: Raghuram Hegde <raghuram.hegde@intel.com>
>>>> Signed-off-by: Chethan T N <chethan.tumkur.narayan@intel.com>
>>>> Signed-off-by: Amit K Bag <amit.k.bag@intel.com>
>>>> ---
>>>> drivers/bluetooth/btintel.c | 39
>>>> +++++++++++++++++++++++++++++++++++++++
>>>> drivers/bluetooth/btintel.h |  6 ++++++
>>>> drivers/bluetooth/btusb.c   | 20 ++++++++++++++++----
>>>> 3 files changed, 61 insertions(+), 4 deletions(-)
>>>> 
>>>> diff --git a/drivers/bluetooth/btintel.c 
>>>> b/drivers/bluetooth/btintel.c index bb99c8653aab..fdec9c53b48d 
>>>> 100644
>>>> --- a/drivers/bluetooth/btintel.c
>>>> +++ b/drivers/bluetooth/btintel.c
>>>> @@ -709,6 +709,45 @@ int btintel_download_firmware(struct hci_dev 
>>>> *hdev, const struct firmware *fw, } 
>>>> EXPORT_SYMBOL_GPL(btintel_download_firmware);
>>>> 
>>>> +void btintel_retry_fw_download(struct hci_dev *hdev) {
>>>> +	/* Send Intel Reset command. This will result in
>>>> +	 * re-enumeration of BT controller.
>>>> +	 *
>>>> +	 * Intel Reset parameter description:
>>>> +	 * reset_param[0] => reset_type : 0x01 (Hard reset),
>>>> +					  0x00 (Soft reset)
>>>> +	 * reset_param[1] => patch_enable : 0x01 (Enable),
>>>> +	 *				    0x00 (Do not enable)
>>>> +	 * reset_param[2] => ddc_reload : 0x01 (Reload),
>>>> +	 *				  0x00 (Do not reload)
>>>> +	 * reset_param[3] => boot_option: 0x00 (Current image),
>>>> +					  0x01 (Specified boot address)
>>>> +	 * reset_param[4] to reset_param[7] => Boot address
>>>> +	 *
>>>> +	 */
>>>> +	static const u8 reset_param[] = { 0x01, 0x01, 0x01, 0x00,
>>>> +					0x00, 0x00, 0x00, 0x00 };
>> 
>> pplease use intel_reset structure and add the comments when assigning the fields.
>> 
>>>> +	struct sk_buff *skb;
>>>> +
>>>> +	skb = __hci_cmd_sync(hdev, 0xfc01, sizeof(reset_param),
>>>> +				reset_param, HCI_INIT_TIMEOUT);
>> 
>> pplease align the second line according to the coding style.
>> 
>>>> +	if (IS_ERR(skb)) {
>>>> +		bt_dev_err(hdev, "FW download error recovery failed (%ld)",
>>>> +				PTR_ERR(skb));
>> 
>> SSame as above.
>> 
>>>> +		return;
>>>> +	}
>>>> +	bt_dev_info(hdev, "Intel reset sent to retry FW download");
>>>> +	kfree_skb(skb);
>> 
>> EExtra empty line here.
>> 
>>>> +	/* Current Intel BT controllers(ThP/JfP) hold the USB reset
>>>> +	 * lines for 2ms when it receives Intel Reset in bootloader mode.
>>>> +	 * Whereas, the upcoming Intel BT controllers will hold USB reset
>>>> +	 * for 150ms. To keep the delay generic, 150ms is chosen here.
>>>> +	 */
>>>> +	msleep(150);
>>>> +}
>>>> +EXPORT_SYMBOL_GPL(btintel_retry_fw_download);
>>>> +
>> 
>> II do not like the name here. Using btintel_reset_to_bootloader would be better. Since the function itself is not going to do the firmware retry. It will just drop you back into boot loader.
>> 
>> HHowever the more important question is what happens if you send this command. Is the device re-enumerating on USB? Or after the 150ms we just have to redo the firmware download.
>> 
>>>> MODULE_AUTHOR("Marcel Holtmann <marcel@holtmann.org>"); 
>>>> MODULE_DESCRIPTION("Bluetooth support for Intel devices ver "
>>>> VERSION); MODULE_VERSION(VERSION); diff --git 
>>>> a/drivers/bluetooth/btintel.h b/drivers/bluetooth/btintel.h index
>>>> 3d846190f2bf..d04d3c7cb513 100644
>>>> --- a/drivers/bluetooth/btintel.h
>>>> +++ b/drivers/bluetooth/btintel.h
>>>> @@ -87,6 +87,7 @@ int btintel_read_boot_params(struct hci_dev *hdev,
>>>> 			     struct intel_boot_params *params); int 
>>>> btintel_download_firmware(struct hci_dev *dev, const struct firmware *fw,
>>>> 			      u32 *boot_param);
>>>> +void btintel_retry_fw_download(struct hci_dev *hdev);
>>>> #else
>>>> 
>>>> static inline int btintel_check_bdaddr(struct hci_dev *hdev) @@ 
>>>> -181,4
>>>> +182,9 @@ static inline int btintel_download_firmware(struct hci_dev
>>>> *dev, {
>>>> 	return -EOPNOTSUPP;
>>>> }
>>>> +
>>>> +static inline void btintel_retry_fw_download(struct hci_dev *hdev) {
>>>> +	return -EOPNOTSUPP;
>>>> +}
>>>> #endif
>>>> diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c 
>>>> index a9c35ebb30f8..7a763bd856ba 100644
>>>> --- a/drivers/bluetooth/btusb.c
>>>> +++ b/drivers/bluetooth/btusb.c
>>>> @@ -1846,8 +1846,11 @@ static int btusb_setup_intel(struct hci_dev *hdev)
>>>> 	 * firmware variant, revision and build number.
>>>> 	 */
>>>> 	err = btintel_read_version(hdev, &ver);
>>>> -	if (err)
>>>> +	if (err) {
>>>> +		bt_dev_err(hdev, "Intel Read version failed (%d)", err);
>>>> +		btintel_retry_fw_download(hdev);
>>>> 		return err;
>>>> +	}
>>>> 
>>>> 	bt_dev_info(hdev, "read Intel version: %02x%02x%02x%02x%02x%02x%02x%02x%02x",
>>>> 		    ver.hw_platform, ver.hw_variant, ver.hw_revision, @@ -2326,9
>>>> +2329,13 @@ static int btusb_setup_intel_new(struct hci_dev *hdev)
>>>> 
>>>> 	/* Start firmware downloading and get boot parameter */
>>>> 	err = btintel_download_firmware(hdev, fw, &boot_param);
>>>> -	if (err < 0)
>>>> +	if (err < 0) {
>>>> +		/* When FW download fails, send Intel Reset to retry
>>>> +		 * FW download.
>>>> +		 */
>>>> +		btintel_retry_fw_download(hdev);
>>>> 		goto done;
>>> 
>>> Is this actually going to work? If you jump to done, then you end up sending intel soft reset and then waiting for the device to boot. If you are lucky it times out, if not, then you end up loading DCC now.
>>> 
>>> If the device re-enumerates on USB, then we need an extra jump point to just release the firmware memory and then just exit hdev->setup. If are suppose to just retry, then we need to actually start over.
>>> 
>>> So have you actually tested this by randomly failing each step in the firmware download process.
>>> 
>> We send hard reset which will re-emumerates BT USB device and  initialize usb driver. 
>> We have tested all the scenario and its working fine.
>
>that is fine. However when this happens we should try to exit without sending any further commands. So we will need a separate exit path then.

This happens during firmware download when controller is in bootloader mode. When there is error during firmware download BT driver will not send any further command and since driver is not initialized bluez stack also will not send any commands at all. Only way to recover from this error is to power cycle the machine. Instead of complete power cycle we introduce this recovery mechanism  by sending hard reset command which will only power cycle the BT chip not the complete machine.

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH] Bluetooth: btusb: Trigger Intel FW download error recovery
  2019-09-30 11:13       ` Bag, Amit K
@ 2019-09-30 11:46         ` Marcel Holtmann
  2019-10-01  5:05           ` Bag, Amit K
  0 siblings, 1 reply; 7+ messages in thread
From: Marcel Holtmann @ 2019-09-30 11:46 UTC (permalink / raw)
  To: Bag, Amit K
  Cc: linux-bluetooth, Srivatsa, Ravishankar, Tumkur Narayan, Chethan,
	Hegde, Raghuram

Hi Amit,

>>>>> Sometimes during FW data download stage, in case of an error is 
>>>>> encountered the controller device could not be recovered. To recover 
>>>>> from such failures send Intel hard Reset to re-trigger FW download 
>>>>> in following error scenarios:
>>>>> 
>>>>> 1. Intel Read version command error
>>>>> 2. Firmware download timeout
>>>>> 3. Failure in Intel Soft Reset for switching to operational FW 4. 
>>>>> Boot timeout for switching to operaional FW
>>>>> 
>>>>> Signed-off-by: Raghuram Hegde <raghuram.hegde@intel.com>
>>>>> Signed-off-by: Chethan T N <chethan.tumkur.narayan@intel.com>
>>>>> Signed-off-by: Amit K Bag <amit.k.bag@intel.com>
>>>>> ---
>>>>> drivers/bluetooth/btintel.c | 39
>>>>> +++++++++++++++++++++++++++++++++++++++
>>>>> drivers/bluetooth/btintel.h |  6 ++++++
>>>>> drivers/bluetooth/btusb.c   | 20 ++++++++++++++++----
>>>>> 3 files changed, 61 insertions(+), 4 deletions(-)
>>>>> 
>>>>> diff --git a/drivers/bluetooth/btintel.c 
>>>>> b/drivers/bluetooth/btintel.c index bb99c8653aab..fdec9c53b48d 
>>>>> 100644
>>>>> --- a/drivers/bluetooth/btintel.c
>>>>> +++ b/drivers/bluetooth/btintel.c
>>>>> @@ -709,6 +709,45 @@ int btintel_download_firmware(struct hci_dev 
>>>>> *hdev, const struct firmware *fw, } 
>>>>> EXPORT_SYMBOL_GPL(btintel_download_firmware);
>>>>> 
>>>>> +void btintel_retry_fw_download(struct hci_dev *hdev) {
>>>>> +	/* Send Intel Reset command. This will result in
>>>>> +	 * re-enumeration of BT controller.
>>>>> +	 *
>>>>> +	 * Intel Reset parameter description:
>>>>> +	 * reset_param[0] => reset_type : 0x01 (Hard reset),
>>>>> +					  0x00 (Soft reset)
>>>>> +	 * reset_param[1] => patch_enable : 0x01 (Enable),
>>>>> +	 *				    0x00 (Do not enable)
>>>>> +	 * reset_param[2] => ddc_reload : 0x01 (Reload),
>>>>> +	 *				  0x00 (Do not reload)
>>>>> +	 * reset_param[3] => boot_option: 0x00 (Current image),
>>>>> +					  0x01 (Specified boot address)
>>>>> +	 * reset_param[4] to reset_param[7] => Boot address
>>>>> +	 *
>>>>> +	 */
>>>>> +	static const u8 reset_param[] = { 0x01, 0x01, 0x01, 0x00,
>>>>> +					0x00, 0x00, 0x00, 0x00 };
>>> 
>>> pplease use intel_reset structure and add the comments when assigning the fields.
>>> 
>>>>> +	struct sk_buff *skb;
>>>>> +
>>>>> +	skb = __hci_cmd_sync(hdev, 0xfc01, sizeof(reset_param),
>>>>> +				reset_param, HCI_INIT_TIMEOUT);
>>> 
>>> pplease align the second line according to the coding style.
>>> 
>>>>> +	if (IS_ERR(skb)) {
>>>>> +		bt_dev_err(hdev, "FW download error recovery failed (%ld)",
>>>>> +				PTR_ERR(skb));
>>> 
>>> SSame as above.
>>> 
>>>>> +		return;
>>>>> +	}
>>>>> +	bt_dev_info(hdev, "Intel reset sent to retry FW download");
>>>>> +	kfree_skb(skb);
>>> 
>>> EExtra empty line here.
>>> 
>>>>> +	/* Current Intel BT controllers(ThP/JfP) hold the USB reset
>>>>> +	 * lines for 2ms when it receives Intel Reset in bootloader mode.
>>>>> +	 * Whereas, the upcoming Intel BT controllers will hold USB reset
>>>>> +	 * for 150ms. To keep the delay generic, 150ms is chosen here.
>>>>> +	 */
>>>>> +	msleep(150);
>>>>> +}
>>>>> +EXPORT_SYMBOL_GPL(btintel_retry_fw_download);
>>>>> +
>>> 
>>> II do not like the name here. Using btintel_reset_to_bootloader would be better. Since the function itself is not going to do the firmware retry. It will just drop you back into boot loader.
>>> 
>>> HHowever the more important question is what happens if you send this command. Is the device re-enumerating on USB? Or after the 150ms we just have to redo the firmware download.
>>> 
>>>>> MODULE_AUTHOR("Marcel Holtmann <marcel@holtmann.org>"); 
>>>>> MODULE_DESCRIPTION("Bluetooth support for Intel devices ver "
>>>>> VERSION); MODULE_VERSION(VERSION); diff --git 
>>>>> a/drivers/bluetooth/btintel.h b/drivers/bluetooth/btintel.h index
>>>>> 3d846190f2bf..d04d3c7cb513 100644
>>>>> --- a/drivers/bluetooth/btintel.h
>>>>> +++ b/drivers/bluetooth/btintel.h
>>>>> @@ -87,6 +87,7 @@ int btintel_read_boot_params(struct hci_dev *hdev,
>>>>> 			     struct intel_boot_params *params); int 
>>>>> btintel_download_firmware(struct hci_dev *dev, const struct firmware *fw,
>>>>> 			      u32 *boot_param);
>>>>> +void btintel_retry_fw_download(struct hci_dev *hdev);
>>>>> #else
>>>>> 
>>>>> static inline int btintel_check_bdaddr(struct hci_dev *hdev) @@ 
>>>>> -181,4
>>>>> +182,9 @@ static inline int btintel_download_firmware(struct hci_dev
>>>>> *dev, {
>>>>> 	return -EOPNOTSUPP;
>>>>> }
>>>>> +
>>>>> +static inline void btintel_retry_fw_download(struct hci_dev *hdev) {
>>>>> +	return -EOPNOTSUPP;
>>>>> +}
>>>>> #endif
>>>>> diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c 
>>>>> index a9c35ebb30f8..7a763bd856ba 100644
>>>>> --- a/drivers/bluetooth/btusb.c
>>>>> +++ b/drivers/bluetooth/btusb.c
>>>>> @@ -1846,8 +1846,11 @@ static int btusb_setup_intel(struct hci_dev *hdev)
>>>>> 	 * firmware variant, revision and build number.
>>>>> 	 */
>>>>> 	err = btintel_read_version(hdev, &ver);
>>>>> -	if (err)
>>>>> +	if (err) {
>>>>> +		bt_dev_err(hdev, "Intel Read version failed (%d)", err);
>>>>> +		btintel_retry_fw_download(hdev);
>>>>> 		return err;
>>>>> +	}
>>>>> 
>>>>> 	bt_dev_info(hdev, "read Intel version: %02x%02x%02x%02x%02x%02x%02x%02x%02x",
>>>>> 		    ver.hw_platform, ver.hw_variant, ver.hw_revision, @@ -2326,9
>>>>> +2329,13 @@ static int btusb_setup_intel_new(struct hci_dev *hdev)
>>>>> 
>>>>> 	/* Start firmware downloading and get boot parameter */
>>>>> 	err = btintel_download_firmware(hdev, fw, &boot_param);
>>>>> -	if (err < 0)
>>>>> +	if (err < 0) {
>>>>> +		/* When FW download fails, send Intel Reset to retry
>>>>> +		 * FW download.
>>>>> +		 */
>>>>> +		btintel_retry_fw_download(hdev);
>>>>> 		goto done;
>>>> 
>>>> Is this actually going to work? If you jump to done, then you end up sending intel soft reset and then waiting for the device to boot. If you are lucky it times out, if not, then you end up loading DCC now.
>>>> 
>>>> If the device re-enumerates on USB, then we need an extra jump point to just release the firmware memory and then just exit hdev->setup. If are suppose to just retry, then we need to actually start over.
>>>> 
>>>> So have you actually tested this by randomly failing each step in the firmware download process.
>>>> 
>>> We send hard reset which will re-emumerates BT USB device and  initialize usb driver. 
>>> We have tested all the scenario and its working fine.
>> 
>> that is fine. However when this happens we should try to exit without sending any further commands. So we will need a separate exit path then.
> 
> This happens during firmware download when controller is in bootloader mode. When there is error during firmware download BT driver will not send any further command and since driver is not initialized bluez stack also will not send any commands at all. Only way to recover from this error is to power cycle the machine. Instead of complete power cycle we introduce this recovery mechanism by sending hard reset command which will only power cycle the BT chip not the complete machine.

are you sure that every goto done is not doing any further commands? When I looked at the code last week I came to a different conclusion.

Regards

Marcel


^ permalink raw reply	[flat|nested] 7+ messages in thread

* RE: [PATCH] Bluetooth: btusb: Trigger Intel FW download error recovery
  2019-09-30 11:46         ` Marcel Holtmann
@ 2019-10-01  5:05           ` Bag, Amit K
  0 siblings, 0 replies; 7+ messages in thread
From: Bag, Amit K @ 2019-10-01  5:05 UTC (permalink / raw)
  To: Marcel Holtmann
  Cc: linux-bluetooth, Srivatsa, Ravishankar, Tumkur Narayan, Chethan,
	Hegde, Raghuram

Hi Marcel,

>>>>>> Sometimes during FW data download stage, in case of an error is 
>>>>>> encountered the controller device could not be recovered. To 
>>>>>> recover from such failures send Intel hard Reset to re-trigger FW 
>>>>>> download in following error scenarios:
>>>>>> 
>>>>>> 1. Intel Read version command error 2. Firmware download timeout 
>>>>>> 3. Failure in Intel Soft Reset for switching to operational FW 4.
>>>>>> Boot timeout for switching to operaional FW
>>>>>> 
>>>>>> Signed-off-by: Raghuram Hegde <raghuram.hegde@intel.com>
>>>>>> Signed-off-by: Chethan T N <chethan.tumkur.narayan@intel.com>
>>>>>> Signed-off-by: Amit K Bag <amit.k.bag@intel.com>
>>>>>> ---
>>>>>> drivers/bluetooth/btintel.c | 39
>>>>>> +++++++++++++++++++++++++++++++++++++++
>>>>>> drivers/bluetooth/btintel.h |  6 ++++++
>>>>>> drivers/bluetooth/btusb.c   | 20 ++++++++++++++++----
>>>>>> 3 files changed, 61 insertions(+), 4 deletions(-)
>>>>>> 
>>>>>> diff --git a/drivers/bluetooth/btintel.c 
>>>>>> b/drivers/bluetooth/btintel.c index bb99c8653aab..fdec9c53b48d
>>>>>> 100644
>>>>>> --- a/drivers/bluetooth/btintel.c
>>>>>> +++ b/drivers/bluetooth/btintel.c
>>>>>> @@ -709,6 +709,45 @@ int btintel_download_firmware(struct hci_dev 
>>>>>> *hdev, const struct firmware *fw, } 
>>>>>> EXPORT_SYMBOL_GPL(btintel_download_firmware);
>>>>>> 
>>>>>> +void btintel_retry_fw_download(struct hci_dev *hdev) {
>>>>>> +	/* Send Intel Reset command. This will result in
>>>>>> +	 * re-enumeration of BT controller.
>>>>>> +	 *
>>>>>> +	 * Intel Reset parameter description:
>>>>>> +	 * reset_param[0] => reset_type : 0x01 (Hard reset),
>>>>>> +					  0x00 (Soft reset)
>>>>>> +	 * reset_param[1] => patch_enable : 0x01 (Enable),
>>>>>> +	 *				    0x00 (Do not enable)
>>>>>> +	 * reset_param[2] => ddc_reload : 0x01 (Reload),
>>>>>> +	 *				  0x00 (Do not reload)
>>>>>> +	 * reset_param[3] => boot_option: 0x00 (Current image),
>>>>>> +					  0x01 (Specified boot address)
>>>>>> +	 * reset_param[4] to reset_param[7] => Boot address
>>>>>> +	 *
>>>>>> +	 */
>>>>>> +	static const u8 reset_param[] = { 0x01, 0x01, 0x01, 0x00,
>>>>>> +					0x00, 0x00, 0x00, 0x00 };
>>>> 
>>>> pplease use intel_reset structure and add the comments when assigning the fields.
>>>> 
>>>>>> +	struct sk_buff *skb;
>>>>>> +
>>>>>> +	skb = __hci_cmd_sync(hdev, 0xfc01, sizeof(reset_param),
>>>>>> +				reset_param, HCI_INIT_TIMEOUT);
>>>> 
>>>> pplease align the second line according to the coding style.
	 will be done. 
>>>> 
>>>>>> +	if (IS_ERR(skb)) {
>>>>>> +		bt_dev_err(hdev, "FW download error recovery failed (%ld)",
>>>>>> +				PTR_ERR(skb));
>>>> 
>>>> SSame as above.
	 will be done. 
>>>> 
>>>>>> +		return;
>>>>>> +	}
>>>>>> +	bt_dev_info(hdev, "Intel reset sent to retry FW download");
>>>>>> +	kfree_skb(skb);
>>>> 
>>>> EExtra empty line here.
	 will be done.
>>>> 
>>>>>> +	/* Current Intel BT controllers(ThP/JfP) hold the USB reset
>>>>>> +	 * lines for 2ms when it receives Intel Reset in bootloader mode.
>>>>>> +	 * Whereas, the upcoming Intel BT controllers will hold USB reset
>>>>>> +	 * for 150ms. To keep the delay generic, 150ms is chosen here.
>>>>>> +	 */
>>>>>> +	msleep(150);
>>>>>> +}
>>>>>> +EXPORT_SYMBOL_GPL(btintel_retry_fw_download);
>>>>>> +
>>>> 
>>>> II do not like the name here. Using btintel_reset_to_bootloader would be better. Since the function itself is not going to do the firmware retry. It will just drop you back into boot loader.
	  OK I will rename the fucntion name and share new patch.
>>>> 
>>>> HHowever the more important question is what happens if you send this command. Is the device re-enumerating on USB? Or after the 150ms we just have to redo the firmware download.
	 Yes the device will re-enumerat on USB. 
>>>> 
>>>>>> MODULE_AUTHOR("Marcel Holtmann <marcel@holtmann.org>"); 
>>>>>> MODULE_DESCRIPTION("Bluetooth support for Intel devices ver "
>>>>>> VERSION); MODULE_VERSION(VERSION); diff --git 
>>>>>> a/drivers/bluetooth/btintel.h b/drivers/bluetooth/btintel.h index
>>>>>> 3d846190f2bf..d04d3c7cb513 100644
>>>>>> --- a/drivers/bluetooth/btintel.h
>>>>>> +++ b/drivers/bluetooth/btintel.h
>>>>>> @@ -87,6 +87,7 @@ int btintel_read_boot_params(struct hci_dev *hdev,
>>>>>> 			     struct intel_boot_params *params); int 
>>>>>> btintel_download_firmware(struct hci_dev *dev, const struct firmware *fw,
>>>>>> 			      u32 *boot_param);
>>>>>> +void btintel_retry_fw_download(struct hci_dev *hdev);
>>>>>> #else
>>>>>> 
>>>>>> static inline int btintel_check_bdaddr(struct hci_dev *hdev) @@
>>>>>> -181,4
>>>>>> +182,9 @@ static inline int btintel_download_firmware(struct 
>>>>>> +hci_dev
>>>>>> *dev, {
>>>>>> 	return -EOPNOTSUPP;
>>>>>> }
>>>>>> +
>>>>>> +static inline void btintel_retry_fw_download(struct hci_dev *hdev) {
>>>>>> +	return -EOPNOTSUPP;
>>>>>> +}
>>>>>> #endif
>>>>>> diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c 
>>>>>> index a9c35ebb30f8..7a763bd856ba 100644
>>>>>> --- a/drivers/bluetooth/btusb.c
>>>>>> +++ b/drivers/bluetooth/btusb.c
>>>>>> @@ -1846,8 +1846,11 @@ static int btusb_setup_intel(struct hci_dev *hdev)
>>>>>> 	 * firmware variant, revision and build number.
>>>>>> 	 */
>>>>>> 	err = btintel_read_version(hdev, &ver);
>>>>>> -	if (err)
>>>>>> +	if (err) {
>>>>>> +		bt_dev_err(hdev, "Intel Read version failed (%d)", err);
>>>>>> +		btintel_retry_fw_download(hdev);
>>>>>> 		return err;
>>>>>> +	}
>>>>>> 
>>>>>> 	bt_dev_info(hdev, "read Intel version: %02x%02x%02x%02x%02x%02x%02x%02x%02x",
>>>>>> 		    ver.hw_platform, ver.hw_variant, ver.hw_revision, @@ -2326,9
>>>>>> +2329,13 @@ static int btusb_setup_intel_new(struct hci_dev *hdev)
>>>>>> 
>>>>>> 	/* Start firmware downloading and get boot parameter */
>>>>>> 	err = btintel_download_firmware(hdev, fw, &boot_param);
>>>>>> -	if (err < 0)
>>>>>> +	if (err < 0) {
>>>>>> +		/* When FW download fails, send Intel Reset to retry
>>>>>> +		 * FW download.
>>>>>> +		 */
>>>>>> +		btintel_retry_fw_download(hdev);
>>>>>> 		goto done;
>>>>> 
>>>>> Is this actually going to work? If you jump to done, then you end up sending intel soft reset and then waiting for the device to boot. If you are lucky it times out, if not, then you end up loading DCC now.
>>>>> 
>>>>> If the device re-enumerates on USB, then we need an extra jump point to just release the firmware memory and then just exit hdev->setup. If are suppose to just retry, then we need to actually start over.
>>>>> 
>>>>> So have you actually tested this by randomly failing each step in the firmware download process.
>>>>> 
>>>> We send hard reset which will re-emumerates BT USB device and  initialize usb driver. 
>>>> We have tested all the scenario and its working fine.
>>> 
>>> that is fine. However when this happens we should try to exit without sending any further commands. So we will need a separate exit path then.
>> 
>> This happens during firmware download when controller is in bootloader mode. When there is error during firmware download BT driver will not send any further command and since driver is not initialized bluez stack also will not send any commands at all. Only way to recover from this error is to power cycle the machine. Instead of complete power cycle we introduce this recovery mechanism by sending hard reset command which will only power cycle the BT chip not the complete machine.
>
> are you sure that every goto done is not doing any further commands? When I looked at the code last week I came to a different conclusion.

Yes in case of error the controller will not reach to goto done and will not send any further commands. 
I will modify this patch as per comments above and upload new version of this patch. 

Thanks & Regards,
Amit Bag

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, back to index

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-26  6:43 [PATCH] Bluetooth: btusb: Trigger Intel FW download error recovery Amit K Bag
2019-09-27  6:38 ` Marcel Holtmann
2019-09-27  7:27   ` Bag, Amit K
2019-09-30 10:40     ` Marcel Holtmann
2019-09-30 11:13       ` Bag, Amit K
2019-09-30 11:46         ` Marcel Holtmann
2019-10-01  5:05           ` Bag, Amit K

Linux-Bluetooth Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-bluetooth/0 linux-bluetooth/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-bluetooth linux-bluetooth/ https://lore.kernel.org/linux-bluetooth \
		linux-bluetooth@vger.kernel.org linux-bluetooth@archiver.kernel.org
	public-inbox-index linux-bluetooth

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-bluetooth


AGPL code for this site: git clone https://public-inbox.org/ public-inbox