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

2008-09-18 Joel Sherrill <joel.sherrill@oarcorp.com>

Browse Source 
* Makefile.am, configure.ac, startup/bspstart.c, startup/linkcmds: Add
	bsp_get_work_area() implementation and use more of the BSP
	Initialization Framework.
	* startup/bspgetworkarea.c: New file.
This commit is contained in:
Joel Sherrill
2008-09-18 20:41:09 +00:00
parent 7f09abec3e
commit ef37cb67a1
6 changed files with 157 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
c/src/lib/libbsp/i386/pc386/ChangeLog
View File

@@ -1,3 +1,10 @@
2008-09-18 Joel Sherrill <joel.sherrill@oarcorp.com>
* Makefile.am, configure.ac, startup/bspstart.c, startup/linkcmds: Add
bsp_get_work_area() implementation and use more of the BSP
Initialization Framework.
* startup/bspgetworkarea.c: New file.
2008-09-18 Joel Sherrill <joel.sherrill@oarcorp.com> 2008-09-18 Joel Sherrill <joel.sherrill@oarcorp.com>
* include/bsp.h: Eliminate definitions of BSP_LIBIO_MAX_FDS since this * include/bsp.h: Eliminate definitions of BSP_LIBIO_MAX_FDS since this

3
c/src/lib/libbsp/i386/pc386/Makefile.am
View File

@@ -79,7 +79,8 @@ pci_SOURCES = ../../i386/shared/pci/pcibios.c \
include_HEADERS += ../../i386/shared/comm/uart.h include_HEADERS += ../../i386/shared/comm/uart.h
startup_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.c \ startup_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.c \
../../shared/bsppredriverhook.c \ ../../shared/bsppredriverhook.c startup/bspgetworkarea.c \
../../shared/bsppretaskinghook.c \
startup/bspstart.c startup/bspclean.c ../../i386/shared/irq/idt.c \ startup/bspstart.c startup/bspclean.c ../../i386/shared/irq/idt.c \
../../i386/shared/irq/irq.c ../../i386/shared/irq/irq_init.c \ ../../i386/shared/irq/irq.c ../../i386/shared/irq/irq_init.c \
../../shared/bootcard.c ../../shared/sbrk.c \ ../../shared/bootcard.c ../../shared/sbrk.c \

2
c/src/lib/libbsp/i386/pc386/configure.ac
View File

@@ -58,6 +58,8 @@ RTEMS_CONFIG_BUILD_SUBDIRS(tools)
AC_SUBST(RTEMS_BSP) AC_SUBST(RTEMS_BSP)
RTEMS_BSP_BOOTCARD_HANDLES_RAM_ALLOCATION
# Explicitly list all Makefiles here # Explicitly list all Makefiles here
AC_CONFIG_FILES([Makefile]) AC_CONFIG_FILES([Makefile])
AC_OUTPUT AC_OUTPUT

131
c/src/lib/libbsp/i386/pc386/startup/bspgetworkarea.c Normal file
View File

@@ -0,0 +1,131 @@
/*
* This routine is an implementation of the bsp_get_work_area()
* that can be used by all m68k BSPs following linkcmds conventions
* regarding heap, stack, and workspace allocation.
*
* COPYRIGHT (c) 1989-2008.
* On-Line Applications Research Corporation (OAR).
*
* The license and distribution terms for this file may be
* found in the file LICENSE in this distribution or at
* http://www.rtems.com/license/LICENSE.
*
* $Id$
*/
#include <bsp.h>
#include <bsp/bootcard.h>
/*
* These are provided by the linkcmds.
*/
extern char WorkAreaBase[];
extern char HeapSize[];
extern char RamSize[];
/* rudimentary multiboot info */
struct multiboot_info {
uint32_t flags; /* start.S only raises flags for items actually */
/* saved; this allows us to check for the size */
/* of the data structure. */
uint32_t mem_lower; /* avail kB in lower memory */
uint32_t mem_upper; /* avail kB in lower memory */
/* ... (unimplemented) */
};
extern struct multiboot_info _boot_multiboot_info;
/*
* Board's memory size easily be overridden by application.
*/
uint32_t bsp_mem_size = 0;
/* Size of stack used during initialization. Defined in 'start.s'. */
extern uint32_t _stack_size;
/* Address of start of free memory. */
uintptr_t rtemsFreeMemStart;
void bsp_size_memory(void)
{
uintptr_t topAddr;
uintptr_t lowest;
uint32_t val;
int i;
/* set the value of start of free memory. */
rtemsFreeMemStart = (uint32_t)WorkAreaBase + _stack_size;
/* Place RTEMS workspace at beginning of free memory. */
if (rtemsFreeMemStart & (CPU_ALIGNMENT - 1)) /* not aligned => align it */
rtemsFreeMemStart = (rtemsFreeMemStart+CPU_ALIGNMENT) & ~(CPU_ALIGNMENT-1);
/* find the lowest 1M boundary to probe */
lowest = ((rtemsFreeMemStart + (1<<20)) >> 20) + 1;
if ( lowest < 2 )
lowest = 2;
/* The memory detection algorithm is very crude; try
* to use multiboot info, if possible (set from start.S)
*/
if ( ((uintptr_t)RamSize == (uintptr_t) 0xFFFFFFFF) &&
(_boot_multiboot_info.flags & 1) &&
_boot_multiboot_info.mem_upper ) {
bsp_mem_size = _boot_multiboot_info.mem_upper * 1024;
printk( "multiboot\n" );
}
if ( (uintptr_t) RamSize == (uintptr_t) 0xFFFFFFFF ) {
printk( "sizing\n" );
/*
* We have to dynamically size memory. Memory size can be anything
* between no less than 2M and 2048M.
* let us first write
*/
for (i=2048; i>=lowest; i--) {
topAddr = i*1024*1024 - 4;
*(volatile uint32_t*)topAddr = topAddr;
}
for(i=lowest; i<=2048; i++) {
topAddr = i*1024*1024 - 4;
val = *(uint32_t*)topAddr;
if (val != topAddr) {
break;
}
}
topAddr = (i-1)*1024*1024 - 4;
} else {
printk( "hardcoded\n" );
topAddr = (uintptr_t) RamSize;
}
bsp_mem_size = topAddr;
}
/*
* This method returns the base address and size of the area which
* is to be allocated between the RTEMS Workspace and the C Program
* Heap.
*/
void bsp_get_work_area(
void **work_area_start,
size_t *work_area_size,
void **heap_start,
size_t *heap_size
)
{
*work_area_start = (void *) rtemsFreeMemStart;
*work_area_size = (uintptr_t) bsp_mem_size - (uintptr_t) rtemsFreeMemStart;
*heap_start = BSP_BOOTCARD_HEAP_USES_WORK_AREA;
*heap_size = (size_t) HeapSize;
#if 0
printk( "WorkArea Base = %p\n", *work_area_start );
printk( "WorkArea Size = 0x%08x\n", *work_area_size );
printk( "C Program Heap Base = %p\n", *heap_start );
printk( "C Program Heap Size = 0x%08x\n", *heap_size );
#endif
}

141
c/src/lib/libbsp/i386/pc386/startup/bspstart.c
View File

@@ -19,7 +19,7 @@
| bspstart.c,v 1.8 1996/05/28 13:12:40 joel Exp - go32 BSP | bspstart.c,v 1.8 1996/05/28 13:12:40 joel Exp - go32 BSP
| With the following copyright notice: | With the following copyright notice:
| ************************************************************************** | **************************************************************************
| * COPYRIGHT (c) 1989-1999. | * COPYRIGHT (c) 1989-2008.
| * On-Line Applications Research Corporation (OAR). | * On-Line Applications Research Corporation (OAR).
| * | *
| * The license and distribution terms for this file may be | * The license and distribution terms for this file may be
@@ -34,120 +34,12 @@
#include <rtems/pci.h> #include <rtems/pci.h>
#include <libcpu/cpuModel.h> #include <libcpu/cpuModel.h>
/*-------------------------------------------------------------------------+
| Global Variables
+--------------------------------------------------------------------------*/
extern uint32_t _end; /* End of BSS. Defined in 'linkcmds'. */
/* rudimentary multiboot info */
struct multiboot_info {
uint32_t flags; /* start.S only raises flags for items actually saved; this allows us to check for the size of the data structure */
uint32_t mem_lower; /* avail kB in lower memory */
uint32_t mem_upper; /* avail kB in lower memory */
/* ... (unimplemented) */
};
extern struct multiboot_info _boot_multiboot_info;
/* /*
* Size of heap if it is 0 it will be dynamically defined by memory size, * External routines
* otherwise the value should be changed by binary patch
*/ */
uint32_t _heap_size = 0; extern void Calibrate_loop_1ms(void);
/* Alternative way to hardcode the board's memory size [rather than heap size].
* Can easily be overridden by application.
*/
extern uint32_t bsp_mem_size
__attribute__ ((weak, alias("bsp_mem_size_default")));
uint32_t bsp_mem_size_default = 0;
/* Size of stack used during initialization. Defined in 'start.s'. */
extern uint32_t _stack_size;
uint32_t rtemsFreeMemStart;
/* Address of start of free memory - should be updated
after creating new partitions or regions. */
/*-------------------------------------------------------------------------+
| External Prototypes
+--------------------------------------------------------------------------*/
extern void rtems_irq_mngt_init(void); extern void rtems_irq_mngt_init(void);
void bsp_libc_init( void *, uint32_t, int ); extern void bsp_size_memory(void);
/*-------------------------------------------------------------------------+
| Function: bsp_pretasking_hook
| Description: BSP pretasking hook. Called just before drivers are
| initialized. Used to setup libc and install any BSP
| extensions. NOTE: Must not use libc (to do io) from here,
| since drivers are not yet initialized.
| Global Variables: None.
| Arguments: None.
| Returns: Nothing.
+--------------------------------------------------------------------------*/
void bsp_pretasking_hook(void)
{
uint32_t topAddr, val;
int i, lowest;
if (rtemsFreeMemStart & (CPU_ALIGNMENT - 1)) /* not aligned => align it */
rtemsFreeMemStart = (rtemsFreeMemStart+CPU_ALIGNMENT) & ~(CPU_ALIGNMENT-1);
/* find the lowest 1M boundary to probe */
lowest = ((rtemsFreeMemStart + (1<<20)) >> 20) + 1;
if ( lowest < 2 )
lowest = 2;
/* The memory detection algorithm is very crude; try
* to use multiboot info, if possible (set from start.S)
*/
if ( bsp_mem_size == 0 &&
(_boot_multiboot_info.flags & 1) &&
_boot_multiboot_info.mem_upper ) {
bsp_mem_size = _boot_multiboot_info.mem_upper * 1024;
}
if ( _heap_size == 0 ) {
if ( bsp_mem_size == 0 ) {
/*
* We have to dynamically size memory. Memory size can be anything
* between no less than 2M and 2048M.
* let us first write
*/
for (i=2048; i>=lowest; i--) {
topAddr = i*1024*1024 - 4;
*(volatile uint32_t*)topAddr = topAddr;
}
for(i=lowest; i<=2048; i++) {
topAddr = i*1024*1024 - 4;
val = *(uint32_t*)topAddr;
if (val != topAddr) {
break;
}
}
topAddr = (i-1)*1024*1024 - 4;
} else {
topAddr = bsp_mem_size;
}
if ( rtemsFreeMemStart > topAddr ) {
printk( "Out of memory -- unable to initialize BSP\n" );
rtems_fatal_error_occurred( 0x85858585 );
}
_heap_size = topAddr - rtemsFreeMemStart;
}
bsp_libc_init((void *)rtemsFreeMemStart, _heap_size, 0);
rtemsFreeMemStart += _heap_size; /* HEAP_SIZE in KBytes */
} /* bsp_pretasking_hook */
/*
* External but essentially private method
*/
void Calibrate_loop_1ms(void);
/*-------------------------------------------------------------------------+ /*-------------------------------------------------------------------------+
| Function: bsp_start | Function: bsp_start
@@ -160,22 +52,16 @@ void bsp_start_default( void )
{ {
int pci_init_retval; int pci_init_retval;
/*
* We need to determine how much memory there is in the system.
*/
bsp_size_memory();
/* /*
* Calibrate variable for 1ms-loop (see timer.c) * Calibrate variable for 1ms-loop (see timer.c)
*/ */
Calibrate_loop_1ms(); Calibrate_loop_1ms();
/* set the value of start of free memory. */
rtemsFreeMemStart = (uint32_t)&_end + _stack_size;
/* Place RTEMS workspace at beginning of free memory. */
if (rtemsFreeMemStart & (CPU_ALIGNMENT - 1)) /* not aligned => align it */
rtemsFreeMemStart = (rtemsFreeMemStart+CPU_ALIGNMENT) & ~(CPU_ALIGNMENT-1);
Configuration.work_space_start = (void *)rtemsFreeMemStart;
rtemsFreeMemStart += rtems_configuration_get_work_space_size();
/* /*
* Init rtems interrupt management * Init rtems interrupt management
*/ */
@@ -192,15 +78,6 @@ void bsp_start_default( void )
if (pci_init_retval != PCIB_ERR_SUCCESS) { if (pci_init_retval != PCIB_ERR_SUCCESS) {
printk("PCI bus: could not initialize PCI BIOS interface\n"); printk("PCI bus: could not initialize PCI BIOS interface\n");
} }
#if 0
printk( "_heap_size = 0x%x\n", _heap_size );
printk( "_stack_size = 0x%x\n", _stack_size );
printk( "rtemsFreeMemStart = 0x%x\n", rtemsFreeMemStart );
printk( "work_space_start = 0x%x\n", rtems_configuration_get_work_space_start() );
printk( "work_space_size = 0x%x\n", rtems_configuration_get_work_space_size() );
#endif
} /* bsp_start */ } /* bsp_start */
/* /*

6
c/src/lib/libbsp/i386/pc386/startup/linkcmds
View File

@@ -17,6 +17,9 @@ OUTPUT_FORMAT("elf32-i386", "elf32-i386",
OUTPUT_ARCH(i386) OUTPUT_ARCH(i386)
ENTRY(_start) ENTRY(_start)
*/ */
HeapSize = DEFINED(HeapSize) ? HeapSize : 0x0;
RamSize = DEFINED(RamSize) ? RamSize : 0xFFFFFFFF;
SECTIONS SECTIONS
{ {
/* Read-only sections, merged into text segment: */ /* Read-only sections, merged into text segment: */
@@ -183,7 +186,10 @@ SECTIONS
. = ALIGN(32 / 8); . = ALIGN(32 / 8);
. = ALIGN(32 / 8); . = ALIGN(32 / 8);
_end = .; PROVIDE (end = .); _end = .; PROVIDE (end = .);
. = ALIGN(0x10);
WorkAreaBase = .;
. = DATA_SEGMENT_END (.); . = DATA_SEGMENT_END (.);
/* Stabs debugging sections. */ /* Stabs debugging sections. */
.stab 0 : { *(.stab) } .stab 0 : { *(.stab) }
.stabstr 0 : { *(.stabstr) } .stabstr 0 : { *(.stabstr) }