Skip to content

K
Kernel

openeuler / Kernel
1 年多 前同步成功

通知 8
Star 0
Fork 0
K
Kernel
提交 5effb73c 编写于 作者: R Rafał Miłecki 提交者： John W. Linville
浏览文件
操作

b43: HT-PHY: Update values for frequency calibration 

Previous values were extracted from MMIO dump of some old 5.x driver,
new ones should improve calibration. This also adds values for 5 GHz.
Signed-off-by: NRafał Miłecki <zajec5@gmail.com>
Signed-off-by: NJohn W. Linville <linville@tuxdriver.com>
上级 1f21de53
隐藏空白更改
内联 并排
Showing with 248 addition and 66 deletion
drivers/net/wireless/b43/radio_2059.c
浏览文件 @ 5effb73c
...@@ -65,73 +65,87 @@ static u16 r2059_phy_rev1_init[][2] = { ...@@ -65,73 +65,87 @@ static u16 r2059_phy_rev1_init[][2] = {
.phy_regs.bw5 = r4, \ .phy_regs.bw5 = r4, \
.phy_regs.bw6 = r5 .phy_regs.bw6 = r5
/* Extracted from MMIO dump of 6.30.223.141
* TODO: Values for channels 12 & 13 are outdated (from some old 5.x driver)!
*/
static const struct b43_phy_ht_channeltab_e_radio2059 b43_phy_ht_channeltab_radio2059[] = { static const struct b43_phy_ht_channeltab_e_radio2059 b43_phy_ht_channeltab_radio2059[] = {
{ .freq = 2412, {
RADIOREGS(0x48, 0x16, 0x30, 0x1b, 0x0a, 0x0a, 0x30, 0x6c, .freq = 2412,
0x09, 0x0f, 0x0a, 0x00, 0x0a, 0x00, 0x61, 0x03, RADIOREGS(0x48, 0x16, 0x30, 0x1b, 0x0a, 0x0a, 0x30, 0x6c,
0x00, 0x00, 0x00, 0xf0, 0x00), 0x09, 0x0f, 0x0a, 0x00, 0x0a, 0x00, 0x61, 0x73,
PHYREGS(0x03c9, 0x03c5, 0x03c1, 0x043a, 0x043f, 0x0443), 0x00, 0x00, 0x00, 0xd0, 0x00),
}, PHYREGS(0x03c9, 0x03c5, 0x03c1, 0x043a, 0x043f, 0x0443),
{ .freq = 2417, },
RADIOREGS(0x4b, 0x16, 0x30, 0x1b, 0x0a, 0x0a, 0x30, 0x71, {
0x09, 0x0f, 0x0a, 0x00, 0x0a, 0x00, 0x61, 0x03, .freq = 2417,
0x00, 0x00, 0x00, 0xf0, 0x00), RADIOREGS(0x4b, 0x16, 0x30, 0x1b, 0x0a, 0x0a, 0x30, 0x71,
PHYREGS(0x03cb, 0x03c7, 0x03c3, 0x0438, 0x043d, 0x0441), 0x09, 0x0f, 0x0a, 0x00, 0x0a, 0x00, 0x61, 0x73,
}, 0x00, 0x00, 0x00, 0xd0, 0x00),
{ .freq = 2422, PHYREGS(0x03cb, 0x03c7, 0x03c3, 0x0438, 0x043d, 0x0441),
RADIOREGS(0x4e, 0x16, 0x30, 0x1b, 0x0a, 0x0a, 0x30, 0x76, },
0x09, 0x0f, 0x09, 0x00, 0x09, 0x00, 0x61, 0x03, {
0x00, 0x00, 0x00, 0xf0, 0x00), .freq = 2422,
PHYREGS(0x03cd, 0x03c9, 0x03c5, 0x0436, 0x043a, 0x043f), RADIOREGS(0x4e, 0x16, 0x30, 0x1b, 0x0a, 0x0a, 0x30, 0x76,
}, 0x09, 0x0f, 0x09, 0x00, 0x09, 0x00, 0x61, 0x73,
{ .freq = 2427, 0x00, 0x00, 0x00, 0xd0, 0x00),
RADIOREGS(0x52, 0x16, 0x30, 0x1b, 0x0a, 0x0a, 0x30, 0x7b, PHYREGS(0x03cd, 0x03c9, 0x03c5, 0x0436, 0x043a, 0x043f),
0x09, 0x0f, 0x09, 0x00, 0x09, 0x00, 0x61, 0x03, },
0x00, 0x00, 0x00, 0xf0, 0x00), {
PHYREGS(0x03cf, 0x03cb, 0x03c7, 0x0434, 0x0438, 0x043d), .freq = 2427,
}, RADIOREGS(0x52, 0x16, 0x30, 0x1b, 0x0a, 0x0a, 0x30, 0x7b,
{ .freq = 2432, 0x09, 0x0f, 0x09, 0x00, 0x09, 0x00, 0x61, 0x73,
RADIOREGS(0x55, 0x16, 0x30, 0x1b, 0x0a, 0x0a, 0x30, 0x80, 0x00, 0x00, 0x00, 0xa0, 0x00),
0x09, 0x0f, 0x08, 0x00, 0x08, 0x00, 0x61, 0x03, PHYREGS(0x03cf, 0x03cb, 0x03c7, 0x0434, 0x0438, 0x043d),
0x00, 0x00, 0x00, 0xf0, 0x00), },
PHYREGS(0x03d1, 0x03cd, 0x03c9, 0x0431, 0x0436, 0x043a), {
}, .freq = 2432,
{ .freq = 2437, RADIOREGS(0x55, 0x16, 0x30, 0x1b, 0x0a, 0x0a, 0x30, 0x80,
RADIOREGS(0x58, 0x16, 0x30, 0x1b, 0x0a, 0x0a, 0x30, 0x85, 0x09, 0x0f, 0x08, 0x00, 0x08, 0x00, 0x61, 0x73,
0x09, 0x0f, 0x08, 0x00, 0x08, 0x00, 0x61, 0x03, 0x00, 0x00, 0x00, 0xa0, 0x00),
0x00, 0x00, 0x00, 0xf0, 0x00), PHYREGS(0x03d1, 0x03cd, 0x03c9, 0x0431, 0x0436, 0x043a),
PHYREGS(0x03d3, 0x03cf, 0x03cb, 0x042f, 0x0434, 0x0438), },
}, {
{ .freq = 2442, .freq = 2437,
RADIOREGS(0x5c, 0x16, 0x30, 0x1b, 0x0a, 0x0a, 0x30, 0x8a, RADIOREGS(0x58, 0x16, 0x30, 0x1b, 0x0a, 0x0a, 0x30, 0x85,
0x09, 0x0f, 0x07, 0x00, 0x07, 0x00, 0x61, 0x03, 0x09, 0x0f, 0x08, 0x00, 0x08, 0x00, 0x61, 0x73,
0x00, 0x00, 0x00, 0xf0, 0x00), 0x00, 0x00, 0x00, 0xa0, 0x00),
PHYREGS(0x03d5, 0x03d1, 0x03cd, 0x042d, 0x0431, 0x0436), PHYREGS(0x03d3, 0x03cf, 0x03cb, 0x042f, 0x0434, 0x0438),
}, },
{ .freq = 2447, {
RADIOREGS(0x5f, 0x16, 0x30, 0x1b, 0x0a, 0x0a, 0x30, 0x8f, .freq = 2442,
0x09, 0x0f, 0x07, 0x00, 0x07, 0x00, 0x61, 0x03, RADIOREGS(0x5c, 0x16, 0x30, 0x1b, 0x0a, 0x0a, 0x30, 0x8a,
0x00, 0x00, 0x00, 0xf0, 0x00), 0x09, 0x0f, 0x07, 0x00, 0x07, 0x00, 0x61, 0x73,
PHYREGS(0x03d7, 0x03d3, 0x03cf, 0x042b, 0x042f, 0x0434), 0x00, 0x00, 0x00, 0x80, 0x00),
}, PHYREGS(0x03d5, 0x03d1, 0x03cd, 0x042d, 0x0431, 0x0436),
{ .freq = 2452, },
RADIOREGS(0x62, 0x16, 0x30, 0x1b, 0x0a, 0x0a, 0x30, 0x94, {
0x09, 0x0f, 0x07, 0x00, 0x07, 0x00, 0x61, 0x03, .freq = 2447,
0x00, 0x00, 0x00, 0xf0, 0x00), RADIOREGS(0x5f, 0x16, 0x30, 0x1b, 0x0a, 0x0a, 0x30, 0x8f,
PHYREGS(0x03d9, 0x03d5, 0x03d1, 0x0429, 0x042d, 0x0431), 0x09, 0x0f, 0x07, 0x00, 0x07, 0x00, 0x61, 0x73,
}, 0x00, 0x00, 0x00, 0x80, 0x00),
{ .freq = 2457, PHYREGS(0x03d7, 0x03d3, 0x03cf, 0x042b, 0x042f, 0x0434),
RADIOREGS(0x66, 0x16, 0x30, 0x1b, 0x0a, 0x0a, 0x30, 0x99, },
0x09, 0x0f, 0x06, 0x00, 0x06, 0x00, 0x61, 0x03, {
0x00, 0x00, 0x00, 0xf0, 0x00), .freq = 2452,
PHYREGS(0x03db, 0x03d7, 0x03d3, 0x0427, 0x042b, 0x042f), RADIOREGS(0x62, 0x16, 0x30, 0x1b, 0x0a, 0x0a, 0x30, 0x94,
}, 0x09, 0x0f, 0x07, 0x00, 0x07, 0x00, 0x61, 0x73,
{ .freq = 2462, 0x00, 0x00, 0x00, 0x80, 0x00),
RADIOREGS(0x69, 0x16, 0x30, 0x1b, 0x0a, 0x0a, 0x30, 0x9e, PHYREGS(0x03d9, 0x03d5, 0x03d1, 0x0429, 0x042d, 0x0431),
0x09, 0x0f, 0x06, 0x00, 0x06, 0x00, 0x61, 0x03, },
0x00, 0x00, 0x00, 0xf0, 0x00), {
PHYREGS(0x03dd, 0x03d9, 0x03d5, 0x0424, 0x0429, 0x042d), .freq = 2457,
}, RADIOREGS(0x66, 0x16, 0x30, 0x1b, 0x0a, 0x0a, 0x30, 0x99,
0x09, 0x0f, 0x06, 0x00, 0x06, 0x00, 0x61, 0x73,
0x00, 0x00, 0x00, 0x60, 0x00),
PHYREGS(0x03db, 0x03d7, 0x03d3, 0x0427, 0x042b, 0x042f),
},
{
.freq = 2462,
RADIOREGS(0x69, 0x16, 0x30, 0x1b, 0x0a, 0x0a, 0x30, 0x9e,
0x09, 0x0f, 0x06, 0x00, 0x06, 0x00, 0x61, 0x73,
0x00, 0x00, 0x00, 0x60, 0x00),
PHYREGS(0x03dd, 0x03d9, 0x03d5, 0x0424, 0x0429, 0x042d),
},
{ .freq = 2467, { .freq = 2467,
RADIOREGS(0x6c, 0x16, 0x30, 0x1b, 0x0a, 0x0a, 0x30, 0xa3, RADIOREGS(0x6c, 0x16, 0x30, 0x1b, 0x0a, 0x0a, 0x30, 0xa3,
0x09, 0x0f, 0x05, 0x00, 0x05, 0x00, 0x61, 0x03, 0x09, 0x0f, 0x05, 0x00, 0x05, 0x00, 0x61, 0x03,
...@@ -144,6 +158,174 @@ static const struct b43_phy_ht_channeltab_e_radio2059 b43_phy_ht_channeltab_radi ...@@ -144,6 +158,174 @@ static const struct b43_phy_ht_channeltab_e_radio2059 b43_phy_ht_channeltab_radi
0x00, 0x00, 0x00, 0xf0, 0x00), 0x00, 0x00, 0x00, 0xf0, 0x00),
PHYREGS(0x03e1, 0x03dd, 0x03d9, 0x0420, 0x0424, 0x0429), PHYREGS(0x03e1, 0x03dd, 0x03d9, 0x0420, 0x0424, 0x0429),
}, },
{
.freq = 5180,
RADIOREGS(0xbe, 0x16, 0x10, 0x1f, 0x08, 0x08, 0x3f, 0x06,
0x02, 0x0c, 0x00, 0x0c, 0x00, 0x0c, 0x00, 0x00,
0x0f, 0x4f, 0xa3, 0x00, 0xfc),
PHYREGS(0x081c, 0x0818, 0x0814, 0x01f9, 0x01fa, 0x01fb),
},
{
.freq = 5200,
RADIOREGS(0xc5, 0x16, 0x10, 0x1f, 0x08, 0x08, 0x3f, 0x08,
0x02, 0x0c, 0x00, 0x0c, 0x00, 0x0c, 0x00, 0x00,
0x0f, 0x4f, 0x93, 0x00, 0xfb),
PHYREGS(0x0824, 0x0820, 0x081c, 0x01f7, 0x01f8, 0x01f9),
},
{
.freq = 5220,
RADIOREGS(0xcc, 0x16, 0x10, 0x1f, 0x08, 0x08, 0x3f, 0x0a,
0x02, 0x0c, 0x00, 0x0c, 0x00, 0x0c, 0x00, 0x00,
0x0f, 0x4f, 0x93, 0x00, 0xea),
PHYREGS(0x082c, 0x0828, 0x0824, 0x01f5, 0x01f6, 0x01f7),
},
{
.freq = 5240,
RADIOREGS(0xd2, 0x16, 0x10, 0x1f, 0x08, 0x08, 0x3f, 0x0c,
0x02, 0x0c, 0x00, 0x0c, 0x00, 0x0c, 0x00, 0x00,
0x0f, 0x4f, 0x93, 0x00, 0xda),
PHYREGS(0x0834, 0x0830, 0x082c, 0x01f3, 0x01f4, 0x01f5),
},
{
.freq = 5260,
RADIOREGS(0xd9, 0x16, 0x10, 0x1f, 0x08, 0x08, 0x3f, 0x0e,
0x02, 0x0b, 0x00, 0x0b, 0x00, 0x0b, 0x00, 0x00,
0x0f, 0x4f, 0x93, 0x00, 0xca),
PHYREGS(0x083c, 0x0838, 0x0834, 0x01f1, 0x01f2, 0x01f3),
},
{
.freq = 5280,
RADIOREGS(0xe0, 0x16, 0x10, 0x1f, 0x08, 0x08, 0x3f, 0x10,
0x02, 0x0b, 0x00, 0x0b, 0x00, 0x0b, 0x00, 0x00,
0x0f, 0x4f, 0x93, 0x00, 0xb9),
PHYREGS(0x0844, 0x0840, 0x083c, 0x01f0, 0x01f0, 0x01f1),
},
{
.freq = 5300,
RADIOREGS(0xe6, 0x16, 0x10, 0x1f, 0x08, 0x08, 0x3f, 0x12,
0x02, 0x0b, 0x00, 0x0b, 0x00, 0x0b, 0x00, 0x00,
0x0f, 0x4c, 0x83, 0x00, 0xb8),
PHYREGS(0x084c, 0x0848, 0x0844, 0x01ee, 0x01ef, 0x01f0),
},
{
.freq = 5320,
RADIOREGS(0xed, 0x16, 0x10, 0x1f, 0x08, 0x08, 0x3f, 0x14,
0x02, 0x0b, 0x00, 0x0b, 0x00, 0x0b, 0x00, 0x00,
0x0f, 0x4c, 0x83, 0x00, 0xa8),
PHYREGS(0x0854, 0x0850, 0x084c, 0x01ec, 0x01ed, 0x01ee),
},
{
.freq = 5500,
RADIOREGS(0x29, 0x17, 0x10, 0x1f, 0x08, 0x08, 0x3f, 0x26,
0x02, 0x09, 0x00, 0x09, 0x00, 0x09, 0x00, 0x00,
0x0a, 0x46, 0x43, 0x00, 0x75),
PHYREGS(0x089c, 0x0898, 0x0894, 0x01dc, 0x01dd, 0x01dd),
},
{
.freq = 5520,
RADIOREGS(0x30, 0x17, 0x10, 0x1f, 0x08, 0x08, 0x3f, 0x28,
0x02, 0x08, 0x00, 0x08, 0x00, 0x08, 0x00, 0x00,
0x0a, 0x46, 0x43, 0x00, 0x75),
PHYREGS(0x08a4, 0x08a0, 0x089c, 0x01da, 0x01db, 0x01dc),
},
{
.freq = 5540,
RADIOREGS(0x36, 0x17, 0x10, 0x1f, 0x08, 0x08, 0x3f, 0x2a,
0x02, 0x08, 0x00, 0x08, 0x00, 0x08, 0x00, 0x00,
0x0a, 0x46, 0x43, 0x00, 0x75),
PHYREGS(0x08ac, 0x08a8, 0x08a4, 0x01d8, 0x01d9, 0x01da),
},
{
.freq = 5560,
RADIOREGS(0x3d, 0x17, 0x10, 0x1f, 0x08, 0x08, 0x3f, 0x2c,
0x02, 0x08, 0x00, 0x08, 0x00, 0x08, 0x00, 0x00,
0x0a, 0x46, 0x43, 0x00, 0x75),
PHYREGS(0x08b4, 0x08b0, 0x08ac, 0x01d7, 0x01d7, 0x01d8),
},
{
.freq = 5580,
RADIOREGS(0x44, 0x17, 0x10, 0x1f, 0x08, 0x08, 0x3f, 0x2e,
0x02, 0x08, 0x00, 0x08, 0x00, 0x08, 0x00, 0x00,
0x0a, 0x46, 0x43, 0x00, 0x74),
PHYREGS(0x08bc, 0x08b8, 0x08b4, 0x01d5, 0x01d6, 0x01d7),
},
{
.freq = 5600,
RADIOREGS(0x4a, 0x17, 0x10, 0x1f, 0x08, 0x08, 0x3f, 0x30,
0x02, 0x08, 0x00, 0x08, 0x00, 0x08, 0x00, 0x00,
0x09, 0x44, 0x23, 0x00, 0x54),
PHYREGS(0x08c4, 0x08c0, 0x08bc, 0x01d3, 0x01d4, 0x01d5),
},
{
.freq = 5620,
RADIOREGS(0x51, 0x17, 0x10, 0x1f, 0x08, 0x08, 0x3f, 0x32,
0x02, 0x07, 0x00, 0x07, 0x00, 0x07, 0x00, 0x00,
0x09, 0x44, 0x23, 0x00, 0x54),
PHYREGS(0x08cc, 0x08c8, 0x08c4, 0x01d2, 0x01d2, 0x01d3),
},
{
.freq = 5640,
RADIOREGS(0x58, 0x17, 0x10, 0x1f, 0x08, 0x08, 0x3f, 0x34,
0x02, 0x07, 0x00, 0x07, 0x00, 0x07, 0x00, 0x00,
0x09, 0x44, 0x23, 0x00, 0x43),
PHYREGS(0x08d4, 0x08d0, 0x08cc, 0x01d0, 0x01d1, 0x01d2),
},
{
.freq = 5660,
RADIOREGS(0x5e, 0x17, 0x10, 0x1f, 0x08, 0x08, 0x3f, 0x36,
0x02, 0x07, 0x00, 0x07, 0x00, 0x07, 0x00, 0x00,
0x09, 0x43, 0x23, 0x00, 0x43),
PHYREGS(0x08dc, 0x08d8, 0x08d4, 0x01ce, 0x01cf, 0x01d0),
},
{
.freq = 5680,
RADIOREGS(0x65, 0x17, 0x10, 0x1f, 0x08, 0x08, 0x3f, 0x38,
0x02, 0x07, 0x00, 0x07, 0x00, 0x07, 0x00, 0x00,
0x09, 0x42, 0x23, 0x00, 0x43),
PHYREGS(0x08e4, 0x08e0, 0x08dc, 0x01cd, 0x01ce, 0x01ce),
},
{
.freq = 5700,
RADIOREGS(0x6c, 0x17, 0x10, 0x1f, 0x08, 0x08, 0x3f, 0x3a,
0x02, 0x07, 0x00, 0x07, 0x00, 0x07, 0x00, 0x00,
0x08, 0x42, 0x13, 0x00, 0x32),
PHYREGS(0x08ec, 0x08e8, 0x08e4, 0x01cb, 0x01cc, 0x01cd),
},
{
.freq = 5745,
RADIOREGS(0x7b, 0x17, 0x20, 0x1f, 0x08, 0x08, 0x3f, 0x7d,
0x04, 0x06, 0x00, 0x06, 0x00, 0x06, 0x00, 0x00,
0x08, 0x42, 0x13, 0x00, 0x21),
PHYREGS(0x08fe, 0x08fa, 0x08f6, 0x01c8, 0x01c8, 0x01c9),
},
{
.freq = 5765,
RADIOREGS(0x81, 0x17, 0x20, 0x1f, 0x08, 0x08, 0x3f, 0x81,
0x04, 0x06, 0x00, 0x06, 0x00, 0x06, 0x00, 0x00,
0x08, 0x42, 0x13, 0x00, 0x11),
PHYREGS(0x0906, 0x0902, 0x08fe, 0x01c6, 0x01c7, 0x01c8),
},
{
.freq = 5785,
RADIOREGS(0x88, 0x17, 0x20, 0x1f, 0x08, 0x08, 0x3f, 0x85,
0x04, 0x05, 0x00, 0x05, 0x00, 0x05, 0x00, 0x00,
0x08, 0x42, 0x13, 0x00, 0x00),
PHYREGS(0x090e, 0x090a, 0x0906, 0x01c4, 0x01c5, 0x01c6),
},
{
.freq = 5805,
RADIOREGS(0x8f, 0x17, 0x20, 0x1f, 0x08, 0x08, 0x3f, 0x89,
0x04, 0x05, 0x00, 0x05, 0x00, 0x05, 0x00, 0x00,
0x06, 0x41, 0x03, 0x00, 0x00),
PHYREGS(0x0916, 0x0912, 0x090e, 0x01c3, 0x01c4, 0x01c4),
},
{
.freq = 5825,
RADIOREGS(0x95, 0x17, 0x20, 0x1f, 0x08, 0x08, 0x3f, 0x8d,
0x04, 0x05, 0x00, 0x05, 0x00, 0x05, 0x00, 0x00,
0x06, 0x41, 0x03, 0x00, 0x00),
PHYREGS(0x091e, 0x091a, 0x0916, 0x01c1, 0x01c2, 0x01c3),
},
}; };
void r2059_upload_inittabs(struct b43_wldev *dev) void r2059_upload_inittabs(struct b43_wldev *dev)
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或