RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

bsp/qoriq: Adjust workspace according to FDT

Browse Source
This commit is contained in:
Sebastian Huber
2017-03-02 15:25:34 +01:00
parent 35136d3d4e
commit d3f60afbfe
2 changed files with 70 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
c/src/lib/libbsp/powerpc/qoriq/Makefile.am
View File

@@ -57,7 +57,6 @@ libbsp_a_SOURCES += \
../../shared/sbrk.c \
../../shared/gnatinstallhandler.c \
../../shared/bspclean.c \
../../shared/bspgetworkarea.c \
../../shared/src/bsp-fdt.c \
../shared/src/ppc-exc-handler-table.c \
../shared/src/tictac.c \

74
c/src/lib/libbsp/powerpc/qoriq/startup/mmu-config.c
View File

@@ -7,7 +7,7 @@
*/
/*
* Copyright (c) 2011-2015 embedded brains GmbH. All rights reserved.
* Copyright (c) 2011, 2017 embedded brains GmbH. All rights reserved.
*
* embedded brains GmbH
* Dornierstr. 4
@@ -21,10 +21,18 @@
*/
#include <bsp.h>
#include <bsp/mmu.h>
#include <bsp/bootcard.h>
#include <bsp/fdt.h>
#include <bsp/linker-symbols.h>
#include <bsp/mmu.h>
#include <bsp/qoriq.h>
#include <sys/param.h>
#include <libfdt.h>
#include <rtems/config.h>
#define TEXT __attribute__((section(".bsp_start_text")))
#define DATA __attribute__((section(".bsp_start_data")))
@@ -95,7 +103,12 @@ typedef struct {
.mas7 = QORIQ_MMU_DEVICE_MAS7 \
}
static const entry DATA config [] = {
#define WORKSPACE_ENTRY_INDEX 0
static entry DATA config[] = {
/* Must be first entry, see WORKSPACE_ENTRY_INDEX */
ENTRY_RW(bsp_section_work_begin, bsp_section_work_size),
#if defined(RTEMS_MULTIPROCESSING) && \
defined(QORIQ_INTERCOM_AREA_BEGIN) && \
defined(QORIQ_INTERCOM_AREA_SIZE)
@@ -119,7 +132,6 @@ static const entry DATA config [] = {
ENTRY_RW(bsp_section_sbss_begin, bsp_section_sbss_size),
ENTRY_RW(bsp_section_bss_begin, bsp_section_bss_size),
ENTRY_RW(bsp_section_rwextra_begin, bsp_section_rwextra_size),
ENTRY_RW(bsp_section_work_begin, bsp_section_work_size),
ENTRY_RW(bsp_section_stack_begin, bsp_section_stack_size),
ENTRY_IO(bsp_section_nocache_begin, bsp_section_nocache_size),
ENTRY_IO(bsp_section_nocachenoload_begin, bsp_section_nocachenoload_size),
@@ -134,11 +146,52 @@ static const entry DATA config [] = {
ENTRY_DEV(&qoriq, sizeof(qoriq))
};
static DATA char memory_path[] = "/memory";
static void TEXT config_fdt_adjust(void)
{
const void *fdt = bsp_fdt_get();
int node;
node = fdt_path_offset_namelen(
fdt,
memory_path,
(int) sizeof(memory_path) - 1
);
if (node >= 0) {
int len;
const void *val;
uint64_t begin;
uint64_t size;
val = fdt_getprop(fdt, node, "reg", &len);
if (len == 8) {
begin = fdt32_to_cpu(((fdt32_t *) val)[0]);
size = fdt32_to_cpu(((fdt32_t *) val)[1]);
} else if (len == 16) {
begin = fdt64_to_cpu(((fdt64_t *) val)[0]);
size = fdt64_to_cpu(((fdt64_t *) val)[1]);
} else {
begin = 0;
size = 0;
}
size = MAX(size, 0x80000000U);
if (begin == 0 && size > (uintptr_t) bsp_section_work_end) {
config[WORKSPACE_ENTRY_INDEX].size += (uintptr_t) size
- (uintptr_t) bsp_section_work_end;
}
}
}
void TEXT qoriq_mmu_config(int first_tlb, int scratch_tlb)
{
qoriq_mmu_context context;
int i = 0;
config_fdt_adjust();
qoriq_mmu_context_init(&context);
for (i = 0; i < QORIQ_TLB1_ENTRY_COUNT; ++i) {
@@ -165,3 +218,16 @@ void TEXT qoriq_mmu_config(int first_tlb, int scratch_tlb)
qoriq_mmu_partition(&context, (3 * QORIQ_TLB1_ENTRY_COUNT) / 4);
qoriq_mmu_write_to_tlb1(&context, first_tlb);
}
void TEXT bsp_work_area_initialize(void)
{
const entry *we = &config[WORKSPACE_ENTRY_INDEX];
uintptr_t begin = we->begin;
uintptr_t end = begin + we->size;
#ifdef BSP_INTERRUPT_STACK_AT_WORK_AREA_BEGIN
begin += rtems_configuration_get_interrupt_stack_size();
#endif
bsp_work_area_initialize_default((void *) begin, end - begin);
}