Skip to contentSkip to conversation

X86: Probe for PIC and set legacy_pic appropriately

PATCH Superseded K. Y. Srinivasan 2 participants 5 messages Apr 14, 2014

Subsystems (2)

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 X86: Probe for PIC and set legacy_pic appropriately

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 version V2 of the patch, I have addressed additional comments from Peter. In this version of the patch, I have addressed Jan's comments ([email protected]).

---
 arch/x86/kernel/cpu/mshyperv.c |    2 --
 arch/x86/kernel/i8259.c        |   20 +++++++++++++++++++-
 2 files changed, 19 insertions(+), 3 deletions(-)
arch/x86/kernel/cpu/mshyperv.c +0 -2
index 47359f7..9ca9587 100644
@@ -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 -1
index 2e977b5..d5447f1 100644
@@ -299,13 +299,31 @@ 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);
 
-	outb(0xff, PIC_MASTER_IMR);	/* mask all of 8259A-1 */
+	/*
+	 * 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_pic - this has to work on a wide range of PC hardware.
Signature · 1 line
1.7.4.1
#1 lore raw
Quoted 7 lines · K. Y. Srinivasan

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 version V2 of the patch, I have addressed additional comments from Peter. In this version of the patch, I have addressed Jan's comments ([email protected]).

Technically the patch looks good, but I'm going to have to reject it based on the patch description.

Keep in mind that the above description is the only thing that would go into the git repository, and needs to be understandable to someone, say, 10 years from now.

The above says nothing about what the proposal was, and the motivation, and the problems it addresses. So the patch is good, but please write a proper, standalone description for it.

Thanks,

-hpa

#2 lore raw
Quoted 28 lines

-----Original Message-----
From: H. Peter Anvin [mailto:[email protected]]
Sent: Monday, April 14, 2014 10:02 AM
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 V3 1/1] X86: Probe for PIC and set legacy_pic appropriately

Quoted 1 line · K. Y. Srinivasan

This patch implements the proposal put forth by H. Peter Anvin

<[email protected]>.

Quoted 2 lines

In version V1 of the patch, I had cleaned up the code based on comments

from Peter.

Quoted 1 line

In version V2 of the patch, I have addressed additional comments from

Peter.

Quoted 1 line

In this version of the patch, I have addressed Jan's comments

([email protected]).

Quoted 2 lines

Technically the patch looks good, but I'm going to have to reject it based on the patch description.

Quoted 7 lines

Keep in mind that the above description is the only thing that would go into the git repository, and needs to be understandable to someone, say, 10 years from now.

The above says nothing about what the proposal was, and the motivation, and the problems it addresses. So the patch is good, but please write a proper, standalone description for it.

Thanks Peter; I will update the description and send it out soon.

K. Y

Quoted 5 lines

Thanks,

-hpa

#3 lore raw
In reply to K. Y. Srinivasan

arch/x86/kernel/i8259.c static void unmask_8259A(void) · line 319

Quoted 2 lines · K. Y. Srinivasan
arch/x86/kernel/i8259.c +2 -0
+	new_val = inb(PIC_MASTER_IMR);
+	if (probe_val != new_val) {

Nitpick: Linux coding style should have this as:

	if (new_val != probe_val)

	-hpa
#4 lore raw
Quoted 13 lines

-----Original Message-----
From: H. Peter Anvin [mailto:[email protected]]
Sent: Monday, April 14, 2014 10:08 AM
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 V3 1/1] X86: Probe for PIC and set legacy_pic appropriately

On 04/14/2014 10:46 AM, K. Y. Srinivasan wrote:

Quoted 9 lines

arch/x86/kernel/i8259.c static void unmask_8259A(void) · line 319

Quoted 2 lines
arch/x86/kernel/i8259.c +2 -0
+	new_val = inb(PIC_MASTER_IMR);
+	if (probe_val != new_val) {

Nitpick: Linux coding style should have this as:

	if (new_val != probe_val)

	-hpa

Will address this as well.

K. Y