add chip name by SREV mapping from ath5k and print MAC and PHY

chip name on module load

git-svn-id: http://madwifi-project.org/svn/madwifi/trunk@3658 0192ed92-7a03-0410-a25b-9323aeb14dbd

diff --git a/ath/if_ath.c b/ath/if_ath.c
index 06cf7989ceb4d5135ee30629b36d6a74815ab9e1..49bbec8205c726a3d02f1afd2540883e26af35c2 100644 (file)
--- a/ath/if_ath.c
+++ b/ath/if_ath.c
@@ -11242,10 +11242,14 @@ ath_announce(struct net_device *dev)
        m[MLEN] = '\0';
        b[BLEN] = '\0';
 
-       snprintf(b, BLEN, "MAC %d.%d PHY %d.%d", 
-               ah->ah_macVersion, ah->ah_macRev,
+       printk(KERN_INFO "%s: Atheros AR%s chip found (MAC %d.%d, ",
+               DEV_NAME(dev),
+               ath5k_chip_name(AR5K_VERSION_VER, ATH_SREV_FROM_AH(ah)),
+               ah->ah_macVersion, ah->ah_macRev);
+       printk("PHY %s %d.%d)\n",
+               ath5k_chip_name(AR5K_VERSION_RAD, ah->ah_phyRev),
                ah->ah_phyRev >> 4, ah->ah_phyRev & 0xf);
-       strncat(m, b, MLEN);
+
        /*
         * Print radio revision(s).  We check the wireless modes
         * to avoid falsely printing revs for inoperable parts.

diff --git a/ath/if_ath_hal_extensions.c b/ath/if_ath_hal_extensions.c
index 04d2423e9d7118cd418b77f302d9e3ce52407198..927f5a0c565cc05fef09855ad23aa5aaa0d41aa5 100644 (file)
--- a/ath/if_ath_hal_extensions.c
+++ b/ath/if_ath_hal_extensions.c
@@ -46,6 +46,41 @@
 #include "if_ath_hal_extensions.h"
 
 
+/* Known SREVs */
+static struct ath5k_srev_name srev_names[] = {
+       { "5210",       AR5K_VERSION_VER,       AR5K_SREV_VER_AR5210 },
+       { "5311",       AR5K_VERSION_VER,       AR5K_SREV_VER_AR5311 },
+       { "5311A",      AR5K_VERSION_VER,       AR5K_SREV_VER_AR5311A },
+       { "5311B",      AR5K_VERSION_VER,       AR5K_SREV_VER_AR5311B },
+       { "5211",       AR5K_VERSION_VER,       AR5K_SREV_VER_AR5211 },
+       { "5212",       AR5K_VERSION_VER,       AR5K_SREV_VER_AR5212 },
+       { "5213",       AR5K_VERSION_VER,       AR5K_SREV_VER_AR5213 },
+       { "5213A",      AR5K_VERSION_VER,       AR5K_SREV_VER_AR5213A },
+       { "2413",       AR5K_VERSION_VER,       AR5K_SREV_VER_AR2413 },
+       { "2414",       AR5K_VERSION_VER,       AR5K_SREV_VER_AR2414 },
+       { "2424",       AR5K_VERSION_VER,       AR5K_SREV_VER_AR2424 },
+       { "5424",       AR5K_VERSION_VER,       AR5K_SREV_VER_AR5424 },
+       { "5413",       AR5K_VERSION_VER,       AR5K_SREV_VER_AR5413 },
+       { "5414",       AR5K_VERSION_VER,       AR5K_SREV_VER_AR5414 },
+       { "5416",       AR5K_VERSION_VER,       AR5K_SREV_VER_AR5416 },
+       { "5418",       AR5K_VERSION_VER,       AR5K_SREV_VER_AR5418 },
+       { "2425",       AR5K_VERSION_VER,       AR5K_SREV_VER_AR2425 },
+       { "xxxxx",      AR5K_VERSION_VER,       AR5K_SREV_UNKNOWN },
+       { "5110",       AR5K_VERSION_RAD,       AR5K_SREV_RAD_5110 },
+       { "5111",       AR5K_VERSION_RAD,       AR5K_SREV_RAD_5111 },
+       { "2111",       AR5K_VERSION_RAD,       AR5K_SREV_RAD_2111 },
+       { "5112",       AR5K_VERSION_RAD,       AR5K_SREV_RAD_5112 },
+       { "5112A",      AR5K_VERSION_RAD,       AR5K_SREV_RAD_5112A },
+       { "2112",       AR5K_VERSION_RAD,       AR5K_SREV_RAD_2112 },
+       { "2112A",      AR5K_VERSION_RAD,       AR5K_SREV_RAD_2112A },
+       { "SChip",      AR5K_VERSION_RAD,       AR5K_SREV_RAD_SC0 },
+       { "SChip",      AR5K_VERSION_RAD,       AR5K_SREV_RAD_SC1 },
+       { "SChip",      AR5K_VERSION_RAD,       AR5K_SREV_RAD_SC2 },
+       { "5133",       AR5K_VERSION_RAD,       AR5K_SREV_RAD_5133 },
+       { "xxxxx",      AR5K_VERSION_RAD,       AR5K_SREV_UNKNOWN },
+};
+
+
 int
 ar_device(int devid)
 {
@@ -109,3 +144,20 @@ ath_set_ack_bitrate(struct ath_softc *sc, int high)
 }
 
 
+const char *
+ath5k_chip_name(enum ath5k_srev_type type, u_int16_t val)
+{
+       const char *name = "xxxxx";
+       unsigned int i;
+
+       for (i = 0; i < ARRAY_SIZE(srev_names); i++) {
+               if (srev_names[i].sr_type != type)
+                       continue;
+               if ((val & 0xff) < srev_names[i + 1].sr_val) {
+                       name = srev_names[i].sr_name;
+                       break;
+               }
+       }
+
+       return name;
+}

diff --git a/ath/if_ath_hal_extensions.h b/ath/if_ath_hal_extensions.h
index 238af0293862aeaaf0e41384f5b83bd88f9a36e6..24c41beff28d1a70501f7a01c756c2ca9943b705 100644 (file)
--- a/ath/if_ath_hal_extensions.h
+++ b/ath/if_ath_hal_extensions.h
@@ -177,6 +177,52 @@
 #define AR5K_STA_ID1_BASE_RATE_11B     0x02000000      /* Use 11b base rate (for ACK/CTS ?) [5211+] */
 
 
+enum ath5k_srev_type {
+       AR5K_VERSION_VER,
+       AR5K_VERSION_RAD,
+};
+
+struct ath5k_srev_name {
+       const char              *sr_name;
+       enum ath5k_srev_type    sr_type;
+       u_int                   sr_val;
+};
+
+#define AR5K_SREV_UNKNOWN      0xffff
+
+#define AR5K_SREV_VER_AR5210   0x00
+#define AR5K_SREV_VER_AR5311   0x10
+#define AR5K_SREV_VER_AR5311A  0x20
+#define AR5K_SREV_VER_AR5311B  0x30
+#define AR5K_SREV_VER_AR5211   0x40
+#define AR5K_SREV_VER_AR5212   0x50
+#define AR5K_SREV_VER_AR5213   0x55
+#define AR5K_SREV_VER_AR5213A  0x59
+#define AR5K_SREV_VER_AR2413   0x78
+#define AR5K_SREV_VER_AR2414   0x79
+#define AR5K_SREV_VER_AR2424   0xa0 /* PCI-E */
+#define AR5K_SREV_VER_AR5424   0xa3 /* PCI-E */
+#define AR5K_SREV_VER_AR5413   0xa4
+#define AR5K_SREV_VER_AR5414   0xa5
+#define AR5K_SREV_VER_AR5416   0xc0 /* PCI-E */
+#define AR5K_SREV_VER_AR5418   0xca /* PCI-E */
+#define AR5K_SREV_VER_AR2425   0xe2 /* PCI-E */
+
+#define AR5K_SREV_RAD_5110     0x00
+#define AR5K_SREV_RAD_5111     0x10
+#define AR5K_SREV_RAD_5111A    0x15
+#define AR5K_SREV_RAD_2111     0x20
+#define AR5K_SREV_RAD_5112     0x30
+#define AR5K_SREV_RAD_5112A    0x35
+#define AR5K_SREV_RAD_2112     0x40
+#define AR5K_SREV_RAD_2112A    0x45
+#define AR5K_SREV_RAD_SC0      0x56    /* Found on 2413/2414 */
+#define AR5K_SREV_RAD_SC1      0x63    /* Found on 5413/5414 */
+#define AR5K_SREV_RAD_SC2      0xa2    /* Found on 2424-5/5424 */
+#define AR5K_SREV_RAD_5133     0xc0    /* MIMO found on 5418 */
+
+#define ATH_SREV_FROM_AH(_ah)  ((_ah)->ah_macVersion << 4 | (_ah)->ah_macRev)
+
 /*
  * DMA size definitions (2^(n+2))
  */
@@ -194,7 +240,7 @@ enum ath5k_dmasize {
 
 int ath_set_ack_bitrate(struct ath_softc* sc, int);
 int ar_device(int devid);
-
+const char * ath5k_chip_name(enum ath5k_srev_type type, u_int16_t val);
 
 static inline unsigned long field_width(unsigned long mask, unsigned long shift)
 {