atheros: final steps to let ar9271 use ath9k hw code
cover atheros: final steps to let ar9271 use ath9k hw code
Instead of building ar9271 by linking the same code together we export the shared ath9k hw code to ath and leave the ath9k prefix for ar9k family hw code.
This should help the development of ar9271 as you no longer need to run scripts to fetch common hw code, instead all hw code will now be built on ath.ko.
To get all pending patches to work on ar9271 you can now fetch a new 2.2 MB file, which will apply on today's wireless-testing:
http://bombadil.infradead.org/~mcgrof/patches/ath/2009/09/all-2009-09-15.patch
Luis R. Rodriguez (3):
Move common hw code between ath9k and ath9k_htc to ath
ath: print device ID if not supported
ath: add AR9271 srev and device ID to allow hw to support ar9271
drivers/net/wireless/ath/Makefile | 13 +-
drivers/net/wireless/ath/{ath9k => }/ani.c | 2 +
drivers/net/wireless/ath/{ath9k => }/ani.h | 0
drivers/net/wireless/ath/ath9k/Makefile | 14 +-
drivers/net/wireless/ath/ath9k/ath9k.h | 8 +-
drivers/net/wireless/ath/ath9k/debug.c | 21 +-
drivers/net/wireless/ath/ath9k/debug.h | 2 +-
drivers/net/wireless/ath/ath9k/hw.c | 4218 -------------------
drivers/net/wireless/ath/ath9k/main.c | 2 +-
drivers/net/wireless/ath/ath9k/pci.c | 4 +-
drivers/net/wireless/ath/ath9k/reg.h | 1706 --------
drivers/net/wireless/ath/{ath9k => }/btcoex.c | 6 +
drivers/net/wireless/ath/{ath9k => }/btcoex.h | 0
drivers/net/wireless/ath/{ath9k => }/calib.c | 3 +
drivers/net/wireless/ath/{ath9k => }/calib.h | 0
drivers/net/wireless/ath/{ath9k => }/eeprom.c | 0
drivers/net/wireless/ath/{ath9k => }/eeprom.h | 2 +-
drivers/net/wireless/ath/{ath9k => }/eeprom_4k.c | 0
drivers/net/wireless/ath/{ath9k => }/eeprom_9287.c | 0
drivers/net/wireless/ath/{ath9k => }/eeprom_def.c | 0
drivers/net/wireless/ath/hw.c | 4256 +++++++++++++++++++-
drivers/net/wireless/ath/{ath9k => }/hw.h | 40 +-
drivers/net/wireless/ath/{ath9k => }/initvals.h | 0
drivers/net/wireless/ath/{ath9k => }/mac.c | 30 +
drivers/net/wireless/ath/{ath9k => }/mac.h | 0
drivers/net/wireless/ath/{ath9k => }/phy.c | 0
drivers/net/wireless/ath/{ath9k => }/phy.h | 0
drivers/net/wireless/ath/{ath9k => }/rc.h | 0
drivers/net/wireless/ath/reg.h | 1688 ++++++++-
29 files changed, 6044 insertions(+), 5971 deletions(-)
rename drivers/net/wireless/ath/{ath9k => }/ani.c (99%)
rename drivers/net/wireless/ath/{ath9k => }/ani.h (100%)
delete mode 100644 drivers/net/wireless/ath/ath9k/hw.c
delete mode 100644 drivers/net/wireless/ath/ath9k/reg.h
rename drivers/net/wireless/ath/{ath9k => }/btcoex.c (96%)
rename drivers/net/wireless/ath/{ath9k => }/btcoex.h (100%)
rename drivers/net/wireless/ath/{ath9k => }/calib.c (99%)
rename drivers/net/wireless/ath/{ath9k => }/calib.h (100%)
rename drivers/net/wireless/ath/{ath9k => }/eeprom.c (100%)
rename drivers/net/wireless/ath/{ath9k => }/eeprom.h (99%)
rename drivers/net/wireless/ath/{ath9k => }/eeprom_4k.c (100%)
rename drivers/net/wireless/ath/{ath9k => }/eeprom_9287.c (100%)
rename drivers/net/wireless/ath/{ath9k => }/eeprom_def.c (100%)
rename drivers/net/wireless/ath/{ath9k => }/hw.h (95%)
rename drivers/net/wireless/ath/{ath9k => }/initvals.h (100%)
rename drivers/net/wireless/ath/{ath9k => }/mac.c (96%)
rename drivers/net/wireless/ath/{ath9k => }/mac.h (100%)
rename drivers/net/wireless/ath/{ath9k => }/phy.c (100%)
rename drivers/net/wireless/ath/{ath9k => }/phy.h (100%)
rename drivers/net/wireless/ath/{ath9k => }/rc.h (100%)RFC 1/3 Move common hw code between ath9k and ath9k_htc to ath
ath9k and ath9k_htc share a lot of common hw code. Instead of linking the common hw code twice for two modules use a module and export the shared hw routines.
There's a few read/write ops left on pci.c and debug.c, we'll either leave these as is or define a common debug interface for them.
Results: 37 non-static symbols, with 129 exported symbols.
---
drivers/net/wireless/ath/Makefile | 13 +-
drivers/net/wireless/ath/{ath9k => }/ani.c | 2 +
drivers/net/wireless/ath/{ath9k => }/ani.h | 0
drivers/net/wireless/ath/ath9k/Makefile | 14 +-
drivers/net/wireless/ath/ath9k/ath9k.h | 8 +-
drivers/net/wireless/ath/ath9k/debug.c | 21 +-
drivers/net/wireless/ath/ath9k/debug.h | 2 +-
drivers/net/wireless/ath/ath9k/hw.c | 4218 -------------------
drivers/net/wireless/ath/ath9k/main.c | 2 +-
drivers/net/wireless/ath/ath9k/pci.c | 4 +-
drivers/net/wireless/ath/ath9k/reg.h | 1706 --------
drivers/net/wireless/ath/{ath9k => }/btcoex.c | 6 +
drivers/net/wireless/ath/{ath9k => }/btcoex.h | 0
drivers/net/wireless/ath/{ath9k => }/calib.c | 3 +
drivers/net/wireless/ath/{ath9k => }/calib.h | 0
drivers/net/wireless/ath/{ath9k => }/eeprom.c | 0
drivers/net/wireless/ath/{ath9k => }/eeprom.h | 2 +-
drivers/net/wireless/ath/{ath9k => }/eeprom_4k.c | 0
drivers/net/wireless/ath/{ath9k => }/eeprom_9287.c | 0
drivers/net/wireless/ath/{ath9k => }/eeprom_def.c | 0
drivers/net/wireless/ath/hw.c | 4252 +++++++++++++++++++-
drivers/net/wireless/ath/{ath9k => }/hw.h | 35 +-
drivers/net/wireless/ath/{ath9k => }/initvals.h | 0
drivers/net/wireless/ath/{ath9k => }/mac.c | 30 +
drivers/net/wireless/ath/{ath9k => }/mac.h | 0
drivers/net/wireless/ath/{ath9k => }/phy.c | 0
drivers/net/wireless/ath/{ath9k => }/phy.h | 0
drivers/net/wireless/ath/{ath9k => }/rc.h | 0
drivers/net/wireless/ath/reg.h | 1688 ++++++++-
29 files changed, 6035 insertions(+), 5971 deletions(-)
rename drivers/net/wireless/ath/{ath9k => }/ani.c (99%)
rename drivers/net/wireless/ath/{ath9k => }/ani.h (100%)
delete mode 100644 drivers/net/wireless/ath/ath9k/hw.c
delete mode 100644 drivers/net/wireless/ath/ath9k/reg.h
rename drivers/net/wireless/ath/{ath9k => }/btcoex.c (96%)
rename drivers/net/wireless/ath/{ath9k => }/btcoex.h (100%)
rename drivers/net/wireless/ath/{ath9k => }/calib.c (99%)
rename drivers/net/wireless/ath/{ath9k => }/calib.h (100%)
rename drivers/net/wireless/ath/{ath9k => }/eeprom.c (100%)
rename drivers/net/wireless/ath/{ath9k => }/eeprom.h (99%)
rename drivers/net/wireless/ath/{ath9k => }/eeprom_4k.c (100%)
rename drivers/net/wireless/ath/{ath9k => }/eeprom_9287.c (100%)
rename drivers/net/wireless/ath/{ath9k => }/eeprom_def.c (100%)
rename drivers/net/wireless/ath/{ath9k => }/hw.h (95%)
rename drivers/net/wireless/ath/{ath9k => }/initvals.h (100%)
rename drivers/net/wireless/ath/{ath9k => }/mac.c (96%)
rename drivers/net/wireless/ath/{ath9k => }/mac.h (100%)
rename drivers/net/wireless/ath/{ath9k => }/phy.c (100%)
rename drivers/net/wireless/ath/{ath9k => }/phy.h (100%)
rename drivers/net/wireless/ath/{ath9k => }/rc.h (100%)drivers/net/wireless/ath/Makefile +12 -1
@@ -4,8 +4,19 @@ obj-$(CONFIG_AR9170_USB) += ar9170/ obj-$(CONFIG_ATH_COMMON) += ath.o +ATH_HW += hw.o \ + eeprom.o \ + eeprom_def.o \ + eeprom_4k.o \ + eeprom_9287.o \ + calib.o \ + ani.o \ + phy.o \ + btcoex.o \ + mac.o + ath-objs := main.o \ regd.o \ - hw.o + $(ATH_HW) ath-$(CONFIG_ATH_DEBUG) += debug.o
drivers/net/wireless/ath/ani.c renamed from drivers/net/wireless/ath/ath9k/ani.c +2 -0
@@ -629,6 +629,7 @@ void ath9k_hw_ani_monitor(struct ath_hw *ah, } } } +EXPORT_SYMBOL (ath9k_hw_ani_monitor);void ath9k_enable_mib_counters (struct ath_hw *ah) {
@@ -756,6 +757,7 @@ void ath9k_hw_procmibevent(struct ath_hw *ah)ath9k_ani_restart (ah); } } +EXPORT_SYMBOL (ath9k_hw_procmibevent);void ath9k_hw_ani_setup (struct ath_hw *ah) {
drivers/net/wireless/ath/ani.h renamed from drivers/net/wireless/ath/ath9k/ani.h +0 -0
drivers/net/wireless/ath/ath9k/Makefile +1 -13
@@ -1,17 +1,5 @@ -ATH9K_HW += hw.o \ - eeprom.o \ - eeprom_def.o \ - eeprom_4k.o \ - eeprom_9287.o \ - calib.o \ - ani.o \ - phy.o \ - btcoex.o \ - mac.o \ - -ath9k-y += $(ATH9K_HW) \ +ath9k-y += main.o \ beacon.o \ - main.o \ recv.o \ xmit.o \ virtual.o \
drivers/net/wireless/ath/ath9k/ath9k.h +4 -4
@@ -22,11 +22,11 @@#include <net/mac80211.h> #include <linux/leds.h> -#include "hw.h" -#include "rc.h" -#include "debug.h" -#include "../ath.h" +#include "../hw.h" +#include "../rc.h" #include "../debug.h" +#include "../ath.h" +#include "debug.h" struct ath_node ;
drivers/net/wireless/ath/ath9k/debug.c +13 -8
@@ -18,6 +18,11 @@#include "ath9k.h" +#define REG_WRITE_D (_ah, _reg, _val) \ + ath9k_hw_common(_ah)->ops->write((_ah), (_val), (_reg)) +#define REG_READ_D (_ah, _reg) \ + ath9k_hw_common(_ah)->ops->read((_ah), (_reg)) +static unsigned int ath9k_debug =ATH_DBG_DEFAULT ;module_param_named (debug, ath9k_debug, uint,0 );
@@ -82,7 +87,7 @@ static ssize_t read_file_dma(struct file *file, char __user *user_buf,ath9k_ps_wakeup (sc); -REG_WRITE (ah,AR_MACMISC , +REG_WRITE_D (ah,AR_MACMISC , ((AR_MACMISC_DMA_OBS_LINE_8 <<AR_MACMISC_DMA_OBS_S ) | (AR_MACMISC_MISC_OBS_BUS_1 <<AR_MACMISC_MISC_OBS_BUS_MSB_S )));
@@ -94,7 +99,7 @@ static ssize_t read_file_dma(struct file *file, char __user *user_buf,if (i %4 ==0 ) len +=snprintf (buf + len,sizeof (buf) - len,"\n" ); - val[i] =REG_READ (ah,AR_DMADBG_0 + (i *sizeof (u32))); + val[i] =REG_READ_D (ah,AR_DMADBG_0 + (i *sizeof (u32))); len +=snprintf (buf + len,sizeof (buf) - len,"%d: %08x " , i, val[i]); }
@@ -144,9 +149,9 @@ static ssize_t read_file_dma(struct file *file, char __user *user_buf, (val[6] & 0x0001e000) >> 13, (val[6] & 0x001e0000) >> 17); len +=snprintf (buf + len,sizeof (buf) - len,"pcu observe: 0x%x \n" , -REG_READ (ah,AR_OBS_BUS_1 )); +REG_READ_D (ah,AR_OBS_BUS_1 )); len +=snprintf (buf + len,sizeof (buf) - len, -"AR_CR: 0x%x \n" ,REG_READ (ah,AR_CR )); +"AR_CR: 0x%x \n" ,REG_READ_D (ah,AR_CR ));ath9k_ps_restore (sc);
@@ -363,12 +368,12 @@ static ssize_t read_file_wiphy(struct file *file, char __user *user_buf, aphy->chan_idx, aphy->chan_is_ht); } -put_unaligned_le32 (REG_READ (sc->sc_ah,AR_STA_ID0 ), addr); -put_unaligned_le16 (REG_READ (sc->sc_ah,AR_STA_ID1 ) &0xffff , addr +4 ); +put_unaligned_le32 (REG_READ_D (sc->sc_ah,AR_STA_ID0 ), addr); +put_unaligned_le16 (REG_READ_D (sc->sc_ah,AR_STA_ID1 ) &0xffff , addr +4 ); len +=snprintf (buf + len,sizeof (buf) - len,"addr: %pM\n" , addr); -put_unaligned_le32 (REG_READ (sc->sc_ah,AR_BSSMSKL ), addr); -put_unaligned_le16 (REG_READ (sc->sc_ah,AR_BSSMSKU ) &0xffff , addr +4 ); +put_unaligned_le32 (REG_READ_D (sc->sc_ah,AR_BSSMSKL ), addr); +put_unaligned_le16 (REG_READ_D (sc->sc_ah,AR_BSSMSKU ) &0xffff , addr +4 ); len +=snprintf (buf + len,sizeof (buf) - len,"addrmask: %pM\n" , addr);
drivers/net/wireless/ath/ath9k/debug.h +1 -1
@@ -17,7 +17,7 @@#ifndef DEBUG_H #define DEBUG_H -#include "hw.h" +#include "../hw.h" struct ath_txq ;struct ath_buf ;
drivers/net/wireless/ath/ath9k/hw.c deleted +0 -4218
2,871 lines not on this page · raw message
drivers/net/wireless/ath/ath9k/reg.h deleted +0 -1706
1,706 lines not on this page · raw message
drivers/net/wireless/ath/btcoex.c renamed from drivers/net/wireless/ath/ath9k/btcoex.c +6 -0
Lines of this file are not shown. View the raw message.
drivers/net/wireless/ath/btcoex.h renamed from drivers/net/wireless/ath/ath9k/btcoex.h +0 -0
drivers/net/wireless/ath/calib.c renamed from drivers/net/wireless/ath/ath9k/calib.c +3 -0
Lines of this file are not shown. View the raw message.
drivers/net/wireless/ath/calib.h renamed from drivers/net/wireless/ath/ath9k/calib.h +0 -0
drivers/net/wireless/ath/eeprom.c renamed from drivers/net/wireless/ath/ath9k/eeprom.c +0 -0
drivers/net/wireless/ath/eeprom.h renamed from drivers/net/wireless/ath/ath9k/eeprom.h +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/wireless/ath/eeprom_4k.c renamed from drivers/net/wireless/ath/ath9k/eeprom_4k.c +0 -0
drivers/net/wireless/ath/eeprom_9287.c renamed from drivers/net/wireless/ath/ath9k/eeprom_9287.c +0 -0
drivers/net/wireless/ath/eeprom_def.c renamed from drivers/net/wireless/ath/ath9k/eeprom_def.c +0 -0
drivers/net/wireless/ath/hw.c +4246 -6
4,252 lines not on this page · raw message
drivers/net/wireless/ath/hw.h renamed from drivers/net/wireless/ath/ath9k/hw.h +27 -8
Lines of this file are not shown. View the raw message.
drivers/net/wireless/ath/initvals.h renamed from drivers/net/wireless/ath/ath9k/initvals.h +0 -0
drivers/net/wireless/ath/mac.c renamed from drivers/net/wireless/ath/ath9k/mac.c +30 -0
Lines of this file are not shown. View the raw message.
drivers/net/wireless/ath/mac.h renamed from drivers/net/wireless/ath/ath9k/mac.h +0 -0
drivers/net/wireless/ath/phy.c renamed from drivers/net/wireless/ath/ath9k/phy.c +0 -0
drivers/net/wireless/ath/phy.h renamed from drivers/net/wireless/ath/ath9k/phy.h +0 -0
drivers/net/wireless/ath/rc.h renamed from drivers/net/wireless/ath/ath9k/rc.h +0 -0
drivers/net/wireless/ath/reg.h +1686 -2
1,688 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
1.6.3.3
Part of the diff is not shown here. View the raw message.
RFC 2/3 ath: print device ID if not supported
In reply to Luis R. Rodriguez--- drivers/net/wireless/ath/hw.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-)
drivers/net/wireless/ath/hw.c +5 -1
@@ -883,8 +883,12 @@ int ath9k_hw_init(struct ath_hw *ah)struct ath_common *common =ath9k_hw_common (ah);int r =0 ; -if (!ath9k_hw_devid_supported (ah->hw_version.devid)) +if (!ath9k_hw_devid_supported (ah->hw_version.devid)) { +ath_print (common,ATH_DBG_FATAL , +"Unsupported device ID: 0x%0x\n" , + ah->hw_version.devid);return -EOPNOTSUPP ; + }ath9k_hw_init_defaults (ah);ath9k_hw_init_config (ah);
Signature · 1 line
1.6.3.3
RFC 3/3 ath: add AR9271 srev and device ID to allow hw to support ar9271
In reply to Luis R. Rodriguez--- drivers/net/wireless/ath/hw.c | 4 ++-- drivers/net/wireless/ath/hw.h | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-)
drivers/net/wireless/ath/hw.c +2 -2
@@ -592,6 +592,7 @@ static bool ath9k_hw_devid_supported(u16 devid)case AR9285_DEVID_PCIE :case AR5416_DEVID_AR9287_PCI :case AR5416_DEVID_AR9287_PCIE : +case AR9271_USB :return true;default :break ;
@@ -609,9 +610,8 @@ static bool ath9k_hw_macversion_supported(u32 macversion)case AR_SREV_VERSION_9280 :case AR_SREV_VERSION_9285 :case AR_SREV_VERSION_9287 : -return true; -/* Not yet */ case AR_SREV_VERSION_9271 : +return true;default :break ; }
drivers/net/wireless/ath/hw.h +5 -0
@@ -32,13 +32,18 @@#include "debug.h" #define ATHEROS_VENDOR_ID 0x168c +#define AR5416_DEVID_PCI 0x0023#define AR5416_DEVID_PCIE 0x0024#define AR9160_DEVID_PCI 0x0027#define AR9280_DEVID_PCI 0x0029#define AR9280_DEVID_PCIE 0x002a#define AR9285_DEVID_PCIE 0x002b +#define AR5416_AR9100_DEVID 0x000b + +#define AR9271_USB 0x9271 +#define AR_SUBVENDOR_ID_NOG 0x0e11#define AR_SUBVENDOR_ID_NEW_A 0x7065#define AR5416_MAGIC 0x19641014
Signature · 1 line
1.6.3.3
cover atheros: final steps to let ar9271 use ath9k hw code
In reply to Luis R. RodriguezQuoted 4 lines · Luis Rodriguez
Instead of building ar9271 by linking the same code together we export the shared ath9k hw code to ath and leave the ath9k prefix for ar9k family hw code.
Quoted 8 lines
This should help the development of ar9271 as you no longer need to run scripts to fetch common hw code, instead all hw code will now be built on ath.ko.
To get all pending patches to work on ar9271 you can now fetch a new 2.2 MB file, which will apply on today's wireless-testing:
http://bombadil.infradead.org/~mcgrof/patches/ath/2009/09/all-2009-09-15.patch
Given that we are keeping the ath9k_htc name and this will be under ath/ath9k_htc, the page and git tree has been renamed:
http://wireless.kernel.org/en/users/Drivers/ath9k_htcgit://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/ath9k_htc.git
That is unless of course someone else has a better name suggestion.
Luis