svn commit: r265348 - in head/sys: contrib/dev/ath/ath_hal/ar9300 dev/ath/ath_hal

[Adrian Chadd]

Author: adrian
Date: Mon May  5 07:58:05 2014
New Revision: 265348
URL: http://svnweb.freebsd.org/changeset/base/265348

Log:
  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: <Atheros AR1111> 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 <jim at netgate.com> for the AR1111 NIC.
  
  Tested:
  
  * AR1111 (pretending not to be an AR9485, but failing miserably);
    STA mode with powersave.
  
  Relnotes:	yes
  Sponsored by:	Netgate

Modified:
  head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_attach.c
  head/sys/dev/ath/ath_hal/ah_devid.h

Modified: head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_attach.c
==============================================================================
--- head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_attach.c	Mon May  5 07:40:55 2014	(r265347)
+++ head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_attach.c	Mon May  5 07:58:05 2014	(r265348)
@@ -4113,6 +4113,8 @@ ar9300_probe(uint16_t vendorid, uint16_t
         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;
     }

Modified: head/sys/dev/ath/ath_hal/ah_devid.h
==============================================================================
--- head/sys/dev/ath/ath_hal/ah_devid.h	Mon May  5 07:40:55 2014	(r265347)
+++ head/sys/dev/ath/ath_hal/ah_devid.h	Mon May  5 07:58:05 2014	(r265348)
@@ -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 */