From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S264493AbTGGVmc (ORCPT ); Mon, 7 Jul 2003 17:42:32 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S264611AbTGGVmc (ORCPT ); Mon, 7 Jul 2003 17:42:32 -0400 Received: from e5.ny.us.ibm.com ([32.97.182.105]:35202 "EHLO e5.ny.us.ibm.com") by vger.kernel.org with ESMTP id S264493AbTGGVma (ORCPT ); Mon, 7 Jul 2003 17:42:30 -0400 Subject: [PATCH] linux-2.4.22-pre3_clear-smi-fix_A0 From: john stultz To: marcelo Cc: Alan Cox , lkml Content-Type: text/plain Organization: Message-Id: <1057614898.27380.86.camel@w-jstultz2.beaverton.ibm.com> Mime-Version: 1.0 X-Mailer: Ximian Evolution 1.2.4 Date: 07 Jul 2003 14:54:58 -0700 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Marcelo, all, Some of our more recent hardware requires that SMIs are routed through the IOAPIC, thus when we clear_IO_APIC() at boot time, we clear the BIOS initialized SMI pin. This basically clobbers the SMI, which can cause problems with console redirection as well keeping us from being able to transition into full ACPI mode. This patch (back ported from 2.5) simply reads the apic entry in clear_IO_APIC to make sure the delivery_mode isn't dest_SMI. If it is, we leave the apic entry alone and return. With this patch, booting with full ACPI works and SMIs function properly. Please apply thanks -john diff -Nru a/arch/i386/kernel/io_apic.c b/arch/i386/kernel/io_apic.c --- a/arch/i386/kernel/io_apic.c Mon Jul 7 14:00:31 2003 +++ b/arch/i386/kernel/io_apic.c Mon Jul 7 14:00:31 2003 @@ -169,6 +169,14 @@ { struct IO_APIC_route_entry entry; unsigned long flags; + + /* Check delivery_mode to be sure we're not clearing an SMI pin */ + spin_lock_irqsave(&ioapic_lock, flags); + *(((int*)&entry) + 0) = io_apic_read(apic, 0x10 + 2 * pin); + *(((int*)&entry) + 1) = io_apic_read(apic, 0x11 + 2 * pin); + spin_unlock_irqrestore(&ioapic_lock, flags); + if (entry.delivery_mode == dest_SMI) + return; /* * Disable it in the IO-APIC irq-routing table: