[PATCH v2 0/7] b43: complete N-PHY rev 8 + radio 2057 rev 8
Alessio Ferri
alessio.ferri at mythread.it
Sun May 24 14:34:48 PDT 2026
Add support for radio 2057 revision 8, paired with N-PHY rev 8 on
the Broadcom BCM6362 single-die integrated 2.4 GHz wireless block.
Three correlated changes are needed for the same chip:
- main.c: the radio_rev allow-list under B43_PHYTYPE_N currently
accepts radio 2057 revisions 9 and 14 only; extend to include
rev 8.
- radio_2057.c: the existing r2057_rev8_init[] is a 54-entry stub
declared inside a TODO comment block and never referenced
from r2057_upload_inittabs().
Replace it with the full 412-entry register set actually
programmed by the proprietary Broadcom wl driver on this radio.
I couldn't find the origin of the original 54-entry stub - 8
of its entries do not appear at all in the rev 8 register set
and 7 more carry different values.
Loading it instead of using the real table leaves the radio
hanging producing a "Microcode not responding" timeout.
- radio_2057.c: r2057_upload_inittabs() case 8 handles radio_rev
5 and 7 only; add the radio_rev == 8 branch pointing at the
new table.
The init table is extracted from an MMIO dump of the radio
register set programmed during proprietary driver initialisation
on BCM6362 silicon (Broadcom wl driver 6.30.102.7).
Assisted-by: Claude:claude-4.7-opus
Signed-off-by: Alessio Ferri <alessio.ferri at mythread.it>
---
drivers/net/wireless/broadcom/b43/main.c | 3 +-
drivers/net/wireless/broadcom/b43/radio_2057.c | 124
+++++++++++++++++++++---- 2 files changed, 110 insertions(+), 17
deletions(-)
diff --git a/drivers/net/wireless/broadcom/b43/main.c
b/drivers/net/wireless/broadcom/b43/main.c index 783af26cb..817448e58
100644 --- a/drivers/net/wireless/broadcom/b43/main.c
+++ b/drivers/net/wireless/broadcom/b43/main.c
@@ -4617,7 +4617,8 @@ static int b43_phy_versioning(struct b43_wldev
*dev) radio_id != 0x2057)
unsupported = 1;
if (radio_id == 0x2057 &&
- !(radio_rev == 9 || radio_rev == 14))
+ !(radio_rev == 8 || radio_rev == 9 ||
+ radio_rev == 14))
unsupported = 1;
break;
case B43_PHYTYPE_LP:
diff --git a/drivers/net/wireless/broadcom/b43/radio_2057.c
b/drivers/net/wireless/broadcom/b43/radio_2057.c index
bd7dafb56..9f693d92b 100644 ---
a/drivers/net/wireless/broadcom/b43/radio_2057.c +++
b/drivers/net/wireless/broadcom/b43/radio_2057.c @@ -73,24 +73,112 @@
static u16 r2057_rev7_init[][2] = { { 0x1B7, 0x05 }, { 0x1C2, 0xa0 },
};
-/* TODO: Which devices should use it?
+/* Extracted from MMIO dump of 6.30.102.7 */
static u16 r2057_rev8_init[][2] = {
- { 0x00, 0x08 }, { 0x01, 0x57 }, { 0x02, 0x20 }, { 0x31, 0x00 },
- { 0x32, 0x00 }, { 0x33, 0x00 }, { 0x51, 0x70 }, { 0x59, 0x88 },
- { 0x5C, 0x20 }, { 0x62, 0x33 }, { 0x63, 0x0f }, { 0x64, 0x0f },
- { 0x6E, 0x58 }, { 0x75, 0x13 }, { 0x7B, 0x13 }, { 0x7C, 0x0f },
- { 0x7D, 0xee }, { 0x81, 0x01 }, { 0x91, 0x3f }, { 0x92, 0x36 },
- { 0xA1, 0x20 }, { 0xC9, 0x01 }, { 0xD6, 0x70 }, { 0xDE, 0x88 },
- { 0xE1, 0x20 }, { 0xE8, 0x0f }, { 0xE9, 0x0f }, { 0xF3, 0x58 },
- { 0xFA, 0x13 }, { 0x100, 0x13 }, { 0x101, 0x0f }, { 0x102,
0xee },
- { 0x106, 0x01 }, { 0x116, 0x3f }, { 0x117, 0x36 }, { 0x126,
0x20 },
- { 0x14E, 0x01 }, { 0x15E, 0x00 }, { 0x15F, 0x00 }, { 0x160,
0x00 },
- { 0x161, 0x00 }, { 0x162, 0x00 }, { 0x163, 0x00 }, { 0x16A,
0x00 },
- { 0x16B, 0x00 }, { 0x16C, 0x00 }, { 0x1A4, 0x00 }, { 0x1A5,
0x00 },
- { 0x1A6, 0x00 }, { 0x1AA, 0x00 }, { 0x1AB, 0x00 }, { 0x1AC,
0x00 },
- { 0x1B7, 0x05 }, { 0x1C2, 0xa0 },
+ { 0x0000, 0x0008 }, { 0x0001, 0x0057 }, { 0x0002, 0x0020 }, {
0x0003, 0x001f },
+ { 0x0004, 0x0004 }, { 0x0005, 0x0002 }, { 0x0006, 0x0001 }, {
0x0007, 0x0001 },
+ { 0x0008, 0x0001 }, { 0x0009, 0x0069 }, { 0x000a, 0x0066 }, {
0x000b, 0x0006 },
+ { 0x000c, 0x0018 }, { 0x000d, 0x0003 }, { 0x000e, 0x0020 }, {
0x000f, 0x0020 },
+ { 0x0010, 0x0000 }, { 0x0011, 0x007c }, { 0x0012, 0x0042 }, {
0x0013, 0x00bd },
+ { 0x0014, 0x0007 }, { 0x0015, 0x0087 }, { 0x0016, 0x0008 }, {
0x0017, 0x0017 },
+ { 0x0018, 0x0007 }, { 0x0019, 0x0000 }, { 0x001a, 0x0002 }, {
0x001b, 0x0013 },
+ { 0x001c, 0x003e }, { 0x001d, 0x003e }, { 0x001e, 0x0096 }, {
0x001f, 0x0004 },
+ { 0x0020, 0x0000 }, { 0x0021, 0x0000 }, { 0x0022, 0x0017 }, {
0x0023, 0x0006 },
+ { 0x0024, 0x0001 }, { 0x0025, 0x0006 }, { 0x0026, 0x0004 }, {
0x0027, 0x000d },
+ { 0x0028, 0x000d }, { 0x0029, 0x0030 }, { 0x002a, 0x0032 }, {
0x002b, 0x0008 },
+ { 0x002c, 0x001c }, { 0x002d, 0x0002 }, { 0x002e, 0x0004 }, {
0x002f, 0x007f },
+ { 0x0030, 0x0027 }, { 0x0031, 0x0000 }, { 0x0032, 0x0000 }, {
0x0033, 0x0000 },
+ { 0x0034, 0x0000 }, { 0x0035, 0x0020 }, { 0x0036, 0x0018 }, {
0x0037, 0x0007 },
+ { 0x0038, 0x0066 }, { 0x0039, 0x0066 }, { 0x003a, 0x0066 }, {
0x003b, 0x0066 },
+ { 0x003c, 0x00ff }, { 0x003d, 0x00ff }, { 0x003e, 0x00ff }, {
0x003f, 0x00ff },
+ { 0x0040, 0x0016 }, { 0x0041, 0x0007 }, { 0x0042, 0x0029 }, {
0x0043, 0x0007 },
+ { 0x0044, 0x0006 }, { 0x0045, 0x0003 }, { 0x0046, 0x0001 }, {
0x0047, 0x0007 },
+ { 0x0048, 0x0088 }, { 0x0049, 0x0005 }, { 0x004a, 0x0077 }, {
0x004b, 0x0066 },
+ { 0x004c, 0x0066 }, { 0x004d, 0x0000 }, { 0x004e, 0x0004 }, {
0x004f, 0x000c },
+ { 0x0050, 0x0000 }, { 0x0051, 0x0070 }, { 0x0056, 0x0007 }, {
0x0057, 0x0000 },
+ { 0x0058, 0x0000 }, { 0x0059, 0x0088 }, { 0x005a, 0x0000 }, {
0x005b, 0x001f },
+ { 0x005c, 0x0020 }, { 0x005d, 0x0001 }, { 0x005e, 0x0030 }, {
0x005f, 0x0070 },
+ { 0x0060, 0x0000 }, { 0x0061, 0x0000 }, { 0x0062, 0x0033 }, {
0x0063, 0x000f },
+ { 0x0064, 0x0013 }, { 0x0065, 0x0000 }, { 0x0066, 0x00ee }, {
0x0069, 0x0000 },
+ { 0x006a, 0x007e }, { 0x006b, 0x003f }, { 0x006c, 0x007f }, {
0x006d, 0x0078 },
+ { 0x006e, 0x0058 }, { 0x006f, 0x0088 }, { 0x0070, 0x0008 }, {
0x0071, 0x000f },
+ { 0x0072, 0x00bc }, { 0x0073, 0x0008 }, { 0x0074, 0x0060 }, {
0x0075, 0x001a },
+ { 0x0076, 0x0070 }, { 0x0077, 0x0000 }, { 0x0078, 0x0000 }, {
0x0079, 0x0000 },
+ { 0x007a, 0x0033 }, { 0x007b, 0x001a }, { 0x007c, 0x0014 }, {
0x007d, 0x00ee },
+ { 0x0080, 0x003c }, { 0x0081, 0x0001 }, { 0x0082, 0x000a }, {
0x0083, 0x009d },
+ { 0x0084, 0x000a }, { 0x0085, 0x0000 }, { 0x0086, 0x0040 }, {
0x0087, 0x0040 },
+ { 0x0088, 0x0088 }, { 0x0089, 0x0010 }, { 0x008a, 0x00f0 }, {
0x008b, 0x0010 },
+ { 0x008c, 0x00f0 }, { 0x008d, 0x0000 }, { 0x008e, 0x0000 }, {
0x008f, 0x0010 },
+ { 0x0090, 0x0055 }, { 0x0091, 0x003f }, { 0x0092, 0x0036 }, {
0x0093, 0x0000 },
+ { 0x0094, 0x0000 }, { 0x0095, 0x0000 }, { 0x0096, 0x0087 }, {
0x0097, 0x0011 },
+ { 0x0098, 0x0000 }, { 0x0099, 0x0033 }, { 0x009a, 0x0088 }, {
0x009b, 0x0000 },
+ { 0x009c, 0x0087 }, { 0x009d, 0x0011 }, { 0x009e, 0x0000 }, {
0x009f, 0x0033 },
+ { 0x00a0, 0x0088 }, { 0x00a1, 0x0020 }, { 0x00a2, 0x003f }, {
0x00a3, 0x0044 },
+ { 0x00a4, 0x008c }, { 0x00a5, 0x006c }, { 0x00a6, 0x0022 }, {
0x00a7, 0x00be },
+ { 0x00a8, 0x0055 }, { 0x00aa, 0x000c }, { 0x00ab, 0x00aa }, {
0x00ac, 0x0002 },
+ { 0x00ad, 0x0000 }, { 0x00ae, 0x0010 }, { 0x00af, 0x0001 }, {
0x00b0, 0x0000 },
+ { 0x00b1, 0x0000 }, { 0x00b2, 0x0080 }, { 0x00b3, 0x0060 }, {
0x00b4, 0x0044 },
+ { 0x00b5, 0x0055 }, { 0x00b6, 0x0001 }, { 0x00b7, 0x0055 }, {
0x00b8, 0x0001 },
+ { 0x00b9, 0x0005 }, { 0x00ba, 0x0055 }, { 0x00bb, 0x0055 }, {
0x00c1, 0x0000 },
+ { 0x00c2, 0x0000 }, { 0x00c3, 0x0000 }, { 0x00c4, 0x0000 }, {
0x00c5, 0x0000 },
+ { 0x00c6, 0x0000 }, { 0x00c7, 0x0000 }, { 0x00c8, 0x0000 }, {
0x00c9, 0x0001 },
+ { 0x00ca, 0x0000 }, { 0x00cb, 0x0000 }, { 0x00cc, 0x0000 }, {
0x00cd, 0x0000 },
+ { 0x00ce, 0x005e }, { 0x00cf, 0x000c }, { 0x00d0, 0x000c }, {
0x00d1, 0x000c },
+ { 0x00d2, 0x0000 }, { 0x00d3, 0x002b }, { 0x00d4, 0x000c }, {
0x00d5, 0x0000 },
+ { 0x00d6, 0x0070 }, { 0x00db, 0x0007 }, { 0x00dc, 0x0000 }, {
0x00dd, 0x0000 },
+ { 0x00de, 0x0088 }, { 0x00df, 0x0000 }, { 0x00e0, 0x001f }, {
0x00e1, 0x0020 },
+ { 0x00e2, 0x0001 }, { 0x00e3, 0x0030 }, { 0x00e4, 0x0070 }, {
0x00e5, 0x0000 },
+ { 0x00e6, 0x0000 }, { 0x00e7, 0x0033 }, { 0x00e8, 0x000f }, {
0x00e9, 0x0013 },
+ { 0x00ea, 0x0000 }, { 0x00eb, 0x00ee }, { 0x00ee, 0x0000 }, {
0x00ef, 0x007e },
+ { 0x00f0, 0x003f }, { 0x00f1, 0x007f }, { 0x00f2, 0x0078 }, {
0x00f3, 0x0058 },
+ { 0x00f4, 0x0088 }, { 0x00f5, 0x0008 }, { 0x00f6, 0x000f }, {
0x00f7, 0x00bc },
+ { 0x00f8, 0x0008 }, { 0x00f9, 0x0060 }, { 0x00fa, 0x001a }, {
0x00fb, 0x0070 },
+ { 0x00fc, 0x0000 }, { 0x00fd, 0x0000 }, { 0x00fe, 0x0000 }, {
0x00ff, 0x0033 },
+ { 0x0100, 0x001a }, { 0x0101, 0x0014 }, { 0x0102, 0x00ee }, {
0x0105, 0x003c },
+ { 0x0106, 0x0001 }, { 0x0107, 0x000a }, { 0x0108, 0x009d }, {
0x0109, 0x000a },
+ { 0x010a, 0x0000 }, { 0x010b, 0x0040 }, { 0x010c, 0x0040 }, {
0x010d, 0x0088 },
+ { 0x010e, 0x0010 }, { 0x010f, 0x00f0 }, { 0x0110, 0x0010 }, {
0x0111, 0x00f0 },
+ { 0x0112, 0x0000 }, { 0x0113, 0x0000 }, { 0x0114, 0x0010 }, {
0x0115, 0x0055 },
+ { 0x0116, 0x003f }, { 0x0117, 0x0036 }, { 0x0118, 0x0000 }, {
0x0119, 0x0000 },
+ { 0x011a, 0x0000 }, { 0x011b, 0x0087 }, { 0x011c, 0x0011 }, {
0x011d, 0x0000 },
+ { 0x011e, 0x0033 }, { 0x011f, 0x0088 }, { 0x0120, 0x0000 }, {
0x0121, 0x0087 },
+ { 0x0122, 0x0011 }, { 0x0123, 0x0000 }, { 0x0124, 0x0033 }, {
0x0125, 0x0088 },
+ { 0x0126, 0x0020 }, { 0x0127, 0x003f }, { 0x0128, 0x0044 }, {
0x0129, 0x008c },
+ { 0x012a, 0x006c }, { 0x012b, 0x0022 }, { 0x012c, 0x00be }, {
0x012d, 0x0055 },
+ { 0x012f, 0x000c }, { 0x0130, 0x00aa }, { 0x0131, 0x0002 }, {
0x0132, 0x0000 },
+ { 0x0133, 0x0010 }, { 0x0134, 0x0001 }, { 0x0135, 0x0000 }, {
0x0136, 0x0000 },
+ { 0x0137, 0x0080 }, { 0x0138, 0x0060 }, { 0x0139, 0x0044 }, {
0x013a, 0x0055 },
+ { 0x013b, 0x0001 }, { 0x013c, 0x0055 }, { 0x013d, 0x0001 }, {
0x013e, 0x0005 },
+ { 0x013f, 0x0055 }, { 0x0140, 0x0055 }, { 0x0146, 0x0000 }, {
0x0147, 0x0000 },
+ { 0x0148, 0x0000 }, { 0x0149, 0x0000 }, { 0x014a, 0x0000 }, {
0x014b, 0x0000 },
+ { 0x014c, 0x0000 }, { 0x014d, 0x0000 }, { 0x014e, 0x0001 }, {
0x014f, 0x0000 },
+ { 0x0150, 0x0000 }, { 0x0151, 0x0000 }, { 0x0154, 0x000c }, {
0x0155, 0x000c },
+ { 0x0156, 0x000c }, { 0x0157, 0x0000 }, { 0x0158, 0x002b }, {
0x0159, 0x0084 },
+ { 0x015a, 0x0015 }, { 0x015b, 0x000f }, { 0x015c, 0x0000 }, {
0x015d, 0x0000 },
+ { 0x015e, 0x0000 }, { 0x015f, 0x0000 }, { 0x0160, 0x0000 }, {
0x0161, 0x0000 },
+ { 0x0162, 0x0000 }, { 0x0163, 0x0000 }, { 0x0164, 0x0000 }, {
0x0165, 0x0000 },
+ { 0x0166, 0x0000 }, { 0x0167, 0x0000 }, { 0x0168, 0x0000 }, {
0x0169, 0x0000 },
+ { 0x016a, 0x0000 }, { 0x016b, 0x0000 }, { 0x016c, 0x0000 }, {
0x016d, 0x0000 },
+ { 0x0170, 0x0000 }, { 0x0171, 0x0077 }, { 0x0172, 0x0077 }, {
0x0173, 0x0077 },
+ { 0x0174, 0x0077 }, { 0x0175, 0x0000 }, { 0x0176, 0x0003 }, {
0x0177, 0x0037 },
+ { 0x0178, 0x0003 }, { 0x0179, 0x0000 }, { 0x017a, 0x0021 }, {
0x017b, 0x0002 },
+ { 0x017c, 0x0000 }, { 0x017d, 0x00aa }, { 0x017e, 0x0000 }, {
0x017f, 0x00aa },
+ { 0x0180, 0x0000 }, { 0x0190, 0x0000 }, { 0x0191, 0x0077 }, {
0x0192, 0x0077 },
+ { 0x0193, 0x0077 }, { 0x0194, 0x0077 }, { 0x0195, 0x0000 }, {
0x0196, 0x0003 },
+ { 0x0197, 0x0037 }, { 0x0198, 0x0003 }, { 0x0199, 0x0000 }, {
0x019a, 0x0021 },
+ { 0x019b, 0x0002 }, { 0x019c, 0x0000 }, { 0x019d, 0x00aa }, {
0x019e, 0x0000 },
+ { 0x019f, 0x00aa }, { 0x01a0, 0x0000 }, { 0x01a1, 0x0002 }, {
0x01a2, 0x000f },
+ { 0x01a3, 0x000f }, { 0x01a4, 0x0000 }, { 0x01a5, 0x0000 }, {
0x01a6, 0x0000 },
+ { 0x01a7, 0x0002 }, { 0x01a8, 0x000f }, { 0x01a9, 0x000f }, {
0x01aa, 0x0000 },
+ { 0x01ab, 0x0000 }, { 0x01ac, 0x0000 }, { 0x01ad, 0x0084 }, {
0x01ae, 0x0060 },
+ { 0x01af, 0x0047 }, { 0x01b0, 0x0047 }, { 0x01b1, 0x0000 }, {
0x01b2, 0x0000 },
+ { 0x01b3, 0x0000 }, { 0x01b4, 0x0000 }, { 0x01b5, 0x0000 }, {
0x01b6, 0x0000 },
+ { 0x01b7, 0x0005 }, { 0x01b8, 0x0000 }, { 0x01b9, 0x0000 }, {
0x01ba, 0x0000 },
+ { 0x01bb, 0x0000 }, { 0x01bc, 0x0000 }, { 0x01bd, 0x0000 }, {
0x01be, 0x0000 },
+ { 0x01bf, 0x0000 }, { 0x01c0, 0x0000 }, { 0x01c1, 0x0000 }, {
0x01c2, 0x00a0 },
+ { 0x01c3, 0x0000 }, { 0x01c4, 0x0000 }, { 0x01c5, 0x0000 }, {
0x01c6, 0x0000 },
+ { 0x01c7, 0x0000 }, { 0x01c8, 0x0000 }, { 0x01c9, 0x0000 }, {
0x01ca, 0x0000 }, };
-*/
/* Extracted from MMIO dump of 6.30.223.141 */
static u16 r2057_rev9_init[][2] = {
@@ -539,6 +627,10 @@ void r2057_upload_inittabs(struct b43_wldev *dev)
} else if (phy->radio_rev == 7) {
table = r2057_rev7_init[0];
size = ARRAY_SIZE(r2057_rev7_init);
+ } else if (phy->radio_rev == 8) {
+ /* BCM6362 single-die 2.4 GHz. */
+ table = r2057_rev8_init[0];
+ size = ARRAY_SIZE(r2057_rev8_init);
}
break;
case 9:
--
2.54.0
More information about the b43-dev
mailing list