diff options
| author | cinap_lenrek <cinap_lenrek@felloff.net> | 2017-02-16 20:03:41 +0100 |
|---|---|---|
| committer | cinap_lenrek <cinap_lenrek@felloff.net> | 2017-02-16 20:03:41 +0100 |
| commit | c1c644d13c14cfb39eb598658652d4df9d28764b (patch) | |
| tree | 1a958b0737ea275e5592d625f4dd82332f605217 /sys/src | |
| parent | b61799df43c4624225557d3ab4ccb4433f2ae5e2 (diff) | |
etheriwl: add support for Centrino Advanced-N 6030, 6235 (thanks khm, openbsd)
from openbsd driver, it seems the Centrino Advanced-N 6030 and 6235
cards share the same device revision as the 6205 (Type6005). Also
changing the device revision field from 4 to 5 bits.
Diffstat (limited to 'sys/src')
| -rw-r--r-- | sys/src/9/pc/etheriwl.c | 27 |
1 files changed, 20 insertions, 7 deletions
diff --git a/sys/src/9/pc/etheriwl.c b/sys/src/9/pc/etheriwl.c index 105bb44cc..a2e1c7046 100644 --- a/sys/src/9/pc/etheriwl.c +++ b/sys/src/9/pc/etheriwl.c @@ -399,11 +399,11 @@ enum { Type1000 = 6, Type6000 = 7, Type6050 = 8, - Type6005 = 11, + Type6005 = 11, /* also Centrino Advanced-N 6030, 6235 */ Type2030 = 12, }; -static char *fwname[16] = { +static char *fwname[32] = { [Type4965] "iwn-4965", [Type5300] "iwn-5000", [Type5350] "iwn-5000", @@ -412,7 +412,7 @@ static char *fwname[16] = { [Type1000] "iwn-1000", [Type6000] "iwn-6000", [Type6050] "iwn-6050", - [Type6005] "iwn-6005", + [Type6005] "iwn-6005", /* see in iwlattach() below */ [Type2030] "iwn-2030", }; @@ -2199,10 +2199,19 @@ iwlattach(Ether *edev) } if(ctlr->fw == nil){ - fw = readfirmware(fwname[ctlr->type]); + char *fn = fwname[ctlr->type]; + if(ctlr->type == Type6005){ + switch(ctlr->pdev->did){ + case 0x0082: /* Centrino Advanced-N 6205 */ + case 0x0085: /* Centrino Advanced-N 6205 */ + break; + default: /* Centrino Advanced-N 6030, 6235 */ + fn = "iwn-6030"; + } + } + fw = readfirmware(fn); print("#l%d: firmware: %s, rev %ux, build %ud, size %ux+%ux+%ux+%ux+%ux\n", - edev->ctlrno, - fwname[ctlr->type], + edev->ctlrno, fn, fw->rev, fw->build, fw->main.text.size, fw->main.data.size, fw->init.text.size, fw->init.data.size, @@ -2440,6 +2449,10 @@ iwlpci(void) case 0x0083: /* Centrino Wireless-N 1000 */ case 0x0887: /* Centrino Wireless-N 2230 */ case 0x0888: /* Centrino Wireless-N 2230 */ + case 0x0090: /* Centrino Advanced-N 6030 */ + case 0x0091: /* Centrino Advanced-N 6030 */ + case 0x088e: /* Centrino Advanced-N 6235 */ + case 0x088f: /* Centrino Advanced-N 6235 */ break; } @@ -2470,7 +2483,7 @@ iwlpci(void) } ctlr->nic = mem; ctlr->pdev = pdev; - ctlr->type = (csr32r(ctlr, Rev) >> 4) & 0xF; + ctlr->type = (csr32r(ctlr, Rev) >> 4) & 0x1F; if(fwname[ctlr->type] == nil){ print("iwl: unsupported controller type %d\n", ctlr->type); |