Mirrors/m1n1
2
0
Fork 0
mirror of https://github.com/AsahiLinux/m1n1 synced 2024-12-19 02:03:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

kboot: Handle ISP heap carveout

Browse source 
Signed-off-by: Hector Martin <marcan@marcan.st>
This commit is contained in:
Hector Martin 2023-09-08 00:06:53 +09:00
parent 668ea16c09
commit 0866a33c35
1 changed files with 38 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

76
src/kboot.c
View file

@ -1802,7 +1802,28 @@ struct isp_segment_ranges {
static int dt_set_isp_fwdata(void) static int dt_set_isp_fwdata(void)
{ {
const char *path = "isp"; const char *fdt_path = "isp";
int ret = 0;
u64 phys, iova, size;
int fdt_node = fdt_path_offset(dt, fdt_path);
if (fdt_node < 0) {
printf("FDT: '%s' not found\n", fdt_path);
return 0;
}
if (isp_get_heap(&phys, &iova, &size)) {
const char *status = fdt_getprop(dt, fdt_node, "status", NULL);
if (!status || strcmp(status, "disabled")) {
printf("FDT: ISP enabled but not initialized, disabling\n");
if (fdt_setprop_string(dt, fdt_node, "status", "disabled") < 0)
bail("FDT: failed to set status property of ISP\n");
}
return 0;
}
int adt_node = adt_path_offset(adt, "/arm-io/isp"); int adt_node = adt_path_offset(adt, "/arm-io/isp");
if (adt_node < 0) if (adt_node < 0)
@ -1810,45 +1831,22 @@ static int dt_set_isp_fwdata(void)
if (adt_node < 0) if (adt_node < 0)
return 0; return 0;
u32 segments_len; uint32_t dev_phandle = fdt_get_phandle(dt, fdt_node);
struct isp_segment_ranges *segments; if (!dev_phandle) {
segments = ret = fdt_generate_phandle(dt, &dev_phandle);
(struct isp_segment_ranges *)adt_getprop(adt, adt_node, "segment-ranges", &segments_len); if (!ret)
if (!segments || !segments_len) ret = fdt_setprop_u32(dt, fdt_node, "phandle", dev_phandle);
bail("ADT: invalid ISP segment-ranges\n"); if (ret != 0)
bail("FDT: couldn't set '%s.phandle' property: %d\n", fdt_path, ret);
int count = segments_len / sizeof(*segments);
for (int i = 0; i < count; i++)
segments[i].remap = segments[i].iova; // match sio segment-ranges
u64 ctrr_size;
switch (os_firmware.version) {
case V12_1: // haven't checked, probably right
case V12_2: // "
case V12_3:
case V12_3_1:
case V12_4:
case V12_5:
ctrr_size = 0x1800000;
break;
case V13_5:
ctrr_size = 0x1000000;
break;
default:
bail("FDT: couldn't get ISP CTRR size (%d)\n", os_firmware.version);
} }
u64 heap_base = segments[count - 1].iova + segments[count - 1].size; int mem_node = dt_get_or_add_reserved_mem("isp-heap", "apple,asc-mem", phys, size);
u64 heap_size = ctrr_size - heap_base; if (mem_node < 0)
return ret;
int fdt_node = fdt_path_offset(dt, path); ret = dt_device_set_reserved_mem(mem_node, "isp-heap", dev_phandle, iova, size);
if (fdt_node < 0) if (ret < 0)
bail("FDT: '%s' node not found\n", path); return ret;
if (fdt_appendprop_u64(dt, fdt_node, "apple,isp-heap-base", heap_base))
bail("FDT: couldn't set apple,isp-heap-base\n");
if (fdt_appendprop_u64(dt, fdt_node, "apple,isp-heap-size", heap_size))
bail("FDT: couldn't set apple,isp-heap-size\n");
return 0; return 0;
} }
@ -2114,6 +2112,9 @@ int kboot_prepare_dt(void *fdt)
dt = NULL; dt = NULL;
} }
/* Need to init ISP early to carve out heap */
isp_init();
dt_bufsize = fdt_totalsize(fdt); dt_bufsize = fdt_totalsize(fdt);
assert(dt_bufsize); assert(dt_bufsize);
@ -2197,7 +2198,6 @@ int kboot_boot(void *kernel)
usb_init(); usb_init();
pcie_init(); pcie_init();
dapf_init_all(); dapf_init_all();
isp_init();
printf("Setting SMP mode to WFE...\n"); printf("Setting SMP mode to WFE...\n");
smp_set_wfe_mode(true); smp_set_wfe_mode(true);