diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2021-06-10 13:04:13 +0200 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2021-06-17 12:58:33 +0200 |
commit | 2c07f24af210c4738fbe6f75a53c58fbd80fb658 (patch) | |
tree | 4d8e061e716beb451cdb45bd8761f2025ce062bb /bsps/sparc | |
parent | grlib: Customizable allocation in ambapp_scan() (diff) | |
download | rtems-2c07f24af210c4738fbe6f75a53c58fbd80fb658.tar.bz2 |
grlib: Add ambapp_plb()
Replace the global variable ambapp_plb with a function to allow an automatic on
demand initialization.
Diffstat (limited to 'bsps/sparc')
-rw-r--r-- | bsps/sparc/leon3/clock/ckinit.c | 2 | ||||
-rw-r--r-- | bsps/sparc/leon3/console/console.c | 4 | ||||
-rw-r--r-- | bsps/sparc/leon3/console/printk_support.c | 2 | ||||
-rw-r--r-- | bsps/sparc/leon3/include/amba.h | 11 | ||||
-rw-r--r-- | bsps/sparc/leon3/include/leon.h | 2 | ||||
-rw-r--r-- | bsps/sparc/leon3/start/amba.c | 72 | ||||
-rw-r--r-- | bsps/sparc/leon3/start/cache.c | 2 | ||||
-rw-r--r-- | bsps/sparc/leon3/start/cpucounter.c | 4 |
8 files changed, 60 insertions, 39 deletions
diff --git a/bsps/sparc/leon3/clock/ckinit.c b/bsps/sparc/leon3/clock/ckinit.c index 43e5f55ae5..4d30e0fd64 100644 --- a/bsps/sparc/leon3/clock/ckinit.c +++ b/bsps/sparc/leon3/clock/ckinit.c @@ -185,7 +185,7 @@ static void leon3_clock_initialize(void) } else if (irqmp_has_timestamp(irqmp_ts)) { /* Use the interrupt controller timestamp counter if available */ tc->tc_get_timecount = _SPARC_Get_timecount_up; - tc->tc_frequency = ambapp_freq_get(&ambapp_plb, LEON3_Timer_Adev); + tc->tc_frequency = ambapp_freq_get(ambapp_plb(), LEON3_Timer_Adev); leon3_tc_tick = leon3_tc_tick_irqmp_timestamp_init; diff --git a/bsps/sparc/leon3/console/console.c b/bsps/sparc/leon3/console/console.c index 9fb1f54828..d5fff88d18 100644 --- a/bsps/sparc/leon3/console/console.c +++ b/bsps/sparc/leon3/console/console.c @@ -66,7 +66,7 @@ static int find_matching_apbuart(struct ambapp_dev *dev, int index, void *arg) /* Get APBUART core frequency, it is assumed that it is the same * as Bus frequency where the UART is situated */ - apbuarts[uarts].freq_hz = ambapp_freq_get(&ambapp_plb, dev); + apbuarts[uarts].freq_hz = ambapp_freq_get(ambapp_plb(), dev); uarts++; if (uarts >= BSP_NUMBER_OF_TERMIOS_PORTS) @@ -81,7 +81,7 @@ static void leon3_console_scan_uarts(void) memset(apbuarts, 0, sizeof(apbuarts)); /* Find APBUART cores */ - ambapp_for_each(&ambapp_plb, (OPTIONS_ALL|OPTIONS_APB_SLVS), VENDOR_GAISLER, + ambapp_for_each(ambapp_plb(), (OPTIONS_ALL|OPTIONS_APB_SLVS), VENDOR_GAISLER, GAISLER_APBUART, find_matching_apbuart, NULL); } diff --git a/bsps/sparc/leon3/console/printk_support.c b/bsps/sparc/leon3/console/printk_support.c index 760ddd4b4c..f521f09a4c 100644 --- a/bsps/sparc/leon3/console/printk_support.c +++ b/bsps/sparc/leon3/console/printk_support.c @@ -85,7 +85,7 @@ static void bsp_debug_uart_init(void) /* Find APBUART core for System Debug Console */ i = leon3_debug_uart_index; - adev = (void *)ambapp_for_each(&ambapp_plb, (OPTIONS_ALL|OPTIONS_APB_SLVS), + adev = (void *)ambapp_for_each(ambapp_plb(), (OPTIONS_ALL|OPTIONS_APB_SLVS), VENDOR_GAISLER, GAISLER_APBUART, ambapp_find_by_idx, (void *)&i); if (adev != NULL) { diff --git a/bsps/sparc/leon3/include/amba.h b/bsps/sparc/leon3/include/amba.h index c41c70a5a7..1492661fa5 100644 --- a/bsps/sparc/leon3/include/amba.h +++ b/bsps/sparc/leon3/include/amba.h @@ -45,17 +45,6 @@ #include <grlib/ambapp.h> #include <grlib/grlib.h> -#ifdef __cplusplus -extern "C" { -#endif - -/* The AMBA Plug&Play info of the bus that the LEON3 sits on */ -extern struct ambapp_bus ambapp_plb; - -#ifdef __cplusplus -} -#endif - /** @} */ #endif /* __AMBA_H__ */ diff --git a/bsps/sparc/leon3/include/leon.h b/bsps/sparc/leon3/include/leon.h index 7eed5894c6..5fadb08052 100644 --- a/bsps/sparc/leon3/include/leon.h +++ b/bsps/sparc/leon3/include/leon.h @@ -494,7 +494,7 @@ static inline uint32_t leon3_up_counter_frequency(void) * For simplicity, assume that the interrupt controller uses the processor * clock. This is at least true on the GR740. */ - return ambapp_freq_get(&ambapp_plb, LEON3_IrqCtrl_Adev); + return ambapp_freq_get(ambapp_plb(), LEON3_IrqCtrl_Adev); } #endif /* !ASM */ diff --git a/bsps/sparc/leon3/start/amba.c b/bsps/sparc/leon3/start/amba.c index 1de206139f..4d5c82b9f9 100644 --- a/bsps/sparc/leon3/start/amba.c +++ b/bsps/sparc/leon3/start/amba.c @@ -15,8 +15,11 @@ #include <bsp/fatal.h> #include <leon.h> #include <grlib/ambapp.h> +#include <rtems/score/memory.h> #include <rtems/sysinit.h> +#include <string.h> + unsigned int leon3_timer_prescaler __attribute__((weak)) = 0; int leon3_timer_core_index __attribute__((weak)) = 0; @@ -25,7 +28,35 @@ int leon3_timer_core_index __attribute__((weak)) = 0; * After software has scanned AMBA PnP it builds a tree to make * it easier for drivers to work with the bus architecture. */ -struct ambapp_bus ambapp_plb; +static struct ambapp_bus ambapp_plb_instance; + +static void *ambapp_plb_alloc( size_t size ) +{ + return _Memory_Allocate( _Memory_Get(), size, CPU_HEAP_ALIGNMENT ); +} + +struct ambapp_bus *ambapp_plb( void ) +{ + struct ambapp_bus *plb; + + plb = &ambapp_plb_instance; + + if ( plb->root == NULL ) { + struct ambapp_context ctx; + + ctx.copy_from_device = (ambapp_memcpy_t) memcpy; + ctx.alloc = ambapp_plb_alloc; + + /* Scan AMBA Plug&Play read-only information. The routine builds a PnP + * tree into ambapp_plb in RAM, after this we never access the PnP + * information in hardware directly any more. + * Since on Processor Local Bus (PLB) memory mapping is 1:1 + */ + ambapp_scan( plb, LEON3_IO_AREA, &ctx, NULL ); + } + + return plb; +} /* If RTEMS_DRVMGR_STARTUP is defined extra code is added that * registers the GRLIB AMBA PnP bus driver as root driver. @@ -48,10 +79,20 @@ struct drvmgr_bus_res grlib_drv_resources __attribute__((weak)) = }; /* GRLIB AMBA bus configuration (the LEON3 root bus configuration) */ -struct grlib_config grlib_bus_config = +struct grlib_config grlib_bus_config; + +static void ambapp_grlib_root_initialize( void ) { - &ambapp_plb, /* AMBAPP bus setup */ - &grlib_drv_resources, /* Driver configuration */ + /* Register Root bus, Use GRLIB AMBA PnP bus as root bus for LEON3 */ + grlib_bus_config.abus = ambapp_plb(); + grlib_bus_config.resources = &grlib_drv_resources; + ambapp_grlib_root_register(&grlib_bus_config); +} + +RTEMS_SYSINIT_ITEM( + ambapp_grlib_root_initialize, + RTEMS_SYSINIT_BSP_START, + RTEMS_SYSINIT_ORDER_SECOND }; #endif @@ -78,16 +119,12 @@ static void amba_initialize(void) { int icsel; struct ambapp_dev *adev; + struct ambapp_bus *plb; - /* Scan AMBA Plug&Play read-only information. The routine builds a PnP - * tree into ambapp_plb in RAM, after this we never access the PnP - * information in hardware directly any more. - * Since on Processor Local Bus (PLB) memory mapping is 1:1 - */ - ambapp_scan(&ambapp_plb, LEON3_IO_AREA, NULL, NULL); + plb = ambapp_plb(); /* Find LEON3 Interrupt controller */ - adev = (void *)ambapp_for_each(&ambapp_plb, (OPTIONS_ALL|OPTIONS_APB_SLVS), + adev = (void *)ambapp_for_each(plb, (OPTIONS_ALL|OPTIONS_APB_SLVS), VENDOR_GAISLER, GAISLER_IRQMP, ambapp_find_by_idx, NULL); if (adev == NULL) { @@ -118,7 +155,7 @@ static void amba_initialize(void) leon3_ext_irq_init(); /* find GP Timer */ - adev = (void *)ambapp_for_each(&ambapp_plb, (OPTIONS_ALL|OPTIONS_APB_SLVS), + adev = (void *)ambapp_for_each(plb, (OPTIONS_ALL|OPTIONS_APB_SLVS), VENDOR_GAISLER, GAISLER_GPTIMER, ambapp_find_by_idx, &leon3_timer_core_index); if (adev) { @@ -127,7 +164,7 @@ static void amba_initialize(void) /* Register AMBA Bus Frequency */ ambapp_freq_init( - &ambapp_plb, + plb, LEON3_Timer_Adev, (LEON3_Timer_Regs->scaler_reload + 1) * LEON3_GPTIMER_0_FREQUENCY_SET_BY_BOOT_LOADER @@ -140,15 +177,10 @@ static void amba_initialize(void) if (leon3_timer_prescaler) LEON3_Timer_Regs->scaler_reload = leon3_timer_prescaler; } - -#ifdef RTEMS_DRVMGR_STARTUP - /* Register Root bus, Use GRLIB AMBA PnP bus as root bus for LEON3 */ - ambapp_grlib_root_register(&grlib_bus_config); -#endif } RTEMS_SYSINIT_ITEM( amba_initialize, - RTEMS_SYSINIT_BSP_START, - RTEMS_SYSINIT_ORDER_SECOND + RTEMS_SYSINIT_BSP_EARLY, + RTEMS_SYSINIT_ORDER_MIDDLE ); diff --git a/bsps/sparc/leon3/start/cache.c b/bsps/sparc/leon3/start/cache.c index fb210a1f70..c428efa119 100644 --- a/bsps/sparc/leon3/start/cache.c +++ b/bsps/sparc/leon3/start/cache.c @@ -31,7 +31,7 @@ static inline volatile struct l2c_regs *get_l2c_regs(void) struct ambapp_dev *adev; adev = (void *) ambapp_for_each( - &ambapp_plb, + ambapp_plb(), OPTIONS_ALL | OPTIONS_AHB_SLVS, VENDOR_GAISLER, GAISLER_L2CACHE, diff --git a/bsps/sparc/leon3/start/cpucounter.c b/bsps/sparc/leon3/start/cpucounter.c index 068c631af1..73a306a1eb 100644 --- a/bsps/sparc/leon3/start/cpucounter.c +++ b/bsps/sparc/leon3/start/cpucounter.c @@ -52,7 +52,7 @@ static void leon3_counter_initialize(void) /* Enable interrupt timestamping for an arbitrary interrupt line */ irqmp_ts->control = 0x1; - leon3_counter_frequency = ambapp_freq_get(&ambapp_plb, LEON3_IrqCtrl_Adev); + leon3_counter_frequency = ambapp_freq_get(ambapp_plb(), LEON3_IrqCtrl_Adev); } else if (gpt != NULL) { /* Fall back to the first GPTIMER if available */ counter->read_isr_disabled = _SPARC_Counter_read_down; @@ -65,7 +65,7 @@ static void leon3_counter_initialize(void) GPTIMER_TIMER_CTRL_RS | GPTIMER_TIMER_CTRL_LD; - leon3_counter_frequency = ambapp_freq_get(&ambapp_plb, LEON3_Timer_Adev) / + leon3_counter_frequency = ambapp_freq_get(ambapp_plb(), LEON3_Timer_Adev) / (gpt->scaler_reload + 1); } } |