X86: Probe for PIC and set legacy_pic appropriately
Subsystems (2)
PATCH 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 this version of the patch I have cleaned up the code based on comments from Peter.
--- arch/x86/kernel/cpu/mshyperv.c | 2 -- arch/x86/kernel/i8259.c | 17 +++++++++++++++++ 2 files changed, 17 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 +17 -0
@@ -299,11 +299,28 @@ static void unmask_8259A(void)static void init_8259A (int auto_eoi) {unsigned long flags; +unsigned char probe_val = ~(1 <<PIC_CASCADE_IR ); 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 (probe_val,PIC_MASTER_IMR ); + probe_val =inb (PIC_MASTER_IMR ); +if (probe_val ==0xff ) { +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
H. Peter Anvin
reviewerQuoted 10 lines · K. Y. Srinivasan
arch/x86/kernel/i8259.c +8
-0+/* +* 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 (probe_val,PIC_MASTER_IMR );
arch/x86/kernel/i8259.c static void unmask_8259A(void) · line 325
Quoted 10 lines
arch/x86/kernel/i8259.c +8
-0+ probe_val =inb (PIC_MASTER_IMR ); +if (probe_val ==0xff ) { +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 */
Again, I would do at least the slave masking above the probe.
Also, I would compare to make sure we get the probe_val back and compare with != instead of comparing with ==.
-hpa
Quoted 36 lines
-----Original Message-----
From: H. Peter Anvin [mailto:[email protected]]
Sent: Friday, April 11, 2014 4:59 PM
To: KY Srinivasan; [email protected]; [email protected]; linux- [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Subject: Re: [PATCH V1 1/1] X86: Probe for PIC and setlegacy_picappropriatelyQuoted 10 lines · K. Y. Srinivasan
arch/x86/kernel/i8259.c +8
-0+/* +* 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 (probe_val,PIC_MASTER_IMR );arch/x86/kernel/i8259.c static void unmask_8259A(void) · line 325
Quoted 10 lines
arch/x86/kernel/i8259.c +8
-0+ probe_val =inb (PIC_MASTER_IMR ); +if (probe_val ==0xff ) { +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 */ Again, I would do at least the slave masking above the probe.
Quoted 2 lines
Also, I would compare to make sure we get the
probe_valback and compare with != instead of comparing with ==.
Will do.
Thanks,
K. Y
���{.n�+�������+%�����ݶ��w��{.n�+����{��G�����{ay�ʇڙ�,j��f���h��������z_�(�階�ݢj"���m������G������?����&���~��iO��z��v�^�m����������?�I�