hrev53938 adds 1 changeset to branch 'master'
old head: cffa2c68a85b3e06322b922e912c04e334f3fd70
new head: a8cd19b6412150b4ba1587b5541480cef333eef4
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=a8cd19b64121+%5Ecffa2c68a85b
----------------------------------------------------------------------------
a8cd19b64121: system/boot: Begin factoring gFDT out of non-u-boot code
Change-Id: Ibe010c6c7ed71a20fc852ce6c72c6f32b98dfad2
Reviewed-on: https://review.haiku-os.org/c/haiku/+/2292
Reviewed-by: Alex von Gluck IV <kallisti5@xxxxxxxxxxx>
Reviewed-by: Adrien Destugues <pulkomandy@xxxxxxxxx>
[ Alexander von Gluck IV <kallisti5@xxxxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev53938
Commit: a8cd19b6412150b4ba1587b5541480cef333eef4
URL: https://git.haiku-os.org/haiku/commit/?id=a8cd19b64121
Author: Alexander von Gluck IV <kallisti5@xxxxxxxxxxx>
Date: Fri Feb 28 23:59:49 2020 UTC
Committer: Alex von Gluck IV <kallisti5@xxxxxxxxxxx>
Commit-Date: Wed Mar 4 14:24:26 2020 UTC
----------------------------------------------------------------------------
5 files changed, 33 insertions(+), 20 deletions(-)
src/system/boot/arch/arm/arch_mmu.cpp | 45 +++++++++++++-------
src/system/boot/arch/arm/arch_mmu.h | 2 +-
.../boot/platform/u-boot/arch/ppc/arch_mmu.cpp | 2 +-
src/system/boot/platform/u-boot/mmu.h | 2 +-
src/system/boot/platform/u-boot/start.cpp | 2 +-
----------------------------------------------------------------------------
diff --git a/src/system/boot/arch/arm/arch_mmu.cpp
b/src/system/boot/arch/arm/arch_mmu.cpp
index 7da9a269e6..9b06a61337 100644
--- a/src/system/boot/arch/arm/arch_mmu.cpp
+++ b/src/system/boot/arch/arm/arch_mmu.cpp
@@ -42,9 +42,6 @@ extern "C" {
// You also need to define ENABLE_SERIAL in serial.cpp
// for output to work.
-extern void *gFDT;
-
-
/*
TODO:
-recycle bit!
@@ -354,7 +351,7 @@ map_pages_loader()
//TODO:move this to generic/ ?
static status_t
-fdt_map_memory_ranges(const char* path, bool physical = false)
+fdt_map_memory_ranges(void* fdt, const char* path, bool physical = false)
{
int node;
const void *prop;
@@ -362,15 +359,15 @@ fdt_map_memory_ranges(const char* path, bool physical =
false)
uint64 total;
dprintf("checking FDT for %s...\n", path);
- node = fdt_path_offset(gFDT, path);
+ node = fdt_path_offset(fdt, path);
total = 0;
int32 regAddressCells = 1;
int32 regSizeCells = 1;
- fdt_get_cell_count(gFDT, node, regAddressCells, regSizeCells);
+ fdt_get_cell_count(fdt, node, regAddressCells, regSizeCells);
- prop = fdt_getprop(gFDT, node, "reg", &len);
+ prop = fdt_getprop(fdt, node, "reg", &len);
if (prop == NULL) {
dprintf("Unable to locate %s in FDT!\n", path);
return B_ERROR;
@@ -420,8 +417,26 @@ fdt_map_memory_ranges(const char* path, bool physical =
false)
}
-void
-init_page_directory()
+static void
+fdt_map_peripheral(void* fdt)
+{
+ if (fdt == NULL) {
+ dprintf("Invalid FDT provided to %s!", __func__);
+ return;
+ }
+
+ // map peripheral devices (such as uart) from fdt
+
+ #warning Map peripherals from the fdt we want to use in the bootloader!
+ // this assumes /pl011@9000000 which is the qemu virt uart
+ fdt_map_memory_ranges(fdt, "/pl011@9000000");
+ // this assumes /axi which is broadcom!
+ fdt_map_memory_ranges(fdt, "/axi");
+}
+
+
+static void
+init_page_directory(void* fdt)
{
TRACE(("init_page_directory\n"));
@@ -441,10 +456,8 @@ init_page_directory()
// map our well known / static pages
map_pages_loader();
- // map peripheral devices (such as uart) from fdt
- // TODO: Iterate over for "simple-bus" compatible devices!
- // this assumes /axi which is broadcom!
- fdt_map_memory_ranges("/axi");
+ // map our fdt peripherals
+ fdt_map_peripheral(fdt);
mmu_flush_TLB();
@@ -693,7 +706,7 @@ mmu_init_for_kernel(void)
extern "C" void
-mmu_init(void)
+mmu_init(void* fdt)
{
TRACE(("mmu_init\n"));
@@ -701,7 +714,7 @@ mmu_init(void)
if (gKernelArgs.num_physical_memory_ranges == 0) {
// get map of physical memory (fill in kernel_args structure)
- if (fdt_map_memory_ranges("/memory", true) != B_OK) {
+ if (fdt_map_memory_ranges(fdt, "/memory", true) != B_OK) {
panic("Error: could not find physical memory ranges
from FDT!\n");
#ifdef SDRAM_BASE
@@ -743,7 +756,7 @@ mmu_init(void)
(addr_t)&_end - (addr_t)&_start);
insert_physical_allocated_range((addr_t)sPageDirectory, 0x200000);
- init_page_directory();
+ init_page_directory(fdt);
// map in a kernel stack
gKernelArgs.cpu_kstack[0].size = KERNEL_STACK_SIZE
diff --git a/src/system/boot/arch/arm/arch_mmu.h
b/src/system/boot/arch/arm/arch_mmu.h
index cd30040c7d..004a083989 100644
--- a/src/system/boot/arch/arm/arch_mmu.h
+++ b/src/system/boot/arch/arm/arch_mmu.h
@@ -18,7 +18,7 @@ static const uint32 kDefaultPageFlags = 0x3;
extern "C" {
#endif
-extern void mmu_init(void);
+extern void mmu_init(void* fdt);
extern void mmu_init_for_kernel(void);
extern addr_t mmu_map_physical_memory(addr_t physicalAddress,
size_t size, uint32 flags);
diff --git a/src/system/boot/platform/u-boot/arch/ppc/arch_mmu.cpp
b/src/system/boot/platform/u-boot/arch/ppc/arch_mmu.cpp
index 2abf1cebb3..df228ea855 100644
--- a/src/system/boot/platform/u-boot/arch/ppc/arch_mmu.cpp
+++ b/src/system/boot/platform/u-boot/arch/ppc/arch_mmu.cpp
@@ -283,7 +283,7 @@ find_physical_memory_ranges(phys_addr_t &total)
extern "C" void
-mmu_init(void)
+mmu_init(void* fdt)
{
size_t tableSize, tlbSize;
status_t err;
diff --git a/src/system/boot/platform/u-boot/mmu.h
b/src/system/boot/platform/u-boot/mmu.h
index cd30040c7d..004a083989 100644
--- a/src/system/boot/platform/u-boot/mmu.h
+++ b/src/system/boot/platform/u-boot/mmu.h
@@ -18,7 +18,7 @@ static const uint32 kDefaultPageFlags = 0x3;
extern "C" {
#endif
-extern void mmu_init(void);
+extern void mmu_init(void* fdt);
extern void mmu_init_for_kernel(void);
extern addr_t mmu_map_physical_memory(addr_t physicalAddress,
size_t size, uint32 flags);
diff --git a/src/system/boot/platform/u-boot/start.cpp
b/src/system/boot/platform/u-boot/start.cpp
index 7542cce71c..d7d38045a4 100644
--- a/src/system/boot/platform/u-boot/start.cpp
+++ b/src/system/boot/platform/u-boot/start.cpp
@@ -305,7 +305,7 @@ start_gen(int argc, const char **argv, struct image_header
*uimage, void *fdt)
size_t fdtSize = gFDT ? fdt_totalsize(gFDT) : 0;
dprintf("fdtSize: 0x%" B_PRIxSIZE "\n", fdtSize);
- mmu_init();
+ mmu_init(gFDT);
// Handle our tarFS post-mmu
if (args.platform.boot_tgz_size > 0) {
