diff mbox series

[v3,03/10] x86: apl: Set the correct boot mode in the FSP-M code

Message ID 20200717032239.197695-2-sjg@chromium.org
State Accepted
Commit efd31328525629db9fc8b48f1e5b33f8ee1de4d7
Delegated to: Bin Meng
Headers show
Series x86: Programmatic generation of ACPI tables (Part C) | expand

Commit Message

Simon Glass July 17, 2020, 3:22 a.m. UTC 
If there is MRC information we should run FSP-M with a different
boot_mode flag since it is supposed to do a 'fast path' through the
memory init. Fix this.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Wolfgang Wallner <wolfgang.wallner@br-automation.com>

Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
---

(no changes since v2)

Changes in v2:
- Add a new commit to handle the boot_mode fix

 arch/x86/cpu/apollolake/fsp_m.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Bin Meng July 17, 2020, 6:30 a.m. UTC | #1 
Hi Simon,

On Fri, Jul 17, 2020 at 11:22 AM Simon Glass <sjg@chromium.org> wrote:
>
> If there is MRC information we should run FSP-M with a different
> boot_mode flag since it is supposed to do a 'fast path' through the
> memory init. Fix this.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> Reviewed-by: Wolfgang Wallner <wolfgang.wallner@br-automation.com>
>
> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

Is this tag automatically added by the new patman? If so, we need to
remove the blank line above.

> ---
>
> (no changes since v2)
>
> Changes in v2:
> - Add a new commit to handle the boot_mode fix
>
>  arch/x86/cpu/apollolake/fsp_m.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>

Regards,
Bin
Simon Glass Aug. 29, 2020, 9:20 p.m. UTC | #2 
Hi Bin,

On Fri, 17 Jul 2020 at 00:30, Bin Meng <bmeng.cn@gmail.com> wrote:
>
> Hi Simon,
>
> On Fri, Jul 17, 2020 at 11:22 AM Simon Glass <sjg@chromium.org> wrote:
> >
> > If there is MRC information we should run FSP-M with a different
> > boot_mode flag since it is supposed to do a 'fast path' through the
> > memory init. Fix this.
> >
> > Signed-off-by: Simon Glass <sjg@chromium.org>
> > Reviewed-by: Wolfgang Wallner <wolfgang.wallner@br-automation.com>
> >
> > Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
>
> Is this tag automatically added by the new patman? If so, we need to
> remove the blank line above.

Yes it is...will have to try this out when I get back to patman.

Regards,
Simon
diff mbox series

Patch

diff --git a/arch/x86/cpu/apollolake/fsp_m.c b/arch/x86/cpu/apollolake/fsp_m.c
index 65461d85b8..e19a2b0826 100644
--- a/arch/x86/cpu/apollolake/fsp_m.c
+++ b/arch/x86/cpu/apollolake/fsp_m.c
@@ -26,7 +26,8 @@  int fspm_update_config(struct udevice *dev, struct fspm_upd *upd)
 		return log_msg_ret("mrc", cache_ret);
 	arch->stack_base = (void *)0xfef96000;
 	arch->boot_loader_tolum_size = 0;
-	arch->boot_mode = FSP_BOOT_WITH_FULL_CONFIGURATION;
+	arch->boot_mode = cache_ret ? FSP_BOOT_WITH_FULL_CONFIGURATION :
+		FSP_BOOT_ASSUMING_NO_CONFIGURATION_CHANGES;
 
 	node = dev_ofnode(dev);
 	if (!ofnode_valid(node))