ath9k_hw: modify hw identification message
cover ath9k_hw: modify hw identification message
While reviewing ar9271 radio revisions I determined the radio revision does not apply although it can be populated in the EEPROM. This changes the hw probe print to reflect this for single chips and throws the code into hw code to be shared with ath9k_htc.
Luis R. Rodriguez (4):
ath9k_hw: move mac name and rf name helpers to hw code
ath9k_hw: distinguish single-chip solutions on initial probe print
ath9k_hw: add AR9271 single chip name mapping
ath9k_hw: add some debug print for hw initialization
drivers/net/wireless/ath/ath9k/ahb.c | 10 ++-- drivers/net/wireless/ath/ath9k/calib.c | 3 + drivers/net/wireless/ath/ath9k/hw.c | 90 ++++++++++++++++++++++++++++++++ drivers/net/wireless/ath/ath9k/hw.h | 2 + drivers/net/wireless/ath/ath9k/main.c | 58 -------------------- drivers/net/wireless/ath/ath9k/pci.c | 10 ++-- 6 files changed, 103 insertions(+), 70 deletions(-)
PATCH 1/4 ath9k_hw: move mac name and rf name helpers to hw code
These are shared between ath9k and the future ath9k_htc driver.
--- drivers/net/wireless/ath/ath9k/ahb.c | 5 ++- drivers/net/wireless/ath/ath9k/hw.c | 62 +++++++++++++++++++++++++++++++++ drivers/net/wireless/ath/ath9k/hw.h | 3 ++ drivers/net/wireless/ath/ath9k/main.c | 58 ------------------------------ drivers/net/wireless/ath/ath9k/pci.c | 5 ++- 5 files changed, 71 insertions(+), 62 deletions(-)
drivers/net/wireless/ath/ath9k/ahb.c +3 -2
@@ -137,9 +137,10 @@ static int ath_ahb_probe(struct platform_device *pdev)"%s: Atheros AR%s MAC/BB Rev:%x, " "AR%s RF Rev:%x, mem=0x%lx, irq=%d\n" ,wiphy_name (hw->wiphy), -ath_mac_bb_name (ah->hw_version.macVersion), +ath9k_hw_mac_bb_name (ah->hw_version.macVersion), ah->hw_version.macRev, -ath_rf_name ((ah->hw_version.analog5GhzRev &AR_RADIO_SREV_MAJOR )), +ath9k_hw_rf_name ((ah->hw_version.analog5GhzRev & +AR_RADIO_SREV_MAJOR )), ah->hw_version.phyRev, (unsigned long)mem, irq);
drivers/net/wireless/ath/ath9k/hw.c +62 -0
65 lines not on this page · raw message
drivers/net/wireless/ath/ath9k/hw.h +3 -0
@@ -720,6 +720,9 @@ void ath_gen_timer_free(struct ath_hw *ah, struct ath_gen_timer *timer);void ath_gen_timer_isr (struct ath_hw *hw);u32 ath9k_hw_gettsf32 (struct ath_hw *ah); +const char *ath9k_hw_mac_bb_name (u32 mac_bb_version); +const char *ath9k_hw_rf_name (u16 rf_version); +#define ATH_PCIE_CAP_LINK_CTRL 0x70#define ATH_PCIE_CAP_LINK_L0S 1#define ATH_PCIE_CAP_LINK_L1 2
drivers/net/wireless/ath/ath9k/main.c +0 -58
64 lines not on this page · raw message
drivers/net/wireless/ath/ath9k/pci.c +3 -2
@@ -222,9 +222,10 @@ static int ath_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)"%s: Atheros AR%s MAC/BB Rev:%x " "AR%s RF Rev:%x: mem=0x%lx, irq=%d\n" ,wiphy_name (hw->wiphy), -ath_mac_bb_name (ah->hw_version.macVersion), +ath9k_hw_mac_bb_name (ah->hw_version.macVersion), ah->hw_version.macRev, -ath_rf_name ((ah->hw_version.analog5GhzRev &AR_RADIO_SREV_MAJOR )), +ath9k_hw_rf_name ((ah->hw_version.analog5GhzRev & +AR_RADIO_SREV_MAJOR )), ah->hw_version.phyRev, (unsigned long)mem, pdev->irq);
Signature · 1 line
1.6.0.4
PATCH 2/4 ath9k_hw: distinguish single-chip solutions on initial probe print
In reply to Luis R. RodriguezDevices with external radios have revisions which we can count on. On single chip solutions these EEPROM values for these radio revision also exist but are not meaningful as the radios are embedded onto the same chip. Each single-chip device evolves together as one device.
--- drivers/net/wireless/ath/ath9k/ahb.c | 11 ++++------- drivers/net/wireless/ath/ath9k/hw.c | 27 +++++++++++++++++++++++---- drivers/net/wireless/ath/ath9k/hw.h | 3 +-- drivers/net/wireless/ath/ath9k/pci.c | 11 ++++------- 4 files changed, 32 insertions(+), 20 deletions(-)
drivers/net/wireless/ath/ath9k/ahb.c +4 -7
@@ -69,6 +69,7 @@ static int ath_ahb_probe(struct platform_device *pdev)int irq;int ret =0 ;struct ath_hw *ah; +char hw_name[1024 ];if (!pdev->dev.platform_data) {dev_err (&pdev->dev,"no platform data specified\n" );
@@ -133,15 +134,11 @@ static int ath_ahb_probe(struct platform_device *pdev) } ah = sc->sc_ah; +ath9k_hw_name (ah, hw_name);printk (KERN_INFO -"%s: Atheros AR%s MAC/BB Rev:%x, " -"AR%s RF Rev:%x, mem=0x%lx, irq=%d\n" , +"%s: %s mem=0x%lx, irq=%d\n" ,wiphy_name (hw->wiphy), -ath9k_hw_mac_bb_name (ah->hw_version.macVersion), - ah->hw_version.macRev, -ath9k_hw_rf_name ((ah->hw_version.analog5GhzRev & -AR_RADIO_SREV_MAJOR )), - ah->hw_version.phyRev, + hw_name, (unsigned long )mem, irq);return 0 ;
drivers/net/wireless/ath/ath9k/hw.c +23 -4
@@ -3959,7 +3959,7 @@ static struct {/* * Return the MAC/BB name. "????" is returned if the MAC/BB is unknown. */ -const char *ath9k_hw_mac_bb_name (u32 mac_bb_version) +static const char *ath9k_hw_mac_bb_name (u32 mac_bb_version) {int i;
@@ -3971,13 +3971,12 @@ const char *ath9k_hw_mac_bb_name(u32 mac_bb_version)return "????" ; } -EXPORT_SYMBOL (ath9k_hw_mac_bb_name);/* * Return the RF name. "????" is returned if the RF is unknown. * Used for devices with external radios. */ -const char *ath9k_hw_rf_name (u16 rf_version) +static const char *ath9k_hw_rf_name (u16 rf_version) {int i;
@@ -3989,4 +3988,24 @@ const char *ath9k_hw_rf_name(u16 rf_version)return "????" ; } -EXPORT_SYMBOL (ath9k_hw_rf_name); + +void ath9k_hw_name (struct ath_hw *ah,char *hw_name) +{ +/* chipsets >= AR9280 are single-chip */ +if (AR_SREV_9280_10_OR_LATER (ah)) { +sprintf (hw_name, +"Atheros single-chip AR%s Rev:%x" , +ath9k_hw_mac_bb_name (ah->hw_version.macVersion), + ah->hw_version.macRev); + } +else { +sprintf (hw_name, +"Atheros AR%s MAC/BB Rev:%x AR%s RF Rev:%x: " , +ath9k_hw_mac_bb_name (ah->hw_version.macVersion), + ah->hw_version.macRev, +ath9k_hw_rf_name ((ah->hw_version.analog5GhzRev & +AR_RADIO_SREV_MAJOR )), + ah->hw_version.phyRev); + } +} +EXPORT_SYMBOL (ath9k_hw_name);
drivers/net/wireless/ath/ath9k/hw.h +1 -2
@@ -720,8 +720,7 @@ void ath_gen_timer_free(struct ath_hw *ah, struct ath_gen_timer *timer);void ath_gen_timer_isr (struct ath_hw *hw);u32 ath9k_hw_gettsf32 (struct ath_hw *ah); -const char *ath9k_hw_mac_bb_name (u32 mac_bb_version); -const char *ath9k_hw_rf_name (u16 rf_version); +void ath9k_hw_name (struct ath_hw *ah,char *hw_name);#define ATH_PCIE_CAP_LINK_CTRL 0x70#define ATH_PCIE_CAP_LINK_L0S 1
drivers/net/wireless/ath/ath9k/pci.c +4 -7
@@ -114,6 +114,7 @@ static int ath_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)u32 val;int ret =0 ;struct ath_hw *ah; +char hw_name[1024 ];if (pci_enable_device (pdev))return -EIO ;
@@ -218,15 +219,11 @@ static int ath_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) sc->irq = pdev->irq; ah = sc->sc_ah; +ath9k_hw_name (ah, hw_name);printk (KERN_INFO -"%s: Atheros AR%s MAC/BB Rev:%x " -"AR%s RF Rev:%x: mem=0x%lx, irq=%d\n" , +"%s: %s mem=0x%lx, irq=%d\n" ,wiphy_name (hw->wiphy), -ath9k_hw_mac_bb_name (ah->hw_version.macVersion), - ah->hw_version.macRev, -ath9k_hw_rf_name ((ah->hw_version.analog5GhzRev & -AR_RADIO_SREV_MAJOR )), - ah->hw_version.phyRev, + hw_name, (unsigned long )mem, pdev->irq);return 0 ;
Signature · 1 line
1.6.0.4
PATCH 2/4 ath9k_hw: distinguish single-chip solutions on initial probe print
Quoted 18 lines · Luis R. Rodriguez
Devices with external radios have revisions which we can count on. On single chip solutions these EEPROM values for these radio revision also exist but are not meaningful as the radios are embedded onto the same chip. Each single-chip device evolves together as one device.
Signed-off-by Luis R. Rodriguez <[email protected]>--- drivers/net/wireless/ath/ath9k/ahb.c | 11 ++++------- drivers/net/wireless/ath/ath9k/hw.c | 27 +++++++++++++++++++++++---- drivers/net/wireless/ath/ath9k/hw.h | 3 +-- drivers/net/wireless/ath/ath9k/pci.c | 11 ++++------- 4 files changed, 32 insertions(+), 20 deletions(-)drivers/net/wireless/ath/ath9k/ahb.c +0
-0
drivers/net/wireless/ath/ath9k/ahb.c static int ath_ahb_probe(struct platform_device *pdev) · line 72
Quoted 4 lines
drivers/net/wireless/ath/ath9k/ahb.c +1
-0@@ -69,6 +69,7 @@ static int ath_ahb_probe(struct platform_device *pdev)int irq;int ret =0 ;struct ath_hw *ah; +char hw_name[1024 ];
This is a bit too large to allocate from stack IMHO.
[...]
drivers/net/wireless/ath/ath9k/pci.c static int ath_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) · line 117
Quoted 7 lines
drivers/net/wireless/ath/ath9k/pci.c +1
-0@@ -114,6 +114,7 @@ static int ath_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)u32 val;int ret =0 ;struct ath_hw *ah; +char hw_name[1024 ];
Ditto.
Signature · 1 line
Kalle Valo
PATCH 2/4 ath9k_hw: distinguish single-chip solutions on initial probe print
Quoted 30 lines · Kalle Valo
Quoted 18 lines · Luis R. Rodriguez
Devices with external radios have revisions which we can count on. On single chip solutions these EEPROM values for these radio revision also exist but are not meaningful as the radios are embedded onto the same chip. Each single-chip device evolves together as one device.
Signed-off-by Luis R. Rodriguez <[email protected]>---
?drivers/net/wireless/ath/ath9k/ahb.c | ? 11 ++++------- ?drivers/net/wireless/ath/ath9k/hw.c ?| ? 27 +++++++++++++++++++++++---- ?drivers/net/wireless/ath/ath9k/hw.h ?| ? ?3 +-- ?drivers/net/wireless/ath/ath9k/pci.c | ? 11 ++++-------?4 files changed, 32 insertions(+), 20 deletions(-)
drivers/net/wireless/ath/ath9k/ahb.c +0
-0drivers/net/wireless/ath/ath9k/ahb.c static int ath_ahb_probe(struct platform_device *pdev) · line 72
Quoted 4 lines
drivers/net/wireless/ath/ath9k/ahb.c +1
-0@@ -69,6 +69,7 @@ static int ath_ahb_probe(struct platform_device *pdev) ? ? ? int irq; ? ? ? int ret = 0; ? ? ? struct ath_hw *ah; + ? ? char hw_name[1024];This is a bit too large to allocate from stack IMHO.
[...]
Quoted 9 lines
drivers/net/wireless/ath/ath9k/pci.c static int ath_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) · line 117
Quoted 7 lines
drivers/net/wireless/ath/ath9k/pci.c +1
-0@@ -114,6 +114,7 @@ static int ath_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) ? ? ? u32 val; ? ? ? int ret = 0; ? ? ? struct ath_hw *ah; + ? ? char hw_name[1024];Ditto.
We use this for debugfs, so I went with that as an upper limit, given that we just use it a probe it seemed sane.
Luis
PATCH 2/4 ath9k_hw: distinguish single-chip solutions on initial probe print
Quoted 10 lines · On Monday 26 October 2009 17:21:40 Luis R. Rodriguez wrote:
Quoted 9 lines
drivers/net/wireless/ath/ath9k/pci.c static int ath_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) · line 117
Quoted 7 lines
drivers/net/wireless/ath/ath9k/pci.c +1
-0@@ -114,6 +114,7 @@ static int ath_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) ? ? ? u32 val; ? ? ? int ret = 0; ? ? ? struct ath_hw *ah; + ? ? char hw_name[1024];Ditto.
Quoted 2 lines
We use this for debugfs, so I went with that as an upper limit, given that we just use it a probe it seemed sane.
I think it's completely insane, because you effectively use 25% of the available stack. Why is a hardware name 1024 chars (max) long anyway?
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
I would be pissed off after reading the first line already ;)
Signature · 1 line
Greetings, Michael.
PATCH 2/4 ath9k_hw: distinguish single-chip solutions on initial probe print
Quoted 32 lines · Michael Buesch
Quoted 10 lines · On Monday 26 October 2009 17:21:40 Luis R. Rodriguez wrote:
Quoted 9 lines
drivers/net/wireless/ath/ath9k/pci.c static int ath_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) · line 117
Quoted 7 lines
drivers/net/wireless/ath/ath9k/pci.c +1
-0@@ -114,6 +114,7 @@ static int ath_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) ? ? ? u32 val; ? ? ? int ret = 0; ? ? ? struct ath_hw *ah; + ? ? char hw_name[1024];Ditto.
Quoted 2 lines
We use this for debugfs, so I went with that as an upper limit, given that we just use it a probe it seemed sane.
I think it's completely insane, because you effectively use 25% of the available stack. Why is a hardware name 1024 chars (max) long anyway?
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
Quoted 1 line
I would be pissed off after reading the first line already ;)
Heh alright, I'll go reduce this, thanks.
Luis
PATCH 3/4 ath9k_hw: add AR9271 single chip name mapping
In reply to Luis R. Rodriguez--- drivers/net/wireless/ath/ath9k/hw.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
drivers/net/wireless/ath/ath9k/hw.c +2 -1
@@ -3941,7 +3941,8 @@ static struct {/* Single-chip solutions */ { AR_SREV_VERSION_9280, "9280" }, { AR_SREV_VERSION_9285, "9285" }, - { AR_SREV_VERSION_9287, "9287" } + { AR_SREV_VERSION_9287, "9287" }, + { AR_SREV_VERSION_9271, "9271" }, };/* For devices with external radios */
Signature · 1 line
1.6.0.4
PATCH 4/4 ath9k_hw: add some debug print for hw initialization
In reply to Luis R. RodriguezThis helps debugging hw bring up.
--- drivers/net/wireless/ath/ath9k/calib.c | 3 +++ drivers/net/wireless/ath/ath9k/hw.c | 8 ++++++++ 2 files changed, 11 insertions(+), 0 deletions(-)
drivers/net/wireless/ath/ath9k/calib.c +3 -0
@@ -1084,6 +1084,9 @@ static bool ar9285_clc(struct ath_hw *ah, struct ath9k_channel *chan) {struct ath_common *common =ath9k_hw_common (ah); +ath_print (common,ATH_DBG_CALIBRATE ,"Running carrier leakage " +"calibration fix\n" ); +REG_SET_BIT (ah,AR_PHY_CL_CAL_CTL ,AR_PHY_CL_CAL_ENABLE );if (IS_CHAN_HT20 (chan)) {REG_SET_BIT (ah,AR_PHY_CL_CAL_CTL ,AR_PHY_PARALLEL_CAL_ENABLE );
drivers/net/wireless/ath/ath9k/hw.c +8 -0
@@ -1005,8 +1005,11 @@ int ath9k_hw_init(struct ath_hw *ah)static void ath9k_hw_init_bb (struct ath_hw *ah,struct ath9k_channel *chan) { +struct ath_common *common =ath9k_hw_common (ah);u32 synthDelay; +ath_print (common,ATH_DBG_RESET ,"initializing baseband\n" ); + synthDelay =REG_READ (ah,AR_PHY_RX_DELAY ) &AR_PHY_RX_DELAY_DELAY ;if (IS_CHAN_B (chan)) synthDelay = (4 * synthDelay) /22 ;
@@ -1591,6 +1594,8 @@ static inline void ath9k_hw_set_dma(struct ath_hw *ah) {u32 regval; +ath_print (ath9k_hw_common (ah),ATH_DBG_RESET , +"Configuring DMA read/write settings\n" );/* * set AHB_MODE not to do cacheline prefetches */
@@ -2145,6 +2150,9 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,/* * For big endian systems turn on swapping for descriptors */ +ath_print (common,ATH_DBG_RESET , +"Configuring byte swap settings\n" ); +if (AR_SREV_9100 (ah)) {u32 mask; mask =REG_READ (ah,AR_CFG );
Signature · 1 line
1.6.0.4