Skip to contentSkip to conversation

ath10k: avoid consecutive OTP download to reduce boot time

PATCH In review Maharaja Kennadyrajan 2 participants 6 messages Jan 7, 2020 – Mar 11, 2020 Qualcomm Atheros ATH10K wireless driver

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ath10k: avoid consecutive OTP download to reduce boot time

From: Vikas Patel <[email protected]>

Currently, OTP is downloaded twice in case of "pre-cal-dt" and "pre-cal-file" to fetch the board ID and takes around ~2 sec more boot uptime.

First OTP download happens in "ath10k_core_probe_fw" and second in ath10k_core_start. First boot does not need OTP download in core start when valid board id acquired.

The second OTP download is required upon core stop/start.

This patch skips the OTP download when first OTP download has acquired a valid board id. This patch also marks board id invalid in "ath10k_core_stop", which will force the OTP download in ath10k_core_start and fetches valid board id.

Tested HW: QCA9984
Tested FW: 10.4-3.6-00104

---
 drivers/net/wireless/ath/ath10k/core.c | 11 +++++++++++
 1 file changed, 11 insertions(+)
drivers/net/wireless/ath/ath10k/core.c +11 -0
index 5ec16ce..8fef991 100644
@@ -874,6 +874,13 @@ static int ath10k_core_get_board_id_from_otp(struct ath10k *ar)
 		return -ENODATA;
 	}
 
+	if (ar->id.bmi_ids_valid) {
+		ath10k_dbg(ar, ATH10K_DBG_BOOT,
+			   "boot already acquired valid otp board id,skip download, board_id %d chip_id %d\n",
+			   ar->id.bmi_board_id, ar->id.bmi_chip_id);
+		goto skip_otp_download;
+	}
+
 	ath10k_dbg(ar, ATH10K_DBG_BOOT,
 		   "boot upload otp to 0x%x len %zd for board id\n",
 		   address, ar->normal_mode_fw.fw_file.otp_len);
@@ -921,6 +928,8 @@ static int ath10k_core_get_board_id_from_otp(struct ath10k *ar)
 	ar->id.bmi_board_id = board_id;
 	ar->id.bmi_chip_id = chip_id;
 
+skip_otp_download:
+
 	return 0;
 }
 
@@ -2863,6 +2872,8 @@ void ath10k_core_stop(struct ath10k *ar)
 	ath10k_htt_tx_stop(&ar->htt);
 	ath10k_htt_rx_free(&ar->htt);
 	ath10k_wmi_detach(ar);
+
+	ar->id.bmi_ids_valid = false;
 }
 EXPORT_SYMBOL(ath10k_core_stop);
 
Signature · 6 lines
1.9.1

_______________________________________________
ath10k mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/ath10k
#1 lore raw

On 2020-01-07 11:53, Maharaja Kennadyrajan wrote:

[Maha]: Please ignore/drop this duplicate patch as I sent it already. Regret for inconvenience caused.

Quoted 65 lines

From: Vikas Patel <[email protected]>

Currently, OTP is downloaded twice in case of "pre-cal-dt" and "pre-cal-file" to fetch the board ID and takes around ~2 sec more boot uptime.

First OTP download happens in "ath10k_core_probe_fw" and second in ath10k_core_start. First boot does not need OTP download in core start when valid board id acquired.

The second OTP download is required upon core stop/start.

This patch skips the OTP download when first OTP download has acquired a valid board id. This patch also marks board id invalid in "ath10k_core_stop", which will force the OTP download in ath10k_core_start and fetches valid board id.

Tested HW: QCA9984
Tested FW: 10.4-3.6-00104

---
 drivers/net/wireless/ath/ath10k/core.c | 11 +++++++++++
 1 file changed, 11 insertions(+)
drivers/net/wireless/ath/ath10k/core.c +7 -0
index 5ec16ce..8fef991 100644
@@ -874,6 +874,13 @@ static int
 ath10k_core_get_board_id_from_otp(struct ath10k *ar)
 		return -ENODATA;
 	}
 
+	if (ar->id.bmi_ids_valid) {
+		ath10k_dbg(ar, ATH10K_DBG_BOOT,
+			   "boot already acquired valid otp board id,skip download,
 board_id %d chip_id %d\n",
+			   ar->id.bmi_board_id, ar->id.bmi_chip_id);
+		goto skip_otp_download;
+	}
+
 	ath10k_dbg(ar, ATH10K_DBG_BOOT,
drivers/net/wireless/ath/ath10k/core.c +4 -0
 		   "boot upload otp to 0x%x len %zd for board id\n",
 		   address, ar->normal_mode_fw.fw_file.otp_len);
@@ -921,6 +928,8 @@ static int
 ath10k_core_get_board_id_from_otp(struct ath10k *ar)
 	ar->id.bmi_board_id = board_id;
 	ar->id.bmi_chip_id = chip_id;
 
+skip_otp_download:
+
 	return 0;
 }
@@ -2863,6 +2872,8 @@ void ath10k_core_stop(struct ath10k *ar)
 	ath10k_htt_tx_stop(&ar->htt);
 	ath10k_htt_rx_free(&ar->htt);
 	ath10k_wmi_detach(ar);
+
+	ar->id.bmi_ids_valid = false;
 }
 EXPORT_SYMBOL(ath10k_core_stop);
#2 lore raw
Quoted 4 lines · Maharaja Kennadyrajan

On 2020-01-07 11:53, Maharaja Kennadyrajan wrote:

[Maha]: Please ignore/drop this duplicate patch as I sent it already. Regret for inconvenience caused.

Are you sure I should drop this? In the first patch I think you forgot to CC linux-wireless and that's why I didn't see it. But this second patch was CCed to linux-wireless and I see it on patchwork. So my plan is to put this back to my queue, please let me know if I have misunderstood.

Signature · 6 lines
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

_______________________________________________
ath10k mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/ath10k
#3 lore raw
Quoted 4 lines · Kalle Valo
Quoted 2 lines · Maharaja Kennadyrajan

On 2020-01-07 11:53, Maharaja Kennadyrajan wrote:

Quoted 8 lines
Quoted 2 lines

[Maha]: Please ignore/drop this duplicate patch as I sent it already. Regret for inconvenience caused.

Are you sure I should drop this? In the first patch I think you forgot to CC linux-wireless and that's why I didn't see it. But this second patch was CCed to linux-wireless and I see it on patchwork. So my plan is to put this back to my queue, please let me know if I have misunderstood.

[Maha]: Hi Kalle, I sent the same patch twice. So I asked to ignore one duplicate patch. You can pick up this patch to put it in your queue and please ignore the duplicate patch.

_______________________________________________
ath10k mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/ath10k

#4 lore raw
In reply to Maharaja Kennadyrajan
Quoted 15 lines · Maharaja Kennadyrajan

Currently, OTP is downloaded twice in case of "pre-cal-dt" and "pre-cal-file" to fetch the board ID and takes around ~2 sec more boot uptime.

First OTP download happens in "ath10k_core_probe_fw" and second in ath10k_core_start. First boot does not need OTP download in core start when valid board id acquired.

The second OTP download is required upon core stop/start.

This patch skips the OTP download when first OTP download has acquired a valid board id. This patch also marks board id invalid in "ath10k_core_stop", which will force the OTP download in ath10k_core_start and fetches valid board id.

Quoted 6 lines

Tested HW: QCA9984
Tested FW: 10.4-3.6-00104

Patch applied to ath-next branch of ath.git, thanks.

a4b9f641e858 ath10k: avoid consecutive OTP download to reduce boot time

Signature · 3 lines
https://patchwork.kernel.org/patch/11320473/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
#5 lore raw
In reply to Maharaja Kennadyrajan
Quoted 15 lines · Maharaja Kennadyrajan

Currently, OTP is downloaded twice in case of "pre-cal-dt" and "pre-cal-file" to fetch the board ID and takes around ~2 sec more boot uptime.

First OTP download happens in "ath10k_core_probe_fw" and second in ath10k_core_start. First boot does not need OTP download in core start when valid board id acquired.

The second OTP download is required upon core stop/start.

This patch skips the OTP download when first OTP download has acquired a valid board id. This patch also marks board id invalid in "ath10k_core_stop", which will force the OTP download in ath10k_core_start and fetches valid board id.

Quoted 6 lines

Tested HW: QCA9984
Tested FW: 10.4-3.6-00104

Patch applied to ath-next branch of ath.git, thanks.

a4b9f641e858 ath10k: avoid consecutive OTP download to reduce boot time

Signature · 8 lines
https://patchwork.kernel.org/patch/11320473/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

_______________________________________________
ath10k mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/ath10k