d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stand/kboot: Make FDT fixup per-arch

Browse Source 
The fixups needed vary somewhat by architecture, so move the FDT fixup
to be per-arch. Rename the fdt_linux_fixup() routine to be
fdt_arch_fixup() and expect all architecutres to fix things up as
needed.

Sponsored by:		Netflix
Differential Revision:	https://reviews.freebsd.org/D36604
This commit is contained in:
Warner Losh 2022-10-27 11:36:51 -06:00
parent 1d21f64149
commit cc9f1b4c35
6 changed files with 129 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
stand/kboot/arch/amd64/Makefile.inc
View File

@ -1,4 +1,4 @@
SRCS+= host_syscall.S amd64_tramp.S elf64_freebsd.c load_addr.c
SRCS+= host_syscall.S amd64_tramp.S elf64_freebsd.c load_addr.c fdt_arch.c
CFLAGS+= -I${SYSDIR}/contrib/dev/acpica/include

32
stand/kboot/arch/amd64/fdt_arch.c Normal file
View File

@ -0,0 +1,32 @@
/*-
* Copyright (c) 2022 Netflix, Inc
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
* IN NO EVENT SHALL TOOLS GMBH BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
* OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/types.h>
#include "kboot.h"
void
fdt_arch_fixups(void *fdtp)
{
/* amd64 doesn't pass in a FDT, so nothing to fix */
}

2
stand/kboot/arch/powerpc64/Makefile.inc
View File

@ -1,6 +1,6 @@
CFLAGS+= -mcpu=powerpc64
SRCS+= ppc64_elf_freebsd.c host_syscall.S kerneltramp.S load_addr.c
SRCS+= ppc64_elf_freebsd.c host_syscall.S kerneltramp.S load_addr.c fdt_arch.c
SRCS+= ucmpdi2.c
LDFLAGS= -nostdlib -static -T ${.CURDIR}/arch/${MACHINE_ARCH}/ldscript.powerpc

89
stand/kboot/arch/powerpc64/fdt_arch.c Normal file
View File

@ -0,0 +1,89 @@
/*-
* Copyright (C) 2014 Nathan Whitehorn
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
* IN NO EVENT SHALL TOOLS GMBH BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
* OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/types.h>
#include <fdt_platform.h>
#include <libfdt.h>
#include "kboot.h"
/* Fix up wrong values added to the device tree by prom_init() in Linux */
void
fdt_arch_fixups(void *fdtp)
{
int offset, len;
const void *prop;
/*
* Remove /memory/available properties, which reflect long-gone OF
* state
*/
offset = fdt_path_offset(fdtp, "/memory@0");
if (offset > 0)
fdt_delprop(fdtp, offset, "available");
/*
* Add reservations for OPAL and RTAS state if present
*/
offset = fdt_path_offset(fdtp, "/ibm,opal");
if (offset > 0) {
const uint64_t *base, *size;
base = fdt_getprop(fdtp, offset, "opal-base-address",
&len);
size = fdt_getprop(fdtp, offset, "opal-runtime-size",
&len);
if (base != NULL && size != NULL)
fdt_add_mem_rsv(fdtp, fdt64_to_cpu(*base),
fdt64_to_cpu(*size));
}
offset = fdt_path_offset(fdtp, "/rtas");
if (offset > 0) {
const uint32_t *base, *size;
base = fdt_getprop(fdtp, offset, "linux,rtas-base", &len);
size = fdt_getprop(fdtp, offset, "rtas-size", &len);
if (base != NULL && size != NULL)
fdt_add_mem_rsv(fdtp, fdt32_to_cpu(*base),
fdt32_to_cpu(*size));
}
/*
* Patch up /chosen nodes so that the stored handles mean something,
* where possible.
*/
offset = fdt_path_offset(fdtp, "/chosen");
if (offset > 0) {
fdt_delprop(fdtp, offset, "cpu"); /* This node not meaningful */
offset = fdt_path_offset(fdtp, "/chosen");
prop = fdt_getprop(fdtp, offset, "linux,stdout-package", &len);
if (prop != NULL) {
fdt_setprop(fdtp, offset, "stdout", prop, len);
offset = fdt_path_offset(fdtp, "/chosen");
fdt_setprop(fdtp, offset, "stdin", prop, len);
}
}
}

4
stand/kboot/kboot.h
View File

@ -10,6 +10,10 @@
#define DEVT_HOSTDISK 1234
void do_init(void);
/* Per-platform fdt fixup */
void fdt_arch_fixups(void *fdtp);
uint64_t kboot_get_phys_load_segment(void);
uint8_t kboot_get_kernel_machine_bits(void);

63
stand/kboot/kbootfdt.c
View File

@ -31,6 +31,7 @@ __FBSDID("$FreeBSD$");
#include <libfdt.h>
#include "bootstrap.h"
#include "host_syscall.h"
#include "kboot.h"
static void
add_node_to_fdt(void *buffer, const char *path, int fdt_offset)
@ -88,66 +89,6 @@ add_node_to_fdt(void *buffer, const char *path, int fdt_offset)
host_close(fd);
}
/* Fix up wrong values added to the device tree by prom_init() in Linux */
static void
fdt_linux_fixups(void *fdtp)
{
int offset, len;
const void *prop;
/*
* Remove /memory/available properties, which reflect long-gone OF
* state
*/
offset = fdt_path_offset(fdtp, "/memory@0");
if (offset > 0)
fdt_delprop(fdtp, offset, "available");
/*
* Add reservations for OPAL and RTAS state if present
*/
offset = fdt_path_offset(fdtp, "/ibm,opal");
if (offset > 0) {
const uint64_t *base, *size;
base = fdt_getprop(fdtp, offset, "opal-base-address",
&len);
size = fdt_getprop(fdtp, offset, "opal-runtime-size",
&len);
if (base != NULL && size != NULL)
fdt_add_mem_rsv(fdtp, fdt64_to_cpu(*base),
fdt64_to_cpu(*size));
}
offset = fdt_path_offset(fdtp, "/rtas");
if (offset > 0) {
const uint32_t *base, *size;
base = fdt_getprop(fdtp, offset, "linux,rtas-base", &len);
size = fdt_getprop(fdtp, offset, "rtas-size", &len);
if (base != NULL && size != NULL)
fdt_add_mem_rsv(fdtp, fdt32_to_cpu(*base),
fdt32_to_cpu(*size));
}
/*
* Patch up /chosen nodes so that the stored handles mean something,
* where possible.
*/
offset = fdt_path_offset(fdtp, "/chosen");
if (offset > 0) {
fdt_delprop(fdtp, offset, "cpu"); /* This node not meaningful */
offset = fdt_path_offset(fdtp, "/chosen");
prop = fdt_getprop(fdtp, offset, "linux,stdout-package", &len);
if (prop != NULL) {
fdt_setprop(fdtp, offset, "stdout", prop, len);
offset = fdt_path_offset(fdtp, "/chosen");
fdt_setprop(fdtp, offset, "stdin", prop, len);
}
}
}
int
fdt_platform_load_dtb(void)
{
@ -158,7 +99,7 @@ fdt_platform_load_dtb(void)
fdt_create_empty_tree(buffer, buflen);
add_node_to_fdt(buffer, "/proc/device-tree",
fdt_path_offset(buffer, "/"));
fdt_linux_fixups(buffer);
fdt_arch_fixups(buffer);
fdt_pack(buffer);