Skip to contentSkip to conversation

x86: zImage: Move subarch assignment out of cmd_line check

PATCH New Andy Shevchenko 2 participants 15 messages Jan 10, 2018 – Aug 22, 2018 x86

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 x86: zImage: Move subarch assignment out of cmd_line check

The commit

20bfac0599bd ("x86: zImage: add Intel MID platforms support")

introduced an assignment of subarch field in boot parameters, though missed the right place of doing that. It doesn't matter if we have or not a kernel command line supplied, we just set that field. Although guard it by protocol version which supports it.

Fixes 20bfac0599bd ("x86: zImage: add Intel MID platforms support")
Cc Vincent Tinelli <[email protected]>
---
 arch/x86/lib/zimage.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
arch/x86/lib/zimage.c +5 -4
index 00172dc7c1..d224db4e07 100644
@@ -246,14 +246,15 @@ int setup_zimage(struct boot_params *setup_base, char *cmd_line, int auto_boot,
 			hdr->setup_move_size = 0x9100;
 		}
 
-#if defined(CONFIG_INTEL_MID)
-		hdr->hardware_subarch = X86_SUBARCH_INTEL_MID;
-#endif
-
 		/* build command line at COMMAND_LINE_OFFSET */
 		build_command_line(cmd_line, auto_boot);
 	}
 
+#ifdef CONFIG_INTEL_MID
+	if (bootproto >= 0x0207)
+		hdr->hardware_subarch = X86_SUBARCH_INTEL_MID;
+#endif
+
 	setup_video(&setup_base->screen_info);
 
 	return 0;
Signature · 1 line
2.15.1
#1 lore raw

PATCH 2/2 x86: zImage: Propagate acpi_rsdp_addr to kernel via boot parameters

New field acpi_rsdp_addr, which has been introduced in boot protocol v2.14 [1], in boot parameters tells kernel the exact address of RDSP ACPI table. Knowing it increases robustness of the kernel by avoiding in some cases traversal through a part of physical memory. It will slightly reduce boot time by the same reason.

[1] See Linux kernel commit

2f74cbf947f4 ("x86/boot: Add the ACPI RSDP address to struct setup_header::acpi_rdsp_addr")

for the details.

---
 arch/x86/include/asm/bootparam.h |  1 +
 arch/x86/lib/acpi_table.c        |  7 +++++++
 arch/x86/lib/acpi_table.h        | 10 ++++++++++
 arch/x86/lib/zimage.c            |  6 ++++++
 4 files changed, 24 insertions(+)
 create mode 100644 arch/x86/lib/acpi_table.h
arch/x86/include/asm/bootparam.h +1 -0
index 48b138c6b0..90768a99ce 100644
@@ -66,6 +66,7 @@ struct setup_header {
 	__u64	pref_address;
 	__u32	init_size;
 	__u32	handover_offset;
+	__u64   acpi_rsdp_addr;
 } __attribute__((packed));
 
 struct sys_desc_table {
arch/x86/lib/acpi_table.c +7 -0
index 7b33cd371e..45bfc111ef 100644
@@ -20,6 +20,7 @@
 #include <asm/mpspec.h>
 #include <asm/tables.h>
 #include <asm/arch/global_nvs.h>
+#include "acpi_table.h"
 
 /*
  * IASL compiles the dsdt entries and writes the hex values
@@ -27,6 +28,11 @@
  */
 extern const unsigned char AmlCode[];
 
+/*
+ * ACPI RSDP address to be used in boot parameters.
+ */
+unsigned long acpi_rsdp_addr;
+
 static void acpi_write_rsdp(struct acpi_rsdp *rsdp, struct acpi_rsdt *rsdt,
 			    struct acpi_xsdt *xsdt)
 {
@@ -460,6 +466,7 @@ ulong write_acpi_tables(ulong start)
 
 	debug("current = %x\n", current);
 
+	acpi_rsdp_addr = (unsigned long)rsdp;
 	debug("ACPI: done\n");
 
 	/* Don't touch ACPI hardware on HW reduced platforms */
arch/x86/lib/acpi_table.h new file +10 -0
new file mode 100644
index 0000000000..cece5d1420
@@ -0,0 +1,10 @@
+/*
+ * SPDX-License-Identifier:	GPL-2.0
+ */
+
+#ifndef _X86_LIB_ACPI_TABLES_H
+#define _X86_LIB_ACPI_TABLES_H
+
+extern unsigned long acpi_rsdp_addr;
+
+#endif
arch/x86/lib/zimage.c +6 -0
index d224db4e07..eae26635b1 100644
@@ -24,6 +24,7 @@
 #include <asm/arch/timestamp.h>
 #endif
 #include <linux/compiler.h>
+#include "acpi_table.h"
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -255,6 +256,11 @@ int setup_zimage(struct boot_params *setup_base, char *cmd_line, int auto_boot,
 		hdr->hardware_subarch = X86_SUBARCH_INTEL_MID;
 #endif
 
+#ifdef CONFIG_GENERATE_ACPI_TABLE
+	if (bootproto >= 0x020e)
+		hdr->acpi_rsdp_addr = acpi_rsdp_addr;
+#endif
+
 	setup_video(&setup_base->screen_info);
 
 	return 0;
Signature · 1 line
2.15.1
#2 lore raw

PATCH 2/2 x86: zImage: Propagate acpi_rsdp_addr to kernel via boot parameters

Hi Andy,

Quoted 9 lines · Andy Shevchenko

New field acpi_rsdp_addr, which has been introduced in boot protocol v2.14 [1], in boot parameters tells kernel the exact address of RDSP ACPI table. Knowing it increases robustness of the kernel by avoiding in some cases traversal through a part of physical memory. It will slightly reduce boot time by the same reason.

[1] See Linux kernel commit

2f74cbf947f4 ("x86/boot: Add the ACPI RSDP address to struct setup_header::acpi_rdsp_addr")

I don't see this commit id in my linux tree. Is this in some custodian's tree?

Quoted 37 lines

for the details.

---
 arch/x86/include/asm/bootparam.h |  1 +
 arch/x86/lib/acpi_table.c        |  7 +++++++
 arch/x86/lib/acpi_table.h        | 10 ++++++++++
 arch/x86/lib/zimage.c            |  6 ++++++
 4 files changed, 24 insertions(+)
 create mode 100644 arch/x86/lib/acpi_table.h
arch/x86/include/asm/bootparam.h +1 -0
index 48b138c6b0..90768a99ce 100644
@@ -66,6 +66,7 @@ struct setup_header {
        __u64   pref_address;
        __u32   init_size;
        __u32   handover_offset;
+       __u64   acpi_rsdp_addr;
 } __attribute__((packed));
 
 struct sys_desc_table {
arch/x86/lib/acpi_table.c +1 -0
index 7b33cd371e..45bfc111ef 100644
@@ -20,6 +20,7 @@
 #include <asm/mpspec.h>
 #include <asm/tables.h>
 #include <asm/arch/global_nvs.h>
+#include "acpi_table.h"
 
 /*
  * IASL compiles the dsdt entries and writes the hex values

arch/x86/lib/acpi_table.c line 33

Quoted 6 lines
arch/x86/lib/acpi_table.c +3 -0
@@ -27,6 +28,11 @@
  */
 extern const unsigned char AmlCode[];
 
+/*
+ * ACPI RSDP address to be used in boot parameters.
+ */

nits: use single line comment format without the ending .

Quoted 44 lines
arch/x86/lib/acpi_table.c +3 -0
+unsigned long acpi_rsdp_addr;
+
 static void acpi_write_rsdp(struct acpi_rsdp *rsdp, struct acpi_rsdt *rsdt,
                            struct acpi_xsdt *xsdt)
 {
@@ -460,6 +466,7 @@ ulong write_acpi_tables(ulong start)
 
        debug("current = %x\n", current);
 
+       acpi_rsdp_addr = (unsigned long)rsdp;
        debug("ACPI: done\n");
 
        /* Don't touch ACPI hardware on HW reduced platforms */
arch/x86/lib/acpi_table.h new file +10 -0
new file mode 100644
index 0000000000..cece5d1420
@@ -0,0 +1,10 @@
+/*
+ * SPDX-License-Identifier:    GPL-2.0
+ */
+
+#ifndef _X86_LIB_ACPI_TABLES_H
+#define _X86_LIB_ACPI_TABLES_H
+
+extern unsigned long acpi_rsdp_addr;
+
+#endif
arch/x86/lib/zimage.c +1 -0
index d224db4e07..eae26635b1 100644
@@ -24,6 +24,7 @@
 #include <asm/arch/timestamp.h>
 #endif
 #include <linux/compiler.h>
+#include "acpi_table.h"
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -255,6 +256,11 @@ int setup_zimage(struct boot_params *setup_base, char *cmd_line, int auto_boot,
                hdr->hardware_subarch = X86_SUBARCH_INTEL_MID;
 #endif

arch/x86/lib/zimage.c int setup_zimage(struct boot_params *setup_base, char *cmd_line, int auto_boot,

Quoted 10 lines
arch/x86/lib/zimage.c +5 -1
 
+#ifdef CONFIG_GENERATE_ACPI_TABLE
+       if (bootproto >= 0x020e)
+               hdr->acpi_rsdp_addr = acpi_rsdp_addr;
+#endif
+
        setup_video(&setup_base->screen_info);
 
        return 0;
--

Other than the above nits,

I can fix the nits when applying if you like.

Regards,
Bin

#3 lore raw

PATCH 2/2 x86: zImage: Propagate acpi_rsdp_addr to kernel via boot parameters

Quoted 11 lines · Bin Meng

Hi Andy,

Quoted 7 lines · Andy Shevchenko

New field acpi_rsdp_addr, which has been introduced in boot protocol v2.14 [1], in boot parameters tells kernel the exact address of RDSP ACPI table. Knowing it increases robustness of the kernel by avoiding
in some cases traversal through a part of physical memory. It will slightly reduce boot time by the same reason.

Quoted 7 lines
Quoted 4 lines

[1] See Linux kernel commit

2f74cbf947f4 ("x86/boot: Add the ACPI RSDP address to struct
setup_header::acpi_rdsp_addr")

I don't see this commit id in my linux tree. Is this in some custodian's tree?

https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git/commit/?id=2
f74cbf947f45fa082dda8eac1a1f1299a372f49

Quoted 40 lines
Quoted 40 lines

for the details.

---
 arch/x86/include/asm/bootparam.h |  1 +
 arch/x86/lib/acpi_table.c        |  7 +++++++
 arch/x86/lib/acpi_table.h        | 10 ++++++++++
 arch/x86/lib/zimage.c            |  6 ++++++
 4 files changed, 24 insertions(+)
 create mode 100644 arch/x86/lib/acpi_table.h
arch/x86/include/asm/bootparam.h +1 -0
index 48b138c6b0..90768a99ce 100644
@@ -66,6 +66,7 @@ struct setup_header {
        __u64   pref_address;
        __u32   init_size;
        __u32   handover_offset;
+       __u64   acpi_rsdp_addr;
 } __attribute__((packed));
 
 struct sys_desc_table {
arch/x86/lib/acpi_table.c +1 -0
index 7b33cd371e..45bfc111ef 100644
@@ -20,6 +20,7 @@
 #include <asm/mpspec.h>
 #include <asm/tables.h>
 #include <asm/arch/global_nvs.h>
+#include "acpi_table.h"
 
 /*
  * IASL compiles the dsdt entries and writes the hex values
@@ -27,6 +28,11 @@
  */
 extern const unsigned char AmlCode[];
 
Quoted 5 lines

arch/x86/lib/acpi_table.c line 33

Quoted 3 lines
arch/x86/lib/acpi_table.c +3 -0
+/*
+ * ACPI RSDP address to be used in boot parameters.
+ */

nits: use single line comment format without the ending .

OK.

Quoted 55 lines
Quoted 55 lines
arch/x86/lib/acpi_table.c +2 -0
+unsigned long acpi_rsdp_addr;
+
 static void acpi_write_rsdp(struct acpi_rsdp *rsdp, struct
 acpi_rsdt *rsdt,
                            struct acpi_xsdt *xsdt)

{

arch/x86/lib/acpi_table.c +1 -0
@@ -460,6 +466,7 @@ ulong write_acpi_tables(ulong start)
 
        debug("current = %x\n", current);
 
+       acpi_rsdp_addr = (unsigned long)rsdp;
        debug("ACPI: done\n");
 
        /* Don't touch ACPI hardware on HW reduced platforms */
arch/x86/lib/acpi_table.h new file +10 -0
new file mode 100644
index 0000000000..cece5d1420
@@ -0,0 +1,10 @@
+/*
+ * SPDX-License-Identifier:    GPL-2.0
+ */
+
+#ifndef _X86_LIB_ACPI_TABLES_H
+#define _X86_LIB_ACPI_TABLES_H
+
+extern unsigned long acpi_rsdp_addr;
+
+#endif
arch/x86/lib/zimage.c +6 -0
index d224db4e07..eae26635b1 100644
@@ -24,6 +24,7 @@
 #include <asm/arch/timestamp.h>
 #endif
 #include <linux/compiler.h>
+#include "acpi_table.h"
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -255,6 +256,11 @@ int setup_zimage(struct boot_params
 *setup_base, char *cmd_line, int auto_boot,
                hdr->hardware_subarch = X86_SUBARCH_INTEL_MID;
 #endif
 
+#ifdef CONFIG_GENERATE_ACPI_TABLE
+       if (bootproto >= 0x020e)
+               hdr->acpi_rsdp_addr = acpi_rsdp_addr;
+#endif
+
        setup_video(&setup_base->screen_info);
 
Quoted 7 lines
Quoted 2 lines
        return 0;

--

Other than the above nits,

I can fix the nits when applying if you like.

If you have a chance to do it soon, please, do, otherwise I would send a new version later (next week I suppose).

Thanks!

Quoted 3 lines

Regards,
Bin

Signature · 2 lines
Andy Shevchenko <[email protected]>
Intel Finland Oy
#4 lore raw

PATCH 2/2 x86: zImage: Propagate acpi_rsdp_addr to kernel via boot parameters

Quoted 14 lines · Andy Shevchenko
Quoted 13 lines · Bin Meng

Hi Andy,

Quoted 9 lines · Andy Shevchenko

New field acpi_rsdp_addr, which has been introduced in boot protocol v2.14 [1], in boot parameters tells kernel the exact address of RDSP ACPI table. Knowing it increases robustness of the kernel by avoiding
in some cases traversal through a part of physical memory. It will slightly reduce boot time by the same reason.

[1] See Linux kernel commit

Quoted 9 lines
Quoted 5 lines
Quoted 2 lines

2f74cbf947f4 ("x86/boot: Add the ACPI RSDP address to struct
setup_header::acpi_rdsp_addr")

I don't see this commit id in my linux tree. Is this in some custodian's tree?

https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git/commit/?id=2
f74cbf947f45fa082dda8eac1a1f1299a372f49

thanks!

Quoted 109 lines
Quoted 40 lines
Quoted 40 lines

for the details.

---
 arch/x86/include/asm/bootparam.h |  1 +
 arch/x86/lib/acpi_table.c        |  7 +++++++
 arch/x86/lib/acpi_table.h        | 10 ++++++++++
 arch/x86/lib/zimage.c            |  6 ++++++
 4 files changed, 24 insertions(+)
 create mode 100644 arch/x86/lib/acpi_table.h
arch/x86/include/asm/bootparam.h +1 -0
index 48b138c6b0..90768a99ce 100644
@@ -66,6 +66,7 @@ struct setup_header {
        __u64   pref_address;
        __u32   init_size;
        __u32   handover_offset;
+       __u64   acpi_rsdp_addr;
 } __attribute__((packed));
 
 struct sys_desc_table {
arch/x86/lib/acpi_table.c +1 -0
index 7b33cd371e..45bfc111ef 100644
@@ -20,6 +20,7 @@
 #include <asm/mpspec.h>
 #include <asm/tables.h>
 #include <asm/arch/global_nvs.h>
+#include "acpi_table.h"
 
 /*
  * IASL compiles the dsdt entries and writes the hex values
@@ -27,6 +28,11 @@
  */
 extern const unsigned char AmlCode[];
 
Quoted 5 lines

arch/x86/lib/acpi_table.c line 33

Quoted 3 lines
arch/x86/lib/acpi_table.c +3 -0
+/*
+ * ACPI RSDP address to be used in boot parameters.
+ */

nits: use single line comment format without the ending .

OK.

Quoted 61 lines
Quoted 56 lines
arch/x86/lib/acpi_table.c +2 -0
+unsigned long acpi_rsdp_addr;
+
 static void acpi_write_rsdp(struct acpi_rsdp *rsdp, struct
 acpi_rsdt *rsdt,
                            struct acpi_xsdt *xsdt)

{

arch/x86/lib/acpi_table.c +1 -0
@@ -460,6 +466,7 @@ ulong write_acpi_tables(ulong start)
 
        debug("current = %x\n", current);
 
+       acpi_rsdp_addr = (unsigned long)rsdp;
        debug("ACPI: done\n");
 
        /* Don't touch ACPI hardware on HW reduced platforms */
arch/x86/lib/acpi_table.h new file +10 -0
new file mode 100644
index 0000000000..cece5d1420
@@ -0,0 +1,10 @@
+/*
+ * SPDX-License-Identifier:    GPL-2.0
+ */
+
+#ifndef _X86_LIB_ACPI_TABLES_H
+#define _X86_LIB_ACPI_TABLES_H
+
+extern unsigned long acpi_rsdp_addr;
+
+#endif
arch/x86/lib/zimage.c +6 -0
index d224db4e07..eae26635b1 100644
@@ -24,6 +24,7 @@
 #include <asm/arch/timestamp.h>
 #endif
 #include <linux/compiler.h>
+#include "acpi_table.h"
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -255,6 +256,11 @@ int setup_zimage(struct boot_params
 *setup_base, char *cmd_line, int auto_boot,
                hdr->hardware_subarch = X86_SUBARCH_INTEL_MID;
 #endif
 
+#ifdef CONFIG_GENERATE_ACPI_TABLE
+       if (bootproto >= 0x020e)
+               hdr->acpi_rsdp_addr = acpi_rsdp_addr;
+#endif
+
        setup_video(&setup_base->screen_info);
 
        return 0;
Quoted 1 line

--

Other than the above nits,

Quoted 4 lines
Quoted 1 line

I can fix the nits when applying if you like.

If you have a chance to do it soon, please, do, otherwise I would send a new version later (next week I suppose).

Fixed the nits and mentioned the git commit URL

applied to u-boot-x86, thanks!

#5 lore raw

PATCH 2/2 x86: zImage: Propagate acpi_rsdp_addr to kernel via boot parameters

Quoted 137 lines · Bin Meng
Quoted 14 lines · Andy Shevchenko
Quoted 13 lines · Bin Meng

Hi Andy,

Quoted 9 lines · Andy Shevchenko

New field acpi_rsdp_addr, which has been introduced in boot protocol v2.14 [1], in boot parameters tells kernel the exact address of RDSP ACPI table. Knowing it increases robustness of the kernel by avoiding
in some cases traversal through a part of physical memory. It will slightly reduce boot time by the same reason.

[1] See Linux kernel commit

Quoted 9 lines
Quoted 5 lines
Quoted 2 lines

2f74cbf947f4 ("x86/boot: Add the ACPI RSDP address to struct
setup_header::acpi_rdsp_addr")

I don't see this commit id in my linux tree. Is this in some custodian's tree?

https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git/commit/?id=2
f74cbf947f45fa082dda8eac1a1f1299a372f49

thanks!

Quoted 109 lines
Quoted 40 lines
Quoted 40 lines

for the details.

---
 arch/x86/include/asm/bootparam.h |  1 +
 arch/x86/lib/acpi_table.c        |  7 +++++++
 arch/x86/lib/acpi_table.h        | 10 ++++++++++
 arch/x86/lib/zimage.c            |  6 ++++++
 4 files changed, 24 insertions(+)
 create mode 100644 arch/x86/lib/acpi_table.h
arch/x86/include/asm/bootparam.h +1 -0
index 48b138c6b0..90768a99ce 100644
@@ -66,6 +66,7 @@ struct setup_header {
        __u64   pref_address;
        __u32   init_size;
        __u32   handover_offset;
+       __u64   acpi_rsdp_addr;
 } __attribute__((packed));
 
 struct sys_desc_table {
arch/x86/lib/acpi_table.c +1 -0
index 7b33cd371e..45bfc111ef 100644
@@ -20,6 +20,7 @@
 #include <asm/mpspec.h>
 #include <asm/tables.h>
 #include <asm/arch/global_nvs.h>
+#include "acpi_table.h"
 
 /*
  * IASL compiles the dsdt entries and writes the hex values
@@ -27,6 +28,11 @@
  */
 extern const unsigned char AmlCode[];
 
Quoted 5 lines

arch/x86/lib/acpi_table.c line 33

Quoted 3 lines
arch/x86/lib/acpi_table.c +3 -0
+/*
+ * ACPI RSDP address to be used in boot parameters.
+ */

nits: use single line comment format without the ending .

OK.

Quoted 61 lines
Quoted 56 lines
arch/x86/lib/acpi_table.c +2 -0
+unsigned long acpi_rsdp_addr;
+
 static void acpi_write_rsdp(struct acpi_rsdp *rsdp, struct
 acpi_rsdt *rsdt,
                            struct acpi_xsdt *xsdt)

{

arch/x86/lib/acpi_table.c +1 -0
@@ -460,6 +466,7 @@ ulong write_acpi_tables(ulong start)
 
        debug("current = %x\n", current);
 
+       acpi_rsdp_addr = (unsigned long)rsdp;
        debug("ACPI: done\n");
 
        /* Don't touch ACPI hardware on HW reduced platforms */
arch/x86/lib/acpi_table.h new file +10 -0
new file mode 100644
index 0000000000..cece5d1420
@@ -0,0 +1,10 @@
+/*
+ * SPDX-License-Identifier:    GPL-2.0
+ */
+
+#ifndef _X86_LIB_ACPI_TABLES_H
+#define _X86_LIB_ACPI_TABLES_H
+
+extern unsigned long acpi_rsdp_addr;
+
+#endif
arch/x86/lib/zimage.c +6 -0
index d224db4e07..eae26635b1 100644
@@ -24,6 +24,7 @@
 #include <asm/arch/timestamp.h>
 #endif
 #include <linux/compiler.h>
+#include "acpi_table.h"
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -255,6 +256,11 @@ int setup_zimage(struct boot_params
 *setup_base, char *cmd_line, int auto_boot,
                hdr->hardware_subarch = X86_SUBARCH_INTEL_MID;
 #endif
 
+#ifdef CONFIG_GENERATE_ACPI_TABLE
+       if (bootproto >= 0x020e)
+               hdr->acpi_rsdp_addr = acpi_rsdp_addr;
+#endif
+
        setup_video(&setup_base->screen_info);
 
        return 0;
Quoted 1 line

--

Other than the above nits,

Quoted 8 lines
Quoted 4 lines
Quoted 1 line

I can fix the nits when applying if you like.

If you have a chance to do it soon, please, do, otherwise I would send a new version later (next week I suppose).

Fixed the nits and mentioned the git commit URL

applied to u-boot-x86, thanks!

This unfortunately breaks qemu-x86 and qemu-x86_64. I will post patches to fix this.

Regards,
Bin

#6 lore raw

PATCH 2/2 x86: zImage: Propagate acpi_rsdp_addr to kernel via boot parameters

In reply to Andy Shevchenko

Hi Andy,

Quoted 14 lines · Andy Shevchenko
Quoted 13 lines · Bin Meng

Hi Andy,

Quoted 9 lines · Andy Shevchenko

New field acpi_rsdp_addr, which has been introduced in boot protocol v2.14 [1], in boot parameters tells kernel the exact address of RDSP ACPI table. Knowing it increases robustness of the kernel by avoiding
in some cases traversal through a part of physical memory. It will slightly reduce boot time by the same reason.

[1] See Linux kernel commit

Quoted 9 lines
Quoted 5 lines
Quoted 2 lines

2f74cbf947f4 ("x86/boot: Add the ACPI RSDP address to struct
setup_header::acpi_rdsp_addr")

I don't see this commit id in my linux tree. Is this in some custodian's tree?

https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git/commit/?id=2
f74cbf947f45fa082dda8eac1a1f1299a372f49

I checked Linux kernel tree, seems the patch of adding acpi_rdsp_addr to setup_header was never accepted. Can you please double check, to see whether we still need this in U-Boot?

I built a v4.17 kernel, and the boot protocol is still 2.13.

Regards,
Bin

#7 lore raw

PATCH 2/2 x86: zImage: Propagate acpi_rsdp_addr to kernel via boot parameters

Quoted 31 lines · Bin Meng

Hi Andy,

Quoted 19 lines · Andy Shevchenko
Quoted 18 lines · Bin Meng

Hi Andy,

Quoted 13 lines · Andy Shevchenko

New field acpi_rsdp_addr, which has been introduced in boot protocol
v2.14 [1], in boot parameters tells kernel the exact address of RDSP
ACPI table. Knowing it increases robustness of the kernel by avoiding
in some cases traversal through a part of physical memory. It will slightly reduce boot time by the same reason.

[1] See Linux kernel commit

2f74cbf947f4 ("x86/boot: Add the ACPI RSDP address to struct
setup_header::acpi_rdsp_addr")

Quoted 7 lines
Quoted 2 lines

I don't see this commit id in my linux tree. Is this in some custodian's tree?

https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git/commit/?
id=2
f74cbf947f45fa082dda8eac1a1f1299a372f49

Quoted 5 lines

I checked Linux kernel tree, seems the patch of adding acpi_rdsp_addr to setup_header was never accepted. Can you please double check, to see whether we still need this in U-Boot?

I built a v4.17 kernel, and the boot protocol is still 2.13.

Indeed. There were a discussion to not apply it for now.

Signature · 2 lines
Andy Shevchenko <[email protected]>
Intel Finland Oy
#8 lore raw

PATCH 2/2 x86: zImage: Propagate acpi_rsdp_addr to kernel via boot parameters

Quoted 32 lines · Andy Shevchenko
Quoted 31 lines · Bin Meng

Hi Andy,

Quoted 26 lines · Andy Shevchenko
Quoted 13 lines · Bin Meng

Hi Andy,

Quoted 9 lines · Andy Shevchenko

New field acpi_rsdp_addr, which has been introduced in boot protocol
v2.14 [1], in boot parameters tells kernel the exact address of RDSP
ACPI table. Knowing it increases robustness of the kernel by avoiding
in some cases traversal through a part of physical memory. It will slightly reduce boot time by the same reason.

Quoted 7 lines
Quoted 4 lines

[1] See Linux kernel commit

2f74cbf947f4 ("x86/boot: Add the ACPI RSDP address to struct
setup_header::acpi_rdsp_addr")

I don't see this commit id in my linux tree. Is this in some custodian's tree?

https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git/commit/?
id=2
f74cbf947f45fa082dda8eac1a1f1299a372f49

Quoted 8 lines
Quoted 5 lines

I checked Linux kernel tree, seems the patch of adding acpi_rdsp_addr to setup_header was never accepted. Can you please double check, to see whether we still need this in U-Boot?

I built a v4.17 kernel, and the boot protocol is still 2.13.

Indeed. There were a discussion to not apply it for now.

I did not find the discussion. Do we need revert the changes in U-Boot?

Regards,
Bin

#9 lore raw

PATCH 2/2 x86: zImage: Propagate acpi_rsdp_addr to kernel via boot parameters

Quoted 43 lines · Bin Meng
Quoted 41 lines · Andy Shevchenko
Quoted 40 lines · Bin Meng

Hi Andy,

Quoted 21 lines · Andy Shevchenko
Quoted 20 lines · Bin Meng

Hi Andy,

Quoted 15 lines · Andy Shevchenko

New field acpi_rsdp_addr, which has been introduced in boot protocol
v2.14 [1], in boot parameters tells kernel the exact address of
RDSP
ACPI table. Knowing it increases robustness of the kernel by avoiding
in some cases traversal through a part of physical memory. It will slightly reduce boot time by the same reason.

[1] See Linux kernel commit

2f74cbf947f4 ("x86/boot: Add the ACPI RSDP address to
struct
setup_header::acpi_rdsp_addr")

Quoted 8 lines
Quoted 2 lines

I don't see this commit id in my linux tree. Is this in some custodian's tree?

https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git/comm
it/?
id=2
f74cbf947f45fa082dda8eac1a1f1299a372f49

I checked Linux kernel tree, seems the patch of adding acpi_rdsp_addr
to setup_header was never accepted. Can you please double check, to
see whether we still need this in U-Boot?

Quoted 7 lines
Quoted 4 lines
Quoted 1 line

I built a v4.17 kernel, and the boot protocol is still 2.13.

Indeed. There were a discussion to not apply it for now.

I did not find the discussion. Do we need revert the changes in U- Boot?

https://patchwork.kernel.org/patch/10098529/

It seems it has been dropped b/c v2 were sent and actually v3 was anticipated, but never appear.

Also I didn't notice any blessing from hpa about protocol extension.

Signature · 2 lines
Andy Shevchenko <[email protected]>
Intel Finland Oy
#10 lore raw

PATCH 2/2 x86: zImage: Propagate acpi_rsdp_addr to kernel via boot parameters

Quoted 6 lines · Andy Shevchenko
Quoted 3 lines · Bin Meng
Quoted 1 line · Andy Shevchenko
Quoted 7 lines
Quoted 2 lines

I did not find the discussion. Do we need revert the changes in U- Boot?

https://patchwork.kernel.org/patch/10098529/

It seems it has been dropped b/c v2 were sent and actually v3 was anticipated, but never appear.

Hmm... I'm wrong there is v3 and stated as applied.

https://www.mail-archive.com/linux-kernel at vger.kernel.org/msg1559618.htm l

Though in next-20180112 it was appeared last time.

This one seems explains what is the issue with this field

https://www.mail-archive.com/xen-devel at lists.xenproject.org/msg04706.htm l

Quoted 2 lines

Also I didn't notice any blessing from hpa about protocol extension.

Signature · 2 lines
Andy Shevchenko <[email protected]>
Intel Finland Oy
#11 lore raw

PATCH 2/2 x86: zImage: Propagate acpi_rsdp_addr to kernel via boot parameters

Hi Andy,

Quoted 20 lines · Andy Shevchenko
Quoted 6 lines · Andy Shevchenko
Quoted 3 lines · Bin Meng
Quoted 1 line · Andy Shevchenko
Quoted 7 lines
Quoted 2 lines

I did not find the discussion. Do we need revert the changes in U- Boot?

https://patchwork.kernel.org/patch/10098529/

It seems it has been dropped b/c v2 were sent and actually v3 was anticipated, but never appear.

Hmm... I'm wrong there is v3 and stated as applied.

https://www.mail-archive.com/linux-kernel at vger.kernel.org/msg1559618.htm l

Quoted 12 lines

Though in next-20180112 it was appeared last time.

This one seems explains what is the issue with this field

https://www.mail-archive.com/xen-devel at lists.xenproject.org/msg04706.htm l

Quoted 2 lines

Also I didn't notice any blessing from hpa about protocol extension.

Sorry to bring this again. Looks as of today the addition to the acpi_rsdp_addr member is still not merged mainstream kernel. Do you think we need revert this in U-Boot, or keep it there but may cause some confusion?

Regards,
Bin

#12 lore raw

PATCH 2/2 x86: zImage: Propagate acpi_rsdp_addr to kernel via boot parameters

Quoted 23 lines · Bin Meng

Hi Andy,

Quoted 19 lines · Andy Shevchenko
Quoted 6 lines · Andy Shevchenko
Quoted 3 lines · Bin Meng
Quoted 1 line · Andy Shevchenko
Quoted 8 lines
Quoted 3 lines

I did not find the discussion. Do we need revert the changes in U-
Boot?

https://patchwork.kernel.org/patch/10098529/

It seems it has been dropped b/c v2 were sent and actually v3 was anticipated, but never appear.

Hmm... I'm wrong there is v3 and stated as applied.

https://www.mail-archive.com/linux-kernel at vger.kernel.org/msg1559618.htm

Quoted 9 lines
Quoted 9 lines

l

Though in next-20180112 it was appeared last time.

This one seems explains what is the issue with this field

https://www.mail-archive.com/xen-devel at lists.xenproject.org/msg04706.htm

Quoted 10 lines
Quoted 5 lines

l

Quoted 3 lines

Also I didn't notice any blessing from hpa about protocol extension.

Sorry to bring this again. Looks as of today the addition to the acpi_rsdp_addr member is still not merged mainstream kernel. Do you think we need revert this in U-Boot, or keep it there but may cause some confusion?

Hmm... I guess I answered to your previous message.
Anyway, I agree for the revert until we will have a clear picture with upstream.

Signature · 2 lines
Andy Shevchenko <[email protected]>
Intel Finland Oy
#13 lore raw

PATCH 1/2 x86: zImage: Move subarch assignment out of cmd_line check

In reply to Andy Shevchenko
Quoted 9 lines · Andy Shevchenko

The commit

20bfac0599bd ("x86: zImage: add Intel MID platforms support")

introduced an assignment of subarch field in boot parameters, though missed the right place of doing that. It doesn't matter if we have or not a kernel command line supplied, we just set that field. Although guard it by protocol version which supports it.

Quoted 7 lines
Fixes 20bfac0599bd ("x86: zImage: add Intel MID platforms support")
Cc Vincent Tinelli <[email protected]>
---
 arch/x86/lib/zimage.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

Good catch!

#14 lore raw

PATCH 1/2 x86: zImage: Move subarch assignment out of cmd_line check

Quoted 19 lines · Bin Meng
Quoted 9 lines · Andy Shevchenko

The commit

20bfac0599bd ("x86: zImage: add Intel MID platforms support")

introduced an assignment of subarch field in boot parameters, though missed the right place of doing that. It doesn't matter if we have or not a kernel command line supplied, we just set that field. Although guard it by protocol version which supports it.

Quoted 7 lines
Fixes 20bfac0599bd ("x86: zImage: add Intel MID platforms support")
Cc Vincent Tinelli <[email protected]>
---
 arch/x86/lib/zimage.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
Quoted 3 lines

Good catch!

applied to u-boot-x86, thanks!