Mirrors/m1n1
2
0
Fork 0
mirror of https://github.com/AsahiLinux/m1n1 synced 2024-09-20 05:01:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

dcp: Undo carnage from bad stage1 DART code

Browse source 
A bug in our DART code was wiping and aliasing page tables. Go through
the segment ranges for DCP and redo any missing mappings. If we redid
any mappings, then PMGR reset DCP so it can recover from having faulted
on the previous boot.

Signed-off-by: Hector Martin <marcan@marcan.st>
This commit is contained in:
Hector Martin 2024-05-17 01:57:34 +09:00
parent c83ad3fc4d
commit 8332e2454c
1 changed files with 42 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/dcp.c
View file

@ -106,6 +106,39 @@ int dcp_work(dcp_dev_t *dcp)
return afk_epic_work(dcp->afk, -1);
}
static int dcp_create_firmware_mappings(const display_config_t *cfg, dcp_dev_t *dcp)
{
int created = 0;
int dcp_node = adt_path_offset(adt, cfg->dcp);
int node = adt_first_child_offset(adt, dcp_node);
if (node < 0) {
printf("dcp: iop-dcp*-nub not found!\n");
return -1;
}
const struct adt_segment_ranges *seg;
u32 segments_len;
seg = adt_getprop(adt, node, "segment-ranges", &segments_len);
unsigned int count = segments_len / sizeof(*seg);
for (unsigned int i = 0; i < count; i++) {
if (dart_translate_silent(dcp->dart_dcp, seg[i].remap))
continue;
size_t len = ALIGN_UP(seg[i].size, SZ_16K);
u32 flags = i == 0 ? 0b0100 : 0; // TEXT gets this bit set?
printf("dcp: Mapping segment #0 %lx -> %lx [%lx]\n", seg[i].remap, seg[i].phys, len);
if (dart_map_flags(dcp->dart_dcp, seg[i].remap, (void *)seg[i].phys, len, flags)) {
printf("dcp: Failed to map segment\n");
return -1;
}
created++;
}
return created;
}
dcp_dev_t *dcp_init(const display_config_t *cfg)
{
u32 sid;
@ -156,6 +189,15 @@ dcp_dev_t *dcp_init(const display_config_t *cfg)
dcp->iovad_dcp = iovad_init(vm_base + 0x10000000, vm_base + 0x20000000);
int ret = dcp_create_firmware_mappings(cfg, dcp);
if (ret < 0) {
printf("dcp: failed to create firmware mappings\n");
goto out_iovad;
}
if (ret > 0) {
pmgr_reset(dcp_die, dcp_pmgr_dev);
}
dcp->asc = asc_init(cfg->dcp);
if (!dcp->asc) {
printf("dcp: failed to initialize ASC\n");