Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 35d534a3 authored by Matthew Garrett's avatar Matthew Garrett Committed by Andi Kleen
Browse files

[PATCH] x86: - restore i8259A eoi status on resume 



Got it. 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: default avatarMatthew Garrett <mjg59@srcf.ucam.org>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
parent f354b3a9

arch/i386/kernel/i8259.c

+5 −1
Original line number Original line Diff line number Diff line
@@ -45,6 +45,8 @@ static void end_8259A_irq (unsigned int irq) 




#define shutdown_8259A_irq	disable_8259A_irq

#define shutdown_8259A_irq	disable_8259A_irq





static int i8259A_auto_eoi;



static void mask_and_ack_8259A(unsigned int);

static void mask_and_ack_8259A(unsigned int);





unsigned int startup_8259A_irq(unsigned int irq)

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)

static int i8259A_resume(struct sys_device *dev)

{

{

	init_8259A(0);

	init_8259A(i8259A_auto_eoi);

	restore_ELCR(irq_trigger);

	restore_ELCR(irq_trigger);

	return 0;

	return 0;

}

}
@@ -301,6 +303,8 @@ void init_8259A(int auto_eoi) 
{

{

	unsigned long flags;

	unsigned long flags;





	i8259A_auto_eoi = auto_eoi;



	spin_lock_irqsave(&i8259A_lock, flags);

	spin_lock_irqsave(&i8259A_lock, flags);





	outb(0xff, PIC_MASTER_IMR);	/* mask all of 8259A-1 */

	outb(0xff, PIC_MASTER_IMR);	/* mask all of 8259A-1 */

arch/x86_64/kernel/i8259.c

+5 −1
Original line number Original line Diff line number Diff line
@@ -123,6 +123,8 @@ void (*interrupt[NR_IRQS])(void) = { 




DEFINE_SPINLOCK(i8259A_lock);

DEFINE_SPINLOCK(i8259A_lock);





static int i8259A_auto_eoi;



static void end_8259A_irq (unsigned int irq)

static void end_8259A_irq (unsigned int irq)

{

{

	if (irq > 256) { 

	if (irq > 256) {
@@ -336,6 +338,8 @@ void init_8259A(int auto_eoi) 
{

{

	unsigned long flags;

	unsigned long flags;





	i8259A_auto_eoi = auto_eoi;



	spin_lock_irqsave(&i8259A_lock, flags);

	spin_lock_irqsave(&i8259A_lock, flags);





	outb(0xff, 0x21);	/* mask all of 8259A-1 */

	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)

static int i8259A_resume(struct sys_device *dev)

{

{

	init_8259A(0);

	init_8259A(i8259A_auto_eoi);

	restore_ELCR(irq_trigger);

	restore_ELCR(irq_trigger);

	return 0;

	return 0;

}

}