From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751879AbbANDHP (ORCPT ); Tue, 13 Jan 2015 22:07:15 -0500 Received: from mga03.intel.com ([134.134.136.65]:50996 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751086AbbANDHO (ORCPT ); Tue, 13 Jan 2015 22:07:14 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.97,862,1389772800"; d="scan'208";a="440264737" From: Jiang Liu To: Sander Eikelenboom , David Vrabel , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , x86@kernel.org, Jiang Liu , Grant Likely , Yinghai Lu Cc: Konrad Rzeszutek Wilk , linux-kernel@vger.kernel.org Subject: [PATCH v3] [Bugfix] x86/apic: Fix xen IRQ allocation failure caused by commit b81975eade8c Date: Wed, 14 Jan 2015 11:09:35 +0800 Message-Id: <1421204979-30619-1-git-send-email-jiang.liu@linux.intel.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit b81975eade8c ("x86, irq: Clean up irqdomain transition code") breaks xen IRQ allocation because xen_smp_prepare_cpus() doesn't invoke setup_IO_APIC(), so no irqdomains created for IOAPICs and mp_map_pin_to_irq() fails at the very beginning. So move creating of IOAPIC irqdomains from setup_IO_APIC() into arch_early_ioapic_init(). Signed-off-by: Jiang Liu Signed-off-by: David Vrabel Reported-and-tested-by: Sander Eikelenboom Cc: Konrad Rzeszutek Wilk --- arch/x86/kernel/apic/io_apic.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c index 3f5f60406ab1..1117c84cefe4 100644 --- a/arch/x86/kernel/apic/io_apic.c +++ b/arch/x86/kernel/apic/io_apic.c @@ -245,6 +245,8 @@ static void free_ioapic_saved_registers(int idx) ioapics[idx].saved_registers = NULL; } +static int mp_irqdomain_create(int ioapic); + int __init arch_early_ioapic_init(void) { struct irq_cfg *cfg; @@ -253,8 +255,10 @@ int __init arch_early_ioapic_init(void) if (!nr_legacy_irqs()) io_apic_irqs = ~0UL; - for_each_ioapic(i) + for_each_ioapic(i) { + BUG_ON(mp_irqdomain_create(i)); alloc_ioapic_saved_registers(i); + } /* * For legacy IRQ's, start with assigning irq0 to irq15 to @@ -2371,16 +2375,12 @@ static void ioapic_destroy_irqdomain(int idx) void __init setup_IO_APIC(void) { - int ioapic; - /* * calling enable_IO_APIC() is moved to setup_local_APIC for BP */ io_apic_irqs = nr_legacy_irqs() ? ~PIC_IRQS : ~0UL; apic_printk(APIC_VERBOSE, "ENABLING IO-APIC IRQs\n"); - for_each_ioapic(ioapic) - BUG_ON(mp_irqdomain_create(ioapic)); /* * Set up IO-APIC IRQ routing. @@ -2929,7 +2929,8 @@ int mp_register_ioapic(int id, u32 address, u32 gsi_base, /* * If mp_register_ioapic() is called during early boot stage when * walking ACPI/SFI/DT tables, it's too early to create irqdomain, - * we are still using bootmem allocator. So delay it to setup_IO_APIC(). + * we are still using bootmem allocator.So delay it to + * arch_early_ioapic_init(). */ if (hotplug) { if (mp_irqdomain_create(idx)) { -- 1.7.10.4