ath5k: Add AHB bus support.
A message that is not in the archive (sent off-list or not yet received): 513944.1321291281894160.JavaMail.wlan@CHBU500181
PATCH v7 8/9 ath5k: Add AHB bus support.
From: Felix Fietkau <[email protected]>
AHB specific functions are now in ahb.c file. AHB bus is compiled in when CONFIG_ATHEROS_AR231X is set in kernel. All other platforms will use PCI bus.
Signed-off-by Felix Fietkau <[email protected]>
Signed-off-by Wojciech Dubowik <[email protected]>
--- drivers/net/wireless/ath/ath5k/Kconfig | 17 +++- drivers/net/wireless/ath/ath5k/Makefile | 3 +- drivers/net/wireless/ath/ath5k/ahb.c | 219 +++++++++++++++++++++++++++++++ drivers/net/wireless/ath/ath5k/ath5k.h | 40 ++++++ drivers/net/wireless/ath/ath5k/base.c | 16 ++- drivers/net/wireless/ath/ath5k/led.c | 6 + drivers/net/wireless/ath/ath5k/reg.h | 25 ++++ 7 files changed, 322 insertions(+), 4 deletions(-) create mode 100644 drivers/net/wireless/ath/ath5k/ahb.c
drivers/net/wireless/ath/ath5k/Kconfig +16 -1
@@ -1,10 +1,12 @@ config ATH5K tristate "Atheros 5xxx wireless cards support" - depends on PCI && MAC80211 + depends on (PCI || ATHEROS_AR231X) && MAC80211 select MAC80211_LEDS select LEDS_CLASS select NEW_LEDS select AVERAGE + select ATH5K_AHB if (ATHEROS_AR231X && !PCI) + select ATH5K_PCI if (!ATHEROS_AR231X && PCI) ---help--- This module adds support for wireless adapters based on Atheros 5xxx chipset.
@@ -38,3 +40,16 @@ config ATH5K_DEBUG modprobe ath5k debug=0x00000400 +config ATH5K_AHB + bool "Atheros 5xxx AHB bus support" + depends on (ATHEROS_AR231X && !PCI) + ---help--- + This adds support for WiSoC type chipsets of the 5xxx Atheros + family. + +config ATH5K_PCI + bool "Atheros 5xxx PCI bus support" + depends on (!ATHEROS_AR231X && PCI) + ---help--- + This adds support for PCI type chipsets of the 5xxx Atheros + family.
drivers/net/wireless/ath/ath5k/Makefile +2 -1
@@ -15,5 +15,6 @@ ath5k-y += rfkill.o ath5k-y += ani.o ath5k-y += sysfs.o ath5k-$(CONFIG_ATH5K_DEBUG) += debug.o -ath5k-y += pci.o +ath5k-$(CONFIG_ATH5K_AHB) += ahb.o +ath5k-$(CONFIG_ATH5K_PCI) += pci.o obj-$(CONFIG_ATH5K) += ath5k.o
drivers/net/wireless/ath/ath5k/ahb.c new file +219 -0
219 lines not on this page · raw message
drivers/net/wireless/ath/ath5k/ath5k.h +40 -0
@@ -319,12 +319,19 @@ struct ath5k_srev_name {#define AR5K_SREV_AR5311B 0x30/* Spirit */ #define AR5K_SREV_AR5211 0x40/* Oahu */ #define AR5K_SREV_AR5212 0x50/* Venice */ +#define AR5K_SREV_AR5312_R2 0x52/* AP31 */ #define AR5K_SREV_AR5212_V4 0x54/* ??? */ #define AR5K_SREV_AR5213 0x55/* ??? */ +#define AR5K_SREV_AR5312_R7 0x57/* AP30 */ +#define AR5K_SREV_AR2313_R8 0x58/* AP43 */ #define AR5K_SREV_AR5213A 0x59/* Hainan */ #define AR5K_SREV_AR2413 0x78/* Griffin lite */ #define AR5K_SREV_AR2414 0x70/* Griffin */ +#define AR5K_SREV_AR2315_R6 0x86/* AP51-Light */ +#define AR5K_SREV_AR2315_R7 0x87/* AP51-Full */ #define AR5K_SREV_AR5424 0x90/* Condor */ +#define AR5K_SREV_AR2317_R1 0x90/* AP61-Light */ +#define AR5K_SREV_AR2317_R2 0x91/* AP61-Full */ #define AR5K_SREV_AR5413 0xa4/* Eagle lite */ #define AR5K_SREV_AR5414 0xa0/* Eagle */ #define AR5K_SREV_AR2415 0xb0/* Talon */
@@ -1329,6 +1336,32 @@ static inline struct ath_regulatory *ath5k_hw_regulatory(struct ath5k_hw *ah)return &(ath5k_hw_common (ah)->regulatory); } +#ifdef CONFIG_ATHEROS_AR231X +#define AR5K_AR2315_PCI_BASE ((void __iomem *)0xb0100000) + +static inline void __iomem *ath5k_ahb_reg (struct ath5k_hw *ah,u16 reg) +{ +/* On AR2315 and AR2317 the PCI clock domain registers +* are outside of the WMAC register space */ +if (unlikely ((reg >=0x4000 ) && (reg <0x5000 ) && + (ah->ah_mac_srev >=AR5K_SREV_AR2315_R6 ))) +return AR5K_AR2315_PCI_BASE + reg; + +return ah->ah_iobase + reg; +} + +static inline u32 ath5k_hw_reg_read (struct ath5k_hw *ah,u16 reg) +{ +return __raw_readl (ath5k_ahb_reg (ah, reg)); +} + +static inline void ath5k_hw_reg_write (struct ath5k_hw *ah,u32 val,u16 reg) +{ +__raw_writel (val,ath5k_ahb_reg (ah, reg)); +} + +#else +static inline u32 ath5k_hw_reg_read (struct ath5k_hw *ah,u16 reg) {return ioread32 (ah->ah_iobase + reg);
@@ -1339,6 +1372,13 @@ static inline void ath5k_hw_reg_write(struct ath5k_hw *ah, u32 val, u16 reg) iowrite32(val, ah->ah_iobase + reg); } +#endif + +static inline enum ath_bus_type ath5k_get_bus_type (struct ath5k_hw *ah) +{ +return ath5k_hw_common (ah)->bus_ops->ath_bus_type; +} +static inline void ath5k_read_cachesize (struct ath_common *common,int *csz) { common->bus_ops->read_cachesize (common, csz);
drivers/net/wireless/ath/ath5k/base.c +14 -2
@@ -87,6 +87,15 @@ static void ath5k_beacon_update_timers(struct ath5k_softc *sc, u64 bc_tsf);/* Known SREVs */ static const struct ath5k_srev_name srev_names[] = { +#ifdef CONFIG_ATHEROS_AR231X + {"5312" ,AR5K_VERSION_MAC ,AR5K_SREV_AR5312_R2 }, + {"5312" ,AR5K_VERSION_MAC ,AR5K_SREV_AR5312_R7 }, + {"2313" ,AR5K_VERSION_MAC ,AR5K_SREV_AR2313_R8 }, + {"2315" ,AR5K_VERSION_MAC ,AR5K_SREV_AR2315_R6 }, + {"2315" ,AR5K_VERSION_MAC ,AR5K_SREV_AR2315_R7 }, + {"2317" ,AR5K_VERSION_MAC ,AR5K_SREV_AR2317_R1 }, + {"2317" ,AR5K_VERSION_MAC ,AR5K_SREV_AR2317_R2 }, +#else {"5210" ,AR5K_VERSION_MAC ,AR5K_SREV_AR5210 }, {"5311" ,AR5K_VERSION_MAC ,AR5K_SREV_AR5311 }, { "5311A", AR5K_VERSION_MAC, AR5K_SREV_AR5311A },
@@ -105,6 +114,7 @@ static const struct ath5k_srev_name srev_names[] = { { "5418", AR5K_VERSION_MAC, AR5K_SREV_AR5418 }, { "2425", AR5K_VERSION_MAC, AR5K_SREV_AR2425 }, { "2417", AR5K_VERSION_MAC, AR5K_SREV_AR2417 }, +#endif { "xxxxx", AR5K_VERSION_MAC, AR5K_SREV_UNKNOWN }, { "5110", AR5K_VERSION_RAD, AR5K_SREV_RAD_5110 }, { "5111", AR5K_VERSION_RAD, AR5K_SREV_RAD_5111 },
@@ -118,10 +128,12 @@ static const struct ath5k_srev_name srev_names[] = { { "2112B", AR5K_VERSION_RAD, AR5K_SREV_RAD_2112B }, { "2413", AR5K_VERSION_RAD, AR5K_SREV_RAD_2413 }, { "5413", AR5K_VERSION_RAD, AR5K_SREV_RAD_5413 }, - { "2316", AR5K_VERSION_RAD, AR5K_SREV_RAD_2316 }, - { "2317", AR5K_VERSION_RAD, AR5K_SREV_RAD_2317 }, { "5424", AR5K_VERSION_RAD, AR5K_SREV_RAD_5424 }, { "5133", AR5K_VERSION_RAD, AR5K_SREV_RAD_5133 }, +#ifdef CONFIG_ATHEROS_AR231X + { "2316", AR5K_VERSION_RAD, AR5K_SREV_RAD_2316 }, + { "2317", AR5K_VERSION_RAD, AR5K_SREV_RAD_2317 }, +#endif { "xxxxx", AR5K_VERSION_RAD, AR5K_SREV_UNKNOWN }, };
drivers/net/wireless/ath/ath5k/led.c +6 -0
@@ -161,14 +161,20 @@ int ath5k_init_leds(struct ath5k_softc *sc) {int ret =0 ;struct ieee80211_hw *hw = sc->hw; +#ifndef CONFIG_ATHEROS_AR231X struct pci_dev *pdev = sc->pdev; +#endif char name[ATH5K_LED_MAX_NAME_LEN +1 ];const struct pci_device_id *match;if (!sc->pdev)return 0 ; +#ifdef CONFIG_ATHEROS_AR231X + match =NULL ; +#else match =pci_match_id (&ath5k_led_devices[0 ], pdev); +#endif if (match) {__set_bit (ATH_STAT_LEDSOFT , sc->status); sc->led_pin =ATH_PIN (match->driver_data);
drivers/net/wireless/ath/ath5k/reg.h +25 -0
@@ -2562,3 +2562,28 @@*/ #define AR5K_PHY_PDADC_TXPOWER_BASE 0xa280#define AR5K_PHY_PDADC_TXPOWER (_n) (AR5K_PHY_PDADC_TXPOWER_BASE + ((_n) << 2)) + +/* +* Platform registers for WiSoC +*/ +#define AR5K_AR5312_RESET 0xbc003020 +#define AR5K_AR5312_RESET_BB0_COLD 0x00000004 +#define AR5K_AR5312_RESET_BB1_COLD 0x00000200 +#define AR5K_AR5312_RESET_WMAC0 0x00002000 +#define AR5K_AR5312_RESET_BB0_WARM 0x00004000 +#define AR5K_AR5312_RESET_WMAC1 0x00020000 +#define AR5K_AR5312_RESET_BB1_WARM 0x00040000 + +#define AR5K_AR5312_ENABLE 0xbc003080 +#define AR5K_AR5312_ENABLE_WLAN0 0x00000001 +#define AR5K_AR5312_ENABLE_WLAN1 0x00000008 + +#define AR5K_AR2315_RESET 0xb1000004 +#define AR5K_AR2315_RESET_WMAC 0x00000001 +#define AR5K_AR2315_RESET_BB_WARM 0x00000002 + +#define AR5K_AR2315_AHB_ARB_CTL 0xb1000008 +#define AR5K_AR2315_AHB_ARB_CTL_WLAN 0x00000002 + +#define AR5K_AR2315_BYTESWAP 0xb100000c +#define AR5K_AR2315_BYTESWAP_WMAC 0x00000002
Signature · 1 line
1.7.1