diff options
| author | Julius Werner <jwerner@chromium.org> | 2021-02-05 16:51:25 -0800 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2021-03-17 08:10:20 +0000 |
| commit | 77639e4537cc9e56e65880e022e154af6d042453 (patch) | |
| tree | fea2b411d9d1d7a52d53630efaef5fd4363809c2 /src/soc/amd | |
| parent | 81dc20e744aa1762c17dcf5aac5c37643d62a983 (diff) | |
cbfs: Replace more instances of cbfs_boot_locate() with newer APIs
In pursuit of the eventual goal of removing cbfs_boot_locate() (and
direct rdev access) from CBFS APIs, this patch replaces all remaining
"simple" uses of the function call that can easily be replaced by the
newer APIs (like cbfs_load() or cbfs_map()). Some cases of
cbfs_boot_locate() remain that will be more complicated to solve.
Signed-off-by: Julius Werner <jwerner@chromium.org>
Change-Id: Icd0f21e2fa49c7cc834523578b7b45b5482cb1a8
Reviewed-on: https://review.coreboot.org/c/coreboot/+/50348
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'src/soc/amd')
| -rw-r--r-- | src/soc/amd/common/block/psp/psp_gen1.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/soc/amd/common/block/psp/psp_gen1.c b/src/soc/amd/common/block/psp/psp_gen1.c index 5096dd3adc..076d3548e9 100644 --- a/src/soc/amd/common/block/psp/psp_gen1.c +++ b/src/soc/amd/common/block/psp/psp_gen1.c @@ -101,8 +101,6 @@ int psp_load_named_blob(enum psp_blob_type type, const char *name) int cmd_status; u32 command; void *blob; - struct cbfsf cbfs_file; - struct region_device rdev; switch (type) { case BLOB_SMU_FW: @@ -122,13 +120,7 @@ int psp_load_named_blob(enum psp_blob_type type, const char *name) return -PSPSTS_UNSUPPORTED; } - if (cbfs_boot_locate(&cbfs_file, name, NULL)) { - printk(BIOS_ERR, "BUG: Cannot locate blob for PSP loading\n"); - return -PSPSTS_INVALID_NAME; - } - - cbfs_file_data(&rdev, &cbfs_file); - blob = rdev_mmap_full(&rdev); + blob = cbfs_map(name, NULL); if (!blob) { printk(BIOS_ERR, "BUG: Cannot map blob for PSP loading\n"); return -PSPSTS_INVALID_NAME; @@ -140,6 +132,6 @@ int psp_load_named_blob(enum psp_blob_type type, const char *name) cmd_status = send_psp_command(command, blob); psp_print_cmd_status(cmd_status, NULL); - rdev_munmap(&rdev, blob); + cbfs_unmap(blob); return cmd_status; } |