Skip to contentSkip to conversation

x86: zImage: Propagate acpi_rsdp_addr to kernel via boot parameters

PATCH New Andy Shevchenko 2 participants 3 messages Sep 13, 2019 – Oct 1, 2019 x86

lore
Share & tools
lore
#0 lore raw

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

This is reincarnation of the U-Boot

commit 3469bf4274540d1491d58e878a9edc0bdcba17ac

Author: Andy Shevchenko <[email protected]>
Date:   Wed Jan 10 19:40:15 2018 +0200

x86: zImage: Propagate acpi_rsdp_addr to kernel via boot parameters

after upstream got eventually the Linux kernel

commit e6e094e053af75cbc164e950814d3d084fb1e698

Author: Juergen Gross <[email protected]>
Date:   Tue Nov 20 08:25:29 2018 +0100

x86/acpi, x86/boot: Take RSDP address from boot params if available

---
 arch/x86/include/asm/bootparam.h | 3 ++-
 arch/x86/lib/zimage.c            | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)
arch/x86/include/asm/bootparam.h +2 -1
index dfbd4b4bba..d961dddc9e 100644
@@ -94,7 +94,8 @@ struct boot_params {
 	__u8  _pad2[4];					/* 0x054 */
 	__u64  tboot_addr;				/* 0x058 */
 	struct ist_info ist_info;			/* 0x060 */
-	__u8  _pad3[16];				/* 0x070 */
+	__u64 acpi_rsdp_addr;				/* 0x070 */
+	__u8  _pad3[8];					/* 0x078 */
 	__u8  hd0_info[16];	/* obsolete! */		/* 0x080 */
 	__u8  hd1_info[16];	/* obsolete! */		/* 0x090 */
 	struct sys_desc_table sys_desc_table;		/* 0x0a0 */
arch/x86/lib/zimage.c +4 -0
index 6a6258a505..d07041fd4c 100644
@@ -288,6 +288,10 @@ 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
+	setup_base->acpi_rsdp_addr = acpi_get_rsdp_addr();
+#endif
+
 	setup_device_tree(hdr, (const void *)env_get_hex("fdtaddr", 0));
 	setup_video(&setup_base->screen_info);
 
Signature · 1 line
2.23.0
#1 lore raw

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

Quoted 15 lines · Andy Shevchenko

This is reincarnation of the U-Boot

commit 3469bf4274540d1491d58e878a9edc0bdcba17ac

Author: Andy Shevchenko <[email protected]>
Date:   Wed Jan 10 19:40:15 2018 +0200

x86: zImage: Propagate acpi_rsdp_addr to kernel via boot parameters

after upstream got eventually the Linux kernel

commit e6e094e053af75cbc164e950814d3d084fb1e698

Author: Juergen Gross <[email protected]>
Date:   Tue Nov 20 08:25:29 2018 +0100
Quoted 8 lines

x86/acpi, x86/boot: Take RSDP address from boot params if available

---
 arch/x86/include/asm/bootparam.h | 3 ++-
 arch/x86/lib/zimage.c            | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)
#2 lore raw

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

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

This is reincarnation of the U-Boot

commit 3469bf4274540d1491d58e878a9edc0bdcba17ac

Author: Andy Shevchenko <[email protected]>
Date:   Wed Jan 10 19:40:15 2018 +0200

x86: zImage: Propagate acpi_rsdp_addr to kernel via boot parameters

after upstream got eventually the Linux kernel

commit e6e094e053af75cbc164e950814d3d084fb1e698

Author: Juergen Gross <[email protected]>
Date:   Tue Nov 20 08:25:29 2018 +0100

x86/acpi, x86/boot: Take RSDP address from boot params if available

Quoted 8 lines
Quoted 6 lines
---
 arch/x86/include/asm/bootparam.h | 3 ++-
 arch/x86/lib/zimage.c            | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

applied to u-boot-x86, thanks!