Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/sys/arch/evbarm/fdt/fdt_machdep.c,v rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/evbarm/fdt/fdt_machdep.c,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.31 retrieving revision 1.63 diff -u -p -r1.31 -r1.63 --- src/sys/arch/evbarm/fdt/fdt_machdep.c 2018/08/05 06:48:50 1.31 +++ src/sys/arch/evbarm/fdt/fdt_machdep.c 2019/07/15 08:44:33 1.63 @@ -1,4 +1,4 @@ -/* $NetBSD: fdt_machdep.c,v 1.31 2018/08/05 06:48:50 skrll Exp $ */ +/* $NetBSD: fdt_machdep.c,v 1.63 2019/07/15 08:44:33 skrll Exp $ */ /*- * Copyright (c) 2015-2017 Jared McNeill @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: fdt_machdep.c,v 1.31 2018/08/05 06:48:50 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fdt_machdep.c,v 1.63 2019/07/15 08:44:33 skrll Exp $"); #include "opt_machdep.h" #include "opt_bootconfig.h" @@ -36,8 +36,10 @@ __KERNEL_RCSID(0, "$NetBSD: fdt_machdep. #include "opt_arm_debug.h" #include "opt_multiprocessor.h" #include "opt_cpuoptions.h" +#include "opt_efi.h" #include "ukbd.h" +#include "wsdisplay.h" #include #include @@ -53,7 +55,18 @@ __KERNEL_RCSID(0, "$NetBSD: fdt_machdep. #include #include #include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include #include #include @@ -72,12 +85,20 @@ __KERNEL_RCSID(0, "$NetBSD: fdt_machdep. #include #include #include +#include #include +#ifdef EFI_RUNTIME +#include +#endif + #if NUKBD > 0 #include #endif +#if NWSDISPLAY > 0 +#include +#endif #ifdef MEMORY_DISK_DYNAMIC #include @@ -95,14 +116,11 @@ char *boot_args = NULL; u_long uboot_args[4] __attribute__((__section__(".data"))); const uint8_t *fdt_addr_r __attribute__((__section__(".data"))); -static char fdt_memory_ext_storage[EXTENT_FIXED_STORAGE_SIZE(DRAM_BLOCKS)]; -static struct extent *fdt_memory_ext; - static uint64_t initrd_start, initrd_end; #include #include -#define FDT_BUF_SIZE (256*1024) +#define FDT_BUF_SIZE (512*1024) static uint8_t fdt_data[FDT_BUF_SIZE]; extern char KERNEL_BASE_phys[]; @@ -110,55 +128,37 @@ extern char KERNEL_BASE_phys[]; static void fdt_update_stdout_path(void); static void fdt_device_register(device_t, void *); +static void fdt_device_register_post_config(device_t, void *); +static void fdt_cpu_rootconf(void); static void fdt_reset(void); static void fdt_powerdown(void); -static dev_type_cnputc(earlyconsputc); -static dev_type_cngetc(earlyconsgetc); - -static struct consdev earlycons = { - .cn_putc = earlyconsputc, - .cn_getc = earlyconsgetc, - .cn_pollc = nullcnpollc, -}; - -static void -fdt_putchar(char c) -{ - const struct arm_platform *plat = arm_fdt_platform(); - if (plat && plat->early_putchar) { - plat->early_putchar(c); - } -#ifdef EARLYCONS - else { -#define PLATFORM_EARLY_PUTCHAR ___CONCAT(EARLYCONS, _platform_early_putchar) - void PLATFORM_EARLY_PUTCHAR(char); - PLATFORM_EARLY_PUTCHAR(c); - } -#endif -} - static void earlyconsputc(dev_t dev, int c) { - fdt_putchar(c); + uartputc(c); } static int earlyconsgetc(dev_t dev) { - return 0; /* XXX */ + return 0; } +static struct consdev earlycons = { + .cn_putc = earlyconsputc, + .cn_getc = earlyconsgetc, + .cn_pollc = nullcnpollc, +}; + #ifdef VERBOSE_INIT_ARM #define VPRINTF(...) printf(__VA_ARGS__) #else -#define VPRINTF(...) +#define VPRINTF(...) __nothing #endif /* - * ARM: Get the first physically contiguous region of memory. - * ARM64: Get all of physical memory, including holes. + * Get all of physical memory, including holes. */ static void fdt_get_memory(uint64_t *pstart, uint64_t *pend) @@ -183,38 +183,24 @@ fdt_get_memory(uint64_t *pstart, uint64_ VPRINTF("FDT /memory [%d] @ 0x%" PRIx64 " size 0x%" PRIx64 "\n", index, cur_addr, cur_size); -#ifdef __aarch64__ if (cur_addr + cur_size > *pend) *pend = cur_addr + cur_size; -#else - /* If subsequent entries follow the previous, append them. */ - if (*pend == cur_addr) - *pend = cur_addr + cur_size; -#endif } } void fdt_add_reserved_memory_range(uint64_t addr, uint64_t size) { - uint64_t start = trunc_page(addr); - uint64_t end = round_page(addr + size); - - int error = extent_free(fdt_memory_ext, start, - end - start, EX_NOWAIT); - if (error != 0) - printf("MEM ERROR: res %" PRIx64 "-%" PRIx64 " failed: %d\n", - start, end, error); - else - VPRINTF("MEM: res %" PRIx64 "-%" PRIx64 "\n", start, end); + fdt_memory_remove_range(addr, size); } /* * Exclude memory ranges from memory config from the device tree */ static void -fdt_add_reserved_memory(uint64_t max_addr) +fdt_add_reserved_memory(uint64_t min_addr, uint64_t max_addr) { + uint64_t lstart = 0, lend = 0; uint64_t addr, size; int index, error; @@ -222,14 +208,79 @@ fdt_add_reserved_memory(uint64_t max_add for (index = 0; index <= num; index++) { error = fdt_get_mem_rsv(fdtbus_get_data(), index, &addr, &size); - if (error != 0 || size == 0) + if (error != 0) + continue; + if (lstart <= addr && addr <= lend) { + size -= (lend - addr); + addr = lend; + } + if (size == 0) + continue; + if (addr + size <= min_addr) continue; if (addr >= max_addr) continue; + if (addr < min_addr) { + size -= (min_addr - addr); + addr = min_addr; + } if (addr + size > max_addr) size = max_addr - addr; fdt_add_reserved_memory_range(addr, size); + lstart = addr; + lend = addr + size; + } +} + +static void +fdt_add_dram_blocks(const struct fdt_memory *m, void *arg) +{ + BootConfig *bc = arg; + + VPRINTF(" %" PRIx64 " - %" PRIx64 "\n", m->start, m->end - 1); + bc->dram[bc->dramblocks].address = m->start; + bc->dram[bc->dramblocks].pages = + (m->end - m->start) / PAGE_SIZE; + bc->dramblocks++; +} + +#define MAX_PHYSMEM 64 +static int nfdt_physmem = 0; +static struct boot_physmem fdt_physmem[MAX_PHYSMEM]; + +static void +fdt_add_boot_physmem(const struct fdt_memory *m, void *arg) +{ + const paddr_t saddr = round_page(m->start); + const paddr_t eaddr = trunc_page(m->end); + + VPRINTF(" %" PRIx64 " - %" PRIx64, m->start, m->end - 1); + if (saddr >= eaddr) { + VPRINTF(" skipped\n"); + return; + } + VPRINTF("\n"); + + struct boot_physmem *bp = &fdt_physmem[nfdt_physmem++]; + + KASSERT(nfdt_physmem <= MAX_PHYSMEM); + + bp->bp_start = atop(saddr); + bp->bp_pages = atop(eaddr) - bp->bp_start; + bp->bp_freelist = VM_FREELIST_DEFAULT; + +#ifdef _LP64 + if (m->end > 0x100000000) + bp->bp_freelist = VM_FREELIST_HIGHMEM; +#endif + +#ifdef PMAP_NEED_ALLOC_POOLPAGE + const uint64_t memory_size = *(uint64_t *)arg; + if (atop(memory_size) > bp->bp_pages) { + arm_poolpage_vmfreelist = VM_FREELIST_DIRECTMAP; + bp->bp_freelist = VM_FREELIST_DIRECTMAP; } +#endif } /* @@ -240,12 +291,8 @@ fdt_build_bootconfig(uint64_t mem_start, { const int memory = OF_finddevice("/memory"); BootConfig *bc = &bootconfig; - struct extent_region *er; uint64_t addr, size; - int index, error; - - fdt_memory_ext = extent_create("FDT Memory", mem_start, mem_end, - fdt_memory_ext_storage, sizeof(fdt_memory_ext_storage), EX_EARLY); + int index; for (index = 0; fdtbus_get_reg64(memory, index, &addr, &size) == 0; @@ -255,29 +302,27 @@ fdt_build_bootconfig(uint64_t mem_start, if (addr + size > mem_end) size = mem_end - addr; - error = extent_alloc_region(fdt_memory_ext, addr, size, - EX_NOWAIT); - if (error != 0) - printf("MEM ERROR: add %" PRIx64 "-%" PRIx64 " failed: %d\n", - addr, addr + size, error); - VPRINTF("MEM: add %" PRIx64 "-%" PRIx64 "\n", addr, addr + size); + fdt_memory_add_range(addr, size); } - fdt_add_reserved_memory(mem_end); + fdt_add_reserved_memory(mem_start, mem_end); const uint64_t initrd_size = initrd_end - initrd_start; if (initrd_size > 0) - fdt_add_reserved_memory_range(initrd_start, initrd_size); + fdt_memory_remove_range(initrd_start, initrd_size); + + const int framebuffer = OF_finddevice("/chosen/framebuffer"); + if (framebuffer >= 0) { + for (index = 0; + fdtbus_get_reg64(framebuffer, index, &addr, &size) == 0; + index++) { + fdt_add_reserved_memory_range(addr, size); + } + } VPRINTF("Usable memory:\n"); bc->dramblocks = 0; - LIST_FOREACH(er, &fdt_memory_ext->ex_regions, er_link) { - VPRINTF(" %lx - %lx\n", er->er_start, er->er_end); - bc->dram[bc->dramblocks].address = er->er_start; - bc->dram[bc->dramblocks].pages = - (er->er_end - er->er_start) / PAGE_SIZE; - bc->dramblocks++; - } + fdt_memory_foreach(fdt_add_dram_blocks, bc); } static void @@ -345,6 +390,32 @@ fdt_setup_initrd(void) #endif } +#ifdef EFI_RUNTIME +static void +fdt_map_efi_runtime(const char *prop, enum arm_efirt_mem_type type) +{ + int len; + + const int chosen_off = fdt_path_offset(fdt_data, "/chosen"); + if (chosen_off < 0) + return; + + const uint64_t *map = fdt_getprop(fdt_data, chosen_off, prop, &len); + if (map == NULL) + return; + + while (len >= 24) { + const paddr_t pa = be64toh(map[0]); + const vaddr_t va = be64toh(map[1]); + const uint64_t sz = be64toh(map[2]); + VPRINTF("%s: %s %lx-%lx (%lx-%lx)\n", __func__, prop, pa, pa+sz-1, va, va+sz-1); + arm_efirt_md_map_range(va, pa, sz, type); + map += 3; + len -= 24; + } +} +#endif + u_int initarm(void *arg); u_int @@ -359,7 +430,10 @@ initarm(void *arg) /* Load FDT */ int error = fdt_check_header(fdt_addr_r); if (error == 0) { - error = fdt_move(fdt_addr_r, fdt_data, sizeof(fdt_data)); + /* If the DTB is too big, try to pack it in place first. */ + if (fdt_totalsize(fdt_addr_r) > sizeof(fdt_data)) + (void)fdt_pack(__UNCONST(fdt_addr_r)); + error = fdt_open_into(fdt_addr_r, fdt_data, sizeof(fdt_data)); if (error != 0) panic("fdt_move failed: %s", fdt_strerror(error)); fdtbus_set_data(fdt_data); @@ -380,26 +454,35 @@ initarm(void *arg) OF_getprop(chosen, "bootargs", bootargs, sizeof(bootargs)); boot_args = bootargs; - VPRINTF("devmap\n"); - pmap_devmap_register(plat->devmap()); -#ifdef __aarch64__ - pmap_devmap_bootstrap(plat->devmap()); -#endif - /* Heads up ... Setup the CPU / MMU / TLB functions. */ VPRINTF("cpufunc\n"); if (set_cpufuncs()) panic("cpu not recognized!"); + /* + * Memory is still identity/flat mapped this point so using ttbr for + * l1pt VA is fine + */ + + VPRINTF("devmap\n"); + extern char ARM_BOOTSTRAP_LxPT[]; + pmap_devmap_bootstrap((vaddr_t)ARM_BOOTSTRAP_LxPT, plat->ap_devmap()); + VPRINTF("bootstrap\n"); - plat->bootstrap(); + plat->ap_bootstrap(); /* * If stdout-path is specified on the command line, override the * value in /chosen/stdout-path before initializing console. */ + VPRINTF("stdout\n"); fdt_update_stdout_path(); + /* + * Done making changes to the FDT. + */ + fdt_pack(fdt_data); + VPRINTF("consinit "); consinit(); VPRINTF("ok\n"); @@ -410,9 +493,11 @@ initarm(void *arg) cpu_reset_address = fdt_reset; cpu_powerdown_address = fdt_powerdown; evbarm_device_register = fdt_device_register; + evbarm_device_register_post_config = fdt_device_register_post_config; + evbarm_cpu_rootconf = fdt_cpu_rootconf; /* Talk to the user */ - VPRINTF("\nNetBSD/evbarm (fdt) booting ...\n"); + printf("NetBSD/evbarm (fdt) booting ...\n"); #ifdef BOOT_ARGS char mi_bootargs[] = BOOT_ARGS; @@ -429,6 +514,9 @@ initarm(void *arg) #endif uint64_t memory_size = memory_end - memory_start; + VPRINTF("%s: memory start %" PRIx64 " end %" PRIx64 " (len %" + PRIx64 ")\n", __func__, memory_start, memory_end, memory_size); + /* Parse ramdisk info */ fdt_probe_initrd(&initrd_start, &initrd_end); @@ -436,8 +524,15 @@ initarm(void *arg) * Populate bootconfig structure for the benefit of * dodumpsys */ + VPRINTF("%s: fdt_build_bootconfig\n", __func__); fdt_build_bootconfig(memory_start, memory_end); +#ifdef EFI_RUNTIME + fdt_map_efi_runtime("netbsd,uefi-runtime-code", ARM_EFIRT_MEM_CODE); + fdt_map_efi_runtime("netbsd,uefi-runtime-data", ARM_EFIRT_MEM_DATA); + fdt_map_efi_runtime("netbsd,uefi-runtime-mmio", ARM_EFIRT_MEM_MMIO); +#endif + /* Perform PT build and VM init */ cpu_kernel_vm_init(memory_start, memory_size); @@ -445,35 +540,45 @@ initarm(void *arg) parse_mi_bootargs(boot_args); - #define MAX_PHYSMEM 16 - static struct boot_physmem fdt_physmem[MAX_PHYSMEM]; - int nfdt_physmem = 0; - struct extent_region *er; - - LIST_FOREACH(er, &fdt_memory_ext->ex_regions, er_link) { - VPRINTF(" %lx - %lx\n", er->er_start, er->er_end); - struct boot_physmem *bp = &fdt_physmem[nfdt_physmem++]; - - KASSERT(nfdt_physmem <= MAX_PHYSMEM); - bp->bp_start = atop(er->er_start); - bp->bp_pages = atop(er->er_end - er->er_start); - bp->bp_freelist = VM_FREELIST_DEFAULT; + VPRINTF("Memory regions:\n"); + fdt_memory_foreach(fdt_add_boot_physmem, &memory_size); -#ifdef _LP64 - if (er->er_end > 0x100000000) - bp->bp_freelist = VM_FREELIST_HIGHMEM; -#endif + u_int sp = initarm_common(KERNEL_VM_BASE, KERNEL_VM_SIZE, fdt_physmem, + nfdt_physmem); -#ifdef PMAP_NEED_ALLOC_POOLPAGE - if (atop(memory_size) > bp->bp_pages) { - arm_poolpage_vmfreelist = VM_FREELIST_DIRECTMAP; - bp->bp_freelist = VM_FREELIST_DIRECTMAP; - } -#endif + /* + * initarm_common flushes cache if required before AP start + */ + error = 0; + if ((boothowto & RB_MD1) == 0) { + VPRINTF("mpstart\n"); + if (plat->ap_mpstart) + error = plat->ap_mpstart(); } - return initarm_common(KERNEL_VM_BASE, KERNEL_VM_SIZE, fdt_physmem, - nfdt_physmem); + if (error) + return sp; + /* + * Now we have APs started the pages used for stacks and L1PT can + * be given to uvm + */ + extern char const __start__init_memory[]; + extern char const __stop__init_memory[] __weak; + + if (__start__init_memory != __stop__init_memory) { + const paddr_t spa = KERN_VTOPHYS((vaddr_t)__start__init_memory); + const paddr_t epa = KERN_VTOPHYS((vaddr_t)__stop__init_memory); + const paddr_t spg = atop(spa); + const paddr_t epg = atop(epa); + + VPRINTF(" start %08lx end %08lx... " + "loading in freelist %d\n", spa, epa, VM_FREELIST_DEFAULT); + + uvm_page_physload(spg, epg, spg, epg, VM_FREELIST_DEFAULT); + + } + + return sp; } static void @@ -514,18 +619,14 @@ consinit(void) if (initialized || cons == NULL) return; - plat->init_attach_args(&faa); + plat->ap_init_attach_args(&faa); faa.faa_phandle = fdtbus_get_stdout_phandle(); - if (plat->uart_freq != NULL) - uart_freq = plat->uart_freq(); + if (plat->ap_uart_freq != NULL) + uart_freq = plat->ap_uart_freq(); cons->consinit(&faa, uart_freq); -#if NUKBD > 0 - ukbd_cnattach(); /* allow USB keyboard to become console */ -#endif - initialized = true; } @@ -534,7 +635,102 @@ delay(u_int us) { const struct arm_platform *plat = arm_fdt_platform(); - plat->delay(us); + plat->ap_delay(us); +} + +static void +fdt_detect_root_device(device_t dev) +{ + struct mbr_sector mbr; + uint8_t buf[DEV_BSIZE]; + uint8_t hash[16]; + const uint8_t *rhash; + char rootarg[64]; + struct vnode *vp; + MD5_CTX md5ctx; + int error, len; + size_t resid; + u_int part; + + const int chosen = OF_finddevice("/chosen"); + if (chosen < 0) + return; + + if (of_hasprop(chosen, "netbsd,mbr") && + of_hasprop(chosen, "netbsd,partition")) { + + /* + * The bootloader has passed in a partition index and MD5 hash + * of the MBR sector. Read the MBR of this device, calculate the + * hash, and compare it with the value passed in. + */ + rhash = fdtbus_get_prop(chosen, "netbsd,mbr", &len); + if (rhash == NULL || len != 16) + return; + of_getprop_uint32(chosen, "netbsd,partition", &part); + if (part >= MAXPARTITIONS) + return; + + vp = opendisk(dev); + if (!vp) + return; + error = vn_rdwr(UIO_READ, vp, buf, sizeof(buf), 0, UIO_SYSSPACE, + 0, NOCRED, &resid, NULL); + VOP_CLOSE(vp, FREAD, NOCRED); + vput(vp); + + if (error != 0) + return; + + memcpy(&mbr, buf, sizeof(mbr)); + MD5Init(&md5ctx); + MD5Update(&md5ctx, (void *)&mbr, sizeof(mbr)); + MD5Final(hash, &md5ctx); + + if (memcmp(rhash, hash, 16) != 0) + return; + + snprintf(rootarg, sizeof(rootarg), " root=%s%c", device_xname(dev), part + 'a'); + strcat(boot_args, rootarg); + } + + if (of_hasprop(chosen, "netbsd,gpt-guid")) { + char guidbuf[UUID_STR_LEN]; + const struct uuid *guid = fdtbus_get_prop(chosen, "netbsd,gpt-guid", &len); + if (guid == NULL || len != 16) + return; + + uuid_snprintf(guidbuf, sizeof(guidbuf), guid); + snprintf(rootarg, sizeof(rootarg), " root=wedge:%s", guidbuf); + strcat(boot_args, rootarg); + } + + if (of_hasprop(chosen, "netbsd,gpt-label")) { + const char *label = fdtbus_get_string(chosen, "netbsd,gpt-label"); + if (label == NULL || *label == '\0') + return; + + device_t dv = dkwedge_find_by_wname(label); + if (dv != NULL) + booted_device = dv; + } + + if (of_hasprop(chosen, "netbsd,booted-mac-address")) { + const uint8_t *macaddr = fdtbus_get_prop(chosen, "netbsd,booted-mac-address", &len); + if (macaddr == NULL || len != 6) + return; + int s = pserialize_read_enter(); + struct ifnet *ifp; + IFNET_READER_FOREACH(ifp) { + if (memcmp(macaddr, CLLADDR(ifp->if_sadl), len) == 0) { + device_t dv = device_find_by_xname(ifp->if_xname); + if (dv != NULL) + booted_device = dv; + break; + } + } + pserialize_read_exit(s); + } } static void @@ -545,8 +741,40 @@ fdt_device_register(device_t self, void if (device_is_a(self, "armfdt")) fdt_setup_initrd(); - if (plat && plat->device_register) - plat->device_register(self, aux); + if (plat && plat->ap_device_register) + plat->ap_device_register(self, aux); +} + +static void +fdt_device_register_post_config(device_t self, void *aux) +{ +#if NUKBD > 0 && NWSDISPLAY > 0 + if (device_is_a(self, "wsdisplay")) { + struct wsdisplay_softc *sc = device_private(self); + if (wsdisplay_isconsole(sc)) + ukbd_cnattach(); + } +#endif +} + +static void +fdt_cpu_rootconf(void) +{ + device_t dev; + deviter_t di; + char *ptr; + + for (dev = deviter_first(&di, 0); dev; dev = deviter_next(&di)) { + if (device_class(dev) != DV_DISK) + continue; + + if (get_bootconf_option(boot_args, "root", BOOTOPT_TYPE_STRING, &ptr) != 0) + break; + + if (device_is_a(dev, "ld") || device_is_a(dev, "sd") || device_is_a(dev, "wd")) + fdt_detect_root_device(dev); + } + deviter_release(&di); } static void @@ -556,8 +784,8 @@ fdt_reset(void) fdtbus_power_reset(); - if (plat && plat->reset) - plat->reset(); + if (plat && plat->ap_reset) + plat->ap_reset(); } static void