Skip to contentSkip to conversation

x86: use int instead of long to set reset vector back to 0

PATCH In review Don Zickus 2 participants 3 messages Feb 8, 2011 – Feb 28, 2011 x86

lore
Share & tools
lore

Don Zickus

author
#0 lore raw

PATCH 1/1 x86: use int instead of long to set reset vector back to 0

A customer of ours, complained that when setting the reset vector back to 0, it trashed other data and hung their box. They noticed when only 4 bytes were set to 0 instead of 8, everything worked correctly.

I don't know where to find this in the spec to know if this is correct, but looking at historical info of the code, x86_64 used to use 'int' here whereas i386 used to use 'long'. When they got merged it seemed like 'long' was used. So the change seems to make sense from that point of view.

I am hoping someone smarter than me can verify this.

---
 arch/x86/include/asm/smpboot_hooks.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/x86/include/asm/smpboot_hooks.h +1 -1
index 6c22bf3..42d0366 100644
@@ -34,7 +34,7 @@ static inline void smpboot_restore_warm_reset_vector(void)
 	 */
 	CMOS_WRITE(0, 0xf);
 
-	*((volatile long *)phys_to_virt(apic->trampoline_phys_low)) = 0;
+	*((volatile int *)phys_to_virt(apic->trampoline_phys_low)) = 0;
 }
 
 static inline void __init smpboot_setup_io_apic(void)
Signature · 1 line
1.7.3.5
#1 lore raw
Quoted 4 lines · Don Zickus

A customer of ours, complained that when setting the reset vector back to 0, it trashed other data and hung their box. They noticed when only 4 bytes were set to 0 instead of 8, everything worked correctly.

We're supposed to be resetting trampoline_phys_low and trampoline_phys_high here, which are two 16-bit values. Writing 64 bits is definitely going to overwrite space that we're not supposed to be touching.

arch/x86/include/asm/smpboot_hooks.h static inline void smpboot_restore_warm_reset_vector(void) · line 37

Quoted 2 lines
arch/x86/include/asm/smpboot_hooks.h +1 -1
-	*((volatile long *)phys_to_virt(apic->trampoline_phys_low)) = 0;
+	*((volatile int *)phys_to_virt(apic->trampoline_phys_low)) = 0;

I'd suggest either using u32 here, or alternatively make it more obvious what's going on and set trampoline_phys_low and trampoline_phys_high (which are both 16 bit) independently.

Ingo? Looks like you touched this last, but it seems that the bug was there already.

Signature · 1 line
Matthew Garrett | [email protected]
#2 lore raw

[tip:x86/urgent] x86: Use u32 instead of long to set reset vector back to 0

In reply to Don Zickus
Commit-ID:  299c56966a72b9109d47c71a6db52097098703dd
Gitweb:     http://git.kernel.org/tip/299c56966a72b9109d47c71a6db52097098703dd
Author:     Don Zickus <[email protected]>
AuthorDate: Mon, 7 Feb 2011 23:25:00 -0500
Committer:  Ingo Molnar <[email protected]>
CommitDate: Mon, 28 Feb 2011 16:22:18 +0100

x86: Use u32 instead of long to set reset vector back to 0

A customer of ours, complained that when setting the reset vector back to 0, it trashed other data and hung their box. They noticed when only 4 bytes were set to 0 instead of 8, everything worked correctly.

Mathew pointed out:

 |
 | We're supposed to be resetting trampoline_phys_low and
 | trampoline_phys_high here, which are two 16-bit values.
 | Writing 64 bits is definitely going to overwrite space
 | that we're not supposed to be touching.
 |

So limit the area modified to u32.

LKML-Reference: <[email protected]>

---
 arch/x86/include/asm/smpboot_hooks.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/x86/include/asm/smpboot_hooks.h +1 -1
index 6c22bf3..725b778 100644
@@ -34,7 +34,7 @@ static inline void smpboot_restore_warm_reset_vector(void)
 	 */
 	CMOS_WRITE(0, 0xf);
 
-	*((volatile long *)phys_to_virt(apic->trampoline_phys_low)) = 0;
+	*((volatile u32 *)phys_to_virt(apic->trampoline_phys_low)) = 0;
 }
 
 static inline void __init smpboot_setup_io_apic(void)