Skip to contentSkip to conversation

x86, reboot: reduce to a single DMI table for reboot quirks

PATCH Ingo Molnar 2 participants 3 messages Jan 30, 2012 1 message not in the archive

lore
Share & tools
lore

Ingo Molnar

author Applied
#1 lore raw
In reply to a message not in the archive

I've applied your first two patches, thanks Michael!

Regarding this patch, it does not apply cleanly to the latest x86 tree:

2 out of 5 hunks FAILED -- rejects in file arch/x86/kernel/reboot.c

which you can pick up from:

git pull git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git master

Also, a style nit, these comments:

Review

Quoted 9 lines
(quoted diff) +9 -0
+	/* Write zero to CMOS register number 0x0f, which the BIOS POST
+	   routine will recognize as telling it to do a proper reboot.  (Well
+	   that's what this book in front of me says -- it may only apply to
+	   the Phoenix BIOS though, it's not clear).  At the same time,
+	   disable NMIs by setting the top bit in the CMOS address register,
+	   as we're about to do peculiar things to the CPU.  I'm not sure if
+	   `outb_p' is needed instead of just `outb'.  Use it to be on the
+	   safe side.  (Yes, CMOS_WRITE does outb_p's. -  Paul G.)
+	 */

and the other similar comments that you move should be coverted to the customary (multi-line) comment style:

/*
* Comment .....
* ...... goes here.
*/

specified in Documentation/CodingStyle.

I realize that you only move code here - but it's worth cleaning it up a bit when touching it.

Thanks,

Ingo

#3 lore raw
In reply to Michael D Labriola
Quoted 5 lines · Michael D Labriola
Quoted 2 lines

I realize that you only move code here - but it's worth cleaning it up a bit when touching it.

You are requesting that I clean up only the comments that appear in the diff, correct? I'll do that as well.

Yeah, and whatever other cleanliness detail you notice: when we touch some code it is the best opportunity to improve it.

I'd also suggest for ou to do it as two patches: first keep your existing patch then do a second one on top of it cleaning up any details, and send me both.

Thanks,

Ingo

#2 lore raw
In reply to Ingo Molnar

12345678901234567890123456789012345678901234567890123456789012345678901234567890
1 2 3 4 5 6 7 8

Ingo Molnar <[email protected]> wrote on 01/30/2012 04:55:37 AM:

Quoted 1 line

I've applied your first two patches, thanks Michael!

Excellent!

Quoted 8 lines

Regarding this patch, it does not apply cleanly to the latest x86 tree:

2 out of 5 hunks FAILED -- rejects in file arch/x86/kernel/reboot.c

which you can pick up from:

git pull git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git

master

Ok, I based all of them off v3.2. I'll rebase off of tip tonight after the kids are in bed. ;-)

Quoted 4 lines

Also, a style nit, these comments:

Quoted 2 lines
(quoted diff) +2 -0
+   /* Write zero to CMOS register number 0x0f, which the BIOS POST
+      routine will recognize as telling it to do a proper reboot. 

(Well

Quoted 1 line
Quoted 1 line

+ that's what this book in front of me says -- it may only apply

to

Quoted 2 lines

Review

Quoted 2 lines
(quoted diff) +2 -0
+      the Phoenix BIOS though, it's not clear).  At the same time,
+      disable NMIs by setting the top bit in the CMOS address 

register,

Quoted 1 line
Quoted 1 line

+ as we're about to do peculiar things to the CPU. I'm not sure

if

Quoted 12 lines

Review

Quoted 3 lines
(quoted diff) +3 -0
+      `outb_p' is needed instead of just `outb'.  Use it to be on the
+      safe side.  (Yes, CMOS_WRITE does outb_p's. -  Paul G.)
+    */

and the other similar comments that you move should be coverted to the customary (multi-line) comment style:

/*
* Comment .....
* ...... goes here.
*/

Quoted 4 lines

specified in Documentation/CodingStyle.

I realize that you only move code here - but it's worth cleaning it up a bit when touching it.

You are requesting that I clean up only the comments that appear in the diff, correct? I'll do that as well.

---
Michael D Labriola
Electric Boat
[email protected]
401-848-8871 (desk)
401-848-8513 (lab)
401-316-9844 (cell)