* [PATCH] x86: Ensure the e820 map is installed in all cases
@ 2021-07-11 3:15 Simon Glass
2021-07-15 11:54 ` Bin Meng
2021-08-10 16:11 ` Christian Melki
0 siblings, 2 replies; 4+ messages in thread
From: Simon Glass @ 2021-07-11 3:15 UTC (permalink / raw)
To: U-Boot Mailing List
Cc: Christian Melki, Simon Glass, Bin Meng, Igor Opaniuk, Wolfgang Wallner
This is a revert of a recent logic change in setup_zimage(). We do
actually need to install this information always. Change it to install
from the Coreboot tables if available, else the normal source.
Fixes: e7bae8283fe ("x86: Allow installing an e820 when booting from coreboot")
Signed-off-by: Simon Glass <sjg@chromium.org>
---
arch/x86/lib/zimage.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/x86/lib/zimage.c b/arch/x86/lib/zimage.c
index 90fc8a466d7..cf4210cd4ba 100644
--- a/arch/x86/lib/zimage.c
+++ b/arch/x86/lib/zimage.c
@@ -313,12 +313,12 @@ int setup_zimage(struct boot_params *setup_base, char *cmd_line, int auto_boot,
int bootproto = get_boot_protocol(hdr, false);
log_debug("Setup E820 entries\n");
- if (ll_boot_init()) {
- setup_base->e820_entries = install_e820_map(
- ARRAY_SIZE(setup_base->e820_map), setup_base->e820_map);
- } else if (IS_ENABLED(CONFIG_COREBOOT_SYSINFO)) {
+ if (IS_ENABLED(CONFIG_COREBOOT_SYSINFO)) {
setup_base->e820_entries = cb_install_e820_map(
ARRAY_SIZE(setup_base->e820_map), setup_base->e820_map);
+ } else {
+ setup_base->e820_entries = install_e820_map(
+ ARRAY_SIZE(setup_base->e820_map), setup_base->e820_map);
}
if (bootproto == 0x0100) {
--
2.32.0.93.g670b81a890-goog
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] x86: Ensure the e820 map is installed in all cases
2021-07-11 3:15 [PATCH] x86: Ensure the e820 map is installed in all cases Simon Glass
@ 2021-07-15 11:54 ` Bin Meng
2021-07-15 11:56 ` Bin Meng
2021-08-10 16:11 ` Christian Melki
1 sibling, 1 reply; 4+ messages in thread
From: Bin Meng @ 2021-07-15 11:54 UTC (permalink / raw)
To: Simon Glass
Cc: U-Boot Mailing List, Christian Melki, Igor Opaniuk, Wolfgang Wallner
On Sun, Jul 11, 2021 at 11:15 AM Simon Glass <sjg@chromium.org> wrote:
>
> This is a revert of a recent logic change in setup_zimage(). We do
> actually need to install this information always. Change it to install
> from the Coreboot tables if available, else the normal source.
>
> Fixes: e7bae8283fe ("x86: Allow installing an e820 when booting from coreboot")
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
>
> arch/x86/lib/zimage.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] x86: Ensure the e820 map is installed in all cases
2021-07-15 11:54 ` Bin Meng
@ 2021-07-15 11:56 ` Bin Meng
0 siblings, 0 replies; 4+ messages in thread
From: Bin Meng @ 2021-07-15 11:56 UTC (permalink / raw)
To: Simon Glass
Cc: U-Boot Mailing List, Christian Melki, Igor Opaniuk, Wolfgang Wallner
On Thu, Jul 15, 2021 at 7:54 PM Bin Meng <bmeng.cn@gmail.com> wrote:
>
> On Sun, Jul 11, 2021 at 11:15 AM Simon Glass <sjg@chromium.org> wrote:
> >
> > This is a revert of a recent logic change in setup_zimage(). We do
> > actually need to install this information always. Change it to install
> > from the Coreboot tables if available, else the normal source.
> >
> > Fixes: e7bae8283fe ("x86: Allow installing an e820 when booting from coreboot")
> > Signed-off-by: Simon Glass <sjg@chromium.org>
> > ---
> >
> > arch/x86/lib/zimage.c | 8 ++++----
> > 1 file changed, 4 insertions(+), 4 deletions(-)
> >
>
> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
applied to u-boot-x86, thanks!
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] x86: Ensure the e820 map is installed in all cases
2021-07-11 3:15 [PATCH] x86: Ensure the e820 map is installed in all cases Simon Glass
2021-07-15 11:54 ` Bin Meng
@ 2021-08-10 16:11 ` Christian Melki
1 sibling, 0 replies; 4+ messages in thread
From: Christian Melki @ 2021-08-10 16:11 UTC (permalink / raw)
To: Simon Glass, U-Boot Mailing List; +Cc: Bin Meng, Igor Opaniuk, Wolfgang Wallner
Simon. Sorry for the late reply.
Tested on Virtualbox and on real hardware (DFI GHF51).
Works for me.
On 7/11/21 5:15 AM, Simon Glass wrote:
> This is a revert of a recent logic change in setup_zimage(). We do
> actually need to install this information always. Change it to install
> from the Coreboot tables if available, else the normal source.
>
> Fixes: e7bae8283fe ("x86: Allow installing an e820 when booting from coreboot")
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
>
> arch/x86/lib/zimage.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/arch/x86/lib/zimage.c b/arch/x86/lib/zimage.c
> index 90fc8a466d7..cf4210cd4ba 100644
> --- a/arch/x86/lib/zimage.c
> +++ b/arch/x86/lib/zimage.c
> @@ -313,12 +313,12 @@ int setup_zimage(struct boot_params *setup_base, char *cmd_line, int auto_boot,
> int bootproto = get_boot_protocol(hdr, false);
>
> log_debug("Setup E820 entries\n");
> - if (ll_boot_init()) {
> - setup_base->e820_entries = install_e820_map(
> - ARRAY_SIZE(setup_base->e820_map), setup_base->e820_map);
> - } else if (IS_ENABLED(CONFIG_COREBOOT_SYSINFO)) {
> + if (IS_ENABLED(CONFIG_COREBOOT_SYSINFO)) {
> setup_base->e820_entries = cb_install_e820_map(
> ARRAY_SIZE(setup_base->e820_map), setup_base->e820_map);
> + } else {
> + setup_base->e820_entries = install_e820_map(
> + ARRAY_SIZE(setup_base->e820_map), setup_base->e820_map);
> }
>
> if (bootproto == 0x0100) {
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-08-10 16:11 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-11 3:15 [PATCH] x86: Ensure the e820 map is installed in all cases Simon Glass
2021-07-15 11:54 ` Bin Meng
2021-07-15 11:56 ` Bin Meng
2021-08-10 16:11 ` Christian Melki
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.