coreboot-gerrit November 2022

coreboot-gerrit@coreboot.org

1 participants
7286 discussions

[S] Change in coreboot[master]: [RFC] drivers/intel/fsp2_0/hand_off_block: limit number of processed ...
by Felix Held (Code Review) 14 Nov '22

14 Nov '22

Attention is currently required from: Andrey Petrov. Hello Andrey Petrov, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/coreboot/+/69580 to look at the new patch set (#3). Change subject: [RFC] drivers/intel/fsp2_0/hand_off_block: limit number of processed HOBs ...................................................................... [RFC] drivers/intel/fsp2_0/hand_off_block: limit number of processed HOBs Limit the number of HOBs fsp_hob_iterator_get_next will process to avoid a more or less infinite loop in case the HOB list in memory is broken. A relatively large number is chosen for HOB_PROCESSING_LIMIT, so that this check won't be run into during normal operation. Signed-off-by: Felix Held <felix-coreboot(a)felixheld.de> Change-Id: Ie89c5b7e0aff7926e819aca455554370afd36f43 --- M src/drivers/intel/fsp2_0/hand_off_block.c 1 file changed, 29 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/80/69580/3 -- To view, visit https://review.coreboot.org/c/coreboot/+/69580 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ie89c5b7e0aff7926e819aca455554370afd36f43 Gerrit-Change-Number: 69580 Gerrit-PatchSet: 3 Gerrit-Owner: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Reviewer: Andrey Petrov <andrey.petrov(a)gmail.com> Gerrit-CC: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Andrey Petrov <andrey.petrov(a)gmail.com> Gerrit-MessageType: newpatchset

1 0

[M] Change in coreboot[master]: drivers/intel/fsp2_0/hand_off_block: add functions to iterate over HOBs
by Felix Held (Code Review) 14 Nov '22

14 Nov '22

Felix Held has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/69475 ) Change subject: drivers/intel/fsp2_0/hand_off_block: add functions to iterate over HOBs ...................................................................... Patch Set 2: (1 comment) File src/drivers/intel/fsp2_0/hand_off_block.c: https://review.coreboot.org/c/coreboot/+/69475/comment/b87a7967_a6ba49d2 PS1, Line 140: while ((*hob_iterator)->type != HOB_TYPE_END_OF_HOB_LIST) { > i have no idea what a reasonable maximum number of hobs would be; 1000 maybe? since it's outside of […] pushed this improvement as CB:69580 -- To view, visit https://review.coreboot.org/c/coreboot/+/69475 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: If86dde2a9f41d0ca7941493a92f11b91a77e2ae0 Gerrit-Change-Number: 69475 Gerrit-PatchSet: 2 Gerrit-Owner: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Reviewer: Andrey Petrov <andrey.petrov(a)gmail.com> Gerrit-Reviewer: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Martin L Roth <gaumless(a)gmail.com> Gerrit-CC: Martin Roth <martin.roth(a)amd.corp-partner.google.com> Gerrit-Comment-Date: Mon, 14 Nov 2022 19:27:45 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Martin L Roth <gaumless(a)gmail.com> Comment-In-Reply-To: Martin Roth <martin.roth(a)amd.corp-partner.google.com> Comment-In-Reply-To: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-MessageType: comment

1 0

[S] Change in coreboot[master]: [RFC] drivers/intel/fsp2_0/hand_off_block: limit number of
by Felix Held (Code Review) 14 Nov '22

14 Nov '22

Attention is currently required from: Andrey Petrov. Hello Andrey Petrov, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/coreboot/+/69580 to look at the new patch set (#2). Change subject: [RFC] drivers/intel/fsp2_0/hand_off_block: limit number of ...................................................................... [RFC] drivers/intel/fsp2_0/hand_off_block: limit number of Limit the number of HOBs fsp_hob_iterator_get_next will process to avoid a more or less infinite loop in case the HOB list in memory is broken. A relatively large number is chosen for HOB_PROCESSING_LIMIT, so that this check won't be run into during normal operation. Signed-off-by: Felix Held <felix-coreboot(a)felixheld.de> Change-Id: Ie89c5b7e0aff7926e819aca455554370afd36f43 --- M src/drivers/intel/fsp2_0/hand_off_block.c 1 file changed, 29 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/80/69580/2 -- To view, visit https://review.coreboot.org/c/coreboot/+/69580 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ie89c5b7e0aff7926e819aca455554370afd36f43 Gerrit-Change-Number: 69580 Gerrit-PatchSet: 2 Gerrit-Owner: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Reviewer: Andrey Petrov <andrey.petrov(a)gmail.com> Gerrit-CC: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Andrey Petrov <andrey.petrov(a)gmail.com> Gerrit-MessageType: newpatchset

1 0

[S] Change in coreboot[master]: [RFC] drivers/intel/fsp2_0/hand_off_block: limit number of
by build bot (Jenkins) (Code Review) 14 Nov '22

14 Nov '22

Attention is currently required from: Andrey Petrov. build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/69580 ) Change subject: [RFC] drivers/intel/fsp2_0/hand_off_block: limit number of ...................................................................... Patch Set 1: (1 comment) File src/drivers/intel/fsp2_0/hand_off_block.c: Robot Comment from checkpatch (run ID jenkins-coreboot-checkpatch-163653): https://review.coreboot.org/c/coreboot/+/69580/comment/aa0ba720_7ca11fc7 PS1, Line 156: "further HOBs. There's likely somthing wrong with the HOB data " 'somthing' may be misspelled - perhaps 'something'? -- To view, visit https://review.coreboot.org/c/coreboot/+/69580 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ie89c5b7e0aff7926e819aca455554370afd36f43 Gerrit-Change-Number: 69580 Gerrit-PatchSet: 1 Gerrit-Owner: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Reviewer: Andrey Petrov <andrey.petrov(a)gmail.com> Gerrit-CC: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Andrey Petrov <andrey.petrov(a)gmail.com> Gerrit-Comment-Date: Mon, 14 Nov 2022 19:24:05 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in coreboot[master]: [RFC] drivers/intel/fsp2_0/hand_off_block: limit number of
by Felix Held (Code Review) 14 Nov '22

14 Nov '22

Felix Held has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/69580 ) Change subject: [RFC] drivers/intel/fsp2_0/hand_off_block: limit number of ...................................................................... [RFC] drivers/intel/fsp2_0/hand_off_block: limit number of Limit the number of HOBs fsp_hob_iterator_get_next will process to avoid a more or less infinite loop in case the HOB list in memory is broken. A relatively large number is chosen for HOB_PROCESSING_LIMIT, so that this check won't be run into during normal operation. Signed-off-by: Felix Held <felix-coreboot(a)felixheld.de> Change-Id: Ie89c5b7e0aff7926e819aca455554370afd36f43 --- M src/drivers/intel/fsp2_0/hand_off_block.c 1 file changed, 29 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/80/69580/1 diff --git a/src/drivers/intel/fsp2_0/hand_off_block.c b/src/drivers/intel/fsp2_0/hand_off_block.c index 2ded33699..573cbc9 100644 --- a/src/drivers/intel/fsp2_0/hand_off_block.c +++ b/src/drivers/intel/fsp2_0/hand_off_block.c @@ -11,6 +11,11 @@ #define HOB_HEADER_LEN 8 +/* Only process HOB_PROCESSING_LIMIT HOBs in fsp_hob_iterator_get_next to avoid an inifinite + loops in case of a broken HOB list in memory. This number should be large enough to not run + into this during normal operation */ +#define HOB_PROCESSING_LIMIT 1000 + /* GUIDs in little-endian, so they can be used with memcmp() */ const uint8_t fsp_bootloader_tolum_guid[16] = { 0x56, 0x4f, 0xff, 0x73, 0x8e, 0xaa, 0x51, 0x44, @@ -137,13 +142,22 @@ const struct hob_header **hob) { const struct hob_header *current_hob; + size_t hobs_processed = 0; while ((*hob_iterator)->type != HOB_TYPE_END_OF_HOB_LIST) { current_hob = *hob_iterator; *hob_iterator = fsp_next_hob(*hob_iterator); + hobs_processed++; if (current_hob->type == hob_type) { *hob = current_hob; return CB_SUCCESS; } + if (hobs_processed >= HOB_PROCESSING_LIMIT) { + printk(BIOS_ERR, "Processed more than %u HOBs; not proessing any " + "further HOBs. There's likely somthing wrong with the HOB data " + "structure in memory.\n", + HOB_PROCESSING_LIMIT); + return CB_ERR; + } } return CB_ERR; } -- To view, visit https://review.coreboot.org/c/coreboot/+/69580 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ie89c5b7e0aff7926e819aca455554370afd36f43 Gerrit-Change-Number: 69580 Gerrit-PatchSet: 1 Gerrit-Owner: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-MessageType: newchange

1 0

[S] Change in coreboot[master]: drv/intel/fsp2_0/hand_off_block: rework fsp_find_extension_hob_by_guid
by Felix Held (Code Review) 14 Nov '22

14 Nov '22

Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/69478 ) Change subject: drv/intel/fsp2_0/hand_off_block: rework fsp_find_extension_hob_by_guid ...................................................................... drv/intel/fsp2_0/hand_off_block: rework fsp_find_extension_hob_by_guid Use the new fsp_hob_iterator_get_next_guid_extension function in fsp_find_extension_hob_by_guid instead of iterating through the HOB list in this function. TEST=AMD_FSP_DMI_HOB is still found and the same type 17 DMI info is printed on the console. Signed-off-by: Felix Held <felix-coreboot(a)felixheld.de> Change-Id: I4d4ce14c8a5494763de3f65ed049f98a768c40a5 Reviewed-on: https://review.coreboot.org/c/coreboot/+/69478 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Arthur Heymans <arthur(a)aheymans.xyz> --- M src/drivers/intel/fsp2_0/hand_off_block.c 1 file changed, 25 insertions(+), 13 deletions(-) Approvals: build bot (Jenkins): Verified Arthur Heymans: Looks good to me, approved diff --git a/src/drivers/intel/fsp2_0/hand_off_block.c b/src/drivers/intel/fsp2_0/hand_off_block.c index 2738c78..2ded33699 100644 --- a/src/drivers/intel/fsp2_0/hand_off_block.c +++ b/src/drivers/intel/fsp2_0/hand_off_block.c @@ -233,22 +233,14 @@ const void *fsp_find_extension_hob_by_guid(const uint8_t *guid, size_t *size) { - const uint8_t *hob_guid; - const struct hob_header *hob = fsp_get_hob_list(); + const struct hob_header *hob_iterator; + const void *hob_guid; - if (!hob) + if (fsp_hob_iterator_init(&hob_iterator) != CB_SUCCESS) return NULL; - for (; hob->type != HOB_TYPE_END_OF_HOB_LIST; hob = fsp_next_hob(hob)) { - if (hob->type != HOB_TYPE_GUID_EXTENSION) - continue; - - hob_guid = hob_header_to_struct(hob); - if (fsp_guid_compare(hob_guid, guid)) { - *size = hob->length - (HOB_HEADER_LEN + 16); - return hob_header_to_extension_hob(hob); - } - } + if (fsp_hob_iterator_get_next_guid_extension(&hob_iterator, guid, &hob_guid, size) == CB_SUCCESS) + return hob_guid; return NULL; } -- To view, visit https://review.coreboot.org/c/coreboot/+/69478 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I4d4ce14c8a5494763de3f65ed049f98a768c40a5 Gerrit-Change-Number: 69478 Gerrit-PatchSet: 2 Gerrit-Owner: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Reviewer: Andrey Petrov <andrey.petrov(a)gmail.com> Gerrit-Reviewer: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: merged

1 0

[S] Change in coreboot[master]: drivers/intel/fsp2_0/hand_off_block: use iterator in fsp_find_range_hob
by Felix Held (Code Review) 14 Nov '22

14 Nov '22

Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/69477 ) Change subject: drivers/intel/fsp2_0/hand_off_block: use iterator in fsp_find_range_hob ...................................................................... drivers/intel/fsp2_0/hand_off_block: use iterator in fsp_find_range_hob Drop the find_resource_hob_by_guid implementation and use the new fsp_hob_iterator_init and fsp_hob_iterator_get_next_guid_resource functions in fsp_find_range_hob. TEST=Mandolin still finds the TSEG range HOB and uses the correct TSEG location. Signed-off-by: Felix Held <felix-coreboot(a)felixheld.de> Change-Id: I00786cbeea203fba195ddc953c3242be544a7d70 Reviewed-on: https://review.coreboot.org/c/coreboot/+/69477 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Arthur Heymans <arthur(a)aheymans.xyz> --- M src/drivers/intel/fsp2_0/hand_off_block.c 1 file changed, 23 insertions(+), 22 deletions(-) Approvals: build bot (Jenkins): Verified Arthur Heymans: Looks good to me, approved diff --git a/src/drivers/intel/fsp2_0/hand_off_block.c b/src/drivers/intel/fsp2_0/hand_off_block.c index 13fbb06..2738c78 100644 --- a/src/drivers/intel/fsp2_0/hand_off_block.c +++ b/src/drivers/intel/fsp2_0/hand_off_block.c @@ -190,23 +190,6 @@ return CB_ERR; } -static const -struct hob_resource *find_resource_hob_by_guid(const struct hob_header *hob, - const uint8_t guid[16]) -{ - const struct hob_resource *res; - - for (; hob->type != HOB_TYPE_END_OF_HOB_LIST; hob = fsp_next_hob(hob)) { - if (hob->type != HOB_TYPE_RESOURCE_DESCRIPTOR) - continue; - - res = fsp_hob_header_to_resource(hob); - if (fsp_guid_compare(res->owner_guid, guid)) - return res; - } - return NULL; -} - void fsp_print_guid(const void *base) { uint32_t big; @@ -224,17 +207,15 @@ int fsp_find_range_hob(struct range_entry *re, const uint8_t guid[16]) { + const struct hob_header *hob_iterator; const struct hob_resource *fsp_mem; - const void *hob_list = fsp_get_hob_list(); - if (!hob_list) + if (fsp_hob_iterator_init(&hob_iterator) != CB_SUCCESS) return -1; range_entry_init(re, 0, 0, 0); - fsp_mem = find_resource_hob_by_guid(hob_list, guid); - - if (!fsp_mem) { + if (fsp_hob_iterator_get_next_guid_resource(&hob_iterator, guid, &fsp_mem) != CB_SUCCESS) { fsp_print_guid(guid); printk(BIOS_SPEW, " not found!\n"); return -1; -- To view, visit https://review.coreboot.org/c/coreboot/+/69477 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I00786cbeea203fba195ddc953c3242be544a7d70 Gerrit-Change-Number: 69477 Gerrit-PatchSet: 2 Gerrit-Owner: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Reviewer: Andrey Petrov <andrey.petrov(a)gmail.com> Gerrit-Reviewer: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: merged

1 0

[M] Change in coreboot[master]: soc/amd/*/root_complex: use FSP HOB iterator functions
by Felix Held (Code Review) 14 Nov '22

14 Nov '22

Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/69476 ) Change subject: soc/amd/*/root_complex: use FSP HOB iterator functions ...................................................................... soc/amd/*/root_complex: use FSP HOB iterator functions Use the newly added functions to iterate over the FSP HOBs to report the resources used by FSP to the resource allocator instead of open coding the iteration over the HOBs in the SoC code. TEST=Patch doesn't change reported resources on Mandolin Signed-off-by: Felix Held <felix-coreboot(a)felixheld.de> Change-Id: I67ca346345c1fa08b008caa885d0a00d2d5afb12 Reviewed-on: https://review.coreboot.org/c/coreboot/+/69476 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Arthur Heymans <arthur(a)aheymans.xyz> --- M src/soc/amd/cezanne/root_complex.c M src/soc/amd/glinda/root_complex.c M src/soc/amd/mendocino/root_complex.c M src/soc/amd/morgana/root_complex.c M src/soc/amd/picasso/root_complex.c 5 files changed, 35 insertions(+), 47 deletions(-) Approvals: build bot (Jenkins): Verified Arthur Heymans: Looks good to me, approved diff --git a/src/soc/amd/cezanne/root_complex.c b/src/soc/amd/cezanne/root_complex.c index 5f2024c..31c2e1a 100644 --- a/src/soc/amd/cezanne/root_complex.c +++ b/src/soc/amd/cezanne/root_complex.c @@ -103,7 +103,7 @@ { uint32_t mem_usable = (uintptr_t)cbmem_top(); unsigned int idx = 0; - const struct hob_header *hob = fsp_get_hob_list(); + const struct hob_header *hob_iterator; const struct hob_resource *res; struct resource *gnb_apic; @@ -148,19 +148,13 @@ gnb_apic->size = 0x00001000; gnb_apic->flags = IORESOURCE_MEM | IORESOURCE_ASSIGNED | IORESOURCE_FIXED; - if (!hob) { + if (fsp_hob_iterator_init(&hob_iterator) != CB_SUCCESS) { printk(BIOS_ERR, "%s incomplete because no HOB list was found\n", __func__); return; } - for (; hob->type != HOB_TYPE_END_OF_HOB_LIST; hob = fsp_next_hob(hob)) { - - if (hob->type != HOB_TYPE_RESOURCE_DESCRIPTOR) - continue; - - res = fsp_hob_header_to_resource(hob); - + while (fsp_hob_iterator_get_next_resource(&hob_iterator, &res) == CB_SUCCESS) { if (res->type == EFI_RESOURCE_SYSTEM_MEMORY && res->addr < mem_usable) continue; /* 0 through low usable was set above */ if (res->type == EFI_RESOURCE_MEMORY_MAPPED_IO) diff --git a/src/soc/amd/glinda/root_complex.c b/src/soc/amd/glinda/root_complex.c index 16f1bdd..04d0599 100644 --- a/src/soc/amd/glinda/root_complex.c +++ b/src/soc/amd/glinda/root_complex.c @@ -118,7 +118,7 @@ { uint32_t mem_usable = (uintptr_t)cbmem_top(); unsigned int idx = 0; - const struct hob_header *hob = fsp_get_hob_list(); + const struct hob_header *hob_iterator; const struct hob_resource *res; struct resource *gnb_apic; @@ -163,19 +163,13 @@ gnb_apic->size = 0x00001000; gnb_apic->flags = IORESOURCE_MEM | IORESOURCE_ASSIGNED | IORESOURCE_FIXED; - if (!hob) { + if (fsp_hob_iterator_init(&hob_iterator) != CB_SUCCESS) { printk(BIOS_ERR, "%s incomplete because no HOB list was found\n", __func__); return; } - for (; hob->type != HOB_TYPE_END_OF_HOB_LIST; hob = fsp_next_hob(hob)) { - - if (hob->type != HOB_TYPE_RESOURCE_DESCRIPTOR) - continue; - - res = fsp_hob_header_to_resource(hob); - + while (fsp_hob_iterator_get_next_resource(&hob_iterator, &res) == CB_SUCCESS) { if (res->type == EFI_RESOURCE_SYSTEM_MEMORY && res->addr < mem_usable) continue; /* 0 through low usable was set above */ if (res->type == EFI_RESOURCE_MEMORY_MAPPED_IO) diff --git a/src/soc/amd/mendocino/root_complex.c b/src/soc/amd/mendocino/root_complex.c index d728516..abc49cf 100644 --- a/src/soc/amd/mendocino/root_complex.c +++ b/src/soc/amd/mendocino/root_complex.c @@ -118,7 +118,7 @@ { uint32_t mem_usable = (uintptr_t)cbmem_top(); unsigned int idx = 0; - const struct hob_header *hob = fsp_get_hob_list(); + const struct hob_header *hob_iterator; const struct hob_resource *res; struct resource *gnb_apic; @@ -163,19 +163,13 @@ gnb_apic->size = 0x00001000; gnb_apic->flags = IORESOURCE_MEM | IORESOURCE_ASSIGNED | IORESOURCE_FIXED; - if (!hob) { + if (fsp_hob_iterator_init(&hob_iterator) != CB_SUCCESS) { printk(BIOS_ERR, "%s incomplete because no HOB list was found\n", __func__); return; } - for (; hob->type != HOB_TYPE_END_OF_HOB_LIST; hob = fsp_next_hob(hob)) { - - if (hob->type != HOB_TYPE_RESOURCE_DESCRIPTOR) - continue; - - res = fsp_hob_header_to_resource(hob); - + while (fsp_hob_iterator_get_next_resource(&hob_iterator, &res) == CB_SUCCESS) { if (res->type == EFI_RESOURCE_SYSTEM_MEMORY && res->addr < mem_usable) continue; /* 0 through low usable was set above */ if (res->type == EFI_RESOURCE_MEMORY_MAPPED_IO) diff --git a/src/soc/amd/morgana/root_complex.c b/src/soc/amd/morgana/root_complex.c index 0e6e730..10e5415 100644 --- a/src/soc/amd/morgana/root_complex.c +++ b/src/soc/amd/morgana/root_complex.c @@ -118,7 +118,7 @@ { uint32_t mem_usable = (uintptr_t)cbmem_top(); unsigned int idx = 0; - const struct hob_header *hob = fsp_get_hob_list(); + const struct hob_header *hob_iterator; const struct hob_resource *res; struct resource *gnb_apic; @@ -163,19 +163,13 @@ gnb_apic->size = 0x00001000; gnb_apic->flags = IORESOURCE_MEM | IORESOURCE_ASSIGNED | IORESOURCE_FIXED; - if (!hob) { + if (fsp_hob_iterator_init(&hob_iterator) != CB_SUCCESS) { printk(BIOS_ERR, "%s incomplete because no HOB list was found\n", __func__); return; } - for (; hob->type != HOB_TYPE_END_OF_HOB_LIST; hob = fsp_next_hob(hob)) { - - if (hob->type != HOB_TYPE_RESOURCE_DESCRIPTOR) - continue; - - res = fsp_hob_header_to_resource(hob); - + while (fsp_hob_iterator_get_next_resource(&hob_iterator, &res) == CB_SUCCESS) { if (res->type == EFI_RESOURCE_SYSTEM_MEMORY && res->addr < mem_usable) continue; /* 0 through low usable was set above */ if (res->type == EFI_RESOURCE_MEMORY_MAPPED_IO) diff --git a/src/soc/amd/picasso/root_complex.c b/src/soc/amd/picasso/root_complex.c index 4892023..c662320 100644 --- a/src/soc/amd/picasso/root_complex.c +++ b/src/soc/amd/picasso/root_complex.c @@ -103,7 +103,7 @@ { uint32_t mem_usable = (uintptr_t)cbmem_top(); unsigned int idx = 0; - const struct hob_header *hob = fsp_get_hob_list(); + const struct hob_header *hob_iterator; const struct hob_resource *res; struct resource *gnb_apic; @@ -146,19 +146,12 @@ gnb_apic->size = 0x00001000; gnb_apic->flags = IORESOURCE_MEM | IORESOURCE_ASSIGNED | IORESOURCE_FIXED; - if (!hob) { - printk(BIOS_ERR, "%s incomplete because no HOB list was found\n", - __func__); + if (fsp_hob_iterator_init(&hob_iterator) != CB_SUCCESS) { + printk(BIOS_ERR, "%s incomplete because no HOB list was found\n", __func__); return; } - for (; hob->type != HOB_TYPE_END_OF_HOB_LIST; hob = fsp_next_hob(hob)) { - - if (hob->type != HOB_TYPE_RESOURCE_DESCRIPTOR) - continue; - - res = fsp_hob_header_to_resource(hob); - + while (fsp_hob_iterator_get_next_resource(&hob_iterator, &res) == CB_SUCCESS) { if (res->type == EFI_RESOURCE_SYSTEM_MEMORY && res->addr < mem_usable) continue; /* 0 through low usable was set above */ if (res->type == EFI_RESOURCE_MEMORY_MAPPED_IO) -- To view, visit https://review.coreboot.org/c/coreboot/+/69476 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I67ca346345c1fa08b008caa885d0a00d2d5afb12 Gerrit-Change-Number: 69476 Gerrit-PatchSet: 2 Gerrit-Owner: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Reviewer: Arthur Heymans <arthur(a)aheymans.xyz> 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-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: merged

1 0

[M] Change in coreboot[master]: drivers/intel/fsp2_0/hand_off_block: add functions to iterate over HOBs
by Felix Held (Code Review) 14 Nov '22

14 Nov '22

Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/69475 ) Change subject: drivers/intel/fsp2_0/hand_off_block: add functions to iterate over HOBs ...................................................................... drivers/intel/fsp2_0/hand_off_block: add functions to iterate over HOBs Introduce iterator function to go through the HOBs that will be used in follow-up commits both from the rest of the common FSP HOB access code and from SoC-specific code that needs to access specific HOBs. Signed-off-by: Felix Held <felix-coreboot(a)felixheld.de> Change-Id: If86dde2a9f41d0ca7941493a92f11b91a77e2ae0 Reviewed-on: https://review.coreboot.org/c/coreboot/+/69475 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Arthur Heymans <arthur(a)aheymans.xyz> --- M src/drivers/intel/fsp2_0/hand_off_block.c M src/drivers/intel/fsp2_0/include/fsp/util.h 2 files changed, 98 insertions(+), 0 deletions(-) Approvals: build bot (Jenkins): Verified Arthur Heymans: Looks good to me, approved diff --git a/src/drivers/intel/fsp2_0/hand_off_block.c b/src/drivers/intel/fsp2_0/hand_off_block.c index 21ce03e..13fbb06 100644 --- a/src/drivers/intel/fsp2_0/hand_off_block.c +++ b/src/drivers/intel/fsp2_0/hand_off_block.c @@ -126,6 +126,70 @@ return &fsp_hob_list_ptr; } +enum cb_err fsp_hob_iterator_init(const struct hob_header **hob_iterator) +{ + *hob_iterator = fsp_get_hob_list(); + return *hob_iterator ? CB_SUCCESS : CB_ERR; +} + +static enum cb_err fsp_hob_iterator_get_next(const struct hob_header **hob_iterator, + uint16_t hob_type, + const struct hob_header **hob) +{ + const struct hob_header *current_hob; + while ((*hob_iterator)->type != HOB_TYPE_END_OF_HOB_LIST) { + current_hob = *hob_iterator; + *hob_iterator = fsp_next_hob(*hob_iterator); + if (current_hob->type == hob_type) { + *hob = current_hob; + return CB_SUCCESS; + } + } + return CB_ERR; +} + +enum cb_err fsp_hob_iterator_get_next_resource(const struct hob_header **hob_iterator, + const struct hob_resource **res) +{ + const struct hob_header *hob; + while (fsp_hob_iterator_get_next(hob_iterator, HOB_TYPE_RESOURCE_DESCRIPTOR, &hob) == CB_SUCCESS) { + *res = fsp_hob_header_to_resource(hob); + return CB_SUCCESS; + } + return CB_ERR; +} + +enum cb_err fsp_hob_iterator_get_next_guid_resource(const struct hob_header **hob_iterator, + const uint8_t guid[16], + const struct hob_resource **res) +{ + const struct hob_resource *res_hob; + while (fsp_hob_iterator_get_next_resource(hob_iterator, &res_hob) == CB_SUCCESS) { + if (fsp_guid_compare(res_hob->owner_guid, guid)) { + *res = res_hob; + return CB_SUCCESS; + } + } + return CB_ERR; +} + +enum cb_err fsp_hob_iterator_get_next_guid_extension(const struct hob_header **hob_iterator, + const uint8_t guid[16], + const void **data, size_t *size) +{ + const struct hob_header *hob; + const uint8_t *guid_hob; + while (fsp_hob_iterator_get_next(hob_iterator, HOB_TYPE_GUID_EXTENSION, &hob) == CB_SUCCESS) { + guid_hob = hob_header_to_struct(hob); + if (fsp_guid_compare(guid_hob, guid)) { + *size = hob->length - (HOB_HEADER_LEN + 16); + *data = hob_header_to_extension_hob(hob); + return CB_SUCCESS; + } + } + return CB_ERR; +} + static const struct hob_resource *find_resource_hob_by_guid(const struct hob_header *hob, const uint8_t guid[16]) diff --git a/src/drivers/intel/fsp2_0/include/fsp/util.h b/src/drivers/intel/fsp2_0/include/fsp/util.h index 1cc422e..566fad9 100644 --- a/src/drivers/intel/fsp2_0/include/fsp/util.h +++ b/src/drivers/intel/fsp2_0/include/fsp/util.h @@ -106,6 +106,23 @@ extern const uint8_t fsp_nv_storage_guid[16]; extern const uint8_t fsp_reserved_memory_guid[16]; +/* + * Functions to iterate over the HOBs and get resource structs or extension HOB data. It's + * required to initialize the hob_iterator struct by a fsp_hob_iterator_init call before + * passing the fsp_hob_iterator_get_next_* functions. The fsp_hob_iterator_get_next_* functions + * will update the hob_iterator to point to the next HOB header, so the iterators can be called + * multiple times to get the data from multiple HOB instances. + */ +enum cb_err fsp_hob_iterator_init(const struct hob_header **hob_iterator); +enum cb_err fsp_hob_iterator_get_next_resource(const struct hob_header **hob_iterator, + const struct hob_resource **res); +enum cb_err fsp_hob_iterator_get_next_guid_resource(const struct hob_header **hob_iterator, + const uint8_t guid[16], + const struct hob_resource **res); +enum cb_err fsp_hob_iterator_get_next_guid_extension(const struct hob_header **hob_iterator, + const uint8_t guid[16], + const void **data, size_t *size); + /* Function to extract the FSP timestamp from FPDT Hob and display */ void fsp_display_timestamp(void); const void *fsp_get_hob_list(void); -- To view, visit https://review.coreboot.org/c/coreboot/+/69475 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: If86dde2a9f41d0ca7941493a92f11b91a77e2ae0 Gerrit-Change-Number: 69475 Gerrit-PatchSet: 2 Gerrit-Owner: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Reviewer: Andrey Petrov <andrey.petrov(a)gmail.com> Gerrit-Reviewer: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Martin L Roth <gaumless(a)gmail.com> Gerrit-CC: Martin Roth <martin.roth(a)amd.corp-partner.google.com> Gerrit-MessageType: merged

1 0

[S] Change in coreboot[master]: mb/google/brya/var/agah: Set GPP_H13 to reset on PLTRST
by Tarun Tuli (Code Review) 14 Nov '22

14 Nov '22

Attention is currently required from: Tarun Tuli, Eran Mitrani, Nick Vaccaro. Hello Eran Mitrani, Subrata Banik, Nick Vaccaro, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/coreboot/+/69340 to look at the new patch set (#3). Change subject: mb/google/brya/var/agah: Set GPP_H13 to reset on PLTRST ...................................................................... mb/google/brya/var/agah: Set GPP_H13 to reset on PLTRST GPP_H13 should be reset when going to S5. Update it to do so on PLTRST BUG=b:240617195 TEST=Measured on Agah that PP3300_SD_X goes off in S5. Change-Id: I959f92f2c486e0ca5cb4269b271c163b4c4925d4 Signed-off-by: Tarun Tuli <taruntuli(a)google.com> --- M src/mainboard/google/brya/variants/agah/gpio.c 1 file changed, 18 insertions(+), 2 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/40/69340/3 -- To view, visit https://review.coreboot.org/c/coreboot/+/69340 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I959f92f2c486e0ca5cb4269b271c163b4c4925d4 Gerrit-Change-Number: 69340 Gerrit-PatchSet: 3 Gerrit-Owner: Tarun Tuli <taruntuli(a)google.com> Gerrit-Reviewer: Eran Mitrani <mitrani(a)google.com> Gerrit-Reviewer: Nick Vaccaro <nvaccaro(a)google.com> Gerrit-Reviewer: Subrata Banik <subratabanik(a)google.com> Gerrit-Attention: Tarun Tuli <taruntuli(a)google.com> Gerrit-Attention: Eran Mitrani <mitrani(a)google.com> Gerrit-Attention: Nick Vaccaro <nvaccaro(a)google.com> Gerrit-MessageType: newpatchset

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit November 2022