X86: Probe for PIC and set legacy_pic appropriately
Subsystems (2)
PATCH v2 1/1 X86: Probe for PIC and set legacy_pic appropriately
Probe for the existance of legacy PIC, if one does not exist, use the null_legacy_pic.
This patch implements the proposal put forth by H. Peter Anvin <[email protected]>.
In version V1 of the patch, I had cleaned up the code based on comments from Peter.
In this version of the patch, I have addressed additional comments from Peter.
--- arch/x86/kernel/cpu/mshyperv.c | 2 -- arch/x86/kernel/i8259.c | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-)
arch/x86/kernel/cpu/mshyperv.c +0 -2
@@ -133,8 +133,6 @@ static void __init ms_hyperv_init_platform(void)printk (KERN_INFO "HyperV: LAPIC Timer Frequency: %#x\n" , lapic_timer_frequency); -printk (KERN_INFO "HyperV: Using null_legacy_pic\n" ); - legacy_pic = &null_legacy_pic; }#endif
arch/x86/kernel/i8259.c +19 -0
@@ -299,11 +299,30 @@ static void unmask_8259A(void)static void init_8259A (int auto_eoi) {unsigned long flags; +unsigned char probe_val = ~(1 <<PIC_CASCADE_IR ); +unsigned char new_val; i8259A_auto_eoi = auto_eoi;raw_spin_lock_irqsave (&i8259A_lock, flags); +/* +* Check to see if we have a PIC. +* Mask all except the cascade and read +* back the value we just wrote. If we don't +* have a PIC, we will read 0xff as opposed to the +* value we wrote. +*/ +outb (0xff ,PIC_SLAVE_IMR );/* mask all of 8259A-2 */ +outb (probe_val,PIC_MASTER_IMR ); + new_val =inb (PIC_MASTER_IMR ); +if (probe_val != new_val) { +printk (KERN_INFO "Using NULL legacy PIC\n" ); + legacy_pic = &null_legacy_pic; +raw_spin_unlock_irqrestore (&i8259A_lock, flags); +return ; + } +outb (0xff ,PIC_MASTER_IMR );/* mask all of 8259A-1 */ outb (0xff ,PIC_SLAVE_IMR );/* mask all of 8259A-2 */
Signature · 1 line
1.7.4.1
Quoted 23 lines
Quoted 1 line
Quoted 1 line · On 12.04.14 at 07:56, <[email protected]> wrote:
arch/x86/kernel/i8259.c +11
-0@@ -299,11 +299,30 @@ static void unmask_8259A(void)static void init_8259A (int auto_eoi) {unsigned long flags; +unsigned char probe_val = ~(1 <<PIC_CASCADE_IR ); +unsigned char new_val; i8259A_auto_eoi = auto_eoi;raw_spin_lock_irqsave (&i8259A_lock, flags); +/* +* Check to see if we have a PIC. +* Mask all except the cascade and read +* back the value we just wrote. If we don't +* have a PIC, we will read 0xff as opposed to the +* value we wrote. +*/ +outb (0xff ,PIC_SLAVE_IMR );/* mask all of 8259A-2 */ +outb (probe_val,PIC_MASTER_IMR );
arch/x86/kernel/i8259.c static void unmask_8259A(void) · line 327
Quoted 10 lines
arch/x86/kernel/i8259.c +8
-0+ new_val =inb (PIC_MASTER_IMR ); +if (probe_val != new_val) { +printk (KERN_INFO "Using NULL legacy PIC\n" ); + legacy_pic = &null_legacy_pic; +raw_spin_unlock_irqrestore (&i8259A_lock, flags); +return ; + } +outb (0xff ,PIC_MASTER_IMR );/* mask all of 8259A-1 */ outb (0xff ,PIC_SLAVE_IMR );/* mask all of 8259A-2 */
And I guess you should delete this last line now that this is already being done slightly earlier - having it done twice is possibly going to confuse future readers (in that they might ask themselves or others whether this really needs to be done twice).
Jan
Quoted 42 lines
-----Original Message-----
From: Jan Beulich [mailto:[email protected]]
Sent: Monday, April 14, 2014 1:15 AM
To: KY Srinivasan
Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; linux- [email protected]; [email protected]
Subject: Re: [PATCH V2 1/1] X86: Probe for PIC and setlegacy_picappropriatelyQuoted 29 lines
Quoted 1 line
Quoted 1 line · On 12.04.14 at 07:56, <[email protected]> wrote:
arch/x86/kernel/i8259.c +18
-0@@ -299,11 +299,30 @@ static void unmask_8259A(void) static void init_8259A(int auto_eoi) {unsigned long flags; +unsigned char probe_val = ~(1 <<PIC_CASCADE_IR ); +unsigned char new_val; i8259A_auto_eoi = auto_eoi;raw_spin_lock_irqsave (&i8259A_lock, flags); +/* +* Check to see if we have a PIC. +* Mask all except the cascade and read +* back the value we just wrote. If we don't +* have a PIC, we will read 0xff as opposed to the +* value we wrote. +*/ +outb (0xff ,PIC_SLAVE_IMR );/* mask all of 8259A-2 */ +outb (probe_val,PIC_MASTER_IMR ); + new_val =inb (PIC_MASTER_IMR ); +if (probe_val != new_val) { +printk (KERN_INFO "Using NULL legacy PIC\n" ); + legacy_pic = &null_legacy_pic; +raw_spin_unlock_irqrestore (&i8259A_lock, flags); +return ; + }
Quoted 8 lines
arch/x86/kernel/i8259.c static void unmask_8259A(void) · line 327
Quoted 3 lines
arch/x86/kernel/i8259.c +1
-0+outb (0xff ,PIC_MASTER_IMR );/* mask all of 8259A-1 */ outb (0xff ,PIC_SLAVE_IMR );/* mask all of 8259A-2 */ And I guess you should delete this last line now that this is already being done slightly earlier - having it done twice is possibly going to confuse future readers (in that they might ask themselves or others whether this really needs to be done twice).
Good point! I will fix this and resend.
K. Y
Quoted 2 lines
Jan
Quoted 4 lines · K. Y. Srinivasan
Probe for the existance of legacy PIC, if one does not exist, use the
null_legacy_pic.Signed-off-by K. Y. Srinivasan <[email protected]>
Fixes the crash on Gen1 VMs for me, which was introduced by "x86/platform/hyperv: When on Hyper-v use NULL legacy PIC".
Olaf