Re: [PATCH] x86: Re-enable IO-APIC for non-SMP X86_32

Bryan O'Donoghue
2015-01-22T22:52:09Z

On 22/01/15 21:42, Thomas Gleixner wrote:
> config X86_UP_APIC
> bool "Local APIC support on uniprocessors"
> - depends on X86_32 && !SMP && !X86_32_NON_STANDARD && !PCI_MSI
> + depends on X86_32 && !SMP && !X86_32_NON_STANDARD
> ---help---
> A local APIC (Advanced Programmable Interrupt Controller) is an
> integrated interrupt controller in the CPU. If you have a single-CPU
> @@ -872,6 +872,10 @@ config X86_UP_APIC
> performance counters), and the NMI watchdog which detects hard
> lockups.
>
> +config X86_UP_APIC_MSI
> + def_bool y
> + select X86_UP_APIC if X86_32 && !SMP && !X86_32_NON_STANDARD && PCI_MSI
> +
> config X86_UP_IOAPIC
> bool "IO-APIC support on uniprocessors"
> depends on X86_UP_APIC

OK.

That works.

You can select local apic and/or io-apic on X86_32 individually with
PCI_MSI swiched off.

If you switch on PCI_MSI the option for X86_UP_APIC_MSI disappears from
and is silently selected by X86_UP_APIC_MSI.