From: "Rafael J. Wysocki" <rjw@sisk•pl>
To: Ingo Molnar <mingo@elte•hu>
Cc: Stephen Rothwell <sfr@canb•auug.org.au>,
linux-next@vger•kernel.org, LKML <linux-kernel@vger•kernel.org>,
Kernel Testers List <kernel-testers@vger•kernel.org>,
"Maciej W. Rozycki" <macro@linux-mips•org>,
Andreas Herrmann <andreas.herrmann3@amd•com>,
Matthew Garrett <mjg59@srcf•ucam.org>
Subject: Re: linux-next: Tree for July 8: nx6325-related commits
Date: Wed, 9 Jul 2008 00:48:47 +0200 [thread overview]
Message-ID: <200807090048.48589.rjw@sisk.pl> (raw)
In-Reply-To: <20080708192251.3275d283.sfr@canb.auug.org.au>
Hi Ingo,
On Tuesday, 8 of July 2008, Stephen Rothwell wrote:
> Hi all,
>
> Changes since next-20080704:
>
> Temporarily dropped tree: ttydev (since it would not import on top of any
> tree I have)
>
> The usb.current gained a white space conflict against Linus' tree (which I
> assume will be gone as soon as Greg rebases his tree).
>
> The usb tree gained a conflict against Linus' tree.
>
> The tip-core tree gained a conflict against Linus' tree.
>
> The sched tree lost a build fix patch.
>
> The x86 tree lost a conflict against Linus' tree but gained two against
> the ftrace tree.
Commits 0b3d81ad4f765513347a04434efc15cbdc4e1c54
("x86, ioapic, acpi: add a knob to disable IRQ 0 through I/O APIC") and
e38502eb8aa82314d5ab0eba45f50e6790dadd88
("x86, ioapic, acpi quirk: disable IRQ 0 through I/O APIC for some HP systems")
don't work on x86_64, because acpi_dmi_table[] depends on __i386__.
Moreover, if you make them work (by removing that dependency), they hang my
nx6325 solid early during boot.
The revert patch is appended for your convenience. ;-)
Thanks,
Rafael
---
arch/x86/kernel/acpi/boot.c | 47 --------------------------------------------
1 file changed, 47 deletions(-)
Index: linux-next/arch/x86/kernel/acpi/boot.c
===================================================================
--- linux-next.orig/arch/x86/kernel/acpi/boot.c
+++ linux-next/arch/x86/kernel/acpi/boot.c
@@ -83,8 +83,6 @@ int acpi_lapic;
int acpi_ioapic;
int acpi_strict;
-static int disable_irq0_through_ioapic __initdata;
-
u8 acpi_sci_flags __initdata;
int acpi_sci_override_gsi __initdata;
int acpi_skip_timer_override __initdata;
@@ -996,10 +994,6 @@ mp_override_legacy_irq(u8 bus_irq, u8 po
int pin;
struct mp_config_intsrc mp_irq;
- /* Skip the 8254 timer interrupt (IRQ 0) if requested. */
- if (bus_irq == 0 && disable_irq0_through_ioapic)
- return;
-
/*
* Convert 'gsi' to 'ioapic.pin'.
*/
@@ -1066,10 +1060,6 @@ static void __init mp_config_acpi_legacy
for (i = 0; i < 16; i++) {
int idx;
- /* Skip the 8254 timer interrupt (IRQ 0) if requested. */
- if (i == 0 && disable_irq0_through_ioapic)
- continue;
-
for (idx = 0; idx < mp_irq_entries; idx++) {
struct mp_config_intsrc *irq = mp_irqs + idx;
@@ -1429,17 +1419,6 @@ static int __init force_acpi_ht(const st
}
/*
- * Don't register any I/O APIC entries for the 8254 timer IRQ.
- */
-static int __init
-dmi_disable_irq0_through_ioapic(const struct dmi_system_id *d)
-{
- pr_notice("%s detected: disabling IRQ 0 through I/O APIC\n", d->ident);
- disable_irq0_through_ioapic = 1;
- return 0;
-}
-
-/*
* If your system is blacklisted here, but you find that acpi=force
* works for you, please contact acpi-devel@sourceforge•net
*/
@@ -1606,32 +1585,6 @@ static struct dmi_system_id __initdata a
DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 360"),
},
},
- /*
- * HP laptops which use a DSDT reporting as HP/SB400/10000,
- * which includes some code which overrides all temperature
- * trip points to 16C if the INTIN2 input of the I/O APIC
- * is enabled. This input is incorrectly designated the
- * ISA IRQ 0 via an interrupt source override even though
- * it is wired to the output of the master 8259A and INTIN0
- * is not connected at all. Abandon any attempts to route
- * IRQ 0 through the I/O APIC therefore.
- */
- {
- .callback = dmi_disable_irq0_through_ioapic,
- .ident = "HP NX6125 laptop",
- .matches = {
- DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
- DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq nx6125"),
- },
- },
- {
- .callback = dmi_disable_irq0_through_ioapic,
- .ident = "HP NX6325 laptop",
- .matches = {
- DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
- DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq nx6325"),
- },
- },
{}
};
next prev parent reply other threads:[~2008-07-08 22:47 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-08 9:22 linux-next: Tree for July 8 Stephen Rothwell
2008-07-08 18:16 ` linux-next: Tree for July 8 (HID) Randy Dunlap
2008-07-09 7:59 ` Jiri Kosina
2008-07-18 22:37 ` Randy Dunlap
2008-07-21 15:55 ` Jiri Kosina
2008-07-08 18:35 ` linux-next: Tree for July 8 (ns8390) Randy Dunlap
2008-07-08 18:30 ` Alan Cox
2008-07-08 18:35 ` Alan Cox
2008-07-08 21:47 ` Randy Dunlap
2008-07-08 22:48 ` Rafael J. Wysocki [this message]
[not found] ` <200807090048.48589.rjw-KKrjLPT3xs0@public.gmane.org>
2008-07-09 14:17 ` linux-next: Tree for July 8: nx6325-related commits Maciej W. Rozycki
[not found] ` <Pine.LNX.4.55.0807091429220.5665-j8+e0ZhYU2SU0huXySazC6sMm+1xrEX8@public.gmane.org>
2008-07-10 11:51 ` Andreas Herrmann
[not found] ` <20080710115102.GB2301-rMjmLWMCR8hKF45tlneXZg@public.gmane.org>
2008-07-11 19:50 ` Maciej W. Rozycki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200807090048.48589.rjw@sisk.pl \
--to=rjw@sisk$(echo .)pl \
--cc=andreas.herrmann3@amd$(echo .)com \
--cc=kernel-testers@vger$(echo .)kernel.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=macro@linux-mips$(echo .)org \
--cc=mingo@elte$(echo .)hu \
--cc=mjg59@srcf$(echo .)ucam.org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox