coreboot-gerrit May 2021

coreboot-gerrit@coreboot.org

1 participants
6048 discussions

Change in coreboot[master]: Documentation/lib/flashmap.md: add information about FMAP endianness
by Krystian Hebel (Code Review) 28 May '21

28 May '21

Krystian Hebel has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/55041 ) Change subject: Documentation/lib/flashmap.md: add information about FMAP endianness ...................................................................... Documentation/lib/flashmap.md: add information about FMAP endianness Change-Id: Idf6d46ed262b18c176d69352e333c56f4fdff66a Signed-off-by: Krystian Hebel <krystian.hebel(a)3mdeb.com> --- M Documentation/lib/flashmap.md 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/41/55041/1 diff --git a/Documentation/lib/flashmap.md b/Documentation/lib/flashmap.md index d3d8bbf..68d0ab5 100644 --- a/Documentation/lib/flashmap.md +++ b/Documentation/lib/flashmap.md @@ -17,7 +17,8 @@ normally go into CBFS. The Flashmap itself starts with a header `struct fmap` and followed by a list of -section descriptions in `struct fmap_area`. +section descriptions in `struct fmap_area`. All fields in those structures are +in little endian format. ### Header The header `struct fmap` has following fields: -- To view, visit https://review.coreboot.org/c/coreboot/+/55041 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Idf6d46ed262b18c176d69352e333c56f4fdff66a Gerrit-Change-Number: 55041 Gerrit-PatchSet: 1 Gerrit-Owner: Krystian Hebel <krystian.hebel(a)3mdeb.com> Gerrit-MessageType: newchange

1 0

Change in coreboot[master]: cpu/x86/entry16.S: Make Intel CBnT TOCTOU safe
by Kyösti Mälkki (Code Review) 28 May '21

28 May '21

Kyösti Mälkki has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/54010 ) Change subject: cpu/x86/entry16.S: Make Intel CBnT TOCTOU safe ...................................................................... Patch Set 4: (1 comment) Patchset: PS4: So who should put a request to abandon CB:38252? Owner or whoever submits? -- To view, visit https://review.coreboot.org/c/coreboot/+/54010 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Id2031e4e406655e14198e45f137ba152f8b6f567 Gerrit-Change-Number: 54010 Gerrit-PatchSet: 4 Gerrit-Owner: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Christian Walter <christian.walter(a)9elements.com> Gerrit-Reviewer: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org> Gerrit-Reviewer: Werner Zeh <werner.zeh(a)siemens.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: 9elements QA <hardwaretestrobot(a)gmail.com> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Comment-Date: Fri, 28 May 2021 10:49:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in coreboot[master]: tests: Add lib/cbmem_stage_cache-test test case
by Jakub Czapiga (Code Review) 28 May '21

28 May '21

Attention is currently required from: Paul Fagerburg, Julius Werner, Jan Dabros. Jakub Czapiga has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/54916 ) Change subject: tests: Add lib/cbmem_stage_cache-test test case ...................................................................... Patch Set 2: (1 comment) File tests/lib/cbmem_stage_cache-test.c: https://review.coreboot.org/c/coreboot/+/54916/comment/1f236cf9_9e90301a PS1, Line 137: void test_stage_cache_load_stage(void **state) > Can you add a comment here about what this test is checking? Done. I also extended some of other comments -- To view, visit https://review.coreboot.org/c/coreboot/+/54916 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ie6851b9473b225beb5ba51e26f44e21ea5919a64 Gerrit-Change-Number: 54916 Gerrit-PatchSet: 2 Gerrit-Owner: Jakub Czapiga <jacz(a)semihalf.com> Gerrit-Reviewer: Jan Dabros <jsd(a)semihalf.com> Gerrit-Reviewer: Julius Werner <jwerner(a)chromium.org> Gerrit-Reviewer: Paul Fagerburg <pfagerburg(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Paul Fagerburg <pfagerburg(a)chromium.org> Gerrit-Attention: Julius Werner <jwerner(a)chromium.org> Gerrit-Attention: Jan Dabros <jsd(a)semihalf.com> Gerrit-Comment-Date: Fri, 28 May 2021 10:39:57 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Paul Fagerburg <pfagerburg(a)chromium.org> Gerrit-MessageType: comment

1 0

Change in coreboot[master]: tests: Add lib/cbmem_stage_cache-test test case
by Jakub Czapiga (Code Review) 28 May '21

28 May '21

Attention is currently required from: Jakub Czapiga, Julius Werner, Jan Dabros. Hello build bot (Jenkins), Paul Fagerburg, Julius Werner, Jan Dabros, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/coreboot/+/54916 to look at the new patch set (#2). Change subject: tests: Add lib/cbmem_stage_cache-test test case ...................................................................... tests: Add lib/cbmem_stage_cache-test test case Signed-off-by: Jakub Czapiga <jacz(a)semihalf.com> Change-Id: Ie6851b9473b225beb5ba51e26f44e21ea5919a64 --- M tests/lib/Makefile.inc A tests/lib/cbmem_stage_cache-test.c 2 files changed, 204 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/16/54916/2 -- To view, visit https://review.coreboot.org/c/coreboot/+/54916 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ie6851b9473b225beb5ba51e26f44e21ea5919a64 Gerrit-Change-Number: 54916 Gerrit-PatchSet: 2 Gerrit-Owner: Jakub Czapiga <jacz(a)semihalf.com> Gerrit-Reviewer: Jan Dabros <jsd(a)semihalf.com> Gerrit-Reviewer: Julius Werner <jwerner(a)chromium.org> Gerrit-Reviewer: Paul Fagerburg <pfagerburg(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Jakub Czapiga <jacz(a)semihalf.com> Gerrit-Attention: Julius Werner <jwerner(a)chromium.org> Gerrit-Attention: Jan Dabros <jsd(a)semihalf.com> Gerrit-MessageType: newpatchset

1 0

Change in coreboot[master]: util/cbfstool/flashmap/fmap.c: fix fmaptool endianness bugs on BE
by Arthur Heymans (Code Review) 28 May '21

28 May '21

Attention is currently required from: Krystian Hebel. Arthur Heymans has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/55039 ) Change subject: util/cbfstool/flashmap/fmap.c: fix fmaptool endianness bugs on BE ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: Can you update Documentation/lib/flashmap.md to state that FMAP is always to be encoded LE? -- To view, visit https://review.coreboot.org/c/coreboot/+/55039 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ia88c0625cefa1e594ac1849271a71c3aacc8ce78 Gerrit-Change-Number: 55039 Gerrit-PatchSet: 2 Gerrit-Owner: Krystian Hebel <krystian.hebel(a)3mdeb.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Attention: Krystian Hebel <krystian.hebel(a)3mdeb.com> Gerrit-Comment-Date: Fri, 28 May 2021 10:28:08 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in coreboot[master]: util/cbfstool/flashmap/fmap.c: fix fmaptool endianness bugs on BE
by Krystian Hebel (Code Review) 28 May '21

28 May '21

Attention is currently required from: Krystian Hebel. Hello build bot (Jenkins), I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/coreboot/+/55039 to look at the new patch set (#2). Change subject: util/cbfstool/flashmap/fmap.c: fix fmaptool endianness bugs on BE ...................................................................... util/cbfstool/flashmap/fmap.c: fix fmaptool endianness bugs on BE This patch makes all accesses to the FMAP fields explicitly little endian. It fixes issue where build on BE host produced different binary image than on LE. Signed-off-by: Marek Kasiewicz <marek.kasiewicz(a)3mdeb.com> Signed-off-by: Krystian Hebel <krystian.hebel(a)3mdeb.com> Change-Id: Ia88c0625cefa1e594ac1849271a71c3aacc8ce78 --- M util/cbfstool/flashmap/fmap.c 1 file changed, 33 insertions(+), 32 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/39/55039/2 -- To view, visit https://review.coreboot.org/c/coreboot/+/55039 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ia88c0625cefa1e594ac1849271a71c3aacc8ce78 Gerrit-Change-Number: 55039 Gerrit-PatchSet: 2 Gerrit-Owner: Krystian Hebel <krystian.hebel(a)3mdeb.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Krystian Hebel <krystian.hebel(a)3mdeb.com> Gerrit-MessageType: newpatchset

1 0

Change in coreboot[master]: nb/intel/x4x/rcven.c: Guard macro parameters
by Werner Zeh (Code Review) 28 May '21

28 May '21

Werner Zeh has submitted this change. ( https://review.coreboot.org/c/coreboot/+/54953 ) Change subject: nb/intel/x4x/rcven.c: Guard macro parameters ...................................................................... nb/intel/x4x/rcven.c: Guard macro parameters Add parentheses around macro parameters to avoid operation order issues. Change-Id: I9528f3d6b221854fddd2db6d2b45c63bfdda0092 Signed-off-by: Angel Pons <th3fanbus(a)gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/54953 Reviewed-by: Arthur Heymans <arthur(a)aheymans.xyz> Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> --- M src/northbridge/intel/x4x/rcven.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: build bot (Jenkins): Verified Arthur Heymans: Looks good to me, approved diff --git a/src/northbridge/intel/x4x/rcven.c b/src/northbridge/intel/x4x/rcven.c index d3b1b31..9e58ef3 100644 --- a/src/northbridge/intel/x4x/rcven.c +++ b/src/northbridge/intel/x4x/rcven.c @@ -10,7 +10,7 @@ #define DQS_HIGH 1 #define DQS_LOW 0 -#define RESET_CNTL(channel) (0x5d8 + channel * 0x400) +#define RESET_CNTL(channel) (0x5d8 + (channel) * 0x400) struct rec_timing { u8 medium; -- To view, visit https://review.coreboot.org/c/coreboot/+/54953 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I9528f3d6b221854fddd2db6d2b45c63bfdda0092 Gerrit-Change-Number: 54953 Gerrit-PatchSet: 2 Gerrit-Owner: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: Damien Zammit Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org> Gerrit-Reviewer: Werner Zeh <werner.zeh(a)siemens.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: merged

1 0

Change in coreboot[master]: ec/kontron/kempld: Guard macro parameters
by Werner Zeh (Code Review) 28 May '21

28 May '21

Werner Zeh has submitted this change. ( https://review.coreboot.org/c/coreboot/+/54952 ) Change subject: ec/kontron/kempld: Guard macro parameters ...................................................................... ec/kontron/kempld: Guard macro parameters Add parentheses around macro parameters to avoid operation order issues. Change-Id: I2d4552abaeda5702619cc53e9dfae1f17b048e67 Signed-off-by: Angel Pons <th3fanbus(a)gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/54952 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Arthur Heymans <arthur(a)aheymans.xyz> --- M src/ec/kontron/kempld/kempld_internal.h 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: build bot (Jenkins): Verified Arthur Heymans: Looks good to me, approved diff --git a/src/ec/kontron/kempld/kempld_internal.h b/src/ec/kontron/kempld/kempld_internal.h index 014778c..993fe8e 100644 --- a/src/ec/kontron/kempld/kempld_internal.h +++ b/src/ec/kontron/kempld/kempld_internal.h @@ -12,8 +12,8 @@ /* indexed registers */ #define KEMPLD_SPEC 0x06 -#define KEMPLD_SPEC_GET_MINOR(x) (x & 0x0f) -#define KEMPLD_SPEC_GET_MAJOR(x) (x >> 4 & 0x0f) +#define KEMPLD_SPEC_GET_MINOR(x) ((x) & 0x0f) +#define KEMPLD_SPEC_GET_MAJOR(x) ((x) >> 4 & 0x0f) #define KEMPLD_CFG 0x37 #define KEMPLD_CFG_GPIO_I2C_MUX (1 << 0) -- To view, visit https://review.coreboot.org/c/coreboot/+/54952 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I2d4552abaeda5702619cc53e9dfae1f17b048e67 Gerrit-Change-Number: 54952 Gerrit-PatchSet: 2 Gerrit-Owner: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: Maxim Polyakov <max.senia.poliak(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Werner Zeh <werner.zeh(a)siemens.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: merged

1 0

Change in coreboot[master]: commonlib/lz4_wrapper.c: do not use bitfields
by Krystian Hebel (Code Review) 28 May '21

28 May '21

Krystian Hebel has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/55040 ) Change subject: commonlib/lz4_wrapper.c: do not use bitfields ...................................................................... commonlib/lz4_wrapper.c: do not use bitfields Order of bits in bitfields is implementation-defined. This makes them non-portable, especially across systems using different endianness. This change removes bitfields and uses masking and shifting instead. Signed-off-by: Krystian Hebel <krystian.hebel(a)3mdeb.com> Change-Id: Ief7d87ddb25c9baa931f27dbd54a4ca730b6ece7 --- M src/commonlib/bsd/lz4_wrapper.c 1 file changed, 33 insertions(+), 39 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/40/55040/1 diff --git a/src/commonlib/bsd/lz4_wrapper.c b/src/commonlib/bsd/lz4_wrapper.c index 73185a5..73a3571 100644 --- a/src/commonlib/bsd/lz4_wrapper.c +++ b/src/commonlib/bsd/lz4_wrapper.c @@ -63,39 +63,32 @@ #define LZ4F_MAGICNUMBER 0x184D2204 +/* Bit field endianness is implementation-defined. Use masks instead. + * https://stackoverflow.com/a/6044223 */ +#define RESERVED0 0x03 +#define HAS_CONTENT_CHECKSUM 0x04 +#define HAS_CONTENT_SIZE 0x08 +#define HAS_BLOCK_CHECKSUM 0x10 +#define INDEPENDENT_BLOCKS 0x20 +#define VERSION 0xC0 +#define VERSION_SHIFT 6 + +#define RESERVED1_2 0x8F +#define MAX_BLOCK_SIZE 0x70 + struct lz4_frame_header { uint32_t magic; - union { - uint8_t flags; - struct { - uint8_t reserved0 : 2; - uint8_t has_content_checksum : 1; - uint8_t has_content_size : 1; - uint8_t has_block_checksum : 1; - uint8_t independent_blocks : 1; - uint8_t version : 2; - }; - }; - union { - uint8_t block_descriptor; - struct { - uint8_t reserved1 : 4; - uint8_t max_block_size : 3; - uint8_t reserved2 : 1; - }; - }; + uint8_t flags; + uint8_t block_descriptor; /* + uint64_t content_size iff has_content_size is set */ /* + uint8_t header_checksum */ } __packed; +#define BH_SIZE 0x7FFFFFFF +#define NOT_COMPRESSED 0x80000000 + struct lz4_block_header { - union { - uint32_t raw; - struct { - uint32_t size : 31; - uint32_t not_compressed : 1; - }; - }; + uint32_t raw; /* + size bytes of data */ /* + uint32_t block_checksum iff has_block_checksum is set */ } __packed; @@ -114,16 +107,17 @@ return 0; /* input overrun */ /* We assume there's always only a single, standard frame. */ - if (le32toh(h->magic) != LZ4F_MAGICNUMBER || h->version != 1) + if (le32toh(h->magic) != LZ4F_MAGICNUMBER + || (h->flags & VERSION) != (1 << VERSION_SHIFT)) return 0; /* unknown format */ - if (h->reserved0 || h->reserved1 || h->reserved2) + if ((h->flags & RESERVED0) || (h->block_descriptor & RESERVED1_2)) return 0; /* reserved must be zero */ - if (!h->independent_blocks) + if (!(h->flags & INDEPENDENT_BLOCKS)) return 0; /* we don't support block dependency */ - has_block_checksum = h->has_block_checksum; + has_block_checksum = h->flags & HAS_BLOCK_CHECKSUM; in += sizeof(*h); - if (h->has_content_size) + if (h->flags & HAS_CONTENT_SIZE) in += sizeof(uint64_t); in += sizeof(uint8_t); } @@ -133,28 +127,28 @@ break; /* input overrun */ struct lz4_block_header b = { - { .raw = le32toh(*(const uint32_t *)in) } + .raw = le32toh(*(const uint32_t *)in) }; in += sizeof(struct lz4_block_header); - if ((size_t)(in - src) + b.size > srcn) + if ((size_t)(in - src) + (b.raw & BH_SIZE) > srcn) break; /* input overrun */ - if (!b.size) { + if (!(b.raw & BH_SIZE)) { out_size = out - dst; break; /* decompression successful */ } - if (b.not_compressed) { - size_t size = MIN((uintptr_t)b.size, (uintptr_t)dst + if (b.raw & NOT_COMPRESSED) { + size_t size = MIN((uintptr_t)(b.raw & BH_SIZE), (uintptr_t)dst + dstn - (uintptr_t)out); memcpy(out, in, size); - if (size < b.size) + if (size < (b.raw & BH_SIZE)) break; /* output overrun */ out += size; } else { /* constant folding essential, do not touch params! */ - int ret = LZ4_decompress_generic(in, out, b.size, + int ret = LZ4_decompress_generic(in, out, (b.raw & BH_SIZE), dst + dstn - out, endOnInputSize, full, 0, noDict, out, NULL, 0); if (ret < 0) @@ -162,7 +156,7 @@ out += ret; } - in += b.size; + in += (b.raw & BH_SIZE); if (has_block_checksum) in += sizeof(uint32_t); } -- To view, visit https://review.coreboot.org/c/coreboot/+/55040 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ief7d87ddb25c9baa931f27dbd54a4ca730b6ece7 Gerrit-Change-Number: 55040 Gerrit-PatchSet: 1 Gerrit-Owner: Krystian Hebel <krystian.hebel(a)3mdeb.com> Gerrit-MessageType: newchange

1 0

Change in coreboot[master]: util/cbfstool/flashmap/fmap.c: fix fmaptool endianness bugs on BE
by Krystian Hebel (Code Review) 28 May '21

28 May '21

Krystian Hebel has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/55039 ) Change subject: util/cbfstool/flashmap/fmap.c: fix fmaptool endianness bugs on BE ...................................................................... util/cbfstool/flashmap/fmap.c: fix fmaptool endianness bugs on BE This patch makes all accesses to the FMAP fields explicitly little endian. It fixes issue where build on BE host produced different binary image than on LE. Signed-off-by: Marek Kasiewicz <marek.kasiewicz(a)3mdeb.com> Signed-off-by: Krystian Hebel <krystian.hebel(a)3mdeb.com> Change-Id: Ia88c0625cefa1e594ac1849271a71c3aacc8ce78 --- M util/cbfstool/flashmap/fmap.c 1 file changed, 32 insertions(+), 32 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/39/55039/1 diff --git a/util/cbfstool/flashmap/fmap.c b/util/cbfstool/flashmap/fmap.c index b7a748c..4755a06 100644 --- a/util/cbfstool/flashmap/fmap.c +++ b/util/cbfstool/flashmap/fmap.c @@ -35,7 +35,7 @@ if (!fmap) return -1; - return sizeof(*fmap) + (fmap->nareas * sizeof(struct fmap_area)); + return sizeof(*fmap) + (le16toh(fmap->nareas) * sizeof(struct fmap_area)); } /* Make a best-effort assessment if the given fmap is real */ @@ -47,8 +47,8 @@ if (fmap->ver_major != FMAP_VER_MAJOR) return 0; /* a basic consistency check: flash should be larger than fmap */ - if (fmap->size < - sizeof(*fmap) + fmap->nareas * sizeof(struct fmap_area)) + if (le32toh(fmap->size) < + sizeof(*fmap) + le16toh(fmap->nareas) * sizeof(struct fmap_area)) return 0; /* fmap-alikes along binary data tend to fail on having a valid, @@ -177,14 +177,14 @@ kv_pair_fmt(kv, "fmap_ver_major", "%d", fmap->ver_major); kv_pair_fmt(kv, "fmap_ver_minor","%d", fmap->ver_minor); kv_pair_fmt(kv, "fmap_base", "0x%016llx", - (unsigned long long)fmap->base); - kv_pair_fmt(kv, "fmap_size", "0x%04x", fmap->size); + (unsigned long long)le64toh(fmap->base)); + kv_pair_fmt(kv, "fmap_size", "0x%04x", le32toh(fmap->size)); kv_pair_fmt(kv, "fmap_name", "%s", fmap->name); - kv_pair_fmt(kv, "fmap_nareas", "%d", fmap->nareas); + kv_pair_fmt(kv, "fmap_nareas", "%d", le16toh(fmap->nareas)); kv_pair_print(kv); kv_pair_free(kv); - for (i = 0; i < fmap->nareas; i++) { + for (i = 0; i < le16toh(fmap->nareas); i++) { struct kv_pair *pair; uint16_t flags; char *str; @@ -194,16 +194,16 @@ return -1; kv_pair_fmt(pair, "area_offset", "0x%08x", - fmap->areas[i].offset); + le32toh(fmap->areas[i].offset)); kv_pair_fmt(pair, "area_size", "0x%08x", - fmap->areas[i].size); + le32toh(fmap->areas[i].size)); kv_pair_fmt(pair, "area_name", "%s", fmap->areas[i].name); kv_pair_fmt(pair, "area_flags_raw", "0x%02x", - fmap->areas[i].flags); + le16toh(fmap->areas[i].flags)); /* Print descriptive strings for flags rather than the field */ - flags = fmap->areas[i].flags; + flags = le16toh(fmap->areas[i].flags); str = fmap_flags_to_string(flags); if (str == NULL) { kv_pair_free(pair); @@ -265,8 +265,8 @@ memcpy(&fmap->signature, FMAP_SIGNATURE, strlen(FMAP_SIGNATURE)); fmap->ver_major = FMAP_VER_MAJOR; fmap->ver_minor = FMAP_VER_MINOR; - fmap->base = base; - fmap->size = size; + fmap->base = htole64(base); + fmap->size = htole32(size); memccpy(&fmap->name, name, '\0', FMAP_STRLEN); return fmap; @@ -289,7 +289,7 @@ return -1; /* too many areas */ - if ((*fmap)->nareas >= 0xffff) + if (le16toh((*fmap)->nareas) >= 0xffff) return -1; orig_size = fmap_size(*fmap); @@ -301,12 +301,12 @@ area = (struct fmap_area *)((uint8_t *)*fmap + orig_size); memset(area, 0, sizeof(*area)); - memcpy(&area->offset, &offset, sizeof(area->offset)); - memcpy(&area->size, &size, sizeof(area->size)); memccpy(&area->name, name, '\0', FMAP_STRLEN); - memcpy(&area->flags, &flags, sizeof(area->flags)); + area->offset = htole32(offset); + area->size = htole32(size); + area->flags = htole16(flags); - (*fmap)->nareas++; + (*fmap)->nareas = htole16(le16toh((*fmap)->nareas) + 1); return new_size; } @@ -319,7 +319,7 @@ if (!fmap || !name) return NULL; - for (i = 0; i < fmap->nareas; i++) { + for (i = 0; i < le16toh(fmap->nareas); i++) { if (!strcmp((const char *)fmap->areas[i].name, name)) { area = &fmap->areas[i]; break; @@ -358,12 +358,12 @@ goto fmap_create_test_exit; } - if (fmap->base != base) { + if (le64toh(fmap->base) != base) { printf("FAILURE: base is incorrect\n"); goto fmap_create_test_exit; } - if (fmap->size != 0x100000) { + if (le32toh(fmap->size) != 0x100000) { printf("FAILURE: size is incorrect\n"); goto fmap_create_test_exit; } @@ -373,7 +373,7 @@ goto fmap_create_test_exit; } - if (fmap->nareas != 0) { + if (le16toh(fmap->nareas) != 0) { printf("FAILURE: number of areas is incorrect\n"); goto fmap_create_test_exit; } @@ -414,10 +414,10 @@ uint16_t nareas_orig; /* test_area will be used by fmap_csum_test and find_area_test */ struct fmap_area test_area = { - .offset = 0x400, - .size = 0x10000, + .offset = htole32(0x400), + .size = htole32(0x10000), .name = "test_area_1", - .flags = FMAP_AREA_STATIC, + .flags = htole16(FMAP_AREA_STATIC), }; status = fail; @@ -428,26 +428,26 @@ goto fmap_append_area_test_exit; } - nareas_orig = (*fmap)->nareas; - (*fmap)->nareas = ~(0); + nareas_orig = le16toh((*fmap)->nareas); + (*fmap)->nareas = htole16(~(0)); if (fmap_append_area(fmap, 0, 0, (const uint8_t *)"foo", 0) >= 0) { printf("FAILURE: failed to abort with too many areas\n"); goto fmap_append_area_test_exit; } - (*fmap)->nareas = nareas_orig; + (*fmap)->nareas = htole16(nareas_orig); total_size = sizeof(**fmap) + sizeof(test_area); if (fmap_append_area(fmap, - test_area.offset, - test_area.size, + le32toh(test_area.offset), + le32toh(test_area.size), test_area.name, - test_area.flags + le16toh(test_area.flags) ) != total_size) { printf("failed to append area\n"); goto fmap_append_area_test_exit; } - if ((*fmap)->nareas != 1) { + if (le16toh((*fmap)->nareas) != 1) { printf("FAILURE: failed to increment number of areas\n"); goto fmap_append_area_test_exit; } -- To view, visit https://review.coreboot.org/c/coreboot/+/55039 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ia88c0625cefa1e594ac1849271a71c3aacc8ce78 Gerrit-Change-Number: 55039 Gerrit-PatchSet: 1 Gerrit-Owner: Krystian Hebel <krystian.hebel(a)3mdeb.com> Gerrit-MessageType: newchange

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit May 2021