Skip to contentSkip to conversation

unexpected IO-APIC on IBM xSeries 440

PATCH New Mariusz Zielinski 4 participants 4 messages Sep 12, 2002 Documentation

lore
Share & tools
lore
#0 lore raw

Hi list,
as instructed I'm making contact (attached dmesg). IBM claims that machine is supported under linux (RedHat Advanced Server 2.1) but I couldn't find any patches. Is it possible that RedHat is hiding some patches from linux community? :)

The problem is that /proc/cpuinfo shows at most 4 processors (depending on kernel version). Dmesg shows many "APIC error on CPUx: 00(80)" errors. I can provide you with further details (make some tests) if needed.

Kernel is preemptible and is compiled with bigmem and acpi enabled.

Linux version 2.5.34 (root@levi) (gcc version 2.95.4 20011002 (Debian prerelease)) #2 SMP czw wrz 12 16:32:16 CEST 2002
Video mode to be used for restore is ffff
BIOS-provided physical RAM map:
BIOS-e820: 0000000000000000 - 000000000009dc00 (usable)
BIOS-e820: 000000000009dc00 - 00000000000a0000 (reserved)
BIOS-e820: 00000000000e0000 - 0000000000100000 (reserved)
BIOS-e820: 0000000000100000 - 00000000dffb6fc0 (usable)
BIOS-e820: 00000000dffb6fc0 - 00000000dffbf800 (ACPI data)
BIOS-e820: 00000000dffbf800 - 00000000e0000000 (reserved)
BIOS-e820: 00000000fec00000 - 0000000100000000 (reserved)
BIOS-e820: 0000000100000000 - 0000000120000000 (usable)
3712MB HIGHMEM available.
896MB LOWMEM available.
found SMP MP-table at 0009dd40
hm, page 0009d000 reserved twice.
hm, page 0009e000 reserved twice.
hm, page 0009e000 reserved twice.
hm, page 0009f000 reserved twice.
WARNING: MP table in the EBDA can be UNSAFE, contact [email protected] if you experience SMP problems!
On node 0 totalpages: 1179648
DMA zone: 4096 pages
Normal zone: 225280 pages
HighMem zone: 950272 pages
ACPI: RSDP (v000 IBM ) @ 0x000fdba0
ACPI: RSDT (v001 IBM SERVIGIL 00000.04096) @ 0xdffbf780
ACPI: FADT (v001 IBM SERVIGIL 00000.04096) @ 0xdffbf700
ACPI: MADT (v001 IBM SERVIGIL 00000.04096) @ 0xdffbf600
ACPI: SRAT (v001 IBM SERVIGIL 00000.04096) @ 0xdffbf4c0
ACPI: Local APIC address 0xfee00000
ACPI: LAPIC (acpi_id[0x00] lapic_id[0x00] enabled)
Processor #0 15:1 APIC version 16
ACPI: LAPIC (acpi_id[0x01] lapic_id[0x02] enabled)
Processor #2 15:1 APIC version 16
ACPI: LAPIC (acpi_id[0x02] lapic_id[0x10] enabled)
Processor #16 invalid (max 16)
ACPI: LAPIC (acpi_id[0x03] lapic_id[0x12] enabled)
Processor #18 invalid (max 16)
ACPI: LAPIC (acpi_id[0x04] lapic_id[0x20] enabled)
Processor #32 invalid (max 16)
ACPI: LAPIC (acpi_id[0x05] lapic_id[0x22] enabled)
Processor #34 invalid (max 16)
ACPI: LAPIC (acpi_id[0x06] lapic_id[0x30] enabled)
Processor #48 invalid (max 16)
ACPI: LAPIC (acpi_id[0x07] lapic_id[0x32] enabled)
Processor #50 invalid (max 16)
ACPI: LAPIC_NMI (acpi_id[0x00] polarity[0x0] trigger[0x0] lint[0x1])
ACPI: LAPIC_NMI (acpi_id[0x01] polarity[0x0] trigger[0x0] lint[0x1])
ACPI: LAPIC_NMI (acpi_id[0x02] polarity[0x0] trigger[0x0] lint[0x1])
ACPI: LAPIC_NMI (acpi_id[0x03] polarity[0x0] trigger[0x0] lint[0x1])
ACPI: LAPIC_NMI (acpi_id[0x04] polarity[0x0] trigger[0x0] lint[0x1])
ACPI: LAPIC_NMI (acpi_id[0x05] polarity[0x0] trigger[0x0] lint[0x1])
ACPI: LAPIC_NMI (acpi_id[0x06] polarity[0x0] trigger[0x0] lint[0x1])
ACPI: LAPIC_NMI (acpi_id[0x07] polarity[0x0] trigger[0x0] lint[0x1])
ACPI: IOAPIC (id[0x0e] address[0xfec00000] global_irq_base[0x0]) IOAPIC[0]: Assigned apic_id 14
IOAPIC[0]: apic_id 14, version 17, address 0xfec00000, IRQ 0-50
ACPI: IOAPIC (id[0x0d] address[0xfec01000] global_irq_base[0x33]) IOAPIC[1]: Assigned apic_id 13
IOAPIC[1]: apic_id 13, version 17, address 0xfec01000, IRQ 51-101
ACPI: INT_SRC_OVR (bus[0] irq[0x8] global_irq[0x8] polarity[0x3] trigger[0x1])
ACPI: INT_SRC_OVR (bus[0] irq[0xe] global_irq[0xe] polarity[0x1] trigger[0x0])
ACPI: INT_SRC_OVR (bus[0] irq[0x9] global_irq[0x24] polarity[0x0] trigger[0x0])
Using ACPI (MADT) for SMP configuration information
IBM machine detected. Enabling interrupts during APM calls.
IBM machine detected. Disabling SMBus accesses.
Kernel command line: auto BOOT_IMAGE=linux-2.5 root=802 BOOT_FILE=/boot/linux-2.5
Initializing CPU#0
Detected 1397.813 MHz processor.
Console: colour VGA+ 80x25
Calibrating delay loop... 2703.36 BogoMIPS
Memory: 4139296k/4718592k available (1788k kernel code, 54316k reserved, 817k data, 120k init, 3276504k highmem)
Security Scaffold v1.0.0 initialized
Dentry-cache hash table entries: 262144 (order: 9, 2097152 bytes) Inode-cache hash table entries: 262144 (order: 9, 2097152 bytes) Mount-cache hash table entries: 512 (order: 0, 4096 bytes)
CPU: Before vendor init, caps: 3febfbff 00000000 00000000, vendor = 0
CPU: L1 I cache: 0K, L1 D cache: 8K
CPU: L2 cache: 256K
CPU: L3 cache: 512K
CPU: Hyper-Threading is disabled
CPU: After vendor init, caps: 3febfbff 00000000 00000000 00000000 Intel machine check architecture supported.
Intel machine check reporting enabled on CPU#0.
CPU#0: Intel P4/Xeon Extended MCE MSRs (12) available
CPU#0: Thermal monitoring enabled

CPU:     After generic, caps: 3febfbff 00000000 00000000 00000000
CPU:             Common caps: 3febfbff 00000000 00000000 00000000

Enabling fast FPU save and restore... done.
Enabling unmasked SIMD FPU exception support... done. Checking 'hlt' instruction... OK.
POSIX conformance testing by UNIFIX
CPU: Before vendor init, caps: 3febfbff 00000000 00000000, vendor = 0
CPU: L1 I cache: 0K, L1 D cache: 8K
CPU: L2 cache: 256K
CPU: L3 cache: 512K
CPU: Hyper-Threading is disabled
CPU: After vendor init, caps: 3febfbff 00000000 00000000 00000000 Intel machine check reporting enabled on CPU#0.
CPU#0: Intel P4/Xeon Extended MCE MSRs (12) available CPU#0: Thermal LVT vector (0xf0) already installed

CPU:     After generic, caps: 3febfbff 00000000 00000000 00000000
CPU:             Common caps: 3febfbff 00000000 00000000 00000000
CPU0: Intel Pentium 4 (Unknown) stepping 01
per-CPU timeslice cutoff: 731.82 usecs.

task migration cache decay timeout: 1 msecs.
enabled ExtINT on CPU#0
ESR value before enabling vector: 00000000
ESR value after enabling vector: 00000000
Booting processor 1/2 eip 2000
Initializing CPU#1
masked ExtINT on CPU#1
ESR value before enabling vector: 00000000
ESR value after enabling vector: 00000000
mtrr: SMP support incomplete for this vendor
Calibrating delay loop... 2785.28 BogoMIPS
CPU: Before vendor init, caps: 3febfbff 00000000 00000000, vendor = 0
CPU: L1 I cache: 0K, L1 D cache: 8K
CPU: L2 cache: 256K
CPU: L3 cache: 512K
CPU: Hyper-Threading is disabled
CPU: After vendor init, caps: 3febfbff 00000000 00000000 00000000 Intel machine check reporting enabled on CPU#1.
CPU#1: Intel P4/Xeon Extended MCE MSRs (12) available CPU#1: Thermal monitoring enabled

CPU:     After generic, caps: 3febfbff 00000000 00000000 00000000
CPU:             Common caps: 3febfbff 00000000 00000000 00000000
CPU1: Intel Pentium 4 (Unknown) stepping 01

Total of 2 processors activated (5488.64 BogoMIPS).
ENABLING IO-APIC IRQs
init IO_APIC IRQs
IO-APIC (apicid-pin) 14-0, 14-2, 14-16, 14-17, 14-18, 14-19, 14-20, 14-21,
14-22, 14-23, 14-24, 14-25, 14-26, 14-27, 14-28, 14-29, 14-30, 14-31, 14-32, 14-33, 14-34,
14-35, 14-37, 14-38, 14-39, 14-40, 14-41, 14-42, 14-43, 14-44, 14-45, 14-46, 14-47, 14-48, 14-49, 14-50, 13-0, 13-1, 13-2, 13-3, 13-4, 13-5, 13-6, 13-7, 13-8, 13-9, 13
-10, 13-11, 13-12, 13-13, 13-14, 13-15, 13-16, 13-17, 13-18, 13-19, 13-20, 13-21, 13-22, 13-23, 13-24, 13-25, 13-26, 13-27, 13-28, 13-29, 13-30, 13-31, 13-32, 13-33, 1
3-34, 13-35, 13-36, 13-37, 13-38, 13-39, 13-40, 13-41, 13-42, 13-43, 13-44, 13-45, 13-46, 13-47, 13-48, 13-49, 13-50 not connected.
..TIMER: vector=0x31 pin1=-1 pin2=0
...trying to set up timer (IRQ0) through the 8259A ...
..... (found pin 0) ...works.
number of MP IRQ sources: 16.
number of IO-APIC #14 registers: 51.
number of IO-APIC #13 registers: 51.
testing the IO APIC.......................

IO APIC #14......
.... register #00: 0E000000
....... : physical APIC id: 0E
.... register #01: 00320011
....... : max redirection entries: 0032
WARNING: unexpected IO-APIC, please mail
to [email protected]
....... : PRQ implemented: 0
....... : IO APIC version: 0011
.... register #02: 00000000
....... : arbitration: 00
.... IRQ redirection table:
NR Log Phy Mask Trig IRR Pol Stat Dest Deli Vect:

 00 001 01  0    0    0   0   0    1    1    31
 01 001 01  0    0    0   0   0    1    1    39
 02 000 00  1    0    0   0   0    0    0    00
 03 001 01  0    0    0   0   0    1    1    41
 04 001 01  0    0    0   0   0    1    1    49
 05 001 01  0    0    0   0   0    1    1    51
 06 001 01  0    0    0   0   0    1    1    59
 07 001 01  0    0    0   0   0    1    1    61
 08 001 01  0    0    0   1   0    1    1    69
 09 001 01  0    0    0   0   0    1    1    71
 0a 001 01  0    0    0   0   0    1    1    79
 0b 001 01  0    0    0   0   0    1    1    81
 0c 001 01  0    0    0   0   0    1    1    89
 0d 001 01  0    0    0   0   0    1    1    91
 0e 001 01  0    0    0   0   0    1    1    99
 0f 001 01  0    0    0   0   0    1    1    A1
 10 000 00  1    0    0   0   0    0    0    00
 11 000 00  1    0    0   0   0    0    0    00
 12 000 00  1    0    0   0   0    0    0    00
 13 000 00  1    0    0   0   0    0    0    00
 14 000 00  1    0    0   0   0    0    0    00
 15 000 00  1    0    0   0   0    0    0    00
 16 000 00  1    0    0   0   0    0    0    00
 17 000 00  1    0    0   0   0    0    0    00
 18 000 00  1    0    0   0   0    0    0    00
 19 000 00  1    0    0   0   0    0    0    00
 1a 000 00  1    0    0   0   0    0    0    00
 1b 000 00  1    0    0   0   0    0    0    00
 1c 000 00  1    0    0   0   0    0    0    00
 1d 000 00  1    0    0   0   0    0    0    00
 1e 000 00  1    0    0   0   0    0    0    00
 1f 000 00  1    0    0   0   0    0    0    00
 20 000 00  1    0    0   0   0    0    0    00
 21 000 00  1    0    0   0   0    0    0    00
 22 000 00  1    0    0   0   0    0    0    00
 23 000 00  1    0    0   0   0    0    0    00
 24 001 01  0    0    0   0   0    1    1    71
 25 000 00  1    0    0   0   0    0    0    00
 26 000 00  1    0    0   0   0    0    0    00
 27 000 00  1    0    0   0   0    0    0    00
 28 000 00  1    0    0   0   0    0    0    00
 29 000 00  1    0    0   0   0    0    0    00
 2a 000 00  1    0    0   0   0    0    0    00
 2b 000 00  1    0    0   0   0    0    0    00
 2c 000 00  1    0    0   0   0    0    0    00
 2d 000 00  1    0    0   0   0    0    0    00
 2e 000 00  1    0    0   0   0    0    0    00
 2f 000 00  1    0    0   0   0    0    0    00
 30 000 00  1    0    0   0   0    0    0    00
 31 000 00  1    0    0   0   0    0    0    00
 32 000 00  1    0    0   0   0    0    0    00

IO APIC #13......
.... register #00: 0D000000
....... : physical APIC id: 0D
.... register #01: 00320011
....... : max redirection entries: 0032
WARNING: unexpected IO-APIC, please mail
to [email protected]
....... : PRQ implemented: 0
....... : IO APIC version: 0011
.... register #02: 00000000
....... : arbitration: 00
.... IRQ redirection table:
NR Log Phy Mask Trig IRR Pol Stat Dest Deli Vect:

 00 000 00  1    0    0   0   0    0    0    00
 01 000 00  1    0    0   0   0    0    0    00
 02 000 00  1    0    0   0   0    0    0    00
 03 000 00  1    0    0   0   0    0    0    00
 04 000 00  1    0    0   0   0    0    0    00
 05 000 00  1    0    0   0   0    0    0    00
 06 000 00  1    0    0   0   0    0    0    00
 07 000 00  1    0    0   0   0    0    0    00
 08 000 00  1    0    0   0   0    0    0    00
 09 000 00  1    0    0   0   0    0    0    00
 0a 000 00  1    0    0   0   0    0    0    00
 0b 000 00  1    0    0   0   0    0    0    00
 0c 000 00  1    0    0   0   0    0    0    00
 0d 000 00  1    0    0   0   0    0    0    00
 0e 000 00  1    0    0   0   0    0    0    00
 0f 000 00  1    0    0   0   0    0    0    00
 10 000 00  1    0    0   0   0    0    0    00
 11 000 00  1    0    0   0   0    0    0    00
 12 000 00  1    0    0   0   0    0    0    00
 13 000 00  1    0    0   0   0    0    0    00
 14 000 00  1    0    0   0   0    0    0    00
 15 000 00  1    0    0   0   0    0    0    00
 16 000 00  1    0    0   0   0    0    0    00
 17 000 00  1    0    0   0   0    0    0    00
 18 000 00  1    0    0   0   0    0    0    00
 19 000 00  1    0    0   0   0    0    0    00
 1a 000 00  1    0    0   0   0    0    0    00
 1b 000 00  1    0    0   0   0    0    0    00
 1c 000 00  1    0    0   0   0    0    0    00
 1d 000 00  1    0    0   0   0    0    0    00
 1e 000 00  1    0    0   0   0    0    0    00
 1f 000 00  1    0    0   0   0    0    0    00
 20 000 00  1    0    0   0   0    0    0    00
 21 000 00  1    0    0   0   0    0    0    00
 22 000 00  1    0    0   0   0    0    0    00
 23 000 00  1    0    0   0   0    0    0    00
 24 000 00  1    0    0   0   0    0    0    00
 25 000 00  1    0    0   0   0    0    0    00
 26 000 00  1    0    0   0   0    0    0    00
 27 000 00  1    0    0   0   0    0    0    00
 28 000 00  1    0    0   0   0    0    0    00
 29 000 00  1    0    0   0   0    0    0    00
 2a 000 00  1    0    0   0   0    0    0    00
 2b 000 00  1    0    0   0   0    0    0    00
 2c 000 00  1    0    0   0   0    0    0    00
 2d 000 00  1    0    0   0   0    0    0    00
 2e 000 00  1    0    0   0   0    0    0    00
 2f 000 00  1    0    0   0   0    0    0    00
 30 000 00  1    0    0   0   0    0    0    00
 31 000 00  1    0    0   0   0    0    0    00
 32 000 00  1    0    0   0   0    0    0    00

IRQ to pin mappings:
IRQ0 -> 0:0
IRQ1 -> 0:1
IRQ3 -> 0:3
IRQ4 -> 0:4
IRQ5 -> 0:5
IRQ6 -> 0:6
IRQ7 -> 0:7
IRQ8 -> 0:8
IRQ9 -> 0:9-> 0:36
IRQ10 -> 0:10
IRQ11 -> 0:11
IRQ12 -> 0:12
IRQ13 -> 0:13
IRQ14 -> 0:14
IRQ15 -> 0:15
.................................... done.
Using local APIC timer interrupts.
calibrating APIC timer ...
..... CPU clock speed is 1396.0951 MHz.
..... host bus clock speed is 99.0782 MHz.
cpu: 0, clocks: 99782, slice: 3023 CPU0<T0:99776,T1:96752,D:1,S:3023,C:99782>
checking TSC synchronization across 2 CPUs: passed. Starting migration thread for cpu 0
Bringing up 1
cpu: 1, clocks: 99782, slice: 3023 CPU1<T0:99776,T1:93728,D:2,S:3023,C:99782>
CPU 1 IS NOW UP!
Starting migration thread for cpu 1
CPUS done 4294967295
Linux NET4.0 for Linux 2.4
Based upon Swansea University Computer Society NET3.039 Initializing RT netlink socket
PCI: PCI BIOS revision 2.10 entry at 0xfd30d, last bus=11
PCI: Using configuration type 1
ACPI: Subsystem revision 20020829
APIC error on CPU0: 00(80)
APIC error on CPU1: 00(80)
ACPI: Interpreter enabled
ACPI: Using IOAPIC for interrupt routing
ACPI: System [ACPI] (supports S0 S5)
ACPI: PCI Root Bridge [PCI0] (00:00)
PCI: Probing PCI hardware (bus 00)
ACPI: PCI Interrupt Routing Table [\_SB_.PCI0._PRT]
ACPI: PCI Root Bridge [PCI1] (00:01)
PCI: Probing PCI hardware (bus 01)
ACPI: PCI Interrupt Routing Table [\_SB_.PCI1._PRT]
ACPI: PCI Root Bridge [PCI2] (00:02)
PCI: Probing PCI hardware (bus 02)
ACPI: PCI Interrupt Routing Table [\_SB_.PCI2._PRT]
ACPI: PCI Root Bridge [PCI5] (00:05)
PCI: Probing PCI hardware (bus 05)
ACPI: PCI Interrupt Routing Table [\_SB_.PCI5._PRT]
ACPI: PCI Root Bridge [PCI7] (00:07)
PCI: Probing PCI hardware (bus 07)
ACPI: PCI Interrupt Routing Table [\_SB_.PCI7._PRT]
ACPI: PCI Root Bridge [PCI9] (00:09)
PCI: Probing PCI hardware (bus 09)
ACPI: PCI Interrupt Routing Table [\_SB_.PCI9._PRT]
ACPI: PCI Interrupt Link [LVIA] (IRQs *9)
ACPI: PCI Interrupt Link [LVIB] (IRQs *10)
ACPI: PCI Interrupt Link [LVIC] (IRQs *3)
ACPI: PCI Interrupt Link [LVID] (IRQs *5)
ACPI: PCI Interrupt Link [LVUS] (IRQs *7)
ACPI: PCI Interrupt Link [LHS1] (IRQs *5)
ACPI: PCI Interrupt Link [LHS2] (IRQs *5)
ACPI: PCI Interrupt Link [LHS3] (IRQs *5)
ACPI: PCI Interrupt Link [LHS4] (IRQs *10)
ACPI: PCI Interrupt Link [LHS5] (IRQs *11)
ACPI: PCI Interrupt Link [LHS6] (IRQs *15)
isapnp: Scanning for PnP cards...
isapnp: No Plug & Play device found
IOAPIC[0]: Set PCI routing entry (14-39 -> 0xa9 -> IRQ 39) 00:00:03[A] -> 14-39 -> vector 0xa9 -> IRQ 39 IOAPIC[0]: Set PCI routing entry (14-16 -> 0xb1 -> IRQ 16) 00:00:04[A] -> 14-16 -> vector 0xb1 -> IRQ 16 IOAPIC[0]: Set PCI routing entry (14-17 -> 0xb9 -> IRQ 17) 00:00:04[B] -> 14-17 -> vector 0xb9 -> IRQ 17 IOAPIC[0]: Set PCI routing entry (14-47 -> 0xc1 -> IRQ 47) 00:00:05[D] -> 14-47 -> vector 0xc1 -> IRQ 47 IOAPIC[0]: Set PCI routing entry (14-40 -> 0xc9 -> IRQ 40) 00:01:03[A] -> 14-40 -> vector 0xc9 -> IRQ 40 IOAPIC[0]: Set PCI routing entry (14-41 -> 0xd1 -> IRQ 41) 00:01:03[B] -> 14-41 -> vector 0xd1 -> IRQ 41 IOAPIC[0]: Set PCI routing entry (14-42 -> 0xd9 -> IRQ 42) 00:01:04[A] -> 14-42 -> vector 0xd9 -> IRQ 42 IOAPIC[1]: Set PCI routing entry (13-0 -> 0xe1 -> IRQ 51) 00:02:01[A] -> 13-0 -> vector 0xe1 -> IRQ 51 IOAPIC[1]: Set PCI routing entry (13-1 -> 0xe9 -> IRQ 52) 00:02:01[B] -> 13-1 -> vector 0xe9 -> IRQ 52 IOAPIC[1]: Set PCI routing entry (13-2 -> 0x32 -> IRQ 53) 00:02:01[C] -> 13-2 -> vector 0x32 -> IRQ 53 IOAPIC[1]: Set PCI routing entry (13-3 -> 0x3a -> IRQ 54) 00:02:01[D] -> 13-3 -> vector 0x3a -> IRQ 54 IOAPIC[1]: Set PCI routing entry (13-4 -> 0x42 -> IRQ 55) 00:02:02[A] -> 13-4 -> vector 0x42 -> IRQ 55 IOAPIC[1]: Set PCI routing entry (13-5 -> 0x4a -> IRQ 56) 00:02:02[B] -> 13-5 -> vector 0x4a -> IRQ 56 IOAPIC[1]: Set PCI routing entry (13-6 -> 0x52 -> IRQ 57) 00:02:02[C] -> 13-6 -> vector 0x52 -> IRQ 57 IOAPIC[1]: Set PCI routing entry (13-7 -> 0x5a -> IRQ 58) 00:02:02[D] -> 13-7 -> vector 0x5a -> IRQ 58 IOAPIC[1]: Set PCI routing entry (13-20 -> 0x62 -> IRQ 71) 00:05:04[A] -> 13-20 -> vector 0x62 -> IRQ 71 IOAPIC[1]: Set PCI routing entry (13-21 -> 0x6a -> IRQ 72) 00:05:04[B] -> 13-21 -> vector 0x6a -> IRQ 72 IOAPIC[1]: Set PCI routing entry (13-22 -> 0x72 -> IRQ 73) 00:05:04[C] -> 13-22 -> vector 0x72 -> IRQ 73 IOAPIC[1]: Set PCI routing entry (13-23 -> 0x7a -> IRQ 74) 00:05:04[D] -> 13-23 -> vector 0x7a -> IRQ 74 IOAPIC[1]: Set PCI routing entry (13-16 -> 0x82 -> IRQ 67) 00:07:03[A] -> 13-16 -> vector 0x82 -> IRQ 67 IOAPIC[1]: Set PCI routing entry (13-17 -> 0x8a -> IRQ 68) 00:07:03[B] -> 13-17 -> vector 0x8a -> IRQ 68 IOAPIC[1]: Set PCI routing entry (13-18 -> 0x92 -> IRQ 69) 00:07:03[C] -> 13-18 -> vector 0x92 -> IRQ 69 IOAPIC[1]: Set PCI routing entry (13-19 -> 0x9a -> IRQ 70) 00:07:03[D] -> 13-19 -> vector 0x9a -> IRQ 70 IOAPIC[1]: Set PCI routing entry (13-8 -> 0xa2 -> IRQ 59) 00:09:01[A] -> 13-8 -> vector 0xa2 -> IRQ 59 IOAPIC[1]: Set PCI routing entry (13-9 -> 0xaa -> IRQ 60) 00:09:01[B] -> 13-9 -> vector 0xaa -> IRQ 60 IOAPIC[1]: Set PCI routing entry (13-10 -> 0xb2 -> IRQ 61) 00:09:01[C] -> 13-10 -> vector 0xb2 -> IRQ 61 IOAPIC[1]: Set PCI routing entry (13-11 -> 0xba -> IRQ 62) 00:09:01[D] -> 13-11 -> vector 0xba -> IRQ 62 IOAPIC[1]: Set PCI routing entry (13-12 -> 0xc2 -> IRQ 63) 00:09:02[A] -> 13-12 -> vector 0xc2 -> IRQ 63 IOAPIC[1]: Set PCI routing entry (13-13 -> 0xca -> IRQ 64) 00:09:02[B] -> 13-13 -> vector 0xca -> IRQ 64 IOAPIC[1]: Set PCI routing entry (13-14 -> 0xd2 -> IRQ 65) 00:09:02[C] -> 13-14 -> vector 0xd2 -> IRQ 65 IOAPIC[1]: Set PCI routing entry (13-15 -> 0xda -> IRQ 66) 00:09:02[D] -> 13-15 -> vector 0xda -> IRQ 66
PCI: Using ACPI for IRQ routing
PCI: if you experience problems, try using option 'pci=noacpi' Starting kswapd
highmem bounce pool size: 64 pages
BIO: pool of 256 setup, 14Kb (56 bytes/bio)
biovec: init pool 0, 1 entries, 12 bytes
biovec: init pool 1, 4 entries, 48 bytes
biovec: init pool 2, 16 entries, 192 bytes
biovec: init pool 3, 64 entries, 768 bytes
biovec: init pool 4, 128 entries, 1536 bytes
biovec: init pool 5, 256 entries, 3072 bytes
aio_setup: sizeof(struct page) = 44
Journalled Block Device driver loaded
Capability LSM initialized
PCI: Enabling Via external APIC routing
PCI: Via IRQ fixup for 00:05.2, from 7 to 15
PCI: Via IRQ fixup for 00:05.3, from 7 to 15
ACPI: Power Button (FF) [PWRF]
ACPI: Processor [CP07] (supports C1)
ACPI: Processor [CP06] (supports C1)
ACPI: Processor [CP05] (supports C1)
ACPI: Processor [CP04] (supports C1)
ACPI: Processor [CP03] (supports C1)
ACPI: Processor [CP02] (supports C1)
ACPI: Processor [CP01] (supports C1)
ACPI: Processor [CP00] (supports C1)

Signature · 1 line
Mariusz Zielinski
#1 lore raw
Quoted 5 lines · Mariusz Zielinski

Hi list,
as instructed I'm making contact (attached dmesg). IBM claims that machine is supported under linux (RedHat Advanced Server 2.1) but I couldn't find any patches. Is it possible that RedHat is hiding some patches from linux community? :)

Hardly. The patches for pretty much every vendor tree are neatly broken down at http://www.kernelnewbies.org/

Quoted 4 lines

The problem is that /proc/cpuinfo shows at most 4 processors (depending on kernel version). Dmesg shows many "APIC error on CPUx: 00(80)" errors. I can provide you with further details (make some tests) if needed.

I don't know what state 2.5 is on Summit numa but 2.4.19-ac and 2.4.20pre6 plus one patch (I can bounce you the diff if you want) should work nicely on summit chipsets with any distro

#2 lore raw
Quoted 3 lines

I don't know what state 2.5 is on Summit numa but 2.4.19-ac and 2.4.20pre6 plus one patch (I can bounce you the diff if you want) should work nicely on summit chipsets with any distro

2.5 has some problems with interrupts and ACPI that were being worked around ... the right people here will send you some stuff.

M.

#3 lore raw

PATCH 1/1 IBM x440 patches for 2.4 and 2.5

Quoted 8 lines · Martin J. Bligh
Quoted 3 lines

I don't know what state 2.5 is on Summit numa but 2.4.19-ac and 2.4.20pre6 plus one patch (I can bounce you the diff if you want) should work nicely on summit chipsets with any distro

2.5 has some problems with interrupts and ACPI that were being worked around ... the right people here will send you some stuff.

M.

Here are my current summit patches. The 2.5 one is notable for not working properly on the x360. The MPS/ACPI system ID code is a bit confused....

Signature · 3 lines
James Cleverdon
IBM xSeries Linux Solutions
{jamesclv(Unix, preferred), cleverdj(Notes)} at us dot ibm dot com
Documentation/Configure.help +11 -0
diff -ruN 2.4.20-pre6/Documentation/Configure.help p6/Documentation/Configure.help
@@ -252,6 +252,17 @@
   You will need a new lynxer.elf file to flash your firmware with - send
   email to [email protected]
 
+Support for IBM Summit (EXA) systems
+CONFIG_SUMMIT
+  This option is needed for IBM systems that use the Summit/EXA chipset.
+  (EXA: Extendable Xseries Architecture)
+
+  In particular, it is needed for the x440 boxen and helps with
+  performance on x360s.  (The x440 is a NUMA box, even for the 4-CPU
+  model.  The x360 is a non-NUMA system.)
+
+  If you don't have any of these computers, you may safely say N.
+
 IO-APIC support on uniprocessors
 CONFIG_X86_UP_IOAPIC
   An IO-APIC (I/O Advanced Programmable Interrupt Controller) is an
arch/i386/config.in +1 -0
diff -ruN 2.4.20-pre6/arch/i386/config.in p6/arch/i386/config.in
@@ -217,6 +217,7 @@
    fi
 else
    bool 'Multiquad NUMA system' CONFIG_MULTIQUAD
+   dep_bool 'Summit Architecture support' CONFIG_SUMMIT $CONFIG_MULTIQUAD
 fi
 
 bool 'Unsynced TSC support' CONFIG_X86_TSC_DISABLE
arch/i386/defconfig +1 -0
diff -ruN 2.4.20-pre6/arch/i386/defconfig p6/arch/i386/defconfig
@@ -63,6 +63,7 @@
 # CONFIG_MTRR is not set
 CONFIG_SMP=y
 # CONFIG_MULTIQUAD is not set
+# CONFIG_SUMMIT is not set
 CONFIG_HAVE_DEC_LOCK=y
 
 #
arch/i386/kernel/apic.c +21 -8
diff -ruN 2.4.20-pre6/arch/i386/kernel/apic.c p6/arch/i386/kernel/apic.c
@@ -29,6 +29,7 @@
 #include <asm/mtrr.h>
 #include <asm/mpspec.h>
 #include <asm/pgalloc.h>
+#include <asm/smpboot.h>
 
 /* Using APIC to generate smp_local_timer_interrupt? */
 int using_apic_timer = 0;
@@ -260,6 +261,16 @@
 	apic_write_around(APIC_LVT1, value);
 }
 
+static unsigned long apic_ldr_value(unsigned long value)
+{
+	if (clustered_apic_logical)
+		return (value);
+	if (clustered_apic_physical)
+		return (((value) & ~APIC_LDR_MASK) |
+			SET_APIC_LOGICAL_ID(physical_to_logical_apicid(hard_smp_processor_id())));
+	return (((value) & ~APIC_LDR_MASK) | SET_APIC_LOGICAL_ID(1UL << smp_processor_id()));
+}
+
 void __init setup_local_APIC (void)
 {
 	unsigned long value, ver, maxlvt;
@@ -292,21 +303,23 @@
 	 * document number 292116).  So here it goes...
 	 */
 
-	if (!clustered_apic_mode) {
+	if (!clustered_apic_logical) {
 		/*
-		 * In clustered apic mode, the firmware does this for us 
-		 * Put the APIC into flat delivery mode.
-		 * Must be "all ones" explicitly for 82489DX.
+		 * For NUMA-Q (clustered apic logical), the firmware does this
+		 * for us. Otherwise put the APIC into clustered or flat
+		 * delivery mode. Must be "all ones" explicitly for 82489DX.
 		 */
-		apic_write_around(APIC_DFR, 0xffffffff);
+
+		if(clustered_apic_mode)
+			apic_write_around(APIC_DFR, APIC_DFR_CLUSTER);
+		else
+			apic_write_around(APIC_DFR, APIC_DFR_FLAT);
 
 		/*
 		 * Set up the logical destination ID.
 		 */
 		value = apic_read(APIC_LDR);
-		value &= ~APIC_LDR_MASK;
-		value |= (1<<(smp_processor_id()+24));
-		apic_write_around(APIC_LDR, value);
+		apic_write_around(APIC_LDR, apic_ldr_value(value));
 	}
 
 	/*
arch/i386/kernel/io_apic.c +37 -11

110 lines not on this page · raw message

arch/i386/kernel/mpparse.c +132 -23

249 lines not on this page · raw message

arch/i386/kernel/pci-pc.c +1 -1
diff -ruN 2.4.20-pre6/arch/i386/kernel/pci-pc.c p6/arch/i386/kernel/pci-pc.c
@@ -477,7 +477,7 @@
 
 #ifdef CONFIG_MULTIQUAD			
 			/* Multi-Quad has an extended PCI Conf1 */
-			if(clustered_apic_mode)
+			if(clustered_apic_logical)
 				return &pci_direct_mq_conf1;
 #endif				
 			return &pci_direct_conf1;
arch/i386/kernel/process.c +1 -1
diff -ruN 2.4.20-pre6/arch/i386/kernel/process.c p6/arch/i386/kernel/process.c
@@ -187,7 +187,7 @@
 			}
 				/* we will leave sorting out the final value 
 				when we are ready to reboot, since we might not
- 				have set up boot_cpu_id or smp_num_cpu */
+ 				have set up boot_cpu_physical_apicid or smp_num_cpu */
 			break;
 #endif
 		}
arch/i386/kernel/smp.c +4 -2
diff -ruN 2.4.20-pre6/arch/i386/kernel/smp.c p6/arch/i386/kernel/smp.c
@@ -115,7 +115,7 @@
 
 static inline int __prepare_ICR (unsigned int shortcut, int vector)
 {
-	return APIC_DM_FIXED | shortcut | vector | APIC_DEST_LOGICAL;
+	return APIC_DM_FIXED | shortcut | vector | INT_DEST_ADDR_MODE;
 }
 
 static inline int __prepare_ICR2 (unsigned int mask)
@@ -214,7 +214,9 @@
 			/*
 			 * prepare target chip field
 			 */
-			cfg = __prepare_ICR2(cpu_to_logical_apicid(query_cpu));
+			cfg = __prepare_ICR2(clustered_apic_physical ?
+					cpu_to_physical_apicid(query_cpu) :
+					cpu_to_logical_apicid(query_cpu));
 			apic_write_around(APIC_ICR2, cfg);
 		
 			/*
arch/i386/kernel/smpboot.c +54 -75

255 lines not on this page · raw message

include/asm-i386/apicdef.h +15 -3
diff -ruN 2.4.20-pre6/include/asm-i386/apicdef.h p6/include/asm-i386/apicdef.h
@@ -11,8 +11,10 @@
 #define		APIC_DEFAULT_PHYS_BASE	0xfee00000
  
 #define		APIC_ID		0x20
-#define			APIC_ID_MASK		(0x0F<<24)
-#define			GET_APIC_ID(x)		(((x)>>24)&0x0F)
+#define			APIC_ID_MASK		(0xFF<<24)
+#define			GET_APIC_ID(x)		(((x)>>24)&0xFF)
+#define				XAPIC_VER_LOW	0x14	/* Version num range */
+#define				XAPIC_VER_HIGH	0x1F
 #define		APIC_LVR	0x30
 #define			APIC_LVR_MASK		0xFF00FF
 #define			GET_APIC_VERSION(x)	((x)&0xFF)
@@ -32,6 +34,8 @@
 #define			SET_APIC_LOGICAL_ID(x)	(((x)<<24))
 #define			APIC_ALL_CPUS		0xFF
 #define		APIC_DFR	0xE0
+#define			APIC_DFR_CLUSTER	0x0FFFFFFFul	/* Clustered */
+#define			APIC_DFR_FLAT		0xFFFFFFFFul	/* Flat mode */
 #define		APIC_SPIV	0xF0
 #define			APIC_SPIV_FOCUS_DISABLED	(1<<9)
 #define			APIC_SPIV_APIC_ENABLED		(1<<8)
@@ -57,6 +61,7 @@
 #define			APIC_INT_LEVELTRIG	0x08000
 #define			APIC_INT_ASSERT		0x04000
 #define			APIC_ICR_BUSY		0x01000
+#define			APIC_DEST_PHYSICAL	0x00000
 #define			APIC_DEST_LOGICAL	0x00800
 #define			APIC_DM_FIXED		0x00000
 #define			APIC_DM_LOWEST		0x00100
@@ -107,7 +112,14 @@
 
 #define APIC_BASE (fix_to_virt(FIX_APIC_BASE))
 
-#define MAX_IO_APICS 8
+#ifdef CONFIG_MULTIQUAD
+#define MAX_IO_APICS	32
+#else
+#define MAX_IO_APICS	8
+#endif
+
+#define		APIC_BROADCAST_ID_XAPIC		0xFF
+#define 	APIC_BROADCAST_ID_APIC		0x0F
 
 /*
  * the local APIC register structure, memory mapped. Not terribly well
include/asm-i386/io_apic.h +1 -1
diff -ruN 2.4.20-pre6/include/asm-i386/io_apic.h p6/include/asm-i386/io_apic.h
@@ -97,7 +97,7 @@
 extern int mp_irq_entries;
 
 /* MP IRQ source entries */
-extern struct mpc_config_intsrc mp_irqs[MAX_IRQ_SOURCES];
+extern struct mpc_config_intsrc *mp_irqs;
 
 /* non-0 if default (table-less) MP configuration */
 extern int mpc_default_type;
include/asm-i386/mpspec.h +8 -12
diff -ruN 2.4.20-pre6/include/asm-i386/mpspec.h p6/include/asm-i386/mpspec.h
@@ -14,7 +14,8 @@
 #define SMP_MAGIC_IDENT	(('_'<<24)|('P'<<16)|('M'<<8)|'_')
 
 /*
- * a maximum of 16 APICs with the current APIC ID architecture.
+ * a maximum of 16 APICs with the classic APIC ID architecture.
+ * xAPICs can have up to 256.  SAPICs have 16 ID bits.
  */
 #ifdef CONFIG_MULTIQUAD
 #define MAX_APICS 256
@@ -184,11 +185,7 @@
  *	7	2 CPU MCA+PCI
  */
 
-#ifdef CONFIG_MULTIQUAD
-#define MAX_IRQ_SOURCES 512
-#else /* !CONFIG_MULTIQUAD */
 #define MAX_IRQ_SOURCES 256
-#endif /* CONFIG_MULTIQUAD */
 
 #define MAX_MP_BUSSES 32
 enum mp_bustype {
@@ -197,24 +194,23 @@
 	MP_BUS_PCI,
 	MP_BUS_MCA
 };
-extern int mp_bus_id_to_type [MAX_MP_BUSSES];
-extern int mp_bus_id_to_node [MAX_MP_BUSSES];
-extern int mp_bus_id_to_local [MAX_MP_BUSSES];
+extern int *mp_bus_id_to_type;
+extern int *mp_bus_id_to_node;
+extern int *mp_bus_id_to_local;
+extern int *mp_bus_id_to_pci_bus;
 extern int quad_local_to_mp_bus_id [NR_CPUS/4][4];
-extern int mp_bus_id_to_pci_bus [MAX_MP_BUSSES];
 
 extern unsigned int boot_cpu_physical_apicid;
+extern unsigned int boot_cpu_logical_apicid;
 extern unsigned long phys_cpu_present_map;
 extern int smp_found_config;
 extern void find_smp_config (void);
 extern void get_smp_config (void);
 extern int nr_ioapics;
 extern int apic_version [MAX_APICS];
-extern int mp_bus_id_to_type [MAX_MP_BUSSES];
 extern int mp_irq_entries;
-extern struct mpc_config_intsrc mp_irqs [MAX_IRQ_SOURCES];
+extern struct mpc_config_intsrc *mp_irqs;
 extern int mpc_default_type;
-extern int mp_bus_id_to_pci_bus [MAX_MP_BUSSES];
 extern int mp_current_pci_id;
 extern unsigned long mp_lapic_addr;
 extern int pic_mode;
include/asm-i386/smp.h +33 -17

76 lines not on this page · raw message

include/asm-i386/smpboot.h +47 -48

109 lines not on this page · raw message

arch/i386/kernel/acpi.c +9 -1
diff -ruN 2.5.31/arch/i386/kernel/acpi.c t31/arch/i386/kernel/acpi.c
@@ -130,6 +130,8 @@
 	printk(KERN_INFO PREFIX "Local APIC address 0x%08x\n",
 		madt->lapic_address);
 
+	acpi_madt_oem_check(madt->header.oem_id, madt->header.oem_table_id);
+
 	return 0;
 }
 
@@ -364,18 +366,21 @@
 		return result;
 	}
 
+#ifndef CONFIG_ACPI_HT_ONLY
 	result = acpi_table_parse_madt(ACPI_MADT_LAPIC_NMI, acpi_parse_lapic_nmi);
 	if (result < 0) {
 		printk(KERN_ERR PREFIX "Error parsing LAPIC NMI entry\n");
 		/* TBD: Cleanup to allow fallback to MPS */
 		return result;
 	}
+#endif /*!CONFIG_ACPI_HT_ONLY*/
 
 	acpi_lapic = 1;
 
 #endif /*CONFIG_X86_LOCAL_APIC*/
 
 #ifdef CONFIG_X86_IO_APIC
+#ifndef CONFIG_ACPI_HT_ONLY
 
 	/* 
 	 * I/O APIC 
@@ -413,11 +418,14 @@
 
 	acpi_ioapic = 1;
 
+#endif /*!CONFIG_ACPI_HT_ONLY*/
 #endif /*CONFIG_X86_IO_APIC*/
 
 #ifdef CONFIG_X86_LOCAL_APIC
-	if (acpi_lapic && acpi_ioapic)
+	if (acpi_lapic && acpi_ioapic) {
 		smp_found_config = 1;
+		smp_cluster_apic_check();
+	}
 #endif
 
 	return 0;
arch/i386/kernel/apic.c +20 -8
diff -ruN 2.5.31/arch/i386/kernel/apic.c t31/arch/i386/kernel/apic.c
@@ -29,6 +29,7 @@
 #include <asm/mtrr.h>
 #include <asm/mpspec.h>
 #include <asm/pgalloc.h>
+#include <asm/smpboot.h>
 
 /* Using APIC to generate smp_local_timer_interrupt? */
 int using_apic_timer = 0;
@@ -272,6 +273,16 @@
 	apic_write_around(APIC_LVT1, value);
 }
 
+static inline unsigned long apic_ldr_value(unsigned long value)
+{
+	if (clustered_apic_numaq)
+		return (value);
+	if (clustered_apic_xapic)
+		return (((value) & ~APIC_LDR_MASK) |
+			SET_APIC_LOGICAL_ID(xapic_physical_to_logical_apicid(hard_smp_processor_id())));
+	return (((value) & ~APIC_LDR_MASK) | SET_APIC_LOGICAL_ID(1UL << smp_processor_id()));
+}
+
 void __init setup_local_APIC (void)
 {
 	unsigned long value, ver, maxlvt;
@@ -304,21 +315,22 @@
 	 * document number 292116).  So here it goes...
 	 */
 
-	if (!clustered_apic_mode) {
+	if (!clustered_apic_numaq) {
 		/*
-		 * In clustered apic mode, the firmware does this for us 
-		 * Put the APIC into flat delivery mode.
-		 * Must be "all ones" explicitly for 82489DX.
+		 * For NUMA-Q, the firmware does this for us.  Otherwise, put the APIC into clustered or flat
+		 *
+		 * delivery mode.  Must be "all ones" explicitly for 82489DX.
 		 */
-		apic_write_around(APIC_DFR, 0xffffffff);
+		if (clustered_apic_mode)
+			apic_write_around(APIC_DFR, APIC_DFR_CLUSTER);
+		else
+			apic_write_around(APIC_DFR, APIC_DFR_FLAT);
 
 		/*
 		 * Set up the logical destination ID.
 		 */
 		value = apic_read(APIC_LDR);
-		value &= ~APIC_LDR_MASK;
-		value |= (1<<(smp_processor_id()+24));
-		apic_write_around(APIC_LDR, value);
+		apic_write_around(APIC_LDR, apic_ldr_value(value));
 	}
 
 	/*
arch/i386/kernel/io_apic.c +42 -66

185 lines not on this page · raw message

arch/i386/kernel/irq.c +2 -0
diff -ruN 2.5.31/arch/i386/kernel/irq.c t31/arch/i386/kernel/irq.c
@@ -332,6 +332,7 @@
 
 	irq_enter();
 	kstat.irqs[cpu][irq]++;
+	apic_adj_tpr(TPR_IRQ);
 	spin_lock(&desc->lock);
 	desc->handler->ack(irq);
 	/*
@@ -389,6 +390,7 @@
 	 */
 	desc->handler->end(irq);
 	spin_unlock(&desc->lock);
+	apic_adj_tpr(-TPR_IRQ);
 
 	irq_exit();
 
arch/i386/kernel/mpparse.c +100 -20

226 lines not on this page · raw message

arch/i386/kernel/process.c +3 -1
diff -ruN 2.5.31/arch/i386/kernel/process.c t31/arch/i386/kernel/process.c
@@ -145,7 +145,9 @@
 		irq_stat[smp_processor_id()].idle_timestamp = jiffies;
 		while (!need_resched())
 			idle();
+		apic_set_tpr(TPR_TASK);
 		schedule();
+		apic_set_tpr(TPR_IDLE);
 	}
 }
 
@@ -197,7 +199,7 @@
 			}
 				/* we will leave sorting out the final value 
 				when we are ready to reboot, since we might not
- 				have set up boot_cpu_id or smp_num_cpu */
+ 				have set up boot_cpu_physical_apicid or smp_num_cpu */
 			break;
 #endif
 		}
arch/i386/kernel/smpboot.c +64 -76

262 lines not on this page · raw message

arch/i386/kernel/trampoline.S +0 -2
diff -ruN 2.5.31/arch/i386/kernel/trampoline.S t31/arch/i386/kernel/trampoline.S
@@ -36,9 +36,7 @@
 
 ENTRY(trampoline_data)
 r_base = .
-#ifdef CONFIG_MULTIQUAD
 	wbinvd
-#endif /* CONFIG_MULTIQUAD */
 	mov	%cs, %ax	# Code and data in the same place
 	mov	%ax, %ds
 
include/asm-i386/acpi.h +3 -0
diff -ruN 2.5.31/include/asm-i386/acpi.h t31/include/asm-i386/acpi.h
@@ -138,6 +138,9 @@
 /* early initialization routine */
 extern void acpi_reserve_bootmem(void);
 
+/* Check for special HW using OEM name lists */
+extern void acpi_madt_oem_check(char *oem_id, char *oem_table_id);
+
 #endif /*CONFIG_ACPI_SLEEP*/
 
 #endif /*__KERNEL__*/
include/asm-i386/apic.h +25 -0
diff -ruN 2.5.31/include/asm-i386/apic.h t31/include/asm-i386/apic.h
@@ -64,6 +64,22 @@
 	apic_write_around(APIC_EOI, 0);
 }
 
+static inline void apic_set_tpr(unsigned long val)
+{
+	unsigned long value;
+
+	value = apic_read(APIC_TASKPRI);
+	apic_write_around(APIC_TASKPRI, (value & ~APIC_TPRI_MASK) + val);
+}
+
+static inline void apic_adj_tpr(long adj)
+{
+	unsigned long value;
+
+	value = apic_read(APIC_TASKPRI);
+	apic_write_around(APIC_TASKPRI, value + adj);
+}
+
 extern int get_maxlvt(void);
 extern void clear_local_APIC(void);
 extern void connect_bsp_APIC (void);
@@ -96,6 +112,15 @@
 #define NMI_LOCAL_APIC	2
 #define NMI_INVALID	3
 
+#else /* CONFIG_X86_LOCAL_APIC */
+#define apic_set_tpr(val)
+#define apic_adj_tpr(adj)
 #endif /* CONFIG_X86_LOCAL_APIC */
 
+/* Priority values for apic_adj_tpr() and apic_set_tpr() */
+/* xAPICs only do priority comparisons on the upper nibble. */
+#define TPR_IDLE	(0x00L)
+#define TPR_TASK	(0x10L)
+#define TPR_IRQ		(0x10L)
+
 #endif /* __ASM_APIC_H */
include/asm-i386/apicdef.h +14 -3
diff -ruN 2.5.31/include/asm-i386/apicdef.h t31/include/asm-i386/apicdef.h
@@ -11,8 +11,10 @@
 #define		APIC_DEFAULT_PHYS_BASE	0xfee00000
  
 #define		APIC_ID		0x20
-#define			APIC_ID_MASK		(0x0F<<24)
-#define			GET_APIC_ID(x)		(((x)>>24)&0x0F)
+#define			APIC_ID_MASK		(0xFF<<24)
+#define			GET_APIC_ID(x)		(((x)>>24)&0xFF)
+#define				XAPIC_VER_LOW	0x14	/* Version num range */
+#define				XAPIC_VER_HIGH	0x1F
 #define		APIC_LVR	0x30
 #define			APIC_LVR_MASK		0xFF00FF
 #define			GET_APIC_VERSION(x)	((x)&0xFF)
@@ -32,6 +34,8 @@
 #define			SET_APIC_LOGICAL_ID(x)	(((x)<<24))
 #define			APIC_ALL_CPUS		0xFF
 #define		APIC_DFR	0xE0
+#define			APIC_DFR_CLUSTER	0x0FFFFFFFul	/* Clustered */
+#define			APIC_DFR_FLAT		0xFFFFFFFFul	/* Flat mode */
 #define		APIC_SPIV	0xF0
 #define			APIC_SPIV_FOCUS_DISABLED	(1<<9)
 #define			APIC_SPIV_APIC_ENABLED		(1<<8)
@@ -58,6 +62,7 @@
 #define			APIC_INT_ASSERT		0x04000
 #define			APIC_ICR_BUSY		0x01000
 #define			APIC_DEST_LOGICAL	0x00800
+#define				APIC_DEST_PHYSICAL	0x0	/* For symmetry */
 #define			APIC_DM_FIXED		0x00000
 #define			APIC_DM_LOWEST		0x00100
 #define			APIC_DM_SMI		0x00200
@@ -108,7 +113,13 @@
 
 #define APIC_BASE (fix_to_virt(FIX_APIC_BASE))
 
-#define MAX_IO_APICS 8
+#define MAX_IO_APICS 32	/* Summit boxes can have 4*(2+3*2) I/O APICs */
+
+/*
+ * The intr broadcast ID is 0xF for old APICs and 0xFF for xAPICs.
+ */
+#define APIC_BROADCAST_ID_XAPIC	0xFF
+#define APIC_BROADCAST_ID_APIC	0x0F
 
 /*
  * the local APIC register structure, memory mapped. Not terribly well
include/asm-i386/mpspec.h +3 -5
diff -ruN 2.5.31/include/asm-i386/mpspec.h t31/include/asm-i386/mpspec.h
@@ -14,13 +14,10 @@
 #define SMP_MAGIC_IDENT	(('_'<<24)|('P'<<16)|('M'<<8)|'_')
 
 /*
- * a maximum of 16 APICs with the current APIC ID architecture.
+ * A maximum of 16 APICs with the classic APIC ID architecture.
+ * xAPICs can have up to 256.
  */
-#ifdef CONFIG_MULTIQUAD
 #define MAX_APICS 256
-#else /* !CONFIG_MULTIQUAD */
-#define MAX_APICS 16
-#endif /* CONFIG_MULTIQUAD */
 
 #define MAX_MPC_ENTRY 1024
 
@@ -204,6 +201,7 @@
 extern int mp_bus_id_to_pci_bus [MAX_MP_BUSSES];
 
 extern unsigned int boot_cpu_physical_apicid;
+extern unsigned int boot_cpu_logical_apicid;
 extern unsigned long phys_cpu_present_map;
 extern int smp_found_config;
 extern void find_smp_config (void);
include/asm-i386/smp.h +50 -37

113 lines not on this page · raw message

include/asm-i386/smpboot.h +29 -49

91 lines not on this page · raw message