Skip to contentSkip to conversation

ath5k: AHB port. Use more generic functions for finding mac revision instead of pci specific.

PATCH In review Wojciech Dubowik 2 participants 2 messages Nov 11, 2010 1 message not in the archive Atheros ATH5K wireless driver

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): 17186438.751289486686690.JavaMail.wlan@CHBU500181

#1 lore raw

PATCH 6/9 ath5k: AHB port. Use more generic functions for finding mac revision instead of pci specific.

Use ath5k_bus_read_srev as a wrapper for MAC revision register reading. Different buses have to aceess it with own functions before hardware is initialized.

---
 drivers/net/wireless/ath/ath5k/ath5k.h  |    2 ++
 drivers/net/wireless/ath/ath5k/attach.c |   11 +++++++----
 drivers/net/wireless/ath/ath5k/pci.c    |    6 ++++++
 3 files changed, 15 insertions(+), 4 deletions(-)
drivers/net/wireless/ath/ath5k/ath5k.h +2 -0
index 2b9d693..a13243a 100644
@@ -1034,6 +1034,7 @@ struct ath5k_hw {
 	u32			ah_phy;
 	u32			ah_mac_srev;
 	u16			ah_mac_version;
+	u16			ah_mac_revision;
 	u16			ah_phy_revision;
 	u16			ah_radio_5ghz_revision;
 	u16			ah_radio_2ghz_revision;
@@ -1144,6 +1145,7 @@ void ath5k_sysfs_unregister(struct ath5k_softc *sc);
 
 /*chip id helper function */
 const char * ath5k_chip_name(enum ath5k_srev_type type, u_int16_t val);
+int ath5k_bus_read_srev(struct ath5k_hw *ah);
 
 /* LED functions */
 int ath5k_init_leds(struct ath5k_softc *sc);
drivers/net/wireless/ath/ath5k/attach.c +7 -4
index c5b2eb7..15e3a83 100644
@@ -128,7 +128,8 @@ int ath5k_hw_attach(struct ath5k_softc *sc)
 	/*
 	 * Find the mac version
 	 */
-	srev = ath5k_hw_reg_read(ah, AR5K_SREV);
+	ath5k_bus_read_srev(ah);
+	srev = ah->ah_mac_srev;
 	if (srev < AR5K_SREV_AR5311)
 		ah->ah_version = AR5K_AR5210;
 	else if (srev < AR5K_SREV_AR5212)
@@ -136,6 +137,10 @@ int ath5k_hw_attach(struct ath5k_softc *sc)
 	else
 		ah->ah_version = AR5K_AR5212;
 
+	/* Get the MAC revision */
+	ah->ah_mac_version = AR5K_REG_MS(srev, AR5K_SREV_VER);
+	ah->ah_mac_revision = AR5K_REG_MS(srev, AR5K_SREV_REV);
+
 	/* Fill the ath5k_hw struct with the needed functions */
 	ret = ath5k_hw_init_desc_functions(ah);
 	if (ret)
@@ -146,9 +151,7 @@ int ath5k_hw_attach(struct ath5k_softc *sc)
 	if (ret)
 		goto err;
 
-	/* Get MAC, PHY and RADIO revisions */
-	ah->ah_mac_srev = srev;
-	ah->ah_mac_version = AR5K_REG_MS(srev, AR5K_SREV_VER);
+	/* Get PHY and RADIO revisions */
 	ah->ah_phy_revision = ath5k_hw_reg_read(ah, AR5K_PHY_CHIP_ID) &
 			0xffffffff;
 	ah->ah_radio_5ghz_revision = ath5k_hw_radio_revision(ah,
drivers/net/wireless/ath/ath5k/pci.c +6 -0
index 0d8dd2d..0acf1fc 100644
@@ -100,6 +100,12 @@ bool ath5k_pci_eeprom_read(struct ath_common *common, u32 offset, u16 *data)
 	return -ETIMEDOUT;
 }
 
+int ath5k_bus_read_srev(struct ath5k_hw *ah)
+{
+	ah->ah_mac_srev = ath5k_hw_reg_read(ah, AR5K_SREV);
+	return 0;
+}
+
 /* Common ath_bus_opts structure */
 static const struct ath_bus_ops ath_pci_bus_ops = {
 	.ath_bus_type = ATH_PCI,
Signature · 1 line
1.7.1
#2 lore raw
Quoted 4 lines · Wojciech Dubowik

Use ath5k_bus_read_srev as a wrapper for MAC revision register reading. Different buses have to aceess it with own functions before hardware is initialized.

Your subject is too long, trim it, remove all that AHB port on every single patch.
Also, have you run all your patches through ./scripts/checkpatch.pl prior to submission?

Luis