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

kboot: Align segment sizes to 16k in dt_reserve_asc_firmware()

Browse source 
The segment for the dcp firmware text is inexplicably only aligned to 4k.

Signed-off-by: Janne Grunau <j@jannau.net>
This commit is contained in:
Janne Grunau 2023-11-04 19:27:40 +01:00 committed by Hector Martin
parent 69e3610737
commit 9a3a1271a5
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/kboot.c
View file

@ -1610,12 +1610,18 @@ static int dt_reserve_asc_firmware(const char *adt_path, const char *adt_path_al
char node_name[64]; char node_name[64];
snprintf(node_name, sizeof(node_name), "asc-firmware@%lx", seg->phys); snprintf(node_name, sizeof(node_name), "asc-firmware@%lx", seg->phys);
int mem_node = dt_get_or_add_reserved_mem(node_name, "apple,asc-mem", seg->phys, seg->size); size_t seg_size = seg->size;
if (seg->size & (SZ_16K - 1)) {
printf("ADT: segment %s uses non 16k aligned size: 0x%06zx\n", node_name, seg_size);
seg_size = ALIGN_UP(seg_size, SZ_16K);
}
int mem_node = dt_get_or_add_reserved_mem(node_name, "apple,asc-mem", seg->phys, seg_size);
if (mem_node < 0) if (mem_node < 0)
return ret; return ret;
uint32_t mem_phandle = fdt_get_phandle(dt, mem_node); uint32_t mem_phandle = fdt_get_phandle(dt, mem_node);
ret = dt_device_set_reserved_mem(mem_node, node_name, dev_phandle, iova, seg->size); ret = dt_device_set_reserved_mem(mem_node, node_name, dev_phandle, iova, seg_size);
if (ret < 0) if (ret < 0)
return ret; return ret;