[PATCH 9/9] ath5k: AHB port. Fix reset and interrupts for AHB type of devices.

[PATCH 9/9] ath5k: AHB port. Fix reset and interrupts for AHB type of devices.

[Wojciech Dubowik]

On WiSoc we cannot access mac register before it is resetted.
Otherwise it will crash hardware.

Signed-off-by: Wojciech Dubowik <Wojciech.Dubowik@neratec.com>
---
 drivers/net/wireless/ath/ath5k/base.c  |    7 ++-
 drivers/net/wireless/ath/ath5k/reset.c |  113 ++++++++++++++++++++++++-------
 2 files changed, 93 insertions(+), 27 deletions(-)

diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c
index 13d5da5..00ebb81 100644
--- a/drivers/net/wireless/ath/ath5k/base.c
+++ b/drivers/net/wireless/ath/ath5k/base.c
@@ -2175,7 +2175,8 @@ ath5k_intr(int irq, void *dev_id)
 	unsigned int counter = 1000;
 
 	if (unlikely(test_bit(ATH_STAT_INVALID, sc->status) ||
-				!ath5k_hw_is_intr_pending(ah)))
+		((ath5k_get_bus_type(ah) != ATH_AHB) &&
+				!ath5k_hw_is_intr_pending(ah))))
 		return IRQ_NONE;
 
 	do {
@@ -2241,6 +2242,10 @@ ath5k_intr(int irq, void *dev_id)
 				tasklet_schedule(&sc->rf_kill.toggleq);
 
 		}
+
+		if(ath5k_get_bus_type(ah) == ATH_AHB)
+			break;
+
 	} while (ath5k_hw_is_intr_pending(ah) && --counter > 0);
 
 	if (unlikely(!counter))
diff --git a/drivers/net/wireless/ath/ath5k/reset.c b/drivers/net/wireless/ath/ath5k/reset.c
index 198a146..05bf536 100644
--- a/drivers/net/wireless/ath/ath5k/reset.c
+++ b/drivers/net/wireless/ath/ath5k/reset.c
@@ -27,6 +27,7 @@
 
 #include <linux/pci.h> 		/* To determine if a card is pci-e */
 #include <linux/log2.h>
+#include <linux/platform_device.h>
 #include "ath5k.h"
 #include "reg.h"
 #include "base.h"
@@ -198,31 +199,73 @@ static inline void ath5k_hw_write_rate_duration(struct ath5k_hw *ah,
  */
 static int ath5k_hw_nic_reset(struct ath5k_hw *ah, u32 val)
 {
-	int ret;
+	int ret = 0;
 	u32 mask = val ? val : ~0U;
 
 	/* Read-and-clear RX Descriptor Pointer*/
-	ath5k_hw_reg_read(ah, AR5K_RXDP);
+	if(!(mask & AR5K_RESET_CTL_MAC))
+		ath5k_hw_reg_read(ah, AR5K_RXDP);
 
 	/*
 	 * Reset the device and wait until success
 	 */
-	ath5k_hw_reg_write(ah, val, AR5K_RESET_CTL);
+	if(ath5k_get_bus_type(ah) == ATH_AHB) {
+		volatile u32 *reg;
+		u32 regval;
+		val = 0;
+
+		/* ah->ah_mac_srev is not available at this point yet */
+		if (ah->ah_sc->devid >= AR5K_SREV_AR2315_R6) {
+			reg = (u32 *) AR5K_AR2315_RESET;
+			if (mask & AR5K_RESET_CTL_MAC)
+				val |= AR5K_AR2315_RESET_WMAC;
+			if (mask & AR5K_RESET_CTL_BASEBAND)
+				val |= AR5K_AR2315_RESET_BB_WARM;
+		} else {
+			reg = (u32 *) AR5K_AR5312_RESET;
+			if (to_platform_device(ah->ah_sc->dev)->id == 0) {
+				if (mask & AR5K_RESET_CTL_MAC)
+					val |= AR5K_AR5312_RESET_WMAC0;
+				if (mask & AR5K_RESET_CTL_BASEBAND)
+					val |= AR5K_AR5312_RESET_BB0_COLD |
+					       AR5K_AR5312_RESET_BB0_WARM;
+			} else {
+				if (mask & AR5K_RESET_CTL_MAC)
+					val |= AR5K_AR5312_RESET_WMAC1;
+				if (mask & AR5K_RESET_CTL_BASEBAND)
+					val |= AR5K_AR5312_RESET_BB1_COLD |
+					       AR5K_AR5312_RESET_BB1_WARM;
+			}
+		}
 
-	/* Wait at least 128 PCI clocks */
-	udelay(15);
+		/* Put BB/MAC into reset */
+		regval = __raw_readl(reg);
+		__raw_writel(regval | val, reg);
+		regval = __raw_readl(reg);
+		udelay(100);
 
-	if (ah->ah_version == AR5K_AR5210) {
-		val &= AR5K_RESET_CTL_PCU | AR5K_RESET_CTL_DMA
-			| AR5K_RESET_CTL_MAC | AR5K_RESET_CTL_PHY;
-		mask &= AR5K_RESET_CTL_PCU | AR5K_RESET_CTL_DMA
-			| AR5K_RESET_CTL_MAC | AR5K_RESET_CTL_PHY;
+		/* Bring BB/MAC out of reset */
+		__raw_writel(regval & ~val, reg);
+		regval = __raw_readl(reg);
 	} else {
-		val &= AR5K_RESET_CTL_PCU | AR5K_RESET_CTL_BASEBAND;
-		mask &= AR5K_RESET_CTL_PCU | AR5K_RESET_CTL_BASEBAND;
-	}
 
-	ret = ath5k_hw_register_timeout(ah, AR5K_RESET_CTL, mask, val, false);
+		ath5k_hw_reg_write(ah, val, AR5K_RESET_CTL);
+
+		/* Wait at least 128 PCI clocks */
+		udelay(15);
+
+		if (ah->ah_version == AR5K_AR5210) {
+			val &= AR5K_RESET_CTL_PCU | AR5K_RESET_CTL_DMA
+				| AR5K_RESET_CTL_MAC | AR5K_RESET_CTL_PHY;
+			mask &= AR5K_RESET_CTL_PCU | AR5K_RESET_CTL_DMA
+				| AR5K_RESET_CTL_MAC | AR5K_RESET_CTL_PHY;
+		} else {
+			val &= AR5K_RESET_CTL_PCU | AR5K_RESET_CTL_BASEBAND;
+			mask &= AR5K_RESET_CTL_PCU | AR5K_RESET_CTL_BASEBAND;
+		}
+
+		ret = ath5k_hw_register_timeout(ah, AR5K_RESET_CTL, mask, val, false);
+	}
 
 	/*
 	 * Reset configuration register (for hw byte-swap). Note that this
@@ -334,6 +377,9 @@ int ath5k_hw_on_hold(struct ath5k_hw *ah)
 	u32 bus_flags;
 	int ret;
 
+	if(ath5k_get_bus_type(ah) == ATH_AHB)
+		return 0;
+
 	/* Make sure device is awake */
 	ret = ath5k_hw_set_power(ah, AR5K_PM_AWAKE, true, 0);
 	if (ret) {
@@ -390,22 +436,30 @@ int ath5k_hw_nic_wakeup(struct ath5k_hw *ah, int flags, bool initial)
 	mode = 0;
 	clock = 0;
 
-	/* Wakeup the device */
-	ret = ath5k_hw_set_power(ah, AR5K_PM_AWAKE, true, 0);
-	if (ret) {
-		ATH5K_ERR(ah->ah_sc, "failed to wakeup the MAC Chip\n");
-		return ret;
+	if(ath5k_get_bus_type(ah) == ATH_AHB && !initial){
+		/* Wakeup the device */
+		ret = ath5k_hw_set_power(ah, AR5K_PM_AWAKE, true, 0);
+		if (ret) {
+			ATH5K_ERR(ah->ah_sc, "failed to wakeup the MAC Chip\n");
+			return ret;
+		}
 	}
 
 	/*
 	 * Put chipset on warm reset...
 	 *
-	 * Note: putting PCI core on warm reset on PCI-E cards
-	 * results card to hang and always return 0xffff... so
-	 * we ingore that flag for PCI-E cards. On PCI cards
-	 * this flag gets cleared after 64 PCI clocks.
 	 */
-	bus_flags = (pdev && pdev->is_pcie) ? 0 : AR5K_RESET_CTL_PCI;
+	if(ath5k_get_bus_type(ah) == ATH_AHB){
+		/* Reset MAC on WiSoc devices */
+		bus_flags = (initial) ? AR5K_RESET_CTL_MAC : 0;
+	} else {
+		/* Note: putting PCI core on warm reset on PCI-E cards
+		 * results card to hang and always return 0xffff... so
+		 * we ingore that flag for PCI-E cards. On PCI cards
+		 * this flag gets cleared after 64 PCI clocks.
+		 */
+		bus_flags = (pdev && pdev->is_pcie) ? 0 : AR5K_RESET_CTL_PCI;
+	}
 
 	if (ah->ah_version == AR5K_AR5210) {
 		ret = ath5k_hw_nic_reset(ah, AR5K_RESET_CTL_PCU |
@@ -536,6 +590,9 @@ static void ath5k_hw_set_sleep_clock(struct ath5k_hw *ah, bool enable)
 	struct ath5k_eeprom_info *ee = &ah->ah_capabilities.cap_eeprom;
 	u32 scal, spending, usec32;
 
+	if(ath5k_get_bus_type(ah) == ATH_AHB)
+		enable = false;
+
 	/* Only set 32KHz settings if we have an external
 	 * 32KHz crystal present */
 	if ((AR5K_EEPROM_HAS32KHZCRYSTAL(ee->ee_misc1) ||
@@ -607,6 +664,7 @@ static void ath5k_hw_set_sleep_clock(struct ath5k_hw *ah, bool enable)
 
 		if ((ah->ah_radio == AR5K_RF5112) ||
 		(ah->ah_radio == AR5K_RF5413) ||
+		(ah->ah_radio == AR5K_RF2316) ||
 		(ah->ah_mac_version == (AR5K_SREV_AR2417 >> 4)))
 			spending = 0x14;
 		else
@@ -614,7 +672,9 @@ static void ath5k_hw_set_sleep_clock(struct ath5k_hw *ah, bool enable)
 		ath5k_hw_reg_write(ah, spending, AR5K_PHY_SPENDING);
 
 		if ((ah->ah_radio == AR5K_RF5112) ||
-		(ah->ah_radio == AR5K_RF5413))
+		(ah->ah_radio == AR5K_RF5413) ||
+		(ah->ah_radio == AR5K_RF2316) ||
+		(ah->ah_radio == AR5K_RF2317))
 			usec32 = 39;
 		else
 			usec32 = 31;
@@ -678,7 +738,8 @@ static void ath5k_hw_tweak_initval_settings(struct ath5k_hw *ah,
 
 	/* Set fast ADC */
 	if ((ah->ah_radio == AR5K_RF5413) ||
-	(ah->ah_mac_version == (AR5K_SREV_AR2417 >> 4))) {
+		(ah->ah_radio == AR5K_RF2317) ||
+		(ah->ah_mac_version == (AR5K_SREV_AR2417 >> 4))) {
 		u32 fast_adc = true;
 
 		if (channel->center_freq == 2462 ||
-- 
1.7.1

Re: [PATCH 9/9] ath5k: AHB port. Fix reset and interrupts for AHB type of devices.

[Bob Copeland]

On Thu, Nov 11, 2010 at 9:58 AM, Wojciech Dubowik <dubowoj@neratec.com> wrote:
> On WiSoc we cannot access mac register before it is resetted.
> Otherwise it will crash hardware.
>
> Signed-off-by: Wojciech Dubowik <Wojciech.Dubowik@neratec.com>
> ---
>  drivers/net/wireless/ath/ath5k/base.c  |    7 ++-
>  drivers/net/wireless/ath/ath5k/reset.c |  113 ++++++++++++++++++++++++-------
>  2 files changed, 93 insertions(+), 27 deletions(-)
>
> diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c
> index 13d5da5..00ebb81 100644
> --- a/drivers/net/wireless/ath/ath5k/base.c
> +++ b/drivers/net/wireless/ath/ath5k/base.c
> @@ -2175,7 +2175,8 @@ ath5k_intr(int irq, void *dev_id)
>        unsigned int counter = 1000;
>
>        if (unlikely(test_bit(ATH_STAT_INVALID, sc->status) ||
> -                               !ath5k_hw_is_intr_pending(ah)))
> +               ((ath5k_get_bus_type(ah) != ATH_AHB) &&
> +                               !ath5k_hw_is_intr_pending(ah))))
>                return IRQ_NONE;
>

Hrm, we really don't want to sprinkle these special cases all around
the driver.  Perhaps it'd be better to make sure ATH_STAT_INVALID
isn't set until the soc is ready.  And, in other cases, using
capability bits or something?  Bus type seems a bit crude.

> @@ -2241,6 +2242,10 @@ ath5k_intr(int irq, void *dev_id)
>                                tasklet_schedule(&sc->rf_kill.toggleq);
>
>                }
> +
> +               if(ath5k_get_bus_type(ah) == ATH_AHB)
> +                       break;
> +
>        } while (ath5k_hw_is_intr_pending(ah) && --counter > 0);

Why?

>  static int ath5k_hw_nic_reset(struct ath5k_hw *ah, u32 val)
>  {
> -       int ret;
> +       int ret = 0;

In general, I dislike assigning ret until the last possible moment,
because leaving it unassigned sometimes catches errors like:

  int ret;

+ if (new_boolean_test)
+     goto out;

  ret = xyz();

  out:
      return ret;

In this particular case it doesn't matter that much, but the
early assignment shouldn't really be needed.


>
>        /*
>         * Reset configuration register (for hw byte-swap). Note that this
> @@ -334,6 +377,9 @@ int ath5k_hw_on_hold(struct ath5k_hw *ah)
>        u32 bus_flags;
>        int ret;
>
> +       if(ath5k_get_bus_type(ah) == ATH_AHB)
> +               return 0;
> +
>        /* Make sure device is awake */
>        ret = ath5k_hw_set_power(ah, AR5K_PM_AWAKE, true, 0);
>        if (ret) {
> @@ -390,22 +436,30 @@ int ath5k_hw_nic_wakeup(struct ath5k_hw *ah, int flags, bool initial)
>        mode = 0;
>        clock = 0;
>
> -       /* Wakeup the device */
> -       ret = ath5k_hw_set_power(ah, AR5K_PM_AWAKE, true, 0);
> -       if (ret) {
> -               ATH5K_ERR(ah->ah_sc, "failed to wakeup the MAC Chip\n");
> -               return ret;
> +       if(ath5k_get_bus_type(ah) == ATH_AHB && !initial){
> +               /* Wakeup the device */
> +               ret = ath5k_hw_set_power(ah, AR5K_PM_AWAKE, true, 0);
> +               if (ret) {
> +                       ATH5K_ERR(ah->ah_sc, "failed to wakeup the MAC Chip\n");
> +                       return ret;
> +               }
>        }
>
>        /*
>         * Put chipset on warm reset...
>         *
> -        * Note: putting PCI core on warm reset on PCI-E cards
> -        * results card to hang and always return 0xffff... so
> -        * we ingore that flag for PCI-E cards. On PCI cards
> -        * this flag gets cleared after 64 PCI clocks.
>         */
> -       bus_flags = (pdev && pdev->is_pcie) ? 0 : AR5K_RESET_CTL_PCI;
> +       if(ath5k_get_bus_type(ah) == ATH_AHB){
> +               /* Reset MAC on WiSoc devices */
> +               bus_flags = (initial) ? AR5K_RESET_CTL_MAC : 0;
> +       } else {
> +               /* Note: putting PCI core on warm reset on PCI-E cards
> +                * results card to hang and always return 0xffff... so
> +                * we ingore that flag for PCI-E cards. On PCI cards
> +                * this flag gets cleared after 64 PCI clocks.
> +                */
> +               bus_flags = (pdev && pdev->is_pcie) ? 0 : AR5K_RESET_CTL_PCI;


Maybe ath5k_get_bus_flags or something here.


 +       }
>
>        if (ah->ah_version == AR5K_AR5210) {
>                ret = ath5k_hw_nic_reset(ah, AR5K_RESET_CTL_PCU |
> @@ -536,6 +590,9 @@ static void ath5k_hw_set_sleep_clock(struct ath5k_hw *ah, bool enable)
>        struct ath5k_eeprom_info *ee = &ah->ah_capabilities.cap_eeprom;
>        u32 scal, spending, usec32;
>
> +       if(ath5k_get_bus_type(ah) == ATH_AHB)
> +               enable = false;
> +

Do you need this hunk?  We never enable the sleep clock for AP mode.

-- 
Bob Copeland %% www.bobcopeland.com

Re: [PATCH 9/9] ath5k: AHB port. Fix reset and interrupts for AHB type of devices.

[Felix Fietkau]

On 2010-11-12 8:16 PM, Bob Copeland wrote:
> On Thu, Nov 11, 2010 at 9:58 AM, Wojciech Dubowik <dubowoj@neratec.com> wrote:
>> On WiSoc we cannot access mac register before it is resetted.
>> Otherwise it will crash hardware.
>>
>> Signed-off-by: Wojciech Dubowik <Wojciech.Dubowik@neratec.com>
>> ---
>>  drivers/net/wireless/ath/ath5k/base.c  |    7 ++-
>>  drivers/net/wireless/ath/ath5k/reset.c |  113 ++++++++++++++++++++++++-------
>>  2 files changed, 93 insertions(+), 27 deletions(-)
>>
>> diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c
>> index 13d5da5..00ebb81 100644
>> --- a/drivers/net/wireless/ath/ath5k/base.c
>> +++ b/drivers/net/wireless/ath/ath5k/base.c
>> @@ -2175,7 +2175,8 @@ ath5k_intr(int irq, void *dev_id)
>>        unsigned int counter = 1000;
>>
>>        if (unlikely(test_bit(ATH_STAT_INVALID, sc->status) ||
>> -                               !ath5k_hw_is_intr_pending(ah)))
>> +               ((ath5k_get_bus_type(ah) != ATH_AHB) &&
>> +                               !ath5k_hw_is_intr_pending(ah))))
>>                return IRQ_NONE;
>>
> 
> Hrm, we really don't want to sprinkle these special cases all around
> the driver.  Perhaps it'd be better to make sure ATH_STAT_INVALID
> isn't set until the soc is ready.  And, in other cases, using
> capability bits or something?  Bus type seems a bit crude.
> 
>> @@ -2241,6 +2242,10 @@ ath5k_intr(int irq, void *dev_id)
>>                                tasklet_schedule(&sc->rf_kill.toggleq);
>>
>>                }
>> +
>> +               if(ath5k_get_bus_type(ah) == ATH_AHB)
>> +                       break;
>> +
>>        } while (ath5k_hw_is_intr_pending(ah) && --counter > 0);
> 
> Why?
I think I had this in one of my old patches, because occasionally the
device would get duplicate interrupt events (causing the kernel IRQ code
to eventually disable the interrupt completely).

>> @@ -536,6 +590,9 @@ static void ath5k_hw_set_sleep_clock(struct ath5k_hw *ah, bool enable)
>>        struct ath5k_eeprom_info *ee = &ah->ah_capabilities.cap_eeprom;
>>        u32 scal, spending, usec32;
>>
>> +       if(ath5k_get_bus_type(ah) == ATH_AHB)
>> +               enable = false;
>> +
> 
> Do you need this hunk?  We never enable the sleep clock for AP mode.
> 
What does this have to do with AP mode? Some people use these devices in
station mode.
If I remember correctly, these devices have problems with sleep clock,
maybe because parts of the WMAC clock overlap with the CPU clock
(they're inside the same chip after all).

- Felix

Re: [PATCH 9/9] ath5k: AHB port. Fix reset and interrupts for AHB type of devices.

[Bob Copeland]

On Fri, Nov 12, 2010 at 2:35 PM, Felix Fietkau <nbd@openwrt.org> wrote:
>> Do you need this hunk?  We never enable the sleep clock for AP mode.
>>
> What does this have to do with AP mode? Some people use these devices in
> station mode.
> If I remember correctly, these devices have problems with sleep clock,
> maybe because parts of the WMAC clock overlap with the CPU clock
> (they're inside the same chip after all).

Well I mentioned it because I didn't know how old the patchset was
originally, and we had problems with the TSF and sleep clock in general
in AP mode, so I didn't know if this line was working around the same
issue.

-- 
Bob Copeland %% www.bobcopeland.com