Skip to content

L
linux
Commit e9141f71 authored by Sujith's avatar Sujith Committed by John W. Linville
Browse files
Options

ath9k_hw: Fix async fifo for AR9287 

Async fifo is now enabled only for versions 1.3 and above.
Enable it in the appropriate place, in the reset routine,
instead of process_ini().
Signed-off-by: default avatarSujith <Sujith.Manoharan@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 15ae733b
Hide whitespace changes
Inline Side-by-side
Showing with 55 additions and 44 deletions
drivers/net/wireless/ath/ath9k/ar5008_phy.c
View file @ e9141f71
...@@ -742,17 +742,6 @@ static int ar5008_hw_process_ini(struct ath_hw *ah, ...@@ -742,17 +742,6 @@ static int ar5008_hw_process_ini(struct ath_hw *ah,
return -EINVAL; return -EINVAL;
} }
if (AR_SREV_9287_12_OR_LATER(ah)) {
/* Enable ASYNC FIFO */
REG_SET_BIT(ah, AR_MAC_PCU_ASYNC_FIFO_REG3,
AR_MAC_PCU_ASYNC_FIFO_REG3_DATAPATH_SEL);
REG_SET_BIT(ah, AR_PHY_MODE, AR_PHY_MODE_ASYNCFIFO);
REG_CLR_BIT(ah, AR_MAC_PCU_ASYNC_FIFO_REG3,
AR_MAC_PCU_ASYNC_FIFO_REG3_SOFT_RESET);
REG_SET_BIT(ah, AR_MAC_PCU_ASYNC_FIFO_REG3,
AR_MAC_PCU_ASYNC_FIFO_REG3_SOFT_RESET);
}
/* /*
* Set correct baseband to analog shift setting to * Set correct baseband to analog shift setting to
* access analog chips. * access analog chips.
......
drivers/net/wireless/ath/ath9k/ar9002_hw.c
View file @ e9141f71
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
#include "ar5008_initvals.h" #include "ar5008_initvals.h"
#include "ar9001_initvals.h" #include "ar9001_initvals.h"
#include "ar9002_initvals.h" #include "ar9002_initvals.h"
#include "ar9002_phy.h"
/* General hardware code for the A5008/AR9001/AR9002 hadware families */ /* General hardware code for the A5008/AR9001/AR9002 hadware families */
...@@ -565,18 +566,29 @@ int ar9002_hw_rf_claim(struct ath_hw *ah) ...@@ -565,18 +566,29 @@ int ar9002_hw_rf_claim(struct ath_hw *ah)
return 0; return 0;
} }
void ar9002_hw_enable_async_fifo(struct ath_hw *ah)
{
if (AR_SREV_9287_13_OR_LATER(ah)) {
REG_SET_BIT(ah, AR_MAC_PCU_ASYNC_FIFO_REG3,
AR_MAC_PCU_ASYNC_FIFO_REG3_DATAPATH_SEL);
REG_SET_BIT(ah, AR_PHY_MODE, AR_PHY_MODE_ASYNCFIFO);
REG_CLR_BIT(ah, AR_MAC_PCU_ASYNC_FIFO_REG3,
AR_MAC_PCU_ASYNC_FIFO_REG3_SOFT_RESET);
REG_SET_BIT(ah, AR_MAC_PCU_ASYNC_FIFO_REG3,
AR_MAC_PCU_ASYNC_FIFO_REG3_SOFT_RESET);
}
}
/* /*
* Enable ASYNC FIFO
*
* If Async FIFO is enabled, the following counters change as MAC now runs * If Async FIFO is enabled, the following counters change as MAC now runs
* at 117 Mhz instead of 88/44MHz when async FIFO is disabled. * at 117 Mhz instead of 88/44MHz when async FIFO is disabled.
* *
* The values below tested for ht40 2 chain. * The values below tested for ht40 2 chain.
* Overwrite the delay/timeouts initialized in process ini. * Overwrite the delay/timeouts initialized in process ini.
*/ */
void ar9002_hw_enable_async_fifo(struct ath_hw *ah) void ar9002_hw_update_async_fifo(struct ath_hw *ah)
{ {
if (AR_SREV_9287_12_OR_LATER(ah)) { if (AR_SREV_9287_13_OR_LATER(ah)) {
REG_WRITE(ah, AR_D_GBL_IFS_SIFS, REG_WRITE(ah, AR_D_GBL_IFS_SIFS,
AR_D_GBL_IFS_SIFS_ASYNC_FIFO_DUR); AR_D_GBL_IFS_SIFS_ASYNC_FIFO_DUR);
REG_WRITE(ah, AR_D_GBL_IFS_SLOT, REG_WRITE(ah, AR_D_GBL_IFS_SLOT,
...@@ -600,9 +612,9 @@ void ar9002_hw_enable_async_fifo(struct ath_hw *ah) ...@@ -600,9 +612,9 @@ void ar9002_hw_enable_async_fifo(struct ath_hw *ah)
*/ */
void ar9002_hw_enable_wep_aggregation(struct ath_hw *ah) void ar9002_hw_enable_wep_aggregation(struct ath_hw *ah)
{ {
if (AR_SREV_9287_12_OR_LATER(ah)) { if (AR_SREV_9287_13_OR_LATER(ah)) {
REG_SET_BIT(ah, AR_PCU_MISC_MODE2, REG_SET_BIT(ah, AR_PCU_MISC_MODE2,
AR_PCU_MISC_MODE2_ENABLE_AGGWEP); AR_PCU_MISC_MODE2_ENABLE_AGGWEP);
} }
} }
......
drivers/net/wireless/ath/ath9k/hw.c
View file @ e9141f71
...@@ -1298,6 +1298,9 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan, ...@@ -1298,6 +1298,9 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
if (AR_SREV_9280_10_OR_LATER(ah)) if (AR_SREV_9280_10_OR_LATER(ah))
REG_SET_BIT(ah, AR_GPIO_INPUT_EN_VAL, AR_GPIO_JTAG_DISABLE); REG_SET_BIT(ah, AR_GPIO_INPUT_EN_VAL, AR_GPIO_JTAG_DISABLE);
if (!AR_SREV_9300_20_OR_LATER(ah))
ar9002_hw_enable_async_fifo(ah);
r = ath9k_hw_process_ini(ah, chan); r = ath9k_hw_process_ini(ah, chan);
if (r) if (r)
return r; return r;
...@@ -1370,7 +1373,7 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan, ...@@ -1370,7 +1373,7 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
ath9k_hw_init_global_settings(ah); ath9k_hw_init_global_settings(ah);
if (!AR_SREV_9300_20_OR_LATER(ah)) { if (!AR_SREV_9300_20_OR_LATER(ah)) {
ar9002_hw_enable_async_fifo(ah); ar9002_hw_update_async_fifo(ah);
ar9002_hw_enable_wep_aggregation(ah); ar9002_hw_enable_wep_aggregation(ah);
} }
......
drivers/net/wireless/ath/ath9k/hw.h
View file @ e9141f71
...@@ -911,6 +911,7 @@ void ath9k_hw_get_delta_slope_vals(struct ath_hw *ah, u32 coef_scaled, ...@@ -911,6 +911,7 @@ void ath9k_hw_get_delta_slope_vals(struct ath_hw *ah, u32 coef_scaled,
void ar9002_hw_cck_chan14_spread(struct ath_hw *ah); void ar9002_hw_cck_chan14_spread(struct ath_hw *ah);
int ar9002_hw_rf_claim(struct ath_hw *ah); int ar9002_hw_rf_claim(struct ath_hw *ah);
void ar9002_hw_enable_async_fifo(struct ath_hw *ah); void ar9002_hw_enable_async_fifo(struct ath_hw *ah);
void ar9002_hw_update_async_fifo(struct ath_hw *ah);
void ar9002_hw_enable_wep_aggregation(struct ath_hw *ah); void ar9002_hw_enable_wep_aggregation(struct ath_hw *ah);
/* /*
......
drivers/net/wireless/ath/ath9k/reg.h
View file @ e9141f71
...@@ -760,32 +760,33 @@ ...@@ -760,32 +760,33 @@
#define AR_SREV_REVISION2 0x00000F00 #define AR_SREV_REVISION2 0x00000F00
#define AR_SREV_REVISION2_S 8 #define AR_SREV_REVISION2_S 8
#define AR_SREV_VERSION_5416_PCI 0xD #define AR_SREV_VERSION_5416_PCI 0xD
#define AR_SREV_VERSION_5416_PCIE 0xC #define AR_SREV_VERSION_5416_PCIE 0xC
#define AR_SREV_REVISION_5416_10 0 #define AR_SREV_REVISION_5416_10 0
#define AR_SREV_REVISION_5416_20 1 #define AR_SREV_REVISION_5416_20 1
#define AR_SREV_REVISION_5416_22 2 #define AR_SREV_REVISION_5416_22 2
#define AR_SREV_VERSION_9100 0x14 #define AR_SREV_VERSION_9100 0x14
#define AR_SREV_VERSION_9160 0x40 #define AR_SREV_VERSION_9160 0x40
#define AR_SREV_REVISION_9160_10 0 #define AR_SREV_REVISION_9160_10 0
#define AR_SREV_REVISION_9160_11 1 #define AR_SREV_REVISION_9160_11 1
#define AR_SREV_VERSION_9280 0x80 #define AR_SREV_VERSION_9280 0x80
#define AR_SREV_REVISION_9280_10 0 #define AR_SREV_REVISION_9280_10 0
#define AR_SREV_REVISION_9280_20 1 #define AR_SREV_REVISION_9280_20 1
#define AR_SREV_REVISION_9280_21 2 #define AR_SREV_REVISION_9280_21 2
#define AR_SREV_VERSION_9285 0xC0 #define AR_SREV_VERSION_9285 0xC0
#define AR_SREV_REVISION_9285_10 0 #define AR_SREV_REVISION_9285_10 0
#define AR_SREV_REVISION_9285_11 1 #define AR_SREV_REVISION_9285_11 1
#define AR_SREV_REVISION_9285_12 2 #define AR_SREV_REVISION_9285_12 2
#define AR_SREV_VERSION_9287 0x180 #define AR_SREV_VERSION_9287 0x180
#define AR_SREV_REVISION_9287_10 0 #define AR_SREV_REVISION_9287_10 0
#define AR_SREV_REVISION_9287_11 1 #define AR_SREV_REVISION_9287_11 1
#define AR_SREV_REVISION_9287_12 2 #define AR_SREV_REVISION_9287_12 2
#define AR_SREV_VERSION_9271 0x140 #define AR_SREV_REVISION_9287_13 3
#define AR_SREV_REVISION_9271_10 0 #define AR_SREV_VERSION_9271 0x140
#define AR_SREV_REVISION_9271_11 1 #define AR_SREV_REVISION_9271_10 0
#define AR_SREV_VERSION_9300 0x1c0 #define AR_SREV_REVISION_9271_11 1
#define AR_SREV_REVISION_9300_20 2 /* 2.0 and 2.1 */ #define AR_SREV_VERSION_9300 0x1c0
#define AR_SREV_REVISION_9300_20 2 /* 2.0 and 2.1 */
#define AR_SREV_5416(_ah) \ #define AR_SREV_5416(_ah) \
(((_ah)->hw_version.macVersion == AR_SREV_VERSION_5416_PCI) || \ (((_ah)->hw_version.macVersion == AR_SREV_VERSION_5416_PCI) || \
...@@ -863,6 +864,11 @@ ...@@ -863,6 +864,11 @@
(((_ah)->hw_version.macVersion > AR_SREV_VERSION_9287) || \ (((_ah)->hw_version.macVersion > AR_SREV_VERSION_9287) || \
(((_ah)->hw_version.macVersion == AR_SREV_VERSION_9287) && \ (((_ah)->hw_version.macVersion == AR_SREV_VERSION_9287) && \
((_ah)->hw_version.macRev >= AR_SREV_REVISION_9287_12))) ((_ah)->hw_version.macRev >= AR_SREV_REVISION_9287_12)))
#define AR_SREV_9287_13_OR_LATER(_ah) \
(((_ah)->hw_version.macVersion > AR_SREV_VERSION_9287) || \
(((_ah)->hw_version.macVersion == AR_SREV_VERSION_9287) && \
((_ah)->hw_version.macRev >= AR_SREV_REVISION_9287_13)))
#define AR_SREV_9271(_ah) \ #define AR_SREV_9271(_ah) \
(((_ah))->hw_version.macVersion == AR_SREV_VERSION_9271) (((_ah))->hw_version.macVersion == AR_SREV_VERSION_9271)
#define AR_SREV_9271_10(_ah) \ #define AR_SREV_9271_10(_ah) \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7