Attachment 579744 Details for Bug 811142 – do chip reset if PLL4 measurement done is not set for long time

[patch] do chip reset if PLL4 measurement done is not set for long time

ar9485-softlockup-do-reset.patch (text/plain), 2.94 KB, created by Mohammed Shafi on 2012-04-24 04:50:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mohammed Shafi

Created: 2012-04-24 04:50:05 UTC

Size: 2.94 KB

patch

obsolete

>diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
>index 72c5bcd..a5306c4 100644
>--- a/drivers/net/wireless/ath/ath9k/hw.c
>+++ b/drivers/net/wireless/ath/ath9k/hw.c
>@@ -766,15 +766,29 @@ static void ath9k_hw_init_qos(struct ath_hw *ah)
> 	REGWRITE_BUFFER_FLUSH(ah);
> }
> 
>-u32 ar9003_get_pll_sqsum_dvc(struct ath_hw *ah)
>+u32 ar9003_get_pll_sqsum_dvc(struct ath_hw *ah, bool *reset)
> {
>+	int i = 0;
>+	struct ath_common *common = ath9k_hw_common(ah);
>+
> 	REG_CLR_BIT(ah, PLL3, PLL3_DO_MEAS_MASK);
> 	udelay(100);
> 	REG_SET_BIT(ah, PLL3, PLL3_DO_MEAS_MASK);
> 
>-	while ((REG_READ(ah, PLL4) & PLL4_MEAS_DONE) == 0)
>+	while ((REG_READ(ah, PLL4) & PLL4_MEAS_DONE) == 0) {
>+
>+		i++;
> 		udelay(100);
> 
>+		if (i > 100) {
>+			ath_err(common, "PLL4 meaurement not done");
>+			*reset = true;
>+			WARN_ON(1);
>+			break;
>+		}
>+
>+	}
>+
> 	return (REG_READ(ah, PLL3) & SQSUM_DVC_MASK) >> 3;
> }
> EXPORT_SYMBOL(ar9003_get_pll_sqsum_dvc);
>diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h
>index dd4b8f4..7a5098f 100644
>--- a/drivers/net/wireless/ath/ath9k/hw.h
>+++ b/drivers/net/wireless/ath/ath9k/hw.h
>@@ -947,7 +947,7 @@ void ath9k_hw_settsf64(struct ath_hw *ah, u64 tsf64);
> void ath9k_hw_reset_tsf(struct ath_hw *ah);
> void ath9k_hw_set_tsfadjust(struct ath_hw *ah, u32 setting);
> void ath9k_hw_init_global_settings(struct ath_hw *ah);
>-u32 ar9003_get_pll_sqsum_dvc(struct ath_hw *ah);
>+u32 ar9003_get_pll_sqsum_dvc(struct ath_hw *ah, bool *reset);
> void ath9k_hw_set11nmac2040(struct ath_hw *ah);
> void ath9k_hw_beaconinit(struct ath_hw *ah, u32 next_beacon, u32 beacon_period);
> void ath9k_hw_set_sta_beacon_timers(struct ath_hw *ah,
>diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
>index d0a4b9b..a147be7 100644
>--- a/drivers/net/wireless/ath/ath9k/main.c
>+++ b/drivers/net/wireless/ath/ath9k/main.c
>@@ -942,11 +942,18 @@ out:
> 	ath9k_ps_restore(sc);
> }
> 
>-static void ath_hw_pll_rx_hang_check(struct ath_softc *sc, u32 pll_sqsum)
>+static void ath_hw_pll_rx_hang_check(struct ath_softc *sc, u32 pll_sqsum, bool reset)
> {
> 	static int count;
> 	struct ath_common *common = ath9k_hw_common(sc->sc_ah);
> 
>+	if (reset) {
>+		ath_dbg(common, RESET, "PLL hang, resetting\n");
>+		RESET_STAT_INC(sc, RESET_TYPE_PLL_HANG);
>+		ieee80211_queue_work(sc->hw, &sc->hw_reset_work);
>+		return;
>+	}
>+
> 	if (pll_sqsum >= 0x40000) {
> 		count++;
> 		if (count == 3) {
>@@ -965,14 +972,15 @@ void ath_hw_pll_work(struct work_struct *work)
> 	struct ath_softc *sc = container_of(work, struct ath_softc,
> 					    hw_pll_work.work);
> 	u32 pll_sqsum;
>+	bool reset = false;
> 
> 	if (AR_SREV_9485(sc->sc_ah)) {
> 
> 		ath9k_ps_wakeup(sc);
>-		pll_sqsum = ar9003_get_pll_sqsum_dvc(sc->sc_ah);
>+		pll_sqsum = ar9003_get_pll_sqsum_dvc(sc->sc_ah, &reset);
> 		ath9k_ps_restore(sc);
> 
>-		ath_hw_pll_rx_hang_check(sc, pll_sqsum);
>+		ath_hw_pll_rx_hang_check(sc, pll_sqsum, reset);
> 
> 		ieee80211_queue_delayed_work(sc->hw, &sc->hw_pll_work, HZ/5);
> 	}

Actions: View | Diff

Attachments on bug 811142: 576487 | 576533 | 577225 | 577370 | 577526 | 579744 | 591228 | 591554