Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752758AbaLSOEe (ORCPT ); Fri, 19 Dec 2014 09:04:34 -0500 Received: from terminus.zytor.com ([198.137.202.10]:45845 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752137AbaLSOEc (ORCPT ); Fri, 19 Dec 2014 09:04:32 -0500 Date: Fri, 19 Dec 2014 06:03:28 -0800 From: tip-bot for Yinghai Lu Message-ID: Cc: hpa@zytor.com, yinghai@kernel.org, bhelgaas@google.com, tglx@linutronix.de, konrad.wilk@oracle.com, gregkh@linuxfoundation.org, bp@alien8.de, joro@8bytes.org, rjw@rjwysocki.net, sebastian@breakpoint.cc, rdunlap@infradead.org, mingo@kernel.org, linux-kernel@vger.kernel.org, benh@kernel.crashing.org, prarit@redhat.com, grant.likely@linaro.org, jiang.liu@linux.intel.com, tony.luck@intel.com Reply-To: jiang.liu@linux.intel.com, grant.likely@linaro.org, benh@kernel.crashing.org, prarit@redhat.com, tony.luck@intel.com, linux-kernel@vger.kernel.org, rjw@rjwysocki.net, rdunlap@infradead.org, sebastian@breakpoint.cc, mingo@kernel.org, tglx@linutronix.de, bhelgaas@google.com, hpa@zytor.com, yinghai@kernel.org, konrad.wilk@oracle.com, joro@8bytes.org, bp@alien8.de, gregkh@linuxfoundation.org In-Reply-To: <1414387308-27148-11-git-send-email-jiang.liu@linux.intel.com> References: <1414387308-27148-11-git-send-email-jiang.liu@linux.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/apic] x86, irq: Prefer assigned ID in APIC ID register for x86_64 Git-Commit-ID: 5411dc4ccb25de133701774dd2a3cf3f7e246f17 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 5411dc4ccb25de133701774dd2a3cf3f7e246f17 Gitweb: http://git.kernel.org/tip/5411dc4ccb25de133701774dd2a3cf3f7e246f17 Author: Yinghai Lu AuthorDate: Mon, 27 Oct 2014 13:21:40 +0800 Committer: Thomas Gleixner CommitDate: Tue, 16 Dec 2014 14:08:15 +0100 x86, irq: Prefer assigned ID in APIC ID register for x86_64 Perfer the assigned ID in APIC ID register for x86_64 if it's still available. [ tglx: Added comments ] Signed-off-by: Yinghai Lu Signed-off-by: Jiang Liu Cc: Konrad Rzeszutek Wilk Cc: Tony Luck Cc: Joerg Roedel Cc: Greg Kroah-Hartman Cc: Sebastian Andrzej Siewior Cc: Benjamin Herrenschmidt Cc: Rafael J. Wysocki Cc: Bjorn Helgaas Cc: Randy Dunlap Cc: Borislav Petkov Cc: Grant Likely Cc: Prarit Bhargava Link: http://lkml.kernel.org/r/1414387308-27148-11-git-send-email-jiang.liu@linux.intel.com Signed-off-by: Thomas Gleixner --- arch/x86/kernel/apic/io_apic.c | 45 ++++++++++++++++++++++++++++++++++++------ 1 file changed, 39 insertions(+), 6 deletions(-) diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c index 654b69b..86fd286 100644 --- a/arch/x86/kernel/apic/io_apic.c +++ b/arch/x86/kernel/apic/io_apic.c @@ -3580,26 +3580,59 @@ static int __init io_apic_get_unique_id(int ioapic, int apic_id) return apic_id; } -static u8 __init io_apic_unique_id(u8 id) +static u8 __init io_apic_unique_id(int idx, u8 id) { if ((boot_cpu_data.x86_vendor == X86_VENDOR_INTEL) && !APIC_XAPIC(apic_version[boot_cpu_physical_apicid])) - return io_apic_get_unique_id(nr_ioapics, id); + return io_apic_get_unique_id(idx, id); else return id; } #else -static u8 __init io_apic_unique_id(u8 id) +static u8 __init io_apic_unique_id(int idx, u8 id) { - int i; + union IO_APIC_reg_00 reg_00; DECLARE_BITMAP(used, 256); + unsigned long flags; + u8 new_id; + int i; bitmap_zero(used, 256); for_each_ioapic(i) __set_bit(mpc_ioapic_id(i), used); + + /* Hand out the requested id if available */ if (!test_bit(id, used)) return id; - return find_first_zero_bit(used, 256); + + /* + * Read the current id from the ioapic and keep it if + * available. + */ + raw_spin_lock_irqsave(&ioapic_lock, flags); + reg_00.raw = io_apic_read(idx, 0); + raw_spin_unlock_irqrestore(&ioapic_lock, flags); + new_id = reg_00.bits.ID; + if (!test_bit(new_id, used)) { + apic_printk(APIC_VERBOSE, KERN_INFO + "IOAPIC[%d]: Using reg apic_id %d instead of %d\n", + idx, new_id, id); + return new_id; + } + + /* + * Get the next free id and write it to the ioapic. + */ + new_id = find_first_zero_bit(used, 256); + reg_00.bits.ID = new_id; + raw_spin_lock_irqsave(&ioapic_lock, flags); + io_apic_write(idx, 0, reg_00.raw); + reg_00.raw = io_apic_read(idx, 0); + raw_spin_unlock_irqrestore(&ioapic_lock, flags); + /* Sanity check */ + BUG_ON(reg_00.bits.ID != new_id); + + return new_id; } #endif @@ -3865,7 +3898,7 @@ void __init mp_register_ioapic(int id, u32 address, u32 gsi_base, return; } - ioapics[idx].mp_config.apicid = io_apic_unique_id(id); + ioapics[idx].mp_config.apicid = io_apic_unique_id(idx, id); ioapics[idx].mp_config.apicver = io_apic_get_version(idx); /* -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/