Add support for Intel 6235 WiFi:
iwn0 at pci2 dev 0 function 0 "Intel Centrino Advanced-N 6235" rev 0x24: msi,
MIMO 2T2R, AGN, address c4:85:08:35:55:f7
Requires newer iwn-6030 firmware that I recently added to the
iwn-firmware package. Trying to configure Bluetooth coexistence
kills the device (unrecoverable firmware error) and I couldn't
understand all of the voodoo that the Linux driver does to deal with
this, so I just disabled it. I don't think our Bluetooth stuff
works anyway.
Index: dev/pci/if_iwn.c
===================================================================
RCS file: /cvs/src/sys/dev/pci/if_iwn.c,v
retrieving revision 1.114
diff -u -p -u -p -r1.114 if_iwn.c
--- dev/pci/if_iwn.c 12 Oct 2012 19:53:24 -0000 1.114
+++ dev/pci/if_iwn.c 11 Nov 2012 04:31:39 -0000
@@ -90,7 +90,8 @@ static const struct pci_matchid iwn_devi
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_1030_1 },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_1030_2 },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_100_1 },
- { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_100_2 }
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_100_2 },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_6235_1 },
};
int iwn_match(struct device *, void *, void *);
@@ -638,7 +639,11 @@ iwn5000_attach(struct iwn_softc *sc, pci
break;
case IWN_HW_REV_TYPE_6005:
sc->limits = &iwn6000_sensitivity_limits;
- sc->fwname = "iwn-6005";
+ if (pid == PCI_PRODUCT_INTEL_WL_6235_1) {
+ sc->fwname = "iwn-6030";
+ sc->sc_flags |= IWN_FLAG_NO_BT_COEX;
+ } else
+ sc->fwname = "iwn-6005";
break;
default:
printf(": adapter type %d not supported\n", sc->hw_type);
@@ -4191,12 +4196,14 @@ iwn_config(struct iwn_softc *sc)
}
}
- /* Configure bluetooth coexistence. */
- error = iwn_send_btcoex(sc);
- if (error != 0) {
- printf("%s: could not configure bluetooth coexistence\n",
- sc->sc_dev.dv_xname);
- return error;
+ if (!(sc->sc_flags & IWN_FLAG_NO_BT_COEX)) {
+ /* Configure bluetooth coexistence. */
+ error = iwn_send_btcoex(sc);
+ if (error != 0) {
+ printf("%s: could not configure bluetooth
coexistence\n",
+ sc->sc_dev.dv_xname);
+ return error;
+ }
}
/* Set mode, channel, RX filter and enable RX. */
Index: dev/pci/if_iwnvar.h
===================================================================
RCS file: /cvs/src/sys/dev/pci/if_iwnvar.h,v
retrieving revision 1.22
diff -u -p -u -p -r1.22 if_iwnvar.h
--- dev/pci/if_iwnvar.h 9 Jan 2011 15:45:37 -0000 1.22
+++ dev/pci/if_iwnvar.h 11 Nov 2012 04:31:39 -0000
@@ -201,6 +201,7 @@ struct iwn_softc {
#define IWN_FLAG_BUSY (1 << 5)
#define IWN_FLAG_HAS_11N (1 << 6)
#define IWN_FLAG_ENH_SENS (1 << 7)
+#define IWN_FLAG_NO_BT_COEX (1 << 8)
uint8_t hw_type;
OpenBSD 5.2-current (GENERIC.MP) #60: Sat Nov 10 22:29:29 CST 2012
j...@zen.superblock.net:/usr/src/sys/arch/amd64/compile/GENERIC.MP
real mem = 4173500416 (3980MB)
avail mem = 4040249344 (3853MB)
mainbus0 at root
bios0 at mainbus0: SMBIOS rev. 2.7 @ 0xeba60 (23 entries)
bios0: vendor American Megatrends Inc. version "UX21A.209" date 06/06/2012
bios0: ASUSTeK COMPUTER INC. UX21A
acpi0 at bios0: rev 2
acpi0: sleep states S0 S3 S4 S5
acpi0: tables DSDT FACP APIC FPDT ECDT MCFG SSDT SSDT SSDT SSDT SLIC HPET SSDT
SSDT DMAR
acpi0: wakeup devices P0P1(S4) PEG0(S4) PEG1(S4) PEG2(S4) PEG3(S4) USB1(S3)
USB2(S3) USB3(S3) USB4(S3) EHC2(S3) USB5(S3) USB6(S3) USB7(S3) HDEF(S4)
RP01(S4) RP02(S4) WLAN(S3) RP03(S4) RP04(S4) RP05(S4) RP06(S4) RP07(S4)
RP08(S4) EHC1(S3) XHC1(S3) XHC_(S4) SLPB(S4)
acpitimer0 at acpi0: 3579545 Hz, 24 bits
acpimadt0 at acpi0 addr 0xfee00000: PC-AT compat
cpu0 at mainbus0: apid 0 (boot processor)
cpu0: Intel(R) Core(TM) i5-3317U CPU @ 1.70GHz, 1596.59 MHz
cpu0:
FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,EST,TM2,SSSE3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,x2APIC,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,NXE,LONG,LAHF,PERF,ITSC,FSGSBASE,SMEP,ERMS
cpu0: 256KB 64b/line 8-way L2 cache
cpu0: apic clock running at 99MHz
cpu1 at mainbus0: apid 2 (application processor)
cpu1: Intel(R) Core(TM) i5-3317U CPU @ 1.70GHz, 1596.38 MHz
cpu1:
FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,EST,TM2,SSSE3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,x2APIC,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,NXE,LONG,LAHF,PERF,ITSC,FSGSBASE,SMEP,ERMS
cpu1: 256KB 64b/line 8-way L2 cache
cpu2 at mainbus0: apid 1 (application processor)
cpu2: Intel(R) Core(TM) i5-3317U CPU @ 1.70GHz, 1596.38 MHz
cpu2:
FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,EST,TM2,SSSE3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,x2APIC,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,NXE,LONG,LAHF,PERF,ITSC,FSGSBASE,SMEP,ERMS
cpu2: 256KB 64b/line 8-way L2 cache
cpu3 at mainbus0: apid 3 (application processor)
cpu3: Intel(R) Core(TM) i5-3317U CPU @ 1.70GHz, 1596.38 MHz
cpu3:
FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,EST,TM2,SSSE3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,x2APIC,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,NXE,LONG,LAHF,PERF,ITSC,FSGSBASE,SMEP,ERMS
cpu3: 256KB 64b/line 8-way L2 cache
ioapic0 at mainbus0: apid 2 pa 0xfec00000, version 20, 24 pins
acpiec0 at acpi0
acpimcfg0 at acpi0 addr 0xf8000000, bus 0-63
acpihpet0 at acpi0: 14318179 Hz
acpiprt0 at acpi0: bus 0 (PCI0)
acpiprt1 at acpi0: bus -1 (P0P1)
acpiprt2 at acpi0: bus -1 (PEG0)
acpiprt3 at acpi0: bus -1 (PEG1)
acpiprt4 at acpi0: bus -1 (PEG2)
acpiprt5 at acpi0: bus -1 (PEG3)
acpiprt6 at acpi0: bus 1 (RP01)
acpiprt7 at acpi0: bus 2 (RP02)
acpiprt8 at acpi0: bus -1 (RP03)
acpiprt9 at acpi0: bus -1 (RP04)
acpiprt10 at acpi0: bus -1 (RP05)
acpiprt11 at acpi0: bus -1 (RP06)
acpiprt12 at acpi0: bus -1 (RP07)
acpiprt13 at acpi0: bus -1 (RP08)
acpicpu0 at acpi0: C2, C1, PSS
acpicpu1 at acpi0: C2, C1, PSS
acpicpu2 at acpi0: C2, C1, PSS
acpicpu3 at acpi0: C2, C1, PSS
acpitz0 at acpi0acpitz0: THRM: failed to read _CRT
: no critical temperature defined
acpiac0 at acpi0: AC unit in unknown state
acpibat0 at acpi0: BAT0 not present
acpibtn0 at acpi0: LID_
acpibtn1 at acpi0: PWRB
acpibtn2 at acpi0: SLPB
acpivideo0 at acpi0: GFX0
acpivout0 at acpivideo0: LCDD
[\\_SB_.PCI0.LPCB.EC0_.PWAC] 0xffff8000001cd188 cnt:02 stk:00 buffer: 40 {1d,
2e, 3b, 48, 55, 61, 6e, 7b, 9a, c5, ff, ff, ff, ff, ff, ff, 21, 2e, 3b, 48, 55,
61, 6e, 7b, 9a, c5, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff,
ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff,
ff, ff, ff}
XXX: Index out of bounds 3818/64
[\\_SB_.PCI0.LPCB.EC0_.PWAC] 0xffff8000001cd188 cnt:02 stk:00 buffer: 40 {1d,
2e, 3b, 48, 55, 61, 6e, 7b, 9a, c5, ff, ff, ff, ff, ff, ff, 21, 2e, 3b, 48, 55,
61, 6e, 7b, 9a, c5, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff,
ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff,
ff, ff, ff}
XXX: Index out of bounds 3817/64
[\\_SB_.PCI0.LPCB.EC0_.PWAC] 0xffff8000001cd188 cnt:02 stk:00 buffer: 40 {1d,
2e, 3b, 48, 55, 61, 6e, 7b, 9a, c5, ff, ff, ff, ff, ff, ff, 21, 2e, 3b, 48, 55,
61, 6e, 7b, 9a, c5, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff,
ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff,
ff, ff, ff}
XXX: Index out of bounds 3816/64
[\\_SB_.PCI0.LPCB.EC0_.PWAC] 0xffff8000001cd188 cnt:02 stk:00 buffer: 40 {1d,
2e, 3b, 48, 55, 61, 6e, 7b, 9a, c5, ff, ff, ff, ff, ff, ff, 21, 2e, 3b, 48, 55,
61, 6e, 7b, 9a, c5, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff,
ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff,
ff, ff, ff}
XXX: Index out of bounds 3815/64
[\\_SB_.PCI0.LPCB.EC0_.PWAC] 0xffff8000001cd188 cnt:02 stk:00 buffer: 40 {1d,
2e, 3b, 48, 55, 61, 6e, 7b, 9a, c5, ff, ff, ff, ff, ff, ff, 21, 2e, 3b, 48, 55,
61, 6e, 7b, 9a, c5, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff,
ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff,
ff, ff, ff}
XXX: Index out of bounds 3814/64
[\\_SB_.PCI0.LPCB.EC0_.PWAC] 0xffff8000001cd188 cnt:02 stk:00 buffer: 40 {1d,
2e, 3b, 48, 55, 61, 6e, 7b, 9a, c5, ff, ff, ff, ff, ff, ff, 21, 2e, 3b, 48, 55,
61, 6e, 7b, 9a, c5, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff,
ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff,
ff, ff, ff}
XXX: Index out of bounds 3813/64
[\\_SB_.PCI0.LPCB.EC0_.PWAC] 0xffff8000001cd188 cnt:02 stk:00 buffer: 40 {1d,
2e, 3b, 48, 55, 61, 6e, 7b, 9a, c5, ff, ff, ff, ff, ff, ff, 21, 2e, 3b, 48, 55,
61, 6e, 7b, 9a, c5, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff,
ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff,
ff, ff, ff}
XXX: Index out of bounds 3812/64
[\\_SB_.PCI0.LPCB.EC0_.PWAC] 0xffff8000001cd188 cnt:02 stk:00 buffer: 40 {1d,
2e, 3b, 48, 55, 61, 6e, 7b, 9a, c5, ff, ff, ff, ff, ff, ff, 21, 2e, 3b, 48, 55,
61, 6e, 7b, 9a, c5, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff,
ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff,
ff, ff, ff}
XXX: Index out of bounds 3811/64
[\\_SB_.PCI0.LPCB.EC0_.PWAC] 0xffff8000001cd188 cnt:02 stk:00 buffer: 40 {1d,
2e, 3b, 48, 55, 61, 6e, 7b, 9a, c5, ff, ff, ff, ff, ff, ff, 21, 2e, 3b, 48, 55,
61, 6e, 7b, 9a, c5, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff,
ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff,
ff, ff, ff}
XXX: Index out of bounds 3810/64
[\\_SB_.PCI0.LPCB.EC0_.PWAC] 0xffff8000001cd188 cnt:02 stk:00 buffer: 40 {1d,
2e, 3b, 48, 55, 61, 6e, 7b, 9a, c5, ff, ff, ff, ff, ff, ff, 21, 2e, 3b, 48, 55,
61, 6e, 7b, 9a, c5, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff,
ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff,
ff, ff, ff}
XXX: Index out of bounds 3809/64
[\\_SB_.PCI0.LPCB.EC0_.PWAC] 0xffff8000001cd188 cnt:02 stk:00 buffer: 40 {1d,
2e, 3b, 48, 55, 61, 6e, 7b, 9a, c5, ff, ff, ff, ff, ff, ff, 21, 2e, 3b, 48, 55,
61, 6e, 7b, 9a, c5, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff,
ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff, ff,
ff, ff, ff}
XXX: Index out of bounds 3808/64
cpu0: Enhanced SpeedStep 1596 MHz: speeds: 1701, 1700, 1600, 1500, 1400, 1300,
1200, 1100, 1000, 900, 800 MHz
pci0 at mainbus0 bus 0
pchb0 at pci0 dev 0 function 0 "Intel Core 3G Host" rev 0x09
vga1 at pci0 dev 2 function 0 "Intel HD Graphics 4000" rev 0x09
wsdisplay0 at vga1 mux 1: console (80x25, vt100 emulation)
wsdisplay0: screen 1-5 added (80x25, vt100 emulation)
intagp0 at vga1
agp0 at intagp0: aperture at 0xe0000000, size 0x10000000
inteldrm0 at vga1: apic 2 int 16
drm0 at inteldrm0
vendor "Intel", unknown product 0x0153 (class DASP subclass miscellaneous, rev
0x09) at pci0 dev 4 function 0 not configured
"Intel 7 Series xHCI" rev 0x04 at pci0 dev 20 function 0 not configured
"Intel 7 Series MEI" rev 0x04 at pci0 dev 22 function 0 not configured
ehci0 at pci0 dev 26 function 0 "Intel 7 Series USB" rev 0x04: apic 2 int 16
usb0 at ehci0: USB revision 2.0
uhub0 at usb0 "Intel EHCI root hub" rev 2.00/1.00 addr 1
azalia0 at pci0 dev 27 function 0 "Intel 7 Series HD Audio" rev 0x04: msi
azalia0: codecs: Realtek ALC269, Intel/0x2806, using Realtek ALC269
audio0 at azalia0
ppb0 at pci0 dev 28 function 0 "Intel 7 Series PCIE" rev 0xc4: msi
pci1 at ppb0 bus 1
ppb1 at pci0 dev 28 function 1 "Intel 7 Series PCIE" rev 0xc4: msi
pci2 at ppb1 bus 2
iwn0 at pci2 dev 0 function 0 "Intel Centrino Advanced-N 6235" rev 0x24: msi,
MIMO 2T2R, AGN, address c4:85:08:35:55:f7
ehci1 at pci0 dev 29 function 0 "Intel 7 Series USB" rev 0x04: apic 2 int 23
usb1 at ehci1: USB revision 2.0
uhub1 at usb1 "Intel EHCI root hub" rev 2.00/1.00 addr 1
pcib0 at pci0 dev 31 function 0 "Intel HM76 LPC" rev 0x04
ahci0 at pci0 dev 31 function 2 "Intel 7 Series AHCI" rev 0x04: msi, AHCI 1.3
scsibus0 at ahci0: 32 targets
sd0 at scsibus0 targ 0 lun 0: <ATA, SanDisk SSD U100, 10.5> SCSI3 0/direct
fixed naa.5001b4477dbd0d01
sd0: 118255MB, 512 bytes/sector, 242187500 sectors, thin
ichiic0 at pci0 dev 31 function 3 "Intel 7 Series SMBus" rev 0x04: apic 2 int 18
iic0 at ichiic0
vendor "Intel", unknown product 0x1e24 (class DASP subclass miscellaneous, rev
0x04) at pci0 dev 31 function 6 not configured
isa0 at pcib0
isadma0 at isa0
pckbc0 at isa0 port 0x60/5
pckbd0 at pckbc0 (kbd slot)
pckbc0: using irq 1 for kbd slot
wskbd0 at pckbd0: console keyboard, using wsdisplay0
pms0 at pckbc0 (aux slot)
pckbc0: using irq 12 for aux slot
wsmouse0 at pms0 mux 0
pcppi0 at isa0 port 0x61
spkr0 at pcppi0
mtrr: Pentium Pro MTRR support
uhub2 at uhub0 port 1 "Intel Rate Matching Hub" rev 2.00/0.00 addr 2
uhub3 at uhub1 port 1 "Intel Rate Matching Hub" rev 2.00/0.00 addr 2
vscsi0 at root
scsibus1 at vscsi0: 256 targets
softraid0 at root
scsibus2 at softraid0: 256 targets
sd1 at scsibus2 targ 1 lun 0: <OPENBSD, SR CRYPTO, 005> SCSI2 0/direct fixed
sd1: 117187MB, 512 bytes/sector, 239999472 sectors
root on sd1a (687a88c211b11fbb.a) swap on sd1b dump on sd1b
