ath10k: increase bmi timeout to fix OTP on qca99xx boards and add bmi identification through pre-cal file
Backporting upstream patches. Signed-off-by: Pavel Kubelun <be.dissent@gmail.com> Signed-off-by: Felix Fietkau <nbd@nbd.name> [refresh, rename patches]master
Pavel Kubelun
8 years ago
committed by
Felix Fietkau
parent
d80d1b6c42
commit
025cb640cd
@ -0,0 +1,31 @@ |
|||||||
|
From: Ben Greear <greearb@candelatech.com>
|
||||||
|
Date: Wed, 31 May 2017 14:21:19 +0300
|
||||||
|
Subject: [PATCH] ath10k: increase BMI timeout
|
||||||
|
|
||||||
|
When testing a 9888 chipset NIC, I notice it often takes
|
||||||
|
almost 2 seconds, and then many times OTP fails, probably due
|
||||||
|
to the two-second timeout.
|
||||||
|
|
||||||
|
[ 2269.841842] ath10k_pci 0000:05:00.0: bmi cmd took: 1984 jiffies (HZ: 1000), rv: 0
|
||||||
|
[ 2273.608185] ath10k_pci 0000:05:00.0: bmi cmd took: 1986 jiffies (HZ: 1000), rv: 0
|
||||||
|
[ 2277.294732] ath10k_pci 0000:05:00.0: bmi cmd took: 1989 jiffies (HZ: 1000), rv: 0
|
||||||
|
|
||||||
|
So, increase the BMI timeout to 3 seconds.
|
||||||
|
|
||||||
|
Signed-off-by: Ben Greear <greearb@candelatech.com>
|
||||||
|
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
|
||||||
|
---
|
||||||
|
|
||||||
|
--- a/drivers/net/wireless/ath/ath10k/bmi.h
|
||||||
|
+++ b/drivers/net/wireless/ath/ath10k/bmi.h
|
||||||
|
@@ -187,8 +187,8 @@ struct bmi_target_info {
|
||||||
|
u32 type;
|
||||||
|
};
|
||||||
|
|
||||||
|
-/* in msec */
|
||||||
|
-#define BMI_COMMUNICATION_TIMEOUT_HZ (2 * HZ)
|
||||||
|
+/* in jiffies */
|
||||||
|
+#define BMI_COMMUNICATION_TIMEOUT_HZ (3 * HZ)
|
||||||
|
|
||||||
|
#define BMI_CE_NUM_TO_TARG 0
|
||||||
|
#define BMI_CE_NUM_TO_HOST 1
|
||||||
@ -0,0 +1,74 @@ |
|||||||
|
From: Ben Greear <greearb@candelatech.com>
|
||||||
|
Date: Wed, 31 May 2017 14:21:21 +0300
|
||||||
|
Subject: [PATCH] ath10k: log when longer bmi cmds happen
|
||||||
|
|
||||||
|
This lets one have a clue that maybe timeouts are happening
|
||||||
|
when we just aren't waiting long enough.
|
||||||
|
|
||||||
|
Signed-off-by: Ben Greear <greearb@candelatech.com>
|
||||||
|
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
|
||||||
|
---
|
||||||
|
|
||||||
|
--- a/drivers/net/wireless/ath/ath10k/pci.c
|
||||||
|
+++ b/drivers/net/wireless/ath/ath10k/pci.c
|
||||||
|
@@ -101,7 +101,8 @@ static int ath10k_pci_init_irq(struct at
|
||||||
|
static int ath10k_pci_deinit_irq(struct ath10k *ar);
|
||||||
|
static int ath10k_pci_request_irq(struct ath10k *ar);
|
||||||
|
static void ath10k_pci_free_irq(struct ath10k *ar);
|
||||||
|
-static int ath10k_pci_bmi_wait(struct ath10k_ce_pipe *tx_pipe,
|
||||||
|
+static int ath10k_pci_bmi_wait(struct ath10k *ar,
|
||||||
|
+ struct ath10k_ce_pipe *tx_pipe,
|
||||||
|
struct ath10k_ce_pipe *rx_pipe,
|
||||||
|
struct bmi_xfer *xfer);
|
||||||
|
static int ath10k_pci_qca99x0_chip_reset(struct ath10k *ar);
|
||||||
|
@@ -1843,7 +1844,7 @@ int ath10k_pci_hif_exchange_bmi_msg(stru
|
||||||
|
if (ret)
|
||||||
|
goto err_resp;
|
||||||
|
|
||||||
|
- ret = ath10k_pci_bmi_wait(ce_tx, ce_rx, &xfer);
|
||||||
|
+ ret = ath10k_pci_bmi_wait(ar, ce_tx, ce_rx, &xfer);
|
||||||
|
if (ret) {
|
||||||
|
u32 unused_buffer;
|
||||||
|
unsigned int unused_nbytes;
|
||||||
|
@@ -1910,23 +1911,37 @@ static void ath10k_pci_bmi_recv_data(str
|
||||||
|
xfer->rx_done = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
-static int ath10k_pci_bmi_wait(struct ath10k_ce_pipe *tx_pipe,
|
||||||
|
+static int ath10k_pci_bmi_wait(struct ath10k *ar,
|
||||||
|
+ struct ath10k_ce_pipe *tx_pipe,
|
||||||
|
struct ath10k_ce_pipe *rx_pipe,
|
||||||
|
struct bmi_xfer *xfer)
|
||||||
|
{
|
||||||
|
unsigned long timeout = jiffies + BMI_COMMUNICATION_TIMEOUT_HZ;
|
||||||
|
+ unsigned long started = jiffies;
|
||||||
|
+ unsigned long dur;
|
||||||
|
+ int ret;
|
||||||
|
|
||||||
|
while (time_before_eq(jiffies, timeout)) {
|
||||||
|
ath10k_pci_bmi_send_done(tx_pipe);
|
||||||
|
ath10k_pci_bmi_recv_data(rx_pipe);
|
||||||
|
|
||||||
|
- if (xfer->tx_done && (xfer->rx_done == xfer->wait_for_resp))
|
||||||
|
- return 0;
|
||||||
|
+ if (xfer->tx_done && (xfer->rx_done == xfer->wait_for_resp)) {
|
||||||
|
+ ret = 0;
|
||||||
|
+ goto out;
|
||||||
|
+ }
|
||||||
|
|
||||||
|
schedule();
|
||||||
|
}
|
||||||
|
|
||||||
|
- return -ETIMEDOUT;
|
||||||
|
+ ret = -ETIMEDOUT;
|
||||||
|
+
|
||||||
|
+out:
|
||||||
|
+ dur = jiffies - started;
|
||||||
|
+ if (dur > HZ)
|
||||||
|
+ ath10k_dbg(ar, ATH10K_DBG_BMI,
|
||||||
|
+ "bmi cmd took %lu jiffies hz %d ret %d\n",
|
||||||
|
+ dur, HZ, ret);
|
||||||
|
+ return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
@ -0,0 +1,80 @@ |
|||||||
|
From: Anilkumar Kolli <akolli@qti.qualcomm.com>
|
||||||
|
Date: Wed, 31 May 2017 14:21:27 +0300
|
||||||
|
Subject: [PATCH] ath10k: add BMI parameters to fix calibration from
|
||||||
|
DT/pre-cal
|
||||||
|
|
||||||
|
QCA99X0, QCA9888, QCA9984 supports calibration data in
|
||||||
|
either OTP or DT/pre-cal file. Current ath10k supports
|
||||||
|
Calibration data from OTP only.
|
||||||
|
|
||||||
|
If caldata is loaded from DT/pre-cal file, fetching board id
|
||||||
|
and applying calibration parameters like tx power gets failed.
|
||||||
|
|
||||||
|
error log:
|
||||||
|
[ 15.733663] ath10k_pci 0000:01:00.0: failed to fetch board file: -2
|
||||||
|
[ 15.741474] ath10k_pci 0000:01:00.0: could not probe fw (-2)
|
||||||
|
|
||||||
|
This patch adds calibration data support from DT/pre-cal
|
||||||
|
file. Below parameters are used to get board id and
|
||||||
|
applying calibration parameters from cal data.
|
||||||
|
|
||||||
|
EEPROM[OTP] FLASH[DT/pre-cal file]
|
||||||
|
Cal param 0x700 0x10000
|
||||||
|
Board id 0x10 0x8000
|
||||||
|
|
||||||
|
Tested on QCA9888 with pre-cal file.
|
||||||
|
|
||||||
|
Signed-off-by: Anilkumar Kolli <akolli@qti.qualcomm.com>
|
||||||
|
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
|
||||||
|
---
|
||||||
|
|
||||||
|
--- a/drivers/net/wireless/ath/ath10k/bmi.h
|
||||||
|
+++ b/drivers/net/wireless/ath/ath10k/bmi.h
|
||||||
|
@@ -83,6 +83,8 @@ enum bmi_cmd_id {
|
||||||
|
#define BMI_NVRAM_SEG_NAME_SZ 16
|
||||||
|
|
||||||
|
#define BMI_PARAM_GET_EEPROM_BOARD_ID 0x10
|
||||||
|
+#define BMI_PARAM_GET_FLASH_BOARD_ID 0x8000
|
||||||
|
+#define BMI_PARAM_FLASH_SECTION_ALL 0x10000
|
||||||
|
|
||||||
|
#define ATH10K_BMI_BOARD_ID_FROM_OTP_MASK 0x7c00
|
||||||
|
#define ATH10K_BMI_BOARD_ID_FROM_OTP_LSB 10
|
||||||
|
--- a/drivers/net/wireless/ath/ath10k/core.c
|
||||||
|
+++ b/drivers/net/wireless/ath/ath10k/core.c
|
||||||
|
@@ -657,7 +657,7 @@ static int ath10k_core_get_board_id_from
|
||||||
|
{
|
||||||
|
u32 result, address;
|
||||||
|
u8 board_id, chip_id;
|
||||||
|
- int ret;
|
||||||
|
+ int ret, bmi_board_id_param;
|
||||||
|
|
||||||
|
address = ar->hw_params.patch_load_addr;
|
||||||
|
|
||||||
|
@@ -681,8 +681,13 @@ static int ath10k_core_get_board_id_from
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
- ret = ath10k_bmi_execute(ar, address, BMI_PARAM_GET_EEPROM_BOARD_ID,
|
||||||
|
- &result);
|
||||||
|
+ if (ar->cal_mode == ATH10K_PRE_CAL_MODE_DT ||
|
||||||
|
+ ar->cal_mode == ATH10K_PRE_CAL_MODE_FILE)
|
||||||
|
+ bmi_board_id_param = BMI_PARAM_GET_FLASH_BOARD_ID;
|
||||||
|
+ else
|
||||||
|
+ bmi_board_id_param = BMI_PARAM_GET_EEPROM_BOARD_ID;
|
||||||
|
+
|
||||||
|
+ ret = ath10k_bmi_execute(ar, address, bmi_board_id_param, &result);
|
||||||
|
if (ret) {
|
||||||
|
ath10k_err(ar, "could not execute otp for board id check: %d\n",
|
||||||
|
ret);
|
||||||
|
@@ -810,6 +815,11 @@ static int ath10k_download_and_run_otp(s
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
+ /* As of now pre-cal is valid for 10_4 variants */
|
||||||
|
+ if (ar->cal_mode == ATH10K_PRE_CAL_MODE_DT ||
|
||||||
|
+ ar->cal_mode == ATH10K_PRE_CAL_MODE_FILE)
|
||||||
|
+ bmi_otp_exe_param = BMI_PARAM_FLASH_SECTION_ALL;
|
||||||
|
+
|
||||||
|
ret = ath10k_bmi_execute(ar, address, bmi_otp_exe_param, &result);
|
||||||
|
if (ret) {
|
||||||
|
ath10k_err(ar, "could not execute otp (%d)\n", ret);
|
||||||
@ -1,11 +1,11 @@ |
|||||||
--- a/drivers/net/wireless/ath/ath10k/htt.h 2016-12-12 16:03:58.491019030 +0100
|
--- a/drivers/net/wireless/ath/ath10k/htt.h
|
||||||
+++ b/drivers/net/wireless/ath/ath10k/htt.h 2016-12-12 15:39:45.242298155 +0100
|
+++ b/drivers/net/wireless/ath/ath10k/htt.h
|
||||||
@@ -199,7 +199,7 @@ enum htt_rx_ring_flags {
|
@@ -199,7 +199,7 @@ enum htt_rx_ring_flags {
|
||||||
};
|
};
|
||||||
|
|
||||||
#define HTT_RX_RING_SIZE_MIN 128
|
#define HTT_RX_RING_SIZE_MIN 128
|
||||||
+#define HTT_RX_RING_SIZE_MAX 512
|
|
||||||
-#define HTT_RX_RING_SIZE_MAX 2048
|
-#define HTT_RX_RING_SIZE_MAX 2048
|
||||||
|
+#define HTT_RX_RING_SIZE_MAX 512
|
||||||
|
|
||||||
struct htt_rx_ring_setup_ring {
|
struct htt_rx_ring_setup_ring {
|
||||||
__le32 fw_idx_shadow_reg_paddr;
|
__le32 fw_idx_shadow_reg_paddr;
|
||||||
|
|||||||
Loading…
Reference in new issue