sync initialization values for AR9160 and AR9280 with ath9k.

see http://marc.info/?l=linux-wireless&m=127802223525594&w=2 for the
list of changes/fixes.

1 files changed, 79 insertions, 77 deletions

diff --git a/sys/dev/ic/ar9280reg.h b/sys/dev/ic/ar9280reg.h
index 4919680d3e4..ff4fa8213eb 100644
--- a/sys/dev/ic/ar9280reg.h
+++ b/sys/dev/ic/ar9280reg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ar9280reg.h,v 1.3 2010/07/15 19:07:43 damien Exp $	*/
+/*	$OpenBSD: ar9280reg.h,v 1.4 2010/07/15 19:24:04 damien Exp $	*/
 
 /*-
  * Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr>
@@ -48,10 +48,9 @@ static const uint16_t ar9280_2_0_regs[] = {
 	P(0x09860), P(0x09864), P(0x09868), P(0x0986c), P(0x09914),
 	P(0x09918), P(0x09924), P(0x09944), P(0x09960), P(0x0a960),
 	P(0x09964), P(0x0c968), P(0x099b8), P(0x099bc), P(0x099c0),
-	P(0x099c4), P(0x099c8), P(0x099cc), P(0x099d0), P(0x099d4),
-	P(0x099d8), P(0x0a204), P(0x0a20c), P(0x0b20c), P(0x0a21c),
-	P(0x0a230), P(0x0a23c), P(0x0a250), P(0x0a358), P(0x0a388),
-	P(0x0a3d8), P(0x07894)
+	P(0x0a204), P(0x0a20c), P(0x0b20c), P(0x0a21c), P(0x0a230),
+	P(0x0a23c), P(0x0a250), P(0x0a358), P(0x0a388), P(0x0a3d8),
+	P(0x07894)
 };
 
 static const uint32_t ar9280_2_0_vals_5g20[] = {
@@ -62,10 +61,9 @@ static const uint32_t ar9280_2_0_vals_5g20[] = {
 	0x00048d18, 0x0001ce00, 0x5ac640d0, 0x06903081, 0x000007d0,
 	0x0000000a, 0xd00a8a0b, 0xffbc1010, 0x00000010, 0x00000010,
 	0x00000210, 0x000003b5, 0x0000001c, 0x00000a00, 0x05eea6d4,
-	0x06336f77, 0x60f65329, 0x08f186c8, 0x00046384, 0x00000000,
-	0x00000000, 0x00000444, 0x00000014, 0x00000014, 0x1883800a,
-	0x00000000, 0x13c88000, 0x001ff000, 0x7999aa02, 0x0c000000,
-	0x00000000, 0x5a508000
+	0x00000444, 0x00000014, 0x00000014, 0x1883800a, 0x00000000,
+	0x13c88000, 0x001ff000, 0x7999aa02, 0x0c000000, 0x00000000,
+	0x5a508000
 };
 
 #ifndef IEEE80211_NO_HT
@@ -77,10 +75,9 @@ static const uint32_t ar9280_2_0_vals_5g40[] = {
 	0x00048d18, 0x0001ce00, 0x5ac640d0, 0x06903081, 0x00000fa0,
 	0x00000014, 0xd00a8a0b, 0xffbc1010, 0x00000010, 0x00000010,
 	0x00000210, 0x000003b5, 0x0000001c, 0x00000a00, 0x05eea6d4,
-	0x06336f77, 0x60f65329, 0x08f186c8, 0x00046384, 0x00000000,
-	0x00000000, 0x00000444, 0x00000014, 0x00000014, 0x1883800a,
-	0x00000000, 0x13c88000, 0x001ff000, 0x7999aa02, 0x0c000000,
-	0x00000000, 0x5a508000
+	0x00000444, 0x00000014, 0x00000014, 0x1883800a, 0x00000000,
+	0x13c88000, 0x001ff000, 0x7999aa02, 0x0c000000, 0x00000000,
+	0x5a508000
 };
 
 static const uint32_t ar9280_2_0_vals_2g40[] = {
@@ -91,10 +88,9 @@ static const uint32_t ar9280_2_0_vals_2g40[] = {
 	0x00048d20, 0x0001ce00, 0x5ac640d0, 0x06903881, 0x00001130,
 	0x00000268, 0xd00a8a0d, 0xffbc1010, 0x00000010, 0x00000010,
 	0x00000210, 0x000003ce, 0x0000001c, 0x00000c00, 0x05eea6d4,
-	0x06336f77, 0x60f65329, 0x08f186c8, 0x00046384, 0x00000000,
-	0x00000000, 0x00000444, 0x0001f019, 0x0001f019, 0x1883800a,
-	0x00000210, 0x13c88001, 0x0004a000, 0x7999aa0e, 0x08000000,
-	0x00000000, 0x5a508000
+	0x00000444, 0x0001f019, 0x0001f019, 0x1883800a, 0x00000210,
+	0x13c88001, 0x0004a000, 0x7999aa0e, 0x08000000, 0x00000000,
+	0x5a508000
 };
 #endif
 
@@ -106,10 +102,9 @@ static const uint32_t ar9280_2_0_vals_2g20[] = {
 	0x00048d20, 0x0001ce00, 0x5ac640d0, 0x06903881, 0x00000898,
 	0x0000000b, 0xd00a8a0d, 0xffbc1010, 0x00000010, 0x00000010,
 	0x00000210, 0x000003ce, 0x0000001c, 0x00000c00, 0x05eea6d4,
-	0x06336f77, 0x60f65329, 0x08f186c8, 0x00046384, 0x00000000,
-	0x00000000, 0x00000444, 0x0001f019, 0x0001f019, 0x1883800a,
-	0x00000108, 0x13c88000, 0x0004a000, 0x7999aa0e, 0x0c000000,
-	0x00000000, 0x5a508000
+	0x00000444, 0x0001f019, 0x0001f019, 0x1883800a, 0x00000108,
+	0x13c88000, 0x0004a000, 0x7999aa0e, 0x0c000000, 0x00000000,
+	0x5a508000
 };
 
 static const uint16_t ar9280_2_0_cm_regs[] = {
@@ -160,20 +155,21 @@ static const uint16_t ar9280_2_0_cm_regs[] = {
 	P(0x0c95c), P(0x09970), P(0x09974), P(0x09978), P(0x0997c),
 	P(0x09980), P(0x09984), P(0x09988), P(0x0998c), P(0x09990),
 	P(0x09994), P(0x09998), P(0x0999c), P(0x099a0), P(0x099a4),
-	P(0x099a8), P(0x099ac), P(0x099b0), P(0x099b4), P(0x099dc),
-	P(0x099e0), P(0x099e4), P(0x099e8), P(0x099ec), P(0x099f0),
-	P(0x099fc), P(0x0a208), P(0x0a210), P(0x0a214), P(0x0a218),
-	P(0x0a220), P(0x0a224), P(0x0a228), P(0x0a22c), P(0x0a234),
-	P(0x0a238), P(0x0a240), P(0x0a244), P(0x0a248), P(0x0a24c),
-	P(0x0a254), P(0x0a258), P(0x0a25c), P(0x0a260), P(0x0a268),
-	P(0x0a26c), P(0x0b26c), P(0x0d270), P(0x0a278), P(0x0d35c),
-	P(0x0d360), P(0x0d364), P(0x0d368), P(0x0d36c), P(0x0d370),
-	P(0x0d374), P(0x0d378), P(0x0d37c), P(0x0d380), P(0x0d384),
-	P(0x0a38c), P(0x0a390), P(0x0a394), P(0x0a398), P(0x0a39c),
-	P(0x0a3a0), P(0x0a3a4), P(0x0a3a8), P(0x0a3ac), P(0x0a3b0),
-	P(0x0a3b4), P(0x0a3b8), P(0x0a3bc), P(0x0a3c0), P(0x0a3c4),
-	P(0x0a3c8), P(0x0a3cc), P(0x0a3d0), P(0x0a3d4), P(0x0a3dc),
-	P(0x0a3e0), P(0x0a3e4), P(0x0a3e8), P(0x0a3ec), P(0x07800),
+	P(0x099a8), P(0x099ac), P(0x099b0), P(0x099b4), P(0x099c4),
+	P(0x099c8), P(0x099cc), P(0x099d0), P(0x099d4), P(0x099d8),
+	P(0x099dc), P(0x099e0), P(0x099e4), P(0x099e8), P(0x099ec),
+	P(0x099f0), P(0x099fc), P(0x0a208), P(0x0a210), P(0x0a214),
+	P(0x0a218), P(0x0a220), P(0x0a224), P(0x0a228), P(0x0a22c),
+	P(0x0a234), P(0x0a238), P(0x0a240), P(0x0a244), P(0x0a248),
+	P(0x0a24c), P(0x0a254), P(0x0a258), P(0x0a25c), P(0x0a260),
+	P(0x0a268), P(0x0a26c), P(0x0b26c), P(0x0d270), P(0x0a278),
+	P(0x0d35c), P(0x0d360), P(0x0d364), P(0x0d368), P(0x0d36c),
+	P(0x0d370), P(0x0d374), P(0x0d378), P(0x0d37c), P(0x0d380),
+	P(0x0d384), P(0x0a38c), P(0x0a390), P(0x0a394), P(0x0a398),
+	P(0x0a39c), P(0x0a3a0), P(0x0a3a4), P(0x0a3a8), P(0x0a3ac),
+	P(0x0a3b0), P(0x0a3b4), P(0x0a3b8), P(0x0a3bc), P(0x0a3c0),
+	P(0x0a3c4), P(0x0a3c8), P(0x0a3cc), P(0x0a3d0), P(0x0a3d4),
+	P(0x0a3dc), P(0x0a3e0), P(0x0a3e4), P(0x0a3e8), P(0x07800),
 	P(0x07804), P(0x07808), P(0x0780c), P(0x07810), P(0x07818),
 	P(0x07824), P(0x07828), P(0x0782c), P(0x07830), P(0x07834),
 	P(0x0783c), P(0x07848), P(0x0784c), P(0x07850), P(0x07854),
@@ -227,23 +223,24 @@ static const uint32_t ar9280_2_0_cm_vals[] = {
 	0x00000000, 0x01002310, 0x10000fff, 0x04900000, 0x04900000,
 	0x00000001, 0x00000004, 0x1e1f2022, 0x0a0b0c0d, 0x00000000,
 	0x9280c00a, 0x00020028, 0x5f3ca3de, 0x2108ecff, 0x14750604,
-	0x004b6a8e, 0x190fb515, 0x00000000, 0x00000001, 0x00000000,
+	0x004b6a8e, 0x190fb514, 0x00000000, 0x00000001, 0x00000000,
 	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
 	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001,
-	0x201fff00, 0x006f0000, 0x03051000, 0x00000820, 0x00000000,
-	0x00000000, 0xaaaaaaaa, 0x3c466478, 0x0cc80caa, 0x00000000,
-	0x00001042, 0x803e4788, 0x4080a333, 0x40206c10, 0x009c4060,
-	0x01834061, 0x00000400, 0x000003b5, 0x233f7180, 0x20202020,
-	0x20202020, 0x38490a20, 0x00007bb6, 0x0fff3ffc, 0x00000000,
-	0x00000000, 0x0cdbd380, 0x0f0f0f01, 0xdfa91f01, 0x00000000,
-	0x0e79e5c6, 0x0e79e5c6, 0x00820820, 0x1ce739ce, 0x07ffffef,
-	0x0fffffe7, 0x17ffffe5, 0x1fffffe4, 0x37ffffe3, 0x3fffffe3,
-	0x57ffffe3, 0x5fffffe2, 0x7fffffe2, 0x7f3c7bba, 0xf3307ff0,
-	0x20202020, 0x20202020, 0x1ce739ce, 0x000001ce, 0x00000001,
+	0x201fff00, 0x006f0000, 0x03051000, 0x00000820, 0x06336f77,
+	0x6af6532f, 0x08f186c8, 0x00046384, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0xaaaaaaaa, 0x3c466478, 0x0cc80caa,
+	0x00000000, 0x00001042, 0x803e4788, 0x4080a333, 0x40206c10,
+	0x009c4060, 0x01834061, 0x00000400, 0x000003b5, 0x233f7180,
+	0x20202020, 0x20202020, 0x38490a20, 0x00007bb6, 0x0fff3ffc,
+	0x00000000, 0x00000000, 0x0cdbd380, 0x0f0f0f01, 0xdfa91f01,
+	0x00000000, 0x0e79e5c6, 0x0e79e5c6, 0x00820820, 0x1ce739ce,
+	0x07ffffef, 0x0fffffe7, 0x17ffffe5, 0x1fffffe4, 0x37ffffe3,
+	0x3fffffe3, 0x57ffffe3, 0x5fffffe2, 0x7fffffe2, 0x7f3c7bba,
+	0xf3307ff0, 0x20202020, 0x20202020, 0x1ce739ce, 0x000001ce,
+	0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
 	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000246, 0x20202020, 0x20202020, 0x20202020, 0x1ce739ce,
-	0x000001ce, 0x00000000, 0x18c43433, 0x00f70081, 0x00040000,
+	0x00000000, 0x00000246, 0x20202020, 0x20202020, 0x20202020,
+	0x1ce739ce, 0x000001ce, 0x00000000, 0x18c43433, 0x00040000,
 	0xdb005012, 0x04924914, 0x21084210, 0x6d801300, 0x07e41000,
 	0x00040000, 0xdb005012, 0x04924914, 0x21084210, 0x6d801300,
 	0x07e40000, 0x00100000, 0x773f0567, 0x54214514, 0x12035828,
@@ -300,8 +297,9 @@ static const uint16_t ar9280_2_0_tx_gain_regs[] = {
 	P(0x0a30c), P(0x0a310), P(0x0a314), P(0x0a318), P(0x0a31c),
 	P(0x0a320), P(0x0a324), P(0x0a328), P(0x0a32c), P(0x0a330),
 	P(0x0a334), P(0x0a338), P(0x0a33c), P(0x0a340), P(0x0a344),
-	P(0x0a348), P(0x0a34c), P(0x0a350), P(0x0a354), P(0x07814),
-	P(0x07838), P(0x0781c), P(0x07840), P(0x07820), P(0x07844)
+	P(0x0a348), P(0x0a34c), P(0x0a350), P(0x0a354), P(0x0a3ec),
+	P(0x07814), P(0x07838), P(0x0781c), P(0x07840), P(0x07820),
+	P(0x07844)
 };
 
 static const uint32_t ar9280_2_0_tx_gain_vals_5g[] = {
@@ -309,8 +307,9 @@ static const uint32_t ar9280_2_0_tx_gain_vals_5g[] = {
 	0x0000a006, 0x0000e012, 0x00011014, 0x0001504a, 0x0001904c,
 	0x0001c04e, 0x00020092, 0x0002410a, 0x0002710c, 0x0002b18b,
 	0x0002e1cc, 0x000321ec, 0x000321ec, 0x000321ec, 0x000321ec,
-	0x000321ec, 0x000321ec, 0x000321ec, 0x000321ec, 0x0019beff,
-	0x0019beff, 0x00392000, 0x00392000, 0x92592480, 0x92592480
+	0x000321ec, 0x000321ec, 0x000321ec, 0x000321ec, 0x00f70081,
+	0x0019beff, 0x0019beff, 0x00392000, 0x00392000, 0x92592480,
+	0x92592480
 };
 
 static const uint32_t ar9280_2_0_tx_gain_vals_2g[] = {
@@ -318,8 +317,9 @@ static const uint32_t ar9280_2_0_tx_gain_vals_2g[] = {
 	0x0000b00b, 0x0000e012, 0x00012048, 0x0001604a, 0x0001a211,
 	0x0001e213, 0x0002121b, 0x00024412, 0x00028414, 0x0002b44a,
 	0x00030649, 0x0003364b, 0x00038a49, 0x0003be48, 0x0003ee4a,
-	0x00042e88, 0x00046e8a, 0x00049ec9, 0x0004bf42, 0x0019beff,
-	0x0019beff, 0x00392000, 0x00392000, 0x92592480, 0x92592480
+	0x00042e88, 0x00046e8a, 0x00049ec9, 0x0004bf42, 0x00f70081,
+	0x0019beff, 0x0019beff, 0x00392000, 0x00392000, 0x92592480,
+	0x92592480
 };
 
 static const struct athn_gain ar9280_2_0_tx_gain = {
@@ -334,8 +334,9 @@ static const uint32_t ar9280_2_0_tx_gain_high_power_vals_5g[] = {
 	0x0000a006, 0x0000e012, 0x00011014, 0x0001504a, 0x0001904c,
 	0x0001c04e, 0x00021092, 0x0002510a, 0x0002910c, 0x0002c18b,
 	0x0002f1cc, 0x000321eb, 0x000341ec, 0x000341ec, 0x000341ec,
-	0x000341ec, 0x000341ec, 0x000341ec, 0x000341ec, 0x00198eff,
-	0x00198eff, 0x00172000, 0x00172000, 0xf258a480, 0xf258a480
+	0x000341ec, 0x000341ec, 0x000341ec, 0x000341ec, 0x00f70081,
+	0x00198eff, 0x00198eff, 0x00172000, 0x00172000, 0xf258a480,
+	0xf258a480
 };
 
 static const uint32_t ar9280_2_0_tx_gain_high_power_vals_2g[] = {
@@ -343,8 +344,9 @@ static const uint32_t ar9280_2_0_tx_gain_high_power_vals_2g[] = {
 	0x0000c010, 0x00010012, 0x00013014, 0x0001820a, 0x0001b211,
 	0x0001e213, 0x00022411, 0x00025413, 0x00029811, 0x0002c813,
 	0x00030a14, 0x00035a50, 0x00039c4c, 0x0003de8a, 0x00042e92,
-	0x00046ed2, 0x0004bed5, 0x0004ff54, 0x00055fd5, 0x00198eff,
-	0x00198eff, 0x00172000, 0x00172000, 0xf258a480, 0xf258a480
+	0x00046ed2, 0x0004bed5, 0x0004ff54, 0x00055fd5, 0x00f70081,
+	0x00198eff, 0x00198eff, 0x00172000, 0x00172000, 0xf258a480,
+	0xf258a480
 };
 
 static const struct athn_gain ar9280_2_0_tx_gain_high_power = {
@@ -416,7 +418,7 @@ static const uint32_t ar9280_2_0_rx_gain_vals_5g[] = {
 };
 
 static const uint32_t ar9280_2_0_rx_gain_vals_2g[] = {
-	0x00000290, 0x00000300, 0x00000304, 0x00000308, 0x0000030c,
+	0x00008000, 0x00008000, 0x00008000, 0x00008000, 0x00008000,
 	0x00008000, 0x00008004, 0x00008008, 0x0000800c, 0x00008080,
 	0x00008084, 0x00008088, 0x0000808c, 0x00008100, 0x00008104,
 	0x00008108, 0x0000810c, 0x00008110, 0x00008114, 0x00008180,
@@ -555,23 +557,23 @@ static const uint32_t ar9280_2_0_rx_gain_23db_backoff_vals_2g[] = {
 	0x00008224, 0x00008290, 0x00008300, 0x00008304, 0x00008308,
 	0x0000830c, 0x00008380, 0x00008384, 0x00008700, 0x00008704,
 	0x00008708, 0x0000870c, 0x00008780, 0x00008784, 0x00008b00,
-	0x00008b04, 0x00008b08, 0x00008b0c, 0x00008b10, 0x00008b14,
-	0x00008b01, 0x00008b05, 0x00008b09, 0x00008b0d, 0x00008b11,
-	0x00008b15, 0x00008b02, 0x00008b06, 0x00008b0a, 0x00008b0e,
-	0x00008b12, 0x00008b16, 0x00008b03, 0x00008b07, 0x00008b0b,
-	0x00008b0f, 0x00008b13, 0x00008b17, 0x00008b23, 0x00008b27,
-	0x00008b2b, 0x00008b2f, 0x00008b33, 0x00008b37, 0x00008b43,
-	0x00008b47, 0x00008b4b, 0x00008b4f, 0x00008b53, 0x00008b57,
-	0x00008b5b, 0x00008b5b, 0x00008b5b, 0x00008b5b, 0x00008b5b,
-	0x00008b5b, 0x00008b5b, 0x00008b5b, 0x00008b5b, 0x00008b5b,
-	0x00008b5b, 0x00008b5b, 0x00008b5b, 0x00008b5b, 0x00008b5b,
-	0x00008b5b, 0x00008b5b, 0x00008b5b, 0x00008b5b, 0x00008b5b,
-	0x00008b5b, 0x00008b5b, 0x00008b5b, 0x00008b5b, 0x00008b5b,
-	0x00008b5b, 0x00008b5b, 0x00008b5b, 0x00008b5b, 0x00008b5b,
-	0x00008b5b, 0x00008b5b, 0x00008b5b, 0x00008b5b, 0x00008b5b,
-	0x00008b5b, 0x00008b5b, 0x00008b5b, 0x00008b5b, 0x00008b5b,
-	0x00008b5b, 0x00008b5b, 0x00008b5b, 0x00008b5b, 0x00008b5b,
-	0x00008b5b, 0x00008b5b, 0x00008b5b, 0x00001050, 0x00001050
+	0x00008b04, 0x00008b08, 0x00008b0c, 0x00008b10, 0x00008b80,
+	0x00008b84, 0x00008b88, 0x00008b8c, 0x00008b90, 0x00008b94,
+	0x00008b98, 0x00008ba4, 0x00008ba8, 0x00008bac, 0x00008bb0,
+	0x00008bb4, 0x00008ba1, 0x00008ba5, 0x00008ba9, 0x00008bad,
+	0x00008bb1, 0x00008bb5, 0x00008ba2, 0x00008ba6, 0x00008baa,
+	0x00008bae, 0x00008bb2, 0x00008bb6, 0x00008ba3, 0x00008ba7,
+	0x00008bab, 0x00008baf, 0x00008bb3, 0x00008bb7, 0x00008bc3,
+	0x00008bc7, 0x00008bcb, 0x00008bcf, 0x00008bd3, 0x00008bd7,
+	0x00008bdb, 0x00008bdb, 0x00008bdb, 0x00008bdb, 0x00008bdb,
+	0x00008bdb, 0x00008bdb, 0x00008bdb, 0x00008bdb, 0x00008bdb,
+	0x00008bdb, 0x00008bdb, 0x00008bdb, 0x00008bdb, 0x00008bdb,
+	0x00008bdb, 0x00008bdb, 0x00008bdb, 0x00008bdb, 0x00008bdb,
+	0x00008bdb, 0x00008bdb, 0x00008bdb, 0x00008bdb, 0x00008bdb,
+	0x00008bdb, 0x00008bdb, 0x00008bdb, 0x00008bdb, 0x00008bdb,
+	0x00008bdb, 0x00008bdb, 0x00008bdb, 0x00008bdb, 0x00008bdb,
+	0x00008bdb, 0x00008bdb, 0x00008bdb, 0x00008bdb, 0x00008bdb,
+	0x00008bdb, 0x00008bdb, 0x00008bdb, 0x00001055, 0x00001055
 };
 
 static const struct athn_gain ar9280_2_0_rx_gain_23db_backoff = {