linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] ath9k : Display MAC/BB and RF version at startup
@ 2008-11-03 20:48 Benoit PAPILLAULT
  2008-11-04  7:27 ` Kalle Valo
  0 siblings, 1 reply; 9+ messages in thread
From: Benoit PAPILLAULT @ 2008-11-03 20:48 UTC (permalink / raw)
  To: linux-wireless@vger.kernel.org; +Cc: Luis Rodriguez

This patch decodes the MAC/BB version (for instance: AR5416) and the RF
part version (for instance: AR5133). It has been tested on AR5416/AR5133
which is a 2.4/5GHz 3x3 11n device. It also makes the differences
between AR5416 (PCI) and AR5418 (PCI Express). Both are named AR5416 in
the register definitions.

Signed-off-by: Benoit Papillault <benoit.papillault@free.fr>

diff --git a/drivers/net/wireless/ath9k/hw.c
b/drivers/net/wireless/ath9k/hw.c
index ded9453..f2916a5 100644
--- a/drivers/net/wireless/ath9k/hw.c
+++ b/drivers/net/wireless/ath9k/hw.c
@@ -382,8 +382,9 @@ static const char *ath9k_hw_devname(u16 devid)
 {
 	switch (devid) {
 	case AR5416_DEVID_PCI:
-	case AR5416_DEVID_PCIE:
 		return "Atheros 5416";
+	case AR5416_DEVID_PCIE:
+		return "Atheros 5418";
 	case AR9160_DEVID_PCI:
 		return "Atheros 9160";
 	case AR9280_DEVID_PCI:
diff --git a/drivers/net/wireless/ath9k/main.c
b/drivers/net/wireless/ath9k/main.c
index c67dadc..7c53ea8 100644
--- a/drivers/net/wireless/ath9k/main.c
+++ b/drivers/net/wireless/ath9k/main.c
@@ -18,6 +18,7 @@

 #include <linux/nl80211.h>
 #include "core.h"
+#include "reg.h"

 #define ATH_PCI_VERSION "0.1"

@@ -1524,10 +1525,11 @@ static int ath_pci_probe(struct pci_dev *pdev,
const struct pci_device_id *id)
 	void __iomem *mem;
 	struct ath_softc *sc;
 	struct ieee80211_hw *hw;
-	const char *athname;
 	u8 csz;
 	u32 val;
 	int ret = 0;
+	struct ath_hal *ah;
+	u16 macVersion, rfVersion;

 	if (pci_enable_device(pdev))
 		return -EIO;
@@ -1614,11 +1616,26 @@ static int ath_pci_probe(struct pci_dev *pdev,
const struct pci_device_id *id)
 		goto bad4;
 	}

-	athname = ath9k_hw_probe(id->vendor, id->device);
-
-	printk(KERN_INFO "%s: %s: mem=0x%lx, irq=%d\n",
+	ah = sc->sc_ah;
+	macVersion = ah->ah_macVersion;
+	rfVersion  = (ah->ah_analog5GhzRev & AR_RADIO_SREV_MAJOR);
+	printk(KERN_INFO
+	       "%s: Atheros AR%s%s%s%s%s%s MAC/BB Rev:%x "
+	       "AR%s%s%s%s%s RF Rev:%x: mem=0x%lx, irq=%d\n",
 	       wiphy_name(hw->wiphy),
-	       athname ? athname : "Atheros ???",
+	       macVersion == AR_SREV_VERSION_5416_PCI  ? "5416" : "",
+	       macVersion == AR_SREV_VERSION_5416_PCIE ? "5418" : "",
+	       macVersion == AR_SREV_VERSION_9100      ? "9100" : "",
+	       macVersion == AR_SREV_VERSION_9160      ? "9160" : "",
+	       macVersion == AR_SREV_VERSION_9280      ? "9280" : "",
+	       macVersion == AR_SREV_VERSION_9285      ? "9285" : "",
+	       ah->ah_macRev,
+	       rfVersion  == 0                         ? "5133" : "",
+	       rfVersion  == AR_RAD5133_SREV_MAJOR     ? "5133" : "",
+	       rfVersion  == AR_RAD5122_SREV_MAJOR     ? "5122" : "",
+	       rfVersion  == AR_RAD2133_SREV_MAJOR     ? "2133" : "",
+	       rfVersion  == AR_RAD2122_SREV_MAJOR     ? "2122" : "",
+	       ah->ah_phyRev,
 	       (unsigned long)mem, pdev->irq);

 	return 0;

^ permalink raw reply related	[flat|nested] 9+ messages in thread

* Re: [PATCH] ath9k : Display MAC/BB and RF version at startup
  2008-11-03 20:48 [PATCH] ath9k : Display MAC/BB and RF version at startup Benoit PAPILLAULT
@ 2008-11-04  7:27 ` Kalle Valo
  2008-11-05  3:02   ` Luis R. Rodriguez
  0 siblings, 1 reply; 9+ messages in thread
From: Kalle Valo @ 2008-11-04  7:27 UTC (permalink / raw)
  To: Benoit PAPILLAULT; +Cc: linux-wireless@vger.kernel.org, Luis Rodriguez

"Benoit PAPILLAULT" <benoit.papillault@free.fr> writes:

> This patch decodes the MAC/BB version (for instance: AR5416) and the RF
> part version (for instance: AR5133). It has been tested on AR5416/AR5133
> which is a 2.4/5GHz 3x3 11n device. It also makes the differences
> between AR5416 (PCI) and AR5418 (PCI Express). Both are named AR5416 in
> the register definitions.
>
> Signed-off-by: Benoit Papillault <benoit.papillault@free.fr>

[...]

> -	printk(KERN_INFO "%s: %s: mem=0x%lx, irq=%d\n",
> +	ah = sc->sc_ah;
> +	macVersion = ah->ah_macVersion;
> +	rfVersion  = (ah->ah_analog5GhzRev & AR_RADIO_SREV_MAJOR);
> +	printk(KERN_INFO
> +	       "%s: Atheros AR%s%s%s%s%s%s MAC/BB Rev:%x "
> +	       "AR%s%s%s%s%s RF Rev:%x: mem=0x%lx, irq=%d\n",
>  	       wiphy_name(hw->wiphy),
> -	       athname ? athname : "Atheros ???",
> +	       macVersion == AR_SREV_VERSION_5416_PCI  ? "5416" : "",
> +	       macVersion == AR_SREV_VERSION_5416_PCIE ? "5418" : "",
> +	       macVersion == AR_SREV_VERSION_9100      ? "9100" : "",
> +	       macVersion == AR_SREV_VERSION_9160      ? "9160" : "",
> +	       macVersion == AR_SREV_VERSION_9280      ? "9280" : "",
> +	       macVersion == AR_SREV_VERSION_9285      ? "9285" : "",
> +	       ah->ah_macRev,
> +	       rfVersion  == 0                         ? "5133" : "",
> +	       rfVersion  == AR_RAD5133_SREV_MAJOR     ? "5133" : "",
> +	       rfVersion  == AR_RAD5122_SREV_MAJOR     ? "5122" : "",
> +	       rfVersion  == AR_RAD2133_SREV_MAJOR     ? "2133" : "",
> +	       rfVersion  == AR_RAD2122_SREV_MAJOR     ? "2122" : "",
> +	       ah->ah_phyRev,

I recommend adding a separate function returning the string instead of
this ugly "%s%s%s%s" trick. Much cleaner that way.

-- 
Kalle Valo

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH] ath9k : Display MAC/BB and RF version at startup
  2008-11-04  7:27 ` Kalle Valo
@ 2008-11-05  3:02   ` Luis R. Rodriguez
  2008-11-05 13:14     ` Benoit PAPILLAULT
  0 siblings, 1 reply; 9+ messages in thread
From: Luis R. Rodriguez @ 2008-11-05  3:02 UTC (permalink / raw)
  To: Kalle Valo
  Cc: Benoit PAPILLAULT, linux-wireless@vger.kernel.org, Luis Rodriguez

On Mon, Nov 03, 2008 at 11:27:37PM -0800, Kalle Valo wrote:
> "Benoit PAPILLAULT" <benoit.papillault@free.fr> writes:
> 
> > This patch decodes the MAC/BB version (for instance: AR5416) and the RF
> > part version (for instance: AR5133). It has been tested on AR5416/AR5133
> > which is a 2.4/5GHz 3x3 11n device. It also makes the differences
> > between AR5416 (PCI) and AR5418 (PCI Express). Both are named AR5416 in
> > the register definitions.
> >
> > Signed-off-by: Benoit Papillault <benoit.papillault@free.fr>
> 
> [...]
> 
> > -     printk(KERN_INFO "%s: %s: mem=0x%lx, irq=%d\n",
> > +     ah = sc->sc_ah;
> > +     macVersion = ah->ah_macVersion;
> > +     rfVersion  = (ah->ah_analog5GhzRev & AR_RADIO_SREV_MAJOR);
> > +     printk(KERN_INFO
> > +            "%s: Atheros AR%s%s%s%s%s%s MAC/BB Rev:%x "
> > +            "AR%s%s%s%s%s RF Rev:%x: mem=0x%lx, irq=%d\n",
> >              wiphy_name(hw->wiphy),
> > -            athname ? athname : "Atheros ???",
> > +            macVersion == AR_SREV_VERSION_5416_PCI  ? "5416" : "",
> > +            macVersion == AR_SREV_VERSION_5416_PCIE ? "5418" : "",
> > +            macVersion == AR_SREV_VERSION_9100      ? "9100" : "",
> > +            macVersion == AR_SREV_VERSION_9160      ? "9160" : "",
> > +            macVersion == AR_SREV_VERSION_9280      ? "9280" : "",
> > +            macVersion == AR_SREV_VERSION_9285      ? "9285" : "",
> > +            ah->ah_macRev,
> > +            rfVersion  == 0                         ? "5133" : "",
> > +            rfVersion  == AR_RAD5133_SREV_MAJOR     ? "5133" : "",
> > +            rfVersion  == AR_RAD5122_SREV_MAJOR     ? "5122" : "",
> > +            rfVersion  == AR_RAD2133_SREV_MAJOR     ? "2133" : "",
> > +            rfVersion  == AR_RAD2122_SREV_MAJOR     ? "2122" : "",
> > +            ah->ah_phyRev,
> 
> I recommend adding a separate function returning the string instead of
> this ugly "%s%s%s%s" trick. Much cleaner that way.

Agreed, also please remove 3x3 comment as we don't have support for
those yet nor do I even have hardware for it. To be clear ath9k supports
2x2 right now. :)

  Luis

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH] ath9k : Display MAC/BB and RF version at startup
  2008-11-05  3:02   ` Luis R. Rodriguez
@ 2008-11-05 13:14     ` Benoit PAPILLAULT
  2008-11-06 21:26       ` [PATCH] ath9k : Display MAC/BB and RF version at startup (v2) Benoit PAPILLAULT
  2008-11-07  0:28       ` [PATCH] ath9k : Display MAC/BB and RF version at startup Luis R. Rodriguez
  0 siblings, 2 replies; 9+ messages in thread
From: Benoit PAPILLAULT @ 2008-11-05 13:14 UTC (permalink / raw)
  To: Luis R. Rodriguez; +Cc: Kalle Valo, linux-wireless@vger.kernel.org

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Luis R. Rodriguez a =E9crit :
>> I recommend adding a separate function returning the string instead =
of
>> this ugly "%s%s%s%s" trick. Much cleaner that way.

I'm going to send an updated patch.

>=20
> Agreed, also please remove 3x3 comment as we don't have support for
> those yet nor do I even have hardware for it. To be clear ath9k suppo=
rts
> 2x2 right now. :)

Hummm... This is what the Atheros web site says and I have 3 antennas
(very nice connector from UBNT btw). Of course, i don't know if it is
supported by the driver, but at least, I think, it's supported by the
hardware.

Reference : http://www.atheros.com/pt/AR9001AP-3NX2.htm

Regards,
Benoit
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFJEZw9OR6EySwP7oIRApusAKDnN+sBIl4hAR2YoAxMaTDkSvvn1QCgompH
a6SODwjspKIGFe8JLT7TnHY=3D
=3DuiLr
-----END PGP SIGNATURE-----
--
To unsubscribe from this list: send the line "unsubscribe linux-wireles=
s" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 9+ messages in thread

* [PATCH] ath9k : Display MAC/BB and RF version at startup (v2)
  2008-11-05 13:14     ` Benoit PAPILLAULT
@ 2008-11-06 21:26       ` Benoit PAPILLAULT
  2008-11-06 21:47         ` [ath9k-devel] " Luis R. Rodriguez
  2008-11-07  0:28       ` [PATCH] ath9k : Display MAC/BB and RF version at startup Luis R. Rodriguez
  1 sibling, 1 reply; 9+ messages in thread
From: Benoit PAPILLAULT @ 2008-11-06 21:26 UTC (permalink / raw)
  To: Luis R. Rodriguez
  Cc: linux-wireless@vger.kernel.org, ath9k-devel@lists.ath9k.org

This patch decodes the MAC/BB version (for instance: AR5416) and the RF
part version (for instance: AR5133). It has been tested on AR5416/AR5133
which is a 2.4/5GHz 11n device. It also makes the differences between
AR5416 (PCI) and AR5418 (PCI Express). Both are named AR5416 in
the register definitions.

Signed-off-by: Benoit Papillault <benoit.papillault@free.fr>

diff --git a/drivers/net/wireless/ath9k/hw.c
b/drivers/net/wireless/ath9k/hw.c
index ded9453..f2916a5 100644
--- a/drivers/net/wireless/ath9k/hw.c
+++ b/drivers/net/wireless/ath9k/hw.c
@@ -382,8 +382,9 @@ static const char *ath9k_hw_devname(u16 devid)
 {
 	switch (devid) {
 	case AR5416_DEVID_PCI:
-	case AR5416_DEVID_PCIE:
 		return "Atheros 5416";
+	case AR5416_DEVID_PCIE:
+		return "Atheros 5418";
 	case AR9160_DEVID_PCI:
 		return "Atheros 9160";
 	case AR9280_DEVID_PCI:
diff --git a/drivers/net/wireless/ath9k/main.c
b/drivers/net/wireless/ath9k/main.c
index c67dadc..2913c13 100644
--- a/drivers/net/wireless/ath9k/main.c
+++ b/drivers/net/wireless/ath9k/main.c
@@ -18,6 +18,7 @@

 #include <linux/nl80211.h>
 #include "core.h"
+#include "reg.h"

 #define ATH_PCI_VERSION "0.1"

@@ -1519,15 +1520,74 @@ static struct ieee80211_ops ath9k_ops = {
 	.set_frag_threshold = ath9k_no_fragmentation,
 };

+static struct {
+	u32 version;
+	const char * name;
+} ath_mac_bb_names[] = {
+	{ AR_SREV_VERSION_5416_PCI,	"5416" },
+	{ AR_SREV_VERSION_5416_PCIE,	"5418" },
+	{ AR_SREV_VERSION_9100,		"9100" },
+	{ AR_SREV_VERSION_9160,		"9160" },
+	{ AR_SREV_VERSION_9280,		"9280" },
+	{ AR_SREV_VERSION_9285,		"9285" }
+};
+
+static struct {
+	u16 version;
+	const char * name;
+} ath_rf_names[] = {
+	{ 0,				"5133" },
+	{ AR_RAD5133_SREV_MAJOR,	"5133" },
+	{ AR_RAD5122_SREV_MAJOR,	"5122" },
+	{ AR_RAD2133_SREV_MAJOR,	"2133" },
+	{ AR_RAD2122_SREV_MAJOR,	"2122" }
+};
+
+/*
+ * Return the MAC/BB name. "????" is returned if the MAC/BB is unknown.
+ */
+
+static const char *
+ath_mac_bb_name(u32 mac_bb_version)
+{
+	int i;
+
+	for (i=0; i<ARRAY_SIZE(ath_mac_bb_names); i++) {
+		if (ath_mac_bb_names[i].version == mac_bb_version) {
+			return ath_mac_bb_names[i].name;
+		}
+	}
+
+	return "????";
+}
+
+/*
+ * Return the RF name. "????" is returned if the RF is unknown.
+ */
+
+static const char *
+ath_rf_name(u16 rf_version)
+{
+	int i;
+
+	for (i=0; i<ARRAY_SIZE(ath_rf_names); i++) {
+		if (ath_rf_names[i].version == rf_version) {
+			return ath_rf_names[i].name;
+		}
+	}
+
+	return "????";
+}
+
 static int ath_pci_probe(struct pci_dev *pdev, const struct
pci_device_id *id)
 {
 	void __iomem *mem;
 	struct ath_softc *sc;
 	struct ieee80211_hw *hw;
-	const char *athname;
 	u8 csz;
 	u32 val;
 	int ret = 0;
+	struct ath_hal *ah;

 	if (pci_enable_device(pdev))
 		return -EIO;
@@ -1614,11 +1674,15 @@ static int ath_pci_probe(struct pci_dev *pdev,
const struct pci_device_id *id)
 		goto bad4;
 	}

-	athname = ath9k_hw_probe(id->vendor, id->device);
-
-	printk(KERN_INFO "%s: %s: mem=0x%lx, irq=%d\n",
+	ah = sc->sc_ah;
+	printk(KERN_INFO
+	       "%s: Atheros AR%s MAC/BB Rev:%x "
+	       "AR%s RF Rev:%x: mem=0x%lx, irq=%d\n",
 	       wiphy_name(hw->wiphy),
-	       athname ? athname : "Atheros ???",
+	       ath_mac_bb_name(ah->ah_macVersion),
+	       ah->ah_macRev,
+	       ath_rf_name((ah->ah_analog5GhzRev & AR_RADIO_SREV_MAJOR)),
+	       ah->ah_phyRev,
 	       (unsigned long)mem, pdev->irq);

 	return 0;

^ permalink raw reply related	[flat|nested] 9+ messages in thread

* Re: [ath9k-devel] [PATCH] ath9k : Display MAC/BB and RF version at startup (v2)
  2008-11-06 21:26       ` [PATCH] ath9k : Display MAC/BB and RF version at startup (v2) Benoit PAPILLAULT
@ 2008-11-06 21:47         ` Luis R. Rodriguez
  2008-11-06 21:49           ` Luis R. Rodriguez
  0 siblings, 1 reply; 9+ messages in thread
From: Luis R. Rodriguez @ 2008-11-06 21:47 UTC (permalink / raw)
  To: Benoit PAPILLAULT
  Cc: ath9k-devel@lists.ath9k.org, linux-wireless@vger.kernel.org

On Thu, Nov 6, 2008 at 1:26 PM, Benoit PAPILLAULT
<benoit.papillault@free.fr> wrote:
> This patch decodes the MAC/BB version (for instance: AR5416) and the RF
> part version (for instance: AR5133). It has been tested on AR5416/AR5133
> which is a 2.4/5GHz 11n device. It also makes the differences between
> AR5416 (PCI) and AR5418 (PCI Express). Both are named AR5416 in
> the register definitions.
>
> Signed-off-by: Benoit Papillault <benoit.papillault@free.fr>

thanks, I'm going to test it on our later hardware, but patch fails
with git am (and therefore with patch itself):

mcgrof@mosca ~/wireless-testing (git::11dv3)$ patch -p1 <
/home/mcgrof/name-ath9k.patch
patching file drivers/net/wireless/ath9k/hw.c
patching file drivers/net/wireless/ath9k/main.c
patch: **** malformed patch at line 105: pci_device_id *id)

  Luis

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [ath9k-devel] [PATCH] ath9k : Display MAC/BB and RF version at startup (v2)
  2008-11-06 21:47         ` [ath9k-devel] " Luis R. Rodriguez
@ 2008-11-06 21:49           ` Luis R. Rodriguez
  0 siblings, 0 replies; 9+ messages in thread
From: Luis R. Rodriguez @ 2008-11-06 21:49 UTC (permalink / raw)
  To: Benoit PAPILLAULT
  Cc: ath9k-devel@lists.ath9k.org, linux-wireless@vger.kernel.org

On Thu, Nov 06, 2008 at 01:47:40PM -0800, Luis Rodriguez wrote:
> On Thu, Nov 6, 2008 at 1:26 PM, Benoit PAPILLAULT
> <benoit.papillault@free.fr> wrote:
> > This patch decodes the MAC/BB version (for instance: AR5416) and the RF
> > part version (for instance: AR5133). It has been tested on AR5416/AR5133
> > which is a 2.4/5GHz 11n device. It also makes the differences between
> > AR5416 (PCI) and AR5418 (PCI Express). Both are named AR5416 in
> > the register definitions.
> >
> > Signed-off-by: Benoit Papillault <benoit.papillault@free.fr>
> 
> thanks, I'm going to test it on our later hardware, but patch fails
> with git am (and therefore with patch itself):
> 
> mcgrof@mosca ~/wireless-testing (git::11dv3)$ patch -p1 <
> /home/mcgrof/name-ath9k.patch
> patching file drivers/net/wireless/ath9k/hw.c
> patching file drivers/net/wireless/ath9k/main.c
> patch: **** malformed patch at line 105: pci_device_id *id)

After tinkering with it applies though, seems your > 80 columns get
wrapped.

From: Benoit PAPILLAULT <benoit.papillault@free.fr>
PATCH] ath9k : Display MAC/BB and RF version at

This patch decodes the MAC/BB version (for instance: AR5416) and the RF
part version (for instance: AR5133). It has been tested on AR5416/AR5133
which is a 2.4/5GHz 11n device. It also makes the differences between
AR5416 (PCI) and AR5418 (PCI Express). Both are named AR5416 in
the register definitions.

Signed-off-by: Benoit Papillault <benoit.papillault@free.fr>

diff --git a/drivers/net/wireless/ath9k/hw.c
b/drivers/net/wireless/ath9k/hw.c
index ded9453..f2916a5 100644
--- a/drivers/net/wireless/ath9k/hw.c
+++ b/drivers/net/wireless/ath9k/hw.c
@@ -382,8 +382,9 @@ static const char *ath9k_hw_devname(u16 devid)
 {
 	switch (devid) {
 	case AR5416_DEVID_PCI:
-	case AR5416_DEVID_PCIE:
 		return "Atheros 5416";
+	case AR5416_DEVID_PCIE:
+		return "Atheros 5418";
 	case AR9160_DEVID_PCI:
 		return "Atheros 9160";
 	case AR9280_DEVID_PCI:
diff --git a/drivers/net/wireless/ath9k/main.c
b/drivers/net/wireless/ath9k/main.c
index c67dadc..2913c13 100644
--- a/drivers/net/wireless/ath9k/main.c
+++ b/drivers/net/wireless/ath9k/main.c
@@ -18,6 +18,7 @@

 #include <linux/nl80211.h>
 #include "core.h"
+#include "reg.h"

 #define ATH_PCI_VERSION "0.1"

@@ -1519,15 +1520,74 @@ static struct ieee80211_ops ath9k_ops = {
 	.set_frag_threshold = ath9k_no_fragmentation,
 };

+static struct {
+	u32 version;
+	const char * name;
+} ath_mac_bb_names[] = {
+	{ AR_SREV_VERSION_5416_PCI,	"5416" },
+	{ AR_SREV_VERSION_5416_PCIE,	"5418" },
+	{ AR_SREV_VERSION_9100,		"9100" },
+	{ AR_SREV_VERSION_9160,		"9160" },
+	{ AR_SREV_VERSION_9280,		"9280" },
+	{ AR_SREV_VERSION_9285,		"9285" }
+};
+
+static struct {
+	u16 version;
+	const char * name;
+} ath_rf_names[] = {
+	{ 0,				"5133" },
+	{ AR_RAD5133_SREV_MAJOR,	"5133" },
+	{ AR_RAD5122_SREV_MAJOR,	"5122" },
+	{ AR_RAD2133_SREV_MAJOR,	"2133" },
+	{ AR_RAD2122_SREV_MAJOR,	"2122" }
+};
+
+/*
+ * Return the MAC/BB name. "????" is returned if the MAC/BB is unknown.
+ */
+
+static const char *
+ath_mac_bb_name(u32 mac_bb_version)
+{
+	int i;
+
+	for (i=0; i<ARRAY_SIZE(ath_mac_bb_names); i++) {
+		if (ath_mac_bb_names[i].version == mac_bb_version) {
+			return ath_mac_bb_names[i].name;
+		}
+	}
+
+	return "????";
+}
+
+/*
+ * Return the RF name. "????" is returned if the RF is unknown.
+ */
+
+static const char *
+ath_rf_name(u16 rf_version)
+{
+	int i;
+
+	for (i=0; i<ARRAY_SIZE(ath_rf_names); i++) {
+		if (ath_rf_names[i].version == rf_version) {
+			return ath_rf_names[i].name;
+		}
+	}
+
+	return "????";
+}
+
 static int ath_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 {
 	void __iomem *mem;
 	struct ath_softc *sc;
 	struct ieee80211_hw *hw;
-	const char *athname;
 	u8 csz;
 	u32 val;
 	int ret = 0;
+	struct ath_hal *ah;

 	if (pci_enable_device(pdev))
 		return -EIO;
@@ -1614,11 +1674,15 @@ static int ath_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 		goto bad4;
 	}

-	athname = ath9k_hw_probe(id->vendor, id->device);
-
-	printk(KERN_INFO "%s: %s: mem=0x%lx, irq=%d\n",
+	ah = sc->sc_ah;
+	printk(KERN_INFO
+	       "%s: Atheros AR%s MAC/BB Rev:%x "
+	       "AR%s RF Rev:%x: mem=0x%lx, irq=%d\n",
 	       wiphy_name(hw->wiphy),
-	       athname ? athname : "Atheros ???",
+	       ath_mac_bb_name(ah->ah_macVersion),
+	       ah->ah_macRev,
+	       ath_rf_name((ah->ah_analog5GhzRev & AR_RADIO_SREV_MAJOR)),
+	       ah->ah_phyRev,
 	       (unsigned long)mem, pdev->irq);

 	return 0;

^ permalink raw reply related	[flat|nested] 9+ messages in thread

* Re: [PATCH] ath9k : Display MAC/BB and RF version at startup
  2008-11-05 13:14     ` Benoit PAPILLAULT
  2008-11-06 21:26       ` [PATCH] ath9k : Display MAC/BB and RF version at startup (v2) Benoit PAPILLAULT
@ 2008-11-07  0:28       ` Luis R. Rodriguez
  2008-11-07  0:31         ` Luis R. Rodriguez
  1 sibling, 1 reply; 9+ messages in thread
From: Luis R. Rodriguez @ 2008-11-07  0:28 UTC (permalink / raw)
  To: Benoit PAPILLAULT; +Cc: Kalle Valo, linux-wireless@vger.kernel.org

T24gV2VkLCBOb3YgNSwgMjAwOCBhdCA1OjE0IEFNLCBCZW5vaXQgUEFQSUxMQVVMVAo8YmVub2l0
LnBhcGlsbGF1bHRAZnJlZS5mcj4gd3JvdGU6Cj4gLS0tLS1CRUdJTiBQR1AgU0lHTkVEIE1FU1NB
R0UtLS0tLQo+IEhhc2g6IFNIQTEKPgo+IEx1aXMgUi4gUm9kcmlndWV6IGEgw6ljcml0IDoKPj4+
IEkgcmVjb21tZW5kIGFkZGluZyBhIHNlcGFyYXRlIGZ1bmN0aW9uIHJldHVybmluZyB0aGUgc3Ry
aW5nIGluc3RlYWQgb2YKPj4+IHRoaXMgdWdseSAiJXMlcyVzJXMiIHRyaWNrLiBNdWNoIGNsZWFu
ZXIgdGhhdCB3YXkuCj4KPiBJJ20gZ29pbmcgdG8gc2VuZCBhbiB1cGRhdGVkIHBhdGNoLgo+Cj4+
Cj4+IEFncmVlZCwgYWxzbyBwbGVhc2UgcmVtb3ZlIDN4MyBjb21tZW50IGFzIHdlIGRvbid0IGhh
dmUgc3VwcG9ydCBmb3IKPj4gdGhvc2UgeWV0IG5vciBkbyBJIGV2ZW4gaGF2ZSBoYXJkd2FyZSBm
b3IgaXQuIFRvIGJlIGNsZWFyIGF0aDlrIHN1cHBvcnRzCj4+IDJ4MiByaWdodCBub3cuIDopCj4K
PiBIdW1tbS4uLiBUaGlzIGlzIHdoYXQgdGhlIEF0aGVyb3Mgd2ViIHNpdGUgc2F5cyBhbmQgSSBo
YXZlIDMgYW50ZW5uYXMKPiAodmVyeSBuaWNlIGNvbm5lY3RvciBmcm9tIFVCTlQgYnR3KS4gT2Yg
Y291cnNlLCBpIGRvbid0IGtub3cgaWYgaXQgaXMKPiBzdXBwb3J0ZWQgYnkgdGhlIGRyaXZlciwg
YnV0IGF0IGxlYXN0LCBJIHRoaW5rLCBpdCdzIHN1cHBvcnRlZCBieSB0aGUKPiBoYXJkd2FyZS4K
Pgo+IFJlZmVyZW5jZSA6IGh0dHA6Ly93d3cuYXRoZXJvcy5jb20vcHQvQVI5MDAxQVAtM05YMi5o
dG0KClRoYW5rcyBmb3IgdGhpcywgSSByZXZpZXdlZCB0aGlzIG5vdyBhbmQgeW91IGFyZSBjb3Jy
ZWN0LCBJIHdhcwpjb21wbGV0ZWx5IG1pc3Rha2luZyB0aGUgbnVtYmVyIG9mIHN0cmVhbXMgd2l0
aCB0aGUgbnVtYmVyIG9mIGNoYWlucy4KM3gzIG1lYW5zIG51bWJlciBvZiBUWC9SWCBjaGFpbnMs
IHRoZXNlIGRldmljZXMgaG93ZXZlciBzdGlsbCBvbmx5CnN1cHBvcnQgMiBzdHJlYW1zIHdoaWNo
IG1lYW4gbWF4IHRoZW9yZXRpY2FsIHRocm91Z2hwdXQgaXMgc3RpbGwgMzAwCk1icHMuIFNvIDN4
MyB3YXMgY29ycmVjdCwgYXBvbG9naWVzIGZvciB0aGUgbWlzY29tbXVuaWNhdGlvbiB0aGVyZS4K
CiAgTHVpcwo=

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH] ath9k : Display MAC/BB and RF version at startup
  2008-11-07  0:28       ` [PATCH] ath9k : Display MAC/BB and RF version at startup Luis R. Rodriguez
@ 2008-11-07  0:31         ` Luis R. Rodriguez
  0 siblings, 0 replies; 9+ messages in thread
From: Luis R. Rodriguez @ 2008-11-07  0:31 UTC (permalink / raw)
  To: Benoit PAPILLAULT; +Cc: Kalle Valo, linux-wireless@vger.kernel.org

T24gVGh1LCBOb3YgNiwgMjAwOCBhdCA0OjI4IFBNLCBMdWlzIFIuIFJvZHJpZ3Vlego8bHJvZHJp
Z3VlekBhdGhlcm9zLmNvbT4gd3JvdGU6Cj4gT24gV2VkLCBOb3YgNSwgMjAwOCBhdCA1OjE0IEFN
LCBCZW5vaXQgUEFQSUxMQVVMVAo+IDxiZW5vaXQucGFwaWxsYXVsdEBmcmVlLmZyPiB3cm90ZToK
Pj4gLS0tLS1CRUdJTiBQR1AgU0lHTkVEIE1FU1NBR0UtLS0tLQo+PiBIYXNoOiBTSEExCj4+Cj4+
IEx1aXMgUi4gUm9kcmlndWV6IGEgw6ljcml0IDoKPj4+PiBJIHJlY29tbWVuZCBhZGRpbmcgYSBz
ZXBhcmF0ZSBmdW5jdGlvbiByZXR1cm5pbmcgdGhlIHN0cmluZyBpbnN0ZWFkIG9mCj4+Pj4gdGhp
cyB1Z2x5ICIlcyVzJXMlcyIgdHJpY2suIE11Y2ggY2xlYW5lciB0aGF0IHdheS4KPj4KPj4gSSdt
IGdvaW5nIHRvIHNlbmQgYW4gdXBkYXRlZCBwYXRjaC4KPj4KPj4+Cj4+PiBBZ3JlZWQsIGFsc28g
cGxlYXNlIHJlbW92ZSAzeDMgY29tbWVudCBhcyB3ZSBkb24ndCBoYXZlIHN1cHBvcnQgZm9yCj4+
PiB0aG9zZSB5ZXQgbm9yIGRvIEkgZXZlbiBoYXZlIGhhcmR3YXJlIGZvciBpdC4gVG8gYmUgY2xl
YXIgYXRoOWsgc3VwcG9ydHMKPj4+IDJ4MiByaWdodCBub3cuIDopCj4+Cj4+IEh1bW1tLi4uIFRo
aXMgaXMgd2hhdCB0aGUgQXRoZXJvcyB3ZWIgc2l0ZSBzYXlzIGFuZCBJIGhhdmUgMyBhbnRlbm5h
cwo+PiAodmVyeSBuaWNlIGNvbm5lY3RvciBmcm9tIFVCTlQgYnR3KS4gT2YgY291cnNlLCBpIGRv
bid0IGtub3cgaWYgaXQgaXMKPj4gc3VwcG9ydGVkIGJ5IHRoZSBkcml2ZXIsIGJ1dCBhdCBsZWFz
dCwgSSB0aGluaywgaXQncyBzdXBwb3J0ZWQgYnkgdGhlCj4+IGhhcmR3YXJlLgo+Pgo+PiBSZWZl
cmVuY2UgOiBodHRwOi8vd3d3LmF0aGVyb3MuY29tL3B0L0FSOTAwMUFQLTNOWDIuaHRtCj4KPiBU
aGFua3MgZm9yIHRoaXMsIEkgcmV2aWV3ZWQgdGhpcyBub3cgYW5kIHlvdSBhcmUgY29ycmVjdCwg
SSB3YXMKPiBjb21wbGV0ZWx5IG1pc3Rha2luZyB0aGUgbnVtYmVyIG9mIHN0cmVhbXMgd2l0aCB0
aGUgbnVtYmVyIG9mIGNoYWlucy4KPiAzeDMgbWVhbnMgbnVtYmVyIG9mIFRYL1JYIGNoYWlucywg
dGhlc2UgZGV2aWNlcyBob3dldmVyIHN0aWxsIG9ubHkKPiBzdXBwb3J0IDIgc3RyZWFtcyB3aGlj
aCBtZWFuIG1heCB0aGVvcmV0aWNhbCB0aHJvdWdocHV0IGlzIHN0aWxsIDMwMAo+IE1icHMuIFNv
IDN4MyB3YXMgY29ycmVjdCwgYXBvbG9naWVzIGZvciB0aGUgbWlzY29tbXVuaWNhdGlvbiB0aGVy
ZS4KCk9uIEhUNDAgOikgYWxzbyBJIHVwZGF0ZWQgdGhlIGRvYyBoZXJlOgoKaHR0cDovL3dpcmVs
ZXNzLmtlcm5lbC5vcmcvZW4vZGV2ZWxvcGVycy9Eb2N1bWVudGF0aW9uL2llZWU4MDIxMS84MDIu
MTFuCgogIEx1aXMK

^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2008-11-07  0:31 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-11-03 20:48 [PATCH] ath9k : Display MAC/BB and RF version at startup Benoit PAPILLAULT
2008-11-04  7:27 ` Kalle Valo
2008-11-05  3:02   ` Luis R. Rodriguez
2008-11-05 13:14     ` Benoit PAPILLAULT
2008-11-06 21:26       ` [PATCH] ath9k : Display MAC/BB and RF version at startup (v2) Benoit PAPILLAULT
2008-11-06 21:47         ` [ath9k-devel] " Luis R. Rodriguez
2008-11-06 21:49           ` Luis R. Rodriguez
2008-11-07  0:28       ` [PATCH] ath9k : Display MAC/BB and RF version at startup Luis R. Rodriguez
2008-11-07  0:31         ` Luis R. Rodriguez

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).