Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/dev/fdt Factor out some fdt(4) features from {,evb}arm i...
details: https://anonhg.NetBSD.org/src/rev/299f3f75cec7
branches: trunk
changeset: 377384:299f3f75cec7
user: rin <rin%NetBSD.org@localhost>
date: Mon Jul 10 07:00:11 2023 +0000
description:
Factor out some fdt(4) features from {,evb}arm into dev/fdt.
Now, FDT-based support to efirt, initrd, rndseed, and efirng can be
used from, e.g., riscv.
Mostly from Nick Hudson.
XXX
As Nick comments, there can be some optimizations for fdt_map_range().
efiboot may also be modified to load these objects into aligned PAs.
diffstat:
sys/arch/aarch64/aarch64/efi_machdep.c | 10 +-
sys/arch/arm/arm/efi_machdep.c | 10 +-
sys/arch/arm/arm/efi_runtime.h | 9 +-
sys/arch/arm/include/efirt.h | 13 +
sys/arch/evbarm/fdt/fdt_machdep.c | 256 +---------------------------
sys/arch/evbarm/include/efirt.h | 3 +
sys/dev/fdt/fdt_boot.c | 295 ++++++++++++++++++++++++++++++++-
sys/dev/fdt/fdt_boot.h | 18 +-
8 files changed, 348 insertions(+), 266 deletions(-)
diffs (truncated from 789 to 300 lines):
diff -r 2625cb5a8f60 -r 299f3f75cec7 sys/arch/aarch64/aarch64/efi_machdep.c
--- a/sys/arch/aarch64/aarch64/efi_machdep.c Mon Jul 10 06:42:33 2023 +0000
+++ b/sys/arch/aarch64/aarch64/efi_machdep.c Mon Jul 10 07:00:11 2023 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: efi_machdep.c,v 1.13 2022/05/03 20:10:20 skrll Exp $ */
+/* $NetBSD: efi_machdep.c,v 1.14 2023/07/10 07:00:11 rin Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,12 +30,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: efi_machdep.c,v 1.13 2022/05/03 20:10:20 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: efi_machdep.c,v 1.14 2023/07/10 07:00:11 rin Exp $");
#include <sys/param.h>
+
#include <uvm/uvm_extern.h>
#include <arm/cpufunc.h>
+#include <arm/efirt.h>
#include <arm/arm/efi_runtime.h>
@@ -49,8 +51,8 @@ static struct {
static bool efi_userva = true;
void
-arm_efirt_md_map_range(vaddr_t va, paddr_t pa, size_t sz,
- enum arm_efirt_mem_type type)
+cpu_efirt_map_range(vaddr_t va, paddr_t pa, size_t sz,
+ enum cpu_efirt_mem_type type)
{
int flags = 0;
int prot = 0;
diff -r 2625cb5a8f60 -r 299f3f75cec7 sys/arch/arm/arm/efi_machdep.c
--- a/sys/arch/arm/arm/efi_machdep.c Mon Jul 10 06:42:33 2023 +0000
+++ b/sys/arch/arm/arm/efi_machdep.c Mon Jul 10 07:00:11 2023 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: efi_machdep.c,v 1.3 2022/12/18 12:02:46 skrll Exp $ */
+/* $NetBSD: efi_machdep.c,v 1.4 2023/07/10 07:00:12 rin Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,11 +30,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: efi_machdep.c,v 1.3 2022/12/18 12:02:46 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: efi_machdep.c,v 1.4 2023/07/10 07:00:12 rin Exp $");
#include <sys/param.h>
+
#include <uvm/uvm_extern.h>
+#include <arm/efirt.h>
#include <arm/vfpreg.h>
#include <arm/arm/efi_runtime.h>
@@ -101,8 +103,8 @@ arm_efirt_md_exit(void)
void
-arm_efirt_md_map_range(vaddr_t va, paddr_t pa, size_t sz,
- enum arm_efirt_mem_type type)
+cpu_efirt_map_range(vaddr_t va, paddr_t pa, size_t sz,
+ enum cpu_efirt_mem_type type)
{
int flags = 0;
int prot = 0;
diff -r 2625cb5a8f60 -r 299f3f75cec7 sys/arch/arm/arm/efi_runtime.h
--- a/sys/arch/arm/arm/efi_runtime.h Mon Jul 10 06:42:33 2023 +0000
+++ b/sys/arch/arm/arm/efi_runtime.h Mon Jul 10 07:00:11 2023 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: efi_runtime.h,v 1.4 2021/10/10 13:03:09 jmcneill Exp $ */
+/* $NetBSD: efi_runtime.h,v 1.5 2023/07/10 07:00:12 rin Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -44,13 +44,6 @@ efi_status arm_efirt_setvar(uint16_t *,
u_long, void *);
int arm_efirt_reset(enum efi_reset);
-enum arm_efirt_mem_type {
- ARM_EFIRT_MEM_CODE,
- ARM_EFIRT_MEM_DATA,
- ARM_EFIRT_MEM_MMIO,
-};
-
-void arm_efirt_md_map_range(vaddr_t, paddr_t, size_t, enum arm_efirt_mem_type);
int arm_efirt_md_enter(void);
void arm_efirt_md_exit(void);
diff -r 2625cb5a8f60 -r 299f3f75cec7 sys/arch/arm/include/efirt.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/arm/include/efirt.h Mon Jul 10 07:00:11 2023 +0000
@@ -0,0 +1,13 @@
+#ifndef _ARM_EFIRT_H_
+#define _ARM_EFIRT_H_
+
+
+enum cpu_efirt_mem_type {
+ ARM_EFIRT_MEM_CODE,
+ ARM_EFIRT_MEM_DATA,
+ ARM_EFIRT_MEM_MMIO,
+};
+
+void cpu_efirt_map_range(vaddr_t, paddr_t, size_t, enum cpu_efirt_mem_type);
+
+#endif
diff -r 2625cb5a8f60 -r 299f3f75cec7 sys/arch/evbarm/fdt/fdt_machdep.c
--- a/sys/arch/evbarm/fdt/fdt_machdep.c Mon Jul 10 06:42:33 2023 +0000
+++ b/sys/arch/evbarm/fdt/fdt_machdep.c Mon Jul 10 07:00:11 2023 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: fdt_machdep.c,v 1.103 2023/04/22 09:53:45 skrll Exp $ */
+/* $NetBSD: fdt_machdep.c,v 1.104 2023/07/10 07:00:12 rin Exp $ */
/*-
* Copyright (c) 2015-2017 Jared McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdt_machdep.c,v 1.103 2023/04/22 09:53:45 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdt_machdep.c,v 1.104 2023/07/10 07:00:12 rin Exp $");
#include "opt_arm_debug.h"
#include "opt_bootconfig.h"
@@ -35,7 +35,6 @@
#include "opt_ddb.h"
#include "opt_efi.h"
#include "opt_machdep.h"
-#include "opt_md.h"
#include "opt_multiprocessor.h"
#include "genfb.h"
@@ -65,8 +64,6 @@
#include <sys/proc.h>
#include <sys/pserialize.h>
#include <sys/reboot.h>
-#include <sys/rnd.h>
-#include <sys/rndsource.h>
#include <sys/systm.h>
#include <sys/termios.h>
#include <sys/vnode.h>
@@ -113,10 +110,6 @@
#include <dev/wscons/wsdisplayvar.h>
#endif
-#ifdef MEMORY_DISK_DYNAMIC
-#include <dev/md.h>
-#endif
-
#ifndef FDT_MAX_BOOT_STRING
#define FDT_MAX_BOOT_STRING 1024
#endif
@@ -129,10 +122,6 @@ char *boot_args = NULL;
u_long uboot_args[4] __attribute__((__section__(".data")));
const uint8_t *fdt_addr_r __attribute__((__section__(".data")));
-static uint64_t initrd_start, initrd_end;
-static uint64_t rndseed_start, rndseed_end; /* our on-disk seed */
-static uint64_t efirng_start, efirng_end; /* firmware's EFI RNG output */
-
#include <libfdt.h>
#include <dev/fdt/fdtvar.h>
#define FDT_BUF_SIZE (512*1024)
@@ -241,21 +230,10 @@ fdt_build_bootconfig(uint64_t mem_start,
uint64_t addr, size;
int index;
- const uint64_t initrd_size =
- round_page(initrd_end) - trunc_page(initrd_start);
- if (initrd_size > 0)
- fdt_memory_remove_range(trunc_page(initrd_start), initrd_size);
-
- const uint64_t rndseed_size =
- round_page(rndseed_end) - trunc_page(rndseed_start);
- if (rndseed_size > 0)
- fdt_memory_remove_range(trunc_page(rndseed_start),
- rndseed_size);
-
- const uint64_t efirng_size =
- round_page(efirng_end) - trunc_page(efirng_start);
- if (efirng_size > 0)
- fdt_memory_remove_range(trunc_page(efirng_start), efirng_size);
+ /* Reserve pages for ramdisk, rndseed, and firmware's RNG */
+ fdt_reserve_initrd();
+ fdt_reserve_rndseed();
+ fdt_reserve_efirng();
const int framebuffer = OF_finddevice("/chosen/framebuffer");
if (framebuffer >= 0) {
@@ -271,222 +249,6 @@ fdt_build_bootconfig(uint64_t mem_start,
fdt_memory_foreach(fdt_add_dram_blocks, bc);
}
-static void
-fdt_probe_range(const char *startname, const char *endname,
- uint64_t *pstart, uint64_t *pend)
-{
- int chosen, len;
- const void *start_data, *end_data;
-
- *pstart = *pend = 0;
-
- chosen = OF_finddevice("/chosen");
- if (chosen < 0)
- return;
-
- start_data = fdtbus_get_prop(chosen, startname, &len);
- end_data = fdtbus_get_prop(chosen, endname, NULL);
- if (start_data == NULL || end_data == NULL)
- return;
-
- switch (len) {
- case 4:
- *pstart = be32dec(start_data);
- *pend = be32dec(end_data);
- break;
- case 8:
- *pstart = be64dec(start_data);
- *pend = be64dec(end_data);
- break;
- default:
- printf("Unsupported len %d for /chosen `%s'\n",
- len, startname);
- return;
- }
-}
-
-static void *
-fdt_map_range(uint64_t start, uint64_t end, uint64_t *psize,
- const char *purpose)
-{
- const paddr_t startpa = trunc_page(start);
- const paddr_t endpa = round_page(end);
- paddr_t pa;
- vaddr_t va;
- void *ptr;
-
- *psize = end - start;
- if (*psize == 0)
- return NULL;
-
- const vaddr_t voff = start & PAGE_MASK;
-
- va = uvm_km_alloc(kernel_map, *psize, 0, UVM_KMF_VAONLY | UVM_KMF_NOWAIT);
- if (va == 0) {
- printf("Failed to allocate VA for %s\n", purpose);
- return NULL;
- }
- ptr = (void *)(va + voff);
-
- for (pa = startpa; pa < endpa; pa += PAGE_SIZE, va += PAGE_SIZE)
- pmap_kenter_pa(va, pa, VM_PROT_READ | VM_PROT_WRITE, 0);
- pmap_update(pmap_kernel());
-
- return ptr;
-}
-
-static void
-fdt_unmap_range(void *ptr, uint64_t size)
-{
- const char *start = ptr, *end = start + size;
- const vaddr_t startva = trunc_page((vaddr_t)(uintptr_t)start);
- const vaddr_t endva = round_page((vaddr_t)(uintptr_t)end);
- const vsize_t sz = endva - startva;
-
- pmap_kremove(startva, sz);
- pmap_update(pmap_kernel());
-
- uvm_km_free(kernel_map, startva, sz, UVM_KMF_VAONLY);
-}
-
-static void
-fdt_probe_initrd(uint64_t *pstart, uint64_t *pend)
-{
- *pstart = *pend = 0;
-
-#ifdef MEMORY_DISK_DYNAMIC
- fdt_probe_range("linux,initrd-start", "linux,initrd-end", pstart, pend);
-#endif
-}
-
-static void
-fdt_setup_initrd(void)
-{
-#ifdef MEMORY_DISK_DYNAMIC
- void *md_start;
- uint64_t initrd_size;
-
- md_start = fdt_map_range(initrd_start, initrd_end, &initrd_size,
- "initrd");
- if (md_start == NULL)
- return;
- md_root_setconf(md_start, initrd_size);
-#endif
-}
Home |
Main Index |
Thread Index |
Old Index