x86: Use qemu-x86_64 to boot EFI installers
Subsystems (8)
v2 cover x86: Use qemu-x86_64 to boot EFI installers
This series adds various minor features so that qemu-x86_64 can boot the Ubuntu 2022.04 installer using a virtio device:
qemu-system-x86_64 -M pc -drive format=raw,file=root.img
-bios /tmp/b/qemu-x86_64/u-boot.rom
-drive if=virtio,file=ubuntu-22.04.2-desktop-amd64.iso -smp 4 -m 4G -serial mon:stdio
The main changes include:
- Enable video in SPL while running in 32-bit mode
- Drop the duplicate ACPI tables with EFI
- Support PCI autoconfig in SPL
- Support FAT on a CDROM filesystem
- Improved bootstd rules around device tree and efi_set_bootdev()
There are also quite a number of minor tweaks and fixes to make things easier to use.
This series is based on an older version of the SPL-video series from Nikhil M Jain. It is available at u-boot-dm/bryc-working
Changes in v2:
- Add new patch with docs for mtrr command
- Add docs to board_init_f_r() too
- Fix BINS typo
- Drop the Ooops string
- Drop ** in strings and use log_err() for messages
- Use log_warning() for the warning
- Handle the case where the tables are in the bloblist
- Add new patch to show the number of physical address bits
- Add new patch to convert some debug statements to use logging
- Add new patch to support Micron memory
- Add new patch to make sure that the LPC is active before SDRAM init
- Add new patch to support outputing function names in SPL
- Drop patch to set high bits of the mtrr base register, for now
Simon Glass (42):
x86: Allow listing MTRRs in SPL
x86: mtrr: Add documentation
bios_emulator: Add Kconfig and adjust Makefile for SPL
bios_emulator: Drop VIDEO_IO_OFFSET
x86: Tidy up EFI code in interrupt_init()
x86: Add a comment for board_init_f_r_trampoline()
x86: Show the CPU physical address size with bdinfo
x86: Correct get_sp() implementation for 64-bit
x86: Show an error when a BIOS exception occurs
acpi: Add a comment to set the acpi tables
bdinfo: Show the RAM top and approximate stack pointer
part: Allow setting the partition-table type
qfw: Show the file address if available
log: Tidy up an ambiguous comment.
video: Allow building video drivers for SPL
qfw: Set the address of the ACPI tables
efi: Show all known UUIDs with CONFIG_CMD_EFIDEBUG
x86: Improve the trampoline in 64-bit mode Show the malloc base with the bdinfo command
nvme: Provide more useful debugging messages
pci: Support autoconfig in SPL
pci: Allow the video BIOS to work in SPL with QEMU
pci: Tidy up logging and reporting for video BIOS
x86: Allow video-BIOS code to be built for SPL
x86: Pass video settings from SPL to U-Boot proper
x86: Init video in SPL if enabled
pci: Adjust video BIOS debugging to be SPL-friendly
pci: Mask the ROM address in case it is already enabled
x86: Enable display for QEMU 64-bit
x86: Allow logging to be used in SPL reliably
fs: fat: Shrink the size of a few strings
fs: fat: Support reading from a larger block size
x86: Enable useful options for qemu-86_64
x86: Record the start and end of the tables
x86: Show the number of physical address bits
x86: Convert some debug statements to use logging
x86: link: Support Micron memory
x86: Make sure that the LPC is active before SDRAM init
log: Support outputing function names in SPL
sandbox: Correct header order in board file
sandbox: Install ACPI tables on startup
efi: Use the installed ACPI tables
arch/sandbox/include/asm/global_data.h | 4 + arch/x86/cpu/i386/cpu.c | 2 + arch/x86/cpu/i386/interrupt.c | 17 +-- arch/x86/cpu/intel_common/mrc.c | 10 +- arch/x86/cpu/ivybridge/sdram.c | 4 +- arch/x86/cpu/mtrr.c | 61 ++++++++ arch/x86/cpu/start64.S | 19 +++ arch/x86/dts/chromebook_link.dts | 1 + arch/x86/include/asm/global_data.h | 5 + arch/x86/include/asm/mtrr.h | 20 +++ arch/x86/include/asm/u-boot-x86.h | 27 +++- arch/x86/lib/Makefile | 7 +- arch/x86/lib/bdinfo.c | 6 + arch/x86/lib/bios.c | 4 +- arch/x86/lib/bootm.c | 2 +- arch/x86/lib/mrccache.c | 6 +- arch/x86/lib/spl.c | 63 +++++++-- arch/x86/lib/tables.c | 16 ++- board/google/Kconfig | 7 - board/sandbox/sandbox.c | 22 ++- cmd/Kconfig | 8 ++ cmd/acpi.c | 24 +++- cmd/bdinfo.c | 6 + cmd/part.c | 34 +++++ cmd/qfw.c | 2 +- cmd/x86/mtrr.c | 60 +------- common/board_f.c | 12 +- common/board_r.c | 7 +- common/log.c | 2 +- common/log_console.c | 10 +- configs/qemu-x86_64_defconfig | 14 ++ disk/part.c | 16 +++ doc/usage/cmd/acpi.rst | 29 +++- doc/usage/cmd/mtrr.rst | 151 ++++++++++++++++++++ doc/usage/cmd/part.rst | 74 ++++++++++ doc/usage/cmd/qfw.rst | 28 ++-- doc/usage/index.rst | 1 + drivers/Kconfig | 2 + drivers/Makefile | 5 +- drivers/bios_emulator/Kconfig | 10 ++ drivers/bios_emulator/biosemui.h | 18 +-- drivers/bios_emulator/x86emu/sys.c | 1 + drivers/gpio/intel_ich6_gpio.c | 5 +- drivers/misc/qfw.c | 12 ++ drivers/nvme/nvme.c | 36 +++-- drivers/pch/pch9.c | 6 +- drivers/pci/Kconfig | 8 ++ drivers/pci/pci-uclass.c | 10 +- drivers/pci/pci_rom.c | 165 +++++++++++++++++----- fs/fat/Kconfig | 13 ++ fs/fat/fat.c | 121 +++++++++++++--- fs/fat/fat_write.c | 22 ++- include/asm-generic/global_data.h | 11 ++ include/bloblist.h | 1 + include/configs/conga-qeval20-qa3-e3845.h | 2 - include/configs/dfi-bt700.h | 2 - include/configs/minnowmax.h | 2 - include/configs/som-db5800-som-6867.h | 2 - include/configs/theadorable-x86-common.h | 2 - include/configs/x86-chromebook.h | 2 - include/part.h | 9 ++ include/pci_ids.h | 1 + include/video.h | 24 ++++ lib/efi_loader/efi_acpi.c | 33 +++-- lib/uuid.c | 2 +- test/dm/acpi.c | 38 +++++ 66 files changed, 1092 insertions(+), 254 deletions(-) create mode 100644 doc/usage/cmd/mtrr.rst create mode 100644 drivers/bios_emulator/Kconfig
Signature · 1 line
2.40.0.634.g4ca3ef3211-goog
PATCH v2 1/42 x86: Allow listing MTRRs in SPL
Move MTRR-listing code into a common file so it can be used from SPL. Update the 'mtrr' command to call it.
Use this in SPL just before adjusting the MTRRs, so we can see the state set up by the board. Only show it when debug is enabled.
---
(no changes since v1)
arch/x86/cpu/mtrr.c | 61 +++++++++++++++++++++++++++++++++++++ arch/x86/include/asm/mtrr.h | 20 ++++++++++++ arch/x86/lib/spl.c | 7 +++++ cmd/x86/mtrr.c | 60 +++--------------------------------- 4 files changed, 92 insertions(+), 56 deletions(-)
arch/x86/cpu/mtrr.c +61 -0
@@ -30,6 +30,16 @@DECLARE_GLOBAL_DATA_PTR ; +const char *const mtrr_type_name[MTRR_TYPE_COUNT ] = { +"Uncacheable" , +"Combine" , +"2" , +"3" , +"Through" , +"Protect" , +"Back" , +}; +/* Prepare to adjust MTRRs */ void mtrr_open (struct mtrr_state *state,bool do_caches) {
@@ -324,3 +334,54 @@ int mtrr_set(int cpu_select, int reg, u64 base, u64 mask)return mtrr_start_op (cpu_select, &oper); } + +static void read_mtrrs_ (void *arg) +{ +struct mtrr_info *info = arg; + +mtrr_read_all (info); +} + +int mtrr_list (int reg_count,int cpu_select) +{ +struct mtrr_info info; +int ret; +int i; + +printf ("Reg Valid Write-type %-16s %-16s %-16s\n" ,"Base ||" , +"Mask ||" ,"Size ||" ); +memset (&info,'\0' ,sizeof (info)); + ret =mp_run_on_cpus (cpu_select, read_mtrrs_, &info); +if (ret) +return log_msg_ret ("run" , ret); +for (i =0 ; i < reg_count; i++) { +const char *type ="Invalid" ; +uint64_t base, mask, size; +bool valid; + + base = info.mtrr[i].base; + mask = info.mtrr[i].mask; + size = ~mask & ((1ULL <<CONFIG_CPU_ADDR_BITS ) -1 ); + size |= (1 <<12 ) -1 ; + size +=1 ; + valid = mask &MTRR_PHYS_MASK_VALID ; + type = mtrr_type_name[base &MTRR_BASE_TYPE_MASK ]; +printf ("%d %-5s %-12s %016llx %016llx %016llx\n" , i, + valid ?"Y" :"N" , type, base & ~MTRR_BASE_TYPE_MASK , + mask & ~MTRR_PHYS_MASK_VALID , size); + } + +return 0 ; +} + +int mtrr_get_type_by_name (const char *typename) +{ +int i; + +for (i =0 ; i <MTRR_TYPE_COUNT ; i++) { +if (*typename == *mtrr_type_name[i]) +return i; + } + +return -EINVAL ; +};
arch/x86/include/asm/mtrr.h +20 -0
@@ -190,6 +190,26 @@ int mtrr_set(int cpu_select, int reg, u64 base, u64 mask);*/ int mtrr_get_var_count (void ); +/** +* mtrr_list() - List the MTRRs +* +* Shows a list of all the MTRRs including their values +* +* @reg_count: Number of registers to show. You can use mtrr_get_var_count() for +* this +* @cpu_select: CPU to use. Use MP_SELECT_BSP for the boot CPU +* Returns: 0 if OK, -ve if the CPU was not found +*/ +int mtrr_list (int reg_count,int cpu_select); + +/** +* mtrr_get_type_by_name() - Get the type of an MTRR given its type name +* +* @typename: Name to check +* Returns: MTRR type (MTRR_TYPE_...) or -EINVAL if invalid +*/ +int mtrr_get_type_by_name (const char *typename); +#endif #if ((CONFIG_XIP_ROM_SIZE & (CONFIG_XIP_ROM_SIZE -1 )) !=0 )
arch/x86/lib/spl.c +7 -0
@@ -19,6 +19,7 @@#include <asm/cpu_common.h> #include <asm/fsp2/fsp_api.h> #include <asm/global_data.h> +#include <asm/mp.h> #include <asm/mrccache.h> #include <asm/mtrr.h> #include <asm/pci.h>
@@ -139,6 +140,12 @@ static int x86_spl_init(void)arch_setup_gd (gd->new_gd); gd->start_addr_sp = (ulong )ptr; +if (_LOG_DEBUG) { + ret =mtrr_list (mtrr_get_var_count (),MP_SELECT_BSP ); +if (ret) +printf ("mtrr_list failed\n" ); + } +/* Cache the SPI flash. Otherwise copying the code to RAM takes ages */ ret = mtrr_add_request(MTRR_TYPE_WRBACK, (1ULL << 32) - CONFIG_XIP_ROM_SIZE,
cmd/x86/mtrr.c +4 -56
82 lines not on this page · raw message
Signature · 1 line
2.40.0.634.g4ca3ef3211-goog
PATCH v2 2/42 x86: mtrr: Add documentation
In reply to Simon GlassAdd documention for the x86 'mtrr' command.
---
Changes in v2:
- Add new patch with docs for mtrr command
doc/usage/cmd/mtrr.rst | 151 +++++++++++++++++++++++++++++++++++++++++ doc/usage/index.rst | 1 + 2 files changed, 152 insertions(+) create mode 100644 doc/usage/cmd/mtrr.rst
doc/usage/cmd/mtrr.rst new file +151 -0
@@ -0,0 +1,151 @@ +.. SPDX-License-Identifier: GPL-2.0+: + +mtrr command +============ + +Synopis +------- + + mtrr [list] + mtrr set <reg> <type> <start> <size> + mtrr disable <reg> + mtrr enable + + +Description +----------- + +The *mtrr* command is used to dump the Memory Type Range Registers (MTRRs) on +an x86 machine. These register control cache behaviour in selected memory +ranges. + +Note that the number of registers can vary between CPUs. + + +mtrr [list] +~~~~~~~~~~~ + +List the MTRRs. The table shows the following information: + +Reg + Register number (the first is register 0) + +Valid + Shows Y if the register is valid (has bit 11 set), N if not + +Write-type + Shows the behaviour when writing to the memory region. The types are + abrievated to fit a reasonable line length. Valid types shown below. + + ====== ============== ==================================================== + Value Type Meaning + ====== ============== ==================================================== + 0 Uncacheable Skip cache and write directly to memory + 1 Combine Multiple writes can be combined into one transaction + 4 Through Update cache and also write to memory + 5 Protect Writes are prohibited + 6 Back Update cache but don't write to memory + ====== ============== ==================================================== + +Base + Base memory address from which the register controls behaviour + +Mask + Mask value, which also indicates the size + +Size + Length of memory region within which the register controls behaviour + + +mtrr set +~~~~~~~~ + +This sets the value of a particular MTRR. Parameters are: + +reg + Register number to set, with 0 being the first + +type + Access type to set. See Write-type above for valid types. This uses the name + rather than its numeric value. + +start + Base memory address from which the register should control behaviour + +size + Length of memory region within which the register controls behaviour + + +mtrr disable +~~~~~~~~~~~~ + +This disables a particular register, by clearing its `valid` bit (11). + + +mtrr enable +~~~~~~~~~~~ + +This enables a particular register, by setting its `valid` bit (11). + + +Example +------- + +This shows disabling and enabling an MTRR, as well as setting its type:: + + => mtrr + CPU 0: + Reg Valid Write-type Base || Mask || Size || + 0 Y Back 0000000000000000 0000000f80000000 0000000080000000 + 1 Y Back 0000000080000000 0000000fe0000000 0000000020000000 + 2 Y Back 00000000a0000000 0000000ff0000000 0000000010000000 + 3 Y Uncacheable 00000000ad000000 0000000fff000000 0000000001000000 + 4 Y Uncacheable 00000000ae000000 0000000ffe000000 0000000002000000 + 5 Y Combine 00000000d0000000 0000000ff0000000 0000000010000000 + 6 N Uncacheable 0000000000000000 0000000000000000 0000001000000000 + 7 N Uncacheable 0000000000000000 0000000000000000 0000001000000000 + 8 N Uncacheable 0000000000000000 0000000000000000 0000001000000000 + 9 N Uncacheable 0000000000000000 0000000000000000 0000001000000000 + => mtrr d 5 + => mtrr + CPU 0: + Reg Valid Write-type Base || Mask || Size || + 0 Y Back 0000000000000000 0000000f80000000 0000000080000000 + 1 Y Back 0000000080000000 0000000fe0000000 0000000020000000 + 2 Y Back 00000000a0000000 0000000ff0000000 0000000010000000 + 3 Y Uncacheable 00000000ad000000 0000000fff000000 0000000001000000 + 4 Y Uncacheable 00000000ae000000 0000000ffe000000 0000000002000000 + 5 N Combine 00000000d0000000 0000000ff0000000 0000000010000000 + 6 N Uncacheable 0000000000000000 0000000000000000 0000001000000000 + 7 N Uncacheable 0000000000000000 0000000000000000 0000001000000000 + 8 N Uncacheable 0000000000000000 0000000000000000 0000001000000000 + 9 N Uncacheable 0000000000000000 0000000000000000 0000001000000000 + => mtrr e 5 + => mtrr + CPU 0: + Reg Valid Write-type Base || Mask || Size || + 0 Y Back 0000000000000000 0000000f80000000 0000000080000000 + 1 Y Back 0000000080000000 0000000fe0000000 0000000020000000 + 2 Y Back 00000000a0000000 0000000ff0000000 0000000010000000 + 3 Y Uncacheable 00000000ad000000 0000000fff000000 0000000001000000 + 4 Y Uncacheable 00000000ae000000 0000000ffe000000 0000000002000000 + 5 Y Combine 00000000d0000000 0000000ff0000000 0000000010000000 + 6 N Uncacheable 0000000000000000 0000000000000000 0000001000000000 + 7 N Uncacheable 0000000000000000 0000000000000000 0000001000000000 + 8 N Uncacheable 0000000000000000 0000000000000000 0000001000000000 + 9 N Uncacheable 0000000000000000 0000000000000000 0000001000000000 + => mtrr set 5 Uncacheable d0000000 10000000 + => mtrr + CPU 0: + Reg Valid Write-type Base || Mask || Size || + 0 Y Back 0000000000000000 0000000f80000000 0000000080000000 + 1 Y Back 0000000080000000 0000000fe0000000 0000000020000000 + 2 Y Back 00000000a0000000 0000000ff0000000 0000000010000000 + 3 Y Uncacheable 00000000ad000000 0000000fff000000 0000000001000000 + 4 Y Uncacheable 00000000ae000000 0000000ffe000000 0000000002000000 + 5 Y Uncacheable 00000000d0000000 0000000ff0000000 0000000010000000 + 6 N Uncacheable 0000000000000000 0000000000000000 0000001000000000 + 7 N Uncacheable 0000000000000000 0000000000000000 0000001000000000 + 8 N Uncacheable 0000000000000000 0000000000000000 0000001000000000 + 9 N Uncacheable 0000000000000000 0000000000000000 0000001000000000 + =>
doc/usage/index.rst +1 -0
@@ -68,6 +68,7 @@ Shell commands cmd/md cmd/mmc cmd/mtest + cmd/mtrr cmd/panic cmd/part cmd/pause
Signature · 1 line
2.40.0.634.g4ca3ef3211-goog
PATCH v2 3/42 bios_emulator: Add Kconfig and adjust Makefile for SPL
In reply to Simon GlassThe Kconfig for this is currently inside a particular board. Move it into the correct place and allow use in SPL, so that video can be used there if needed.
---
(no changes since v1)
board/google/Kconfig | 7 ------- drivers/Kconfig | 2 ++ drivers/Makefile | 2 +- drivers/bios_emulator/Kconfig | 10 ++++++++++ 4 files changed, 13 insertions(+), 8 deletions(-) create mode 100644 drivers/bios_emulator/Kconfig
board/google/Kconfig +0 -7
@@ -4,13 +4,6 @@ if VENDOR_GOOGLE -config BIOSEMU - bool - select X86EMU_RAW_IO - -config X86EMU_RAW_IO - bool - choice prompt "Mainboard model" optional
drivers/Kconfig +2 -0
@@ -10,6 +10,8 @@ source "drivers/ata/Kconfig" source "drivers/axi/Kconfig" +source "drivers/bios_emulator/Kconfig" + source "drivers/bus/Kconfig" source "drivers/block/Kconfig"
drivers/Makefile +1 -1
@@ -1,5 +1,6 @@ # SPDX-License-Identifier: GPL-2.0+ +obj-$(CONFIG_$(SPL_TPL_)BIOSEMU) += bios_emulator/ obj-$(CONFIG_$(SPL_TPL_)BLK) += block/ obj-$(CONFIG_$(SPL_TPL_)BOOTCOUNT_LIMIT) += bootcount/ obj-$(CONFIG_$(SPL_TPL_)BUTTON) += button/
@@ -78,7 +79,6 @@ ifeq ($(CONFIG_SPL_BUILD)$(CONFIG_TPL_BUILD),) obj-y += adc/ obj-y += ata/ obj-$(CONFIG_DM_DEMO) += demo/ -obj-$(CONFIG_BIOSEMU) += bios_emulator/ obj-y += block/ obj-y += cache/ obj-$(CONFIG_CPU) += cpu/
drivers/bios_emulator/Kconfig new file +10 -0
@@ -0,0 +1,10 @@ +config BIOSEMU + bool + select X86EMU_RAW_IO + +config SPL_BIOSEMU + bool + select X86EMU_RAW_IO + +config X86EMU_RAW_IO + bool
Signature · 1 line
2.40.0.634.g4ca3ef3211-goog
PATCH v2 4/42 bios_emulator: Drop VIDEO_IO_OFFSET
In reply to Simon GlassThis is always zero in the source tree, so drop it.
While we are here, add a comment to _X86EMU_env since it the symbol is actually defined twice, which can cause confusion when building.
---
(no changes since v1)
drivers/bios_emulator/biosemui.h | 18 +++++++++--------- drivers/bios_emulator/x86emu/sys.c | 1 + include/configs/conga-qeval20-qa3-e3845.h | 2 -- include/configs/dfi-bt700.h | 2 -- include/configs/minnowmax.h | 2 -- include/configs/som-db5800-som-6867.h | 2 -- include/configs/theadorable-x86-common.h | 2 -- include/configs/x86-chromebook.h | 2 -- 8 files changed, 10 insertions(+), 21 deletions(-)
drivers/bios_emulator/biosemui.h +9 -9
@@ -128,19 +128,19 @@ typedef struct {u32 finalVal; } BE_portInfo; -#define PM_inpb (port) inb(port+VIDEO_IO_OFFSET) -#define PM_inpw (port) inw(port+VIDEO_IO_OFFSET) -#define PM_inpd (port) inl(port+VIDEO_IO_OFFSET) -#define PM_outpb (port,val) outb(val,port+VIDEO_IO_OFFSET) -#define PM_outpw (port,val) outw(val,port+VIDEO_IO_OFFSET) -#define PM_outpd (port,val) outl(val,port+VIDEO_IO_OFFSET) +#define PM_inpb (port) inb(port) +#define PM_inpw (port) inw(port) +#define PM_inpd (port) inl(port) +#define PM_outpb (port, val) outb(val, port) +#define PM_outpw (port, val) outw(val, port) +#define PM_outpd (port, val) outl(val, port)#define LOG_inpb (port) PM_inpb(port)#define LOG_inpw (port) PM_inpw(port)#define LOG_inpd (port) PM_inpd(port) -#define LOG_outpb (port,val) PM_outpb(port,val) -#define LOG_outpw (port,val) PM_outpw(port,val) -#define LOG_outpd (port,val) PM_outpd(port,val) +#define LOG_outpb (port, val) PM_outpb(port, val) +#define LOG_outpw (port, val) PM_outpw(port, val) +#define LOG_outpd (port, val) PM_outpd(port, val)/*-------------------------- Function Prototypes --------------------------*/
drivers/bios_emulator/x86emu/sys.c +1 -0
@@ -44,6 +44,7 @@/*------------------------- Global Variables ------------------------------*/ +/* Note: bios.c defines this if the emulator is not enabled */ X86EMU_sysEnv _X86EMU_env;/* Global emulator machine state */ X86EMU_intrFuncs _X86EMU_intrTab[256 ];
include/configs/conga-qeval20-qa3-e3845.h +0 -2
@@ -16,8 +16,6 @@"stdout=serial\0" \ "stderr=serial\0" -#define VIDEO_IO_OFFSET 0 -#undef CFG_EXTRA_ENV_SETTINGS#define CFG_EXTRA_ENV_SETTINGS \ "kernel-ver=4.4.0-22\0" \
include/configs/dfi-bt700.h +0 -2
@@ -20,8 +20,6 @@"stdout=serial\0" \ "stderr=serial\0" -#define VIDEO_IO_OFFSET 0 -#undef CFG_EXTRA_ENV_SETTINGS#define CFG_EXTRA_ENV_SETTINGS \ "kernel-ver=4.4.0-24\0" \
include/configs/minnowmax.h +0 -2
@@ -17,6 +17,4 @@"stderr=vidconsole,serial\0" \ "usb_pgood_delay=40\0" -#define VIDEO_IO_OFFSET 0 -#endif /* __CONFIG_H */
include/configs/som-db5800-som-6867.h +0 -2
@@ -16,6 +16,4 @@"stdout=serial,vidconsole\0" \ "stderr=serial,vidconsole\0" -#define VIDEO_IO_OFFSET 0 -#endif /* __CONFIG_H */
include/configs/theadorable-x86-common.h +0 -2
@@ -15,8 +15,6 @@"stdout=serial\0" \"stderr=serial\0" -#define VIDEO_IO_OFFSET 0 -/* Environment settings */ #undef CFG_EXTRA_ENV_SETTINGS
include/configs/x86-chromebook.h +0 -2
@@ -10,8 +10,6 @@#define CFG_X86_REFCODE_ADDR 0xffea0000#define CFG_X86_REFCODE_RUN_ADDR 0 -#define VIDEO_IO_OFFSET 0 -#define CFG_STD_DEVICES_SETTINGS "stdin=usbkbd,i8042-kbd,serial\0" \ "stdout=vidconsole,serial\0" \ "stderr=vidconsole,serial\0"
Signature · 1 line
2.40.0.634.g4ca3ef3211-goog
PATCH v2 5/42 x86: Tidy up EFI code in interrupt_init()
In reply to Simon GlassThe ll_boot_init() check handles the EFI case so we don't need the rest of the code. Drop it.
---
(no changes since v1)
arch/x86/cpu/i386/interrupt.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-)
arch/x86/cpu/i386/interrupt.c +5 -12
@@ -266,6 +266,10 @@ int interrupt_init(void)struct udevice *dev;int ret; +/* +* When running as an EFI application we are not in control of +* interrupts and should leave them alone. +*/ if (!ll_boot_init ())return 0 ;
@@ -274,11 +278,6 @@ int interrupt_init(void)if (ret && ret != -ENODEV )return ret; -/* -* When running as an EFI application we are not in control of -* interrupts and should leave them alone. -*/ -#ifndef CONFIG_EFI_APP /* Just in case... */ disable_interrupts ();
@@ -294,14 +293,8 @@ int interrupt_init(void)/* Initialize core interrupt and exception functionality of CPU */ cpu_init_interrupts (); -/* -* It is now safe to enable interrupts. -* -* TODO([email protected]): But we don't handle these correctly when -* booted from EFI. -*/ +/* It is now safe to enable interrupts */ enable_interrupts (); -#endif return 0 ; }
Signature · 1 line
2.40.0.634.g4ca3ef3211-goog
PATCH v2 6/42 x86: Add a comment for board_init_f_r_trampoline()
In reply to Simon GlassAdd a comment for this function in the header.
Change the function (and the one after) to use __noreturn to keep checkpatch happy.
Add docs to board_init_f_r() while we are here.
---
Changes in v2:
- Add docs to board_init_f_r() too
arch/x86/include/asm/u-boot-x86.h | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)
arch/x86/include/asm/u-boot-x86.h +14 -2
@@ -102,8 +102,20 @@ int video_bios_init(void);*/ int fsp_save_s3_stack (void ); -void board_init_f_r_trampoline (ulong ) __attribute__ ((noreturn)); -void board_init_f_r (void ) __attribute__ ((noreturn)); +/** +* board_init_f_r_trampoline() - jump to relocated address with new stack +* +* @sp: New stack pointer to use +*/ +void __noreturn board_init_f_r_trampoline (ulong sp); + +/** +* board_init_f_r() - jump to relocated U-Boot +* +* This is used to jump from pre-relocation to post-relocation U-Boot. It +* enables the cache and jump to the new location. +*/ +void __noreturn board_init_f_r (void );int arch_misc_init (void );
Signature · 1 line
2.40.0.634.g4ca3ef3211-goog
PATCH v2 7/42 x86: Show the CPU physical address size with bdinfo
In reply to Simon GlassThis is useful information so show it with the bdinfo command.
---
(no changes since v1)
arch/x86/lib/bdinfo.c | 1 + 1 file changed, 1 insertion(+)
arch/x86/lib/bdinfo.c +1 -0
@@ -22,6 +22,7 @@ void arch_print_bdinfo(void)bdinfo_print_num_l ("vendor" , gd->arch.x86_vendor);bdinfo_print_str (" name" ,cpu_vendor_name (gd->arch.x86_vendor));bdinfo_print_num_l ("model" , gd->arch.x86_model); +bdinfo_print_num_l ("phys_addr" ,cpu_phys_address_size ());if (IS_ENABLED (CONFIG_EFI_STUB ))efi_show_bdinfo ();
Signature · 1 line
2.40.0.634.g4ca3ef3211-goog
PATCH v2 8/42 x86: Correct get_sp() implementation for 64-bit
In reply to Simon GlassUse an assembler implementation as is done for i386, so that the results are equivalent.
---
(no changes since v1)
arch/x86/lib/bootm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/lib/bootm.c +1 -1
@@ -258,7 +258,7 @@ static ulong get_sp(void)ulong ret;#if CONFIG_IS_ENABLED (X86_64 ) - ret = gd->start_addr_sp; + asm("mov %%rsp, %0" :"=r" (ret) : );#else asm("mov %%esp, %0" :"=r" (ret) : );#endif
Signature · 1 line
2.40.0.634.g4ca3ef3211-goog
PATCH v2 9/42 x86: Show an error when a BIOS exception occurs
In reply to Simon GlassRather than silently hanging, show an error first. This can happen when there is something wrong with the video BIOS.
---
Changes in v2:
- Fix BINS typo
- Drop the Ooops string
arch/x86/lib/bios.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/lib/bios.c +1 -1
@@ -78,7 +78,7 @@ static int int_exception_handler(void) };struct eregs *regs = ®_info; -debug ("Oops, exception %d while executing option rom\n" , regs->vector); +log_err ("Exception %d while executing option rom\n" , regs->vector);cpu_hlt ();return 0 ;
Signature · 1 line
2.40.0.634.g4ca3ef3211-goog
PATCH v2 10/42 acpi: Add a comment to set the acpi tables
In reply to Simon GlassSometimes a previous bootloader has written ACPI tables. It is useful to be able to find and list these. Add an 'acpi set' command to set the address for these tables.
---
(no changes since v1)
cmd/acpi.c | 24 +++++++++++++++++++++--- doc/usage/cmd/acpi.rst | 29 +++++++++++++++++++++++++++-- test/dm/acpi.c | 38 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 86 insertions(+), 5 deletions(-)
cmd/acpi.c +21 -3
@@ -118,6 +118,22 @@ static int do_acpi_list(struct cmd_tbl *cmdtp, int flag, int argc,return 0 ; } +static int do_acpi_set (struct cmd_tbl *cmdtp,int flag,int argc, +char *const argv[]) +{ +ulong val; + +if (argc <2 ) { +printf ("ACPI pointer: %lx\n" ,gd_acpi_start ()); + }else { + val =hextoul (argv[1 ],NULL ); +printf ("Setting ACPI pointer to %lx\n" , val); +gd_set_acpi_start (val); + } + +return 0 ; +} +static int do_acpi_items (struct cmd_tbl *cmdtp,int flag,int argc,char *const argv[]) {
@@ -157,12 +173,14 @@ static int do_acpi_dump(struct cmd_tbl *cmdtp, int flag, int argc,#ifdef CONFIG_SYS_LONGHELP static char acpi_help_text[] = -"list - list ACPI tables\n" -"acpi items [-d] - List/dump each piece of ACPI data from devices\n" -"acpi dump <name> - Dump ACPI table" ; +"list - list ACPI tables\n" +"acpi items [-d] - List/dump each piece of ACPI data from devices\n" +"acpi set [<addr>] - Set or show address of ACPI tables\n" +"acpi dump <name> - Dump ACPI table" ;#endif U_BOOT_CMD_WITH_SUBCMDS (acpi,"ACPI tables" , acpi_help_text,U_BOOT_SUBCMD_MKENT (list,1 ,1 , do_acpi_list),U_BOOT_SUBCMD_MKENT (items,2 ,1 , do_acpi_items), +U_BOOT_SUBCMD_MKENT (set,2 ,1 , do_acpi_set),U_BOOT_SUBCMD_MKENT (dump,2 ,1 , do_acpi_dump));
doc/usage/cmd/acpi.rst +27 -2
@@ -11,12 +11,14 @@ Synopis acpi list acpi items [-d] acpi dump <name> + acpi set <address> Description ----------- -The *acpi* command is used to dump the ACPI tables generated by U-Boot for passing -to the operating systems. +The *acpi* command is used to dump the ACPI tables generated by U-Boot for +passing to the operating systems. It allow allows manually setting the address +to take a look at existing ACPI tables. ACPI tables can be generated by various output functions and even devices can output material to include in the Differentiated System Description Table (DSDT)
@@ -231,5 +233,28 @@ Example 00000000: 44 53 44 54 ea 32 00 00 02 eb 55 2d 42 4f 4f 54 DSDT.2....U-BOOT 00000010: 55 2d 42 4f 4f 54 42 4c 25 07 11 20 49 4e 54 4c U-BOOTBL%.. INTL +This shows searching for tables in a known area of memory, then setting the +pointer:: + + => acpi list + No ACPI tables present + => ms.s bff00000 80000 "RSD PTR" + bff75000: 52 53 44 20 50 54 52 20 cf 42 4f 43 48 53 20 00 RSD PTR .BOCHS . + 1 match + => acpi set bff75000 + Setting ACPI pointer to bff75000 + => acpi list + Name Base Size Detail + ---- -------- ----- ------ + RSDP bff75000 0 v00 BOCHS + RSDT bff76a63 38 v01 BOCHS BXPC 1 BXPC 1 + FACP bff768ff 74 v01 BOCHS BXPC 1 BXPC 1 + DSDT bff75080 187f v01 BOCHS BXPC 1 BXPC 1 + FACS bff75040 40 + APIC bff76973 90 v01 BOCHS BXPC 1 BXPC 1 + HPET bff76a03 38 v01 BOCHS BXPC 1 BXPC 1 + WAET bff76a3b 28 v01 BOCHS BXPC 1 BXPC 1 + SSDT bff95040 c5 v02 COREv4 COREBOOT 2a CORE 20221020 + .. _`ACPI specification`: https://uefi.org/sites/default/files/resources/ACPI_6_3_final_Jan30.pdf
test/dm/acpi.c +38 -0
@@ -611,3 +611,41 @@ static int dm_test_acpi_cmd_items(struct unit_test_state *uts)return 0 ; }DM_TEST (dm_test_acpi_cmd_items,UT_TESTF_SCAN_PDATA |UT_TESTF_SCAN_FDT ); + +/* Test 'acpi set' command */ +static int dm_test_acpi_cmd_set (struct unit_test_state *uts) +{ +struct acpi_ctx ctx; +ulong addr; +void *buf; + +gd_set_acpi_start (0 ); + +console_record_reset (); +ut_asserteq (0 ,gd_acpi_start ()); +ut_assertok (run_command ("acpi set" ,0 )); +ut_assert_nextline ("ACPI pointer: 0" ); + + buf =memalign (16 ,BUF_SIZE ); +ut_assertnonnull (buf); + addr =map_to_sysmem (buf); +ut_assertok (setup_ctx_and_base_tables (uts, &ctx, addr)); + +ut_assertok (acpi_write_dev_tables (&ctx)); + +ut_assertok (run_command ("acpi set" ,0 )); +ut_assert_nextline ("ACPI pointer: %lx" , addr); + +ut_assertok (run_command ("acpi set 0" ,0 )); +ut_assert_nextline ("Setting ACPI pointer to 0" ); +ut_asserteq (0 ,gd_acpi_start ()); + +ut_assertok (run_commandf ("acpi set %lx" , addr)); +ut_assert_nextline ("Setting ACPI pointer to %lx" , addr); +ut_asserteq (addr,gd_acpi_start ()); + +ut_assert_console_end (); + +return 0 ; +} +DM_TEST (dm_test_acpi_cmd_set,UT_TESTF_SCAN_PDATA |UT_TESTF_SCAN_FDT );
Signature · 1 line
2.40.0.634.g4ca3ef3211-goog
PATCH v2 11/42 bdinfo: Show the RAM top and approximate stack pointer
In reply to Simon GlassThese are useful pieces of information when debugging. The RAM top shows where U-Boot started allocating memory from, before it relocated. The stack pointer can be checked to ensure it is in the correct region.
---
(no changes since v1)
cmd/Kconfig | 8 ++++++++ cmd/bdinfo.c | 5 +++++ 2 files changed, 13 insertions(+)
cmd/Kconfig +8 -0
@@ -135,6 +135,14 @@ config CMD_BDI help Print board info +config CMD_BDINFO_EXTRA + bool "bdinfo extra features" + default y if SANDBOX || X86 + help + Show additional information about the board. This uses a little more + code space but provides more options, particularly those useful for + bringup, development and debugging. + config CMD_CONFIG bool "config" default SANDBOX
cmd/bdinfo.c +5 -0
@@ -145,6 +145,11 @@ int do_bdinfo(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])printf ("devicetree = %s\n" ,fdtdec_get_srcname ()); } +if (IS_ENABLED (CONFIG_CMD_BDINFO_EXTRA )) { +bdinfo_print_num_ll ("stack ptr" , (ulong)&bd); +bdinfo_print_num_ll ("ram_top ptr" , (ulong )gd->ram_top); + } +arch_print_bdinfo ();return 0 ;
Signature · 1 line
2.40.0.634.g4ca3ef3211-goog
PATCH v2 12/42 part: Allow setting the partition-table type
In reply to Simon GlassSome devices have multiple partition types available on the same media. It is sometimes useful to see these to check that everything is working correctly.
Provide a way to manually set the partition-table type, avoiding the auto-detection process.
---
(no changes since v1)
cmd/part.c | 34 +++++++++++++++++++ disk/part.c | 16 +++++++++ doc/usage/cmd/part.rst | 74 ++++++++++++++++++++++++++++++++++++++++++ include/part.h | 9 +++++ 4 files changed, 133 insertions(+)
cmd/part.c +34 -0
@@ -182,6 +182,36 @@ static int do_part_number(int argc, char *const argv[])return do_part_info (argc, argv,CMD_PART_INFO_NUMBER ); } +static int do_part_set (int argc,char *const argv[]) +{ +const char *devname, *partstr, *typestr; +struct blk_desc *desc; +int dev; + +if (argc <3 ) +return CMD_RET_USAGE ; + +/* Look up the device */ + devname = argv[0 ]; + partstr = argv[1 ]; + typestr = argv[2 ]; + dev =blk_get_device_by_str (devname, partstr, &desc); +if (dev <0 ) { +printf ("** Bad device specification %s %s **\n" , devname, + partstr); +return CMD_RET_FAILURE ; + } + + desc->part_type =part_get_type_by_name (typestr); +if (!desc->part_type) { +printf ("Unknown partition type '%s'\n" , typestr); +return CMD_RET_FAILURE ; + } +part_print (desc); + +return 0 ; +} +#ifdef CONFIG_PARTITION_TYPE_GUID static int do_part_type (int argc,char *const argv[]) {
@@ -245,6 +275,8 @@ static int do_part(struct cmd_tbl *cmdtp, int flag, int argc,return do_part_number (argc -2 , argv +2 ); else if (!strcmp(argv[1], "types")) return do_part_types(argc - 2, argv + 2); + else if (!strcmp(argv[1], "set")) + return do_part_set(argc - 2, argv + 2);#ifdef CONFIG_PARTITION_TYPE_GUID else if (!strcmp(argv[1], "type")) return do_part_type(argc - 2, argv + 2);
@@ -279,6 +311,8 @@ U_BOOT_CMD(#endif "part type <interface> <dev>:<part> <varname>\n" " - set environment variable to partition type\n" +"part set <interface> <dev> type\n" +" - set partition type for a device\n" "part types\n" " - list supported partition table types" );
disk/part.c +16 -0
@@ -54,6 +54,22 @@ static struct part_driver *part_driver_lookup_type(struct blk_desc *dev_desc)return NULL ; } +int part_get_type_by_name (const char *name) +{ +struct part_driver *drv = + ll_entry_start(struct part_driver, part_driver); + const int n_ents = ll_entry_count(struct part_driver, part_driver); +struct part_driver *entry; + +for (entry = drv; entry != drv + n_ents; entry++) { +if (!strcasecmp (name, entry->name)) +return entry->part_type; + } + +/* Not found */ +return PART_TYPE_UNKNOWN ; +} +static struct blk_desc *get_dev_hwpart (const char *ifname,int dev,int hwpart) {struct blk_desc *dev_desc;
doc/usage/cmd/part.rst +74 -0
92 lines not on this page · raw message
include/part.h +9 -0
@@ -598,6 +598,15 @@ static inline struct part_driver *part_driver_get_first(void) return ll_entry_start(struct part_driver, part_driver); } +/** +* part_get_type_by_name() - Get partition type by name +* +* @name: Name of partition type to look up (not case-sensitive) +* Returns: Corresponding partition type (PART_TYPE_...) or PART_TYPE_UNKNOWN if +* not known +*/ +int part_get_type_by_name (const char *name); +#else static inline int part_driver_get_count (void ) {return 0 ; }
Signature · 1 line
2.40.0.634.g4ca3ef3211-goog
PATCH v2 13/42 qfw: Show the file address if available
In reply to Simon GlassSome files have an associated address. Show this with the 'qfw list' command so that it is possible to dump the data.
---
(no changes since v1)
cmd/qfw.c | 2 +- doc/usage/cmd/qfw.rst | 28 ++++++++++++++++------------ 2 files changed, 17 insertions(+), 13 deletions(-)
cmd/qfw.c +1 -1
@@ -26,7 +26,7 @@ static int qemu_fwcfg_cmd_list_firmware(void)for (file =qfw_file_iter_init (qfw_dev, &iter); !qfw_file_iter_end (&iter); file =qfw_file_iter_next (&iter)) { -printf ("%-56s\n" , file->cfg.name); +printf ("%08lx %-56s\n" , file->addr, file->cfg.name); }return 0 ;
doc/usage/cmd/qfw.rst +16 -12
@@ -11,6 +11,7 @@ Synopsis qfw list qfw cpus qfw load [kernel_addr [initrd_addr]] + qfw list Description -----------
@@ -41,18 +42,21 @@ QEMU firmware files are listed via the *qfw list* command: :: => qfw list - etc/boot-fail-wait - etc/smbios/smbios-tables - etc/smbios/smbios-anchor - etc/e820 - genroms/kvmvapic.bin - genroms/linuxboot.bin - etc/system-states - etc/acpi/tables - etc/table-loader - etc/tpm/log - etc/acpi/rsdp - bootorder + 00000000 bios-geometry + 00000000 bootorder + 000f0060 etc/acpi/rsdp + bed14040 etc/acpi/tables + 00000000 etc/boot-fail-wait + 00000000 etc/e820 + 00000000 etc/smbios/smbios-anchor + 00000000 etc/smbios/smbios-tables + 00000000 etc/system-states + 00000000 etc/table-loader + 00000000 etc/tpm/log + 00000000 genroms/kvmvapic.bin + +Where an address is shown, it indicates where the data is available for +inspection, e.g. using the :doc:`md`. The available CPUs can be shown via the *qfw cpus* command:
Signature · 1 line
2.40.0.634.g4ca3ef3211-goog
PATCH v2 14/42 log: Tidy up an ambiguous comment.
In reply to Simon GlassAdd a a bit more detail so it is clear that multiple devices are supported, but only one per driver.
---
(no changes since v1)
common/log.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
common/log.c +1 -1
@@ -436,7 +436,7 @@ int log_init(void)/* * We cannot add runtime data to the driver since it is likely stored * in rodata. Instead, set up a 'device' corresponding to each driver. -* We only support having a single device. +* We only support having a single device for each driver. */ INIT_LIST_HEAD ((struct list_head *)&gd->log_head);while (drv < end) {
Signature · 1 line
2.40.0.634.g4ca3ef3211-goog
PATCH v2 15/42 video: Allow building video drivers for SPL
In reply to Simon GlassUpdate the Makefile rules to allow video drivers in SPL. This is useful for 64-bit QEMU on x86, since the video BIOS can only be run from 32-bit mode (i.e. in SPL).
---
(no changes since v1)
drivers/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/Makefile +2 -1
@@ -37,6 +37,8 @@ obj-$(CONFIG_$(SPL_)SYSINFO) += sysinfo/ obj-$(CONFIG_$(SPL_TPL_)TPM) += tpm/ obj-$(CONFIG_XEN) += xen/ obj-$(CONFIG_$(SPL_)FPGA) += fpga/ +obj-$(CONFIG_$(SPL_TPL_)VIDEO) += video/ + obj-y += bus/ ifndef CONFIG_TPL_BUILD
@@ -97,7 +99,6 @@ obj-y += rtc/ obj-y += scsi/ obj-y += sound/ obj-y += spmi/ -obj-y += video/ obj-y += watchdog/ obj-$(CONFIG_QE) += qe/ obj-$(CONFIG_U_QE) += qe/
Signature · 1 line
2.40.0.634.g4ca3ef3211-goog
PATCH v2 16/42 qfw: Set the address of the ACPI tables
In reply to Simon GlassOnce the ACPI tables have been set up, record their address so that it is possible to list them with 'acpi list'.
---
(no changes since v1)
drivers/misc/qfw.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/misc/qfw.c +4 -0
@@ -18,6 +18,7 @@#include <dm.h> #include <misc.h> #include <tables_csum.h> +#include <asm/acpi_table.h> #if defined(CONFIG_GENERATE_ACPI_TABLE ) && !defined(CONFIG_SANDBOX )/*
@@ -227,6 +228,9 @@ out: }free (table_loader); + +gd_set_acpi_start (acpi_get_rsdp_addr ()); +return addr; }
Signature · 1 line
2.40.0.634.g4ca3ef3211-goog
PATCH v2 17/42 efi: Show all known UUIDs with CONFIG_CMD_EFIDEBUG
In reply to Simon GlassThe CMD_EFIDEBUG option enables debugging so it is reasonable to assume that all effects should be made to decode the dreaded UUIDs favoured by UEFI.
Update the table to show them all when CONFIG_CMD_EFIDEBUG is enabled.
---
(no changes since v1)
lib/uuid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
lib/uuid.c +1 -1
@@ -255,7 +255,7 @@ static const struct { EFI_CERT_TYPE_PKCS7_GUID, },#endif -#ifdef CONFIG_EFI +#if defined(CONFIG_CMD_EFIDEBUG) || defined(CONFIG_EFI) { "EFI_LZMA_COMPRESSED", EFI_LZMA_COMPRESSED }, { "EFI_DXE_SERVICES", EFI_DXE_SERVICES }, { "EFI_HOB_LIST", EFI_HOB_LIST },
Signature · 1 line
2.40.0.634.g4ca3ef3211-goog
PATCH v2 18/42 x86: Improve the trampoline in 64-bit mode
In reply to Simon GlassAt present this leaves the stack at the pre-relocation value. This is not ideal since we want to have U-Boot running entirely from the top of memory.
In addition, the new global_data pointer is not actually used, since the global_data pointer itself is relocated, then the pre-relocation value is changed, so the effective value (after relocation) does not update.
Adjust the implementation to follow the 32-bit code more closely, with a trampoline function which is passed the new stack and global_data pointer. This ensures that the correct values come through even when relocating.
---
(no changes since v1)
arch/x86/cpu/start64.S | 19 +++++++++++++++++++ arch/x86/include/asm/u-boot-x86.h | 11 +++++++++++ common/board_f.c | 12 +++++++----- 3 files changed, 37 insertions(+), 5 deletions(-)
arch/x86/cpu/start64.S +19 -0
@@ -26,3 +26,22 @@ _start: /* Should not return here */ jmp . + +.globl board_init_f_r_trampoline64 +.type board_init_f_r_trampoline64, @function +board_init_f_r_trampoline64: + /* + * 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 */ + movq %rsi, %rsp + + /* New gd is in rdi */ + + /* Re-enter U-Boot by calling board_init_f_r() */ + call board_init_f_r
arch/x86/include/asm/u-boot-x86.h +11 -0
@@ -117,6 +117,17 @@ void __noreturn board_init_f_r_trampoline(ulong sp);*/ void __noreturn board_init_f_r (void ); +/* +* board_init_f_r_trampoline64() - jump to relocated address with new stack +* +* This is the 64-bit version +* +* @new_gd: New global_data pointer to use +* @sp: New stack pointer to pass on to board_init_r() +*/ +void __noreturn board_init_f_r_trampoline64 (struct global_data *new_gd, +ulong sp); +int arch_misc_init (void );/* Read the time stamp counter */
common/board_f.c +7 -5
@@ -731,8 +731,7 @@ static int fix_fdt(void)#endif /* ARM calls relocate_code from its crt0.S */ -#if !defined(CONFIG_ARM ) && !defined(CONFIG_SANDBOX ) && \ - !CONFIG_IS_ENABLED (X86_64 ) +#if !defined(CONFIG_ARM ) && !defined(CONFIG_SANDBOX )static int jump_to_copy (void ) {
@@ -754,7 +753,11 @@ static int jump_to_copy(void)* (CPU cache) */ arch_setup_gd (gd->new_gd); -board_init_f_r_trampoline (gd->start_addr_sp); +# if CONFIG_IS_ENABLED (X86_64 ) +board_init_f_r_trampoline64 (gd->new_gd, gd->start_addr_sp); +# else +board_init_f_r_trampoline (gd->start_addr_sp); +# endif #else relocate_code (gd->start_addr_sp, gd->new_gd, gd->relocaddr);#endif
@@ -969,8 +972,7 @@ static const init_fnc_t init_sequence_f[] = {* watchdog device is not serviced is as small as possible. */ cyclic_unregister_all, -#if !defined(CONFIG_ARM) && !defined(CONFIG_SANDBOX) && \ - !CONFIG_IS_ENABLED(X86_64) +#if !defined(CONFIG_ARM) && !defined(CONFIG_SANDBOX) jump_to_copy, #endif NULL,
Signature · 1 line
2.40.0.634.g4ca3ef3211-goog
PATCH v2 19/42 Show the malloc base with the bdinfo command
In reply to Simon GlassIt is useful to see the base of the malloc region. This is visible when debugging but not in normal usage.
Add it to the global data so that it can be shown.
---
(no changes since v1)
cmd/bdinfo.c | 1 + common/board_r.c | 7 ++++--- include/asm-generic/global_data.h | 11 +++++++++++ 3 files changed, 16 insertions(+), 3 deletions(-)
cmd/bdinfo.c +1 -0
@@ -148,6 +148,7 @@ int do_bdinfo(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])if (IS_ENABLED (CONFIG_CMD_BDINFO_EXTRA )) {bdinfo_print_num_ll ("stack ptr" , (ulong)&bd);bdinfo_print_num_ll ("ram_top ptr" , (ulong )gd->ram_top); +bdinfo_print_num_l ("malloc base" ,gd_malloc_start ()); }arch_print_bdinfo ();
common/board_r.c +4 -3
@@ -196,7 +196,7 @@ static int initr_barrier(void)static int initr_malloc (void ) { -ulong malloc_start; +ulong start;#if CONFIG_VAL (SYS_MALLOC_F_LEN ) debug("Pre-reloc malloc() used %#lx bytes (%ld KB)\n", gd->malloc_ptr,
@@ -207,8 +207,9 @@ static int initr_malloc(void)* This value MUST match the value of gd->start_addr_sp in board_f.c: * reserve_noncached(). */ - malloc_start = gd->relocaddr -TOTAL_MALLOC_LEN ; -mem_malloc_init ((ulong )map_sysmem (malloc_start,TOTAL_MALLOC_LEN ), + start = gd->relocaddr -TOTAL_MALLOC_LEN ; +gd_set_malloc_start (start); +mem_malloc_init ((ulong )map_sysmem (start,TOTAL_MALLOC_LEN ),TOTAL_MALLOC_LEN );return 0 ; }
include/asm-generic/global_data.h +11 -0
@@ -301,6 +301,10 @@ struct global_data {* @timebase_l: low 32 bits of timer */ unsigned int timebase_l; +/** +* @malloc_start: start of malloc() region +*/ + CONFIG_IS_ENABLED(CMD_BDINFO_EXTRA, (ulong malloc_start;))#if CONFIG_VAL (SYS_MALLOC_F_LEN )/** * @malloc_base: base address of early malloc()
@@ -560,6 +564,13 @@ static_assert(sizeof(struct global_data) == GD_SIZE);#define gd_event_state () NULL#endif +#if CONFIG_IS_ENABLED (CMD_BDINFO_EXTRA ) +#define gd_malloc_start () gd->malloc_start +#define gd_set_malloc_start (_val) gd->malloc_start = (_val) +#else +#define gd_malloc_start () 0 +#define gd_set_malloc_start (val) +#endif /** * enum gd_flags - global data flags *
Signature · 1 line
2.40.0.634.g4ca3ef3211-goog
PATCH v2 20/42 nvme: Provide more useful debugging messages
In reply to Simon GlassWhen scanning fails it is useful to be able to decode what went wrong. Add some debugging for this.
---
(no changes since v1)
drivers/nvme/nvme.c | 36 ++++++++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 10 deletions(-)
drivers/nvme/nvme.c +26 -10
@@ -578,17 +578,22 @@ static int nvme_set_queue_count(struct nvme_dev *dev, int count)return min (result &0xffff , result >>16 ) +1 ; } -static void nvme_create_io_queues (struct nvme_dev *dev) +static int nvme_create_io_queues (struct nvme_dev *dev) {unsigned int i; +int ret;for (i = dev->queue_count; i <= dev->max_qid; i++)if (!nvme_alloc_queue (dev, i, dev->q_depth)) -break ; +return log_msg_ret ("all" , -ENOMEM ); -for (i = dev->online_queues; i <= dev->queue_count -1 ; i++) -if (nvme_create_queue (dev->queues[i], i)) -break ; +for (i = dev->online_queues; i <= dev->queue_count -1 ; i++) { + ret =nvme_create_queue (dev->queues[i], i); +if (ret) +return log_msg_ret ("cre" , ret); + } + +return 0 ; }static int nvme_setup_io_queues (struct nvme_dev *dev)
@@ -598,14 +603,18 @@ static int nvme_setup_io_queues(struct nvme_dev *dev) nr_io_queues =1 ; result =nvme_set_queue_count (dev, nr_io_queues); -if (result <=0 ) +if (result <=0 ) { +log_debug ("Cannot set queue count (err=%dE)\n" , result);return result; + } dev->max_qid = nr_io_queues;/* Free previously allocated queues */ nvme_free_queues (dev, nr_io_queues +1 ); -nvme_create_io_queues (dev); + result =nvme_create_io_queues (dev); +if (result) +return result;return 0 ; }
@@ -683,8 +692,11 @@ int nvme_scan_namespace(void) uclass_foreach_dev(dev, uc) { ret =device_probe (dev); -if (ret) +if (ret) { +log_err ("Failed to probe '%s': err=%dE\n" , dev->name, + ret);return ret; + } }return 0 ;
@@ -842,8 +854,10 @@ int nvme_init(struct udevice *udev) ndev->dbs = ((void __iomem *)ndev->bar) +4096 ; ret =nvme_configure_admin_queue (ndev); -if (ret) +if (ret) { +log_debug ("Unable to configure admin queue (err=%dE)\n" , ret); goto free_queue; + }/* Allocate after the page size is known */ ndev->prp_pool =memalign (ndev->page_size,MAX_PRP_POOL );
@@ -855,8 +869,10 @@ int nvme_init(struct udevice *udev) ndev->prp_entry_num =MAX_PRP_POOL >>3 ; ret =nvme_setup_io_queues (ndev); -if (ret) +if (ret) { +log_debug ("Unable to setup I/O queues(err=%dE)\n" , ret); goto free_queue; + }nvme_get_info_from_identify (ndev);
Signature · 1 line
2.40.0.634.g4ca3ef3211-goog
PATCH v2 21/42 pci: Support autoconfig in SPL
In reply to Simon GlassAllow PCI autoconfig to be handled in SPL, so that we can set it up correctly for boards which need to do this before U-Boot proper. This includes qemu-x64_64 which needs to set up the video device while in 32-bit mode.
---
(no changes since v1)
drivers/pci/Kconfig | 8 ++++++++ drivers/pci/pci-uclass.c | 10 +++++++++- 2 files changed, 17 insertions(+), 1 deletion(-)
drivers/pci/Kconfig +8 -0
@@ -40,6 +40,14 @@ config PCI_PNP help Enable PCI memory and I/O space resource allocation and assignment. +config SPL_PCI_PNP + bool "Enable Plug & Play support for PCI" + help + Enable PCI memory and I/O space resource allocation and assignment. + This is normally not done in SPL, but can be enabled if devices must + be set up in the SPL phase. Often it is enough to manually configure + one device, so this option can be disabled. + config PCI_REGION_MULTI_ENTRY bool "Enable Multiple entries of region type MEMORY in ranges for PCI" help
drivers/pci/pci-uclass.c +9 -1
@@ -13,6 +13,7 @@#include <log.h> #include <malloc.h> #include <pci.h> +#include <spl.h> #include <asm/global_data.h> #include <asm/io.h> #include <dm/device-internal.h>
@@ -722,6 +723,9 @@ static bool pci_need_device_pre_reloc(struct udevice *bus, uint vendor,u32 vendev;int index; +if (spl_phase () ==PHASE_SPL &&CONFIG_IS_ENABLED (PCI_PNP )) +return true; + for (index = 0; !dev_read_u32_index(bus, "u-boot,pci-pre-reloc", index, &vendev);
@@ -793,7 +797,9 @@ static int pci_find_and_bind_driver(struct udevice *parent,* space is pretty limited (ie: using Cache As RAM). */ if (!(gd->flags &GD_FLG_RELOC ) && - !(drv->flags &DM_FLAG_PRE_RELOC )) + !(drv->flags &DM_FLAG_PRE_RELOC ) && + (!CONFIG_IS_ENABLED (PCI_PNP ) || +spl_phase () !=PHASE_SPL ))return log_msg_ret ("pre" , -EPERM );/*
@@ -918,6 +924,8 @@ int pci_bind_bus_devices(struct udevice *bus) } ret =pci_find_and_bind_driver (bus, &find_id, bdf, &dev); + }else { +debug ("device: %s\n" , dev->name); }if (ret == -EPERM )continue ;
Signature · 1 line
2.40.0.634.g4ca3ef3211-goog
PATCH v2 22/42 pci: Allow the video BIOS to work in SPL with QEMU
In reply to Simon GlassQEMU emulates two common machines (Q35 and i440fx) which use mapping to determine whether RAM is present below 1MB. In order to copy the video BIOS to c0000 we need to flip this mapping over to RAM. This does not happen automatically until SPL has finished running.
Switch in RAM at these address so that the video BIOS can be loaded and run. This fix was found in the seabios code base.
---
(no changes since v1)
drivers/pci/pci_rom.c | 46 +++++++++++++++++++++++++++++++++++++++++++ include/pci_ids.h | 1 + 2 files changed, 47 insertions(+)
drivers/pci/pci_rom.c +46 -0
@@ -141,6 +141,49 @@ static int pci_rom_probe(struct udevice *dev, struct pci_rom_header **hdrp)return 0 ; } +#define Q35_HOST_BRIDGE_PAM0 0x90 +#define I440FX_PAM0 0x59 + +/** +* intel_set_writable_ram() - Set RAM to be writable +* +* This is needed for QEMU when using Q35 or I440FX emulation, since otherwise +* there is no RAM available at c0000 +* +* See Intel 82945G/82945G/82945GC GMCH and 82945P/82945PL MCH Datasheet for +* information about the PAM0-PAM6 registers +*/ +static void intel_set_writable_ram (void ) +{ +struct udevice *dev; +int pam0 =-1 ; +int i; + +for (pci_find_first_device (&dev); dev;pci_find_next_device (&dev)) { +const struct pci_child_plat *pdata =dev_get_parent_plat (dev); + +if (pdata->vendor ==PCI_VENDOR_ID_INTEL ) { +if (pdata->device ==PCI_DEVICE_ID_INTEL_Q35_MCH ) { + pam0 =Q35_HOST_BRIDGE_PAM0 ; +break ; + }else if (pdata->device ==PCI_DEVICE_ID_INTEL_82441 ) { + pam0 =I440FX_PAM0 ; +break ; + } + } + } + +if (!dev) +return ; + +// Adjust RAM to be writable from c0000 to f0000 +for (i =1 ; i <=6 ; i++) +dm_pci_write_config8 (dev, pam0 + i,0x33 ); + +// Also f0000-100000 +dm_pci_write_config8 (dev, pam0,0x30 ); +} +/** * pci_rom_load() - Load a ROM image and return a pointer to it *
@@ -185,6 +228,9 @@ static int pci_rom_load(struct pci_rom_header *rom_header,return -ENOMEM ; *allocedp = true;#endif +/* QEMU hacks */ +intel_set_writable_ram (); +if (target != rom_header) {ulong start =get_timer (0 );
include/pci_ids.h +1 -0
@@ -2870,6 +2870,7 @@#define PCI_DEVICE_ID_INTEL_ICH9_7 0x2916#define PCI_DEVICE_ID_INTEL_ICH9_8 0x2918#define PCI_DEVICE_ID_INTEL_ICH9_AHCI 0x2922 +#define PCI_DEVICE_ID_INTEL_Q35_MCH 0x29c0#define PCI_DEVICE_ID_INTEL_I7_MCR 0x2c18#define PCI_DEVICE_ID_INTEL_I7_MC_TAD 0x2c19#define PCI_DEVICE_ID_INTEL_I7_MC_RAS 0x2c1a
Signature · 1 line
2.40.0.634.g4ca3ef3211-goog
PATCH v2 23/42 pci: Tidy up logging and reporting for video BIOS
In reply to Simon GlassWhen running the ROM the code is not very helpful when something goes wrong. Add a little more debugging and some logging of return values to improve this.
---
(no changes since v1)
drivers/pci/pci_rom.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
drivers/pci/pci_rom.c +9 -3
@@ -300,14 +300,16 @@ int dm_pci_run_vga_bios(struct udevice *dev, int (*int15_handler)(void), ret =pci_rom_probe (dev, &rom);if (ret) -return ret; +return log_msg_ret ("pro" , ret); ret =pci_rom_load (rom, &ram, &alloced); -if (ret) +if (ret) { + ret =log_msg_ret ("ld" , ret); goto err; + }if (!board_should_run_oprom (dev)) { - ret = -ENXIO ; + ret =log_msg_ret ("run" , -ENXIO ); goto err; }
@@ -345,21 +347,25 @@ int dm_pci_run_vga_bios(struct udevice *dev, int (*int15_handler)(void),#ifdef CONFIG_BIOSEMU BE_VGAInfo *info; +log_debug ("Running video BIOS with emulator..." ); ret =biosemu_setup (dev, &info);if (ret) goto err;biosemu_set_interrupt_handler (0x15 , int15_handler); ret =biosemu_run (dev, (uchar *)ram,1 <<16 , info, true, vesa_mode, &mode_info); +log_debug ("done\n" );if (ret) goto err;#endif }else {#if defined(CONFIG_X86 ) && (CONFIG_IS_ENABLED (X86_32BIT_INIT ) ||CONFIG_TPL ) +log_debug ("Running video BIOS..." );bios_set_interrupt_handler (0x15 , int15_handler);bios_run_on_x86 (dev, (unsigned long )ram, vesa_mode, &mode_info); +log_debug ("done\n" );#endif }debug ("Final vesa mode %#x\n" , mode_info.video_mode);
Signature · 1 line
2.40.0.634.g4ca3ef3211-goog
PATCH v2 24/42 x86: Allow video-BIOS code to be built for SPL
In reply to Simon GlassWith qemu-x86_64 we need to run the video BIOS while in 32-bit mode, i.e. SPL. Add a Kconfig option for this, adjust the Makefile rules and use CONFIG_IS_ENABLED() where needed.
---
(no changes since v1)
arch/x86/lib/Makefile | 7 ++++--- arch/x86/lib/bios.c | 2 +- drivers/pci/pci_rom.c | 28 ++++++++++++++-------------- 3 files changed, 19 insertions(+), 18 deletions(-)
arch/x86/lib/Makefile +4 -3
@@ -4,16 +4,17 @@ # Wolfgang Denk, DENX Software Engineering, [email protected]. obj-y += bdinfo.o -ifndef CONFIG_X86_64 -ifndef CONFIG_TPL_BUILD + +ifndef CONFIG_$(SPL_TPL_)X86_64 obj-y += bios.o obj-y += bios_asm.o obj-y += bios_interrupts.o endif -endif + ifndef CONFIG_SPL_BUILD obj-$(CONFIG_X86_32BIT_INIT) += string.o endif + ifndef CONFIG_SPL_BUILD obj-$(CONFIG_CMD_BOOTM) += bootm.o endif
arch/x86/lib/bios.c +1 -1
@@ -23,7 +23,7 @@static int (*int_handler[256 ])(void );/* to have a common register file for interrupt handlers */ -#ifndef CONFIG_BIOSEMU +#if !CONFIG_IS_ENABLED (BIOSEMU )X86EMU_sysEnv _X86EMU_env;#endif
drivers/pci/pci_rom.c +14 -14
@@ -344,20 +344,20 @@ int dm_pci_run_vga_bios(struct udevice *dev, int (*int15_handler)(void), }if (emulate) { -#ifdef CONFIG_BIOSEMU -BE_VGAInfo *info; - -log_debug ("Running video BIOS with emulator..." ); - ret =biosemu_setup (dev, &info); -if (ret) - goto err; -biosemu_set_interrupt_handler (0x15 , int15_handler); - ret =biosemu_run (dev, (uchar *)ram,1 <<16 , info, - true, vesa_mode, &mode_info); -log_debug ("done\n" ); -if (ret) - goto err; -#endif +if (CONFIG_IS_ENABLED (BIOSEMU )) { +BE_VGAInfo *info; + +log_debug ("Running video BIOS with emulator..." ); + ret =biosemu_setup (dev, &info); +if (ret) + goto err; +biosemu_set_interrupt_handler (0x15 , int15_handler); + ret =biosemu_run (dev, (uchar *)ram,1 <<16 , info, + true, vesa_mode, &mode_info); +log_debug ("done\n" ); +if (ret) + goto err; + } }else {#if defined(CONFIG_X86 ) && (CONFIG_IS_ENABLED (X86_32BIT_INIT ) ||CONFIG_TPL )log_debug ("Running video BIOS..." );
Signature · 1 line
2.40.0.634.g4ca3ef3211-goog
PATCH v2 25/42 x86: Pass video settings from SPL to U-Boot proper
In reply to Simon GlassWhen video is set up in SPL, U-Boot proper needs to use the correct parameters so it can write to the display.
Put these in a bloblist so they are available to U-Boot proper.
---
(no changes since v1)
drivers/pci/pci_rom.c | 78 +++++++++++++++++++++++++++++++------------ include/bloblist.h | 1 + include/video.h | 24 +++++++++++++ 3 files changed, 82 insertions(+), 21 deletions(-)
drivers/pci/pci_rom.c +57 -21
@@ -26,6 +26,7 @@#include <common.h> #include <bios_emul.h> +#include <bloblist.h> #include <bootstage.h> #include <dm.h> #include <errno.h>
@@ -34,6 +35,7 @@#include <malloc.h> #include <pci.h> #include <pci_rom.h> +#include <spl.h> #include <vesa.h> #include <video.h> #include <acpi/acpi_s3.h>
@@ -420,34 +422,68 @@ int vesa_setup_video(struct udevice *dev, int (*int15_handler)(void))printf ("Not available (previous bootloader prevents it)\n" );return -EPERM ; } -bootstage_start (BOOTSTAGE_ID_ACCUM_LCD ,"vesa display" ); - ret =dm_pci_run_vga_bios (dev, int15_handler,PCI_ROM_USE_NATIVE | -PCI_ROM_ALLOW_FALLBACK ); -bootstage_accum (BOOTSTAGE_ID_ACCUM_LCD ); -if (ret) { -debug ("failed to run video BIOS: %d\n" , ret); -return ret; - } - ret =vesa_setup_video_priv (&mode_info.vesa, - mode_info.vesa.phys_base_ptr, uc_priv, - plat); -if (ret) { -if (ret == -ENFILE ) { -/* -* See video-uclass.c for how to set up reserved memory -* in your video driver -*/ -log_err ("CONFIG_VIDEO_COPY enabled but driver '%s' set up no reserved memory\n" , - dev->driver->name); +/* In U-Boot proper, collect the information added by SPL (see below) */ +if (IS_ENABLED (CONFIG_SPL_VIDEO ) &&spl_phase () >PHASE_SPL && +CONFIG_IS_ENABLED (BLOBLIST )) { +struct video_handoff *ho; + + ho =bloblist_find (BLOBLISTT_U_BOOT_VIDEO ,sizeof (*ho)); +if (!ho) +return log_msg_ret ("blf" , -ENOENT ); + plat->base = ho->fb; + plat->size = ho->size; + uc_priv->xsize = ho->xsize; + uc_priv->ysize = ho->ysize; + uc_priv->line_length = ho->line_length; + uc_priv->bpix = ho->bpix; + }else { +bootstage_start (BOOTSTAGE_ID_ACCUM_LCD ,"vesa display" ); + ret =dm_pci_run_vga_bios (dev, int15_handler, +PCI_ROM_USE_NATIVE | +PCI_ROM_ALLOW_FALLBACK ); +bootstage_accum (BOOTSTAGE_ID_ACCUM_LCD ); +if (ret) { +debug ("failed to run video BIOS: %d\n" , ret); +return ret; } -debug ("No video mode configured\n" ); -return ret; + ret =vesa_setup_video_priv (&mode_info.vesa, + mode_info.vesa.phys_base_ptr, + uc_priv, plat); +if (ret) { +if (ret == -ENFILE ) { +/* +* See video-uclass.c for how to set up reserved +* memory in your video driver +*/ +log_err ("CONFIG_VIDEO_COPY enabled but driver '%s' set up no reserved memory\n" , + dev->driver->name); + } + +debug ("No video mode configured\n" ); +return ret; + } }printf ("Video: %dx%dx%d\n" , uc_priv->xsize, uc_priv->ysize, mode_info.vesa.bits_per_pixel); +/* In SPL, store the information for use by U-Boot proper */ +if (spl_phase () ==PHASE_SPL &&CONFIG_IS_ENABLED (BLOBLIST )) { +struct video_handoff *ho; + + ho =bloblist_add (BLOBLISTT_U_BOOT_VIDEO ,sizeof (*ho),0 ); +if (!ho) +return log_msg_ret ("blc" , -ENOMEM ); + + ho->fb = plat->base; + ho->size = plat->size; + ho->xsize = uc_priv->xsize; + ho->ysize = uc_priv->ysize; + ho->line_length = uc_priv->line_length; + ho->bpix = uc_priv->bpix; + } +return 0 ; }
include/bloblist.h +1 -0
@@ -113,6 +113,7 @@ enum bloblist_tag_t {BLOBLISTT_PROJECT_AREA =0x8000 ,BLOBLISTT_U_BOOT_SPL_HANDOFF =0x8000 ,/* Hand-off info from SPL */ BLOBLISTT_VBE =0x8001 ,/* VBE per-phase state */ +BLOBLISTT_U_BOOT_VIDEO =0x8002 ,/* Video information from SPL */ /* * Vendor-specific tags are permitted here. Projects can be open source
include/video.h +24 -0
@@ -133,6 +133,30 @@ struct video_ops {#define video_get_ops (dev) ((struct video_ops *)(dev)->driver->ops) +/** +* struct video_handoff - video information passed from SPL +* +* This is used when video is set up by SPL, to provide the details to U-Boot +* proper. +* +* @fb: Base address of frame buffer, 0 if not yet known +* @size: Frame-buffer size, in bytes +* @xsize: Number of pixel columns (e.g. 1366) +* @ysize: Number of pixels rows (e.g.. 768) +* @line_length: Length of each frame buffer line, in bytes. This can be +* set by the driver, but if not, the uclass will set it after +* probing +* @bpix: Encoded bits per pixel (enum video_log2_bpp) +*/ +struct video_handoff { +u64 fb; +u32 size; +ushort xsize; +ushort ysize; +u32 line_length; +u8 bpix; +}; +/** enum colour_idx - the 16 colors supported by consoles */ enum colour_idx {VID_BLACK =0 ,
Signature · 1 line
2.40.0.634.g4ca3ef3211-goog
Re: [EXTERNAL] [PATCH v2 25/42] x86: Pass video settings from SPL to U-Boot proper
Hi Simon,
Quoted 130 lines · Simon Glass
When video is set up in SPL, U-Boot proper needs to use the correct parameters so it can write to the display.
Put these in a bloblist so they are available to U-Boot proper.
Signed-off-by Simon Glass <[email protected]>---
(no changes since v1)
drivers/pci/pci_rom.c | 78 +++++++++++++++++++++++++++++++------------ include/bloblist.h | 1 + include/video.h | 24 +++++++++++++ 3 files changed, 82 insertions(+), 21 deletions(-)drivers/pci/pci_rom.c +57
-21@@ -26,6 +26,7 @@#include <common.h> #include <bios_emul.h> +#include <bloblist.h> #include <bootstage.h> #include <dm.h> #include <errno.h> @@ -34,6 +35,7 @@#include <malloc.h> #include <pci.h> #include <pci_rom.h> +#include <spl.h> #include <vesa.h> #include <video.h> #include <acpi/acpi_s3.h> @@ -420,34 +422,68 @@ int vesa_setup_video(struct udevice *dev, int (*int15_handler)(void))printf ("Not available (previous bootloader prevents it)\n" );return -EPERM ; } -bootstage_start (BOOTSTAGE_ID_ACCUM_LCD ,"vesa display" ); - ret =dm_pci_run_vga_bios (dev, int15_handler,PCI_ROM_USE_NATIVE | -PCI_ROM_ALLOW_FALLBACK ); -bootstage_accum (BOOTSTAGE_ID_ACCUM_LCD ); -if (ret) { -debug ("failed to run video BIOS: %d\n" , ret); -return ret; - } - ret =vesa_setup_video_priv (&mode_info.vesa, - mode_info.vesa.phys_base_ptr, uc_priv, - plat); -if (ret) { -if (ret == -ENFILE ) { -/* -* See video-uclass.c for how to set up reserved memory -* in your video driver -*/ -log_err ("CONFIG_VIDEO_COPY enabled but driver '%s' set up no reserved memory\n" , - dev->driver->name); +/* In U-Boot proper, collect the information added by SPL (see below) */ +if (IS_ENABLED (CONFIG_SPL_VIDEO ) &&spl_phase () >PHASE_SPL && +CONFIG_IS_ENABLED (BLOBLIST )) { +struct video_handoff *ho; + + ho =bloblist_find (BLOBLISTT_U_BOOT_VIDEO ,sizeof (*ho)); +if (!ho) +return log_msg_ret ("blf" , -ENOENT ); + plat->base = ho->fb; + plat->size = ho->size; + uc_priv->xsize = ho->xsize; + uc_priv->ysize = ho->ysize; + uc_priv->line_length = ho->line_length; + uc_priv->bpix = ho->bpix; + }else { +bootstage_start (BOOTSTAGE_ID_ACCUM_LCD ,"vesa display" ); + ret =dm_pci_run_vga_bios (dev, int15_handler, +PCI_ROM_USE_NATIVE | +PCI_ROM_ALLOW_FALLBACK ); +bootstage_accum (BOOTSTAGE_ID_ACCUM_LCD ); +if (ret) { +debug ("failed to run video BIOS: %d\n" , ret); +return ret; } -debug ("No video mode configured\n" ); -return ret; + ret =vesa_setup_video_priv (&mode_info.vesa, + mode_info.vesa.phys_base_ptr, + uc_priv, plat); +if (ret) { +if (ret == -ENFILE ) { +/* +* See video-uclass.c for how to set up reserved +* memory in your video driver +*/ +log_err ("CONFIG_VIDEO_COPY enabled but driver '%s' set up no reserved memory\n" , + dev->driver->name); + } + +debug ("No video mode configured\n" ); +return ret; + } }printf ("Video: %dx%dx%d\n" , uc_priv->xsize, uc_priv->ysize, mode_info.vesa.bits_per_pixel); +/* In SPL, store the information for use by U-Boot proper */ +if (spl_phase () ==PHASE_SPL &&CONFIG_IS_ENABLED (BLOBLIST )) { +struct video_handoff *ho; + + ho =bloblist_add (BLOBLISTT_U_BOOT_VIDEO ,sizeof (*ho),0 ); +if (!ho) +return log_msg_ret ("blc" , -ENOMEM ); + + ho->fb = plat->base; + ho->size = plat->size; + ho->xsize = uc_priv->xsize; + ho->ysize = uc_priv->ysize; + ho->line_length = uc_priv->line_length; + ho->bpix = uc_priv->bpix; + } +return 0 ; }include/bloblist.h +0
-0
include/bloblist.h enum bloblist_tag_t { · line 117
Quoted 5 lines
include/bloblist.h +1
-0@@ -113,6 +113,7 @@ enum bloblist_tag_t {BLOBLISTT_PROJECT_AREA =0x8000 ,BLOBLISTT_U_BOOT_SPL_HANDOFF =0x8000 ,/* Hand-off info from SPL */ BLOBLISTT_VBE =0x8001 ,/* VBE per-phase state */ + BLOBLISTT_U_BOOT_VIDEO = 0x8002, /* Video information from SPL */
Add a tag name for U_BOOT_VIDEO blob.
Quoted 27 lines
include/bloblist.h +0
-0/* * Vendor-specific tags are permitted here. Projects can be open source include/video.h +17
-0@@ -133,6 +133,30 @@ struct video_ops {#define video_get_ops (dev) ((struct video_ops *)(dev)->driver->ops) +/** +* struct video_handoff - video information passed from SPL +* +* This is used when video is set up by SPL, to provide the details to U-Boot +* proper. +* +* @fb: Base address of frame buffer, 0 if not yet known +* @size: Frame-buffer size, in bytes +* @xsize: Number of pixel columns (e.g. 1366) +* @ysize: Number of pixels rows (e.g.. 768) +* @line_length: Length of each frame buffer line, in bytes. This can be +* set by the driver, but if not, the uclass will set it after +* probing +* @bpix: Encoded bits per pixel (enum video_log2_bpp) +*/ +struct video_handoff { +u64 fb;
include/video.h struct video_ops { · line 162
Quoted 10 lines
include/video.h +7
-0+u32 size; +ushort xsize; +ushort ysize; +u32 line_length; +u8 bpix; +}; +/** enum colour_idx - the 16 colors supported by consoles */ enum colour_idx {VID_BLACK =0 ,
Thanks,
Nikhil
PATCH v2 26/42 x86: Init video in SPL if enabled
In reply to Simon GlassWhen video is required in SPL, set this up ready for use. Ignore any problems since it may be that video is not actually available and we still want to continue on to U-Boot proper in that case.
Make sure that the SPL banner is only shown once.
---
(no changes since v1)
arch/x86/lib/spl.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
arch/x86/lib/spl.c +11 -1
@@ -15,6 +15,7 @@#include <malloc.h> #include <spl.h> #include <syscon.h> +#include <vesa.h> #include <asm/cpu.h> #include <asm/cpu_common.h> #include <asm/fsp2/fsp_api.h>
@@ -97,7 +98,8 @@ static int x86_spl_init(void)return ret; }#endif -preloader_console_init (); +if (!IS_ENABLED (CONFIG_SPL_BOARD_INIT )) +preloader_console_init ();#if !defined(CONFIG_TPL ) && !CONFIG_IS_ENABLED (CPU ) ret =print_cpuinfo ();if (ret) {
@@ -257,4 +259,12 @@ void spl_board_init(void)#ifndef CONFIG_TPL preloader_console_init ();#endif + +if (CONFIG_IS_ENABLED (VIDEO )) { +struct udevice *dev; + +/* Set up PCI video in SPL if required */ +uclass_first_device_err (UCLASS_PCI , &dev); +uclass_first_device_err (UCLASS_VIDEO , &dev); + } }
Signature · 1 line
2.40.0.634.g4ca3ef3211-goog
PATCH v2 27/42 pci: Adjust video BIOS debugging to be SPL-friendly
In reply to Simon GlassA hex value is expected for the VGA mode. Drop the 0x prefix, which is not supported in SPL.
---
(no changes since v1)
drivers/pci/pci_rom.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/pci/pci_rom.c +2 -2
@@ -319,7 +319,7 @@ int dm_pci_run_vga_bios(struct udevice *dev, int (*int15_handler)(void),defined (CONFIG_FRAMEBUFFER_VESA_MODE) vesa_mode =CONFIG_FRAMEBUFFER_VESA_MODE ;#endif -debug ("Selected vesa mode %#x\n" , vesa_mode); +debug ("Selected vesa mode %x\n" , vesa_mode);if (exec_method &PCI_ROM_USE_NATIVE ) {#ifdef CONFIG_X86
@@ -370,7 +370,7 @@ int dm_pci_run_vga_bios(struct udevice *dev, int (*int15_handler)(void),log_debug ("done\n" );#endif } -debug ("Final vesa mode %#x\n" , mode_info.video_mode); +debug ("Final vesa mode %x\n" , mode_info.video_mode); ret =0 ; err:
Signature · 1 line
2.40.0.634.g4ca3ef3211-goog
PATCH v2 28/42 pci: Mask the ROM address in case it is already enabled
In reply to Simon GlassIn some cases the video ROM may have been enabled previously, such as by a previous firmware stage. Use the correct address in that case.
---
(no changes since v1)
drivers/pci/pci_rom.c | 1 + 1 file changed, 1 insertion(+)
drivers/pci/pci_rom.c +1 -0
@@ -93,6 +93,7 @@ static int pci_rom_probe(struct udevice *dev, struct pci_rom_header **hdrp)debug ("%s: rom_address=%x\n" , __func__, rom_address);return -ENOENT ; } + rom_address &=PCI_ROM_ADDRESS_MASK ;/* Enable expansion ROM address decoding. */ dm_pci_write_config32(dev, PCI_ROM_ADDRESS,
Signature · 1 line
2.40.0.634.g4ca3ef3211-goog
PATCH v2 29/42 x86: Enable display for QEMU 64-bit
In reply to Simon GlassEnable the various options needed for display to work on the qemu-x86_64 board. This includes expanding the available malloc() memory in SPL, since the PCI bus must be enumerated in order to find the video device.
It also includes enabling a bloblist, so that the video parameters can be passed. This is placed at address 10000 but is not needed after U-Boot proper reads the information there.
---
(no changes since v1)
configs/qemu-x86_64_defconfig | 6 ++++++ 1 file changed, 6 insertions(+)
configs/qemu-x86_64_defconfig +6 -0
@@ -7,6 +7,7 @@ CONFIG_MAX_CPUS=2 CONFIG_SPL_DM_SPI=y CONFIG_DEFAULT_DEVICE_TREE="qemu-x86_i440fx" CONFIG_SPL_TEXT_BASE=0xfffd0000 +CONFIG_SPL_SYS_MALLOC_F_LEN=0x2000 CONFIG_DEBUG_UART_BASE=0x3f8 CONFIG_DEBUG_UART_CLOCK=1843200 CONFIG_X86_RUN_64BIT=y
@@ -29,7 +30,10 @@ CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_LAST_STAGE_INIT=y CONFIG_PCI_INIT_R=y +CONFIG_BLOBLIST=y +CONFIG_BLOBLIST_ADDR=0x10000 CONFIG_SPL_NO_BSS_LIMIT=y +CONFIG_SPL_BOARD_INIT=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_CPU=y CONFIG_SPL_ENV_SUPPORT=y
@@ -69,10 +73,12 @@ CONFIG_LBA48=y CONFIG_SYS_64BIT_LBA=y CONFIG_CPU=y CONFIG_NVME_PCI=y +CONFIG_SPL_PCI_PNP=y CONFIG_SPL_DM_RTC=y CONFIG_SYS_NS16550_PORT_MAPPED=y CONFIG_SPI=y CONFIG_USB_KEYBOARD=y +CONFIG_SPL_VIDEO=y CONFIG_FRAMEBUFFER_SET_VESA_MODE=y CONFIG_FRAMEBUFFER_VESA_MODE_USER=y CONFIG_FRAMEBUFFER_VESA_MODE=0x144
Signature · 1 line
2.40.0.634.g4ca3ef3211-goog
PATCH v2 30/42 x86: Allow logging to be used in SPL reliably
In reply to Simon GlassWhen global_data is relocated, log_head moves in memory, meaning that the items in that list point to the wrong place.
Disable logging when making the change, then reenable it afterwards, so that logging works normally.
---
(no changes since v1)
arch/x86/lib/spl.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
arch/x86/lib/spl.c +13 -0
@@ -139,9 +139,22 @@ static int x86_spl_init(void)*/ gd->new_gd = (struct global_data *)ptr;memcpy (gd->new_gd, gd,sizeof (*gd)); + +/* +* Make sure logging is disabled when we switch, since the log system +* list head will move +*/ + gd->new_gd->flags &= ~GD_FLG_LOG_READY ;arch_setup_gd (gd->new_gd); gd->start_addr_sp = (ulong )ptr; +/* start up logging again, with the new list-head location */ + ret =log_init (); +if (ret) { +log_debug ("Log setup failed (err=%d)\n" , ret); +return ret; + } +if (_LOG_DEBUG) { ret =mtrr_list (mtrr_get_var_count (),MP_SELECT_BSP );if (ret)
Signature · 1 line
2.40.0.634.g4ca3ef3211-goog
PATCH v2 31/42 fs: fat: Shrink the size of a few strings
In reply to Simon GlassTo save a few bytes, replace Error with ** and try to use the same string for multiple messages where possible.
---
Changes in v2:
- Drop ** in strings and use log_err() for messages
fs/fat/fat.c | 20 +++++++++++--------- fs/fat/fat_write.c | 14 ++++---------- 2 files changed, 15 insertions(+), 19 deletions(-)
fs/fat/fat.c +11 -9
@@ -8,6 +8,8 @@* 2003-03-10 - [email protected] - ported to uboot */ +#define LOG_CATEGORY LOGC_FS +#include <common.h> #include <blk.h> #include <config.h>
@@ -97,8 +99,8 @@ int fat_register_device(struct blk_desc *dev_desc, int part_no)/* Read the partition table, if present */ if (part_get_info (dev_desc, part_no, &info)) {if (part_no !=0 ) { -printf ("** Partition %d not valid on device %d **\n" , - part_no, dev_desc->devnum); +log_err ("Partition %d invalid on device %d\n" , part_no, + dev_desc->devnum);return -1 ; }
@@ -168,7 +170,7 @@ static __u32 get_fatent(fsdata *mydata, __u32 entry)__u32 ret =0x00 ;if (CHECK_CLUST (entry, mydata->fatsize)) { -printf ("Error: Invalid FAT entry: 0x%08x\n" , entry); +log_err ("Invalid FAT entry: %#08x\n" , entry);return ret; }
@@ -586,19 +588,19 @@ static int get_fs_info(fsdata *mydata) mydata->sect_size = (bs.sector_size[1 ] <<8 ) + bs.sector_size[0 ]; mydata->clust_size = bs.cluster_size;if (mydata->sect_size != cur_part_info.blksz) { -printf ("Error: FAT sector size mismatch (fs=%hu, dev=%lu)\n" , - mydata->sect_size, cur_part_info.blksz); +log_err ("FAT sector size mismatch (fs=%u, dev=%lu)\n" , + mydata->sect_size, cur_part_info.blksz);return -1 ; }if (mydata->clust_size ==0 ) { -printf ("Error: FAT cluster size not set\n" ); +log_err ("FAT cluster size not set\n" );return -1 ; }if ((unsigned int )mydata->clust_size * mydata->sect_size >MAX_CLUSTSIZE ) { -printf ("Error: FAT cluster size too big (cs=%u, max=%u)\n" , - (unsigned int )mydata->clust_size * mydata->sect_size, -MAX_CLUSTSIZE ); +log_err ("FAT cluster size too big (cs=%u, max=%u)\n" , + (uint )mydata->clust_size * mydata->sect_size, +MAX_CLUSTSIZE );return -1 ; }
fs/fat/fat_write.c +4 -10
@@ -1571,8 +1571,9 @@ int fat_unlink(const char *filename)char *filename_copy, *dirname, *basename; filename_copy =strdup (filename); -if (!filename_copy) { -printf ("Error: allocating memory\n" ); + itr =malloc_cache_aligned (sizeof (fat_itr)); +if (!itr || !filename_copy) { +printf ("Error: out of memory\n" ); ret = -ENOMEM ; goto exit; }
@@ -1584,13 +1585,6 @@ int fat_unlink(const char *filename) goto exit; } - itr =malloc_cache_aligned (sizeof (fat_itr)); -if (!itr) { -printf ("Error: allocating memory\n" ); - ret = -ENOMEM ; - goto exit; - } - ret =fat_itr_root (itr, &fsdata);if (ret) goto exit;
@@ -1605,7 +1599,7 @@ int fat_unlink(const char *filename) }if (!find_directory_entry (itr, basename)) { -printf ("%s: doesn't exist\n" , basename); +log_err ("%s: doesn't exist (%d)\n" , basename, -ENOENT ); ret = -ENOENT ; goto exit; }
Signature · 1 line
2.40.0.634.g4ca3ef3211-goog
PATCH v2 32/42 fs: fat: Support reading from a larger block size
In reply to Simon GlassAt present it is not possible to read from some CDROM drives since the FAT sector size does not match the media's block size. Add a conversion option for this, so that reading is possible.
This does increase SPL size for read-only FAT support by 25 bytes but all but 6 are covered by the previous patch. We could reduce the overhead of this feature to 0 bytes by making the code uglier (using a static variable).
---
Changes in v2:
- Use log_warning() for the warning
fs/fat/Kconfig | 13 ++++++ fs/fat/fat.c | 107 ++++++++++++++++++++++++++++++++++++++++----- fs/fat/fat_write.c | 8 ++-- 3 files changed, 114 insertions(+), 14 deletions(-)
fs/fat/Kconfig +13 -0
@@ -22,3 +22,16 @@ config FS_FAT_MAX_CLUSTSIZE is the smallest amount of disk space that can be used to hold a file. Unless you have an extremely tight memory memory constraints, leave the default. + +config FAT_BLK_XLATE + bool "Enable FAT filesystem on a device with a larger block size" + depends on FS_FAT + help + This provides a simple translation mechanism for reading FAT + filesystems which don't use the same sector size as the underlying + media. For example, the FAT filesystem may use 512 bytes but the + media uses 2048, e.g. on a CDROM drive. + + This only supports the case where the FAT filesystem's sector size is + smaller than the media's block size. It does not support creating or + writing files.
fs/fat/fat.c +96 -11
167 lines not on this page · raw message
fs/fat/fat_write.c +5 -3
@@ -477,7 +477,7 @@ static int set_fatent_value(fsdata *mydata, __u32 entry, __u32 entry_value) startblock += mydata->fat_sect; -if (disk_read (startblock, getsize, bufptr) <0 ) { +if (disk_read (NULL , startblock, getsize, bufptr) <0 ) {debug ("Error reading FAT blocks\n" );return -1 ; }
@@ -712,7 +712,8 @@ get_set_cluster(fsdata *mydata, __u32 clustnum, loff_t pos, __u8 *buffer,/* partial write at beginning */ if (pos) { wsize =min (bytesperclust - pos, size); - ret =disk_read (startsect, mydata->clust_size, tmpbuf_cluster); + ret =disk_read (NULL , startsect, mydata->clust_size, + tmpbuf_cluster);if (ret != mydata->clust_size) {debug ("Error reading data (got %d)\n" , ret);return -1 ;
@@ -778,7 +779,8 @@ get_set_cluster(fsdata *mydata, __u32 clustnum, loff_t pos, __u8 *buffer,/* partial write at end */ if (size) { wsize = size; - ret =disk_read (startsect, mydata->clust_size, tmpbuf_cluster); + ret =disk_read (NULL , startsect, mydata->clust_size, + tmpbuf_cluster);if (ret != mydata->clust_size) {debug ("Error reading data (got %d)\n" , ret);return -1 ;
Signature · 1 line
2.40.0.634.g4ca3ef3211-goog
PATCH v2 33/42 x86: Enable useful options for qemu-86_64
In reply to Simon GlassThis build can be used to boot standard distro builds, since these are mostly 64-bit these days. Enable some more options, so that all possible EFI UUIDs are decoded, we get a proper printf() in SPL, can search memory for tables, support the full set of standard-boot features, have full logging and can boot from CDROM media.
---
(no changes since v1)
configs/qemu-x86_64_defconfig | 8 ++++++++ 1 file changed, 8 insertions(+)
configs/qemu-x86_64_defconfig +8 -0
@@ -19,6 +19,7 @@ CONFIG_GENERATE_MP_TABLE=y CONFIG_X86_OFFSET_U_BOOT=0xfff00000 CONFIG_FIT=y CONFIG_SPL_LOAD_FIT=y +CONFIG_BOOTSTD_FULL=y CONFIG_SYS_MONITOR_BASE=0x01110000 CONFIG_DISTRO_DEFAULTS=y CONFIG_BOOTSTAGE=y
@@ -27,6 +28,9 @@ CONFIG_SHOW_BOOT_PROGRESS=y CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="root=/dev/sdb3 init=/sbin/init rootwait ro" CONFIG_SYS_CONSOLE_INFO_QUIET=y +CONFIG_LOG=y +CONFIG_LOGF_FUNC=y +CONFIG_SPL_LOG=y CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_LAST_STAGE_INIT=y CONFIG_PCI_INIT_R=y
@@ -46,12 +50,14 @@ CONFIG_SYS_PBSIZE=532 CONFIG_CMD_CPU=y CONFIG_CMD_BOOTEFI_SELFTEST=y CONFIG_CMD_NVEDIT_EFI=y +CONFIG_CMD_MEM_SEARCH=y CONFIG_CMD_IDE=y CONFIG_CMD_SPI=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_BOOTP_BOOTFILESIZE=y # CONFIG_CMD_NFS is not set +CONFIG_CMD_EFIDEBUG=y CONFIG_CMD_TIME=y CONFIG_CMD_QFW=y CONFIG_CMD_BOOTSTAGE=y
@@ -83,5 +89,7 @@ CONFIG_FRAMEBUFFER_SET_VESA_MODE=y CONFIG_FRAMEBUFFER_VESA_MODE_USER=y CONFIG_FRAMEBUFFER_VESA_MODE=0x144 CONFIG_CONSOLE_SCROLL_LINES=5 +CONFIG_FAT_BLK_XLATE=y +# CONFIG_SPL_USE_TINY_PRINTF is not set CONFIG_GENERATE_ACPI_TABLE=y # CONFIG_GZIP is not set
Signature · 1 line
2.40.0.634.g4ca3ef3211-goog
PATCH v2 34/42 x86: Record the start and end of the tables
In reply to Simon GlassThe ACPI tables are special in that they are passed to EFI as a separate piece, independent of other tables.
Also they can be spread over two areas of memory, e.g. with QEMU we end up with tables kept in high memory as well.
Add new global_data fields to hold this information and update the bdinfo command to show the table areas.
Move the rom_table_end variable into the loop that uses it.
---
Changes in v2:
- Handle the case where the tables are in the bloblist
arch/sandbox/include/asm/global_data.h | 4 ++++ arch/x86/include/asm/global_data.h | 4 ++++ arch/x86/lib/bdinfo.c | 4 ++++ arch/x86/lib/tables.c | 16 +++++++++++++++- drivers/misc/qfw.c | 8 ++++++++ 5 files changed, 35 insertions(+), 1 deletion(-)
arch/sandbox/include/asm/global_data.h +4 -0
@@ -13,6 +13,10 @@struct arch_global_data {uint8_t *ram_buf;/* emulated RAM buffer */ void *text_base;/* pointer to base of text region */ +ulong table_start;/* Start address of x86 tables */ +ulong table_end;/* End address of x86 tables */ +ulong table_start_high;/* Start address of high x86 tables */ +ulong table_end_high;/* End address of high x86 tables */ };#include <asm-generic/global_data.h>
arch/x86/include/asm/global_data.h +4 -0
@@ -123,6 +123,10 @@ struct arch_global_data {#endif void *itss_priv;/* Private ITSS data pointer */ ulong coreboot_table;/* Address of coreboot table */ +ulong table_start;/* Start address of x86 tables */ +ulong table_end;/* End address of x86 tables */ +ulong table_start_high;/* Start address of high x86 tables */ + ulong table_end_high; /* End address of high x86 tables */ };#endif
arch/x86/lib/bdinfo.c +4 -0
@@ -23,6 +23,10 @@ void arch_print_bdinfo(void)bdinfo_print_str (" name" ,cpu_vendor_name (gd->arch.x86_vendor));bdinfo_print_num_l ("model" , gd->arch.x86_model);bdinfo_print_num_l ("phys_addr" ,cpu_phys_address_size ()); +bdinfo_print_num_l ("table start" , gd->arch.table_start); +bdinfo_print_num_l ("table end" , gd->arch.table_end); +bdinfo_print_num_l (" high start" , gd->arch.table_start_high); +bdinfo_print_num_l (" high end" , gd->arch.table_end_high);if (IS_ENABLED (CONFIG_EFI_STUB ))efi_show_bdinfo ();
arch/x86/lib/tables.c +15 -1
@@ -54,6 +54,10 @@ static struct table_info table_list[] = {#ifdef CONFIG_GENERATE_MP_TABLE { "mp", write_mp_table, },#endif +/* +* tables which can go in the bloblist must be last in this list, so +* that the calculation of gd->table_end works properly +*/ #ifdef CONFIG_GENERATE_ACPI_TABLE { "acpi", write_acpi_tables, BLOBLISTT_ACPI_TABLES, 0x10000, 0x1000}, #endif
@@ -79,23 +83,28 @@ void table_fill_string(char *dest, const char *src, size_t n, char pad)int write_tables (void ) {u32 rom_table_start; -u32 rom_table_end;u32 high_table, table_size;struct memory_area cfg_tables[ARRAY_SIZE (table_list) +1 ];int i; rom_table_start =ROM_TABLE_ADDR ; + gd->arch.table_start = rom_table_start;debug ("Writing tables to %x:\n" , rom_table_start);for (i =0 ; i <ARRAY_SIZE (table_list); i++) {const struct table_info *table = &table_list[i];int size = table->size ? :CONFIG_ROM_TABLE_SIZE ; +u32 rom_table_end;if (IS_ENABLED (CONFIG_BLOBLIST_TABLES ) && table->tag) { +if (!gd->arch.table_end) + gd->arch.table_end = rom_table_start; rom_table_start = (ulong )bloblist_add (table->tag, size, table->align);if (!rom_table_start)return log_msg_ret ("bloblist" , -ENOBUFS ); +if (!gd->arch.table_start_high) + gd->arch.table_start_high = rom_table_start; } rom_table_end = table->write (rom_table_start);if (!rom_table_end) {
@@ -132,6 +141,11 @@ int write_tables(void) rom_table_start = rom_table_end; } +if (gd->arch.table_start_high) + gd->arch.table_end_high = rom_table_start; +else + gd->arch.table_end = rom_table_start; +if (IS_ENABLED (CONFIG_SEABIOS )) {/* make sure the last item is zero */ cfg_tables[i].size =0 ;
drivers/misc/qfw.c +8 -0
@@ -65,6 +65,11 @@ static int bios_linker_allocate(struct udevice *dev,printf ("error: allocating resource\n" );return -ENOMEM ; } +if (aligned_addr < gd->arch.table_start_high) + gd->arch.table_start_high = aligned_addr; +if (aligned_addr + size > gd->arch.table_end_high) + gd->arch.table_end_high = aligned_addr + size; + }else if (entry->alloc.zone ==BIOS_LINKER_LOADER_ALLOC_ZONE_FSEG ) { aligned_addr =ALIGN (*addr, align); }else {
@@ -189,6 +194,9 @@ ulong write_acpi_tables(ulong addr)return addr; } + gd->arch.table_start_high = (ulong )table_loader; + gd->arch.table_end_high = (ulong )table_loader; +qfw_read_entry (dev,be16_to_cpu (file->cfg.select), size, table_loader);for (i =0 ; i < (size /sizeof (*entry)); i++) {
Signature · 1 line
2.40.0.634.g4ca3ef3211-goog
PATCH v2 35/42 x86: Show the number of physical address bits
In reply to Simon GlassAdd this information to global_data and show it with the 'bdinfo' command. For now we use CONFIG_CPU_ADDR_BITS to control the number of bits, but this could change if needed.
---
Changes in v2:
- Add new patch to show the number of physical address bits
arch/x86/cpu/i386/cpu.c | 2 ++ arch/x86/include/asm/global_data.h | 1 + arch/x86/lib/bdinfo.c | 1 + 3 files changed, 4 insertions(+)
arch/x86/cpu/i386/cpu.c +2 -0
@@ -468,6 +468,7 @@ int x86_cpu_init_f(void)if (ll_boot_init ())setup_cpu_features ();setup_identity (); + gd->arch.phys_bits =cpu_phys_address_size ();setup_mtrr ();setup_pci_ram_top ();
@@ -483,6 +484,7 @@ int x86_cpu_reinit_f(void)long addr;setup_identity (); + gd->arch.phys_bits =cpu_phys_address_size ();setup_pci_ram_top (); addr =locate_coreboot_table ();if (addr >=0 ) {
arch/x86/include/asm/global_data.h +1 -0
@@ -127,6 +127,7 @@ struct arch_global_data {ulong table_end;/* End address of x86 tables */ ulong table_start_high;/* Start address of high x86 tables */ ulong table_end_high;/* End address of high x86 tables */ + uint phys_bits; /* Number of physical address bits */ };#endif
arch/x86/lib/bdinfo.c +1 -0
@@ -27,6 +27,7 @@ void arch_print_bdinfo(void)bdinfo_print_num_l ("table end" , gd->arch.table_end);bdinfo_print_num_l (" high start" , gd->arch.table_start_high);bdinfo_print_num_l (" high end" , gd->arch.table_end_high); +bdinfo_print_num_l ("phys bits" , gd->arch.phys_bits);if (IS_ENABLED (CONFIG_EFI_STUB ))efi_show_bdinfo ();
Signature · 1 line
2.40.0.634.g4ca3ef3211-goog
PATCH v2 36/42 x86: Convert some debug statements to use logging
In reply to Simon GlassMove from using debug() to log_debug() so that we don't have to use the __func__ parameter and can access other logging features.
---
Changes in v2:
- Add new patch to convert some debug statements to use logging
arch/x86/cpu/intel_common/mrc.c | 10 +++++----- arch/x86/cpu/ivybridge/sdram.c | 4 +++- arch/x86/lib/mrccache.c | 6 ++++-- arch/x86/lib/spl.c | 22 ++++++++++++++-------- drivers/gpio/intel_ich6_gpio.c | 5 +++-- drivers/pch/pch9.c | 6 ++++-- 6 files changed, 33 insertions(+), 20 deletions(-)
arch/x86/cpu/intel_common/mrc.c +5 -5
@@ -3,6 +3,8 @@* Copyright (c) 2016 Google, Inc */ +#define LOG_CATEGORY UCLASS_RAM +#include <common.h> #include <dm.h> #include <init.h>
@@ -144,12 +146,10 @@ int mrc_locate_spd(struct udevice *dev, int size, const void **spd_datap) ret =gpio_request_list_by_name (dev,"board-id-gpios" , desc,ARRAY_SIZE (desc),GPIOD_IS_IN ); -if (ret <0 ) { -debug ("%s: gpio ret=%d\n" , __func__, ret); -return ret; - } +if (ret <0 ) +return log_msg_ret ("gp" , ret); spd_index =dm_gpio_get_values_as_int (desc, ret); -debug ("spd index %d\n" , spd_index); +log_debug ("spd index %d\n" , spd_index); node =fdt_first_subnode (blob,dev_of_offset (dev));if (node <0 )
arch/x86/cpu/ivybridge/sdram.c +3 -1
@@ -9,6 +9,8 @@* Copyright (C) 2011 Google Inc. */ +#define LOG_CATEGORY UCLASS_RAM +#include <common.h> #include <dm.h> #include <errno.h>
@@ -213,7 +215,7 @@ static int copy_spd(struct udevice *dev, struct pei_data *peid) ret =mrc_locate_spd (dev,sizeof (peid->spd_data[0 ]), &data);if (ret) { -debug ("%s: Could not locate SPD (ret=%d)\n" , __func__, ret); +log_debug ("Could not locate SPD (err=%d)\n" , ret);return ret; }
arch/x86/lib/mrccache.c +4 -2
@@ -6,6 +6,8 @@* Copyright (C) 2015 Bin Meng <[email protected]> */ +#define LOG_CATEGORY UCLASS_RAM +#include <common.h> #include <dm.h> #include <errno.h>
@@ -197,8 +199,8 @@ static void mrccache_setup(struct mrc_output *mrc, void *data) cache->signature =MRC_DATA_SIGNATURE ; cache->data_size = mrc->len; checksum =compute_ip_checksum (mrc->buf, cache->data_size); -debug ("Saving %d bytes for MRC output data, checksum %04x\n" , - cache->data_size, checksum); +log_debug ("Saving %d bytes for MRC output data, checksum %04x\n" , + cache->data_size, checksum); cache->checksum = checksum; cache->reserved =0 ;memcpy (cache->data, mrc->buf, cache->data_size);
arch/x86/lib/spl.c +14 -8
@@ -3,6 +3,8 @@* Copyright (c) 2016 Google, Inc */ +#define LOG_CATEGORY LOGC_BOOT +#include <common.h> #include <cpu_func.h> #include <debug_uart.h>
@@ -76,25 +78,25 @@ static int x86_spl_init(void)#endif int ret; -debug ("%s starting\n" , __func__); +log_debug ("x86 spl starting\n" );if (IS_ENABLED (TPL )) ret =x86_cpu_reinit_f ();else ret =x86_cpu_init_f (); ret =spl_init ();if (ret) { -debug ("%s: spl_init() failed\n" , __func__); +log_debug ("spl_init() failed (err=%d)\n" , ret);return ret; } ret =arch_cpu_init ();if (ret) { -debug ("%s: arch_cpu_init() failed\n" , __func__); +log_debug ("arch_cpu_init() failed (err=%d)\n" , ret);return ret; }#ifndef CONFIG_TPL ret =fsp_setup_pinctrl (NULL ,NULL );if (ret) { -debug ("%s: fsp_setup_pinctrl() failed\n" , __func__); +log_debug ("fsp_setup_pinctrl() failed (err=%d)\n" , ret);return ret; }#endif
@@ -103,23 +105,25 @@ static int x86_spl_init(void)#if !defined(CONFIG_TPL ) && !CONFIG_IS_ENABLED (CPU ) ret =print_cpuinfo ();if (ret) { -debug ("%s: print_cpuinfo() failed\n" , __func__); +log_debug ("print_cpuinfo() failed (err=%d)\n" , ret);return ret; }#endif ret =dram_init ();if (ret) { -debug ("%s: dram_init() failed\n" , __func__); +log_debug ("dram_init() failed (err=%d)\n" , ret);return ret; } +log_debug ("mrc\n" );if (IS_ENABLED (CONFIG_ENABLE_MRC_CACHE )) { ret =mrccache_spl_save ();if (ret) -debug ("%s: Failed to write to mrccache (err=%d)\n" , - __func__, ret); +log_debug ("Failed to write to mrccache (err=%d)\n" , + ret); }#ifndef CONFIG_SYS_COREBOOT +log_debug ("bss\n" );debug ("BSS clear from %lx to %lx len %lx\n" , (ulong)&__bss_start, (ulong)&__bss_end, (ulong )&__bss_end - (ulong )&__bss_start);memset (&__bss_start,'\0' , (ulong )&__bss_end - (ulong )&__bss_start);
@@ -140,6 +144,7 @@ static int x86_spl_init(void) gd->new_gd = (struct global_data *)ptr;memcpy (gd->new_gd, gd,sizeof (*gd)); +log_debug ("logging\n" );/* * Make sure logging is disabled when we switch, since the log system * list head will move
@@ -179,6 +184,7 @@ static int x86_spl_init(void)debug ("Failed to set CPU frequency (err=%d)\n" , ret);# endif #endif +log_debug ("done\n" );return 0 ; }
drivers/gpio/intel_ich6_gpio.c +3 -2
@@ -26,6 +26,8 @@* reserved or subject to arcane restrictions. */ +#define LOG_CATEGORY UCLASS_GPIO +#include <common.h> #include <dm.h> #include <errno.h>
@@ -155,8 +157,7 @@ static int ich6_gpio_request(struct udevice *dev, unsigned offset,*/ tmplong =inl (bank->use_sel);if (!(tmplong & (1UL << offset))) { -debug ("%s: gpio %d is reserved for internal use\n" , __func__, - offset); +log_debug ("gpio %d is reserved for internal use\n" , offset);return -EPERM ; }
drivers/pch/pch9.c +4 -2
@@ -3,6 +3,8 @@* Copyright (C) 2014 Google, Inc */ +#define LOG_CATEGORY UCLASS_PCH +#include <common.h> #include <dm.h> #include <log.h>
@@ -38,7 +40,7 @@ static int pch9_get_gpio_base(struct udevice *dev, u32 *gbasep)*/ dm_pci_read_config32 (dev,GPIO_BASE , &base);if (base ==0x00000000 || base ==0xffffffff ) { -debug ("%s: unexpected BASE value\n" , __func__); +log_debug ("unexpected BASE value\n" );return -ENODEV ; }
@@ -59,7 +61,7 @@ static int pch9_get_io_base(struct udevice *dev, u32 *iobasep)dm_pci_read_config32 (dev,IO_BASE , &base);if (base ==0x00000000 || base ==0xffffffff ) { -debug ("%s: unexpected BASE value\n" , __func__); +log_debug ("unexpected BASE value\n" );return -ENODEV ; }
Signature · 1 line
2.40.0.634.g4ca3ef3211-goog
PATCH v2 37/42 x86: link: Support Micron memory
In reply to Simon GlassAdd the required tag so that micron memory can be set up correctly.
---
Changes in v2:
- Add new patch to support Micron memory
arch/x86/dts/chromebook_link.dts | 1 + 1 file changed, 1 insertion(+)
arch/x86/dts/chromebook_link.dts +1 -0
@@ -314,6 +314,7 @@ 00 00 00 00 00 00 00 00]; }; micron_4Gb_1600_1.35v_x16 { + bootph-all; reg = <2>; data = [92 11 0b 03 04 19 02 02 03 11 01 08 0a 00 fe 00
Signature · 1 line
2.40.0.634.g4ca3ef3211-goog
PATCH v2 38/42 x86: Make sure that the LPC is active before SDRAM init
In reply to Simon GlassSome boards need to access GPIOs to determine which SDRAM is fitted to the board, for example chromebook_link. Probe this device (if it exists) to make sure that this works as expected.
---
Changes in v2:
- Add new patch to make sure that the LPC is active before SDRAM init
arch/x86/lib/spl.c | 9 +++++++++ 1 file changed, 9 insertions(+)
arch/x86/lib/spl.c +9 -0
@@ -65,6 +65,8 @@ static int set_max_freq(void)static int x86_spl_init (void ) { +struct udevice *dev; +#ifndef CONFIG_TPL /* * TODO([email protected]): We use this area of RAM for the stack
@@ -109,6 +111,13 @@ static int x86_spl_init(void) return ret; }#endif +/* probe the LPC so we get the GPIO_BASE set up correctly */ + ret =uclass_first_device_err (UCLASS_LPC , &dev); +if (ret && ret != -ENODEV ) { +log_debug ("lpc probe failed\n" ); +return ret; + } + ret =dram_init ();if (ret) {log_debug ("dram_init() failed (err=%d)\n" , ret);
Signature · 1 line
2.40.0.634.g4ca3ef3211-goog
PATCH v2 39/42 log: Support outputing function names in SPL
In reply to Simon GlassThe output is garbled when tiny printf() is used. Correct this by adding a special case.
---
Changes in v2:
- Add new patch to support outputing function names in SPL
common/log_console.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
common/log_console.c +8 -2
@@ -37,8 +37,14 @@ static int log_console_emit(struct log_device *ldev, struct log_rec *rec)printf ("%s:" , rec->file);if (fmt &BIT (LOGF_LINE ))printf ("%d-" , rec->line); -if (fmt &BIT (LOGF_FUNC )) -printf ("%*s()" ,CONFIG_LOGF_FUNC_PAD , rec->func); +if (fmt &BIT (LOGF_FUNC )) { +if (CONFIG_IS_ENABLED (USE_TINY_PRINTF )) { +printf ("%s()" , rec->func); + }else { +printf ("%*s()" ,CONFIG_LOGF_FUNC_PAD , + rec->func); + } + } }if (fmt &BIT (LOGF_MSG ))printf ("%s%s" , add_space ?" " :"" , rec->msg);
Signature · 1 line
2.40.0.634.g4ca3ef3211-goog
PATCH v2 40/42 sandbox: Correct header order in board file
In reply to Simon GlassFix the header order in this file.
---
(no changes since v1)
board/sandbox/sandbox.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
board/sandbox/sandbox.c +3 -3
@@ -11,16 +11,16 @@#include <efi.h> #include <efi_loader.h> #include <env_internal.h> +#include <extension_board.h> #include <init.h> #include <led.h> +#include <malloc.h> #include <os.h> #include <asm/global_data.h> #include <asm/test.h> #include <asm/u-boot-sandbox.h> #include <linux/kernel.h> -#include <malloc.h> - -#include <extension_board.h> +#include <linux/sizes.h> /* * Pointer to initial global data area
Signature · 1 line
2.40.0.634.g4ca3ef3211-goog
PATCH v2 41/42 sandbox: Install ACPI tables on startup
In reply to Simon GlassWith x86 we set up the ACPI tables on startup so they can be examined. Do the same with sandbox, so it is consistent.
---
(no changes since v1)
board/sandbox/sandbox.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
board/sandbox/sandbox.c +16 -0
@@ -15,7 +15,9 @@#include <init.h> #include <led.h> #include <malloc.h> +#include <mapmem.h> #include <os.h> +#include <acpi/acpi_table.h> #include <asm/global_data.h> #include <asm/test.h> #include <asm/u-boot-sandbox.h>
@@ -154,6 +156,8 @@ int extension_board_scan(struct list_head *extension_list)int board_late_init (void ) {struct udevice *dev; +ulong addr, end; +void *ptr;int ret; ret =uclass_first_device_err (UCLASS_CROS_EC , &dev);
@@ -166,6 +170,18 @@ int board_late_init(void)panic ("Cannot init cros-ec device" ); return -1; } + +if (IS_ENABLED (CONFIG_GENERATE_ACPI_TABLE )) { +/* Reserve 64K for ACPI tables, aligned to a 4K boundary */ + ptr =memalign (SZ_4K ,SZ_64K ); + addr =map_to_sysmem (ptr); + +/* Generate ACPI tables */ + end =write_acpi_tables (addr); + gd->arch.table_start = addr; + gd->arch.table_end = addr; + } +return 0 ; }#endif
Signature · 1 line
2.40.0.634.g4ca3ef3211-goog
PATCH v2 42/42 efi: Use the installed ACPI tables
In reply to Simon GlassU-Boot sets up the ACPI tables during startup. Rather than creating a new set, install the existing ones. Create a memory-map record to cover the tables.
---
Changes in v2:
- Drop patch to set high bits of the mtrr base register, for now
lib/efi_loader/efi_acpi.c | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-)
lib/efi_loader/efi_acpi.c +19 -14
@@ -10,6 +10,9 @@#include <log.h> #include <mapmem.h> #include <acpi/acpi_table.h> +#include <asm/global_data.h> + +DECLARE_GLOBAL_DATA_PTR ;static const efi_guid_t acpi_guid =EFI_ACPI_TABLE_GUID ;
@@ -20,26 +23,28 @@ static const efi_guid_t acpi_guid = EFI_ACPI_TABLE_GUID;*/ efi_status_t efi_acpi_register (void ) { -/* Map within the low 32 bits, to allow for 32bit ACPI tables */ -u64 acpi =U32_MAX ; +ulong addr, start, end;efi_status_t ret; -ulong addr; -/* Reserve 64kiB page for ACPI */ - ret =efi_allocate_pages (EFI_ALLOCATE_MAX_ADDRESS , -EFI_ACPI_RECLAIM_MEMORY ,16 , &acpi); +/* Mark space used for tables */ + start =ALIGN_DOWN (gd->arch.table_start,EFI_PAGE_MASK ); + end =ALIGN (gd->arch.table_end,EFI_PAGE_MASK ); + ret =efi_add_memory_map (start, end - start,EFI_ACPI_RECLAIM_MEMORY );if (ret !=EFI_SUCCESS )return ret; +if (gd->arch.table_start_high) { + start =ALIGN_DOWN (gd->arch.table_start_high,EFI_PAGE_MASK ); + end =ALIGN (gd->arch.table_end_high,EFI_PAGE_MASK ); + ret =efi_add_memory_map (start, end - start, +EFI_ACPI_RECLAIM_MEMORY ); +if (ret !=EFI_SUCCESS ) +return ret; + } -/* -* Generate ACPI tables - we know that efi_allocate_pages() returns -* a 4k-aligned address, so it is safe to assume that -* write_acpi_tables() will write the table at that address. -*/ - addr =map_to_sysmem ((void *)(ulong )acpi); -write_acpi_tables (addr); + addr =gd_acpi_start (); +printf ("EFI using ACPI tables at %lx\n" , addr);/* And expose them to our EFI payload */ return efi_install_configuration_table (&acpi_guid, - (void *)(uintptr_t )acpi); + (void *)(ulong )addr); }
Signature · 1 line
2.40.0.634.g4ca3ef3211-goog