Skip to contentSkip to conversation

x86: Add support for booting from TPL

PATCH New Simon Glass 2 participants 90 messages Jan 30, 2019 – Apr 26, 2019

Subsystems (5)
x86 Kbuild PCI Char and misc drivers +1 more subsystems
lore
Share & tools
lore
#0 lore raw

cover x86: Add support for booting from TPL

At present SPL is used on 64-bit platforms, to allow SPL to be built as a 32-bit program and U-Boot proper to be built as 64-bit.

However it is useful to be able to use SPL on any x86 platform, where U-Boot needs to be updated in the field. Then SPL can select which U-Boot to run (A or B) and most of the code can be updated. Similarly, using TPL allows both SPL and U-Boot to be updated. This is the best approach, since it means that all of U-Boot proper as well as SPL (in particular SDRAM init) can be updated in the field. This provides for the smallest possible amount of read-only (non-updateable) code: just the TPL code.

This series contains a number of changes to allow x86 boards to use TPL, SPL and U-Boot proper. As a test, it is enabled for samus with a new chromebook_samus_tpl board.

Simon Glass (40):
binman: Don't generate an error in 'text' entry constructor
binman: Don't show image-skip message by default
binman: Add a missing comment in Entry_vblock
dm: core: Fix translate condition in ofnode_get_addr_size()
cros_ec: Use a hyphen in the uclass name
spl: Allow sandbox to build a device-tree file
RFC: binman: Allow sections to have an offset
x86: start64: Fix copyright message
x86: mp_init: Use proper error numbers
x86: Add a way to reinit the cpu
x86: dts: Add device-tree labels for rtc and reset
x86: Update a stale comment about ifdtool
x86: Support SPL and TPL
x86: Support booting with TPL
x86: Add a handoff header file
x86: broadwell: Improve SDRAM debugging output
x86: broadwell: Allow SDRAM init from SPL
x86: Move init of debug UART to cpu.c
x86: broadwell: Split CPU init
x86: Add support for starting from SPL/TPL
x86: Allow 16-bit init to be in TPL
x86: broadwell: Allow booting from SPL
x86: broadwell: Select refcode and CPU code for SPL
x86: Add common Intel code for SPL
x86: Support saving MRC data from SPL
x86: Add a simple TPL implementations
x86: mrccache: Add more debugging
x86: Add a sysreset driver for the Intel PCH
x86: Support TPL in Intel common code
x86: Don't set up MTRRs in SPL
x86: Don't generate a bootstage report in SPL
x86: Support PCI VGA ROM when TPL is used
x86: sysreset: Implement the get_last() method
x86: Add documention on the samus flashmap
x86: samus: Update device tree for SPL
x86: samus: Update device tree for verified boot
x86: Update device tree for TPL
x86: Update device tree for Chromium OS verified boot
x86: Fix device-tree indentation
x86: samus: Add a target to boot through TPL

 Makefile                                  |   1 +
 arch/Kconfig                              |  30 +
 arch/x86/Kconfig                          |  10 +-
 arch/x86/Makefile                         |  16 +-
 arch/x86/cpu/Makefile                     |  15 +-
 arch/x86/cpu/broadwell/Kconfig            |   1 +
 arch/x86/cpu/broadwell/Makefile           |  23 +-
 arch/x86/cpu/broadwell/cpu.c              | 676 +--------------------
 arch/x86/cpu/broadwell/cpu_from_spl.c     |  63 ++
 arch/x86/cpu/broadwell/cpu_full.c         | 694 ++++++++++++++++++++++
 arch/x86/cpu/broadwell/northbridge.c      |  93 +++
 arch/x86/cpu/broadwell/sdram.c            | 136 +----
 arch/x86/cpu/i386/cpu.c                   | 113 ++--
 arch/x86/cpu/intel_common/Makefile        |  17 +-
 arch/x86/cpu/intel_common/car.S           |   2 +-
 arch/x86/cpu/intel_common/cpu_from_spl.c  |  27 +
 arch/x86/cpu/mp_init.c                    |  10 +-
 arch/x86/cpu/start64.S                    |   2 +-
 arch/x86/cpu/start_from_spl.S             |  71 +++
 arch/x86/cpu/start_from_tpl.S             |  50 ++
 arch/x86/cpu/u-boot-spl.lds               |   2 +-
 arch/x86/cpu/x86_64/cpu.c                 |   5 +
 arch/x86/dts/chromebook_samus.dts         |  60 +-
 arch/x86/dts/reset.dtsi                   |   2 +-
 arch/x86/dts/rtc.dtsi                     |   2 +-
 arch/x86/dts/u-boot.dtsi                  | 154 +++--
 arch/x86/include/asm/handoff.h            |  15 +
 arch/x86/include/asm/mrccache.h           |  11 +
 arch/x86/include/asm/spl.h                |  17 +-
 arch/x86/include/asm/u-boot-x86.h         |  20 +
 arch/x86/lib/Makefile                     |   9 +-
 arch/x86/lib/bootm.c                      |   2 +-
 arch/x86/lib/init_helpers.c               |   5 +-
 arch/x86/lib/mrccache.c                   |  52 +-
 arch/x86/lib/spl.c                        |  44 +-
 arch/x86/lib/tpl.c                        | 118 ++++
 board/google/Kconfig                      |   8 +
 board/google/chromebook_samus/Kconfig     |  14 +-
 board/google/chromebook_samus/MAINTAINERS |   7 +
 configs/chromebook_samus_tpl_defconfig    |  80 +++
 doc/README.x86                            |  14 +
 drivers/core/ofnode.c                     |   2 +-
 drivers/misc/cros_ec.c                    |   2 +-
 drivers/pci/pci_rom.c                     |   2 +-
 drivers/sysreset/Kconfig                  |   9 +
 drivers/sysreset/Makefile                 |   1 +
 drivers/sysreset/sysreset_intel_pch.c     | 125 ++++
 drivers/sysreset/sysreset_x86.c           |   6 +
 include/configs/chromebook_link.h         |   3 -
 include/configs/chromebook_samus.h        |   3 +
 include/configs/qemu-x86.h                |   3 -
 scripts/Makefile.spl                      |  24 +-
 tools/binman/bsection.py                  |   5 +-
 tools/binman/control.py                   |   4 +-
 tools/binman/etype/section.py             |   3 +-
 tools/binman/etype/text.py                |   4 +-
 tools/binman/etype/vblock.py              |   1 +
 57 files changed, 1933 insertions(+), 955 deletions(-)
 create mode 100644 arch/x86/cpu/broadwell/cpu_from_spl.c
 create mode 100644 arch/x86/cpu/broadwell/cpu_full.c
 create mode 100644 arch/x86/cpu/intel_common/cpu_from_spl.c
 create mode 100644 arch/x86/cpu/start_from_spl.S
 create mode 100644 arch/x86/cpu/start_from_tpl.S
 create mode 100644 arch/x86/include/asm/handoff.h
 create mode 100644 arch/x86/lib/tpl.c
 create mode 100644 configs/chromebook_samus_tpl_defconfig
 create mode 100644 drivers/sysreset/sysreset_intel_pch.c
Signature · 1 line
2.20.1.495.gaa96b0ce6b-goog
#1 lore raw

PATCH 1/40 binman: Don't generate an error in 'text' entry constructor

It is not good practice to raise an exception in a constructor. In this case the 'text' entry may not actually be used, if -i is used to filter out the images that get built.

Move the exception to where the data is actually used.

---

 tools/binman/etype/text.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
tools/binman/etype/text.py +2 -2
index 6e99819487..c4aa510a87 100644
@@ -51,10 +51,10 @@ class Entry_text(Entry):
         self.text_label, = self.GetEntryArgsOrProps(
             [EntryArg('text-label', str)])
         self.value, = self.GetEntryArgsOrProps([EntryArg(self.text_label, str)])
+
+    def ObtainContents(self):
         if not self.value:
             self.Raise("No value provided for text label '%s'" %
                        self.text_label)
-
-    def ObtainContents(self):
         self.SetContents(self.value)
         return True
Signature · 1 line
2.20.1.495.gaa96b0ce6b-goog
#2 lore raw

PATCH 1/40 binman: Don't generate an error in 'text' entry constructor

Quoted 5 lines · Simon Glass

It is not good practice to raise an exception in a constructor. In this case the 'text' entry may not actually be used, if -i is used to filter out the images that get built.

Quoted 8 lines

Move the exception to where the data is actually used.

---

 tools/binman/etype/text.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
#3 lore raw

PATCH 2/40 binman: Don't show image-skip message by default

In reply to Simon Glass

This message is not very important since it is simply indicating that the user's instructions are being followed. Only show it when the verbosity level is above the default.

---

 tools/binman/control.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
tools/binman/control.py +2 -2
index 3446e2e79c..b32e4e1996 100644
@@ -133,8 +133,8 @@ def Binman(options, args):
                     if name not in options.image:
                         del images[name]
                         skip.append(name)
-                if skip:
-                    print 'Skipping images: %s\n' % ', '.join(skip)
+                if skip and options.verbosity >= 2:
+                    print 'Skipping images: %s' % ', '.join(skip)
 
             state.Prepare(images, dtb)
 
Signature · 1 line
2.20.1.495.gaa96b0ce6b-goog
#4 lore raw

PATCH 2/40 binman: Don't show image-skip message by default

Hi Simon,

Quoted 16 lines · Simon Glass

This message is not very important since it is simply indicating that the user's instructions are being followed. Only show it when the verbosity level is above the default.

---

 tools/binman/control.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
tools/binman/control.py +0 -0
index 3446e2e79c..b32e4e1996 100644

tools/binman/control.py def Binman(options, args): · line 137

Quoted 7 lines
tools/binman/control.py +2 -2
@@ -133,8 +133,8 @@ def Binman(options, args):
                     if name not in options.image:
                         del images[name]
                         skip.append(name)
-                if skip:
-                    print 'Skipping images: %s\n' % ', '.join(skip)
+                if skip and options.verbosity >= 2:
+                    print 'Skipping images: %s' % ', '.join(skip)

Is dropping '\n' intentional?

tools/binman/control.py def Binman(options, args):

Quoted 4 lines
tools/binman/control.py +0 -1
             state.Prepare(images, dtb)
 
--

Regards,
Bin

#5 lore raw

PATCH 3/40 binman: Add a missing comment in Entry_vblock

In reply to Simon Glass

An important property is missing. Update the entry comment to include this.

---

 tools/binman/etype/vblock.py | 1 +
 1 file changed, 1 insertion(+)
tools/binman/etype/vblock.py +1 -0
index c4d970ed16..334ff9f966 100644
@@ -18,6 +18,7 @@ class Entry_vblock(Entry):
     """An entry which contains a Chromium OS verified boot block
 
     Properties / Entry arguments:
+        - content: List of phandles to entries to sign
         - keydir: Directory containing the public keys to use
         - keyblock: Name of the key file to use (inside keydir)
         - signprivate: Name of provide key file to use (inside keydir)
Signature · 1 line
2.20.1.495.gaa96b0ce6b-goog
#7 lore raw

PATCH 4/40 dm: core: Fix translate condition in ofnode_get_addr_size()

In reply to Simon Glass

Update the condition to translate only if this is enabled for SPL.

---

 drivers/core/ofnode.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/core/ofnode.c +1 -1
index 0e584c12dc..34f3c88b92 100644
@@ -547,7 +547,7 @@ fdt_addr_t ofnode_get_addr_size(ofnode node, const char *property,
 		ns = of_n_size_cells(np);
 		*sizep = of_read_number(prop + na, ns);
 
-		if (IS_ENABLED(CONFIG_OF_TRANSLATE) && ns > 0)
+		if (CONFIG_IS_ENABLED(OF_TRANSLATE) && ns > 0)
 			return of_translate_address(np, prop);
 		else
 			return of_read_number(prop, na);
Signature · 1 line
2.20.1.495.gaa96b0ce6b-goog
#9 lore raw

PATCH 5/40 cros_ec: Use a hyphen in the uclass name

In reply to Simon Glass

Device-tree rules require that aliases use a hyphen rather than a underscore. Update the uclass name to fit with this.

---

 drivers/misc/cros_ec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/misc/cros_ec.c +1 -1
index 565de040fe..382f826286 100644
@@ -1482,7 +1482,7 @@ int cros_ec_set_lid_shutdown_mask(struct udevice *dev, int enable)
 
 UCLASS_DRIVER(cros_ec) = {
 	.id		= UCLASS_CROS_EC,
-	.name		= "cros_ec",
+	.name		= "cros-ec",
 	.per_device_auto_alloc_size = sizeof(struct cros_ec_dev),
 	.post_bind	= dm_scan_fdt_dev,
 	.flags		= DM_UC_FLAG_ALLOC_PRIV_DMA,
Signature · 1 line
2.20.1.495.gaa96b0ce6b-goog
#10 lore raw

PATCH 5/40 cros_ec: Use a hyphen in the uclass name

Hi Simon,

Quoted 4 lines · Simon Glass

Device-tree rules require that aliases use a hyphen rather than a underscore. Update the uclass name to fit with this.

I don't understand the connection between the uclass name and the DT aliases. Could you please provide more details?

Quoted 3 lines

---

Regards,
Bin

#11 lore raw

PATCH 6/40 spl: Allow sandbox to build a device-tree file

In reply to Simon Glass

At present only OF_SEPARATE is considered valid for building a device-tree file in SPL. However sandbox uses OF_HOSTFILE instead. Update the logic to handle this and make it easier to understand.

---

 scripts/Makefile.spl | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)
scripts/Makefile.spl +13 -1
index 1430d7d851..c9eea629dd 100644
@@ -255,8 +255,20 @@ else
 FINAL_DTB_CONTAINER = $(obj)/$(SPL_BIN).multidtb.fit
 endif
 
+# Build the .dtb file if:
+#   - we are not using OF_PLATDATA
+#   - we are using OF_CONTROL
+#   - we have either OF_SEPARATE or OF_HOSTFILE
+build_dtb :=
+ifeq ($(CONFIG_$(SPL_TPL_)OF_PLATDATA),)
+ifneq ($(CONFIG_$(SPL_TPL_)OF_CONTROL),)
+ifeq ($(CONFIG_OF_SEPARATE)$(CONFIG_OF_HOSTFILE),y)
+build_dtb := y
+endif
+endif
+endif
 
-ifeq ($(CONFIG_$(SPL_TPL_)OF_CONTROL)$(CONFIG_OF_SEPARATE)$(CONFIG_$(SPL_TPL_)OF_PLATDATA),yy)
+ifneq ($(build_dtb),)
 $(obj)/$(SPL_BIN)-dtb.bin: $(obj)/$(SPL_BIN)-nodtb.bin \
 		$(if $(CONFIG_SPL_SEPARATE_BSS),,$(obj)/$(SPL_BIN)-pad.bin) \
 		$(FINAL_DTB_CONTAINER)  FORCE
Signature · 1 line
2.20.1.495.gaa96b0ce6b-goog
#12 lore raw

PATCH 6/40 spl: Allow sandbox to build a device-tree file

Hi Simon,

Quoted 16 lines · Simon Glass

At present only OF_SEPARATE is considered valid for building a device-tree file in SPL. However sandbox uses OF_HOSTFILE instead. Update the logic to handle this and make it easier to understand.

---

 scripts/Makefile.spl | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)
scripts/Makefile.spl +0 -0
index 1430d7d851..c9eea629dd 100644

scripts/Makefile.spl else · line 261

Quoted 7 lines
scripts/Makefile.spl +4 -0
@@ -255,8 +255,20 @@ else
 FINAL_DTB_CONTAINER = $(obj)/$(SPL_BIN).multidtb.fit
 endif
 
+# Build the .dtb file if:
+#   - we are not using OF_PLATDATA
+#   - we are using OF_CONTROL
+#   - we have either OF_SEPARATE or OF_HOSTFILE

This is not 1:1 translation of the original logic.

The original logic was any two of the 3 macros:
$CONFIG_$(SPL_TPL_)OF_CONTROL, $CONFIG_OF_SEPARATE, $CONFIG_$(SPL_TPL_)OF_PLATDATA, are defined. But here the new logic is excluding $CONFIG_$(SPL_TPL_)OF_PLATDATA.

Quoted 5 lines
scripts/Makefile.spl +5 -0
+build_dtb :=
+ifeq ($(CONFIG_$(SPL_TPL_)OF_PLATDATA),)
+ifneq ($(CONFIG_$(SPL_TPL_)OF_CONTROL),)
+ifeq ($(CONFIG_OF_SEPARATE)$(CONFIG_OF_HOSTFILE),y)
+build_dtb := y

scripts/Makefile.spl else

Quoted 10 lines
scripts/Makefile.spl +4 -2
+endif
+endif
+endif
 
-ifeq ($(CONFIG_$(SPL_TPL_)OF_CONTROL)$(CONFIG_OF_SEPARATE)$(CONFIG_$(SPL_TPL_)OF_PLATDATA),yy)
+ifneq ($(build_dtb),)
 $(obj)/$(SPL_BIN)-dtb.bin: $(obj)/$(SPL_BIN)-nodtb.bin \
                $(if $(CONFIG_SPL_SEPARATE_BSS),,$(obj)/$(SPL_BIN)-pad.bin) \
                $(FINAL_DTB_CONTAINER)  FORCE
--

Regards,
Bin

#13 lore raw

PATCH 7/40 RFC: binman: Allow sections to have an offset

In reply to Simon Glass

At present sections are always placed automatically. Even if an 'offset' property is provided it is ignored. Update the logic to support an offset for sections.

Note: Needs a test updates

---

 tools/binman/bsection.py      | 5 +++--
 tools/binman/etype/section.py | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)
tools/binman/bsection.py +3 -2
index ccf2920c5b..4a5ced201e 100644
@@ -57,7 +57,7 @@ class Section(object):
         self._name = name
         self._node = node
         self._image = image
-        self._offset = 0
+        self._offset = None
         self._size = None
         self._align_size = None
         self._pad_before = 0
@@ -75,6 +75,7 @@ class Section(object):
 
     def _ReadNode(self):
         """Read properties from the section node"""
+        self._offset = fdt_util.GetInt(self._node, 'offset')
         self._size = fdt_util.GetInt(self._node, 'size')
         self._align_size = fdt_util.GetInt(self._node, 'align-size')
         if tools.NotPowerOfTwo(self._align_size):
@@ -130,7 +131,7 @@ class Section(object):
             entry.AddMissingProperties()
 
     def SetCalculatedProperties(self):
-        state.SetInt(self._node, 'offset', self._offset)
+        state.SetInt(self._node, 'offset', self._offset or 0)
         state.SetInt(self._node, 'size', self._size)
         image_pos = self._image_pos
         if self._parent_section:
tools/binman/etype/section.py +2 -1
index 7f1b413604..3681a48468 100644
@@ -67,7 +67,8 @@ class Entry_section(Entry):
     def Pack(self, offset):
         """Pack all entries into the section"""
         self._section.PackEntries()
-        self._section.SetOffset(offset)
+        if self._section._offset is None:
+            self._section.SetOffset(offset)
         self.size = self._section.GetSize()
         return super(Entry_section, self).Pack(offset)
 
Signature · 1 line
2.20.1.495.gaa96b0ce6b-goog
#14 lore raw

PATCH 7/40 RFC: binman: Allow sections to have an offset

Hi Simon,

Quoted 5 lines · Simon Glass

At present sections are always placed automatically. Even if an 'offset' property is provided it is ignored. Update the logic to support an offset for sections.

Quoted 9 lines

Note: Needs a test updates

---

 tools/binman/bsection.py      | 5 +++--
 tools/binman/etype/section.py | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

x86 is not using 'offset' in section so it should be fine. I think we will need update tools/binman/README to document 'offset' too.

Regards,
Bin

#15 lore raw

PATCH 8/40 x86: start64: Fix copyright message

In reply to Simon Glass

There is a typo in this header. Fix it.

---

 arch/x86/cpu/start64.S | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/cpu/start64.S +1 -1
index a78a3316b6..7be834788b 100644
@@ -2,7 +2,7 @@
 /*
  * 64-bit x86 Startup Code
  *
- * (C) Copyright 216 Google, Inc
+ * Copyright 2019 Google, Inc
  * Written by Simon Glass <[email protected]>
  */
 
Signature · 1 line
2.20.1.495.gaa96b0ce6b-goog
#17 lore raw

PATCH 9/40 x86: mp_init: Use proper error numbers

In reply to Simon Glass

At present many of the functions in this file return -1 as an error number. which is -EPERM. Update the code to use real error numbers.

---

 arch/x86/cpu/mp_init.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
arch/x86/cpu/mp_init.c +5 -5
index ea64c2ee57..fefbf8f728 100644
@@ -322,7 +322,7 @@ static int start_aps(int ap_count, atomic_t *num_aps)
 	if (sipi_vector > max_vector_loc) {
 		printf("SIPI vector too large! 0x%08x\n",
 		       sipi_vector);
-		return -1;
+		return -ENOSPC;
 	}
 
 	debug("Attempting to start %d APs\n", ap_count);
@@ -364,7 +364,7 @@ static int start_aps(int ap_count, atomic_t *num_aps)
 	if (wait_for_aps(num_aps, ap_count, 10000, 50)) {
 		debug("Not all APs checked in: %d/%d\n",
 		      atomic_read(num_aps), ap_count);
-		return -1;
+		return -EIO;
 	}
 
 	return 0;
@@ -387,7 +387,7 @@ static int bsp_do_flight_plan(struct udevice *cpu, struct mp_params *mp_params)
 			if (wait_for_aps(&rec->cpus_entered, num_aps,
 					 timeout_us, step_us)) {
 				debug("MP record %d timeout\n", i);
-				ret = -1;
+				ret = -ETIMEDOUT;
 			}
 		}
 
@@ -508,7 +508,7 @@ int mp_init(struct mp_params *p)
 
 	if (p == NULL || p->flight_plan == NULL || p->num_records < 1) {
 		printf("Invalid MP parameters\n");
-		return -1;
+		return -EINVAL;
 	}
 
 	num_cpus = cpu_get_count(cpu);
@@ -531,7 +531,7 @@ int mp_init(struct mp_params *p)
 	/* Load the SIPI vector */
 	ret = load_sipi_vector(&ap_count, num_cpus);
 	if (ap_count == NULL)
-		return -1;
+		return -ENOENT;
 
 	/*
 	 * Make sure SIPI data hits RAM so the APs that come up will see
Signature · 1 line
2.20.1.495.gaa96b0ce6b-goog
#18 lore raw

PATCH 9/40 x86: mp_init: Use proper error numbers

Quoted 10 lines · Simon Glass

At present many of the functions in this file return -1 as an error number. which is -EPERM. Update the code to use real error numbers.

---

 arch/x86/cpu/mp_init.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
#19 lore raw

PATCH 10/40 x86: Add a way to reinit the cpu

In reply to Simon Glass

We cannot init the CPU fully both than once during a boot. Add a new function which can be called to figure out the CPU identity, but which does not change anything. For x86_64, this is empty for now.

---

 arch/x86/cpu/i386/cpu.c           | 113 ++++++++++++++++++------------
 arch/x86/cpu/x86_64/cpu.c         |   5 ++
 arch/x86/include/asm/u-boot-x86.h |  20 ++++++
 3 files changed, 94 insertions(+), 44 deletions(-)
arch/x86/cpu/i386/cpu.c +69 -44
index 208ef08562..4c362f4adc 100644
@@ -309,21 +309,22 @@ u32 cpu_get_stepping(void)
 	return gd->arch.x86_mask;
 }
 
-int x86_cpu_init_f(void)
+/* initialise FPU, reset EM, set MP and NE */
+static void setup_cpu_features(void)
 {
 	const u32 em_rst = ~X86_CR0_EM;
 	const u32 mp_ne_set = X86_CR0_MP | X86_CR0_NE;
 
-	if (ll_boot_init()) {
-		/* initialize FPU, reset EM, set MP and NE */
-		asm ("fninit\n" \
-		"movl %%cr0, %%eax\n" \
-		"andl %0, %%eax\n" \
-		"orl  %1, %%eax\n" \
-		"movl %%eax, %%cr0\n" \
-		: : "i" (em_rst), "i" (mp_ne_set) : "eax");
-	}
+	asm ("fninit\n" \
+	"movl %%cr0, %%eax\n" \
+	"andl %0, %%eax\n" \
+	"orl  %1, %%eax\n" \
+	"movl %%eax, %%cr0\n" \
+	: : "i" (em_rst), "i" (mp_ne_set) : "eax");
+}
 
+static void setup_identity(void)
+{
 	/* identify CPU via cpuid and store the decoded info into gd->arch */
 	if (has_cpuid()) {
 		struct cpu_device_id cpu;
@@ -339,46 +340,70 @@ int x86_cpu_init_f(void)
 
 		gd->arch.has_mtrr = has_mtrr();
 	}
-	/* Don't allow PCI region 3 to use memory in the 2-4GB memory hole */
+}
+
+/* Don't allow PCI region 3 to use memory in the 2-4GB memory hole */
+static void setup_pci_ram_top(void)
+{
 	gd->pci_ram_top = 0x80000000U;
+}
+
+static void setup_mtrr(void)
+{
+	u64 mtrr_cap;
 
 	/* Configure fixed range MTRRs for some legacy regions */
-	if (gd->arch.has_mtrr) {
-		u64 mtrr_cap;
-
-		mtrr_cap = native_read_msr(MTRR_CAP_MSR);
-		if (mtrr_cap & MTRR_CAP_FIX) {
-			/* Mark the VGA RAM area as uncacheable */
-			native_write_msr(MTRR_FIX_16K_A0000_MSR,
-					 MTRR_FIX_TYPE(MTRR_TYPE_UNCACHEABLE),
-					 MTRR_FIX_TYPE(MTRR_TYPE_UNCACHEABLE));
-
-			/*
-			 * Mark the PCI ROM area as cacheable to improve ROM
-			 * execution performance.
-			 */
-			native_write_msr(MTRR_FIX_4K_C0000_MSR,
-					 MTRR_FIX_TYPE(MTRR_TYPE_WRBACK),
-					 MTRR_FIX_TYPE(MTRR_TYPE_WRBACK));
-			native_write_msr(MTRR_FIX_4K_C8000_MSR,
-					 MTRR_FIX_TYPE(MTRR_TYPE_WRBACK),
-					 MTRR_FIX_TYPE(MTRR_TYPE_WRBACK));
-			native_write_msr(MTRR_FIX_4K_D0000_MSR,
-					 MTRR_FIX_TYPE(MTRR_TYPE_WRBACK),
-					 MTRR_FIX_TYPE(MTRR_TYPE_WRBACK));
-			native_write_msr(MTRR_FIX_4K_D8000_MSR,
-					 MTRR_FIX_TYPE(MTRR_TYPE_WRBACK),
-					 MTRR_FIX_TYPE(MTRR_TYPE_WRBACK));
-
-			/* Enable the fixed range MTRRs */
-			msr_setbits_64(MTRR_DEF_TYPE_MSR, MTRR_DEF_TYPE_FIX_EN);
-		}
+	if (!gd->arch.has_mtrr)
+		return;
+
+	mtrr_cap = native_read_msr(MTRR_CAP_MSR);
+	if (mtrr_cap & MTRR_CAP_FIX) {
+		/* Mark the VGA RAM area as uncacheable */
+		native_write_msr(MTRR_FIX_16K_A0000_MSR,
+				 MTRR_FIX_TYPE(MTRR_TYPE_UNCACHEABLE),
+				 MTRR_FIX_TYPE(MTRR_TYPE_UNCACHEABLE));
+
+		/*
+		 * Mark the PCI ROM area as cacheable to improve ROM
+		 * execution performance.
+		 */
+		native_write_msr(MTRR_FIX_4K_C0000_MSR,
+				 MTRR_FIX_TYPE(MTRR_TYPE_WRBACK),
+				 MTRR_FIX_TYPE(MTRR_TYPE_WRBACK));
+		native_write_msr(MTRR_FIX_4K_C8000_MSR,
+				 MTRR_FIX_TYPE(MTRR_TYPE_WRBACK),
+				 MTRR_FIX_TYPE(MTRR_TYPE_WRBACK));
+		native_write_msr(MTRR_FIX_4K_D0000_MSR,
+				 MTRR_FIX_TYPE(MTRR_TYPE_WRBACK),
+				 MTRR_FIX_TYPE(MTRR_TYPE_WRBACK));
+		native_write_msr(MTRR_FIX_4K_D8000_MSR,
+				 MTRR_FIX_TYPE(MTRR_TYPE_WRBACK),
+				 MTRR_FIX_TYPE(MTRR_TYPE_WRBACK));
+
+		/* Enable the fixed range MTRRs */
+		msr_setbits_64(MTRR_DEF_TYPE_MSR, MTRR_DEF_TYPE_FIX_EN);
 	}
+}
+
+int x86_cpu_init_f(void)
+{
+	if (ll_boot_init())
+		setup_cpu_features();
+	setup_identity();
+	setup_mtrr();
+	setup_pci_ram_top();
 
-#ifdef CONFIG_I8254_TIMER
 	/* Set up the i8254 timer if required */
-	i8254_init();
-#endif
+	if (IS_ENABLED(CONFIG_I8254_TIMER))
+		i8254_init();
+
+	return 0;
+}
+
+int x86_cpu_reinit_f(void)
+{
+	setup_identity();
+	setup_pci_ram_top();
 
 	return 0;
 }
arch/x86/cpu/x86_64/cpu.c +5 -0
index 6c063e8200..42abb23a9e 100644
@@ -61,3 +61,8 @@ int print_cpuinfo(void)
 {
 	return 0;
 }
+
+int x86_cpu_reinit_f(void)
+{
+	return 0;
+}
arch/x86/include/asm/u-boot-x86.h +20 -0
index 670fcdc009..c252192bf4 100644
@@ -13,7 +13,27 @@ extern char gdt_rom[];
 
 /* cpu/.../cpu.c */
 int arch_cpu_init(void);
+
+/**
+ * x86_cpu_init_f() - Set up basic features of the x86 CPU
+ *
+ * 0 on success, -ve on error
+ */
 int x86_cpu_init_f(void);
+
+/**
+ * x86_cpu_reinit_f() - Set up the CPU a second time
+ *
+ * Once cpu_init_f() has been called (e.g. in SPL) we should not call it
+ * again (e.g. in U-Boot proper) since it sets up the state from scratch.
+ * Call this function in later phases of U-Boot instead. It reads the CPU
+ * identify so that CPU functions can be used correctly, but does not change
+ * anything.
+ *
+ * @return 0 (indicating success, to mimic cpu_init_f())
+ */
+int x86_cpu_reinit_f(void);
+
 int cpu_init_f(void);
 void setup_gdt(struct global_data *id, u64 *gdt_addr);
 /*
Signature · 1 line
2.20.1.495.gaa96b0ce6b-goog
#20 lore raw

PATCH 10/40 x86: Add a way to reinit the cpu

Quoted 5 lines · Simon Glass

We cannot init the CPU fully both than once during a boot. Add a new function which can be called to figure out the CPU identity, but which does not change anything. For x86_64, this is empty for now.

Quoted 8 lines

---

 arch/x86/cpu/i386/cpu.c           | 113 ++++++++++++++++++------------
 arch/x86/cpu/x86_64/cpu.c         |   5 ++
 arch/x86/include/asm/u-boot-x86.h |  20 ++++++
 3 files changed, 94 insertions(+), 44 deletions(-)
#21 lore raw

PATCH 11/40 x86: dts: Add device-tree labels for rtc and reset

In reply to Simon Glass

Add labels for these nodes so that board DT files can reference them.

---

 arch/x86/dts/reset.dtsi | 2 +-
 arch/x86/dts/rtc.dtsi   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
arch/x86/dts/reset.dtsi +1 -1
index f979d83757..555d0dd960 100644
@@ -1,5 +1,5 @@
 / {
-	reset {
+	reset: reset {
 		compatible = "x86,reset";
 		u-boot,dm-pre-reloc;
 	};
arch/x86/dts/rtc.dtsi +1 -1
index 1797e042da..d0bbd84e50 100644
@@ -1,5 +1,5 @@
 / {
-	rtc {
+	rtc: rtc {
 		compatible = "motorola,mc146818";
 		u-boot,dm-pre-reloc;
 		reg = <0x70 2>;
Signature · 1 line
2.20.1.495.gaa96b0ce6b-goog
#22 lore raw

PATCH 11/40 x86: dts: Add device-tree labels for rtc and reset

Quoted 10 lines · Simon Glass

Add labels for these nodes so that board DT files can reference them.

---

 arch/x86/dts/reset.dtsi | 2 +-
 arch/x86/dts/rtc.dtsi   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
#23 lore raw

PATCH 12/40 x86: Update a stale comment about ifdtool

In reply to Simon Glass

We use binman to build the x86 image now. Update a comment which still refers to ifdtool.

---

 arch/x86/cpu/intel_common/car.S | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/cpu/intel_common/car.S +1 -1
index 52a77bb2d1..00308dbdef 100644
@@ -235,7 +235,7 @@ mtrr_table_end:
 
 	.align 4
 _dt_ucode_base_size:
-	/* These next two fields are filled in by ifdtool */
+	/* These next two fields are filled in by binman */
 .globl ucode_base
 ucode_base:	/* Declared in microcode.h */
 	.long	0			/* microcode base */
Signature · 1 line
2.20.1.495.gaa96b0ce6b-goog
#24 lore raw

PATCH 12/40 x86: Update a stale comment about ifdtool

Hi Simon,

Quoted 10 lines · Simon Glass

We use binman to build the x86 image now. Update a comment which still refers to ifdtool.

---

 arch/x86/cpu/intel_common/car.S | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

But we should apply the same change in arch/x86/lib/fsp/fsp_car.S too.

Regards,
Bin

#25 lore raw

PATCH 13/40 x86: Support SPL and TPL

In reply to Simon Glass

At present only chromebook_link64 supports SPL. It is useful to eb able to support both TPL and SPL to implement verified boot on x86.

Enable the options for both along with some suitable default options needed to boot through these phases.

---

 arch/Kconfig     | 30 ++++++++++++++++++++++++++++++
 arch/x86/Kconfig |  1 -
 2 files changed, 30 insertions(+), 1 deletion(-)
arch/Kconfig +30 -0
index 35e2712fce..7cb207fe35 100644
@@ -124,6 +124,8 @@ config SH
 
 config X86
 	bool "x86 architecture"
+	select SUPPORT_SPL
+	select SUPPORT_TPL
 	select CREATE_ARCH_SYMLINK
 	select DM
 	select DM_PCI
@@ -160,6 +162,34 @@ config X86
 	imply USB_ETHER_ASIX
 	imply USB_ETHER_SMSC95XX
 	imply USB_HOST_ETHER
+	# Thing to enable for when SPL/TPL are enabled: SPL
+	imply SPL_DM
+	imply SPL_OF_LIBFDT
+	imply SPL_DRIVERS_MISC_SUPPORT
+	imply SPL_GPIO_SUPPORT
+	imply SPL_LIBCOMMON_SUPPORT
+	imply SPL_LIBGENERIC_SUPPORT
+	imply SPL_SERIAL_SUPPORT
+	imply SPL_SPI_FLASH_SUPPORT
+	imply SPL_SPI_SUPPORT
+	imply SPL_OF_CONTROL
+	imply SPL_TIMER
+	imply SPL_REGMAP
+	imply SPL_SYSCON
+	# TPL
+	imply TPL_DM
+	imply TPL_OF_LIBFDT
+	imply TPL_DRIVERS_MISC_SUPPORT
+	imply TPL_GPIO_SUPPORT
+	imply TPL_LIBCOMMON_SUPPORT
+	imply TPL_LIBGENERIC_SUPPORT
+	imply TPL_SERIAL_SUPPORT
+	imply TPL_SPI_FLASH_SUPPORT
+	imply TPL_SPI_SUPPORT
+	imply TPL_OF_CONTROL
+	imply TPL_TIMER
+	imply TPL_REGMAP
+	imply TPL_SYSCON
 
 config XTENSA
 	bool "Xtensa architecture"
arch/x86/Kconfig +0 -1
index e052093775..185f0ef8c4 100644
@@ -32,7 +32,6 @@ config X86_RUN_32BIT
 config X86_RUN_64BIT
 	bool "64-bit"
 	select X86_64
-	select SUPPORT_SPL
 	select SPL
 	select SPL_SEPARATE_BSS
 	help
Signature · 1 line
2.20.1.495.gaa96b0ce6b-goog
#26 lore raw

PATCH 13/40 x86: Support SPL and TPL

Quoted 7 lines · Simon Glass

At present only chromebook_link64 supports SPL. It is useful to eb able to support both TPL and SPL to implement verified boot on x86.

Enable the options for both along with some suitable default options needed to boot through these phases.

Quoted 7 lines

---

 arch/Kconfig     | 30 ++++++++++++++++++++++++++++++
 arch/x86/Kconfig |  1 -
 2 files changed, 30 insertions(+), 1 deletion(-)
#27 lore raw

PATCH 14/40 x86: Support booting with TPL

In reply to Simon Glass

Some boards want to use TPL as the first phase of U-Boot. This allows selection of A or B SPL phases, thus allowing the memory init to be upgraded in the field.

Add a new Kconfig option for this.

---

 arch/x86/Kconfig | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
arch/x86/Kconfig +8 -1
index 185f0ef8c4..45a533625a 100644
@@ -176,10 +176,17 @@ config X86_16BIT_INIT
 config SPL_X86_16BIT_INIT
 	bool
 	depends on X86_RESET_VECTOR
-	default y if X86_RESET_VECTOR && SPL
+	default y if X86_RESET_VECTOR && SPL && !TPL
 	help
 	  This is enabled when 16-bit init is in SPL
 
+config TPL_X86_16BIT_INIT
+	bool
+	depends on X86_RESET_VECTOR
+	default y if X86_RESET_VECTOR && TPL
+	help
+	  This is enabled when 16-bit init is in TPL
+
 config X86_32BIT_INIT
 	bool
 	depends on X86_RESET_VECTOR
Signature · 1 line
2.20.1.495.gaa96b0ce6b-goog
#28 lore raw

PATCH 14/40 x86: Support booting with TPL

Quoted 5 lines · Simon Glass

Some boards want to use TPL as the first phase of U-Boot. This allows selection of A or B SPL phases, thus allowing the memory init to be upgraded in the field.

Quoted 8 lines

Add a new Kconfig option for this.

---

 arch/x86/Kconfig | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
#29 lore raw

PATCH 15/40 x86: Add a handoff header file

In reply to Simon Glass

Add an arch-specific handoff header so that we can use the HANDOFF feature on x86 devices.

---

 arch/x86/include/asm/handoff.h | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 arch/x86/include/asm/handoff.h
arch/x86/include/asm/handoff.h new file +15 -0
new file mode 100644
index 0000000000..4d18d59efe
@@ -0,0 +1,15 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Architecture-specific SPL handoff information for x86
+ *
+ * Copyright 2018 Google, Inc
+ * Written by Simon Glass <[email protected]>
+ */
+
+#ifndef __x86_asm_handoff_h
+#define __x86_asm_handoff_h
+
+struct arch_spl_handoff {
+};
+
+#endif
Signature · 1 line
2.20.1.495.gaa96b0ce6b-goog
#30 lore raw

PATCH 15/40 x86: Add a handoff header file

Quoted 11 lines · Simon Glass

Add an arch-specific handoff header so that we can use the HANDOFF feature on x86 devices.

---

 arch/x86/include/asm/handoff.h | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 arch/x86/include/asm/handoff.h
#31 lore raw

PATCH 16/40 x86: broadwell: Improve SDRAM debugging output

In reply to Simon Glass

Add debugging during SDRAM init so that problems are easier to diagnose.

---

 arch/x86/cpu/broadwell/sdram.c | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)
arch/x86/cpu/broadwell/sdram.c +20 -12
index 03a35bcf73..1b9f9840c6 100644
@@ -204,16 +204,18 @@ int dram_init(void)
 
 	/* Print ME state before MRC */
 	ret = syscon_get_by_driver_data(X86_SYSCON_ME, &me_dev);
-	if (ret)
+	if (ret) {
+		debug("Cannot get ME (err=%d)\n", ret);
 		return ret;
+	}
 	intel_me_status(me_dev);
 
 	/* Save ME HSIO version */
-	ret = uclass_first_device(UCLASS_PCH, &pch_dev);
-	if (ret)
+	ret = uclass_first_device_err(UCLASS_PCH, &pch_dev);
+	if (ret) {
+		debug("Cannot get PCH (err=%d)\n", ret);
 		return ret;
-	if (!pch_dev)
-		return -ENODEV;
+	}
 	power_state_get(pch_dev, &ps);
 
 	intel_me_hsio_version(me_dev, &ps.hsio_version, &ps.hsio_checksum);
@@ -221,15 +223,17 @@ int dram_init(void)
 	broadwell_fill_pei_data(pei_data);
 	mainboard_fill_pei_data(pei_data);
 
-	ret = uclass_first_device(UCLASS_NORTHBRIDGE, &dev);
-	if (ret)
+	ret = uclass_first_device_err(UCLASS_NORTHBRIDGE, &dev);
+	if (ret) {
+		debug("Cannot get Northbridge (err=%d)\n", ret);
 		return ret;
-	if (!dev)
-		return -ENODEV;
+	}
 	size = 256;
 	ret = mrc_locate_spd(dev, size, &spd_data);
-	if (ret)
+	if (ret) {
+		debug("Cannot locate SPD (err=%d)\n", ret);
 		return ret;
+	}
 	memcpy(pei_data->spd_data[0][0], spd_data, size);
 	memcpy(pei_data->spd_data[1][0], spd_data, size);
 
@@ -239,13 +243,17 @@ int dram_init(void)
 
 	debug("PEI version %#x\n", pei_data->pei_version);
 	ret = mrc_common_init(dev, pei_data, true);
-	if (ret)
+	if (ret) {
+		debug("mrc_common_init() failed(err=%d)\n", ret);
 		return ret;
+	}
 	debug("Memory init done\n");
 
 	ret = sdram_find(dev);
-	if (ret)
+	if (ret) {
+		debug("sdram_find() failed (err=%d)\n", ret);
 		return ret;
+	}
 	gd->ram_size = gd->arch.meminfo.total_32bit_memory;
 	debug("RAM size %llx\n", (unsigned long long)gd->ram_size);
 
Signature · 1 line
2.20.1.495.gaa96b0ce6b-goog
#32 lore raw

PATCH 16/40 x86: broadwell: Improve SDRAM debugging output

Quoted 10 lines · Simon Glass

Add debugging during SDRAM init so that problems are easier to diagnose.

---

 arch/x86/cpu/broadwell/sdram.c | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)
#33 lore raw

PATCH 17/40 x86: broadwell: Allow SDRAM init from SPL

In reply to Simon Glass

At present SDRAM is always set up in U-Boot proper. Allow this to be done in SPL instead so that U-Boot proper can be loaded into SDRAM and run from there. This allows U-Boot to be compressed to reduce space, since it is not necessary to run it directly from flash.

---

 arch/x86/cpu/broadwell/Makefile      |  2 +-
 arch/x86/cpu/broadwell/northbridge.c | 93 ++++++++++++++++++++++++++++
 arch/x86/cpu/broadwell/sdram.c       | 93 ----------------------------
 3 files changed, 94 insertions(+), 94 deletions(-)
arch/x86/cpu/broadwell/Makefile +1 -1
index a032861e57..55f2c93719 100644
@@ -12,4 +12,4 @@ obj-y += pinctrl_broadwell.o
 obj-y += power_state.o
 obj-y += refcode.o
 obj-y += sata.o
-obj-y += sdram.o
+obj-$(CONFIG_$(SPL_TPL_)X86_32BIT_INIT) += sdram.o
arch/x86/cpu/broadwell/northbridge.c +93 -0

101 lines not on this page · raw message

arch/x86/cpu/broadwell/sdram.c +0 -93

99 lines not on this page · raw message

Signature · 1 line
2.20.1.495.gaa96b0ce6b-goog
#34 lore raw

PATCH 17/40 x86: broadwell: Allow SDRAM init from SPL

Hi Simon,

Quoted 2 lines · Simon Glass

At present SDRAM is always set up in U-Boot proper. Allow this to be done

I don't understand. I thought SDRAM was already set up in the U-Boot SPL in the 64-bit build. The U-Boot proper needs a MMU table which resides in RAM, so without RAM being initialized first there is no way for U-Boot proper to run. Am I missing anything?

Quoted 4 lines

in SPL instead so that U-Boot proper can be loaded into SDRAM and run from there. This allows U-Boot to be compressed to reduce space, since it is not necessary to run it directly from flash.

Quoted 8 lines

---

 arch/x86/cpu/broadwell/Makefile      |  2 +-
 arch/x86/cpu/broadwell/northbridge.c | 93 ++++++++++++++++++++++++++++
 arch/x86/cpu/broadwell/sdram.c       | 93 ----------------------------
 3 files changed, 94 insertions(+), 94 deletions(-)

Regards,
Bin

#35 lore raw

PATCH 17/40 x86: broadwell: Allow SDRAM init from SPL

Hi Bin,

Quoted 11 lines · Bin Meng

Hi Simon,

Quoted 2 lines · Simon Glass

At present SDRAM is always set up in U-Boot proper. Allow this to be done

I don't understand. I thought SDRAM was already set up in the U-Boot SPL in the 64-bit build. The U-Boot proper needs a MMU table which resides in RAM, so without RAM being initialized first there is no way for U-Boot proper to run. Am I missing anything?

I'll update this to make it clear it is just for broadwell, which doesn't support 64-bit.

Regards,
Simon

Quoted 16 lines
Quoted 5 lines

in SPL instead so that U-Boot proper can be loaded into SDRAM and run from there. This allows U-Boot to be compressed to reduce space, since it is not necessary to run it directly from flash.

Quoted 8 lines

---

 arch/x86/cpu/broadwell/Makefile      |  2 +-
 arch/x86/cpu/broadwell/northbridge.c | 93 ++++++++++++++++++++++++++++
 arch/x86/cpu/broadwell/sdram.c       | 93 ----------------------------
 3 files changed, 94 insertions(+), 94 deletions(-)

Regards,
Bin

#36 lore raw

PATCH 18/40 x86: Move init of debug UART to cpu.c

In reply to Simon Glass

At present the debug UART is set up in sdram.c which is not the best place since it has nothing in particular to do with SDRAM. Since we want to support initing this in SPL too, move it to a common file.

---

 arch/x86/cpu/broadwell/cpu.c   | 13 +++++++++++++
 arch/x86/cpu/broadwell/sdram.c | 11 -----------
 2 files changed, 13 insertions(+), 11 deletions(-)
arch/x86/cpu/broadwell/cpu.c +13 -0
index 232fa40eb5..d53c7b863f 100644
@@ -12,7 +12,9 @@
 #include <asm/cpu_x86.h>
 #include <asm/cpu_common.h>
 #include <asm/intel_regs.h>
+#include <asm/lpc_common.h>
 #include <asm/msr.h>
+#include <asm/pci.h>
 #include <asm/post.h>
 #include <asm/turbo.h>
 #include <asm/arch/cpu.h>
@@ -156,6 +158,17 @@ int print_cpuinfo(void)
 	return 0;
 }
 
+void board_debug_uart_init(void)
+{
+	struct udevice *bus = NULL;
+
+	/* com1 / com2 decode range */
+	pci_x86_write_config(bus, PCH_DEV_LPC, LPC_IO_DEC, 1 << 4, PCI_SIZE_16);
+
+	pci_x86_write_config(bus, PCH_DEV_LPC, LPC_EN, COMA_LPC_EN,
+			     PCI_SIZE_16);
+}
+
 /*
  * The core 100MHz BLCK is disabled in deeper c-states. One needs to calibrate
  * the 100MHz BCLCK against the 24MHz BLCK to restore the clocks properly
arch/x86/cpu/broadwell/sdram.c +0 -11
index b8450cc9d2..b31d78c092 100644
@@ -194,17 +194,6 @@ int misc_init_r(void)
 	return 0;
 }
 
-void board_debug_uart_init(void)
-{
-	struct udevice *bus = NULL;
-
-	/* com1 / com2 decode range */
-	pci_x86_write_config(bus, PCH_DEV_LPC, LPC_IO_DEC, 1 << 4, PCI_SIZE_16);
-
-	pci_x86_write_config(bus, PCH_DEV_LPC, LPC_EN, COMA_LPC_EN,
-			     PCI_SIZE_16);
-}
-
 static const struct udevice_id broadwell_syscon_ids[] = {
 	{ .compatible = "intel,me", .data = X86_SYSCON_ME },
 	{ }
Signature · 1 line
2.20.1.495.gaa96b0ce6b-goog
#37 lore raw

PATCH 18/40 x86: Move init of debug UART to cpu.c

Quoted 5 lines · Simon Glass

At present the debug UART is set up in sdram.c which is not the best place since it has nothing in particular to do with SDRAM. Since we want to support initing this in SPL too, move it to a common file.

Quoted 7 lines

---

 arch/x86/cpu/broadwell/cpu.c   | 13 +++++++++++++
 arch/x86/cpu/broadwell/sdram.c | 11 -----------
 2 files changed, 13 insertions(+), 11 deletions(-)
#38 lore raw

PATCH 19/40 x86: broadwell: Split CPU init

In reply to Simon Glass

Split the CPU init into two parts - the 'full' init which happens in the first U-Boot phase, and the rest of the init that happens on subsequent stages.

---

 arch/x86/cpu/broadwell/Makefile   |   1 +
 arch/x86/cpu/broadwell/cpu.c      | 673 -----------------------------
 arch/x86/cpu/broadwell/cpu_full.c | 694 ++++++++++++++++++++++++++++++
 3 files changed, 695 insertions(+), 673 deletions(-)
 create mode 100644 arch/x86/cpu/broadwell/cpu_full.c
arch/x86/cpu/broadwell/Makefile +1 -0
index 55f2c93719..303d2b274b 100644
@@ -3,6 +3,7 @@
 # Copyright (c) 2016 Google, Inc
 
 obj-y += cpu.o
+obj-y += cpu_full.o
 obj-y += iobp.o
 obj-y += lpc.o
 obj-y += me.o
arch/x86/cpu/broadwell/cpu.c +0 -673

682 lines not on this page · raw message

arch/x86/cpu/broadwell/cpu_full.c new file +694 -0

694 lines not on this page · raw message

Signature · 1 line
2.20.1.495.gaa96b0ce6b-goog
#39 lore raw

PATCH 19/40 x86: broadwell: Split CPU init

Quoted 5 lines · Simon Glass

Split the CPU init into two parts - the 'full' init which happens in the first U-Boot phase, and the rest of the init that happens on subsequent stages.

Quoted 9 lines

---

 arch/x86/cpu/broadwell/Makefile   |   1 +
 arch/x86/cpu/broadwell/cpu.c      | 673 -----------------------------
 arch/x86/cpu/broadwell/cpu_full.c | 694 ++++++++++++++++++++++++++++++
 3 files changed, 695 insertions(+), 673 deletions(-)
 create mode 100644 arch/x86/cpu/broadwell/cpu_full.c
#40 lore raw

PATCH 20/40 x86: Add support for starting from SPL/TPL

In reply to Simon Glass

When a previous phase of U-Boot has run we need to adjust the init of subsequent states to avoid messing up the CPU state.

Add a new version of the start logic for SPL, when it boots from TPL (start_from tpl.c) and a new version for U-Boot when it boots from SPL.

---

 arch/x86/Makefile             | 12 ++++++
 arch/x86/cpu/Makefile         | 15 +++++++-
 arch/x86/cpu/start_from_spl.S | 71 +++++++++++++++++++++++++++++++++++
 arch/x86/cpu/start_from_tpl.S | 50 ++++++++++++++++++++++++
 4 files changed, 147 insertions(+), 1 deletion(-)
 create mode 100644 arch/x86/cpu/start_from_spl.S
 create mode 100644 arch/x86/cpu/start_from_tpl.S
arch/x86/Makefile +12 -0
index fec14847cc..9fd6cf2d3b 100644
@@ -4,9 +4,21 @@ ifeq ($(CONFIG_EFI_APP),)
 ifdef CONFIG_$(SPL_)X86_64
 head-y := arch/x86/cpu/start64.o
 else
+ifeq ($(CONFIG_$(SPL_TPL_)X86_16BIT_INIT),y)
 head-y := arch/x86/cpu/start.o
+else
+ifndef CONFIG_SPL
+head-y := arch/x86/cpu/start.o
+else
+ifdef CONFIG_SPL_BUILD
+head-y	= arch/x86/cpu/start_from_tpl.o
+else
+head-y	= arch/x86/cpu/start_from_spl.o
+endif
+endif
 endif
 endif
+endif # EFI
 
 head-$(CONFIG_$(SPL_)X86_16BIT_INIT) += arch/x86/cpu/start16.o
 head-$(CONFIG_$(SPL_)X86_16BIT_INIT) += arch/x86/cpu/resetvec.o
arch/x86/cpu/Makefile +14 -1
index 54668aab24..85fd5e616e 100644
@@ -9,9 +9,22 @@
 ifeq ($(CONFIG_$(SPL_)X86_64),y)
 extra-y	= start64.o
 else
+ifeq ($(CONFIG_$(SPL_TPL_)X86_16BIT_INIT),y)
 extra-y	= start.o
+else
+ifndef CONFIG_SPL
+extra-y	= start.o
+else
+ifdef CONFIG_SPL_BUILD
+extra-y	= start_from_tpl.o
+else
+extra-y	= start_from_spl.o
 endif
-extra-$(CONFIG_$(SPL_)X86_16BIT_INIT) += resetvec.o start16.o
+endif
+endif
+endif
+
+extra-$(CONFIG_$(SPL_TPL_)X86_16BIT_INIT) += resetvec.o start16.o
 
 obj-y	+= cpu.o cpu_x86.o
 
arch/x86/cpu/start_from_spl.S new file +71 -0

71 lines not on this page · raw message

arch/x86/cpu/start_from_tpl.S new file +50 -0

50 lines not on this page · raw message

Signature · 1 line
2.20.1.495.gaa96b0ce6b-goog
#41 lore raw

PATCH 20/40 x86: Add support for starting from SPL/TPL

Hi Simon,

arch/x86/cpu/start_from_spl.S

Quoted 73 lines · Simon Glass

When a previous phase of U-Boot has run we need to adjust the init of subsequent states to avoid messing up the CPU state.

Add a new version of the start logic for SPL, when it boots from TPL (start_from tpl.c) and a new version for U-Boot when it boots from SPL.

---

 arch/x86/Makefile             | 12 ++++++
 arch/x86/cpu/Makefile         | 15 +++++++-
 arch/x86/cpu/start_from_spl.S | 71 +++++++++++++++++++++++++++++++++++
 arch/x86/cpu/start_from_tpl.S | 50 ++++++++++++++++++++++++
 4 files changed, 147 insertions(+), 1 deletion(-)
 create mode 100644 arch/x86/cpu/start_from_spl.S
 create mode 100644 arch/x86/cpu/start_from_tpl.S
arch/x86/Makefile +12 -0
index fec14847cc..9fd6cf2d3b 100644
@@ -4,9 +4,21 @@ ifeq ($(CONFIG_EFI_APP),)
 ifdef CONFIG_$(SPL_)X86_64
 head-y := arch/x86/cpu/start64.o
 else
+ifeq ($(CONFIG_$(SPL_TPL_)X86_16BIT_INIT),y)
 head-y := arch/x86/cpu/start.o
+else
+ifndef CONFIG_SPL
+head-y := arch/x86/cpu/start.o
+else
+ifdef CONFIG_SPL_BUILD
+head-y = arch/x86/cpu/start_from_tpl.o
+else
+head-y = arch/x86/cpu/start_from_spl.o
+endif
+endif
 endif
 endif
+endif # EFI
 
 head-$(CONFIG_$(SPL_)X86_16BIT_INIT) += arch/x86/cpu/start16.o
 head-$(CONFIG_$(SPL_)X86_16BIT_INIT) += arch/x86/cpu/resetvec.o
arch/x86/cpu/Makefile +14 -1
index 54668aab24..85fd5e616e 100644
@@ -9,9 +9,22 @@
 ifeq ($(CONFIG_$(SPL_)X86_64),y)
 extra-y        = start64.o
 else
+ifeq ($(CONFIG_$(SPL_TPL_)X86_16BIT_INIT),y)
 extra-y        = start.o
+else
+ifndef CONFIG_SPL
+extra-y        = start.o
+else
+ifdef CONFIG_SPL_BUILD
+extra-y        = start_from_tpl.o
+else
+extra-y        = start_from_spl.o
 endif
-extra-$(CONFIG_$(SPL_)X86_16BIT_INIT) += resetvec.o start16.o
+endif
+endif
+endif
+
+extra-$(CONFIG_$(SPL_TPL_)X86_16BIT_INIT) += resetvec.o start16.o
 
 obj-y  += cpu.o cpu_x86.o
 
arch/x86/cpu/start_from_spl.S +0 -0

Is it possible to consolidate start_from_spl.S and start_from_tpl.S into one file, to save some duplicates?

Quoted 94 lines

new file mode 100644
index 0000000000..4d4e5d0758

arch/x86/cpu/start_from_spl.S new file +71 -0
@@ -0,0 +1,71 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * 32-bit x86 Startup Code when running from SPL
+ *
+ * Copyright 2018 Google, Inc
+ * Written by Simon Glass <[email protected]>
+ */
+
+#include <config.h>
+
+.section .text.start
+.code32
+.globl _start
+.type _start, @function
+_start:
+       /* Set up memory using the existing stack */
+       movl    $(CONFIG_SYS_CAR_ADDR + CONFIG_SYS_CAR_SIZE - 4), %eax
+#ifdef CONFIG_DCACHE_RAM_MRC_VAR_SIZE
+       subl    $CONFIG_DCACHE_RAM_MRC_VAR_SIZE, %eax
+#endif
+       /*
+        * We don't subject CONFIG_DCACHE_RAM_MRC_VAR_SIZE since memory is
+        * already set up. This has the happy side-effect of putting gd in a
+        * new place separate from SPL, so the memset() in
+        * board_init_f_init_reserve() does not cause any problems (otherwise
+        * it would zero out the gd and crash)
+        */
+       call    board_init_f_alloc_reserve
+       mov     %eax, %esp
+
+       call    board_init_f_init_reserve
+
+       xorl    %eax, %eax
+       call    board_init_f
+       call    board_init_f_r
+
+       /* Should not return here */
+       jmp     .
+
+.globl board_init_f_r_trampoline
+.type board_init_f_r_trampoline, @function
+board_init_f_r_trampoline:
+       /*
+        * SPL has been executed and SDRAM has been initialised, U-Boot code
+        * has been copied into RAM, BSS has been cleared and relocation
+        * adjustments have been made. It is now time to jump into the in-RAM
+        * copy of U-Boot
+        *
+        * %eax = Address of top of new stack
+        */
+
+       /* Stack grows down from top of SDRAM */
+       movl    %eax, %esp
+
+       /* Re-enter U-Boot by calling board_init_f_r() */
+       call    board_init_f_r
+
+die:
+       hlt
+       jmp     die
+       hlt
+
+       .align 4
+_dt_ucode_base_size:
+       /* These next two fields are filled in by binman */
+.globl ucode_base
+ucode_base:    /* Declared in microcode.h */
+       .long   0                       /* microcode base */
+.globl ucode_size
+ucode_size:    /* Declared in microcode.h */
+       .long   0                       /* microcode size */
arch/x86/cpu/start_from_tpl.S new file +12 -0
new file mode 100644
index 0000000000..e27f39eddf
@@ -0,0 +1,50 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * 32-bit x86 Startup Code when running from SPL
+ *
+ * Copyright 2018 Google, Inc
+ * Written by Simon Glass <[email protected]>
+ */
+
+#include <config.h>
+
+.section .text.start
+.code32

arch/x86/cpu/start_from_tpl.S line 22

Quoted 10 lines
arch/x86/cpu/start_from_tpl.S new file +10 -0
+.globl _start
+.type _start, @function
+_start:
+       /* Set up memory using the existing stack */
+       mov     %esp, %eax
+       call    board_init_f_alloc_reserve
+       mov     %eax, %esp
+
+       call    board_init_f_init_reserve
+

missing "xorl %eax, %eax" here

arch/x86/cpu/start_from_tpl.S line 33

Quoted 11 lines
arch/x86/cpu/start_from_tpl.S new file +11 -0
+       call    board_init_f
+       call    board_init_f_r
+
+       /* Should not return here */
+       jmp     .
+
+.globl board_init_f_r_trampoline
+.type board_init_f_r_trampoline, @function
+board_init_f_r_trampoline:
+       /*
+        * SPL has been executed and SDRAM has been initialised, U-Boot code

TPL?

Quoted 8 lines
arch/x86/cpu/start_from_tpl.S new file +8 -0
+        * has been copied into RAM, BSS has been cleared and relocation
+        * adjustments have been made. It is now time to jump into the in-RAM
+        * copy of U-Boot
+        *
+        * %eax = Address of top of new stack
+        */
+
+       /* Stack grows down from top of SDRAM */

arch/x86/cpu/start_from_tpl.S

Quoted 10 lines
arch/x86/cpu/start_from_tpl.S new file +9 -1
+       movl    %eax, %esp
+
+       /* Re-enter U-Boot by calling board_init_f_r() */
+       call    board_init_f_r
+
+die:
+       hlt
+       jmp     die
+       hlt
--

Regards,
Bin

#42 lore raw

PATCH 21/40 x86: Allow 16-bit init to be in TPL

In reply to Simon Glass

At present we support having 16-bit init be in SPL or U-Boot proper, but not TPL. Add support for this so that TPL can boot.

---

 Makefile                           |  1 +
 arch/x86/Makefile                  |  4 ++--
 arch/x86/cpu/intel_common/Makefile |  2 +-
 arch/x86/cpu/u-boot-spl.lds        |  2 +-
 scripts/Makefile.spl               | 10 +++++++++-
 5 files changed, 14 insertions(+), 5 deletions(-)
Makefile +1 -0
index c73b116480..86b21a1a78 100644
@@ -1399,6 +1399,7 @@ cmd_ldr = $(LD) $(LDFLAGS_$(@F)) \
 
 u-boot.rom: u-boot-x86-16bit.bin u-boot.bin \
 		$(if $(CONFIG_SPL_X86_16BIT_INIT),spl/u-boot-spl.bin) \
+		$(if $(CONFIG_TPL_X86_16BIT_INIT),tpl/u-boot-tpl.bin) \
 		$(if $(CONFIG_HAVE_REFCODE),refcode.bin) FORCE
 	$(call if_changed,binman)
 
arch/x86/Makefile +2 -2
index 9fd6cf2d3b..f1afc74fff 100644
@@ -20,8 +20,8 @@ endif
 endif
 endif # EFI
 
-head-$(CONFIG_$(SPL_)X86_16BIT_INIT) += arch/x86/cpu/start16.o
-head-$(CONFIG_$(SPL_)X86_16BIT_INIT) += arch/x86/cpu/resetvec.o
+head-$(CONFIG_$(SPL_TPL_)X86_16BIT_INIT) += arch/x86/cpu/start16.o
+head-$(CONFIG_$(SPL_TPL_)X86_16BIT_INIT) += arch/x86/cpu/resetvec.o
 
 libs-y += arch/x86/cpu/
 libs-y += arch/x86/lib/
arch/x86/cpu/intel_common/Makefile +1 -1
index bf798c287f..80fbc7ab66 100644
@@ -3,7 +3,7 @@
 # Copyright (c) 2016 Google, Inc
 
 ifdef CONFIG_HAVE_MRC
-obj-$(CONFIG_$(SPL_)X86_32BIT_INIT) += car.o
+obj-$(CONFIG_$(SPL_TPL_)X86_16BIT_INIT) += car.o
 obj-$(CONFIG_$(SPL_)X86_32BIT_INIT) += me_status.o
 obj-$(CONFIG_$(SPL_)X86_32BIT_INIT) += report_platform.o
 obj-$(CONFIG_$(SPL_)X86_32BIT_INIT) += mrc.o
arch/x86/cpu/u-boot-spl.lds +1 -1
index 4e656dc4e5..f20c0b810d 100644
@@ -54,7 +54,7 @@ SECTIONS
 	/DISCARD/ : { *(.interp*) }
 	/DISCARD/ : { *(.gnu*) }
 
-#ifdef CONFIG_SPL_X86_16BIT_INIT
+#if defined(CONFIG_SPL_X86_16BIT_INIT) || defined(CONFIG_TPL_X86_16BIT_INIT)
 	/*
 	 * The following expressions place the 16-bit Real-Mode code and
 	 * Reset Vector at the end of the Flash ROM
scripts/Makefile.spl +9 -1
index c9eea629dd..107f1e257a 100644
@@ -230,7 +230,11 @@ ifeq ($(CONFIG_SYS_SOC),"at91")
 ALL-y	+= boot.bin
 endif
 
+ifdef CONFIG_TPL_BUILD
+ALL-$(CONFIG_TPL_X86_16BIT_INIT) += $(obj)/u-boot-x86-16bit-tpl.bin
+else
 ALL-$(CONFIG_SPL_X86_16BIT_INIT) += $(obj)/u-boot-x86-16bit-spl.bin
+endif
 
 ALL-$(CONFIG_ARCH_ZYNQ)		+= $(obj)/boot.bin
 ALL-$(CONFIG_ARCH_ZYNQMP)	+= $(obj)/boot.bin
@@ -330,7 +334,7 @@ quiet_cmd_objcopy = OBJCOPY $@
 cmd_objcopy = $(OBJCOPY) $(OBJCOPYFLAGS) $(OBJCOPYFLAGS_$(@F)) $< $@
 
 OBJCOPYFLAGS_$(SPL_BIN)-nodtb.bin = $(SPL_OBJCFLAGS) -O binary \
-		$(if $(CONFIG_SPL_X86_16BIT_INIT),-R .start16 -R .resetvec)
+		$(if $(CONFIG_$(SPL_TPL_)X86_16BIT_INIT),-R .start16 -R .resetvec)
 
 $(obj)/$(SPL_BIN)-nodtb.bin: $(obj)/$(SPL_BIN) FORCE
 	$(call if_changed,objcopy)
@@ -339,6 +343,10 @@ OBJCOPYFLAGS_u-boot-x86-16bit-spl.bin := -O binary -j .start16 -j .resetvec
 $(obj)/u-boot-x86-16bit-spl.bin: $(obj)/u-boot-spl FORCE
 	$(call if_changed,objcopy)
 
+OBJCOPYFLAGS_u-boot-x86-16bit-tpl.bin := -O binary -j .start16 -j .resetvec
+$(obj)/u-boot-x86-16bit-tpl.bin: $(obj)/u-boot-tpl FORCE
+	$(call if_changed,objcopy)
+
 LDFLAGS_$(SPL_BIN) += -T u-boot-spl.lds $(LDFLAGS_FINAL)
 
 # Avoid 'Not enough room for program headers' error on binutils 2.28 onwards.
Signature · 1 line
2.20.1.495.gaa96b0ce6b-goog
#43 lore raw

PATCH 21/40 x86: Allow 16-bit init to be in TPL

Quoted 5 lines · Simon Glass

At present we support having 16-bit init be in SPL or U-Boot proper, but not TPL. Add support for this so that TPL can boot.

Quoted 9 lines

---

 Makefile                           |  1 +
 arch/x86/Makefile                  |  4 ++--
 arch/x86/cpu/intel_common/Makefile |  2 +-
 arch/x86/cpu/u-boot-spl.lds        |  2 +-
 scripts/Makefile.spl               | 10 +++++++++-
 5 files changed, 14 insertions(+), 5 deletions(-)
#44 lore raw

PATCH 22/40 x86: broadwell: Allow booting from SPL

In reply to Simon Glass

At present broadwell only supports booting straight into U-Boot proper. Add a separate init file to boot from SPL into U-Boot proper, and select it when SPL is in use.

---

 arch/x86/cpu/broadwell/Makefile       | 15 +++++++
 arch/x86/cpu/broadwell/cpu_from_spl.c | 63 +++++++++++++++++++++++++++
 2 files changed, 78 insertions(+)
 create mode 100644 arch/x86/cpu/broadwell/cpu_from_spl.c
arch/x86/cpu/broadwell/Makefile +15 -0
index 303d2b274b..11d30b03e5 100644
@@ -4,6 +4,21 @@
 
 obj-y += cpu.o
 obj-y += cpu_full.o
+
+ifdef CONFIG_SPL
+ifndef CONFIG_SPL_BUILD
+obj-y += cpu_from_spl.o
+obj-y += cpu_full.o
+endif
+ifndef CONFIG_SPL_BUILD
+# obj-y += cpu_from_spl.o
+endif
+endif
+
+ifeq ($(CONFIG_$(SPL_TPL_)X86_32BIT_INIT),)
+#obj-y += cpu_from_spl.o
+endif
+
 obj-y += iobp.o
 obj-y += lpc.o
 obj-y += me.o
arch/x86/cpu/broadwell/cpu_from_spl.c new file +63 -0

63 lines not on this page · raw message

Signature · 1 line
2.20.1.495.gaa96b0ce6b-goog
#45 lore raw

PATCH 22/40 x86: broadwell: Allow booting from SPL

Quoted 5 lines · Simon Glass

At present broadwell only supports booting straight into U-Boot proper. Add a separate init file to boot from SPL into U-Boot proper, and select it when SPL is in use.

Quoted 8 lines

---

 arch/x86/cpu/broadwell/Makefile       | 15 +++++++
 arch/x86/cpu/broadwell/cpu_from_spl.c | 63 +++++++++++++++++++++++++++
 2 files changed, 78 insertions(+)
 create mode 100644 arch/x86/cpu/broadwell/cpu_from_spl.c
#46 lore raw

PATCH 23/40 x86: broadwell: Select refcode and CPU code for SPL

In reply to Simon Glass

Allow broadwell to build for SPL and include the reference code.

---

 arch/x86/cpu/broadwell/Makefile | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
arch/x86/cpu/broadwell/Makefile +4 -3
index 11d30b03e5..394a794f91 100644
@@ -2,13 +2,14 @@
 #
 # Copyright (c) 2016 Google, Inc
 
-obj-y += cpu.o
-obj-y += cpu_full.o
+obj-$(CONFIG_$(SPL_TPL_)X86_16BIT_INIT) += cpu.o
+obj-$(CONFIG_$(SPL_TPL_)X86_32BIT_INIT) += cpu_full.o
 
 ifdef CONFIG_SPL
 ifndef CONFIG_SPL_BUILD
 obj-y += cpu_from_spl.o
 obj-y += cpu_full.o
+obj-y += refcode.o
 endif
 ifndef CONFIG_SPL_BUILD
 # obj-y += cpu_from_spl.o
@@ -26,6 +27,6 @@ obj-y += northbridge.o
 obj-y += pch.o
 obj-y += pinctrl_broadwell.o
 obj-y += power_state.o
-obj-y += refcode.o
+obj-$(CONFIG_$(SPL_TPL_)X86_32BIT_INIT) += refcode.o
 obj-y += sata.o
 obj-$(CONFIG_$(SPL_TPL_)X86_32BIT_INIT) += sdram.o
Signature · 1 line
2.20.1.495.gaa96b0ce6b-goog
#48 lore raw

PATCH 24/40 x86: Add common Intel code for SPL

In reply to Simon Glass

Add an implementation of arch_cpu_init_f() so that the x86 SPL code builds and identifies the CPU.

---

 arch/x86/cpu/intel_common/Makefile       |  6 ++++++
 arch/x86/cpu/intel_common/cpu_from_spl.c | 27 ++++++++++++++++++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 arch/x86/cpu/intel_common/cpu_from_spl.c
arch/x86/cpu/intel_common/Makefile +6 -0
index 80fbc7ab66..57cca0b930 100644
@@ -14,3 +14,9 @@ ifndef CONFIG_TARGET_EFI_APP
 obj-y += microcode.o
 endif
 obj-y += pch.o
+
+ifdef CONFIG_SPL
+ifndef CONFIG_SPL_BUILD
+obj-y += cpu_from_spl.o
+endif
+endif
arch/x86/cpu/intel_common/cpu_from_spl.c new file +27 -0
new file mode 100644
index 0000000000..a6233c75ce
@@ -0,0 +1,27 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (c) 2016 Google, Inc
+ */
+
+#include <common.h>
+#include <dm.h>
+#include <errno.h>
+#include <asm/cpu_common.h>
+#include <asm/intel_regs.h>
+#include <asm/lapic.h>
+#include <asm/lpc_common.h>
+#include <asm/msr.h>
+#include <asm/mtrr.h>
+#include <asm/post.h>
+#include <asm/microcode.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+int arch_cpu_init(void)
+{
+	int ret;
+
+	ret = x86_cpu_reinit_f();
+
+	return ret;
+}
Signature · 1 line
2.20.1.495.gaa96b0ce6b-goog
#49 lore raw

PATCH 24/40 x86: Add common Intel code for SPL

Quoted 4 lines · Simon Glass

Add an implementation of arch_cpu_init_f() so that the x86 SPL code builds and identifies the CPU.

Quoted 8 lines

---

 arch/x86/cpu/intel_common/Makefile       |  6 ++++++
 arch/x86/cpu/intel_common/cpu_from_spl.c | 27 ++++++++++++++++++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 arch/x86/cpu/intel_common/cpu_from_spl.c
#50 lore raw

PATCH 25/40 x86: Support saving MRC data from SPL

In reply to Simon Glass

When SPL is used to set up the memory controller we want to save the MRC data in SPL to avoid needing to pass it up to U-Boot proper to save. Add a function to handle that.

---

 arch/x86/include/asm/mrccache.h | 11 ++++++++++
 arch/x86/lib/mrccache.c         | 36 ++++++++++++++++++++++++---------
 2 files changed, 38 insertions(+), 9 deletions(-)
arch/x86/include/asm/mrccache.h +11 -0
index 04783cd329..40fda856ff 100644
@@ -103,4 +103,15 @@ int mrccache_get_region(struct udevice **devp, struct mrc_region *entry);
  */
 int mrccache_save(void);
 
+/**
+ * mrccache_spl_save() - Save to the MRC region from SPL
+ *
+ * When SPL is used to set up the memory controller we want to save the MRC
+ * data in SPL to avoid needing to pass it up to U-Boot proper to save. This
+ * function handles that.
+ *
+ * @return 0 if saved to SPI flash successfully, other error if failed
+ */
+int mrccache_spl_save(void);
+
 #endif /* _ASM_MRCCACHE_H */
arch/x86/lib/mrccache.c +27 -9
index 2a8919885b..f37a732a45 100644
@@ -159,18 +159,11 @@ int mrccache_update(struct udevice *sf, struct mrc_region *entry,
 	return 0;
 }
 
-int mrccache_reserve(void)
+static void mrccache_setup(void *data)
 {
-	struct mrc_data_container *cache;
+	struct mrc_data_container *cache = data;
 	u16 checksum;
 
-	if (!gd->arch.mrc_output_len)
-		return 0;
-
-	/* adjust stack pointer to store pure cache data plus the header */
-	gd->start_addr_sp -= (gd->arch.mrc_output_len + MRC_DATA_HEADER_SIZE);
-	cache = (struct mrc_data_container *)gd->start_addr_sp;
-
 	cache->signature = MRC_DATA_SIGNATURE;
 	cache->data_size = gd->arch.mrc_output_len;
 	checksum = compute_ip_checksum(gd->arch.mrc_output, cache->data_size);
@@ -182,6 +175,16 @@ int mrccache_reserve(void)
 
 	/* gd->arch.mrc_output now points to the container */
 	gd->arch.mrc_output = (char *)cache;
+}
+
+int mrccache_reserve(void)
+{
+	if (!gd->arch.mrc_output_len)
+		return 0;
+
+	/* adjust stack pointer to store pure cache data plus the header */
+	gd->start_addr_sp -= (gd->arch.mrc_output_len + MRC_DATA_HEADER_SIZE);
+	mrccache_setup((void *)gd->start_addr_sp);
 
 	gd->start_addr_sp &= ~0xf;
 
@@ -256,3 +259,18 @@ err_entry:
 		debug("%s: Failed: %d\n", __func__, ret);
 	return ret;
 }
+
+int mrccache_spl_save(void)
+{
+	void *data;
+	int size;
+
+	size = gd->arch.mrc_output_len + MRC_DATA_HEADER_SIZE;
+	data = malloc(size);
+	if (!data)
+		return log_msg_ret("Allocate MRC cache block", -ENOMEM);
+	mrccache_setup(data);
+	gd->arch.mrc_output = data;
+
+	return mrccache_save();
+}
Signature · 1 line
2.20.1.495.gaa96b0ce6b-goog
#51 lore raw

PATCH 25/40 x86: Support saving MRC data from SPL

Quoted 5 lines · Simon Glass

When SPL is used to set up the memory controller we want to save the MRC data in SPL to avoid needing to pass it up to U-Boot proper to save. Add a function to handle that.

Quoted 7 lines

---

 arch/x86/include/asm/mrccache.h | 11 ++++++++++
 arch/x86/lib/mrccache.c         | 36 ++++++++++++++++++++++++---------
 2 files changed, 38 insertions(+), 9 deletions(-)
#52 lore raw

PATCH 26/40 x86: Add a simple TPL implementations

In reply to Simon Glass

Add the required CPU code so that TPL builds correctly. Also update the SPL code to deal with being booted from TPL.

---

 arch/x86/include/asm/spl.h        |  17 ++++-
 arch/x86/lib/Makefile             |   9 ++-
 arch/x86/lib/spl.c                |  44 ++++++++++-
 arch/x86/lib/tpl.c                | 118 ++++++++++++++++++++++++++++++
 include/configs/chromebook_link.h |   3 -
 include/configs/qemu-x86.h        |   3 -
 6 files changed, 183 insertions(+), 11 deletions(-)
 create mode 100644 arch/x86/lib/tpl.c
arch/x86/include/asm/spl.h +15 -2
index 8cf59d14e7..27432b2897 100644
@@ -2,6 +2,19 @@
 /*
  * Copyright (C) 2017 Google, Inc
  * Written by Simon Glass <[email protected]>
- *
- * This file is required for SPL to build, but is empty.
  */
+
+#ifndef __asm_spl_h
+#define __asm_spl_h
+
+#define CONFIG_SPL_BOARD_LOAD_IMAGE
+
+enum {
+	BOOT_DEVICE_SPI		= 10,
+	BOOT_DEVICE_BOARD,
+	BOOT_DEVICE_CROS_VBOOT,
+};
+
+void jump_to_spl(ulong entry);
+
+#endif
arch/x86/lib/Makefile +8 -1
index 1e8efcc44f..a72378c0aa 100644
@@ -43,7 +43,14 @@ ifndef CONFIG_SPL_BUILD
 obj-$(CONFIG_CMD_ZBOOT)	+= zimage.o
 endif
 obj-$(CONFIG_HAVE_FSP) += fsp/
-obj-$(CONFIG_SPL_BUILD) += spl.o
+
+ifdef CONFIG_SPL_BUILD
+ifdef CONFIG_TPL_BUILD
+obj-y += tpl.o
+else
+obj-y += spl.o
+endif
+endif
 
 lib-$(CONFIG_USE_PRIVATE_LIBGCC) += div64.o
 
arch/x86/lib/spl.c +42 -2

116 lines not on this page · raw message

arch/x86/lib/tpl.c new file +118 -0

118 lines not on this page · raw message

include/configs/chromebook_link.h +0 -3
index ee546d8f89..f59ed8e28b 100644
@@ -20,9 +20,6 @@
 
 #define CONFIG_SPL_TEXT_BASE		0xfffd0000
 
-#define BOOT_DEVICE_SPI			10
-
 #define CONFIG_SPL_BOARD_LOAD_IMAGE
-#define BOOT_DEVICE_BOARD		11
 
 #endif	/* __CONFIG_H */
include/configs/qemu-x86.h +0 -3
index 4b9ddd6f25..59206fb24b 100644
@@ -37,9 +37,6 @@
 
 #define CONFIG_SPL_TEXT_BASE		0xfffd0000
 
-#define BOOT_DEVICE_SPI			10
-
 #define CONFIG_SPL_BOARD_LOAD_IMAGE
-#define BOOT_DEVICE_BOARD		11
 
 #endif	/* __CONFIG_H */
Signature · 1 line
2.20.1.495.gaa96b0ce6b-goog
#53 lore raw

PATCH 26/40 x86: Add a simple TPL implementations

Quoted 7 lines · Simon Glass

Add the required CPU code so that TPL builds correctly. Also update the SPL code to deal with being booted from TPL.

---

Quoted 9 lines
 arch/x86/include/asm/spl.h        |  17 ++++-
 arch/x86/lib/Makefile             |   9 ++-
 arch/x86/lib/spl.c                |  44 ++++++++++-
 arch/x86/lib/tpl.c                | 118 ++++++++++++++++++++++++++++++
 include/configs/chromebook_link.h |   3 -
 include/configs/qemu-x86.h        |   3 -
 6 files changed, 183 insertions(+), 11 deletions(-)
 create mode 100644 arch/x86/lib/tpl.c
#54 lore raw

PATCH 27/40 x86: mrccache: Add more debugging

In reply to Simon Glass

When the MRC cache fails to save it is useful to have some debugging info to indicate what when wrong. Add some more debug() calls.

---

 arch/x86/lib/mrccache.c | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)
arch/x86/lib/mrccache.c +12 -4
index f37a732a45..be107627b8 100644
@@ -113,8 +113,10 @@ int mrccache_update(struct udevice *sf, struct mrc_region *entry,
 	ulong base_addr;
 	int ret;
 
-	if (!is_mrc_cache(cur))
+	if (!is_mrc_cache(cur)) {
+		debug("%s: Cache data not valid\n", __func__);
 		return -EINVAL;
+	}
 
 	/* Find the last used block */
 	base_addr = entry->base + entry->offset;
@@ -205,17 +207,23 @@ int mrccache_get_region(struct udevice **devp, struct mrc_region *entry)
 		return -ENOENT;
 	}
 
-	if (fdtdec_get_int_array(blob, node, "memory-map", reg, 2))
+	if (fdtdec_get_int_array(blob, node, "memory-map", reg, 2)) {
+		debug("%s: Cannot find memory map\n", __func__);
 		return -EINVAL;
+	}
 	entry->base = reg[0];
 
 	/* Find the place where we put the MRC cache */
 	mrc_node = fdt_subnode_offset(blob, node, "rw-mrc-cache");
-	if (mrc_node < 0)
+	if (mrc_node < 0) {
+		debug("%s: Cannot find node\n", __func__);
 		return -EPERM;
+	}
 
-	if (fdtdec_get_int_array(blob, mrc_node, "reg", reg, 2))
+	if (fdtdec_get_int_array(blob, mrc_node, "reg", reg, 2)) {
+		debug("%s: Cannot find address\n", __func__);
 		return -EINVAL;
+	}
 	entry->offset = reg[0];
 	entry->length = reg[1];
 
Signature · 1 line
2.20.1.495.gaa96b0ce6b-goog
#55 lore raw

PATCH 27/40 x86: mrccache: Add more debugging

Quoted 3 lines · Simon Glass

When the MRC cache fails to save it is useful to have some debugging info to indicate what when wrong. Add some more debug() calls.

what went wrong.

Quoted 7 lines

---

 arch/x86/lib/mrccache.c | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)
#56 lore raw

PATCH 28/40 x86: Add a sysreset driver for the Intel PCH

In reply to Simon Glass

Intel SoCs support a fairly stardard reset mechanism which can support powering off the device. Add support for this and enable it by default on broadwell, which already has the necessary pm.h header file.

This driver augments the standard x86 sysreset driver.

---

 arch/x86/cpu/broadwell/Kconfig        |   1 +
 drivers/sysreset/Kconfig              |   9 ++
 drivers/sysreset/Makefile             |   1 +
 drivers/sysreset/sysreset_intel_pch.c | 125 ++++++++++++++++++++++++++
 4 files changed, 136 insertions(+)
 create mode 100644 drivers/sysreset/sysreset_intel_pch.c
arch/x86/cpu/broadwell/Kconfig +1 -0
index 5b015c89d9..2955ffc55b 100644
@@ -18,6 +18,7 @@ config INTEL_BROADWELL
 	imply USB
 	imply USB_EHCI_HCD
 	imply VIDEO_BROADWELL_IGD
+	imply SYSRESET_INTEL_PCH
 
 if INTEL_BROADWELL
 
drivers/sysreset/Kconfig +9 -0
index 8ce3e2e207..f88412adcc 100644
@@ -23,6 +23,15 @@ config SYSRESET_GPIO
 	  example on Microblaze where reset logic can be controlled via GPIO
 	  pin which triggers cpu reset.
 
+config SYSRESET_INTEL_PCH
+	bool "Enable support for Intel PCH reset driver"
+	depends on X86
+	help
+	  Enable this option to get reset support on Intel SoCs which have
+	  a common Platform-Controller Hub (PCH). This driver supports powering
+	  off the device. It augments the standard x86 sysreset driver which
+	  provides normal reset options.
+
 config SYSRESET_MICROBLAZE
 	bool "Enable support for Microblaze soft reset"
 	depends on MICROBLAZE
drivers/sysreset/Makefile +1 -0
index b3728ac17f..2add6cb37a 100644
@@ -8,6 +8,7 @@ obj-$(CONFIG_ARCH_ROCKCHIP) += sysreset_rockchip.o
 obj-$(CONFIG_ARCH_STI) += sysreset_sti.o
 obj-$(CONFIG_SANDBOX) += sysreset_sandbox.o
 obj-$(CONFIG_SYSRESET_GPIO) += sysreset_gpio.o
+obj-$(CONFIG_SYSRESET_INTEL_PCH) += sysreset_intel_pch.o
 obj-$(CONFIG_SYSRESET_MCP83XX) += sysreset_mpc83xx.o
 obj-$(CONFIG_SYSRESET_MICROBLAZE) += sysreset_microblaze.o
 obj-$(CONFIG_SYSRESET_PSCI) += sysreset_psci.o
drivers/sysreset/sysreset_intel_pch.c new file +125 -0

125 lines not on this page · raw message

Signature · 1 line
2.20.1.495.gaa96b0ce6b-goog
#57 lore raw

PATCH 28/40 x86: Add a sysreset driver for the Intel PCH

Hi Simon,

Quoted 7 lines · Simon Glass

Intel SoCs support a fairly stardard reset mechanism which can support powering off the device. Add support for this and enable it by default on broadwell, which already has the necessary pm.h header file.

This driver augments the standard x86 sysreset driver.

I think we need update the existing sysreset_x86 driver to support SYSRESET_POWER_OFF, instead of creating a new driver to do such.

We can add a new PCH ioctl code to get the pmbase, and do the ACPI power off in the sysreset_x86 driver.

Quoted 10 lines

---

 arch/x86/cpu/broadwell/Kconfig        |   1 +
 drivers/sysreset/Kconfig              |   9 ++
 drivers/sysreset/Makefile             |   1 +
 drivers/sysreset/sysreset_intel_pch.c | 125 ++++++++++++++++++++++++++
 4 files changed, 136 insertions(+)
 create mode 100644 drivers/sysreset/sysreset_intel_pch.c

Regards,
Bin

#58 lore raw

PATCH 28/40 x86: Add a sysreset driver for the Intel PCH

Hi Bin,

Quoted 9 lines · Bin Meng

Hi Simon,

Quoted 5 lines · Simon Glass

Intel SoCs support a fairly stardard reset mechanism which can support powering off the device. Add support for this and enable it by default on broadwell, which already has the necessary pm.h header file.

Quoted 8 lines
Quoted 2 lines

This driver augments the standard x86 sysreset driver.

I think we need update the existing sysreset_x86 driver to support SYSRESET_POWER_OFF, instead of creating a new driver to do such.

We can add a new PCH ioctl code to get the pmbase, and do the ACPI power off in the sysreset_x86 driver.

So are you saying that the registers are the same for all x86 chips? From what I can tell, the offsets vary.

Regards,
Simon

Quoted 14 lines
Quoted 11 lines

---

 arch/x86/cpu/broadwell/Kconfig        |   1 +
 drivers/sysreset/Kconfig              |   9 ++
 drivers/sysreset/Makefile             |   1 +
 drivers/sysreset/sysreset_intel_pch.c | 125 ++++++++++++++++++++++++++
 4 files changed, 136 insertions(+)
 create mode 100644 drivers/sysreset/sysreset_intel_pch.c

Regards,
Bin

#59 lore raw

PATCH 28/40 x86: Add a sysreset driver for the Intel PCH

Hi Simon,

Quoted 16 lines · Simon Glass

Hi Bin,

Quoted 12 lines · Bin Meng

Hi Simon,

Quoted 7 lines · Simon Glass

Intel SoCs support a fairly stardard reset mechanism which can support powering off the device. Add support for this and enable it by default on broadwell, which already has the necessary pm.h header file.

This driver augments the standard x86 sysreset driver.

Quoted 8 lines
Quoted 5 lines

I think we need update the existing sysreset_x86 driver to support SYSRESET_POWER_OFF, instead of creating a new driver to do such.

We can add a new PCH ioctl code to get the pmbase, and do the ACPI power off in the sysreset_x86 driver.

So are you saying that the registers are the same for all x86 chips? From what I can tell, the offsets vary.

Yes, the offsets might be different, so instead of getting only the pmbase, we need do something like getting ACPI PM register block information from the PCH driver. That's how acpi_create_fadt() passes ACPI register block information to the OS.

Regards,
Bin

#60 lore raw

PATCH 28/40 x86: Add a sysreset driver for the Intel PCH

Hi Bin,

Quoted 26 lines · Bin Meng

Hi Simon,

Quoted 22 lines · Simon Glass

Hi Bin,

Quoted 17 lines · Bin Meng

Hi Simon,

Quoted 7 lines · Simon Glass

Intel SoCs support a fairly stardard reset mechanism which can support powering off the device. Add support for this and enable it by default on broadwell, which already has the necessary pm.h header file.

This driver augments the standard x86 sysreset driver.

I think we need update the existing sysreset_x86 driver to support SYSRESET_POWER_OFF, instead of creating a new driver to do such.

We can add a new PCH ioctl code to get the pmbase, and do the ACPI power off in the sysreset_x86 driver.

Quoted 7 lines
Quoted 2 lines

So are you saying that the registers are the same for all x86 chips? From what I can tell, the offsets vary.

Yes, the offsets might be different, so instead of getting only the pmbase, we need do something like getting ACPI PM register block information from the PCH driver. That's how acpi_create_fadt() passes ACPI register block information to the OS.

That doesn't make a lot of sense to me. If the register layout is different, why not just use different drivers?

I suppose we could put the common code (with parameters) in a separate file and call it from the driver. The parameters would presumably be:

PMBASE
GPE0_EN(0)
PM1_STS
PM1_CNT

Regards,
Simon

#61 lore raw

PATCH 28/40 x86: Add a sysreset driver for the Intel PCH

Hi Simon,

Quoted 33 lines · Simon Glass

Hi Bin,

Quoted 29 lines · Bin Meng

Hi Simon,

Quoted 24 lines · Simon Glass

Hi Bin,

Quoted 9 lines · Bin Meng

Hi Simon,

Quoted 5 lines · Simon Glass

Intel SoCs support a fairly stardard reset mechanism which can support powering off the device. Add support for this and enable it by default on broadwell, which already has the necessary pm.h header file.

Quoted 8 lines
Quoted 2 lines

This driver augments the standard x86 sysreset driver.

I think we need update the existing sysreset_x86 driver to support SYSRESET_POWER_OFF, instead of creating a new driver to do such.

We can add a new PCH ioctl code to get the pmbase, and do the ACPI power off in the sysreset_x86 driver.

So are you saying that the registers are the same for all x86 chips? From what I can tell, the offsets vary.

Quoted 8 lines
Quoted 4 lines

Yes, the offsets might be different, so instead of getting only the pmbase, we need do something like getting ACPI PM register block information from the PCH driver. That's how acpi_create_fadt() passes ACPI register block information to the OS.

That doesn't make a lot of sense to me. If the register layout is different, why not just use different drivers?

Yes, the register layout might be different but the programming model is the same and well defined in the ACPI spec.

Quoted 7 lines

I suppose we could put the common code (with parameters) in a separate file and call it from the driver. The parameters would presumably be:

PMBASE
GPE0_EN(0)
PM1_STS
PM1_CNT

That's why I suggest to ask PCH driver to provide these offsets in a struct via an ioctl call to the sysreset driver.

Regards,
Bin

#62 lore raw

PATCH 29/40 x86: Support TPL in Intel common code

In reply to Simon Glass

Update the Makefie rules to ensure that the correct files are built when TPL is being used.

---

 arch/x86/cpu/intel_common/Makefile | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
arch/x86/cpu/intel_common/Makefile +6 -3
index 57cca0b930..07f27c29ec 100644
@@ -4,15 +4,18 @@
 
 ifdef CONFIG_HAVE_MRC
 obj-$(CONFIG_$(SPL_TPL_)X86_16BIT_INIT) += car.o
-obj-$(CONFIG_$(SPL_)X86_32BIT_INIT) += me_status.o
-obj-$(CONFIG_$(SPL_)X86_32BIT_INIT) += report_platform.o
-obj-$(CONFIG_$(SPL_)X86_32BIT_INIT) += mrc.o
+obj-$(CONFIG_$(SPL_TPL_)X86_32BIT_INIT) += me_status.o
+obj-$(CONFIG_$(SPL_TPL_)X86_32BIT_INIT) += report_platform.o
+obj-$(CONFIG_$(SPL_TPL_)X86_32BIT_INIT) += mrc.o
 endif
 obj-y += cpu.o
 obj-y += lpc.o
 ifndef CONFIG_TARGET_EFI_APP
+obj-$(CONFIG_$(SPL_TPL_)X86_32BIT_INIT) += microcode.o
+ifndef CONFIG_$(SPL_)X86_64
 obj-y += microcode.o
 endif
+endif
 obj-y += pch.o
 
 ifdef CONFIG_SPL
Signature · 1 line
2.20.1.495.gaa96b0ce6b-goog
#63 lore raw

PATCH 29/40 x86: Support TPL in Intel common code

Quoted 10 lines · Simon Glass

Update the Makefie rules to ensure that the correct files are built when TPL is being used.

---

 arch/x86/cpu/intel_common/Makefile | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
#64 lore raw

PATCH 30/40 x86: Don't set up MTRRs in SPL

In reply to Simon Glass

The MTRRs are normally set up in U-Boot proper, so avoid setting them up in SPL as well.

---

 arch/x86/lib/init_helpers.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
arch/x86/lib/init_helpers.c +4 -1
index 0481f453ca..ac85278cdf 100644
@@ -18,7 +18,10 @@ __weak ulong board_get_usable_ram_top(ulong total_size)
 
 int init_cache_f_r(void)
 {
-#if CONFIG_IS_ENABLED(X86_32BIT_INIT) && !defined(CONFIG_HAVE_FSP)
+#if (CONFIG_IS_ENABLED(X86_32BIT_INIT) || \
+     (!defined(CONFIG_SPL_BUILD) && \
+      !CONFIG_IS_ENABLED(CONFIG_X86_RUN_64BIT))) && \
+    !defined(CONFIG_HAVE_FSP)
 	int ret;
 
 	ret = mtrr_commit(false);
Signature · 1 line
2.20.1.495.gaa96b0ce6b-goog
#66 lore raw

PATCH 31/40 x86: Don't generate a bootstage report in SPL

In reply to Simon Glass

This report is normally generated by U-Boot proper. Correct the condition here so that it respects the Kconfig options for bootstage.

---

 arch/x86/lib/bootm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/lib/bootm.c +1 -1
index 832b1f901c..5443a862ab 100644
@@ -35,7 +35,7 @@ void bootm_announce_and_cleanup(void)
 	timestamp_add_now(TS_U_BOOT_START_KERNEL);
 #endif
 	bootstage_mark_name(BOOTSTAGE_ID_BOOTM_HANDOFF, "start_kernel");
-#ifdef CONFIG_BOOTSTAGE_REPORT
+#if CONFIG_IS_ENABLED(BOOTSTAGE_REPORT)
 	bootstage_report();
 #endif
 
Signature · 1 line
2.20.1.495.gaa96b0ce6b-goog
#67 lore raw

PATCH 31/40 x86: Don't generate a bootstage report in SPL

Quoted 10 lines · Simon Glass

This report is normally generated by U-Boot proper. Correct the condition here so that it respects the Kconfig options for bootstage.

---

 arch/x86/lib/bootm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
#68 lore raw

PATCH 32/40 x86: Support PCI VGA ROM when TPL is used

In reply to Simon Glass

When TPL is in use, U-Boot proper should support initing the VGA ROM even though the 32-bit init portion is in SPL. Update the condition to handle this.

---

 drivers/pci/pci_rom.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pci/pci_rom.c +1 -1
index 7d9b75c2c4..2cede1211b 100644
@@ -306,7 +306,7 @@ int dm_pci_run_vga_bios(struct udevice *dev, int (*int15_handler)(void),
 			goto err;
 #endif
 	} else {
-#if defined(CONFIG_X86) && CONFIG_IS_ENABLED(X86_32BIT_INIT)
+#if defined(CONFIG_X86) && (CONFIG_IS_ENABLED(X86_32BIT_INIT) || CONFIG_TPL)
 		bios_set_interrupt_handler(0x15, int15_handler);
 
 		bios_run_on_x86(dev, (unsigned long)ram, vesa_mode,
Signature · 1 line
2.20.1.495.gaa96b0ce6b-goog
#69 lore raw

PATCH 32/40 x86: Support PCI VGA ROM when TPL is used

Quoted 11 lines · Simon Glass

When TPL is in use, U-Boot proper should support initing the VGA ROM even though the 32-bit init portion is in SPL. Update the condition to handle this.

---

 drivers/pci/pci_rom.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
#70 lore raw

PATCH 33/40 x86: sysreset: Implement the get_last() method

In reply to Simon Glass

Add a default implementation of this method which always indicates that the last reset was a power-on reset. This is the most likely type of reset and without a PCH-specific driver we cannot determine any other type.

---

 drivers/sysreset/sysreset_x86.c | 6 ++++++
 1 file changed, 6 insertions(+)
drivers/sysreset/sysreset_x86.c +6 -0
index 20b958cfd4..2a8ec6b0d2 100644
@@ -31,6 +31,11 @@ static int x86_sysreset_request(struct udevice *dev, enum sysreset_t type)
 	return -EINPROGRESS;
 }
 
+static int x86_sysreset_get_last(struct udevice *dev)
+{
+	return SYSRESET_POWER;
+}
+
 static const struct udevice_id x86_sysreset_ids[] = {
 	{ .compatible = "x86,reset" },
 	{ }
@@ -38,6 +43,7 @@ static const struct udevice_id x86_sysreset_ids[] = {
 
 static struct sysreset_ops x86_sysreset_ops = {
 	.request = x86_sysreset_request,
+	.get_last = x86_sysreset_get_last,
 };
 
 U_BOOT_DRIVER(x86_sysreset) = {
Signature · 1 line
2.20.1.495.gaa96b0ce6b-goog
#71 lore raw

PATCH 33/40 x86: sysreset: Implement the get_last() method

Hi Simon,

Quoted 5 lines · Simon Glass

Add a default implementation of this method which always indicates that the last reset was a power-on reset. This is the most likely type of reset and without a PCH-specific driver we cannot determine any other type.

See my comments for patch [28/40]. We can return the correct reset type based on whether PCH provided ioctl for pmbase address.

Quoted 6 lines

---

 drivers/sysreset/sysreset_x86.c | 6 ++++++
 1 file changed, 6 insertions(+)

Regards,
Bin

#72 lore raw

PATCH 33/40 x86: sysreset: Implement the get_last() method

Hi Bin,

Quoted 5 lines · Bin Meng

Hi Simon,

Quoted 1 line · Simon Glass
Quoted 7 lines
Quoted 4 lines

Add a default implementation of this method which always indicates that the last reset was a power-on reset. This is the most likely type of reset and without a PCH-specific driver we cannot determine any other type.

See my comments for patch [28/40]. We can return the correct reset type based on whether PCH provided ioctl for pmbase address.

I've haven't implemented this for v2. I think I need a few pointers on where to get this info. I suppose I could add it in a follow-on patch. Also it would be good to add a command to show this info.

Regards,
Simon

#73 lore raw

PATCH 34/40 x86: Add documention on the samus flashmap

In reply to Simon Glass

There are quite a few variables which control where things appear in the final ROM image. Add a flashmap in the documentation to make this easier to figure out.

---

 doc/README.x86 | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
doc/README.x86 +14 -0
index fa49cb8b8a..d5224b7536 100644
@@ -185,6 +185,20 @@ If you are using em100, then this command will flash write -Boot:
 
    em100 -s -d filename.rom -c W25Q64CV -r
 
+Flash map for samus / broadwell:
+
+   fffff800	SYS_X86_START16
+   ffff0000	RESET_SEG_START
+   fffd8000	TPL_TEXT_BASE
+   fffa0000	X86_MRC_ADDR
+   fff90000	VGA_BIOS_ADDR
+   ffed0000	SYS_TEXT_BASE
+   ffea0000	X86_REFCODE_ADDR
+   ffe70000	SPL_TEXT_BASE
+   ffa00000	<spare>
+   ff801000	intel-me (address set by descriptor.bin)
+   ff800000	intel-descriptor
+
 ---
 
 Intel Crown Bay specific instructions for bare mode:
Signature · 1 line
2.20.1.495.gaa96b0ce6b-goog
#74 lore raw

PATCH 34/40 x86: Add documention on the samus flashmap

Quoted 11 lines · Simon Glass

There are quite a few variables which control where things appear in the final ROM image. Add a flashmap in the documentation to make this easier to figure out.

---

 doc/README.x86 | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
#75 lore raw

PATCH 35/40 x86: samus: Update device tree for SPL

In reply to Simon Glass

Add tags to allow required nodes to be present in SPL / TPL. Also enable the sysreset driver.

---

 arch/x86/dts/chromebook_samus.dts | 38 +++++++++++++++++++++++++++----
 1 file changed, 34 insertions(+), 4 deletions(-)
arch/x86/dts/chromebook_samus.dts +34 -4
index b58936b4ac..348d012e23 100644
@@ -17,6 +17,7 @@
 		spi0 = &spi;
 		usb0 = &usb_0;
 		usb1 = &usb_1;
+		cros-ec0 = &cros_ec;
 	};
 
 	config {
@@ -73,6 +74,7 @@
 
 		/* Put this first: it is the default */
 		gpio_unused: gpio-unused {
+			u-boot,dm-pre-reloc;
 			mode-gpio;
 			direction = <PIN_INPUT>;
 			owner = <OWNER_GPIO>;
@@ -80,6 +82,7 @@
 		};
 
 		gpio_acpi_sci: acpi-sci {
+			u-boot,dm-pre-reloc;
 			mode-gpio;
 			direction = <PIN_INPUT>;
 			invert;
@@ -87,6 +90,7 @@
 		};
 
 		gpio_acpi_smi: acpi-smi {
+			u-boot,dm-pre-reloc;
 			mode-gpio;
 			direction = <PIN_INPUT>;
 			invert;
@@ -94,12 +98,14 @@
 		};
 
 		gpio_input: gpio-input {
+			u-boot,dm-pre-reloc;
 			mode-gpio;
 			direction = <PIN_INPUT>;
 			owner = <OWNER_GPIO>;
 		};
 
 		gpio_input_invert: gpio-input-invert {
+			u-boot,dm-pre-reloc;
 			mode-gpio;
 			direction = <PIN_INPUT>;
 			owner = <OWNER_GPIO>;
@@ -107,9 +113,11 @@
 		};
 
 		gpio_native: gpio-native {
+			u-boot,dm-pre-reloc;
 		};
 
 		gpio_out_high: gpio-out-high {
+			u-boot,dm-pre-reloc;
 			mode-gpio;
 			direction = <PIN_OUTPUT>;
 			output-value = <1>;
@@ -118,6 +126,7 @@
 		};
 
 		gpio_out_low: gpio-out-low {
+			u-boot,dm-pre-reloc;
 			mode-gpio;
 			direction = <PIN_OUTPUT>;
 			output-value = <0>;
@@ -126,6 +135,7 @@
 		};
 
 		gpio_pirq: gpio-pirq {
+			u-boot,dm-pre-reloc;
 			mode-gpio;
 			direction = <PIN_INPUT>;
 			owner = <OWNER_GPIO>;
@@ -133,6 +143,7 @@
 		};
 
 		soc_gpio at 0 {
+			u-boot,dm-pre-reloc;
 			config =
 				<0 &gpio_unused 0>,	/* unused */
 				<1 &gpio_unused 0>,	/* unused */
@@ -250,8 +261,10 @@
 			spd {
 				#address-cells = <1>;
 				#size-cells = <0>;
+				u-boot,dm-pre-reloc;
 				samsung_4 {
 					reg = <6>;
+					u-boot,dm-pre-reloc;
 					data = [91 20 f1 03 04 11 05 0b
 						03 11 01 08 0a 00 50 01
 						78 78 90 50 90 11 50 e0
@@ -291,6 +304,7 @@
 					 * columns 10, density 4096 mb, x32
 					 */
 					reg = <8>;
+					u-boot,dm-pre-reloc;
 					data = [91 20 f1 03 04 11 05 0b
 						03 11 01 08 0a 00 50 01
 						78 78 90 50 90 11 50 e0
@@ -326,6 +340,7 @@
 					};
 				samsung_8 {
 					reg = <10>;
+					u-boot,dm-pre-reloc;
 					data = [91 20 f1 03 04 12 05 0a
 						03 11 01 08 0a 00 50 01
 						78 78 90 50 90 11 50 e0
@@ -365,6 +380,7 @@
 					 * columns 11, density 4096 mb, x16
 					 */
 					reg = <12>;
+					u-boot,dm-pre-reloc;
 					data = [91 20 f1 03 04 12 05 0a
 						03 11 01 08 0a 00 50 01
 						78 78 90 50 90 11 50 e0
@@ -404,6 +420,7 @@
 					 * columns 11, density 8192 mb, x16
 					 */
 					reg = <13>;
+					u-boot,dm-pre-reloc;
 					data = [91 20 f1 03 05 1a 05 0a
 						03 11 01 08 0a 00 50 01
 						78 78 90 50 90 11 50 e0
@@ -443,6 +460,7 @@
 					 * columns 11, density 8192 mb, x16
 					 */
 					reg = <15>;
+					u-boot,dm-pre-reloc;
 					data = [91 20 f1 03 05 1a 05 0a
 						03 11 01 08 0a 00 50 01
 						78 78 90 50 90 11 50 e0
@@ -511,7 +529,7 @@
 			compatible = "ehci-pci";
 		};
 
-		pch at 1f,0 {
+		pch: pch at 1f,0 {
 			reg = <0x0000f800 0 0 0 0>;
 			compatible = "intel,broadwell-pch";
 			u-boot,dm-pre-reloc;
@@ -530,17 +548,20 @@
 			power-enable-gpio = <&gpio_a 23 0>;
 
 			spi: spi {
+				u-boot,dm-pre-reloc;
 				#address-cells = <1>;
 				#size-cells = <0>;
 				compatible = "intel,ich9-spi";
 				spi-flash at 0 {
+					u-boot,dm-pre-reloc;
 					#size-cells = <1>;
 					#address-cells = <1>;
 					reg = <0>;
 					compatible = "winbond,w25q64",
 							"spi-flash";
-					memory-map = <0xff800000 0x00800000>;
+					memory-map = <0 0xff800000 0 0x00800000>;
 					rw-mrc-cache {
+						u-boot,dm-pre-reloc;
 						label = "rw-mrc-cache";
 						reg = <0x003e0000 0x00010000>;
 					};
@@ -580,7 +601,8 @@
 				#size-cells = <0>;
 				u-boot,dm-pre-reloc;
 				intel,gen-dec = <0x800 0xfc 0x900 0xfc>;
-				cros-ec at 200 {
+				cros_ec: cros-ec {
+					u-boot,dm-pre-reloc;
 					compatible = "google,cros-ec-lpc";
 					reg = <0x204 1 0x200 1 0x880 0x80>;
 
@@ -601,7 +623,7 @@
 		sata at 1f,2 {
 			compatible = "intel,wildcatpoint-ahci";
 			reg = <0x0000fa00 0 0 0 0>;
-			u-boot,dm-pre-reloc;
+			u-boot,dm-pre-proper;
 			intel,sata-mode = "ahci";
 			intel,sata-port-map = <1>;
 			intel,sata-port0-gen3-tx = <0x72>;
@@ -615,13 +637,21 @@
 		};
 	};
 
+	pch-reset {
+		compatible = "intel,pch-reset";
+		intel,pch = <&pch>;
+	};
+
 	tpm {
+		u-boot,dm-pre-reloc;
 		reg = <0xfed40000 0x5000>;
 		compatible = "infineon,slb9635lpc";
 	};
 
 	microcode {
+		u-boot,dm-pre-reloc;
 		update at 0 {
+			u-boot,dm-pre-reloc;
 #include "microcode/mc0306d4_00000018.dtsi"
 		};
 	};
Signature · 1 line
2.20.1.495.gaa96b0ce6b-goog
#76 lore raw

PATCH 35/40 x86: samus: Update device tree for SPL

Quoted 10 lines · Simon Glass

Add tags to allow required nodes to be present in SPL / TPL. Also enable the sysreset driver.

---

 arch/x86/dts/chromebook_samus.dts | 38 +++++++++++++++++++++++++++----
 1 file changed, 34 insertions(+), 4 deletions(-)
#77 lore raw

PATCH 36/40 x86: samus: Update device tree for verified boot

In reply to Simon Glass

Add nvdata drivers for the TPM and RTC as used on samus. These are needed for Chromium OS verified boot on samus.

---

 arch/x86/dts/chromebook_samus.dts | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)
arch/x86/dts/chromebook_samus.dts +21 -1
index 348d012e23..7c5b1e4010 100644
@@ -9,6 +9,12 @@
 /include/ "rtc.dtsi"
 /include/ "tsc_timer.dtsi"
 
+#ifdef CONFIG_CHROMEOS
+#include "chromeos-x86.dtsi"
+#include "flashmap-x86-ro.dtsi"
+#include "flashmap-8mb-rw.dtsi"
+#endif
+
 / {
 	model = "Google Samus";
 	compatible = "google,samus", "intel,broadwell";
@@ -552,7 +558,7 @@
 				#address-cells = <1>;
 				#size-cells = <0>;
 				compatible = "intel,ich9-spi";
-				spi-flash at 0 {
+				fwstore_spi: spi-flash at 0 {
 					u-boot,dm-pre-reloc;
 					#size-cells = <1>;
 					#address-cells = <1>;
@@ -646,6 +652,10 @@
 		u-boot,dm-pre-reloc;
 		reg = <0xfed40000 0x5000>;
 		compatible = "infineon,slb9635lpc";
+		secdata {
+			u-boot,dm-pre-reloc;
+			compatible = "google,tpm-secdata";
+		};
 	};
 
 	microcode {
@@ -657,3 +667,13 @@
 	};
 
 };
+
+&rtc {
+	#address-cells = <1>;
+	#size-cells = <0>;
+	nvdata {
+		u-boot,dm-pre-reloc;
+		compatible = "google,cmos-nvdata";
+		reg = <0x26>;
+	};
+};
Signature · 1 line
2.20.1.495.gaa96b0ce6b-goog
#78 lore raw

PATCH 36/40 x86: samus: Update device tree for verified boot

Quoted 10 lines · Simon Glass

Add nvdata drivers for the TPM and RTC as used on samus. These are needed for Chromium OS verified boot on samus.

---

 arch/x86/dts/chromebook_samus.dts | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)
#79 lore raw

PATCH 37/40 x86: Update device tree for TPL

In reply to Simon Glass

Add TPL binaries to the device x86 binman desciption. When enabled, TPL will start first, doing the 16-bit init, then jump to SPL and finally U-Boot proper.

---

 arch/x86/dts/u-boot.dtsi | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)
arch/x86/dts/u-boot.dtsi +24 -2
index 1050236330..70e9c8f7ac 100644
@@ -22,7 +22,21 @@
 			filename = CONFIG_INTEL_ME_FILE;
 		};
 #endif
-#ifdef CONFIG_SPL
+#ifdef CONFIG_TPL
+		u-boot-spl {
+			offset = <CONFIG_SPL_TEXT_BASE>;
+		};
+		u-boot-spl-dtb {
+		};
+		u-boot-tpl-with-ucode-ptr {
+			offset = <CONFIG_TPL_TEXT_BASE>;
+		};
+		u-boot-tpl-dtb {
+		};
+		u-boot {
+			offset = <CONFIG_SYS_TEXT_BASE>;
+		};
+#elif defined(CONFIG_SPL)
 		u-boot-spl-with-ucode-ptr {
 			offset = <CONFIG_SPL_TEXT_BASE>;
 		};
@@ -31,7 +45,11 @@
 			type = "u-boot-dtb-with-ucode";
 		};
 		u-boot {
+#if CONFIG_SYS_TEXT_BASE == 0x1110000
 			offset = <0xfff00000>;
+#else
+			offset = <CONFIG_SYS_TEXT_BASE>;
+#endif
 		};
 #else
 		u-boot-with-ucode-ptr {
@@ -77,7 +95,11 @@
 			offset = <CONFIG_X86_REFCODE_ADDR>;
 		};
 #endif
-#ifdef CONFIG_SPL
+#ifdef CONFIG_TPL
+		x86-start16-tpl {
+			offset = <CONFIG_SYS_X86_START16>;
+		};
+#elif defined(CONFIG_SPL)
 		x86-start16-spl {
 			offset = <CONFIG_SYS_X86_START16>;
 		};
Signature · 1 line
2.20.1.495.gaa96b0ce6b-goog
#80 lore raw

PATCH 37/40 x86: Update device tree for TPL

Hi Simon,

Quoted 4 lines · Simon Glass

Add TPL binaries to the device x86 binman desciption. When enabled, TPL will start first, doing the 16-bit init, then jump to SPL and finally U-Boot proper.

I am confused by "TPL will start first". My understanding is that "SPL" starts before "TPL".

Quoted 7 lines

---

 arch/x86/dts/u-boot.dtsi | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

Regards,
Bin

#81 lore raw

PATCH 37/40 x86: Update device tree for TPL

Hi Bin,

Quoted 11 lines · Bin Meng

Hi Simon,

Quoted 4 lines · Simon Glass

Add TPL binaries to the device x86 binman desciption. When enabled, TPL will start first, doing the 16-bit init, then jump to SPL and finally U-Boot proper.

I am confused by "TPL will start first". My understanding is that "SPL" starts before "TPL".

No, it is TPL -> SPL - > U-Boot.

Regards,
Simon

#82 lore raw

PATCH 38/40 x86: Update device tree for Chromium OS verified boot

In reply to Simon Glass

The standard image generated by U-Boot on x86 is u-boot.rom. Add a separate image called image.bin for verified boot. This supports verification in TPL of which SPL/U-Boot to start, then jumping to the correct one, with SPL setting up the SDRAM and U-Boot proper providing the user interface if needed.

---

 arch/x86/dts/u-boot.dtsi | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)
arch/x86/dts/u-boot.dtsi +15 -2
index 70e9c8f7ac..5943619b86 100644
@@ -6,9 +6,23 @@
 
 #include <config.h>
 
-#ifdef CONFIG_ROM_SIZE
+#ifdef CONFIG_CHROMEOS
 / {
 	binman {
+		multiple-images;
+		rom: rom {
+		};
+	};
+};
+#else
+/ {
+	rom: binman {
+	};
+};
+#endif
+
+#ifdef CONFIG_ROM_SIZE
+&rom {
 		filename = "u-boot.rom";
 		end-at-4gb;
 		sort-by-offset;
@@ -108,6 +122,5 @@
 			offset = <CONFIG_SYS_X86_START16>;
 		};
 #endif
-	};
 };
 #endif
Signature · 1 line
2.20.1.495.gaa96b0ce6b-goog
#83 lore raw

PATCH 38/40 x86: Update device tree for Chromium OS verified boot

Quoted 7 lines · Simon Glass

The standard image generated by U-Boot on x86 is u-boot.rom. Add a separate image called image.bin for verified boot. This supports verification in TPL of which SPL/U-Boot to start, then jumping to the correct one, with SPL setting up the SDRAM and U-Boot proper providing the user interface if needed.

Quoted 6 lines

---

 arch/x86/dts/u-boot.dtsi | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)
#84 lore raw

PATCH 39/40 x86: Fix device-tree indentation

In reply to Simon Glass

With the use of a phandle we can outdent the device tree nodes a little. Fix this.

---

 arch/x86/dts/u-boot.dtsi | 147 +++++++++++++++++++--------------------
 1 file changed, 73 insertions(+), 74 deletions(-)
arch/x86/dts/u-boot.dtsi +73 -74
index 5943619b86..8bb1318a2c 100644
@@ -23,104 +23,103 @@
 
 #ifdef CONFIG_ROM_SIZE
 &rom {
-		filename = "u-boot.rom";
-		end-at-4gb;
-		sort-by-offset;
-		pad-byte = <0xff>;
-		size = <CONFIG_ROM_SIZE>;
+	filename = "u-boot.rom";
+	end-at-4gb;
+	sort-by-offset;
+	pad-byte = <0xff>;
+	size = <CONFIG_ROM_SIZE>;
 #ifdef CONFIG_HAVE_INTEL_ME
-		intel-descriptor {
-			filename = CONFIG_FLASH_DESCRIPTOR_FILE;
-		};
-		intel-me {
-			filename = CONFIG_INTEL_ME_FILE;
-		};
+	intel-descriptor {
+		filename = CONFIG_FLASH_DESCRIPTOR_FILE;
+	};
+	intel-me {
+		filename = CONFIG_INTEL_ME_FILE;
+	};
 #endif
 #ifdef CONFIG_TPL
-		u-boot-spl {
-			offset = <CONFIG_SPL_TEXT_BASE>;
-		};
-		u-boot-spl-dtb {
-		};
-		u-boot-tpl-with-ucode-ptr {
-			offset = <CONFIG_TPL_TEXT_BASE>;
-		};
-		u-boot-tpl-dtb {
-		};
-		u-boot {
-			offset = <CONFIG_SYS_TEXT_BASE>;
-		};
+	u-boot-spl {
+		offset = <CONFIG_SPL_TEXT_BASE>;
+	};
+	u-boot-spl-dtb {
+	};
+	u-boot-tpl-with-ucode-ptr {
+		offset = <CONFIG_TPL_TEXT_BASE>;
+	};
+	u-boot-tpl-dtb {
+	};
+	u-boot {
+		offset = <CONFIG_SYS_TEXT_BASE>;
+	};
 #elif defined(CONFIG_SPL)
-		u-boot-spl-with-ucode-ptr {
-			offset = <CONFIG_SPL_TEXT_BASE>;
-		};
-
-		u-boot-dtb-with-ucode2 {
-			type = "u-boot-dtb-with-ucode";
-		};
-		u-boot {
+	u-boot-spl-with-ucode-ptr {
+		offset = <CONFIG_SPL_TEXT_BASE>;
+	};
+	u-boot-dtb-with-ucode2 {
+		type = "u-boot-dtb-with-ucode";
+	};
+	u-boot {
 #if CONFIG_SYS_TEXT_BASE == 0x1110000
-			offset = <0xfff00000>;
+		offset = <0xfff00000>;
 #else
-			offset = <CONFIG_SYS_TEXT_BASE>;
+		offset = <CONFIG_SYS_TEXT_BASE>;
 #endif
-		};
+	};
 #else
-		u-boot-with-ucode-ptr {
-			offset = <CONFIG_SYS_TEXT_BASE>;
-		};
+	u-boot-with-ucode-ptr {
+		offset = <CONFIG_SYS_TEXT_BASE>;
+	};
 #endif
-		u-boot-dtb-with-ucode {
-		};
-		u-boot-ucode {
-			align = <16>;
-		};
+	u-boot-dtb-with-ucode {
+	};
+	u-boot-ucode {
+		align = <16>;
+	};
 #ifdef CONFIG_HAVE_MRC
-		intel-mrc {
-			offset = <CONFIG_X86_MRC_ADDR>;
-		};
+	intel-mrc {
+		offset = <CONFIG_X86_MRC_ADDR>;
+	};
 #endif
 #ifdef CONFIG_HAVE_FSP
-		intel-fsp {
-			filename = CONFIG_FSP_FILE;
-			offset = <CONFIG_FSP_ADDR>;
-		};
+	intel-fsp {
+		filename = CONFIG_FSP_FILE;
+		offset = <CONFIG_FSP_ADDR>;
+	};
 #endif
 #ifdef CONFIG_HAVE_CMC
-		intel-cmc {
-			filename = CONFIG_CMC_FILE;
-			offset = <CONFIG_CMC_ADDR>;
-		};
+	intel-cmc {
+		filename = CONFIG_CMC_FILE;
+		offset = <CONFIG_CMC_ADDR>;
+	};
 #endif
 #ifdef CONFIG_HAVE_VGA_BIOS
-		intel-vga {
-			filename = CONFIG_VGA_BIOS_FILE;
-			offset = <CONFIG_VGA_BIOS_ADDR>;
-		};
+	intel-vga {
+		filename = CONFIG_VGA_BIOS_FILE;
+		offset = <CONFIG_VGA_BIOS_ADDR>;
+	};
 #endif
 #ifdef CONFIG_HAVE_VBT
-		intel-vbt {
-			filename = CONFIG_VBT_FILE;
-			offset = <CONFIG_VBT_ADDR>;
-		};
+	intel-vbt {
+		filename = CONFIG_VBT_FILE;
+		offset = <CONFIG_VBT_ADDR>;
+	};
 #endif
 #ifdef CONFIG_HAVE_REFCODE
-		intel-refcode {
-			offset = <CONFIG_X86_REFCODE_ADDR>;
-		};
+	intel-refcode {
+		offset = <CONFIG_X86_REFCODE_ADDR>;
+	};
 #endif
 #ifdef CONFIG_TPL
-		x86-start16-tpl {
-			offset = <CONFIG_SYS_X86_START16>;
-		};
+	x86-start16-tpl {
+		offset = <CONFIG_SYS_X86_START16>;
+	};
 #elif defined(CONFIG_SPL)
-		x86-start16-spl {
-			offset = <CONFIG_SYS_X86_START16>;
-		};
+	x86-start16-spl {
+		offset = <CONFIG_SYS_X86_START16>;
+	};
 #else
-		x86-start16 {
-			offset = <CONFIG_SYS_X86_START16>;
-		};
+	x86-start16 {
+		offset = <CONFIG_SYS_X86_START16>;
+	};
 #endif
 };
 #endif
Signature · 1 line
2.20.1.495.gaa96b0ce6b-goog
#85 lore raw

PATCH 39/40 x86: Fix device-tree indentation

Quoted 10 lines · Simon Glass

With the use of a phandle we can outdent the device tree nodes a little. Fix this.

---

 arch/x86/dts/u-boot.dtsi | 147 +++++++++++++++++++--------------------
 1 file changed, 73 insertions(+), 74 deletions(-)
#86 lore raw

PATCH 40/40 x86: samus: Add a target to boot through TPL

In reply to Simon Glass

Add a version of samus which supports booting from TPL to SPL and then to U-Boot. This allows TPL to select from an A or B SPL to support verified boot with field upgrade.

---

 board/google/Kconfig                      |  8 +++
 board/google/chromebook_samus/Kconfig     | 14 +++-
 board/google/chromebook_samus/MAINTAINERS |  7 ++
 configs/chromebook_samus_tpl_defconfig    | 80 +++++++++++++++++++++++
 include/configs/chromebook_samus.h        |  3 +
 5 files changed, 110 insertions(+), 2 deletions(-)
 create mode 100644 configs/chromebook_samus_tpl_defconfig
board/google/Kconfig +8 -0
index d98a5e818f..679a0f1023 100644
@@ -52,6 +52,14 @@ config TARGET_CHROMEBOOK_SAMUS
 	  Chrome OS EC connected on LPC, and it provides a 2560x1700 high
 	  resolution touch-enabled LCD display.
 
+config TARGET_CHROMEBOOK_SAMUS_TPL
+	bool "Chromebook samus booting from TPL"
+	help
+	  This is a version of Samus which boots into TPL, then to SPL and
+	  U-Boot proper. This is useful where verified boot must select
+	  between different A/B versions of SPL/U-Boot, to allow upgrading of
+	  almost all U-Boot code in the field.
+
 endchoice
 
 source "board/google/chromebook_link/Kconfig"
board/google/chromebook_samus/Kconfig +12 -2
index afbfe53deb..90c23cba1b 100644
@@ -1,4 +1,4 @@
-if TARGET_CHROMEBOOK_SAMUS
+if TARGET_CHROMEBOOK_SAMUS || TARGET_CHROMEBOOK_SAMUS_TPL
 
 config SYS_BOARD
 	default "chromebook_samus"
@@ -10,7 +10,8 @@ config SYS_SOC
 	default "broadwell"
 
 config SYS_CONFIG_NAME
-	default "chromebook_samus"
+	default "chromebook_samus" if TARGET_CHROMEBOOK_SAMUS
+	default "chromebook_samus" if TARGET_CHROMEBOOK_SAMUS_TPL
 
 config SYS_TEXT_BASE
 	default 0xffe00000
@@ -39,3 +40,12 @@ config SYS_CAR_SIZE
 	default 0x40000
 
 endif
+
+if TARGET_CHROMEBOOK_SAMUS_TPL
+
+config BOARD_SPECIFIC_OPTIONS_TPL # dummy
+	def_bool y
+	select SPL
+	select TPL
+
+endif
board/google/chromebook_samus/MAINTAINERS +7 -0
index 5500e46b40..ca4b16500a 100644
@@ -4,3 +4,10 @@ S:	Maintained
 F:	board/google/chromebook_samus/
 F:	include/configs/chromebook_samus.h
 F:	configs/chromebook_samus_defconfig
+
+CHROMEBOOK SAMUS TPL BOARD
+M:	Simon Glass <[email protected]>
+S:	Maintained
+F:	board/google/chromebook_samus/
+F:	include/configs/chromebook_samus.h
+F:	configs/chromebook_samus_tpl_defconfig
configs/chromebook_samus_tpl_defconfig new file +80 -0

80 lines not on this page · raw message

include/configs/chromebook_samus.h +3 -0
index ccb2fe8caa..610be1e7b5 100644
@@ -23,4 +23,7 @@
 #define CONFIG_ENV_SECT_SIZE		0x1000
 #define CONFIG_ENV_OFFSET		0x003f8000
 
+#define CONFIG_SPL_TEXT_BASE		0xffe70000
+#define CONFIG_TPL_TEXT_BASE		0xfffd8000
+
 #endif	/* __CONFIG_H */
Signature · 1 line
2.20.1.495.gaa96b0ce6b-goog
#87 lore raw

PATCH 40/40 x86: samus: Add a target to boot through TPL

Quoted 8 lines · Simon Glass

Add a version of samus which supports booting from TPL to SPL and then to U-Boot. This allows TPL to select from an A or B SPL to support verified boot with field upgrade.

---

Quoted 8 lines
 board/google/Kconfig                      |  8 +++
 board/google/chromebook_samus/Kconfig     | 14 +++-
 board/google/chromebook_samus/MAINTAINERS |  7 ++
 configs/chromebook_samus_tpl_defconfig    | 80 +++++++++++++++++++++++
 include/configs/chromebook_samus.h        |  3 +
 5 files changed, 110 insertions(+), 2 deletions(-)
 create mode 100644 configs/chromebook_samus_tpl_defconfig

Generally it looks good

But I still need understand the boot sequence of SPL/TPL.

#88 lore raw

cover x86: Add support for booting from TPL

In reply to Simon Glass

Hi Bin,

Quoted 50 lines · Simon Glass

At present SPL is used on 64-bit platforms, to allow SPL to be built as a 32-bit program and U-Boot proper to be built as 64-bit.

However it is useful to be able to use SPL on any x86 platform, where U-Boot needs to be updated in the field. Then SPL can select which U-Boot to run (A or B) and most of the code can be updated. Similarly, using TPL allows both SPL and U-Boot to be updated. This is the best approach, since it means that all of U-Boot proper as well as SPL (in particular SDRAM init) can be updated in the field. This provides for the smallest possible amount of read-only (non-updateable) code: just the TPL code.

This series contains a number of changes to allow x86 boards to use TPL, SPL and U-Boot proper. As a test, it is enabled for samus with a new chromebook_samus_tpl board.

Simon Glass (40):
binman: Don't generate an error in 'text' entry constructor
binman: Don't show image-skip message by default
binman: Add a missing comment in Entry_vblock
dm: core: Fix translate condition in ofnode_get_addr_size()
cros_ec: Use a hyphen in the uclass name
spl: Allow sandbox to build a device-tree file
RFC: binman: Allow sections to have an offset
x86: start64: Fix copyright message
x86: mp_init: Use proper error numbers
x86: Add a way to reinit the cpu
x86: dts: Add device-tree labels for rtc and reset
x86: Update a stale comment about ifdtool
x86: Support SPL and TPL
x86: Support booting with TPL
x86: Add a handoff header file
x86: broadwell: Improve SDRAM debugging output
x86: broadwell: Allow SDRAM init from SPL
x86: Move init of debug UART to cpu.c
x86: broadwell: Split CPU init
x86: Add support for starting from SPL/TPL
x86: Allow 16-bit init to be in TPL
x86: broadwell: Allow booting from SPL
x86: broadwell: Select refcode and CPU code for SPL
x86: Add common Intel code for SPL
x86: Support saving MRC data from SPL
x86: Add a simple TPL implementations
x86: mrccache: Add more debugging
x86: Add a sysreset driver for the Intel PCH
x86: Support TPL in Intel common code
x86: Don't set up MTRRs in SPL
x86: Don't generate a bootstage report in SPL
x86: Support PCI VGA ROM when TPL is used

Quoted 8 lines

x86: sysreset: Implement the get_last() method
x86: Add documention on the samus flashmap
x86: samus: Update device tree for SPL
x86: samus: Update device tree for verified boot
x86: Update device tree for TPL
x86: Update device tree for Chromium OS verified boot
x86: Fix device-tree indentation
x86: samus: Add a target to boot through TPL

Just checking if you have any comments on this series?

Regards,
Simon

#89 lore raw

cover x86: Add support for booting from TPL

Hi Simon,

Quoted 63 lines · Simon Glass

Hi Bin,

Quoted 50 lines · Simon Glass

At present SPL is used on 64-bit platforms, to allow SPL to be built as a 32-bit program and U-Boot proper to be built as 64-bit.

However it is useful to be able to use SPL on any x86 platform, where U-Boot needs to be updated in the field. Then SPL can select which U-Boot to run (A or B) and most of the code can be updated. Similarly, using TPL allows both SPL and U-Boot to be updated. This is the best approach, since it means that all of U-Boot proper as well as SPL (in particular SDRAM init) can be updated in the field. This provides for the smallest possible amount of read-only (non-updateable) code: just the TPL code.

This series contains a number of changes to allow x86 boards to use TPL, SPL and U-Boot proper. As a test, it is enabled for samus with a new chromebook_samus_tpl board.

Simon Glass (40):
binman: Don't generate an error in 'text' entry constructor
binman: Don't show image-skip message by default
binman: Add a missing comment in Entry_vblock
dm: core: Fix translate condition in ofnode_get_addr_size()
cros_ec: Use a hyphen in the uclass name
spl: Allow sandbox to build a device-tree file
RFC: binman: Allow sections to have an offset
x86: start64: Fix copyright message
x86: mp_init: Use proper error numbers
x86: Add a way to reinit the cpu
x86: dts: Add device-tree labels for rtc and reset
x86: Update a stale comment about ifdtool
x86: Support SPL and TPL
x86: Support booting with TPL
x86: Add a handoff header file
x86: broadwell: Improve SDRAM debugging output
x86: broadwell: Allow SDRAM init from SPL
x86: Move init of debug UART to cpu.c
x86: broadwell: Split CPU init
x86: Add support for starting from SPL/TPL
x86: Allow 16-bit init to be in TPL
x86: broadwell: Allow booting from SPL
x86: broadwell: Select refcode and CPU code for SPL
x86: Add common Intel code for SPL
x86: Support saving MRC data from SPL
x86: Add a simple TPL implementations
x86: mrccache: Add more debugging
x86: Add a sysreset driver for the Intel PCH
x86: Support TPL in Intel common code
x86: Don't set up MTRRs in SPL
x86: Don't generate a bootstage report in SPL
x86: Support PCI VGA ROM when TPL is used

Quoted 8 lines

x86: sysreset: Implement the get_last() method
x86: Add documention on the samus flashmap
x86: samus: Update device tree for SPL
x86: samus: Update device tree for verified boot
x86: Update device tree for TPL
x86: Update device tree for Chromium OS verified boot
x86: Fix device-tree indentation
x86: samus: Add a target to boot through TPL

Quoted 1 line

Just checking if you have any comments on this series?

Sorry for the long delay due to Chinese new year holiday vacation. I will look at this series soon (in fact I started reviewing the sound series yesterday)

Regards,
Bin