ath5k: AHB port. Add AHB bus support.
PATCH 8/9 ath5k: AHB port. Add AHB bus support.
In reply to a message not in the archiveAHB specific functions are now in ahb.c file. There is no common init functions which tries first pci and then ahb becasue on some wisoc's PCI is not present. AHB bus is compiled in when CONFIG_ATHEROS_AR231X is set in kernel.
--- drivers/net/wireless/ath/ath5k/Makefile | 2 +- drivers/net/wireless/ath/ath5k/ahb.c | 221 +++++++++++++++++++++++++++++++ drivers/net/wireless/ath/ath5k/ath5k.h | 12 ++ drivers/net/wireless/ath/ath5k/base.c | 16 ++- drivers/net/wireless/ath/ath5k/led.c | 6 + drivers/net/wireless/ath/ath5k/reg.h | 25 ++++ 6 files changed, 279 insertions(+), 3 deletions(-) create mode 100644 drivers/net/wireless/ath/ath5k/ahb.c
drivers/net/wireless/ath/ath5k/Makefile +1 -1
@@ -15,5 +15,5 @@ ath5k-y += rfkill.o ath5k-y += ani.o ath5k-y += sysfs.o ath5k-$(CONFIG_ATH5K_DEBUG) += debug.o -ath5k-y += pci.o +ath5k-y += $(if $(CONFIG_ATHEROS_AR231X),ahb,pci).o obj-$(CONFIG_ATH5K) += ath5k.o
drivers/net/wireless/ath/ath5k/ahb.c new file +221 -0
221 lines not on this page · raw message
drivers/net/wireless/ath/ath5k/ath5k.h +12 -0
@@ -303,12 +303,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 */
@@ -1311,6 +1318,11 @@ static inline void ath5k_hw_reg_write(struct ath5k_hw *ah, u32 val, u16 reg)iowrite32 (val, ah->ah_iobase + reg); } +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
@@ -86,6 +86,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 },
@@ -104,6 +113,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 },
@@ -117,10 +127,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
@@ -2558,3 +2558,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
Quoted 3 lines · Wojciech Dubowik
AHB specific functions are now in
ahb.cfile. There is no common init functions which tries first pci and then ahb becasue on some
'because'
Quoted 9 lines
drivers/net/wireless/ath/ath5k/Makefile +0
-0@@ -15,5 +15,5 @@ ath5k-y += rfkill.oath5k-y += ani.o ath5k-y += sysfs.o ath5k-$(CONFIG_ATH5K_DEBUG) += debug.o
drivers/net/wireless/ath/ath5k/Makefile +1
-1-ath5k-y += pci.o +ath5k-y += $(if $(CONFIG_ATHEROS_AR231X),ahb,pci).oobj-$(CONFIG_ATH5K) += ath5k.o
This is not the right way.. what if someone wants both in one kernel?
Signature · 1 line
Bob Copeland %% www.bobcopeland.com
Quoted 7 lines · Bob Copeland
Quoted 3 lines · Wojciech Dubowik
AHB specific functions are now in
ahb.cfile. There is no common init functions which tries first pci and then ahb becasue on some'because'
Quoted 11 lines
drivers/net/wireless/ath/ath5k/Makefile ath5k-y += rfkill.o · line 19
Quoted 9 lines
drivers/net/wireless/ath/ath5k/Makefile +1
-1@@ -15,5 +15,5 @@ ath5k-y += rfkill.o ath5k-y += ani.o ath5k-y += sysfs.o ath5k-$(CONFIG_ATH5K_DEBUG) += debug.o -ath5k-y += pci.o +ath5k-y += $(if $(CONFIG_ATHEROS_AR231X),ahb,pci).o obj-$(CONFIG_ATH5K) += ath5k.oThis is not the right way.. what if someone wants both in one kernel?
Having both in the kernel is completely pointless. There are no devices that can support both, nor will there ever be.
- Felix
Quoted 26 lines
From: "Felix Fietkau" <[email protected]>
To: "Bob Copeland" <[email protected]>
Cc: "Wojciech Dubowik" <[email protected]>, [email protected], [email protected]
Sent: Freitag, 12. November 2010 20:36:51
Subject: Re: [PATCH 8/9] ath5k: AHB port. Add AHB bus support.Quoted 8 lines · Bob Copeland
Quoted 3 lines · Wojciech Dubowik
AHB specific functions are now in
ahb.cfile. There is no common init functions which tries first pci and then ahb becasue on some'because'
Quoted 12 lines
drivers/net/wireless/ath/ath5k/Makefile ath5k-y += rfkill.o · line 19
Quoted 9 lines
drivers/net/wireless/ath/ath5k/Makefile +1
-1@@ -15,5 +15,5 @@ ath5k-y += rfkill.o ath5k-y += ani.o ath5k-y += sysfs.o ath5k-$(CONFIG_ATH5K_DEBUG) += debug.o -ath5k-y += pci.o +ath5k-y += $(if $(CONFIG_ATHEROS_AR231X),ahb,pci).o obj-$(CONFIG_ATH5K) += ath5k.oThis is not the right way.. what if someone wants both in one kernel?
Quoted 5 lines
Having both in the kernel is completely pointless. There are no devices
that can support both, nor will there ever be.- Felix
I agree. The only advantage would be that some of the typos and missing functions in either of the files would be detected during compile time. My AR5312 board crashes when I enable PCI. I guess it's fixable but it's out of the scope of the ath5k driver...
br,
Wojtek
Quoted 30 lines · Wojciech Dubowik
Quoted 30 lines
From: "Felix Fietkau" <[email protected]>
To: "Bob Copeland" <[email protected]>
Cc: "Wojciech Dubowik" <[email protected]>, [email protected], [email protected]
Sent: Freitag, 12. November 2010 20:36:51
Subject: Re: [PATCH 8/9] ath5k: AHB port. Add AHB bus support.Quoted 8 lines · Bob Copeland
Quoted 3 lines · Wojciech Dubowik
AHB specific functions are now in
ahb.cfile. There is no common init functions which tries first pci and then ahb becasue on some'because'
Quoted 12 lines
drivers/net/wireless/ath/ath5k/Makefile ath5k-y += rfkill.o · line 19
Quoted 9 lines
drivers/net/wireless/ath/ath5k/Makefile +1
-1@@ -15,5 +15,5 @@ ath5k-y += rfkill.o ath5k-y += ani.o ath5k-y += sysfs.o ath5k-$(CONFIG_ATH5K_DEBUG) += debug.o -ath5k-y += pci.o +ath5k-y += $(if $(CONFIG_ATHEROS_AR231X),ahb,pci).o obj-$(CONFIG_ATH5K) += ath5k.oThis is not the right way.. what if someone wants both in one kernel?
Having both in the kernel is completely pointless. There are no devices
that can support both, nor will there ever be.
Quoted 6 lines
Quoted 1 line
- Felix
I agree. The only advantage would be that some of the typos and missing functions in either of the files would be detected during compile time. My AR5312 board crashes when I enable PCI. I guess it's fixable but it's out of the scope of the ath5k driver...
Well, AR5312 does not have PCI. Only AR2315 has it, and there is only one device that even uses it (Atheros never officially supported it).
- Felix
Quoted 7 lines · Felix Fietkau
Quoted 6 lines · Wojciech Dubowik
Quoted 3 lines
Having both in the kernel is completely pointless. There are no devices
that can support both, nor will there ever be.I agree. The only advantage would be that some of the typos and missing functions in either of the files would be detected during compile time.
Compile-testing coverage is a fine reason to allow people to compile both modules. Ok, I accept that it's a bit of a pain to create separate modules, but can we at least do it like:
ath5k-$(CONFIG_ATH5K_PCI) += pci.o
ath5k-$(CONFIG_ATH5K_AHB) += ahb.o
and add the appropriate selects and mutual exclusion to the Kconfig? Of course, that presupposes a Kconfig entry for CONFIG_ATHEROS_AR2316 where there is not one currently.
Signature · 1 line
Bob Copeland %% www.bobcopeland.com