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>
This commit is contained in:
Ben Greear 2017-05-31 14:21:21 +03:00 committed by Kalle Valo
parent 13c3b26a71
commit 6bb099b088

View File

@ -101,7 +101,8 @@ static int ath10k_pci_init_irq(struct ath10k *ar);
static int ath10k_pci_deinit_irq(struct ath10k *ar); static int ath10k_pci_deinit_irq(struct ath10k *ar);
static int ath10k_pci_request_irq(struct ath10k *ar); static int ath10k_pci_request_irq(struct ath10k *ar);
static void ath10k_pci_free_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 ath10k_ce_pipe *rx_pipe,
struct bmi_xfer *xfer); struct bmi_xfer *xfer);
static int ath10k_pci_qca99x0_chip_reset(struct ath10k *ar); static int ath10k_pci_qca99x0_chip_reset(struct ath10k *ar);
@ -1846,7 +1847,7 @@ int ath10k_pci_hif_exchange_bmi_msg(struct ath10k *ar,
if (ret) if (ret)
goto err_resp; 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) { if (ret) {
u32 unused_buffer; u32 unused_buffer;
unsigned int unused_nbytes; unsigned int unused_nbytes;
@ -1913,23 +1914,37 @@ static void ath10k_pci_bmi_recv_data(struct ath10k_ce_pipe *ce_state)
xfer->rx_done = true; 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 ath10k_ce_pipe *rx_pipe,
struct bmi_xfer *xfer) struct bmi_xfer *xfer)
{ {
unsigned long timeout = jiffies + BMI_COMMUNICATION_TIMEOUT_HZ; unsigned long timeout = jiffies + BMI_COMMUNICATION_TIMEOUT_HZ;
unsigned long started = jiffies;
unsigned long dur;
int ret;
while (time_before_eq(jiffies, timeout)) { while (time_before_eq(jiffies, timeout)) {
ath10k_pci_bmi_send_done(tx_pipe); ath10k_pci_bmi_send_done(tx_pipe);
ath10k_pci_bmi_recv_data(rx_pipe); ath10k_pci_bmi_recv_data(rx_pipe);
if (xfer->tx_done && (xfer->rx_done == xfer->wait_for_resp)) if (xfer->tx_done && (xfer->rx_done == xfer->wait_for_resp)) {
return 0; ret = 0;
goto out;
}
schedule(); 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;
} }
/* /*