d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[ath_hal] add USB reset PLL work around for AR9331/AR9344 (Hornet/Wasp.)

Browse Source 
It turns out that this is useful on hornet and wasp SoCs but it isn't
enabled in ye olde HAL /unless/ you were using a version from one of the
business units building USB targetted devices.  It eventually got fixed
for all of them as people started wanting to use the USB ports on their
SoCs (eg for flash storage, bluetooth, 4G/LTE widgets, etc.)

This is actually a fix from ath9k but I'm merging it with the available-but-
disabled code in the QCA reference HAL.

Tested:

* AR9331 SoC
This commit is contained in:
Adrian Chadd 2017-06-04 21:21:44 +00:00
parent 50c5bb10c5
commit f0949f0cc6
1 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
sys/contrib/dev/ath/ath_hal/ar9300/ar9300_reset.c
View File

@ -90,6 +90,29 @@ do { \
#define WAR_USB_DISABLE_PLL_LOCK_DETECT(__ah)
#endif
/*
* Note: the below is the version that ships with ath9k.
* The original HAL version is above.
*/
static void
ar9300_disable_pll_lock_detect(struct ath_hal *ah)
{
/*
* On AR9330 and AR9340 devices, some PHY registers must be
* tuned to gain better stability/performance. These registers
* might be changed while doing wlan reset so the registers must
* be reprogrammed after each reset.
*/
if (AR_SREV_HORNET(ah) || AR_SREV_WASP(ah)) {
HALDEBUG(ah, HAL_DEBUG_RESET, "%s: called\n", __func__);
OS_REG_CLR_BIT(ah, AR_PHY_USB_CTRL1, (1 << 20));
OS_REG_RMW(ah, AR_PHY_USB_CTRL2,
(1 << 21) | (0xf << 22),
(1 << 21) | (0x3 << 22));
}
}
static inline void
ar9300_attach_hw_platform(struct ath_hal *ah)
{
@ -1850,6 +1873,7 @@ ar9300_set_reset(struct ath_hal *ah, int type)
/* Clear AHB reset */
OS_REG_WRITE(ah, AR_HOSTIF_REG(ah, AR_RC), 0);
ar9300_disable_pll_lock_detect(ah);
ar9300_attach_hw_platform(ah);
@ -1984,6 +2008,7 @@ ar9300_phy_disable(struct ath_hal *ah)
ar9300_init_pll(ah, AH_NULL);
ar9300_disable_pll_lock_detect(ah);
return AH_TRUE;
}
@ -4774,7 +4799,7 @@ ar9300_reset(struct ath_hal *ah, HAL_OPMODE opmode, struct ieee80211_channel *ch
* successfully - skip the rest of reset
*/
if (AH9300(ah)->ah_dma_stuck != AH_TRUE) {
WAR_USB_DISABLE_PLL_LOCK_DETECT(ah);
ar9300_disable_pll_lock_detect(ah);
#if ATH_SUPPORT_MCI
if (AH_PRIVATE(ah)->ah_caps.halMciSupport && ahp->ah_mci_ready)
{
@ -5350,7 +5375,7 @@ ar9300_reset(struct ath_hal *ah, HAL_OPMODE opmode, struct ieee80211_channel *ch
#undef REG_WRITE
#endif /* ATH_LOW_POWER_ENABLE */
WAR_USB_DISABLE_PLL_LOCK_DETECT(ah);
ar9300_disable_pll_lock_detect(ah);
/* H/W Green TX */
ar9300_control_signals_for_green_tx_mode(ah);