Date: Wed, 03 Feb 2016 22:14:13 +0100 From: Tobias Kortkamp <t@tobik.me> To: Adrian Chadd <adrian.chadd@gmail.com> Cc: freebsd-wireless@freebsd.org Subject: Re: [patch] Change ath(4) to report correct chip name for Qualcomm Atheros cards Message-ID: <1454534053.1273131.511201162.1933BAC7@webmail.messagingengine.com> In-Reply-To: <CAJ-Vmom-8zKuorN2ubuXMUBqSe2oNnaaBTUubOLRyGkDYwFt_g@mail.gmail.com> References: <1454498827.3964610.510611394.3ED30F5C@webmail.messagingengine.com> <CAJ-Vmom-8zKuorN2ubuXMUBqSe2oNnaaBTUubOLRyGkDYwFt_g@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format.
--_----------=_145453405312731314
Content-Transfer-Encoding: 7bit
Content-Type: text/plain
Sure. Here you go.
On Wed, Feb 3, 2016, at 10:00 PM, Adrian Chadd wrote:
> Hi!
>
> Thanks! I've been meaning to do this for a while but have been ..
> slack-ish.
>
> Can you attach it as a patch? I'll commit it tonight.
>
>
> -a
>
>
> On 3 February 2016 at 03:27, Tobias Kortkamp <t@tobik.me> wrote:
> > Hi,
> >
> > when using ath(4) the driver reports the wrong name for Qualcomm Atheros
> > chips on attach e.g. a QCA9565 card reports as being an AR9565.
> > ath_hal(4) however mentions QCA9565 and not AR9565. This is confusing
> > if you want to find out if your card is supposed to be supported or not.
> > I also saw some comments in sys/dev/ath/ath_hal/ah.c that is not
> > supposed to be that way. Fixing this seems simple enough (see inlined
> > patch).
> >
> > Thanks,
> > Tobias
> >
> > diff --git a/sys/dev/ath/ath_hal/ah.c b/sys/dev/ath/ath_hal/ah.c
> > index a0baa69..8333f10 100644
> > --- a/sys/dev/ath/ath_hal/ah.c
> > +++ b/sys/dev/ath/ath_hal/ah.c
> > @@ -91,63 +91,60 @@ ath_hal_mac_name(struct ath_hal *ah)
> > switch (ah->ah_macVersion) {
> > case AR_SREV_VERSION_CRETE:
> > case AR_SREV_VERSION_MAUI_1:
> > - return "5210";
> > + return "AR5210";
> > case AR_SREV_VERSION_MAUI_2:
> > case AR_SREV_VERSION_OAHU:
> > - return "5211";
> > + return "AR5211";
> > case AR_SREV_VERSION_VENICE:
> > - return "5212";
> > + return "AR5212";
> > case AR_SREV_VERSION_GRIFFIN:
> > - return "2413";
> > + return "AR2413";
> > case AR_SREV_VERSION_CONDOR:
> > - return "5424";
> > + return "AR5424";
> > case AR_SREV_VERSION_EAGLE:
> > - return "5413";
> > + return "AR5413";
> > case AR_SREV_VERSION_COBRA:
> > - return "2415";
> > + return "AR2415";
> > case AR_SREV_2425: /* Swan */
> > - return "2425";
> > + return "AR2425";
> > case AR_SREV_2417: /* Nala */
> > - return "2417";
> > + return "AR2417";
> > case AR_XSREV_VERSION_OWL_PCI:
> > - return "5416";
> > + return "AR5416";
> > case AR_XSREV_VERSION_OWL_PCIE:
> > - return "5418";
> > + return "AR5418";
> > case AR_XSREV_VERSION_HOWL:
> > - return "9130";
> > + return "AR9130";
> > case AR_XSREV_VERSION_SOWL:
> > - return "9160";
> > + return "AR9160";
> > case AR_XSREV_VERSION_MERLIN:
> > if (AH_PRIVATE(ah)->ah_ispcie)
> > - return "9280";
> > - return "9220";
> > + return "AR9280";
> > + return "AR9220";
> > case AR_XSREV_VERSION_KITE:
> > - return "9285";
> > + return "AR9285";
> > case AR_XSREV_VERSION_KIWI:
> > if (AH_PRIVATE(ah)->ah_ispcie)
> > - return "9287";
> > - return "9227";
> > + return "AR9287";
> > + return "AR9227";
> > case AR_SREV_VERSION_AR9380:
> > if (ah->ah_macRev >= AR_SREV_REVISION_AR9580_10)
> > - return "9580";
> > - return "9380";
> > + return "AR9580";
> > + return "AR9380";
> > case AR_SREV_VERSION_AR9460:
> > - return "9460";
> > + return "AR9460";
> > case AR_SREV_VERSION_AR9330:
> > - return "9330";
> > + return "AR9330";
> > case AR_SREV_VERSION_AR9340:
> > - return "9340";
> > + return "AR9340";
> > case AR_SREV_VERSION_QCA9550:
> > - /* XXX should say QCA, not AR */
> > - return "9550";
> > + return "QCA9550";
> > case AR_SREV_VERSION_AR9485:
> > - return "9485";
> > + return "AR9485";
> > case AR_SREV_VERSION_QCA9565:
> > - /* XXX should say QCA, not AR */
> > - return "9565";
> > + return "QCA9565";
> > case AR_SREV_VERSION_QCA9530:
> > - /* XXX should say QCA, not AR */
> > - return "9530";
> > + return "QCA9530";
> > }
> > return "????";
> > }
> > diff --git a/sys/dev/ath/if_ath.c b/sys/dev/ath/if_ath.c
> > index 0dc7d3f..8b1580a 100644
> > --- a/sys/dev/ath/if_ath.c
> > +++ b/sys/dev/ath/if_ath.c
> > @@ -6160,7 +6160,7 @@ ath_announce(struct ath_softc *sc)
> > {
> > struct ath_hal *ah = sc->sc_ah;
> >
> > - device_printf(sc->sc_dev, "AR%s mac %d.%d RF%s phy %d.%d\n",
> > + device_printf(sc->sc_dev, "%s mac %d.%d RF%s phy %d.%d\n",
> > ath_hal_mac_name(ah), ah->ah_macVersion, ah->ah_macRev,
> > ath_hal_rf_name(ah), ah->ah_phyRev >> 4, ah->ah_phyRev &
> > 0xf);
> > device_printf(sc->sc_dev, "2GHz radio: 0x%.4x; 5GHz radio:
> > 0x%.4x\n",
> > _______________________________________________
> > freebsd-wireless@freebsd.org mailing list
> > https://lists.freebsd.org/mailman/listinfo/freebsd-wireless
> > To unsubscribe, send any mail to "freebsd-wireless-unsubscribe@freebsd.org"
> _______________________________________________
> freebsd-wireless@freebsd.org mailing list
> https://lists.freebsd.org/mailman/listinfo/freebsd-wireless
> To unsubscribe, send any mail to
> "freebsd-wireless-unsubscribe@freebsd.org"
--_----------=_145453405312731314
Content-Disposition: attachment; filename="ath.diff"
Content-Id: <1454533923.1272950.0e483890d561afeb635e69a126118f165ad9fcc2.26F315E3@content.messagingengine.com>
Content-Transfer-Encoding: base64
Content-Type: text/x-diff; name="ath.diff"
ZGlmZiAtLWdpdCBhL3N5cy9kZXYvYXRoL2F0aF9oYWwvYWguYyBiL3N5cy9k
ZXYvYXRoL2F0aF9oYWwvYWguYwppbmRleCBhMGJhYTY5Li44MzMzZjEwIDEw
MDY0NAotLS0gYS9zeXMvZGV2L2F0aC9hdGhfaGFsL2FoLmMKKysrIGIvc3lz
L2Rldi9hdGgvYXRoX2hhbC9haC5jCkBAIC05MSw2MyArOTEsNjAgQEAgYXRo
X2hhbF9tYWNfbmFtZShzdHJ1Y3QgYXRoX2hhbCAqYWgpCiAJc3dpdGNoIChh
aC0+YWhfbWFjVmVyc2lvbikgewogCWNhc2UgQVJfU1JFVl9WRVJTSU9OX0NS
RVRFOgogCWNhc2UgQVJfU1JFVl9WRVJTSU9OX01BVUlfMToKLQkJcmV0dXJu
ICI1MjEwIjsKKwkJcmV0dXJuICJBUjUyMTAiOwogCWNhc2UgQVJfU1JFVl9W
RVJTSU9OX01BVUlfMjoKIAljYXNlIEFSX1NSRVZfVkVSU0lPTl9PQUhVOgot
CQlyZXR1cm4gIjUyMTEiOworCQlyZXR1cm4gIkFSNTIxMSI7CiAJY2FzZSBB
Ul9TUkVWX1ZFUlNJT05fVkVOSUNFOgotCQlyZXR1cm4gIjUyMTIiOworCQly
ZXR1cm4gIkFSNTIxMiI7CiAJY2FzZSBBUl9TUkVWX1ZFUlNJT05fR1JJRkZJ
TjoKLQkJcmV0dXJuICIyNDEzIjsKKwkJcmV0dXJuICJBUjI0MTMiOwogCWNh
c2UgQVJfU1JFVl9WRVJTSU9OX0NPTkRPUjoKLQkJcmV0dXJuICI1NDI0IjsK
KwkJcmV0dXJuICJBUjU0MjQiOwogCWNhc2UgQVJfU1JFVl9WRVJTSU9OX0VB
R0xFOgotCQlyZXR1cm4gIjU0MTMiOworCQlyZXR1cm4gIkFSNTQxMyI7CiAJ
Y2FzZSBBUl9TUkVWX1ZFUlNJT05fQ09CUkE6Ci0JCXJldHVybiAiMjQxNSI7
CisJCXJldHVybiAiQVIyNDE1IjsKIAljYXNlIEFSX1NSRVZfMjQyNToJLyog
U3dhbiAqLwotCQlyZXR1cm4gIjI0MjUiOworCQlyZXR1cm4gIkFSMjQyNSI7
CiAJY2FzZSBBUl9TUkVWXzI0MTc6CS8qIE5hbGEgKi8KLQkJcmV0dXJuICIy
NDE3IjsKKwkJcmV0dXJuICJBUjI0MTciOwogCWNhc2UgQVJfWFNSRVZfVkVS
U0lPTl9PV0xfUENJOgotCQlyZXR1cm4gIjU0MTYiOworCQlyZXR1cm4gIkFS
NTQxNiI7CiAJY2FzZSBBUl9YU1JFVl9WRVJTSU9OX09XTF9QQ0lFOgotCQly
ZXR1cm4gIjU0MTgiOworCQlyZXR1cm4gIkFSNTQxOCI7CiAJY2FzZSBBUl9Y
U1JFVl9WRVJTSU9OX0hPV0w6Ci0JCXJldHVybiAiOTEzMCI7CisJCXJldHVy
biAiQVI5MTMwIjsKIAljYXNlIEFSX1hTUkVWX1ZFUlNJT05fU09XTDoKLQkJ
cmV0dXJuICI5MTYwIjsKKwkJcmV0dXJuICJBUjkxNjAiOwogCWNhc2UgQVJf
WFNSRVZfVkVSU0lPTl9NRVJMSU46CiAJCWlmIChBSF9QUklWQVRFKGFoKS0+
YWhfaXNwY2llKQotCQkJcmV0dXJuICI5MjgwIjsKLQkJcmV0dXJuICI5MjIw
IjsKKwkJCXJldHVybiAiQVI5MjgwIjsKKwkJcmV0dXJuICJBUjkyMjAiOwog
CWNhc2UgQVJfWFNSRVZfVkVSU0lPTl9LSVRFOgotCQlyZXR1cm4gIjkyODUi
OworCQlyZXR1cm4gIkFSOTI4NSI7CiAJY2FzZSBBUl9YU1JFVl9WRVJTSU9O
X0tJV0k6CiAJCWlmIChBSF9QUklWQVRFKGFoKS0+YWhfaXNwY2llKQotCQkJ
cmV0dXJuICI5Mjg3IjsKLQkJcmV0dXJuICI5MjI3IjsKKwkJCXJldHVybiAi
QVI5Mjg3IjsKKwkJcmV0dXJuICJBUjkyMjciOwogCWNhc2UgQVJfU1JFVl9W
RVJTSU9OX0FSOTM4MDoKIAkJaWYgKGFoLT5haF9tYWNSZXYgPj0gQVJfU1JF
Vl9SRVZJU0lPTl9BUjk1ODBfMTApCi0JCQlyZXR1cm4gIjk1ODAiOwotCQly
ZXR1cm4gIjkzODAiOworCQkJcmV0dXJuICJBUjk1ODAiOworCQlyZXR1cm4g
IkFSOTM4MCI7CiAJY2FzZSBBUl9TUkVWX1ZFUlNJT05fQVI5NDYwOgotCQly
ZXR1cm4gIjk0NjAiOworCQlyZXR1cm4gIkFSOTQ2MCI7CiAJY2FzZSBBUl9T
UkVWX1ZFUlNJT05fQVI5MzMwOgotCQlyZXR1cm4gIjkzMzAiOworCQlyZXR1
cm4gIkFSOTMzMCI7CiAJY2FzZSBBUl9TUkVWX1ZFUlNJT05fQVI5MzQwOgot
CQlyZXR1cm4gIjkzNDAiOworCQlyZXR1cm4gIkFSOTM0MCI7CiAJY2FzZSBB
Ul9TUkVWX1ZFUlNJT05fUUNBOTU1MDoKLQkJLyogWFhYIHNob3VsZCBzYXkg
UUNBLCBub3QgQVIgKi8KLQkJcmV0dXJuICI5NTUwIjsKKwkJcmV0dXJuICJR
Q0E5NTUwIjsKIAljYXNlIEFSX1NSRVZfVkVSU0lPTl9BUjk0ODU6Ci0JCXJl
dHVybiAiOTQ4NSI7CisJCXJldHVybiAiQVI5NDg1IjsKIAljYXNlIEFSX1NS
RVZfVkVSU0lPTl9RQ0E5NTY1OgotCQkvKiBYWFggc2hvdWxkIHNheSBRQ0Es
IG5vdCBBUiAqLwotCQlyZXR1cm4gIjk1NjUiOworCQlyZXR1cm4gIlFDQTk1
NjUiOwogCWNhc2UgQVJfU1JFVl9WRVJTSU9OX1FDQTk1MzA6Ci0JCS8qIFhY
WCBzaG91bGQgc2F5IFFDQSwgbm90IEFSICovCi0JCXJldHVybiAiOTUzMCI7
CisJCXJldHVybiAiUUNBOTUzMCI7CiAJfQogCXJldHVybiAiPz8/PyI7CiB9
CmRpZmYgLS1naXQgYS9zeXMvZGV2L2F0aC9pZl9hdGguYyBiL3N5cy9kZXYv
YXRoL2lmX2F0aC5jCmluZGV4IDBkYzdkM2YuLjhiMTU4MGEgMTAwNjQ0Ci0t
LSBhL3N5cy9kZXYvYXRoL2lmX2F0aC5jCisrKyBiL3N5cy9kZXYvYXRoL2lm
X2F0aC5jCkBAIC02MTYwLDcgKzYxNjAsNyBAQCBhdGhfYW5ub3VuY2Uoc3Ry
dWN0IGF0aF9zb2Z0YyAqc2MpCiB7CiAJc3RydWN0IGF0aF9oYWwgKmFoID0g
c2MtPnNjX2FoOwogCi0JZGV2aWNlX3ByaW50ZihzYy0+c2NfZGV2LCAiQVIl
cyBtYWMgJWQuJWQgUkYlcyBwaHkgJWQuJWRcbiIsCisJZGV2aWNlX3ByaW50
ZihzYy0+c2NfZGV2LCAiJXMgbWFjICVkLiVkIFJGJXMgcGh5ICVkLiVkXG4i
LAogCQlhdGhfaGFsX21hY19uYW1lKGFoKSwgYWgtPmFoX21hY1ZlcnNpb24s
IGFoLT5haF9tYWNSZXYsCiAJCWF0aF9oYWxfcmZfbmFtZShhaCksIGFoLT5h
aF9waHlSZXYgPj4gNCwgYWgtPmFoX3BoeVJldiAmIDB4Zik7CiAJZGV2aWNl
X3ByaW50ZihzYy0+c2NfZGV2LCAiMkdIeiByYWRpbzogMHglLjR4OyA1R0h6
IHJhZGlvOiAweCUuNHhcbiIsCg==
--_----------=_145453405312731314--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1454534053.1273131.511201162.1933BAC7>