Skip to content

L
linux
Commit a60f99f7 authored by Rafał Miłecki's avatar Rafał Miłecki Committed by John W. Linville
Browse files
Options

b43: update list and code making a selection of firmware files 

Clean ucode selection, fix choice of firmware for LCN, drop some goto-s,
add new devices.
Tested on 14e4:4312, 14e4:4315, 14e4:4328, 14e4:432b, 14e4:4353.
Signed-off-by: default avatarRafał Miłecki <zajec5@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent e5c3ef36
Show whitespace changes
Inline Side-by-side
Showing with 125 additions and 99 deletions
drivers/net/wireless/b43/main.c
View file @ a60f99f7
...@@ -2201,52 +2201,78 @@ int b43_do_request_fw(struct b43_request_fw_context *ctx, ...@@ -2201,52 +2201,78 @@ int b43_do_request_fw(struct b43_request_fw_context *ctx,
return -EPROTO; return -EPROTO;
} }
/* http://bcm-v4.sipsolutions.net/802.11/Init/Firmware */
static int b43_try_request_fw(struct b43_request_fw_context *ctx) static int b43_try_request_fw(struct b43_request_fw_context *ctx)
{ {
struct b43_wldev *dev = ctx->dev; struct b43_wldev *dev = ctx->dev;
struct b43_firmware *fw = &ctx->dev->fw; struct b43_firmware *fw = &ctx->dev->fw;
struct b43_phy *phy = &dev->phy;
const u8 rev = ctx->dev->dev->core_rev; const u8 rev = ctx->dev->dev->core_rev;
const char *filename; const char *filename;
u32 tmshigh;
int err; int err;
/* Files for HT and LCN were found by trying one by one */
/* Get microcode */ /* Get microcode */
if ((rev >= 5) && (rev <= 10)) { filename = NULL;
filename = "ucode5"; switch (rev) {
} else if ((rev >= 11) && (rev <= 12)) { case 42:
filename = "ucode11"; if (phy->type == B43_PHYTYPE_AC)
} else if (rev == 13) { filename = "ucode42";
filename = "ucode13";
} else if (rev == 14) {
filename = "ucode14";
} else if (rev == 15) {
filename = "ucode15";
} else {
switch (dev->phy.type) {
case B43_PHYTYPE_N:
if (rev >= 16)
filename = "ucode16_mimo";
else
goto err_no_ucode;
break; break;
case B43_PHYTYPE_HT: case 33:
if (rev == 29) if (phy->type == B43_PHYTYPE_LCN40)
filename = "ucode33_lcn40";
break;
case 30:
if (phy->type == B43_PHYTYPE_N)
filename = "ucode30_mimo";
break;
case 29:
if (phy->type == B43_PHYTYPE_HT)
filename = "ucode29_mimo"; filename = "ucode29_mimo";
else
goto err_no_ucode;
break; break;
case B43_PHYTYPE_LCN: case 26:
if (rev == 24) if (phy->type == B43_PHYTYPE_HT)
filename = "ucode24_mimo"; filename = "ucode26_mimo";
else break;
goto err_no_ucode; case 28:
case 25:
if (phy->type == B43_PHYTYPE_N)
filename = "ucode25_mimo";
else if (phy->type == B43_PHYTYPE_LCN)
filename = "ucode25_lcn";
break;
case 24:
if (phy->type == B43_PHYTYPE_LCN)
filename = "ucode24_lcn";
break;
case 23:
if (phy->type == B43_PHYTYPE_N)
filename = "ucode16_mimo";
break;
case 16 ... 19:
if (phy->type == B43_PHYTYPE_N)
filename = "ucode16_mimo";
else if (phy->type == B43_PHYTYPE_LP)
filename = "ucode16_lp";
break;
case 15:
filename = "ucode15";
break;
case 14:
filename = "ucode14";
break;
case 13:
filename = "ucode13";
break;
case 11 ... 12:
filename = "ucode11";
break;
case 5 ... 10:
filename = "ucode5";
break; break;
default:
goto err_no_ucode;
}
} }
if (!filename)
goto err_no_ucode;
err = b43_do_request_fw(ctx, filename, &fw->ucode, true); err = b43_do_request_fw(ctx, filename, &fw->ucode, true);
if (err) if (err)
goto err_load; goto err_load;
...@@ -2268,117 +2294,117 @@ static int b43_try_request_fw(struct b43_request_fw_context *ctx) ...@@ -2268,117 +2294,117 @@ static int b43_try_request_fw(struct b43_request_fw_context *ctx)
goto err_load; goto err_load;
/* Get initvals */ /* Get initvals */
filename = NULL;
switch (dev->phy.type) { switch (dev->phy.type) {
case B43_PHYTYPE_A:
if ((rev >= 5) && (rev <= 10)) {
tmshigh = ssb_read32(dev->dev->sdev, SSB_TMSHIGH);
if (tmshigh & B43_TMSHIGH_HAVE_2GHZ_PHY)
filename = "a0g1initvals5";
else
filename = "a0g0initvals5";
} else
goto err_no_initvals;
break;
case B43_PHYTYPE_G: case B43_PHYTYPE_G:
if ((rev >= 5) && (rev <= 10)) if (rev == 13)
filename = "b0g0initvals5";
else if (rev >= 13)
filename = "b0g0initvals13"; filename = "b0g0initvals13";
else else if (rev >= 5 && rev <= 10)
goto err_no_initvals; filename = "b0g0initvals5";
break; break;
case B43_PHYTYPE_N: case B43_PHYTYPE_N:
if (rev >= 16) if (rev == 30)
filename = "n16initvals30";
else if (rev == 28 || rev == 25)
filename = "n0initvals25";
else if (rev == 24)
filename = "n0initvals24";
else if (rev == 23)
filename = "n0initvals16"; /* What about n0initvals22? */
else if (rev >= 16 && rev <= 18)
filename = "n0initvals16"; filename = "n0initvals16";
else if ((rev >= 11) && (rev <= 12)) else if (rev >= 11 && rev <= 12)
filename = "n0initvals11"; filename = "n0initvals11";
else
goto err_no_initvals;
break; break;
case B43_PHYTYPE_LP: case B43_PHYTYPE_LP:
if (rev == 13) if (rev >= 16 && rev <= 18)
filename = "lp0initvals13"; filename = "lp0initvals16";
else if (rev == 15)
filename = "lp0initvals15";
else if (rev == 14) else if (rev == 14)
filename = "lp0initvals14"; filename = "lp0initvals14";
else if (rev >= 15) else if (rev == 13)
filename = "lp0initvals15"; filename = "lp0initvals13";
else
goto err_no_initvals;
break; break;
case B43_PHYTYPE_HT: case B43_PHYTYPE_HT:
if (rev == 29) if (rev == 29)
filename = "ht0initvals29"; filename = "ht0initvals29";
else else if (rev == 26)
goto err_no_initvals; filename = "ht0initvals26";
break; break;
case B43_PHYTYPE_LCN: case B43_PHYTYPE_LCN:
if (rev == 24) if (rev == 24)
filename = "lcn0initvals24"; filename = "lcn0initvals24";
else
goto err_no_initvals;
break; break;
default: case B43_PHYTYPE_LCN40:
goto err_no_initvals; if (rev == 33)
filename = "lcn400initvals33";
break;
case B43_PHYTYPE_AC:
if (rev == 42)
filename = "ac1initvals42";
break;
} }
if (!filename)
goto err_no_initvals;
err = b43_do_request_fw(ctx, filename, &fw->initvals, false); err = b43_do_request_fw(ctx, filename, &fw->initvals, false);
if (err) if (err)
goto err_load; goto err_load;
/* Get bandswitch initvals */ /* Get bandswitch initvals */
switch (dev->phy.type) {
case B43_PHYTYPE_A:
if ((rev >= 5) && (rev <= 10)) {
tmshigh = ssb_read32(dev->dev->sdev, SSB_TMSHIGH);
if (tmshigh & B43_TMSHIGH_HAVE_2GHZ_PHY)
filename = "a0g1bsinitvals5";
else
filename = "a0g0bsinitvals5";
} else if (rev >= 11)
filename = NULL; filename = NULL;
else switch (dev->phy.type) {
goto err_no_initvals;
break;
case B43_PHYTYPE_G: case B43_PHYTYPE_G:
if ((rev >= 5) && (rev <= 10)) if (rev == 13)
filename = "b0g0bsinitvals13";
else if (rev >= 5 && rev <= 10)
filename = "b0g0bsinitvals5"; filename = "b0g0bsinitvals5";
else if (rev >= 11)
filename = NULL;
else
goto err_no_initvals;
break; break;
case B43_PHYTYPE_N: case B43_PHYTYPE_N:
if (rev >= 16) if (rev == 30)
filename = "n16bsinitvals30";
else if (rev == 28 || rev == 25)
filename = "n0bsinitvals25";
else if (rev == 24)
filename = "n0bsinitvals24";
else if (rev == 23)
filename = "n0bsinitvals16"; /* What about n0bsinitvals22? */
else if (rev >= 16 && rev <= 18)
filename = "n0bsinitvals16"; filename = "n0bsinitvals16";
else if ((rev >= 11) && (rev <= 12)) else if (rev >= 11 && rev <= 12)
filename = "n0bsinitvals11"; filename = "n0bsinitvals11";
else
goto err_no_initvals;
break; break;
case B43_PHYTYPE_LP: case B43_PHYTYPE_LP:
if (rev == 13) if (rev >= 16 && rev <= 18)
filename = "lp0bsinitvals13"; filename = "lp0bsinitvals16";
else if (rev == 15)
filename = "lp0bsinitvals15";
else if (rev == 14) else if (rev == 14)
filename = "lp0bsinitvals14"; filename = "lp0bsinitvals14";
else if (rev >= 15) else if (rev == 13)
filename = "lp0bsinitvals15"; filename = "lp0bsinitvals13";
else
goto err_no_initvals;
break; break;
case B43_PHYTYPE_HT: case B43_PHYTYPE_HT:
if (rev == 29) if (rev == 29)
filename = "ht0bsinitvals29"; filename = "ht0bsinitvals29";
else else if (rev == 26)
goto err_no_initvals; filename = "ht0bsinitvals26";
break; break;
case B43_PHYTYPE_LCN: case B43_PHYTYPE_LCN:
if (rev == 24) if (rev == 24)
filename = "lcn0bsinitvals24"; filename = "lcn0bsinitvals24";
else
goto err_no_initvals;
break; break;
default: case B43_PHYTYPE_LCN40:
goto err_no_initvals; if (rev == 33)
filename = "lcn400bsinitvals33";
break;
case B43_PHYTYPE_AC:
if (rev == 42)
filename = "ac1bsinitvals42";
break;
} }
if (!filename)
goto err_no_initvals;
err = b43_do_request_fw(ctx, filename, &fw->initvals_band, false); err = b43_do_request_fw(ctx, filename, &fw->initvals_band, false);
if (err) if (err)
goto err_load; goto err_load;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7