Hi,
We have an Supermicro MBD-X8DTH-6 mainboard here. It has an
additional PCI bus behind the pchb0 host bridge. This diff from
mikeb@ makes OpenBSD detect the pci1 bus.
bluhm
Index: arch/i386/pci/pchb.c
===================================================================
RCS file: /mount/cvsdev/cvs/openbsd/src/sys/arch/i386/pci/pchb.c,v
retrieving revision 1.85
diff -u -p -r1.85 pchb.c
--- arch/i386/pci/pchb.c 31 Aug 2010 17:13:46 -0000 1.85
+++ arch/i386/pci/pchb.c 1 Dec 2010 22:15:14 -0000
@@ -113,6 +113,9 @@
#define AMD64HT_LDT_SEC_BUS_NUM(reg) (((reg) >> 8) & 0xff)
+#define I825520_HB_IOHMISCSS 0x09c
+#define I825520_HB_IOHMISCSS_DUALIOH (1<<25)
+
struct pchb_softc {
struct device sc_dev;
@@ -300,6 +303,19 @@ pchbattach(struct device *parent, struct
}
if (pbnum != 0)
doattach = 1;
+ break;
+ case PCI_PRODUCT_INTEL_825520_HB:
+ tag = pci_make_tag(pa->pa_pc, 0, 20, 0);
+ if (pci_conf_read(pa->pa_pc, tag, I825520_HB_IOHMISCSS)
+ & I825520_HB_IOHMISCSS_DUALIOH) {
+ /*
+ * Intel doesn't properly document a way to
+ * figure out the bus number, so we hardcode
+ * it for now.
+ */
+ pbnum = 0x80;
+ doattach = 1;
+ }
break;
/* RNG */
case PCI_PRODUCT_INTEL_82810_HB:
OpenBSD 4.8-current (GENERIC.MP) #2: Wed Dec 1 23:15:34 CET 2010
[email protected]:/usr/src/sys/arch/i386/compile/GENERIC.MP
cpu0: Intel(R) Xeon(R) CPU X5570 @ 2.93GHz ("GenuineIntel" 686-class) 2.94
GHz
cpu0:
FPU,V86,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUS
H,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,SBF,SSE3,MWAIT,DS-CPL,VMX,EST,TM2,SSSE3
,CX16,xTPR,PDCM,DCA,SSE4.1,SSE4.2,POPCNT
real mem = 3211845632 (3063MB)
avail mem = 3149238272 (3003MB)
mainbus0 at root
bios0 at mainbus0: AT/286+ BIOS, date 03/04/10, BIOS32 rev. 0 @ 0xf0010,
SMBIOS rev. 2.6 @ 0x99c00 (88 entries)
bios0: vendor American Megatrends Inc. version "1.1b" date 03/04/2010
bios0: Supermicro X8DTH-i/6/iF/6F
acpi0 at bios0: rev 2
acpi0: sleep states S0 S1 S4 S5
acpi0: tables DSDT FACP APIC MCFG SPMI OEMB HPET SSDT EINJ BERT ERST HEST
acpi0: wakeup devices NPE1(S4) NPE2(S4) NPE3(S4) NPE4(S4) NPE5(S4) NPE6(S4)
NPE7(S4) NPE8(S4) NPE9(S4) NPEA(S4) P0P1(S4) USB0(S4) USB1(S4) USB2(S4)
USB5(S4) EUSB(S4) USB3(S4) USB4(S4) USB6(S4) USBE(S4) GBE_(S4) P0P4(S4)
P0P5(S4) P0P6(S4) P0P7(S4) P0P8(S4) P0P9(S4) PS2K(S1) PS2M(S1) SLPB(S4)
NPE1(S4) NPE2(S4) NPE3(S4) NPE4(S4) NPE5(S4) NPE6(S4) NPE7(S4) NPE8(S4)
NPE9(S4) NPEA(S4)
acpitimer0 at acpi0: 3579545 Hz, 24 bits
acpimadt0 at acpi0 addr 0xfee00000: PC-AT compat
cpu0 at mainbus0: apid 0 (boot processor)
cpu0: apic clock running at 133MHz
cpu1 at mainbus0: apid 2 (application processor)
cpu1: Intel(R) Xeon(R) CPU X5570 @ 2.93GHz ("GenuineIntel" 686-class) 2.94
GHz
cpu1:
FPU,V86,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUS
H,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,SBF,SSE3,MWAIT,DS-CPL,VMX,EST,TM2,SSSE3
,CX16,xTPR,PDCM,DCA,SSE4.1,SSE4.2,POPCNT
cpu2 at mainbus0: apid 4 (application processor)
cpu2: Intel(R) Xeon(R) CPU X5570 @ 2.93GHz ("GenuineIntel" 686-class) 2.94
GHz
cpu2:
FPU,V86,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUS
H,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,SBF,SSE3,MWAIT,DS-CPL,VMX,EST,TM2,SSSE3
,CX16,xTPR,PDCM,DCA,SSE4.1,SSE4.2,POPCNT
cpu3 at mainbus0: apid 6 (application processor)
cpu3: Intel(R) Xeon(R) CPU X5570 @ 2.93GHz ("GenuineIntel" 686-class) 2.94
GHz
cpu3:
FPU,V86,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUS
H,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,SBF,SSE3,MWAIT,DS-CPL,VMX,EST,TM2,SSSE3
,CX16,xTPR,PDCM,DCA,SSE4.1,SSE4.2,POPCNT
ioapic0 at mainbus0: apid 1 pa 0xfec00000, version 20, 24 pins
ioapic0: misconfigured as apic 8, remapped to apid 1
ioapic1 at mainbus0: apid 3 pa 0xfec8a000, version 20, 24 pins
ioapic1: misconfigured as apic 9, remapped to apid 3
ioapic2 at mainbus0: apid 5 pa 0xfec9a000, version 20, 24 pins
ioapic2: misconfigured as apic 10, remapped to apid 5
acpihpet0 at acpi0: 14318179 Hz
acpiprt0 at acpi0: bus 0 (PCI0)
acpiprt1 at acpi0: bus 1 (NPE1)
acpiprt2 at acpi0: bus -1 (NPE2)
acpiprt3 at acpi0: bus 2 (NPE3)
acpiprt4 at acpi0: bus -1 (NPE4)
acpiprt5 at acpi0: bus 3 (NPE5)
acpiprt6 at acpi0: bus -1 (NPE6)
acpiprt7 at acpi0: bus 4 (NPE7)
acpiprt8 at acpi0: bus -1 (NPE8)
acpiprt9 at acpi0: bus 5 (NPE9)
acpiprt10 at acpi0: bus -1 (NPEA)
acpiprt11 at acpi0: bus 6 (P0P1)
acpiprt12 at acpi0: bus -1 (P0P4)
acpiprt13 at acpi0: bus -1 (P0P5)
acpiprt14 at acpi0: bus -1 (P0P6)
acpiprt15 at acpi0: bus -1 (P0P7)
acpiprt16 at acpi0: bus -1 (P0P8)
acpiprt17 at acpi0: bus -1 (P0P9)
acpiprt18 at acpi0: bus 128 (BR50)
acpiprt19 at acpi0: bus 130 (NPE1)
acpiprt20 at acpi0: bus -1 (NPE2)
acpiprt21 at acpi0: bus 131 (NPE3)
acpiprt22 at acpi0: bus -1 (NPE4)
acpiprt23 at acpi0: bus 132 (NPE5)
acpiprt24 at acpi0: bus -1 (NPE6)
acpiprt25 at acpi0: bus 133 (NPE7)
acpiprt26 at acpi0: bus -1 (NPE8)
acpiprt27 at acpi0: bus 134 (NPE9)
acpiprt28 at acpi0: bus -1 (NPEA)
acpicpu0 at acpi0: PSS
acpicpu1 at acpi0: PSS
acpicpu2 at acpi0: PSS
acpicpu3 at acpi0: PSS
acpibtn0 at acpi0: SLPB
acpibtn1 at acpi0: PWRB
bios0: ROM list: 0xc0000/0x8000 0xc8000/0x5600 0xcd800/0x2a00 0xd0800/0x1000
0xd1800/0x1000
ipmi at mainbus0 not configured
cpu0: Enhanced SpeedStep 2934 MHz: speeds: 2934, 2933, 2800, 2667, 2533, 2400,
2267, 2133, 2000, 1867, 1733, 1600 MHz
pci0 at mainbus0 bus 0: configuration mode 1 (bios)
pchb0 at pci0 dev 0 function 0 "Intel 5520 Host" rev 0x22
pci1 at pchb0 bus 128
ppb0 at pci1 dev 0 function 0 vendor "Intel", unknown product 0x3420 rev 0x13
pci2 at ppb0 bus 129
ppb1 at pci1 dev 1 function 0 "Intel X58 PCIE" rev 0x22
pci3 at ppb1 bus 130
ppb2 at pci1 dev 3 function 0 "Intel X58 PCIE" rev 0x22
pci4 at ppb2 bus 131
em0 at pci4 dev 0 function 0 "Intel PRO/1000 (82576)" rev 0x01: apic 5 int 0
(irq 10), address 00:1b:21:86:a5:be
em1 at pci4 dev 0 function 1 "Intel PRO/1000 (82576)" rev 0x01: apic 5 int 10
(irq 15), address 00:1b:21:86:a5:bf
ppb3 at pci1 dev 5 function 0 "Intel X58 PCIE" rev 0x22
pci5 at ppb3 bus 132
ppb4 at pci1 dev 7 function 0 "Intel X58 PCIE" rev 0x22
pci6 at ppb4 bus 133
ppb5 at pci1 dev 9 function 0 "Intel X58 PCIE" rev 0x22
pci7 at ppb5 bus 134
"Intel X58 IOxAPIC" rev 0x22 at pci1 dev 19 function 0 not configured
"Intel X58 Misc" rev 0x22 at pci1 dev 20 function 0 not configured
"Intel X58 GPIO" rev 0x22 at pci1 dev 20 function 1 not configured
"Intel X58 RAS" rev 0x22 at pci1 dev 20 function 2 not configured
"Intel X58 Throttle" rev 0x22 at pci1 dev 20 function 3 not configured
"Intel X58 QuickData" rev 0x22 at pci1 dev 22 function 0 not configured
"Intel X58 QuickData" rev 0x22 at pci1 dev 22 function 1 not configured
"Intel X58 QuickData" rev 0x22 at pci1 dev 22 function 2 not configured
"Intel X58 QuickData" rev 0x22 at pci1 dev 22 function 3 not configured
"Intel X58 QuickData" rev 0x22 at pci1 dev 22 function 4 not configured
"Intel X58 QuickData" rev 0x22 at pci1 dev 22 function 5 not configured
"Intel X58 QuickData" rev 0x22 at pci1 dev 22 function 6 not configured
"Intel X58 QuickData" rev 0x22 at pci1 dev 22 function 7 not configured
ppb6 at pci0 dev 1 function 0 "Intel X58 PCIE" rev 0x22
pci8 at ppb6 bus 1
em2 at pci8 dev 0 function 0 "Intel PRO/1000 (82576)" rev 0x01: apic 3 int 4
(irq 10), address 00:25:90:03:e4:f8
em3 at pci8 dev 0 function 1 "Intel PRO/1000 (82576)" rev 0x01: apic 3 int 16
(irq 15), address 00:25:90:03:e4:f9
ppb7 at pci0 dev 3 function 0 "Intel X58 PCIE" rev 0x22
pci9 at ppb7 bus 2
ppb8 at pci0 dev 5 function 0 "Intel X58 PCIE" rev 0x22
pci10 at ppb8 bus 3
ppb9 at pci0 dev 7 function 0 "Intel X58 PCIE" rev 0x22
pci11 at ppb9 bus 4
ppb10 at pci0 dev 9 function 0 "Intel X58 PCIE" rev 0x22
pci12 at ppb10 bus 5
mpii0 at pci12 dev 0 function 0 "Symbios Logic SAS2008" rev 0x02: apic 3 int 8
(irq 10)
scsibus0 at mpii0: 128 targets
sd0 at scsibus0 targ 0 lun 0: <LSI, Logical Volume, 3000> SCSI4 0/direct
fixed
sd0: 139236MB, 512 bytes/sec, 285155329 sec total
"Intel X58 IOxAPIC" rev 0x22 at pci0 dev 19 function 0 not configured
"Intel X58 Misc" rev 0x22 at pci0 dev 20 function 0 not configured
"Intel X58 GPIO" rev 0x22 at pci0 dev 20 function 1 not configured
"Intel X58 RAS" rev 0x22 at pci0 dev 20 function 2 not configured
"Intel X58 Throttle" rev 0x22 at pci0 dev 20 function 3 not configured
"Intel X58 QuickData" rev 0x22 at pci0 dev 22 function 0 not configured
"Intel X58 QuickData" rev 0x22 at pci0 dev 22 function 1 not configured
"Intel X58 QuickData" rev 0x22 at pci0 dev 22 function 2 not configured
"Intel X58 QuickData" rev 0x22 at pci0 dev 22 function 3 not configured
"Intel X58 QuickData" rev 0x22 at pci0 dev 22 function 4 not configured
"Intel X58 QuickData" rev 0x22 at pci0 dev 22 function 5 not configured
"Intel X58 QuickData" rev 0x22 at pci0 dev 22 function 6 not configured
"Intel X58 QuickData" rev 0x22 at pci0 dev 22 function 7 not configured
uhci0 at pci0 dev 26 function 0 "Intel 82801JI USB" rev 0x00: apic 1 int 16
(irq 10)
uhci1 at pci0 dev 26 function 1 "Intel 82801JI USB" rev 0x00: apic 1 int 21
(irq 7)
ehci0 at pci0 dev 26 function 7 "Intel 82801JI USB" rev 0x00: apic 1 int 18
(irq 14)
usb0 at ehci0: USB revision 2.0
uhub0 at usb0 "Intel EHCI root hub" rev 2.00/1.00 addr 1
uhci2 at pci0 dev 29 function 0 "Intel 82801JI USB" rev 0x00: apic 1 int 23
(irq 6)
uhci3 at pci0 dev 29 function 1 "Intel 82801JI USB" rev 0x00: apic 1 int 19
(irq 11)
uhci4 at pci0 dev 29 function 2 "Intel 82801JI USB" rev 0x00: apic 1 int 18
(irq 14)
ehci1 at pci0 dev 29 function 7 "Intel 82801JI USB" rev 0x00: apic 1 int 23
(irq 6)
usb1 at ehci1: USB revision 2.0
uhub1 at usb1 "Intel EHCI root hub" rev 2.00/1.00 addr 1
ppb11 at pci0 dev 30 function 0 "Intel 82801BA Hub-to-PCI" rev 0x90
pci13 at ppb11 bus 6
vga1 at pci13 dev 4 function 0 "Matrox MGA G200eW" rev 0x0a
wsdisplay0 at vga1 mux 1: console (80x25, vt100 emulation)
wsdisplay0: screen 1-5 added (80x25, vt100 emulation)
pcib0 at pci0 dev 31 function 0 "Intel 82801JIR LPC" rev 0x00
ahci0 at pci0 dev 31 function 2 "Intel 82801JI AHCI" rev 0x00: apic 1 int 19
(irq 11), AHCI 1.2
scsibus1 at ahci0: 32 targets
cd0 at scsibus1 targ 0 lun 0: <TEAC, DV-W28S-R, 1.0B> ATAPI 5/cdrom removable
ichiic0 at pci0 dev 31 function 3 "Intel 82801JI SMBus" rev 0x00: apic 1 int
18 (irq 14)
iic0 at ichiic0
iic0: addr 0x2e 00=40 words 00=4040 01=0000 02=0000 03=0000 04=0000 05=0000
06=0000 07=0000
"w83795g" at iic0 addr 0x2f not configured
iic0: addr 0x2f 01=1d 02=ff 03=78 04=3a 05=d5 06=ff 08=0f 0a=0f 0b=ff 10=89
11=02 13=be 15=8d 16=be 17=e6 1b=8b 1c=88 1d=89 1e=87 1f=9f 20=ea 21=3a 22=31
23=39 24=1d 25=28 27=28 2e=13 2f=ff 30=13 31=14 32=ff 33=ff 34=ff 35=ff 3d=ff
3e=ff 3f=ff 40=16 41=14 42=08 46=40 48=ff 49=7f 4a=7f 4b=ff 4c=f2 4d=7f 4e=3f
4f=ff 56=ff 57=ff 58=81 5a=02 6b=64 6c=64 6d=ff 6e=ff 6f=ff 70=ba 71=4b 72=ba
73=4b 74=a8 75=73 76=ce 77=a9 78=ce 79=a9 7a=97 7b=7b 7c=ce 7d=a9 7e=f8 7f=ca
80=ff 82=ff 84=ff 86=a8 87=73 88=98 89=7b 8a=98 8b=7b 8c=98 8d=7b 8e=ff 90=ff
92=3f 94=ff 96=64 97=5f 98=7f 99=7f 9a=64 9b=5f 9c=7f 9d=7f 9e=64 9f=5f a0=7f
a1=7f a2=7f a3=7f a4=7f a5=7f a6=ac a7=8d a8=7f a9=7f aa=f9 ab=cc ac=7f ad=7f
ae=64 af=5f b0=55 b1=50 b2=5f b3=5c b4=5f b5=5c b6=76 b7=76 b8=76 b9=76 ba=76
bb=76 bc=76 bd=76 be=76 bf=76 c0=76 c1=76 c2=76 c3=76 c4=88 c5=88 c6=88 c7=88
c8=88 c9=88 ca=88 cb=ff cc=ff cd=ff ce=ff cf=ff d9=22 da=24 db=0a dc=60 df=10
e6=bb e7=c0 e8=09 e9=09 ea=09 eb=09 ec=09 ed=22 ee=22 ef=02 f0=ff f9=0f fa=ff
fb=51 fc=af fd=a3 fe=79 ff=50 words 00=00ff 01=1dff 02=ffff 03=78ff 04=3aff
05=d5ff 06=ffff 07=00ff: w83795g
usb2 at uhci0: USB revision 1.0
uhub2 at usb2 "Intel UHCI root hub" rev 1.00/1.00 addr 1
usb3 at uhci1: USB revision 1.0
uhub3 at usb3 "Intel UHCI root hub" rev 1.00/1.00 addr 1
usb4 at uhci2: USB revision 1.0
uhub4 at usb4 "Intel UHCI root hub" rev 1.00/1.00 addr 1
usb5 at uhci3: USB revision 1.0
uhub5 at usb5 "Intel UHCI root hub" rev 1.00/1.00 addr 1
usb6 at uhci4: USB revision 1.0
uhub6 at usb6 "Intel UHCI root hub" rev 1.00/1.00 addr 1
isa0 at pcib0
isadma0 at isa0
com0 at isa0 port 0x3f8/8 irq 4: ns16550a, 16 byte fifo
com0: console
com1 at isa0 port 0x2f8/8 irq 3: ns16550a, 16 byte fifo
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
pcppi0 at isa0 port 0x61
spkr0 at pcppi0
wbsio0 at isa0 port 0x2e/2: W83627DHG-P rev 0x73
lm1 at wbsio0 port 0xa10/8: W83627DHG
npx0 at isa0 port 0xf0/16: reported by CPUID; using exception 16
mtrr: Pentium Pro MTRR support
vscsi0 at root
scsibus2 at vscsi0: 256 targets
softraid0 at root
root on sd0a swap on sd0b dump on sd0b
Domain /dev/pci0:
0:0:0: Intel 5520 Host
0:1:0: Intel X58 PCIE
0:3:0: Intel X58 PCIE
0:5:0: Intel X58 PCIE
0:7:0: Intel X58 PCIE
0:9:0: Intel X58 PCIE
0:19:0: Intel X58 IOxAPIC
0:20:0: Intel X58 Misc
0:20:1: Intel X58 GPIO
0:20:2: Intel X58 RAS
0:20:3: Intel X58 Throttle
0:22:0: Intel X58 QuickData
0:22:1: Intel X58 QuickData
0:22:2: Intel X58 QuickData
0:22:3: Intel X58 QuickData
0:22:4: Intel X58 QuickData
0:22:5: Intel X58 QuickData
0:22:6: Intel X58 QuickData
0:22:7: Intel X58 QuickData
0:26:0: Intel 82801JI USB
0:26:1: Intel 82801JI USB
0:26:7: Intel 82801JI USB
0:29:0: Intel 82801JI USB
0:29:1: Intel 82801JI USB
0:29:2: Intel 82801JI USB
0:29:7: Intel 82801JI USB
0:30:0: Intel 82801BA Hub-to-PCI
0:31:0: Intel 82801JIR LPC
0:31:2: Intel 82801JI AHCI
0:31:3: Intel 82801JI SMBus
1:0:0: Intel PRO/1000 (82576)
1:0:1: Intel PRO/1000 (82576)
5:0:0: Symbios Logic SAS2008
6:4:0: Matrox MGA G200eW
128:0:0: Intel unknown
128:1:0: Intel X58 PCIE
128:3:0: Intel X58 PCIE
128:5:0: Intel X58 PCIE
128:7:0: Intel X58 PCIE
128:9:0: Intel X58 PCIE
128:19:0: Intel X58 IOxAPIC
128:20:0: Intel X58 Misc
128:20:1: Intel X58 GPIO
128:20:2: Intel X58 RAS
128:20:3: Intel X58 Throttle
128:22:0: Intel X58 QuickData
128:22:1: Intel X58 QuickData
128:22:2: Intel X58 QuickData
128:22:3: Intel X58 QuickData
128:22:4: Intel X58 QuickData
128:22:5: Intel X58 QuickData
128:22:6: Intel X58 QuickData
128:22:7: Intel X58 QuickData
131:0:0: Intel PRO/1000 (82576)
131:0:1: Intel PRO/1000 (82576)
