Changeset f074a4d in rtems


Ignore:
Timestamp:
Oct 27, 2013, 6:27:44 PM (8 years ago)
Author:
Sebastian Huber <sebastian.huber@…>
Branches:
4.11, 5, master
Children:
fbed79b
Parents:
f619250
git-author:
Sebastian Huber <sebastian.huber@…> (10/27/13 18:27:44)
git-committer:
Sebastian Huber <sebastian.huber@…> (10/27/13 18:39:36)
Message:

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.

Location:
c/src/lib
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • c/src/lib/libbsp/arm/raspberrypi/startup/mm_config_table.c

    rf619250 rf074a4d  
    1616#include <bsp/arm-cp15-start.h>
    1717
    18 #ifdef RTEMS_SMP
    19   #define MMU_DATA_READ_WRITE ARMV7_MMU_DATA_READ_WRITE_SHAREABLE
    20 #else
    21   #define MMU_DATA_READ_WRITE ARMV7_MMU_DATA_READ_WRITE_CACHED
    22 #endif
    23 
    2418BSP_START_DATA_SECTION const arm_cp15_start_section_config
    2519bsp_mm_config_table[] = {
     
    3125    .begin = (uint32_t) bsp_section_fast_data_begin,
    3226    .end = (uint32_t) bsp_section_fast_data_end,
    33     .flags = MMU_DATA_READ_WRITE
     27    .flags = ARMV7_MMU_DATA_READ_WRITE_CACHED
    3428  }, {
    3529    .begin = (uint32_t) bsp_section_start_begin,
     
    3933    .begin = (uint32_t) bsp_section_vector_begin,
    4034    .end = (uint32_t) bsp_section_vector_end,
    41     .flags = MMU_DATA_READ_WRITE
     35    .flags = ARMV7_MMU_DATA_READ_WRITE_CACHED
    4236  }, {
    4337    .begin = (uint32_t) bsp_section_text_begin,
     
    5145    .begin = (uint32_t) bsp_section_data_begin,
    5246    .end = (uint32_t) bsp_section_data_end,
    53     .flags = MMU_DATA_READ_WRITE
     47    .flags = ARMV7_MMU_DATA_READ_WRITE_CACHED
    5448  }, {
    5549    .begin = (uint32_t) bsp_section_bss_begin,
    5650    .end = (uint32_t) bsp_section_bss_end,
    57     .flags = MMU_DATA_READ_WRITE
     51    .flags = ARMV7_MMU_DATA_READ_WRITE_CACHED
    5852  }, {
    5953    .begin = (uint32_t) bsp_section_work_begin,
    6054    .end = (uint32_t) bsp_section_work_end,
    61     .flags = MMU_DATA_READ_WRITE
     55    .flags = ARMV7_MMU_DATA_READ_WRITE_CACHED
    6256  }, {
    6357    .begin = (uint32_t) bsp_section_stack_begin,
    6458    .end = (uint32_t) bsp_section_stack_end,
    65     .flags = MMU_DATA_READ_WRITE
     59    .flags = ARMV7_MMU_DATA_READ_WRITE_CACHED
    6660  }, {
    6761    .begin = 0x20000000,
  • c/src/lib/libbsp/arm/realview-pbx-a9/startup/bspstarthooks.c

    rf619250 rf074a4d  
    1919#include <bsp/linker-symbols.h>
    2020
    21 #ifdef RTEMS_SMP
    22   #define MMU_DATA_READ_WRITE ARMV7_MMU_DATA_READ_WRITE_SHAREABLE
    23 #else
    24   #define MMU_DATA_READ_WRITE ARMV7_MMU_DATA_READ_WRITE_CACHED
    25 #endif
    26 
    2721BSP_START_DATA_SECTION static const arm_cp15_start_section_config
    2822rvpbxa9_mmu_config_table[] = {
     
    3428    .begin = (uint32_t) bsp_section_fast_data_begin,
    3529    .end = (uint32_t) bsp_section_fast_data_end,
    36     .flags = MMU_DATA_READ_WRITE
     30    .flags = ARMV7_MMU_DATA_READ_WRITE_CACHED
    3731  }, {
    3832    .begin = (uint32_t) bsp_section_start_begin,
     
    4236    .begin = (uint32_t) bsp_section_vector_begin,
    4337    .end = (uint32_t) bsp_section_vector_end,
    44     .flags = MMU_DATA_READ_WRITE
     38    .flags = ARMV7_MMU_DATA_READ_WRITE_CACHED
    4539  }, {
    4640    .begin = (uint32_t) bsp_section_text_begin,
     
    5448    .begin = (uint32_t) bsp_section_data_begin,
    5549    .end = (uint32_t) bsp_section_data_end,
    56     .flags = MMU_DATA_READ_WRITE
     50    .flags = ARMV7_MMU_DATA_READ_WRITE_CACHED
    5751  }, {
    5852    .begin = (uint32_t) bsp_section_bss_begin,
    5953    .end = (uint32_t) bsp_section_bss_end,
    60     .flags = MMU_DATA_READ_WRITE
     54    .flags = ARMV7_MMU_DATA_READ_WRITE_CACHED
    6155  }, {
    6256    .begin = (uint32_t) bsp_section_work_begin,
    6357    .end = (uint32_t) bsp_section_work_end,
    64     .flags = MMU_DATA_READ_WRITE
     58    .flags = ARMV7_MMU_DATA_READ_WRITE_CACHED
    6559  }, {
    6660    .begin = (uint32_t) bsp_section_stack_begin,
    6761    .end = (uint32_t) bsp_section_stack_end,
    68     .flags = MMU_DATA_READ_WRITE
     62    .flags = ARMV7_MMU_DATA_READ_WRITE_CACHED
    6963  }, {
    7064    .begin = 0x10000000U,
  • c/src/lib/libbsp/arm/xilinx-zynq/startup/bspstarthooks.c

    rf619250 rf074a4d  
    1919#include <bsp/linker-symbols.h>
    2020
    21 #ifdef RTEMS_SMP
    22   #define MMU_DATA_READ_WRITE ARMV7_MMU_DATA_READ_WRITE_SHAREABLE
    23 #else
    24   #define MMU_DATA_READ_WRITE ARMV7_MMU_DATA_READ_WRITE_CACHED
    25 #endif
    26 
    2721BSP_START_DATA_SECTION static const arm_cp15_start_section_config
    2822zynq_mmu_config_table[] = {
     
    3428    .begin = (uint32_t) bsp_section_fast_data_begin,
    3529    .end = (uint32_t) bsp_section_fast_data_end,
    36     .flags = MMU_DATA_READ_WRITE
     30    .flags = ARMV7_MMU_DATA_READ_WRITE_CACHED
    3731  }, {
    3832    .begin = (uint32_t) bsp_section_start_begin,
     
    4236    .begin = (uint32_t) bsp_section_vector_begin,
    4337    .end = (uint32_t) bsp_section_vector_end,
    44     .flags = MMU_DATA_READ_WRITE
     38    .flags = ARMV7_MMU_DATA_READ_WRITE_CACHED
    4539  }, {
    4640    .begin = (uint32_t) bsp_section_text_begin,
     
    5448    .begin = (uint32_t) bsp_section_data_begin,
    5549    .end = (uint32_t) bsp_section_data_end,
    56     .flags = MMU_DATA_READ_WRITE
     50    .flags = ARMV7_MMU_DATA_READ_WRITE_CACHED
    5751  }, {
    5852    .begin = (uint32_t) bsp_section_bss_begin,
    5953    .end = (uint32_t) bsp_section_bss_end,
    60     .flags = MMU_DATA_READ_WRITE
     54    .flags = ARMV7_MMU_DATA_READ_WRITE_CACHED
    6155  }, {
    6256    .begin = (uint32_t) bsp_section_work_begin,
    6357    .end = (uint32_t) bsp_section_work_end,
    64     .flags = MMU_DATA_READ_WRITE
     58    .flags = ARMV7_MMU_DATA_READ_WRITE_CACHED
    6559  }, {
    6660    .begin = (uint32_t) bsp_section_stack_begin,
    6761    .end = (uint32_t) bsp_section_stack_end,
    68     .flags = MMU_DATA_READ_WRITE
     62    .flags = ARMV7_MMU_DATA_READ_WRITE_CACHED
    6963  }, {
    7064    .begin = 0xe0000000U,
  • c/src/lib/libcpu/arm/shared/include/arm-cp15.h

    rf619250 rf074a4d  
    100100    | ARM_MMU_SECT_DEFAULT)
    101101
    102 #define ARMV7_MMU_READ_WRITE_CACHED \
    103   (ARMV7_MMU_READ_WRITE | ARM_MMU_SECT_TEX_0 | ARM_MMU_SECT_C | ARM_MMU_SECT_B)
     102#ifdef RTEMS_SMP
     103  #define ARMV7_MMU_READ_WRITE_CACHED \
     104    (ARMV7_MMU_READ_WRITE \
     105      | ARM_MMU_SECT_TEX_0 | ARM_MMU_SECT_C | ARM_MMU_SECT_B | ARM_MMU_SECT_S)
     106#else
     107  #define ARMV7_MMU_READ_WRITE_CACHED \
     108    (ARMV7_MMU_READ_WRITE \
     109      | ARM_MMU_SECT_TEX_0 | ARM_MMU_SECT_C | ARM_MMU_SECT_B)
     110#endif
    104111
    105112#define ARMV7_MMU_DATA_READ_ONLY \
     
    114121#define ARMV7_MMU_DATA_READ_WRITE_CACHED \
    115122  ARMV7_MMU_READ_WRITE_CACHED
    116 
    117 #define ARMV7_MMU_DATA_READ_WRITE_SHAREABLE \
    118   (ARMV7_MMU_READ_WRITE_CACHED | ARM_MMU_SECT_S)
    119123
    120124#define ARMV7_MMU_CODE \
Note: See TracChangeset for help on using the changeset viewer.