From owner-freebsd-wireless@freebsd.org Wed Feb 3 11:27:13 2016 Return-Path: Delivered-To: freebsd-wireless@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 852BBA9A071 for ; Wed, 3 Feb 2016 11:27:13 +0000 (UTC) (envelope-from t@tobik.me) Received: from new1-smtp.messagingengine.com (new1-smtp.messagingengine.com [66.111.4.221]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5D638126C for ; Wed, 3 Feb 2016 11:27:09 +0000 (UTC) (envelope-from t@tobik.me) Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailnew.nyi.internal (Postfix) with ESMTP id 9631A1CF5 for ; Wed, 3 Feb 2016 06:27:08 -0500 (EST) Received: from web6 ([10.202.2.216]) by compute2.internal (MEProxy); Wed, 03 Feb 2016 06:27:08 -0500 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=tobik.me; h= content-transfer-encoding:content-type:date:from:message-id :mime-version:subject:to:x-sasl-enc:x-sasl-enc; s=mesmtp; bh=ezh Ddpgt0FNaI0zJytatGsmBE1c=; b=ce9GExE/asmRG2BOgn000PNvJLd5NkF846A KtCtMw9mNowxvcY4wQ6w5fVvZzrgWSPlsTtVRaUmRjhFZVRptirt5AncE5QqvFvf isZDZErdEVWNCtZK/6oZpG9eHW5hgQzxJMB/qBufDP3Nm83OsTtGpIcwULWb+5rP G/1snA0Q= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:content-type :date:from:message-id:mime-version:subject:to:x-sasl-enc :x-sasl-enc; s=smtpout; bh=ezhDdpgt0FNaI0zJytatGsmBE1c=; b=TUJaW KaMH7QbJHnWM09FGJBejQWpAXifSXASfqPi6/mcHSMOamUN9kQJzarsULaaDaqyi e210Vu6ML0vt2V/YbyEEPey3HI5S/e+li74BIn9WJ7wEiwzorNwQtA4k0scOc4w1 0hKXR3638uEvOh69RwFdI1ns0YtBkpYits8Nqg= Received: by web6.nyi.internal (Postfix, from userid 99) id 0B6E353FA0; Wed, 3 Feb 2016 06:27:08 -0500 (EST) Message-Id: <1454498827.3964610.510611394.3ED30F5C@webmail.messagingengine.com> X-Sasl-Enc: KDSehmIe+/qlaojLy4lh8NtSSH7h3xT44lrOXQk1IbvB 1454498827 From: Tobias Kortkamp To: freebsd-wireless@FreeBSD.org MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain X-Mailer: MessagingEngine.com Webmail Interface - ajax-9c016a65 Subject: [patch] Change ath(4) to report correct chip name for Qualcomm Atheros cards Date: Wed, 03 Feb 2016 12:27:07 +0100 X-BeenThere: freebsd-wireless@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "Discussions of 802.11 stack, tools device driver development." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Feb 2016 11:27:13 -0000 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",