svn commit: r217809 - head/sys/dev/ath/ath_hal

[Adrian Chadd]

Author: adrian
Date: Tue Jan 25 05:35:09 2011
New Revision: 217809
URL: http://svn.freebsd.org/changeset/base/217809

Log:
  Fix the Atheros V4K EEPROM definitions to match those in ath9k.
  
  It turns out that the V4K eeprom definitions (used by the AR9285 and
  its derivatives) is wrong. These values are at least causing issues
  on my AR2427.
  
  With this fix (and initvals in a subsequent commit), the AR2427 behaves
  a lot better.
  
  Note - there's still significant drift between the ath9k v4k eeprom
  init code (again, used by AR9285 and derivatives) and what's in this
  tree. That needs to be investigated and resolved.

Modified:
  head/sys/dev/ath/ath_hal/ah_eeprom_v4k.c
  head/sys/dev/ath/ath_hal/ah_eeprom_v4k.h

Modified: head/sys/dev/ath/ath_hal/ah_eeprom_v4k.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ah_eeprom_v4k.c	Tue Jan 25 04:35:07 2011	(r217808)
+++ head/sys/dev/ath/ath_hal/ah_eeprom_v4k.c	Tue Jan 25 05:35:09 2011	(r217809)
@@ -65,9 +65,9 @@ v4kEepromGet(struct ath_hal *ah, int par
         case AR_EEP_RFSILENT:
 		return pBase->rfSilent;
     	case AR_EEP_OB_2:
-		return pModal->ob;
+		return pModal->ob_0;
     	case AR_EEP_DB_2:
-		return pModal->db;
+		return pModal->db1_1;
 	case AR_EEP_TXMASK:
 		return pBase->txMask;
 	case AR_EEP_RXMASK:

Modified: head/sys/dev/ath/ath_hal/ah_eeprom_v4k.h
==============================================================================
--- head/sys/dev/ath/ath_hal/ah_eeprom_v4k.h	Tue Jan 25 04:35:07 2011	(r217808)
+++ head/sys/dev/ath/ath_hal/ah_eeprom_v4k.h	Tue Jan 25 05:35:09 2011	(r217809)
@@ -88,14 +88,18 @@ typedef struct ModalEepHeader4k {
 	uint8_t		xpd;					// 1
 	int8_t		iqCalICh[AR5416_4K_MAX_CHAINS];		// 1
 	int8_t		iqCalQCh[AR5416_4K_MAX_CHAINS];		// 1
+
 	uint8_t		pdGainOverlap;				// 1
-	uint8_t		ob;					// 1
-	uint8_t		db;					// 1
-	uint8_t		xpaBiasLvl;				// 1
-#if 0
-	uint8_t		pwrDecreaseFor2Chain;			// 1
-	uint8_t		pwrDecreaseFor3Chain;			// 1 -> 48 B
+
+#ifdef __BIG_ENDIAN_BITFIELD
+	uint8_t		ob_1:4, ob_0:4;
+	uint8_t		db1_1:4, db1_0:4;
+#else
+	uint8_t		ob_0:4, ob_1:4;
+	uint8_t		db1_0:4, db1_1:4;
 #endif
+
+	uint8_t		xpaBiasLvl;				// 1
 	uint8_t		txFrameToDataStart;			// 1
 	uint8_t		txFrameToPaOn;				// 1
 	uint8_t		ht40PowerIncForPdadc;			// 1
@@ -104,23 +108,34 @@ typedef struct ModalEepHeader4k {
 	uint8_t		swSettleHt40;				// 1	
 	uint8_t		xatten2Db[AR5416_4K_MAX_CHAINS];    	// 1
 	uint8_t		xatten2Margin[AR5416_4K_MAX_CHAINS];	// 1
-	uint8_t		ob_ch1;				// 1 -> ob and db become chain specific from AR9280
-	uint8_t		db_ch1;				// 1
-	uint8_t		flagBits;			// 1
-#define	AR5416_EEP_FLAG_USEANT1		0x01	/* +1 configured antenna */
-#define	AR5416_EEP_FLAG_FORCEXPAON	0x02	/* force XPA bit for 5G */
-#define	AR5416_EEP_FLAG_LOCALBIAS	0x04	/* enable local bias */
-#define	AR5416_EEP_FLAG_FEMBANDSELECT	0x08	/* FEM band select used */
-#define	AR5416_EEP_FLAG_XLNABUFIN	0x10
-#define	AR5416_EEP_FLAG_XLNAISEL	0x60
-#define	AR5416_EEP_FLAG_XLNAISEL_S	5
-#define	AR5416_EEP_FLAG_XLNABUFMODE	0x80
-	uint8_t		miscBits;			// [0..1]: bb_tx_dac_scale_cck
-	uint16_t	xpaBiasLvlFreq[3];		// 6
-	uint8_t		futureModal[2];			// 2
+
+#ifdef __BIG_ENDIAN_BITFIELD
+        uint8_t db2_1:4, db2_0:4;				// 1
+#else
+	uint8_t db2_0:4, db2_1:4;				// 1
+#endif
+
+	uint8_t version;					// 1
+
+#ifdef __BIG_ENDIAN_BITFIELD
+	uint8_t ob_3:4, ob_2:4;
+	uint8_t antdiv_ctl1:4, ob_4:4;
+	uint8_t db1_3:4, db1_2:4;
+	uint8_t antdiv_ctl2:4, db1_4:4;
+	uint8_t db2_2:4, db2_3:4;
+	uint8_t reserved:4, db2_4:4;
+#else
+	uint8_t ob_2:4, ob_3:4;
+	uint8_t ob_4:4, antdiv_ctl1:4;
+	uint8_t db1_2:4, db1_3:4;
+	uint8_t db1_4:4, antdiv_ctl2:4;
+	uint8_t db2_2:4, db2_3:4;
+	uint8_t db2_4:4, reserved:4;
+#endif
+	uint8_t futureModal[4];
 
 	SPUR_CHAN spurChans[AR5416_EEPROM_MODAL_SPURS];	// 20 B
-} __packed MODAL_EEP4K_HEADER;				// == 68 B    
+} __packed MODAL_EEP4K_HEADER;				// == ? B
 
 typedef struct CalCtlData4k {
 	CAL_CTL_EDGES		ctlEdges[AR5416_4K_MAX_CHAINS][AR5416_4K_NUM_BAND_EDGES];