From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S265032AbTF1Aat (ORCPT ); Fri, 27 Jun 2003 20:30:49 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S264983AbTF1AaZ (ORCPT ); Fri, 27 Jun 2003 20:30:25 -0400 Received: from e31.co.us.ibm.com ([32.97.110.129]:41938 "EHLO e31.co.us.ibm.com") by vger.kernel.org with ESMTP id S265007AbTF1A2z (ORCPT ); Fri, 27 Jun 2003 20:28:55 -0400 Subject: [PATCH] linux-2.4.22-pre2_x440-acpi-fix_A0 From: john stultz To: Andrew Grover Cc: lkml Content-Type: text/plain Organization: Message-Id: <1056760485.28320.242.camel@w-jstultz2.beaverton.ibm.com> Mime-Version: 1.0 X-Mailer: Ximian Evolution 1.2.4 Date: 27 Jun 2003 17:34:45 -0700 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Andy, all, This patch fixes the new ACPI booting code to work XAPIC systems like the IBM x440s. Please add to your tree and send to Marcelo. thanks -john diff -Nru a/arch/i386/kernel/acpi.c b/arch/i386/kernel/acpi.c --- a/arch/i386/kernel/acpi.c Fri Jun 27 17:28:24 2003 +++ b/arch/i386/kernel/acpi.c Fri Jun 27 17:28:24 2003 @@ -129,6 +129,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; } diff -Nru a/arch/i386/kernel/io_apic.c b/arch/i386/kernel/io_apic.c --- a/arch/i386/kernel/io_apic.c Fri Jun 27 17:28:24 2003 +++ b/arch/i386/kernel/io_apic.c Fri Jun 27 17:28:24 2003 @@ -1732,6 +1732,13 @@ apic_id = reg_00.ID; } + /* XAPICs do not need unique IDs */ + if (clustered_apic_mode == CLUSTERED_APIC_XAPIC){ + printk(KERN_INFO "IOAPIC[%d]: Assigned apic_id %d\n", + ioapic, apic_id); + return apic_id; + } + /* * Every APIC in a system must have a unique ID or we get lots of nice * 'stuck on smp_invalidate_needed IPI wait' messages. diff -Nru a/arch/i386/kernel/mpparse.c b/arch/i386/kernel/mpparse.c --- a/arch/i386/kernel/mpparse.c Fri Jun 27 17:28:24 2003 +++ b/arch/i386/kernel/mpparse.c Fri Jun 27 17:28:24 2003 @@ -1252,6 +1252,23 @@ io_apic_set_pci_routing(ioapic, ioapic_pin, irq); } +/* Hook from generic ACPI tables.c */ +void __init acpi_madt_oem_check(char *oem_id, char *oem_table_id) +{ + if (!strncmp(oem_id, "IBM", 3) && + (!strncmp(oem_table_id, "SERVIGIL", 8) || + !strncmp(oem_table_id, "EXA", 3) || + !strncmp(oem_table_id, "RUTHLESS", 8))){ + clustered_apic_mode = CLUSTERED_APIC_XAPIC; + apic_broadcast_id = APIC_BROADCAST_ID_XAPIC; + int_dest_addr_mode = APIC_DEST_PHYSICAL; + int_delivery_mode = dest_Fixed; + esr_disable = 1; + /*Start cyclone clock*/ + cyclone_setup(0); + } +} + #ifdef CONFIG_ACPI_PCI void __init mp_parse_prt (void) diff -Nru a/include/asm-i386/acpi.h b/include/asm-i386/acpi.h --- a/include/asm-i386/acpi.h Fri Jun 27 17:28:24 2003 +++ b/include/asm-i386/acpi.h Fri Jun 27 17:28:24 2003 @@ -165,6 +165,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*/