Skip to content

Commit 7ff8f3f

Browse files
committed
skinit: address feedback
Signed-off-by: Marty E. Plummer <hanetzer@startmail.com>
1 parent 3968375 commit 7ff8f3f

1 file changed

Lines changed: 6 additions & 5 deletions

File tree

src/soc/amd/common/skl/skinit.c

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@ void platform_prog_run(struct prog *prog)
4141
*/
4242
_Static_assert(sizeof(skl) == 4);
4343

44-
hexdump(prog, sizeof(*prog));
45-
4644
/*
4745
* APs have to be in wait-for-SIPI state for at least 1000 cycles before
4846
* SKINIT. Send INIT now and assume that loading SKL from CBFS is long
@@ -51,14 +49,17 @@ void platform_prog_run(struct prog *prog)
5149
lapic_send_ipi_others(LAPIC_INT_LEVELTRIG | LAPIC_INT_ASSERT | LAPIC_MT_INIT);
5250

5351
skl = memalign(64*KiB, 64*KiB);
52+
if (!skl)
53+
die("Could not reserve memory for DRTM\n");
54+
55+
memset(slrt, 0, 64*KiB - (skl - (void *)slrt));
5456

55-
cbfs_load(CONFIG_CBFS_PREFIX "/drtm_payload", skl, 64*KiB);
57+
if (!cbfs_load(CONFIG_CBFS_PREFIX "/drtm_payload", skl, 64*KiB))
58+
die("Could not load DRTM payload\n");
5659

5760
bootloader_data_offset = ((struct sl_header *)skl)->bootloader_data_offset;
5861
slrt = (struct slr_table *)(skl + bootloader_data_offset);
5962

60-
memset(slrt, 0, 64*KiB - (skl - (void *)slrt));
61-
6263
slrt->magic = SLR_TABLE_MAGIC;
6364
slrt->revision = SLR_TABLE_REVISION;
6465
slrt->architecture = SLR_AMD_SKINIT;

0 commit comments

Comments
 (0)