diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2018-01-27 14:37:51 +0100 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2018-01-31 12:49:09 +0100 |
commit | 4cf93658eff5cf6b0c02e98a0d1ec33dea5ed85c (patch) | |
tree | 8ce105a37991b79f38da9da31c1cb6ce13ef6beb /c/src/lib/libcpu/i386 | |
parent | bsps: Move network define to source files (diff) | |
download | rtems-4cf93658eff5cf6b0c02e98a0d1ec33dea5ed85c.tar.bz2 |
bsps: Rework cache manager implementation
The previous cache manager support used a single souce file
(cache_manager.c) which included an implementation header (cache_.h).
This required the use of specialized include paths to find the right
header file. Change this to include a generic implementation header
(cacheimpl.h) in specialized source files.
Use the following directories and files:
* bsps/shared/cache
* bsps/@RTEMS_CPU@/shared/cache
* bsps/@RTEMS_CPU@/@RTEMS_BSP_FAMILY/start/cache.c
Update #3285.
Diffstat (limited to 'c/src/lib/libcpu/i386')
-rw-r--r-- | c/src/lib/libcpu/i386/Makefile.am | 6 | ||||
-rw-r--r-- | c/src/lib/libcpu/i386/cache.c | 88 | ||||
-rw-r--r-- | c/src/lib/libcpu/i386/cache_.h | 15 |
3 files changed, 0 insertions, 109 deletions
diff --git a/c/src/lib/libcpu/i386/Makefile.am b/c/src/lib/libcpu/i386/Makefile.am index 6f1e9fe3ec..ec7a4c4a48 100644 --- a/c/src/lib/libcpu/i386/Makefile.am +++ b/c/src/lib/libcpu/i386/Makefile.am @@ -4,12 +4,6 @@ noinst_PROGRAMS = include $(top_srcdir)/../../../automake/compile.am -noinst_PROGRAMS += cache.rel -cache_rel_SOURCES = cache.c cache_.h \ - ../shared/src/cache_manager.c ../shared/include/cache.h -cache_rel_CPPFLAGS = $(AM_CPPFLAGS) -cache_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - noinst_PROGRAMS += score.rel score_rel_SOURCES = displayCpu.c cpuModel.S cpuModel.h idtr.S cpu.h score_rel_CPPFLAGS = $(AM_CPPFLAGS) diff --git a/c/src/lib/libcpu/i386/cache.c b/c/src/lib/libcpu/i386/cache.c deleted file mode 100644 index da31a38bee..0000000000 --- a/c/src/lib/libcpu/i386/cache.c +++ /dev/null @@ -1,88 +0,0 @@ -/* - * Cache Management Support Routines for the i386 - */ - -#include <rtems.h> -#include "cache_.h" -#include <rtems/score/cpu.h> -#include <libcpu/page.h> - -void _CPU_disable_cache(void) -{ - unsigned int regCr0; - - regCr0 = i386_get_cr0(); - regCr0 |= CR0_PAGE_LEVEL_CACHE_DISABLE; - regCr0 |= CR0_NO_WRITE_THROUGH; - i386_set_cr0( regCr0 ); - rtems_cache_flush_entire_data(); -} - -/* - * Enable the entire cache - */ - -void _CPU_enable_cache(void) -{ - unsigned int regCr0; - - regCr0 = i386_get_cr0(); - regCr0 &= ~(CR0_PAGE_LEVEL_CACHE_DISABLE); - regCr0 &= ~(CR0_NO_WRITE_THROUGH); - i386_set_cr0( regCr0 ); - /*rtems_cache_flush_entire_data();*/ -} - -/* - * CACHE MANAGER: The following functions are CPU-specific. - * They provide the basic implementation for the rtems_* cache - * management routines. If a given function has no meaning for the CPU, - * it does nothing by default. - * - * FIXME: The routines below should be implemented per CPU, - * to accomodate the capabilities of each. - */ - -#if defined(I386_CACHE_ALIGNMENT) -void _CPU_cache_flush_1_data_line(const void *d_addr) {} -void _CPU_cache_invalidate_1_data_line(const void *d_addr) {} -void _CPU_cache_freeze_data(void) {} -void _CPU_cache_unfreeze_data(void) {} -void _CPU_cache_invalidate_1_instruction_line ( const void *d_addr ) {} -void _CPU_cache_freeze_instruction(void) {} -void _CPU_cache_unfreeze_instruction(void) {} - -void _CPU_cache_flush_entire_data(void) -{ - __asm__ volatile ("wbinvd"); -} -void _CPU_cache_invalidate_entire_data(void) -{ - __asm__ volatile ("invd"); -} - -void _CPU_cache_enable_data(void) -{ - _CPU_enable_cache(); -} - -void _CPU_cache_disable_data(void) -{ - _CPU_disable_cache(); -} - -void _CPU_cache_invalidate_entire_instruction(void) -{ - __asm__ volatile ("invd"); -} - -void _CPU_cache_enable_instruction(void) -{ - _CPU_enable_cache(); -} - -void _CPU_cache_disable_instruction( void ) -{ - _CPU_disable_cache(); -} -#endif diff --git a/c/src/lib/libcpu/i386/cache_.h b/c/src/lib/libcpu/i386/cache_.h deleted file mode 100644 index cefd39f3ad..0000000000 --- a/c/src/lib/libcpu/i386/cache_.h +++ /dev/null @@ -1,15 +0,0 @@ -/* - * i386 Cache Manager Wrapper - */ - -#ifndef __i386_CACHE_h -#define __i386_CACHE_h - -#define I386_CACHE_ALIGNMENT 16 -#define CPU_DATA_CACHE_ALIGNMENT I386_CACHE_ALIGNMENT -#define CPU_INSTRUCTION_CACHE_ALIGNEMNT I386_CACHE_ALIGNMENT - -#include "../shared/include/cache.h" - -#endif -/* end of include file */ |