From 9a4cf01f45a277419bc1ac861dbfc17a1c81f3d2 Mon Sep 17 00:00:00 2001 From: Adrian Chadd Date: Mon, 5 May 2014 07:58:05 +0000 Subject: [PATCH] Add Atheros AR1111 support to the HAL. This seems to probe/attach as an AR9485 and thus nothing else besides adding the device id seems to be required. ath0: mem 0xf4800000-0xf487ffff irq 19 at device 0.0 on pci5 ath0: [HT] enabling HT modes ath0: [HT] enabling short-GI in 20MHz mode ath0: [HT] 1 stream STBC receive enabled ath0: [HT] 1 RX streams; 1 TX streams ath0: AR9485 mac 576.1 RF5110 phy 1926.8 ath0: 2GHz radio: 0x0000; 5GHz radio: 0x0000 The NIC I have here is a 1 antenna, 2GHz only device. Thankyou to Jim Thompson for the AR1111 NIC. Tested: * AR1111 (pretending not to be an AR9485, but failing miserably); STA mode with powersave. Relnotes: yes Sponsored by: Netgate --- sys/contrib/dev/ath/ath_hal/ar9300/ar9300_attach.c | 2 ++ sys/dev/ath/ath_hal/ah_devid.h | 1 + 2 files changed, 3 insertions(+) diff --git a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_attach.c b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_attach.c index 46833ef749f4..9cc99ec701f0 100644 --- a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_attach.c +++ b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_attach.c @@ -4113,6 +4113,8 @@ ar9300_probe(uint16_t vendorid, uint16_t devid) return "Qualcomm Atheros QCA955x"; case AR9300_DEVID_QCA9565: /* Aphrodite */ return "Qualcomm Atheros AR9565"; + case AR9300_DEVID_AR1111_PCIE: + return "Atheros AR1111"; default: return AH_NULL; } diff --git a/sys/dev/ath/ath_hal/ah_devid.h b/sys/dev/ath/ath_hal/ah_devid.h index 43d994dcd3ab..1e4d47307258 100644 --- a/sys/dev/ath/ath_hal/ah_devid.h +++ b/sys/dev/ath/ath_hal/ah_devid.h @@ -92,6 +92,7 @@ #define AR9300_DEVID_AR946X_PCIE 0x0034 #define AR9300_DEVID_AR9330 0x0035 #define AR9300_DEVID_QCA9565 0x0036 +#define AR9300_DEVID_AR1111_PCIE 0x0037 #define AR9300_DEVID_QCA955X 0x0039 #define AR_SUBVENDOR_ID_NOG 0x0e11 /* No 11G subvendor ID */