From f074a4d1bba5dd60188bdd2bce1ecbaaac7aa9a7 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Sun, 27 Oct 2013 19:27:44 +0100 Subject: bsps/arm: ARMV7_MMU_DATA_READ_WRITE_SHAREABLE Delete ARMV7_MMU_DATA_READ_WRITE_SHAREABLE and move RTEMS_SMP specific MMU attribute settings to arm-cp15.h. --- .../libbsp/arm/raspberrypi/startup/mm_config_table.c | 18 ++++++------------ .../libbsp/arm/realview-pbx-a9/startup/bspstarthooks.c | 18 ++++++------------ .../lib/libbsp/arm/xilinx-zynq/startup/bspstarthooks.c | 18 ++++++------------ c/src/lib/libcpu/arm/shared/include/arm-cp15.h | 14 +++++++++----- 4 files changed, 27 insertions(+), 41 deletions(-) diff --git a/c/src/lib/libbsp/arm/raspberrypi/startup/mm_config_table.c b/c/src/lib/libbsp/arm/raspberrypi/startup/mm_config_table.c index 607394dae0..6e46cb1be3 100644 --- a/c/src/lib/libbsp/arm/raspberrypi/startup/mm_config_table.c +++ b/c/src/lib/libbsp/arm/raspberrypi/startup/mm_config_table.c @@ -15,12 +15,6 @@ #include #include -#ifdef RTEMS_SMP - #define MMU_DATA_READ_WRITE ARMV7_MMU_DATA_READ_WRITE_SHAREABLE -#else - #define MMU_DATA_READ_WRITE ARMV7_MMU_DATA_READ_WRITE_CACHED -#endif - BSP_START_DATA_SECTION const arm_cp15_start_section_config bsp_mm_config_table[] = { { @@ -30,7 +24,7 @@ bsp_mm_config_table[] = { }, { .begin = (uint32_t) bsp_section_fast_data_begin, .end = (uint32_t) bsp_section_fast_data_end, - .flags = MMU_DATA_READ_WRITE + .flags = ARMV7_MMU_DATA_READ_WRITE_CACHED }, { .begin = (uint32_t) bsp_section_start_begin, .end = (uint32_t) bsp_section_start_end, @@ -38,7 +32,7 @@ bsp_mm_config_table[] = { }, { .begin = (uint32_t) bsp_section_vector_begin, .end = (uint32_t) bsp_section_vector_end, - .flags = MMU_DATA_READ_WRITE + .flags = ARMV7_MMU_DATA_READ_WRITE_CACHED }, { .begin = (uint32_t) bsp_section_text_begin, .end = (uint32_t) bsp_section_text_end, @@ -50,19 +44,19 @@ bsp_mm_config_table[] = { }, { .begin = (uint32_t) bsp_section_data_begin, .end = (uint32_t) bsp_section_data_end, - .flags = MMU_DATA_READ_WRITE + .flags = ARMV7_MMU_DATA_READ_WRITE_CACHED }, { .begin = (uint32_t) bsp_section_bss_begin, .end = (uint32_t) bsp_section_bss_end, - .flags = MMU_DATA_READ_WRITE + .flags = ARMV7_MMU_DATA_READ_WRITE_CACHED }, { .begin = (uint32_t) bsp_section_work_begin, .end = (uint32_t) bsp_section_work_end, - .flags = MMU_DATA_READ_WRITE + .flags = ARMV7_MMU_DATA_READ_WRITE_CACHED }, { .begin = (uint32_t) bsp_section_stack_begin, .end = (uint32_t) bsp_section_stack_end, - .flags = MMU_DATA_READ_WRITE + .flags = ARMV7_MMU_DATA_READ_WRITE_CACHED }, { .begin = 0x20000000, .end = 0x21000000, diff --git a/c/src/lib/libbsp/arm/realview-pbx-a9/startup/bspstarthooks.c b/c/src/lib/libbsp/arm/realview-pbx-a9/startup/bspstarthooks.c index e598c067b3..ce9c3cea52 100644 --- a/c/src/lib/libbsp/arm/realview-pbx-a9/startup/bspstarthooks.c +++ b/c/src/lib/libbsp/arm/realview-pbx-a9/startup/bspstarthooks.c @@ -18,12 +18,6 @@ #include #include -#ifdef RTEMS_SMP - #define MMU_DATA_READ_WRITE ARMV7_MMU_DATA_READ_WRITE_SHAREABLE -#else - #define MMU_DATA_READ_WRITE ARMV7_MMU_DATA_READ_WRITE_CACHED -#endif - BSP_START_DATA_SECTION static const arm_cp15_start_section_config rvpbxa9_mmu_config_table[] = { { @@ -33,7 +27,7 @@ rvpbxa9_mmu_config_table[] = { }, { .begin = (uint32_t) bsp_section_fast_data_begin, .end = (uint32_t) bsp_section_fast_data_end, - .flags = MMU_DATA_READ_WRITE + .flags = ARMV7_MMU_DATA_READ_WRITE_CACHED }, { .begin = (uint32_t) bsp_section_start_begin, .end = (uint32_t) bsp_section_start_end, @@ -41,7 +35,7 @@ rvpbxa9_mmu_config_table[] = { }, { .begin = (uint32_t) bsp_section_vector_begin, .end = (uint32_t) bsp_section_vector_end, - .flags = MMU_DATA_READ_WRITE + .flags = ARMV7_MMU_DATA_READ_WRITE_CACHED }, { .begin = (uint32_t) bsp_section_text_begin, .end = (uint32_t) bsp_section_text_end, @@ -53,19 +47,19 @@ rvpbxa9_mmu_config_table[] = { }, { .begin = (uint32_t) bsp_section_data_begin, .end = (uint32_t) bsp_section_data_end, - .flags = MMU_DATA_READ_WRITE + .flags = ARMV7_MMU_DATA_READ_WRITE_CACHED }, { .begin = (uint32_t) bsp_section_bss_begin, .end = (uint32_t) bsp_section_bss_end, - .flags = MMU_DATA_READ_WRITE + .flags = ARMV7_MMU_DATA_READ_WRITE_CACHED }, { .begin = (uint32_t) bsp_section_work_begin, .end = (uint32_t) bsp_section_work_end, - .flags = MMU_DATA_READ_WRITE + .flags = ARMV7_MMU_DATA_READ_WRITE_CACHED }, { .begin = (uint32_t) bsp_section_stack_begin, .end = (uint32_t) bsp_section_stack_end, - .flags = MMU_DATA_READ_WRITE + .flags = ARMV7_MMU_DATA_READ_WRITE_CACHED }, { .begin = 0x10000000U, .end = 0x10020000U, diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/startup/bspstarthooks.c b/c/src/lib/libbsp/arm/xilinx-zynq/startup/bspstarthooks.c index 8d02c2583e..d3d5d75a6b 100644 --- a/c/src/lib/libbsp/arm/xilinx-zynq/startup/bspstarthooks.c +++ b/c/src/lib/libbsp/arm/xilinx-zynq/startup/bspstarthooks.c @@ -18,12 +18,6 @@ #include #include -#ifdef RTEMS_SMP - #define MMU_DATA_READ_WRITE ARMV7_MMU_DATA_READ_WRITE_SHAREABLE -#else - #define MMU_DATA_READ_WRITE ARMV7_MMU_DATA_READ_WRITE_CACHED -#endif - BSP_START_DATA_SECTION static const arm_cp15_start_section_config zynq_mmu_config_table[] = { { @@ -33,7 +27,7 @@ zynq_mmu_config_table[] = { }, { .begin = (uint32_t) bsp_section_fast_data_begin, .end = (uint32_t) bsp_section_fast_data_end, - .flags = MMU_DATA_READ_WRITE + .flags = ARMV7_MMU_DATA_READ_WRITE_CACHED }, { .begin = (uint32_t) bsp_section_start_begin, .end = (uint32_t) bsp_section_start_end, @@ -41,7 +35,7 @@ zynq_mmu_config_table[] = { }, { .begin = (uint32_t) bsp_section_vector_begin, .end = (uint32_t) bsp_section_vector_end, - .flags = MMU_DATA_READ_WRITE + .flags = ARMV7_MMU_DATA_READ_WRITE_CACHED }, { .begin = (uint32_t) bsp_section_text_begin, .end = (uint32_t) bsp_section_text_end, @@ -53,19 +47,19 @@ zynq_mmu_config_table[] = { }, { .begin = (uint32_t) bsp_section_data_begin, .end = (uint32_t) bsp_section_data_end, - .flags = MMU_DATA_READ_WRITE + .flags = ARMV7_MMU_DATA_READ_WRITE_CACHED }, { .begin = (uint32_t) bsp_section_bss_begin, .end = (uint32_t) bsp_section_bss_end, - .flags = MMU_DATA_READ_WRITE + .flags = ARMV7_MMU_DATA_READ_WRITE_CACHED }, { .begin = (uint32_t) bsp_section_work_begin, .end = (uint32_t) bsp_section_work_end, - .flags = MMU_DATA_READ_WRITE + .flags = ARMV7_MMU_DATA_READ_WRITE_CACHED }, { .begin = (uint32_t) bsp_section_stack_begin, .end = (uint32_t) bsp_section_stack_end, - .flags = MMU_DATA_READ_WRITE + .flags = ARMV7_MMU_DATA_READ_WRITE_CACHED }, { .begin = 0xe0000000U, .end = 0xe0200000U, diff --git a/c/src/lib/libcpu/arm/shared/include/arm-cp15.h b/c/src/lib/libcpu/arm/shared/include/arm-cp15.h index a92ce79309..40d4a594e5 100644 --- a/c/src/lib/libcpu/arm/shared/include/arm-cp15.h +++ b/c/src/lib/libcpu/arm/shared/include/arm-cp15.h @@ -99,8 +99,15 @@ extern "C" { | ARM_MMU_SECT_AP_0 \ | ARM_MMU_SECT_DEFAULT) -#define ARMV7_MMU_READ_WRITE_CACHED \ - (ARMV7_MMU_READ_WRITE | ARM_MMU_SECT_TEX_0 | ARM_MMU_SECT_C | ARM_MMU_SECT_B) +#ifdef RTEMS_SMP + #define ARMV7_MMU_READ_WRITE_CACHED \ + (ARMV7_MMU_READ_WRITE \ + | ARM_MMU_SECT_TEX_0 | ARM_MMU_SECT_C | ARM_MMU_SECT_B | ARM_MMU_SECT_S) +#else + #define ARMV7_MMU_READ_WRITE_CACHED \ + (ARMV7_MMU_READ_WRITE \ + | ARM_MMU_SECT_TEX_0 | ARM_MMU_SECT_C | ARM_MMU_SECT_B) +#endif #define ARMV7_MMU_DATA_READ_ONLY \ ARMV7_MMU_READ_ONLY @@ -114,9 +121,6 @@ extern "C" { #define ARMV7_MMU_DATA_READ_WRITE_CACHED \ ARMV7_MMU_READ_WRITE_CACHED -#define ARMV7_MMU_DATA_READ_WRITE_SHAREABLE \ - (ARMV7_MMU_READ_WRITE_CACHED | ARM_MMU_SECT_S) - #define ARMV7_MMU_CODE \ ARMV7_MMU_READ_ONLY -- cgit v1.2.3