On 25 March 2014 10:15, Kalle Valo <kvalo@xxxxxxxxxxxxxxxx> wrote:
> ath10k_pci_wait_for_target_init() did really follow the style used elsewhere in
> ath10k. Use ath10k_pci_read/write() wrappers, simplify the while loop and
> improve warning messages.
>
> Signed-off-by: Kalle Valo <kvalo@xxxxxxxxxxxxxxxx>
> ---
> drivers/net/wireless/ath/ath10k/pci.c | 33 ++++++++++++++++++++-------------
> 1 file changed, 20 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/net/wireless/ath/ath10k/pci.c b/drivers/net/wireless/ath/ath10k/pci.c
> index 9d242d801d9d..0425c76daf3f 100644
> --- a/drivers/net/wireless/ath/ath10k/pci.c
> +++ b/drivers/net/wireless/ath/ath10k/pci.c
> @@ -2385,30 +2385,37 @@ static int ath10k_pci_deinit_irq(struct ath10k *ar)
> static int ath10k_pci_wait_for_target_init(struct ath10k *ar)
> {
> struct ath10k_pci *ar_pci = ath10k_pci_priv(ar);
> - int wait_limit = 300; /* 3 sec */
> + const int wait = 3000; /* ms */
We probably should have a #define for this.
> + unsigned long timeout;
> int ret;
> + u32 val;
>
> ret = ath10k_pci_wake(ar);
> if (ret) {
> - ath10k_err("failed to wake up target: %d\n", ret);
> + ath10k_err("failed to wake up target for init: %d\n", ret);
> return ret;
> }
>
> - while (wait_limit-- &&
> - !(ioread32(ar_pci->mem + FW_INDICATOR_ADDRESS) &
> - FW_IND_INITIALIZED)) {
> + timeout = jiffies + msecs_to_jiffies(wait);
> +
> + do {
> + val = ath10k_pci_read32(ar, FW_INDICATOR_ADDRESS);
> + if (val == FW_IND_INITIALIZED)
> + break;
> +
It might be worth to add:
if (val == 0xFFFFFFFF)
return -EIO;
> if (ar_pci->num_msi_intrs == 0)
> /* Fix potential race by repeating CORE_BASE writes */
> - iowrite32(PCIE_INTR_FIRMWARE_MASK |
> - PCIE_INTR_CE_MASK_ALL,
> - ar_pci->mem + (SOC_CORE_BASE_ADDRESS |
> - PCIE_INTR_ENABLE_ADDRESS));
> + ath10k_pci_soc_write32(ar, PCIE_INTR_ENABLE_ADDRESS,
> + PCIE_INTR_FIRMWARE_MASK |
> + PCIE_INTR_CE_MASK_ALL);
> +
> mdelay(10);
> - }
> + } while (time_before(jiffies, timeout));
>
> - if (wait_limit < 0) {
> - ath10k_err("target stalled\n");
> - ret = -EIO;
> + if (val != FW_IND_INITIALIZED) {
> + ath10k_err("failed to receive initialized event from target after %d ms: %d\n",
> + wait, val);
`val` is u32 so it shouldn't be %d. %08x makes most sense I guess.
Michał
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
