x86: Misc small fixes

PATCH New Borislav Petkov 2 participants 7 messages Mar 12, 2014 – Mar 13, 2014

Subsystems (3)

Documentation x86 x86 MM

lore

Share & tools

lore

Borislav Petkov

author maintainer

2014-03-12 14:13 UTC #0 lore raw

cover x86: Misc small fixes

From: Borislav Petkov <[email protected]>

Here are a couple of minor fixlets which accumulated recently.

Borislav Petkov (3):
x86, boot: Correct max ramdisk size name x86, crash: Unify ifdef
x86, pageattr: Correct WBINVD spelling in comment

 Documentation/x86/boot.txt | 4 ++--
 arch/x86/boot/header.S     | 2 +-
 arch/x86/kernel/crash.c    | 2 --
 arch/x86/mm/pageattr.c     | 6 +++---
 4 files changed, 6 insertions(+), 8 deletions(-)

Signature · 1 line

1.9.0

Borislav Petkov

author maintainer

2014-03-12 14:13 UTC #1 lore raw

PATCH 1/3 x86, boot: Correct max ramdisk size name

From: Borislav Petkov <[email protected]>

The name in struct bootparam is ->initrd_addr_max and not ramdisk_max. Fix that.

Signed-off-by Borislav Petkov <[email protected]>

---
 Documentation/x86/boot.txt | 4 ++--
 arch/x86/boot/header.S     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

Documentation/x86/boot.txt +2 -2

index cb81741d3b0b..a75e3adaa39d 100644
@@ -182,7 +182,7 @@ Offset	Proto	Name		Meaning
 0226/1	2.02+(3 ext_loader_ver	Extended boot loader version
 0227/1	2.02+(3	ext_loader_type	Extended boot loader ID
 0228/4	2.02+	cmd_line_ptr	32-bit pointer to the kernel command line
-022C/4	2.03+	ramdisk_max	Highest legal initrd address
+022C/4	2.03+	initrd_addr_max	Highest legal initrd address
 0230/4	2.05+	kernel_alignment Physical addr alignment required for kernel
 0234/1	2.05+	relocatable_kernel Whether kernel is relocatable or not
 0235/1	2.10+	min_alignment	Minimum alignment, as a power of two

@@ -534,7 +534,7 @@ Protocol:	2.02+
   zero, the kernel will assume that your boot loader does not support
   the 2.02+ protocol.
 
-Field name:	ramdisk_max
+Field name:	initrd_addr_max
 Type:		read
 Offset/size:	0x22c/4
 Protocol:	2.03+

arch/x86/boot/header.S +1 -1

index ec3b8ba68096..46f5a220b0ad 100644
@@ -350,7 +350,7 @@ cmd_line_ptr:	.long	0		# (Header version 0x0202 or later)
 					# can be located anywhere in
 					# low memory 0x10000 or higher.
 
-ramdisk_max:	.long 0x7fffffff
+initrd_addr_max: .long 0x7fffffff
 					# (Header version 0x0203 or later)
 					# The highest safe address for
 					# the contents of an initrd

Signature · 1 line

1.9.0

tip-bot for Borislav Petkov

merge bot

2014-03-13 22:37 UTC #2 lore raw

[tip:x86/cleanups] x86, boot: Correct max ramdisk size name

x86, boot: Correct max ramdisk size name

Commit-ID:  3e920b532a0f49d05e4c0f7d1b46b0ab8f471e09
Gitweb:     http://git.kernel.org/tip/3e920b532a0f49d05e4c0f7d1b46b0ab8f471e09
Author:     Borislav Petkov <[email protected]>
AuthorDate: Wed, 12 Mar 2014 15:13:02 +0100
Committer:  H. Peter Anvin <[email protected]>
CommitDate: Thu, 13 Mar 2014 15:32:42 -0700

x86, boot: Correct max ramdisk size name

The name in struct bootparam is ->initrd_addr_max and not ramdisk_max. Fix that.

Signed-off-by Borislav Petkov <[email protected]>

Link http://lkml.kernel.org/r/[email protected] open here

Signed-off-by H. Peter Anvin <[email protected]>

---
 Documentation/x86/boot.txt | 4 ++--
 arch/x86/boot/header.S     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

Documentation/x86/boot.txt +2 -2

index cb81741d..a75e3ad 100644
@@ -182,7 +182,7 @@ Offset	Proto	Name		Meaning
 0226/1	2.02+(3 ext_loader_ver	Extended boot loader version
 0227/1	2.02+(3	ext_loader_type	Extended boot loader ID
 0228/4	2.02+	cmd_line_ptr	32-bit pointer to the kernel command line
-022C/4	2.03+	ramdisk_max	Highest legal initrd address
+022C/4	2.03+	initrd_addr_max	Highest legal initrd address
 0230/4	2.05+	kernel_alignment Physical addr alignment required for kernel
 0234/1	2.05+	relocatable_kernel Whether kernel is relocatable or not
 0235/1	2.10+	min_alignment	Minimum alignment, as a power of two

@@ -534,7 +534,7 @@ Protocol:	2.02+
   zero, the kernel will assume that your boot loader does not support
   the 2.02+ protocol.
 
-Field name:	ramdisk_max
+Field name:	initrd_addr_max
 Type:		read
 Offset/size:	0x22c/4
 Protocol:	2.03+

arch/x86/boot/header.S +1 -1

index ec3b8ba..46f5a22 100644
@@ -350,7 +350,7 @@ cmd_line_ptr:	.long	0		# (Header version 0x0202 or later)
 					# can be located anywhere in
 					# low memory 0x10000 or higher.
 
-ramdisk_max:	.long 0x7fffffff
+initrd_addr_max: .long 0x7fffffff
 					# (Header version 0x0203 or later)
 					# The highest safe address for
 					# the contents of an initrd

Borislav Petkov

author maintainer

2014-03-12 14:13 UTC #3 lore raw

PATCH 2/3 x86, crash: Unify ifdef

In reply to Borislav Petkov

From: Borislav Petkov <[email protected]>

Merge two back-to-back CONFIG_X86_32 ifdefs into one.

Signed-off-by Borislav Petkov <[email protected]>

---
 arch/x86/kernel/crash.c | 2 --
 1 file changed, 2 deletions(-)

arch/x86/kernel/crash.c +0 -2

index a57902efe2d5..507de8066594 100644
@@ -57,9 +57,7 @@ static void kdump_nmi_callback(int cpu, struct pt_regs *regs)
 {
 #ifdef CONFIG_X86_32
 	struct pt_regs fixed_regs;
-#endif
 
-#ifdef CONFIG_X86_32
 	if (!user_mode_vm(regs)) {
 		crash_fixup_ss_esp(&fixed_regs, regs);
 		regs = &fixed_regs;

Signature · 1 line

1.9.0

tip-bot for Borislav Petkov

merge bot

2014-03-13 22:37 UTC #4 lore raw

[tip:x86/cleanups] x86, crash: Unify ifdef

x86, crash: Unify ifdef

Commit-ID:  5314feebabd92535a16295a8067b3fd79815cd16
Gitweb:     http://git.kernel.org/tip/5314feebabd92535a16295a8067b3fd79815cd16
Author:     Borislav Petkov <[email protected]>
AuthorDate: Wed, 12 Mar 2014 15:13:03 +0100
Committer:  H. Peter Anvin <[email protected]>
CommitDate: Thu, 13 Mar 2014 15:32:44 -0700

x86, crash: Unify ifdef

Merge two back-to-back CONFIG_X86_32 ifdefs into one.

Signed-off-by Borislav Petkov <[email protected]>

Link http://lkml.kernel.org/r/[email protected] open here

Signed-off-by H. Peter Anvin <[email protected]>

---
 arch/x86/kernel/crash.c | 2 --
 1 file changed, 2 deletions(-)

arch/x86/kernel/crash.c +0 -2

index a57902e..507de80 100644
@@ -57,9 +57,7 @@ static void kdump_nmi_callback(int cpu, struct pt_regs *regs)
 {
 #ifdef CONFIG_X86_32
 	struct pt_regs fixed_regs;
-#endif
 
-#ifdef CONFIG_X86_32
 	if (!user_mode_vm(regs)) {
 		crash_fixup_ss_esp(&fixed_regs, regs);
 		regs = &fixed_regs;

Borislav Petkov

author maintainer

2014-03-12 14:14 UTC #5 lore raw

PATCH 3/3 x86, pageattr: Correct WBINVD spelling in comment

In reply to Borislav Petkov

From: Borislav Petkov <[email protected]>

It is WBINVD, for INValiDate and not "wbindv". Use caps for instruction names, while at it.

Signed-off-by Borislav Petkov <[email protected]>

---
 arch/x86/mm/pageattr.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

arch/x86/mm/pageattr.c +3 -3

index b3b19f46c016..ba957c9b677c 100644
@@ -1377,10 +1377,10 @@ static int change_page_attr_set_clr(unsigned long *addr, int numpages,
 	cache = cache_attr(mask_set);
 
 	/*
-	 * On success we use clflush, when the CPU supports it to
-	 * avoid the wbindv. If the CPU does not support it and in the
+	 * On success we use CLFLUSH, when the CPU supports it to
+	 * avoid the WBINVD. If the CPU does not support it and in the
 	 * error case we fall back to cpa_flush_all (which uses
-	 * wbindv):
+	 * WBINVD):
 	 */
 	if (!ret && cpu_has_clflush) {
 		if (cpa.flags & (CPA_PAGES_ARRAY | CPA_ARRAY)) {

Signature · 1 line

1.9.0

tip-bot for Borislav Petkov

merge bot

2014-03-13 22:37 UTC #6 lore raw

[tip:x86/cleanups] x86, pageattr: Correct WBINVD spelling in comment

x86, pageattr: Correct WBINVD spelling in comment

Commit-ID:  b82ad3d3944193e5f95319c30fd24e39d0d7b510
Gitweb:     http://git.kernel.org/tip/b82ad3d3944193e5f95319c30fd24e39d0d7b510
Author:     Borislav Petkov <[email protected]>
AuthorDate: Wed, 12 Mar 2014 15:13:04 +0100
Committer:  H. Peter Anvin <[email protected]>
CommitDate: Thu, 13 Mar 2014 15:32:45 -0700

x86, pageattr: Correct WBINVD spelling in comment

It is WBINVD, for INValiDate and not "wbindv". Use caps for instruction names, while at it.

Signed-off-by Borislav Petkov <[email protected]>

Link http://lkml.kernel.org/r/[email protected] open here

Signed-off-by H. Peter Anvin <[email protected]>

---
 arch/x86/mm/pageattr.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

arch/x86/mm/pageattr.c +3 -3

index b3b19f4..ba957c9 100644
@@ -1377,10 +1377,10 @@ static int change_page_attr_set_clr(unsigned long *addr, int numpages,
 	cache = cache_attr(mask_set);
 
 	/*
-	 * On success we use clflush, when the CPU supports it to
-	 * avoid the wbindv. If the CPU does not support it and in the
+	 * On success we use CLFLUSH, when the CPU supports it to
+	 * avoid the WBINVD. If the CPU does not support it and in the
 	 * error case we fall back to cpa_flush_all (which uses
-	 * wbindv):
+	 * WBINVD):
 	 */
 	if (!ret && cpu_has_clflush) {
 		if (cpa.flags & (CPA_PAGES_ARRAY | CPA_ARRAY)) {