Skip to contentSkip to conversation

ath10k: add error handling to ath10k_pci_wait()

PATCH Applied Kalle Valo 2 participants 4 messages Oct 17, 2013 – Oct 21, 2013 Qualcomm Atheros ATH10K wireless driver

lore
Share & tools
lore

Kalle Valo

author
#0 lore raw

PATCH 1/1 ath10k: add error handling to ath10k_pci_wait()

ath10k_pci_wait() didn't notify any errors to callers, it just printed a warning so add proper error handling.

---
 drivers/net/wireless/ath/ath10k/pci.c |   28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)
drivers/net/wireless/ath/ath10k/pci.c +24 -4
index 1e9cfcc9..92759cd 100644
@@ -525,15 +525,19 @@ static bool ath10k_pci_target_is_awake(struct ath10k *ar)
 	return (RTC_STATE_V_GET(val) == RTC_STATE_V_ON);
 }
 
-static void ath10k_pci_wait(struct ath10k *ar)
+static int ath10k_pci_wait(struct ath10k *ar)
 {
 	int n = 100;
 
 	while (n-- && !ath10k_pci_target_is_awake(ar))
 		msleep(10);
 
-	if (n < 0)
+	if (n < 0) {
 		ath10k_warn("Unable to wakeup target\n");
+		return -ETIMEDOUT;
+	}
+
+	return 0;
 }
 
 int ath10k_do_pci_wake(struct ath10k *ar)
@@ -2227,7 +2231,13 @@ static int ath10k_pci_start_intr_legacy(struct ath10k *ar)
 		  ar_pci->mem + PCIE_LOCAL_BASE_ADDRESS +
 		  PCIE_SOC_WAKE_ADDRESS);
 
-	ath10k_pci_wait(ar);
+	ret = ath10k_pci_wait(ar);
+	if (ret) {
+		ath10k_warn("Failed to enable legacy interrupt, target did not wake up: %d\n",
+			    ret);
+		free_irq(ar_pci->pdev->irq, ar);
+		return ret;
+	}
 
 	/*
 	 * A potential race occurs here: The CORE_BASE write
@@ -2290,6 +2300,10 @@ static int ath10k_pci_start_intr(struct ath10k *ar)
 	}
 
 	ret = ath10k_pci_start_intr_legacy(ar);
+	if (ret) {
+		ath10k_warn("Failed to start legacy interrupts: %d\n", ret);
+		return ret;
+	}
 
 exit:
 	ar_pci->num_msi_intrs = num;
@@ -2315,13 +2329,19 @@ static int ath10k_pci_reset_target(struct ath10k *ar)
 {
 	struct ath10k_pci *ar_pci = ath10k_pci_priv(ar);
 	int wait_limit = 300; /* 3 sec */
+	int ret;
 
 	/* Wait for Target to finish initialization before we proceed. */
 	iowrite32(PCIE_SOC_WAKE_V_MASK,
 		  ar_pci->mem + PCIE_LOCAL_BASE_ADDRESS +
 		  PCIE_SOC_WAKE_ADDRESS);
 
-	ath10k_pci_wait(ar);
+	ret = ath10k_pci_wait(ar);
+	if (ret) {
+		ath10k_warn("Failed to reset target, target did not wake up: %d\n",
+			    ret);
+		return ret;
+	}
 
 	while (wait_limit-- &&
 	       !(ioread32(ar_pci->mem + FW_INDICATOR_ADDRESS) &
#1 lore raw
Quoted 36 lines · Kalle Valo

ath10k_pci_wait() didn't notify any errors to callers, it just printed a warning so add proper error handling.

---
 drivers/net/wireless/ath/ath10k/pci.c |   28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)
drivers/net/wireless/ath/ath10k/pci.c +6 -2
index 1e9cfcc9..92759cd 100644
@@ -525,15 +525,19 @@ static bool ath10k_pci_target_is_awake(struct ath10k *ar)
        return (RTC_STATE_V_GET(val) == RTC_STATE_V_ON);
 }
 
-static void ath10k_pci_wait(struct ath10k *ar)
+static int ath10k_pci_wait(struct ath10k *ar)
 {
        int n = 100;
 
        while (n-- && !ath10k_pci_target_is_awake(ar))
                msleep(10);
 
-       if (n < 0)
+       if (n < 0) {
                ath10k_warn("Unable to wakeup target\n");
+               return -ETIMEDOUT;
+       }
+
+       return 0;
 }
 
 int ath10k_do_pci_wake(struct ath10k *ar)
@@ -2227,7 +2231,13 @@ static int ath10k_pci_start_intr_legacy(struct ath10k *ar)
                  ar_pci->mem + PCIE_LOCAL_BASE_ADDRESS +

drivers/net/wireless/ath/ath10k/pci.c static int ath10k_pci_start_intr_legacy(struct ath10k *ar) · line 2240

Quoted 10 lines
drivers/net/wireless/ath/ath10k/pci.c +7 -1
                  PCIE_SOC_WAKE_ADDRESS);
 
-       ath10k_pci_wait(ar);
+       ret = ath10k_pci_wait(ar);
+       if (ret) {
+               ath10k_warn("Failed to enable legacy interrupt, target did not wake up: %d\n",
+                           ret);
+               free_irq(ar_pci->pdev->irq, ar);
+               return ret;
+       }

I think we could actually use ath10k_do_pci_wake/sleep() here (see above iowrite). It does basically the same thing - sets the wake register and waits until HW wakes up. I think ath10k_pci_wait() could even go away.

Quoted 22 lines
drivers/net/wireless/ath/ath10k/pci.c +5 -0
        /*
         * A potential race occurs here: The CORE_BASE write
@@ -2290,6 +2300,10 @@ static int ath10k_pci_start_intr(struct ath10k *ar)
        }
 
        ret = ath10k_pci_start_intr_legacy(ar);
+       if (ret) {
+               ath10k_warn("Failed to start legacy interrupts: %d\n", ret);
+               return ret;
+       }
 
 exit:
        ar_pci->num_msi_intrs = num;
@@ -2315,13 +2329,19 @@ static int ath10k_pci_reset_target(struct ath10k *ar)
 {
        struct ath10k_pci *ar_pci = ath10k_pci_priv(ar);
        int wait_limit = 300; /* 3 sec */
+       int ret;
 
        /* Wait for Target to finish initialization before we proceed. */
        iowrite32(PCIE_SOC_WAKE_V_MASK,

drivers/net/wireless/ath/ath10k/pci.c static int ath10k_pci_reset_target(struct ath10k *ar) · line 2344

Quoted 10 lines
drivers/net/wireless/ath/ath10k/pci.c +6 -1
                  ar_pci->mem + PCIE_LOCAL_BASE_ADDRESS +
                  PCIE_SOC_WAKE_ADDRESS);
 
-       ath10k_pci_wait(ar);
+       ret = ath10k_pci_wait(ar);
+       if (ret) {
+               ath10k_warn("Failed to reset target, target did not wake up: %d\n",
+                           ret);
+               return ret;
+       }

Ditto.

Michał

author
#2 lore raw
Quoted 5 lines · Michal Kazior
Quoted 4 lines · Kalle Valo

ath10k_pci_wait() didn't notify any errors to callers, it just printed a warning so add proper error handling.

[...]

Quoted 4 lines
Quoted 4 lines
drivers/net/wireless/ath/ath10k/pci.c +0 -0
@@ -2227,7 +2231,13 @@ static int ath10k_pci_start_intr_legacy(struct ath10k *ar)
                  ar_pci->mem + PCIE_LOCAL_BASE_ADDRESS +
                  PCIE_SOC_WAKE_ADDRESS);
 
Quoted 13 lines

drivers/net/wireless/ath/ath10k/pci.c static int ath10k_pci_start_intr_legacy(struct ath10k *ar) · line 2240

Quoted 8 lines
drivers/net/wireless/ath/ath10k/pci.c +7 -1
-       ath10k_pci_wait(ar);
+       ret = ath10k_pci_wait(ar);
+       if (ret) {
+               ath10k_warn("Failed to enable legacy interrupt, target did not wake up: %d\n",
+                           ret);
+               free_irq(ar_pci->pdev->irq, ar);
+               return ret;
+       }

I think we could actually use ath10k_do_pci_wake/sleep() here (see above iowrite). It does basically the same thing - sets the wake register and waits until HW wakes up. I think ath10k_pci_wait() could even go away.

That would be nice, I'll take a look. Thanks for the review.

Signature · 1 line
Kalle Valo
author Applied
#3 lore raw
In reply to Kalle Valo
Quoted 4 lines · Kalle Valo

ath10k_pci_wait() didn't notify any errors to callers, it just printed a warning so add proper error handling.

Applied, I just changed the commit log to this:

commit f3782744c9b50edf94d28e37a937ff84f267dfab

Author: Kalle Valo <[email protected]>
Date:   Thu Oct 17 11:36:15 2013 +0300

ath10k: add error handling to ath10k_pci_wait()

ath10k_pci_wait() didn't notify any errors to callers, it just printed a warning so add proper error handling. This fixes a crash Ben reported:

ath10k: MSI-X interrupt handling (8 intrs)
ath10k: Unable to wakeup target
ath10k: target took longer 5000 us to wake up (awake count 1)
ath10k: Failed to get pcie state addr: -16
ath10k: early firmware event indicated
BUG: unable to handle kernel NULL pointer dereference at 0000000000000004
IP: [<ffffffffa06ae46c>] ath10k_ce_completed_send_next+0x47/0x122 [ath10k_pci]

Signature · 1 line
Kalle Valo