Mirrors/m1n1
2
0
Fork 0
mirror of https://github.com/AsahiLinux/m1n1 synced 2024-11-27 17:00:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

memory: Remap some carveouts as uncached

Browse source 
This fixes display DART real-time cache hits causing AMCC exceptions.

The relevant carve-outs have flags 0x60004016; 0x60004002 is used for
DCP which is non-realtime, so I'm guessing the '16' means we should map
it uncached.

Signed-off-by: Hector Martin <marcan@marcan.st>
This commit is contained in:
Hector Martin 2022-04-19 23:36:41 +09:00
parent 144c3da78e
commit fabe27e3f1
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/memory.c
View file

@ -345,7 +345,7 @@ static void mmu_map_mmio(void)
} }
} }
static void mmu_remap_pcie(void) static void mmu_remap_ranges(void)
{ {
int node = adt_path_offset(adt, "/defaults"); int node = adt_path_offset(adt, "/defaults");
@ -359,7 +359,7 @@ static void mmu_remap_pcie(void)
printf("MMU: Failed to get pmap-io-ranges property!\n"); printf("MMU: Failed to get pmap-io-ranges property!\n");
return; return;
} }
int range_cnt = ranges_len / 20; int range_cnt = ranges_len / 24;
while (range_cnt--) { while (range_cnt--) {
u64 addr = ranges[0] | ((u64)ranges[1] << 32); u64 addr = ranges[0] | ((u64)ranges[1] << 32);
u64 size = ranges[2] | ((u64)ranges[3] << 32); u64 size = ranges[2] | ((u64)ranges[3] << 32);
@ -369,6 +369,10 @@ static void mmu_remap_pcie(void)
if ((flags >> 28) == 8) { if ((flags >> 28) == 8) {
printf("MMU: Adding nGnRE mapping at 0x%lx (0x%lx)\n", addr, size); printf("MMU: Adding nGnRE mapping at 0x%lx (0x%lx)\n", addr, size);
mmu_add_mapping(addr, addr, size, MAIR_IDX_DEVICE_nGnRE, PERM_RW_EL0); mmu_add_mapping(addr, addr, size, MAIR_IDX_DEVICE_nGnRE, PERM_RW_EL0);
} else if (flags == 0x60004016) {
printf("MMU: Adding UC mapping at 0x%lx (0x%lx)\n", addr, size);
dc_civac_range((void *)addr, size);
mmu_add_mapping(addr, addr, size, MAIR_IDX_FRAMEBUFFER, PERM_RW_EL0);
} }
ranges += 6; ranges += 6;
@ -378,7 +382,6 @@ static void mmu_remap_pcie(void)
static void mmu_add_default_mappings(void) static void mmu_add_default_mappings(void)
{ {
mmu_map_mmio(); mmu_map_mmio();
mmu_remap_pcie();
ram_base = ALIGN_DOWN(cur_boot_args.phys_base, BIT(32)); ram_base = ALIGN_DOWN(cur_boot_args.phys_base, BIT(32));
uint64_t ram_size = cur_boot_args.mem_size + cur_boot_args.phys_base - ram_base; uint64_t ram_size = cur_boot_args.mem_size + cur_boot_args.phys_base - ram_base;
@ -432,6 +435,11 @@ static void mmu_add_default_mappings(void)
*/ */
mmu_add_mapping(0xe000000000, 0x0000000000, 0x0800000000, MAIR_IDX_DEVICE_nGnRnE, PERM_RW_EL0); mmu_add_mapping(0xe000000000, 0x0000000000, 0x0800000000, MAIR_IDX_DEVICE_nGnRnE, PERM_RW_EL0);
mmu_add_mapping(0xf000000000, 0x0000000000, 0x0800000000, MAIR_IDX_DEVICE_nGnRE, PERM_RW_EL0); mmu_add_mapping(0xf000000000, 0x0000000000, 0x0800000000, MAIR_IDX_DEVICE_nGnRE, PERM_RW_EL0);
/*
* Handle pmap-ranges
*/
mmu_remap_ranges();
} }
static void mmu_configure(void) static void mmu_configure(void)