summaryrefslogtreecommitdiff
path: root/src/soc
diff options
context:
space:
mode:
Diffstat (limited to 'src/soc')
-rw-r--r--src/soc/amd/common/block/psp/psp_gen1.c12
-rw-r--r--src/soc/nvidia/tegra210/mtc.c19
2 files changed, 5 insertions, 26 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;
}
diff --git a/src/soc/nvidia/tegra210/mtc.c b/src/soc/nvidia/tegra210/mtc.c
index b0bba9c4eb..47cbd923ff 100644
--- a/src/soc/nvidia/tegra210/mtc.c
+++ b/src/soc/nvidia/tegra210/mtc.c
@@ -15,30 +15,17 @@ static size_t mtc_table_size;
int tegra210_run_mtc(void)
{
- ssize_t nread;
- struct region_device fh;
- struct cbfsf mtc_file;
-
+ size_t nread;
void *const mtc = (void *)(uintptr_t)CONFIG_MTC_ADDRESS;
void *dvfs_table;
size_t (*mtc_fw)(void **dvfs_table) = (void *)mtc;
- if (cbfs_boot_locate(&mtc_file, "tegra_mtc.bin", NULL)) {
+ nread = cbfs_load("tegra_mtc.bin", mtc, 1*GiB);
+ if (!nread) {
printk(BIOS_ERR, "MTC file not found: tegra_mtc.bin\n");
return -1;
}
- cbfs_file_data(&fh, &mtc_file);
-
- /* Read MTC file into predefined region. */
- nread = rdev_readat(&fh, mtc, 0, region_device_sz(&fh));
-
- if (nread != region_device_sz(&fh)) {
- printk(BIOS_ERR, "MTC bytes read (%zu) != file length(%zu)!\n",
- nread, region_device_sz(&fh));
- return -1;
- }
-
printk(BIOS_INFO, "MTC: %zu bytes loaded @ %p\n", nread, mtc);
mtc_table_size = (*mtc_fw)(&dvfs_table);