The patch titled
x86: restore i8259A eoi status on resume
has been removed from the -mm tree. Its filename is
x86-restore-i8259a-eoi-status-on-resume.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: x86: restore i8259A eoi status on resume
From: Matthew Garrett <mjg59@xxxxxxxxxxxxx>
i8259A_resume calls init_8259A(0) unconditionally, even if auto_eoi has
been set. Keep track of the current status and restore that on resume.
This fixes it for AMD64 and i386.
Signed-off-by: Matthew Garrett <mjg59@xxxxxxxxxxxxx>
Cc: Pavel Machek <pavel@xxxxxx>
Cc: "Rafael J. Wysocki" <rjw@xxxxxxx>
Cc: Andi Kleen <ak@xxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/i386/kernel/i8259.c | 6 +++++-
arch/x86_64/kernel/i8259.c | 6 +++++-
2 files changed, 10 insertions(+), 2 deletions(-)
diff -puN arch/i386/kernel/i8259.c~x86-restore-i8259a-eoi-status-on-resume arch/i386/kernel/i8259.c
--- a/arch/i386/kernel/i8259.c~x86-restore-i8259a-eoi-status-on-resume
+++ a/arch/i386/kernel/i8259.c
@@ -45,6 +45,8 @@ static void end_8259A_irq (unsigned int
#define shutdown_8259A_irq disable_8259A_irq
+static int i8259A_auto_eoi;
+
static void mask_and_ack_8259A(unsigned int);
unsigned int startup_8259A_irq(unsigned int irq)
@@ -253,7 +255,7 @@ static void save_ELCR(char *trigger)
static int i8259A_resume(struct sys_device *dev)
{
- init_8259A(0);
+ init_8259A(i8259A_auto_eoi);
restore_ELCR(irq_trigger);
return 0;
}
@@ -301,6 +303,8 @@ void init_8259A(int auto_eoi)
{
unsigned long flags;
+ i8259A_auto_eoi = auto_eoi;
+
spin_lock_irqsave(&i8259A_lock, flags);
outb(0xff, PIC_MASTER_IMR); /* mask all of 8259A-1 */
diff -puN arch/x86_64/kernel/i8259.c~x86-restore-i8259a-eoi-status-on-resume arch/x86_64/kernel/i8259.c
--- a/arch/x86_64/kernel/i8259.c~x86-restore-i8259a-eoi-status-on-resume
+++ a/arch/x86_64/kernel/i8259.c
@@ -123,6 +123,8 @@ void (*interrupt[NR_IRQS])(void) = {
DEFINE_SPINLOCK(i8259A_lock);
+static int i8259A_auto_eoi;
+
static void end_8259A_irq (unsigned int irq)
{
if (irq > 256) {
@@ -336,6 +338,8 @@ void init_8259A(int auto_eoi)
{
unsigned long flags;
+ i8259A_auto_eoi = auto_eoi;
+
spin_lock_irqsave(&i8259A_lock, flags);
outb(0xff, 0x21); /* mask all of 8259A-1 */
@@ -394,7 +398,7 @@ static void save_ELCR(char *trigger)
static int i8259A_resume(struct sys_device *dev)
{
- init_8259A(0);
+ init_8259A(i8259A_auto_eoi);
restore_ELCR(irq_trigger);
return 0;
}
_
Patches currently in -mm which might be from mjg59@xxxxxxxxxxxxx are
2.6-sony_acpi4.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
