coreboot-gerrit June 2023

coreboot-gerrit@coreboot.org

1 participants
5387 discussions

[M] Change in coreboot[master]: WIP acpi: Add functions to declare ARM GIC V3 hardware
by Arthur Heymans (Code Review) 27 Jun '23

27 Jun '23

Attention is currently required from: Lance Zhao, Tim Wawrzynczak. Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/76132?usp=email ) Change subject: WIP acpi: Add functions to declare ARM GIC V3 hardware ...................................................................... WIP acpi: Add functions to declare ARM GIC V3 hardware Signed-off-by: Arthur Heymans <arthur(a)aheymans.xyz> Change-Id: I5074d0a76316e854b7801e14b3241f88e805b02f --- M src/acpi/Kconfig M src/acpi/acpi.c M src/include/acpi/acpi.h M src/include/device/path.h 4 files changed, 99 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/32/76132/1 diff --git a/src/acpi/Kconfig b/src/acpi/Kconfig index a45a68c..26697d8 100644 --- a/src/acpi/Kconfig +++ b/src/acpi/Kconfig @@ -46,6 +46,10 @@ config ACPI_COMMON_MADT_IOAPIC bool +config ACPI_COMMON_MADT_GICC_V3 + bool + depends on ARCH_ARM64 + config ACPI_NO_PCAT_8259 bool help diff --git a/src/acpi/acpi.c b/src/acpi/acpi.c index cfc388b..43fb70a 100644 --- a/src/acpi/acpi.c +++ b/src/acpi/acpi.c @@ -338,6 +338,83 @@ return current; } +static int acpi_create_madt_one_gicc_v3(acpi_madt_gicc_t *gicc, u32 acpi_uid, u32 pi_gsiv, + uint32_t vgic_mi, uint64_t mpidr) +{ + memset(gicc, 0, sizeof(acpi_madt_gicc_t)); + gicc->type = GICC; + gicc->length = sizeof(acpi_madt_gicc_t); + gicc->reserved = 0; + gicc->cpu_interface_number = 0; /* V3, no compat mode */ + gicc->acpi_processor_uid = acpi_uid; + gicc->flags.enabled = 1; + gicc->parking_protocol_persion = 0; /* Assume PSCI exclusively */ + gicc->performance_interrupt_gsiv = pi_gsiv; + gicc->parked_address = 0; + gicc->physical_base_address = 0; /* V3, no compat mode */ + gicc->vgic_maintenance_interrupt = vgic_mi; + gicc->gicr_base_address = 0; /* ignored by ASPM if GICR is present */ + gicc->processor_power_efficiency_class = 0; /* Ignore for now */ + /* For platforms implementing ARMv8 the format must be: + * Bits [63:40] Must be zero + * Bits [39:32] Aff3 : Match Aff3 of target processor MPIDR + * Bits [31:24] Must be zero + * Bits [23:16] Aff2 : Match Aff2 of target processor MPIDR + * Bits [15:8] Aff1 : Match Aff1 of target processor MPIDR + * Bits [7:0] Aff0 : Match Aff0 of target processor MPIDR + */ + gicc->mpidr = mpidr & 0xff00ffffff; + + return gicc->length; +} + +static unsigned long acpi_create_madt_giccs_v3(unsigned long current) +{ + // Loop over CPUs GIC + uint32_t acpi_id = 0; + for (struct device *dev = dev_find_path(NULL, DEVICE_PATH_GICC_V3); dev; + dev = dev_find_path(dev, DEVICE_PATH_GICC_V3)) { + acpi_madt_gicc_t *gicc = (acpi_madt_gicc_t *)current; + current += acpi_create_madt_one_gicc_v3(gicc, acpi_id++, + dev->path.gicc_v3.pi_gsiv, + dev->path.gicc_v3.vgic_mi, + dev->path.gicc_v3.mpidr); + } + + return current; +} + +static unsigned long acpi_create_madt_gicd_v3(unsigned long current) +{ + acpi_madt_gicd_t *gicd = (acpi_madt_gicd_t *)current; + memset(gicd, 0, sizeof(acpi_madt_gicd_t)); + gicd->type = GICD; + gicd->length = sizeof(acpi_madt_gicd_t); + gicd->physical_base_address = get_gicd_base(); + gicd->system_vector_base = 0; + gicd->gic_version = 3; + + return current + gicd->length; +} + +/* + * The redistributor in GICv3 has two 64KB frames per CPU; in + * GICv4 it has four 64KB frames per CPU. + */ +#define GICV3_REDIST_SIZE 0x20000 +#define GICV4_REDIST_SIZE 0x40000 +static unsigned long acpi_create_madt_gicr_v3(unsigned long current) +{ + acpi_madt_gicr_t *gicr = (acpi_madt_gicr_t *)current; + memset(gicr, 0, sizeof(acpi_madt_gicr_t)); + gicr->type = GICR; + gicr->length = sizeof(acpi_madt_gicr_t); + gicr->discovery_range_base_address = get_gicr_base(); + gicr->discovery_range_length = GICV3_REDIST_SIZE * CONFIG_MAX_CPUS; + + return current + gicr->length; +} + static void acpi_create_madt(acpi_madt_t *madt) { acpi_header_t *header = &(madt->header); @@ -368,6 +445,12 @@ if (CONFIG(ACPI_COMMON_MADT_IOAPIC)) current = acpi_create_madt_ioapic_gsi0_default(current); + if (CONFIG(ACPI_COMMON_MADT_GICC_V3)) { + current = acpi_create_madt_giccs_v3(current); + current = acpi_create_madt_gicd_v3(current); + current = acpi_create_madt_gicr_v3(current); + } + if (CONFIG(ACPI_CUSTOM_MADT)) current = acpi_fill_madt(current); diff --git a/src/include/acpi/acpi.h b/src/include/acpi/acpi.h index 266eb60..64b7613 100644 --- a/src/include/acpi/acpi.h +++ b/src/include/acpi/acpi.h @@ -1456,6 +1456,9 @@ unsigned long acpi_create_madt_lapic_nmis(unsigned long current); +uintptr_t get_gicd_base(void); +uintptr_t get_gicr_base(void); + int acpi_create_srat_lapic(acpi_srat_lapic_t *lapic, u8 node, u8 apic); int acpi_create_srat_x2apic(acpi_srat_x2apic_t *x2apic, u32 node, u32 apic); int acpi_create_srat_mem(acpi_srat_mem_t *mem, u8 node, u32 basek, u32 sizek, diff --git a/src/include/device/path.h b/src/include/device/path.h index c0df66b..4912d08 100644 --- a/src/include/device/path.h +++ b/src/include/device/path.h @@ -23,6 +23,7 @@ DEVICE_PATH_MMIO, DEVICE_PATH_GPIO, DEVICE_PATH_MDIO, + DEVICE_PATH_GICC_V3, /* * When adding path types to this table, please also update the @@ -48,6 +49,7 @@ "DEVICE_PATH_MMIO", \ "DEVICE_PATH_GPIO", \ "DEVICE_PATH_MDIO", \ + "DEVICE_PATH_GICC_V3", \ } struct domain_path { @@ -120,6 +122,12 @@ unsigned int addr; }; +struct gicc_v3_path { + long long unsigned mpidr; + unsigned int vgic_mi; + unsigned int pi_gsiv; +}; + struct device_path { enum device_path_type type; union { @@ -138,6 +146,7 @@ struct mmio_path mmio; struct gpio_path gpio; struct mdio_path mdio; + struct gicc_v3_path gicc_v3; }; }; -- To view, visit https://review.coreboot.org/c/coreboot/+/76132?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I5074d0a76316e854b7801e14b3241f88e805b02f Gerrit-Change-Number: 76132 Gerrit-PatchSet: 1 Gerrit-Owner: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: Lance Zhao <lance.zhao(a)gmail.com> Gerrit-Reviewer: Tim Wawrzynczak <inforichland(a)gmail.com> Gerrit-Attention: Lance Zhao <lance.zhao(a)gmail.com> Gerrit-Attention: Tim Wawrzynczak <inforichland(a)gmail.com> Gerrit-MessageType: newchange

1 0

[M] Change in coreboot[master]: acpi/acpi.h: Add MADT GIC structures
by Arthur Heymans (Code Review) 27 Jun '23

27 Jun '23

Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/76131?usp=email ) Change subject: acpi/acpi.h: Add MADT GIC structures ...................................................................... acpi/acpi.h: Add MADT GIC structures Signed-off-by: Arthur Heymans <arthur(a)aheymans.xyz> Change-Id: I9e6544c956cb3d516d2e5900357af9ae8976cc8e --- M src/include/acpi/acpi.h 1 file changed, 88 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/31/76131/1 diff --git a/src/include/acpi/acpi.h b/src/include/acpi/acpi.h index d3f209a..266eb60 100644 --- a/src/include/acpi/acpi.h +++ b/src/include/acpi/acpi.h @@ -745,6 +745,94 @@ u8 reserved[3]; } __packed acpi_madt_lx2apic_nmi_t; +/* MADT: GIC CPU Interface (GICC) Structure 6.5 */ +struct gicc_flags { + uint32_t enabled : 1; + /* 0 - Level-triggered | 1 - Edge-Triggered */ + uint32_t performance_interrupt_mode : 1; + uint32_t vgic_maintenance_interrupt_mode : 1; + uint32_t online_capable : 1; + uint32_t reserved : 28; + +}; +_Static_assert(sizeof(struct gicc_flags) == sizeof(uint32_t), "Wrong gicc_flags size\n"); + +typedef struct acpi_gicc { + uint8_t type; + uint8_t length; + uint16_t reserved; + uint32_t cpu_interface_number; + uint32_t acpi_processor_uid; + struct gicc_flags flags; + uint32_t parking_protocol_persion; + uint32_t performance_interrupt_gsiv; + uint64_t parked_address; + uint64_t physical_base_address; /* GIC v1/v2 or GIC v3/v4 in v2 compat mode */ + uint64_t gicv; + uint64_t gich; + uint32_t vgic_maintenance_interrupt; + uint64_t gicr_base_address; /* Only GIC v3 and above */ + uint64_t mpidr; + uint8_t processor_power_efficiency_class; + uint8_t reserved1; + uint16_t spe_overflow_interrupt; + uint16_t trbe_interrupt; +} __packed acpi_madt_gicc_t; +_Static_assert(sizeof(acpi_madt_gicc_t) == 82, "Wrong MADT GICC size\n"); + +/* MADT: GIC Distributor (GICD) Structure */ +typedef struct acpi_gicd { + uint8_t type; + uint8_t length; + uint16_t reserved1; + uint32_t gic_id; + uint64_t physical_base_address; + uint32_t system_vector_base; + uint8_t gic_version; + uint8_t reserved2[3]; +} __packed acpi_madt_gicd_t; +_Static_assert(sizeof(acpi_madt_gicd_t) == 24, "Wrong MADT acpi_gicd_t size\n"); + +/* MADT: GIC MSI Frame Structure */ +struct gic_msi_flags { + uint32_t spi_count_select : 1; + uint32_t reserved : 31; +}; +_Static_assert(sizeof(struct gic_msi_flags) == sizeof(uint32_t), "Wrong gic_msi_flags size\n"); + +typedef struct acpi_gic_msi { + uint8_t type; + uint8_t length; + uint16_t reserved; + uint32_t gic_msi_frame_id; + uint64_t physical_base_address; + struct gic_msi_flags flags; + uint16_t spi_count; + uint16_t spi_base; +} __packed acpi_gic_msi_t; +_Static_assert(sizeof(acpi_gic_msi_t) == 24, "Wrong MADT acpi_gic_msi_t size\n"); + +/* MADT: GIC Redistributor (GICR) Structure */ +typedef struct apci_girc { + uint8_t type; + uint8_t length; + uint16_t reserved; + uint64_t discovery_range_base_address; + uint32_t discovery_range_length; +} __packed acpi_madt_gicr_t; +_Static_assert(sizeof(acpi_madt_gicr_t) == 16, "Wrong MADT acpi_gicr_t size\n"); + +/* MADT: GIC Interrupt Translation Service (ITS) Structure */ +typedef struct apci_gic_its { + uint8_t type; + uint8_t length; + uint16_t reserved; + uint32_t gic_its_id; + uint64_t physical_base_address; + uint32_t reserved2; +} __packed acpi_madt_gic_its_t; +_Static_assert(sizeof(acpi_madt_gic_its_t) == 20, "Wrong MADT acpi_gic_its_t size\n"); + #define ACPI_DBG2_PORT_SERIAL 0x8000 #define ACPI_DBG2_PORT_SERIAL_16550 0x0000 #define ACPI_DBG2_PORT_SERIAL_16550_DBGP 0x0001 -- To view, visit https://review.coreboot.org/c/coreboot/+/76131?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I9e6544c956cb3d516d2e5900357af9ae8976cc8e Gerrit-Change-Number: 76131 Gerrit-PatchSet: 1 Gerrit-Owner: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-MessageType: newchange

1 0

[L] Change in coreboot[master]: mb/{skl,kbl}: Use true/false keywords for non-array dt options
by Michael Niewöhner (Code Review) 27 Jun '23

27 Jun '23

Attention is currently required from: Angel Pons, Felix Singer, Frans Hendriks, Jeremy Soller, Michał Żygowski, Nico Huber, Piotr Król, Sean Rhodes, Tim Crawford. Michael Niewöhner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/75888?usp=email ) Change subject: mb/{skl,kbl}: Use true/false keywords for non-array dt options ...................................................................... Patch Set 5: (1 comment) Commit Message: https://review.coreboot.org/c/coreboot/+/75888/comment/aa4db14d_5b88182b : PS5, Line 25: soc_gen="skylake" && \ : options=`grep -A 1337 -r "struct soc_intel_${soc_gen}_config" "src/soc/intel/${soc_gen}/chip.h" | \ : grep "bool" | \ : cut -d ';' -f 1 | \ : tr '\t' ' ' | \ : cut -d ' ' -f 3 | \ : sed -E 's/[a-zA-Z0-9_]+\[.+\]//g'` : devicetrees=`find "src/mainboard" -name '*.cb' \ : -exec grep -H "chip soc/intel/${soc_gen}" {} \; | \ : cut -d ':' -f 1` && \ : for option in ${options}; do \ : echo ${devicetrees} | \ : xargs sed -i'' -E \ : -e "s/\"${option}\"(\s+)=(\s+)\"1\"/${option}\1=\2true/g" \ : -e "s/\"${option}\"(\s+)=(\s+)\"0\"/${option}\1=\2false/g"; \ : done : > I would modify the script like this: […] opinions? -- To view, visit https://review.coreboot.org/c/coreboot/+/75888?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Iff063c37a093e597c6b73a583903ce5e4f698856 Gerrit-Change-Number: 75888 Gerrit-PatchSet: 5 Gerrit-Owner: Felix Singer <service+coreboot-gerrit(a)felixsinger.de> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Elyes Haouas <ehaouas(a)noos.fr> Gerrit-Reviewer: Eric Lai <eric_lai(a)quanta.corp-partner.google.com> Gerrit-Reviewer: Erik van den Bogaert <ebogaert(a)eltan.com> Gerrit-Reviewer: Frans Hendriks <fhendriks(a)eltan.com> Gerrit-Reviewer: Jeremy Soller <jeremy(a)system76.com> Gerrit-Reviewer: Jonathon Hall <jonathon.hall(a)puri.sm> Gerrit-Reviewer: Michael Niewöhner <foss(a)mniewoehner.de> Gerrit-Reviewer: Michał Żygowski <michal.zygowski(a)3mdeb.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Piotr Król <piotr.krol(a)3mdeb.com> Gerrit-Reviewer: Sean Rhodes <sean(a)starlabs.systems> Gerrit-Reviewer: Tim Crawford <tcrawford(a)system76.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Felix Singer <service+coreboot-gerrit(a)felixsinger.de> Gerrit-Attention: Tim Crawford <tcrawford(a)system76.com> Gerrit-Attention: Sean Rhodes <sean(a)starlabs.systems> Gerrit-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Michał Żygowski <michal.zygowski(a)3mdeb.com> Gerrit-Attention: Frans Hendriks <fhendriks(a)eltan.com> Gerrit-Attention: Jeremy Soller <jeremy(a)system76.com> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Piotr Król <piotr.krol(a)3mdeb.com> Gerrit-Comment-Date: Tue, 27 Jun 2023 14:52:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Michael Niewöhner <foss(a)mniewoehner.de> Gerrit-MessageType: comment

1 0

[L] Change in coreboot[master]: payloads/external/LinuxBoot: Clean up
by Maximilian Brune (Code Review) 27 Jun '23

27 Jun '23

Attention is currently required from: Christian Walter, Martin L Roth, Stefan Reinauer. Hello Christian Walter, Martin L Roth, Stefan Reinauer, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/coreboot/+/76150?usp=email to look at the new patch set (#2). Change subject: payloads/external/LinuxBoot: Clean up ...................................................................... payloads/external/LinuxBoot: Clean up There were some issues with the current Linuxboot Makefiles. - multithreaded compilation didn't work, because some prerequisites were missing - initramfs wasn't added for x86 qemu boot. - riscv support was incomplete It began with seperate patches, but resulted in a clean up patch, that is hard to seperate. The most important changes are the following: - Instead of phony targets, actual files are now used as prerequisites - riscv can now be used as target - initramfs works now also for x86 - instead of querying the most recent version from the internet, I set a known working version (because I tested it) that can be customized and/or upgraded in the future. - I removed as much ifeq statements as possible and moved that responsibility to Kconfig, because they tend to make the Makefile less readable. Signed-off-by: Maximilian Brune <maximilian.brune(a)9elements.com> Change-Id: I25e757108e0dd473969fe5a192ad0733f1fe6286 --- M payloads/external/LinuxBoot/Kconfig M payloads/external/LinuxBoot/Makefile M payloads/external/LinuxBoot/arm64/kernel_fdt_lzma.its M payloads/external/LinuxBoot/targets/linux.mk M payloads/external/LinuxBoot/targets/u-root.mk M payloads/external/Makefile.inc 6 files changed, 104 insertions(+), 215 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/50/76150/2 -- To view, visit https://review.coreboot.org/c/coreboot/+/76150?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I25e757108e0dd473969fe5a192ad0733f1fe6286 Gerrit-Change-Number: 76150 Gerrit-PatchSet: 2 Gerrit-Owner: Maximilian Brune <maximilian.brune(a)9elements.com> Gerrit-Reviewer: Christian Walter <christian.walter(a)9elements.com> Gerrit-Reviewer: Martin L Roth <gaumless(a)gmail.com> Gerrit-Reviewer: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Gerrit-CC: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Martin L Roth <gaumless(a)gmail.com> Gerrit-Attention: Christian Walter <christian.walter(a)9elements.com> Gerrit-Attention: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Gerrit-MessageType: newpatchset

1 0

[S] Change in coreboot[master]: mb/{cfl,cml,whl}: Use true/false macros for s0ix_enable dt option
by Michael Niewöhner (Code Review) 27 Jun '23

27 Jun '23

Attention is currently required from: Christian Walter, Eric Lai, Patrick Rudolph, Paul Menzel, Tarun Tuli, Yuchen He. Michael Niewöhner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/75960?usp=email ) Change subject: mb/{cfl,cml,whl}: Use true/false macros for s0ix_enable dt option ...................................................................... Patch Set 6: (1 comment) Patchset: PS6: I think, it makes more sense, to do this with the more generic script in CB:75888 -- To view, visit https://review.coreboot.org/c/coreboot/+/75960?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ibfd1b1dc7d3a210e30d7007876f5aa8a8a0d4d34 Gerrit-Change-Number: 75960 Gerrit-PatchSet: 6 Gerrit-Owner: Yuchen He <yuchenhe126(a)gmail.com> Gerrit-Reviewer: Christian Walter <christian.walter(a)9elements.com> Gerrit-Reviewer: Eric Lai <eric_lai(a)quanta.corp-partner.google.com> Gerrit-Reviewer: Felix Singer <service+coreboot-gerrit(a)felixsinger.de> Gerrit-Reviewer: Michael Niewöhner <foss(a)mniewoehner.de> Gerrit-Reviewer: Patrick Rudolph <patrick.rudolph(a)9elements.com> Gerrit-Reviewer: Tarun Tuli <taruntuli(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Tarun Tuli <taruntuli(a)google.com> Gerrit-Attention: Patrick Rudolph <patrick.rudolph(a)9elements.com> Gerrit-Attention: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Christian Walter <christian.walter(a)9elements.com> Gerrit-Attention: Eric Lai <eric_lai(a)quanta.corp-partner.google.com> Gerrit-Attention: Yuchen He <yuchenhe126(a)gmail.com> Gerrit-Comment-Date: Tue, 27 Jun 2023 14:51:28 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[M] Change in coreboot[master]: vendorcode/amd/fsp/phoenix: Add dmi_info.h header
by Konrad Adamczyk (Code Review) 27 Jun '23

27 Jun '23

Attention is currently required from: Felix Held, Fred Reitberger, Jason Glenesk, Matt DeVillier. Konrad Adamczyk has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/76107?usp=email ) Change subject: vendorcode/amd/fsp/phoenix: Add dmi_info.h header ...................................................................... Patch Set 1: -Code-Review -- To view, visit https://review.coreboot.org/c/coreboot/+/76107?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I5e0109af51b78360f7038b20a2975aceb721a7d5 Gerrit-Change-Number: 76107 Gerrit-PatchSet: 1 Gerrit-Owner: Konrad Adamczyk <konrada(a)google.com> Gerrit-Reviewer: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Reviewer: Fred Reitberger <reitbergerfred(a)gmail.com> Gerrit-Reviewer: Jason Glenesk <jason.glenesk(a)gmail.com> Gerrit-Reviewer: Konrad Adamczyk <konrada(a)google.com> Gerrit-Reviewer: Matt DeVillier <matt.devillier(a)amd.corp-partner.google.com> Gerrit-Attention: Jason Glenesk <jason.glenesk(a)gmail.com> Gerrit-Attention: Matt DeVillier <matt.devillier(a)amd.corp-partner.google.com> Gerrit-Attention: Fred Reitberger <reitbergerfred(a)gmail.com> Gerrit-Attention: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Comment-Date: Tue, 27 Jun 2023 14:50:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in coreboot[master]: vendorcode/amd/fsp/phoenix: Add dmi_info.h header
by Konrad Adamczyk (Code Review) 27 Jun '23

27 Jun '23

Attention is currently required from: Felix Held, Fred Reitberger, Jason Glenesk, Matt DeVillier. Konrad Adamczyk has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/76107?usp=email ) Change subject: vendorcode/amd/fsp/phoenix: Add dmi_info.h header ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://review.coreboot.org/c/coreboot/+/76107?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I5e0109af51b78360f7038b20a2975aceb721a7d5 Gerrit-Change-Number: 76107 Gerrit-PatchSet: 1 Gerrit-Owner: Konrad Adamczyk <konrada(a)google.com> Gerrit-Reviewer: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Reviewer: Fred Reitberger <reitbergerfred(a)gmail.com> Gerrit-Reviewer: Jason Glenesk <jason.glenesk(a)gmail.com> Gerrit-Reviewer: Konrad Adamczyk <konrada(a)google.com> Gerrit-Reviewer: Matt DeVillier <matt.devillier(a)amd.corp-partner.google.com> Gerrit-Attention: Jason Glenesk <jason.glenesk(a)gmail.com> Gerrit-Attention: Matt DeVillier <matt.devillier(a)amd.corp-partner.google.com> Gerrit-Attention: Fred Reitberger <reitbergerfred(a)gmail.com> Gerrit-Attention: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Comment-Date: Tue, 27 Jun 2023 14:50:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[L] Change in coreboot[master]: payloads/external/LinuxBoot: Clean up
by Maximilian Brune (Code Review) 27 Jun '23

27 Jun '23

Maximilian Brune has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/76150?usp=email ) Change subject: payloads/external/LinuxBoot: Clean up ...................................................................... payloads/external/LinuxBoot: Clean up There were some issues with the current Linuxboot Makefiles. - multithreaded compilation didn't work, because some prerequisites were missing - initramfs wasn't added for x86 qemu boot. - riscv support was incomplete It began with seperate patches, but resulted in a clean up patch, that is hard to seperate. The most important changes are the following: - Instead of phony targets, actual files are now used - riscv can now be used as target - initramfs works now also for x86 - instead of querying the most recent version from the internet, I set a known working version (because I tested it) that can be customized and/or upgraded in the future. - I removed as much ifeq statements as possible and moved that responsibility to Kconfig, because they tend to make the Makefile less readable. Signed-off-by: Maximilian Brune <maximilian.brune(a)9elements.com> Change-Id: I25e757108e0dd473969fe5a192ad0733f1fe6286 --- M payloads/external/LinuxBoot/Kconfig M payloads/external/LinuxBoot/Makefile M payloads/external/LinuxBoot/arm64/kernel_fdt_lzma.its M payloads/external/LinuxBoot/targets/linux.mk M payloads/external/LinuxBoot/targets/u-root.mk M payloads/external/Makefile.inc 6 files changed, 104 insertions(+), 215 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/50/76150/1 diff --git a/payloads/external/LinuxBoot/Kconfig b/payloads/external/LinuxBoot/Kconfig index 4feb98b9..caebf27 100644 --- a/payloads/external/LinuxBoot/Kconfig +++ b/payloads/external/LinuxBoot/Kconfig @@ -84,33 +84,20 @@ endchoice -config LINUXBOOT_KERNEL_CUSTOM_VERSION +config LINUXBOOT_KERNEL_VERSION string "kernel version" - default "" - depends on LINUXBOOT_KERNEL_CUSTOM + default "6.3.9" help Choose the Linux kernel version number. (x.x.x) Release candidate kernels (rc) are currently are not supported. -choice - prompt "Kernel configuration" - default LINUXBOOT_KERNEL_ARCH_DEFAULT_CONFIG - -config LINUXBOOT_KERNEL_ARCH_DEFAULT_CONFIG - bool "Default architecture configuration" - help - This option will use the default configuration for the - selected architecture. - -config LINUXBOOT_KERNEL_CUSTOM_CONFIG - bool "Custom (def)config file" - -endchoice - config LINUXBOOT_KERNEL_CONFIGFILE string "Config file path" - default "defconfig" - depends on LINUXBOOT_KERNEL_CUSTOM_CONFIG + default "arm64/defconfig" if LINUXBOOT_ARM64 + default "x86_64/defconfig" if LINUXBOOT_X86_64 + default "x86/defconfig" if LINUXBOOT_X86 + default "arm64/defconfig" if LINUXBOOT_ARM64 + default "riscv/defconfig" if LINUXBOOT_RISCV help Path to the kernel configuration file. @@ -131,10 +118,10 @@ endchoice -config LINUXBOOT_DTB_FILE +config LINUXBOOT_DTS_FILE string "Compiled devicetree file" depends on LINUXBOOT_ARM64 || LINUXBOOT_RISCV - default "" + default "empty.dts" endif #LINUXBOOT_COMPILE_KERNEL @@ -145,8 +132,8 @@ Add your own kernel command-line arguments. config PAYLOAD_FILE - default "payloads/external/LinuxBoot/linuxboot/bzImage" if LINUXBOOT_COMPILE_KERNEL && ( LINUXBOOT_X86 || LINUXBOOT_X86_64 ) - default "payloads/external/LinuxBoot/linuxboot/uImage" if LINUXBOOT_COMPILE_KERNEL && (LINUXBOOT_ARM64 || LINUXBOOT_RISCV) + default "payloads/external/LinuxBoot/build/bzImage" if LINUXBOOT_COMPILE_KERNEL && ( LINUXBOOT_X86 || LINUXBOOT_X86_64 ) + default "payloads/external/LinuxBoot/build/uImage" if LINUXBOOT_COMPILE_KERNEL && (LINUXBOOT_ARM64 || LINUXBOOT_RISCV) default LINUXBOOT_KERNEL_PATH if !LINUXBOOT_COMPILE_KERNEL comment "Linux initramfs" @@ -157,7 +144,7 @@ config LINUXBOOT_INITRAMFS_PATH string "Path to initramfs" - depends on !LINUXBOOT_BUILD_INITRAMFS + default "build/initramfs_u-root.cpio" if LINUXBOOT_UROOT if LINUXBOOT_BUILD_INITRAMFS @@ -345,11 +332,6 @@ endchoice -config LINUX_INITRD - string - default "payloads/external/LinuxBoot/linuxboot/initramfs_u-root.cpio" if LINUXBOOT_UROOT - default LINUXBOOT_INITRAMFS_PATH if !LINUXBOOT_BUILD_INITRAMFS - config LINUXBOOT_INITRAMFS_SUFFIX string default "" if LINUXBOOT_INITRAMFS_COMPRESSION_NONE diff --git a/payloads/external/LinuxBoot/Makefile b/payloads/external/LinuxBoot/Makefile index cd9f7ea..c4cd87f 100644 --- a/payloads/external/LinuxBoot/Makefile +++ b/payloads/external/LinuxBoot/Makefile @@ -1,62 +1,51 @@ ## SPDX-License-Identifier: GPL-2.0-only -project_dir=linuxboot - unexport $(COREBOOT_EXPORTS) -all: linuxboot +ARCH-$(CONFIG_LINUXBOOT_X86_64)=x86_64 +ARCH-$(CONFIG_LINUXBOOT_X86)=x86 +ARCH-$(CONFIG_LINUXBOOT_ARM64)=arm64 +ARCH-$(CONFIG_LINUXBOOT_RISCV)=riscv +top:=../../.. -u-root: - $(MAKE) -f targets/u-root.mk +linuxboot: $(top)/$(CONFIG_PAYLOAD_FILE) -ifeq ($(CONFIG_LINUXBOOT_BUILD_INITRAMFS),y) -ifeq ($(CONFIG_LINUXBOOT_UROOT),y) -initramfs: u-root -endif -else -ifneq ($(CONFIG_LINUXBOOT_INITRAMFS),) -initramfs: - if [[ ! -f "$(top)/$(CONFIG_LINUXBOOT_INITRAMFS)" ]]; then \ - echo "<< Linux initramfs '$(CONFIG_LINUXBOOT_INITRAMFS)' is missing. >>"; \ - exit 1; \ - fi -endif -endif +include targets/linux.mk targets/u-root.mk -initramfs_compressed: initramfs +build/initramfs: $(CONFIG_LINUXBOOT_INITRAMFS_PATH) ifeq ($(CONFIG_LINUXBOOT_INITRAMFS_COMPRESSION_XZ),y) - xz --keep --force --check=crc32 --lzma2=dict=1MiB $(top)/$(CONFIG_LINUXBOOT_INITRAMFS) + xz --keep --force --check=crc32 --lzma2=dict=1MiB $(CONFIG_LINUXBOOT_INITRAMFS_PATH) +endif + cp $(CONFIG_LINUXBOOT_INITRAMFS_PATH)$(CONFIG_LINUXBOOT_INITRAMFS_SUFFIX) $@ + +#ifeq ($(CONFIG_LINUXBOOT_COMPILE_KERNEL),y) + +ifeq ($(CONFIG_LINUXBOOT_KERNEL_BZIMAGE),y) + +$(top)/$(CONFIG_PAYLOAD_FILE): $(kernel_dir)/arch/x86/boot/bzImage | build + cp $< $@ + +else ifeq ($(CONFIG_LINUXBOOT_KERNEL_UIMAGE),y) + +build/target.dtb: $(CONFIG_LINUXBOOT_DTS_FILE) + dtc -o $@ $< + +$(top)/$(CONFIG_PAYLOAD_FILE): build/vmlinux.bin.lzma build/initramfs build/target.dtb $(ARCH-y)/kernel_fdt_lzma.its + mkimage -f $(ARCH-y)/kernel_fdt_lzma.its $@ + endif -ifeq ($(CONFIG_LINUXBOOT_COMPILE_KERNEL),y) -ifeq ($(CONFIG_LINUXBOOT_ARCH),arm64) -kernel: initramfs - if [[ ! -f "$(top)/$(CONFIG_LINUXBOOT_DTB_FILE)" ]]; then \ - echo "<< Linux kernel devicetree is missing. >>"; \ - exit 1; \ - fi - $(MAKE) -f targets/linux.mk -else -kernel: - $(MAKE) -f targets/linux.mk -endif -else -kernel: - if [[ ! -f "$(top)/$(CONFIG_LINUXBOOT_KERNEL)" ]]; then \ - echo "<< Linux kernel '$(CONFIG_LINUXBOOT_KERNEL)' is missing. >>"; \ - exit 1; \ - fi -endif - -linuxboot: kernel initramfs_compressed +#TODO this is a bit confusing +build: + mkdir build clean: - rm -rf $(project_dir)/kernel* - rm -f $(project_dir)/u-root - rm -f $(project_dir)/initramfs* - rm -f $(project_dir)/bzImage + rm -rf build/kernel* + rm -f build/u-root + rm -f build/initramfs* + rm -f build/bzImage distclean: - rm -rf $(project_dir) + rm -rf build -.PHONY: linuxboot kernel initramfs_compressed initramfs u-root clean distclean +.PHONY: linuxboot clean distclean diff --git a/payloads/external/LinuxBoot/arm64/kernel_fdt_lzma.its b/payloads/external/LinuxBoot/arm64/kernel_fdt_lzma.its index 3087e69..46c43ac 100644 --- a/payloads/external/LinuxBoot/arm64/kernel_fdt_lzma.its +++ b/payloads/external/LinuxBoot/arm64/kernel_fdt_lzma.its @@ -11,7 +11,7 @@ images { kernel { description = "Vanilla Linux kernel"; - data = /incbin/("vmlinux.bin.lzma"); + data = /incbin/("../build/vmlinux.bin.lzma"); type = "kernel"; arch = "arm64"; os = "linux"; @@ -30,7 +30,7 @@ }; fdt-1 { description = "Flattened Device Tree blob"; - data = /incbin/("target.dtb"); + data = /incbin/("../build/target.dtb"); type = "flat_dt"; arch = "arm64"; compression = "none"; @@ -46,7 +46,7 @@ }; ramdisk-1 { description = "Compressed Initramfs"; - data = /incbin/("initramfs"); + data = /incbin/("../build/initramfs"); type = "ramdisk"; arch = "arm64"; os = "linux"; @@ -65,6 +65,7 @@ configurations { default = "conf-1"; conf-1 { + compatible = "linuxboot"; description = "Boot Linux kernel with FDT blob"; kernel = "kernel"; fdt = "fdt-1"; diff --git a/payloads/external/LinuxBoot/targets/linux.mk b/payloads/external/LinuxBoot/targets/linux.mk index 12f66f7..a28a5f3 100644 --- a/payloads/external/LinuxBoot/targets/linux.mk +++ b/payloads/external/LinuxBoot/targets/linux.mk @@ -1,39 +1,21 @@ ## SPDX-License-Identifier: GPL-2.0-only -SHELL := /bin/bash - -ARCH-$(CONFIG_LINUXBOOT_X86_64)=x86_64 -ARCH-$(CONFIG_LINUXBOOT_X86)=x86 -ARCH-$(CONFIG_LINUXBOOT_ARM64)=arm64 - -TAG-$(CONFIG_LINUXBOOT_KERNEL_MAINLINE)=mainline -TAG-$(CONFIG_LINUXBOOT_KERNEL_STABLE)=stable -TAG-$(CONFIG_LINUXBOOT_KERNEL_LONGTERM)=longterm +SHELL := /bin/sh pwd:=$(shell pwd) top:=../../.. -project_dir=linuxboot -tarball_dir:=$(project_dir)/tarball -decompress_flag=.done OBJCOPY:=$(LINUXBOOT_CROSS_COMPILE)objcopy KERNEL_MAKE_FLAGS = \ + CROSS_COMPILE=$(LINUXBOOT_CROSS_COMPILE) \ ARCH=$(ARCH-y) \ KBUILD_BUILD_USER="coreboot" \ KBUILD_BUILD_HOST="reproducible" \ KBUILD_BUILD_TIMESTAMP="$(shell perl -e 'print scalar gmtime($(SOURCE_DATE_EPOCH))')" \ KBUILD_BUILD_VERSION="0" -ifeq ($(CONFIG_LINUXBOOT_KERNEL_CUSTOM),y) - kernel_version:=$(CONFIG_LINUXBOOT_KERNEL_CUSTOM_VERSION) -else - kernel_version:=$(shell curl -sS -k https://www.kernel.org/feeds/kdist.xml | \ - sed -n -e 's@.*<guid isPermaLink="false">$.*$</guid>.*@\1@p' | \ - awk -F ',' '/$(TAG-y)/{ print $$3 }' | \ - head -n 1) -endif - -kernel_dir=$(project_dir)/kernel-$(subst .,_,$(kernel_version)) +kernel_version=$(CONFIG_LINUXBOOT_KERNEL_VERSION) +kernel_dir=kernel-$(subst .,_,$(kernel_version)) kernel_tarball=linux-$(kernel_version).tar kernel_mirror=https://mirrors.edge.kernel.org/pub/linux/kernel @@ -49,81 +31,33 @@ kernel_mirror_path := $(kernel_mirror)/v6.x endif -all: kernel +$(kernel_tarball).xz: + echo " Test $(kernel_version)" + echo " WWW $(kernel_mirror_path)/$(kernel_tarball).xz"; + curl -OLSs "$(kernel_mirror_path)/$(kernel_tarball).xz"; -lookup: -ifeq ($(kernel_version),) - $(error kernel version lookup failed for $(TAG-y) release) -endif - @echo " WWW Kernel [$(TAG-y)] $(kernel_version)" +$(kernel_dir): $(kernel_tarball).xz + echo " XZ $(kernel_tarball).xz"; + mkdir $(kernel_dir); + tar xJf $(kernel_tarball).xz --strip 1 -C $(kernel_dir); -fetch: -ifneq ($(shell [[ -d "$(kernel_dir)" && -f "$(kernel_dir)/$(decompress_flag)" ]];echo $$?),0) - mkdir -p $(tarball_dir) - if [[ ! -f $(tarball_dir)/$(kernel_tarball).xz && ! -f $(tarball_dir)/$(kernel_tarball).xz ]]; then \ - echo " WWW $(kernel_tarball).xz"; \ - cd $(tarball_dir); \ - curl -OLSs "$(kernel_mirror_path)/$(kernel_tarball).xz"; \ - cd $(pwd); \ - fi -endif - -unpack: fetch - if [[ -d "$(kernel_dir)" && ! -f "$(kernel_dir)/$(decompress_flag)" ]]; then \ - rm -rf $(kernel_dir); \ - fi - if [[ ! -d "$(kernel_dir)" ]]; then \ - mkdir $(kernel_dir); \ - echo " XZ $(kernel_tarball).xz"; \ - tar xJf $(tarball_dir)/$(kernel_tarball).xz --strip 1 -C $(kernel_dir); \ - fi - touch $(kernel_dir)/$(decompress_flag) - -$(kernel_dir)/.config: unpack +$(kernel_dir)/.config: $(CONFIG_LINUXBOOT_KERNEL_CONFIGFILE) | $(kernel_dir) @echo " CONFIG Linux $(kernel_version)" -ifeq ($(CONFIG_LINUXBOOT_KERNEL_CUSTOM_CONFIG),y) cp $(CONFIG_LINUXBOOT_KERNEL_CONFIGFILE) $(kernel_dir)/.config -else - cp $(ARCH-y)/defconfig $(kernel_dir)/.config -endif $(MAKE) -C $(kernel_dir) $(KERNEL_MAKE_FLAGS) olddefconfig -build: $(kernel_dir)/.config +$(kernel_dir)/vmlinux : $(kernel_dir)/.config | $(kernel_dir) @echo " MAKE Linux $(kernel_version)" -ifeq ($(CONFIG_LINUXBOOT_KERNEL_BZIMAGE),y) - $(MAKE) -C $(kernel_dir) $(KERNEL_MAKE_FLAGS) CROSS_COMPILE=$(LINUXBOOT_CROSS_COMPILE) bzImage -else -ifeq ($(CONFIG_LINUXBOOT_KERNEL_UIMAGE),y) - $(MAKE) -C $(kernel_dir) $(KERNEL_MAKE_FLAGS) CROSS_COMPILE=$(LINUXBOOT_CROSS_COMPILE) vmlinux -endif -endif + $(MAKE) -j 4 -C $(kernel_dir) $(KERNEL_MAKE_FLAGS) CROSS_COMPILE=$(LINUXBOOT_CROSS_COMPILE) vmlinux -ifeq ($(CONFIG_LINUXBOOT_KERNEL_BZIMAGE),y) -$(top)/$(CONFIG_LINUXBOOT_KERNEL): build - @echo " CP bzImage" - cp $(kernel_dir)/arch/x86/boot/bzImage $@ -else -ifeq ($(CONFIG_LINUXBOOT_KERNEL_UIMAGE),y) -$(project_dir)/target.dtb: $(top)/$(CONFIG_LINUXBOOT_DTB_FILE) - cp $< $@ -$(project_dir)/vmlinux.bin: $(kernel_dir)/vmlinux +build/vmlinux.bin: $(kernel_dir)/vmlinux | build $(OBJCOPY) -O binary $< $@ -$(project_dir)/vmlinux.bin.lzma: $(project_dir)/vmlinux.bin + +build/vmlinux.bin.lzma: build/vmlinux.bin xz -c -k -f --format=lzma --lzma1=dict=1MiB,lc=3,lp=0,pb=3 $< > $@ -$(top)/$(CONFIG_LINUXBOOT_KERNEL): build $(project_dir)/vmlinux.bin.lzma $(project_dir)/target.dtb - cp $(project_dir)/../arm64/kernel_fdt_lzma.its $(project_dir) - cp $(top)/$(CONFIG_LINUXBOOT_INITRAMFS)$(CONFIG_LINUXBOOT_INITRAMFS_SUFFIX) $(project_dir)/initramfs - mkimage -f $(project_dir)/kernel_fdt_lzma.its $@ -else - $(error Kernel image format not found) - exit 1 -endif -endif -ifneq ($(TAG-y),) -kernel: lookup $(top)/$(CONFIG_LINUXBOOT_KERNEL) -else -kernel: $(top)/$(CONFIG_LINUXBOOT_KERNEL) -endif +$(kernel_dir)/arch/x86/boot/bzImage: $(kernel_dir)/.config + @echo " MAKE Linux $(kernel_version)" + $(MAKE) -C $(kernel_dir) $(KERNEL_MAKE_FLAGS) CROSS_COMPILE=$(LINUXBOOT_CROSS_COMPILE) bzImage -.PHONY: all kernel build unpack fetch check +.PHONY: kernel diff --git a/payloads/external/LinuxBoot/targets/u-root.mk b/payloads/external/LinuxBoot/targets/u-root.mk index e673aab..52c8956 100644 --- a/payloads/external/LinuxBoot/targets/u-root.mk +++ b/payloads/external/LinuxBoot/targets/u-root.mk @@ -1,13 +1,12 @@ ## SPDX-License-Identifier: GPL-2.0-only -project_dir=$(shell pwd)/linuxboot -go_path_dir=$(project_dir)/go -uroot_bin=$(project_dir)/u-root uroot_package=github.com/u-root/u-root +uroot_build=build/go/src/$(uroot_package) -ARCH-$(CONFIG_LIBUXBOOT_X86_64)=amd64 -ARCH-$(CONFIG_LINUXBOOT_X86)=i386 -ARCH-$(CONFIG_LINUXBOOT_ARM64)=arm64 +UROOT_ARCH-$(CONFIG_LIBUXBOOT_X86_64)=amd64 +UROOT_ARCH-$(CONFIG_LINUXBOOT_X86)=i386 +UROOT_ARCH-$(CONFIG_LINUXBOOT_ARM64)=arm64 +UROOT_ARCH-$(CONFIG_LINUXBOOT_RISCV)=riscv64 go_version=$(shell go version | sed -nr 's/.*go([0-9]+\.[0-9]+.?[0-9]?).*/\1/p' ) go_version_major=$(shell echo $(go_version) | sed -nr 's/^([0-9]+)\.([0-9]+)\.?([0-9]*)$$/\1/p') @@ -23,8 +22,6 @@ uroot_cmds=$(CONFIG_LINUXBOOT_UROOT_COMMANDS) -all: u-root - version: ifeq ("$(go_version)","") printf "\n<<Please install Golang >= 1.9 for u-root mode>>\n\n" @@ -38,27 +35,16 @@ endif endif -get: version - if [ -d "$(go_path_dir)/src/$(uroot_package)" ]; then \ - git -C $(go_path_dir)/src/$(uroot_package) checkout --quiet main; \ - git -C $(go_path_dir)/src/$(uroot_package) pull || \ - echo -e "\n<<Pulling u-root package from GitHub failed>>\n"; \ - else \ - git clone https://${uroot_package} ${go_path_dir}/src/${uroot_package} || \ - (echo -e "\n<<Failed to clone u-root package. Please check your internet access>>\n" && \ - exit 1); \ - fi +$(uroot_build): + git clone https://$(uroot_package) $(uroot_build) + git -C $(uroot_build) checkout --quiet $(CONFIG_LINUXBOOT_UROOT_VERSION) -checkout: get - git -C $(go_path_dir)/src/$(uroot_package) checkout --quiet $(CONFIG_LINUXBOOT_UROOT_VERSION) +$(uroot_build)/u-root: $(uroot_build) + cd $(uroot_build); \ + go build -o u-root . -build: checkout - cd ${go_path_dir}/src/${uroot_package}; \ - go build -o ${uroot_bin} . - -u-root: build - GOARCH=$(ARCH-y) $(uroot_bin) \ - -uroot-source ${go_path_dir}/src/${uroot_package} \ - $(uroot_args) -o $(project_dir)/initramfs_u-root.cpio $(uroot_cmds) - -.PHONY: all u-root build checkout get version +#$(CONFIG_LINUXBOOT_INITRAMFS_PATH) +build/initramfs_u-root.cpio: $(uroot_build)/u-root + GOARCH=$(UROOT_ARCH-y) $(uroot_build)/u-root \ + -uroot-source $(uroot_build) \ + $(uroot_args) -o build/initramfs_u-root.cpio $(uroot_cmds) diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc index 85e01b9..92fa205 100644 --- a/payloads/external/Makefile.inc +++ b/payloads/external/Makefile.inc @@ -26,8 +26,8 @@ endif ifneq ($(strip $(call strip_quotes,$(CONFIG_LINUX_INITRD))),) ifneq ($(CONFIG_LINUXBOOT_ARM64),y) - ADDITIONAL_PAYLOAD_CONFIG+=-I $(CONFIG_LINUX_INITRD)$(CONFIG_LINUXBOOT_INITRAMFS_SUFFIX) - prebuilt-files += $(strip $(call strip_quotes,$(CONFIG_LINUX_INITRD))) + ADDITIONAL_PAYLOAD_CONFIG+=-I $(CONFIG_LINUX_INITRD)$(CONFIG_LINUXBOOT_INITRAMFS)$(CONFIG_LINUXBOOT_INITRAMFS_SUFFIX) + prebuilt-files += $(strip $(call strip_quotes,$(CONFIG_LINUX_INITRD)$(CONFIG_LINUXBOOT_INITRAMFS))) endif endif endif @@ -371,24 +371,20 @@ linuxboot: $(MAKE) -C payloads/external/LinuxBoot \ CPUS=$(CPUS) \ + CONFIG_PAYLOAD_FILE=$(CONFIG_PAYLOAD_FILE) \ CONFIG_LINUXBOOT_X86_64=$(CONFIG_LINUXBOOT_X86_64) \ CONFIG_LINUXBOOT_X86=$(CONFIG_LINUXBOOT_X86) \ CONFIG_LINUXBOOT_ARM64=$(CONFIG_LINUXBOOT_ARM64) \ - CONFIG_LINUXBOOT_KERNEL=$(CONFIG_PAYLOAD_FILE) \ - CONFIG_LINUXBOOT_INITRAMFS=$(CONFIG_LINUX_INITRD) \ - CONFIG_LINUXBOOT_INITRAMFS_SUFFIX=$(CONFIG_LINUXBOOT_INITRAMFS_SUFFIX) \ - CONFIG_LINUXBOOT_COMPILE_KERNEL=$(CONFIG_LINUXBOOT_COMPILE_KERNEL) \ + CONFIG_LINUXBOOT_RISCV=$(CONFIG_LINUXBOOT_RISCV) \ CONFIG_LINUXBOOT_BUILD_INITRAMFS=$(CONFIG_LINUXBOOT_BUILD_INITRAMFS) \ - CONFIG_LINUXBOOT_KERNEL_MAINLINE=$(CONFIG_LINUXBOOT_KERNEL_MAINLINE) \ - CONFIG_LINUXBOOT_KERNEL_STABLE=$(CONFIG_LINUXBOOT_KERNEL_STABLE) \ - CONFIG_LINUXBOOT_KERNEL_LONGTERM=$(CONFIG_LINUXBOOT_KERNEL_LONGTERM) \ - CONFIG_LINUXBOOT_KERNEL_CUSTOM=$(CONFIG_LINUXBOOT_KERNEL_CUSTOM) \ - CONFIG_LINUXBOOT_KERNEL_CUSTOM_VERSION=$(CONFIG_LINUXBOOT_KERNEL_CUSTOM_VERSION) \ - CONFIG_LINUXBOOT_KERNEL_CUSTOM_CONFIG=$(CONFIG_LINUXBOOT_KERNEL_CUSTOM_CONFIG) \ + CONFIG_LINUXBOOT_INITRAMFS_PATH=$(CONFIG_LINUXBOOT_INITRAMFS_PATH) \ + CONFIG_LINUXBOOT_INITRAMFS_SUFFIX=$(CONFIG_LINUXBOOT_INITRAMFS_SUFFIX) \ + CONFIG_LINUXBOOT_INITRAMFS_COMPRESSION_XZ=$(CONFIG_LINUXBOOT_INITRAMFS_COMPRESSION_XZ) \ + CONFIG_LINUXBOOT_COMPILE_KERNEL=$(CONFIG_LINUXBOOT_COMPILE_KERNEL) \ + CONFIG_LINUXBOOT_KERNEL_VERSION=$(CONFIG_LINUXBOOT_KERNEL_VERSION) \ CONFIG_LINUXBOOT_KERNEL_BZIMAGE=$(CONFIG_LINUXBOOT_KERNEL_BZIMAGE) \ CONFIG_LINUXBOOT_KERNEL_UIMAGE=$(CONFIG_LINUXBOOT_KERNEL_UIMAGE) \ CONFIG_LINUXBOOT_KERNEL_CONFIGFILE=$(CONFIG_LINUXBOOT_KERNEL_CONFIGFILE) \ - CONFIG_LINUXBOOT_INITRAMFS_COMPRESSION_XZ=$(CONFIG_LINUXBOOT_INITRAMFS_COMPRESSION_XZ) \ CONFIG_LINUXBOOT_UROOT=$(CONFIG_LINUXBOOT_UROOT) \ CONFIG_LINUXBOOT_UROOT_VERSION=$(CONFIG_LINUXBOOT_UROOT_VERSION) \ CONFIG_LINUXBOOT_UROOT_FORMAT=$(CONFIG_LINUXBOOT_UROOT_FORMAT) \ @@ -397,11 +393,12 @@ CONFIG_LINUXBOOT_UROOT_SHELL=$(CONFIG_LINUXBOOT_UROOT_SHELL) \ CONFIG_LINUXBOOT_UROOT_COMMANDS=$(CONFIG_LINUXBOOT_UROOT_COMMANDS) \ CONFIG_LINUXBOOT_UROOT_FILES=$(CONFIG_LINUXBOOT_UROOT_FILES) \ - CONFIG_LINUXBOOT_DTB_FILE=$(CONFIG_LINUXBOOT_DTB_FILE) + CONFIG_LINUXBOOT_DTS_FILE=$(CONFIG_LINUXBOOT_DTS_FILE) \ + LINUXBOOT_CROSS_COMPILE="$(CROSS_COMPILE_$(ARCH-bootblock-y))" \ -payloads/external/LinuxBoot/linuxboot/bzImage: linuxboot -payloads/external/LinuxBoot/linuxboot/uImage: linuxboot -payloads/external/LinuxBoot/linuxboot/initramfs_u-root.cpio: linuxboot +payloads/external/LinuxBoot/build/bzImage: linuxboot +payloads/external/LinuxBoot/build/uImage: linuxboot +payloads/external/LinuxBoot/build/initramfs_u-root.cpio: linuxboot # BOOTBOOT -- To view, visit https://review.coreboot.org/c/coreboot/+/76150?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I25e757108e0dd473969fe5a192ad0733f1fe6286 Gerrit-Change-Number: 76150 Gerrit-PatchSet: 1 Gerrit-Owner: Maximilian Brune <maximilian.brune(a)9elements.com> Gerrit-MessageType: newchange

1 0

[XS] Change in coreboot[master]: soc/amd/phoenix/Kconfig: Drop TODO for FSP_DMI_TABLES
by Konrad Adamczyk (Code Review) 27 Jun '23

27 Jun '23

Attention is currently required from: Felix Held, Fred Reitberger, Jason Glenesk, Matt DeVillier. Konrad Adamczyk has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/76109?usp=email ) Change subject: soc/amd/phoenix/Kconfig: Drop TODO for FSP_DMI_TABLES ...................................................................... soc/amd/phoenix/Kconfig: Drop TODO for FSP_DMI_TABLES BUG=b:288520486 TEST=In kernel, dump `dmidecode -t 17`. Signed-off-by: Konrad Adamczyk <konrada(a)google.com> Change-Id: I1a8aae12ec449fe921814a6e363306fced969367 --- M src/soc/amd/phoenix/Kconfig 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/09/76109/1 diff --git a/src/soc/amd/phoenix/Kconfig b/src/soc/amd/phoenix/Kconfig index 942c931..4ab26ee 100644 --- a/src/soc/amd/phoenix/Kconfig +++ b/src/soc/amd/phoenix/Kconfig @@ -78,7 +78,7 @@ select SOC_AMD_COMMON_BLOCK_UCODE select SOC_AMD_COMMON_BLOCK_XHCI select SOC_AMD_COMMON_FSP_CCX_CPPC_HOB # TODO: Check if this is still correct - select SOC_AMD_COMMON_FSP_DMI_TABLES # TODO: Check if this is still correct + select SOC_AMD_COMMON_FSP_DMI_TABLES select SOC_AMD_COMMON_FSP_PCI # TODO: Check if this is still correct select SOC_AMD_COMMON_FSP_PRELOAD_FSPS select SSE2 -- To view, visit https://review.coreboot.org/c/coreboot/+/76109?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I1a8aae12ec449fe921814a6e363306fced969367 Gerrit-Change-Number: 76109 Gerrit-PatchSet: 1 Gerrit-Owner: Konrad Adamczyk <konrada(a)google.com> Gerrit-Reviewer: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Reviewer: Fred Reitberger <reitbergerfred(a)gmail.com> Gerrit-Reviewer: Jason Glenesk <jason.glenesk(a)gmail.com> Gerrit-Reviewer: Matt DeVillier <matt.devillier(a)amd.corp-partner.google.com> Gerrit-Attention: Jason Glenesk <jason.glenesk(a)gmail.com> Gerrit-Attention: Matt DeVillier <matt.devillier(a)amd.corp-partner.google.com> Gerrit-Attention: Fred Reitberger <reitbergerfred(a)gmail.com> Gerrit-Attention: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-MessageType: newchange

1 0

[XS] Change in coreboot[master]: soc/amd/common/fsp: Fix dimm_num assignment
by Konrad Adamczyk (Code Review) 27 Jun '23

27 Jun '23

Attention is currently required from: Felix Held, Fred Reitberger, Jason Glenesk, Matt DeVillier, Raul Rangel. Konrad Adamczyk has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/76108?usp=email ) Change subject: soc/amd/common/fsp: Fix dimm_num assignment ...................................................................... soc/amd/common/fsp: Fix dimm_num assignment The dimm_num shall be populated with dimm, not channel. BUG=b:288520486 TEST=In kernel, see output from `dmidecode -t 17`. Observe that Locator reflects proper location of the module. Signed-off-by: Konrad Adamczyk <konrada(a)google.com> Change-Id: Id876a5c245ed1a145c930b3456830d7b42780b74 --- M src/soc/amd/common/fsp/dmi.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/08/76108/1 diff --git a/src/soc/amd/common/fsp/dmi.c b/src/soc/amd/common/fsp/dmi.c index a671476..408c0e4 100644 --- a/src/soc/amd/common/fsp/dmi.c +++ b/src/soc/amd/common/fsp/dmi.c @@ -226,7 +226,7 @@ print_dmi_info(type17_dmi_info); dimm_info = &mem_info->dimm[dimm_cnt]; dimm_info->channel_num = channel; - dimm_info->dimm_num = channel; + dimm_info->dimm_num = dimm; transfer_memory_info(type17_dmi_info, dimm_info); if (use_cbi_part_number) { /* mem_info is memset to 0 above, so it's -- To view, visit https://review.coreboot.org/c/coreboot/+/76108?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Id876a5c245ed1a145c930b3456830d7b42780b74 Gerrit-Change-Number: 76108 Gerrit-PatchSet: 1 Gerrit-Owner: Konrad Adamczyk <konrada(a)google.com> Gerrit-Reviewer: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Reviewer: Fred Reitberger <reitbergerfred(a)gmail.com> Gerrit-Reviewer: Jason Glenesk <jason.glenesk(a)gmail.com> Gerrit-Reviewer: Matt DeVillier <matt.devillier(a)amd.corp-partner.google.com> Gerrit-Reviewer: Raul Rangel <rrangel(a)chromium.org> Gerrit-Attention: Jason Glenesk <jason.glenesk(a)gmail.com> Gerrit-Attention: Raul Rangel <rrangel(a)chromium.org> Gerrit-Attention: Matt DeVillier <matt.devillier(a)amd.corp-partner.google.com> Gerrit-Attention: Fred Reitberger <reitbergerfred(a)gmail.com> Gerrit-Attention: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-MessageType: newchange

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit June 2023