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

bsp/arm: Add SCU errata handling for L2C-310 cache

Browse Source
This commit is contained in:
Ralf Kirchner
2014-02-17 11:57:19 +01:00
committed by Sebastian Huber
parent b0553f473b
commit 0b74e10fff
2 changed files with 36 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
c/src/lib/libbsp/arm/shared/include/arm-a9mpcore-regs.h
View File

@@ -58,7 +58,10 @@ typedef struct {
#define A9MPCORE_SCU_INVSS_CPU3(ways) BSP_FLD32(val, 12, 15) #define A9MPCORE_SCU_INVSS_CPU3(ways) BSP_FLD32(val, 12, 15)
#define A9MPCORE_SCU_INVSS_CPU3_GET(reg) /* Write only register */ #define A9MPCORE_SCU_INVSS_CPU3_GET(reg) /* Write only register */
#define A9MPCORE_SCU_INVSS_CPU3_SET(reg, val) BSP_FLD32SET(reg, val, 12, 15) #define A9MPCORE_SCU_INVSS_CPU3_SET(reg, val) BSP_FLD32SET(reg, val, 12, 15)
uint32_t reserved_10[12]; uint32_t reserved_09[8];
uint32_t diagn_ctrl;
#define A9MPCORE_SCU_DIAGN_CTRL_MIGRATORY_BIT_DISABLE BSP_BIT32(0)
uint32_t reserved_10[3];
uint32_t fltstart; uint32_t fltstart;
uint32_t fltend; uint32_t fltend;
uint32_t reserved_48[2]; uint32_t reserved_48[2];

41
c/src/lib/libbsp/arm/shared/include/arm-a9mpcore-start.h
View File

@@ -30,6 +30,7 @@
#include <bsp.h> #include <bsp.h>
#include <bsp/start.h> #include <bsp/start.h>
#include <bsp/arm-a9mpcore-regs.h> #include <bsp/arm-a9mpcore-regs.h>
#include <bsp/arm-errata.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@@ -79,25 +80,45 @@ BSP_START_TEXT_SECTION static inline arm_a9mpcore_start_scu_invalidate(
scu->invss = (ways & 0xf) << ((cpu_id & 0x3) * 4); scu->invss = (ways & 0xf) << ((cpu_id & 0x3) * 4);
} }
BSP_START_TEXT_SECTION static inline arm_a9mpcore_start_hook_0(void) BSP_START_TEXT_SECTION static void inline
arm_a9mpcore_start_errata_764369_handler(volatile a9mpcore_scu *scu)
{ {
#ifdef RTEMS_SMP #ifdef RTEMS_SMP
volatile a9mpcore_scu *scu = (volatile a9mpcore_scu *) BSP_ARM_A9MPCORE_SCU_BASE; if (arm_errata_is_applicable_processor_errata_764369()) {
uint32_t cpu_id; scu->diagn_ctrl |= A9MPCORE_SCU_DIAGN_CTRL_MIGRATORY_BIT_DISABLE;
uint32_t actlr; }
#endif
}
/* Enable Snoop Control Unit (SCU) */ BSP_START_TEXT_SECTION static inline
arm_a9mpcore_start_scu_enable(volatile a9mpcore_scu *scu)
{
arm_a9mpcore_start_errata_764369_handler(scu);
scu->ctrl |= A9MPCORE_SCU_CTRL_SCU_EN; scu->ctrl |= A9MPCORE_SCU_CTRL_SCU_EN;
}
BSP_START_TEXT_SECTION static inline arm_a9mpcore_start_hook_0(void)
{
volatile a9mpcore_scu *scu =
(volatile a9mpcore_scu *) BSP_ARM_A9MPCORE_SCU_BASE;
uint32_t cpu_id;
arm_a9mpcore_start_scu_enable(scu);
#ifdef RTEMS_SMP
/* Enable cache coherency support for this processor */ /* Enable cache coherency support for this processor */
actlr = arm_cp15_get_auxiliary_control(); {
actlr |= ARM_CORTEX_A9_ACTL_SMP; uint32_t actlr = arm_cp15_get_auxiliary_control();
arm_cp15_set_auxiliary_control(actlr); actlr |= ARM_CORTEX_A9_ACTL_SMP;
arm_cp15_set_auxiliary_control(actlr);
}
#endif
cpu_id = arm_cortex_a9_get_multiprocessor_cpu_id(); cpu_id = arm_cortex_a9_get_multiprocessor_cpu_id();
arm_a9mpcore_start_scu_invalidate(scu, cpu_id, 0xf); arm_a9mpcore_start_scu_invalidate(scu, cpu_id, 0xf);
#ifdef RTEMS_SMP
if (cpu_id != 0) { if (cpu_id != 0) {
arm_a9mpcore_start_set_vector_base(); arm_a9mpcore_start_set_vector_base();
@@ -116,7 +137,9 @@ BSP_START_TEXT_SECTION static inline arm_a9mpcore_start_hook_0(void)
); );
/* FIXME: Sharing the translation table between processors is brittle */ /* FIXME: Sharing the translation table between processors is brittle */
arm_cp15_set_translation_table_base((uint32_t *) bsp_translation_table_base); arm_cp15_set_translation_table_base(
(uint32_t *) bsp_translation_table_base
);
ctrl |= ARM_CP15_CTRL_I | ARM_CP15_CTRL_C | ARM_CP15_CTRL_M; ctrl |= ARM_CP15_CTRL_I | ARM_CP15_CTRL_C | ARM_CP15_CTRL_M;
arm_cp15_set_control(ctrl); arm_cp15_set_control(ctrl);