michaelh/zephyr
1
0
Fork 0
Code Releases Activity

x86: cache: Use new cache APIs

Browse source 
Add an helper to correctly use the new cache APIs.

Signed-off-by: Carlo Caione <ccaione@baylibre.com>
This commit is contained in:
Carlo Caione 2020-12-02 15:56:52 +01:00 • committed by Anas Nashif
commit dc4cc5565b
3 changed files with 29 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

2
arch/x86/core/Kconfig.ia32
View file

@ -140,7 +140,7 @@ config LAZY_FPU_SHARING
endmenu endmenu
config CACHE_LINE_SIZE config DCACHE_LINE_SIZE
default 64 if CPU_ATOM default 64 if CPU_ATOM
config CLFLUSH_INSTRUCTION_SUPPORTED config CLFLUSH_INSTRUCTION_SUPPORTED

55
arch/x86/core/ia32/cache.c
View file

@ -26,23 +26,13 @@ extern int z_is_clflush_available(void);
extern void z_cache_flush_wbinvd(vaddr_t addr, size_t len); extern void z_cache_flush_wbinvd(vaddr_t addr, size_t len);
extern size_t z_cache_line_size_get(void); extern size_t z_cache_line_size_get(void);
#if defined(CONFIG_CACHE_LINE_SIZE_DETECT) #if defined(CONFIG_DCACHE_LINE_SIZE_DETECT)
size_t sys_cache_line_size; size_t sys_cache_line_size;
#endif #endif
#if defined(CONFIG_CLFLUSH_INSTRUCTION_SUPPORTED) || \ #if defined(CONFIG_CLFLUSH_INSTRUCTION_SUPPORTED) || \
defined(CONFIG_CLFLUSH_DETECT) defined(CONFIG_CLFLUSH_DETECT)
#if (CONFIG_CACHE_LINE_SIZE == 0) && !defined(CONFIG_CACHE_LINE_SIZE_DETECT)
#error Cannot use this implementation with a cache line size of 0
#endif
#if defined(CONFIG_CACHE_LINE_SIZE_DETECT)
#define DCACHE_LINE_SIZE sys_cache_line_size
#else
#define DCACHE_LINE_SIZE CONFIG_CACHE_LINE_SIZE
#endif
/** /**
* *
* @brief Flush cache lines to main memory * @brief Flush cache lines to main memory
@ -51,59 +41,66 @@ size_t sys_cache_line_size;
* sys_cache_flush() iterates on the cache lines, a cache line alignment for * sys_cache_flush() iterates on the cache lines, a cache line alignment for
* both is optimal. * both is optimal.
* *
* The cache line size is specified either via the CONFIG_CACHE_LINE_SIZE * The cache line size is specified either via the CONFIG_DCACHE_LINE_SIZE
* kconfig option or it is detected at runtime. * kconfig option or it is detected at runtime.
* *
* @return N/A * @return N/A
*/ */
void arch_dcache_flush(void *start_addr, size_t size) static void arch_dcache_flush(void *start_addr, size_t size)
{ {
size_t line_size = sys_dcache_line_size_get();
uintptr_t start = (uintptr_t)start_addr; uintptr_t start = (uintptr_t)start_addr;
uintptr_t end; uintptr_t end;
size = ROUND_UP(size, DCACHE_LINE_SIZE); if (line_size == 0U) {
return;
}
size = ROUND_UP(size, line_size);
end = start + size; end = start + size;
for (; start < end; start += DCACHE_LINE_SIZE) { for (; start < end; start += line_size) {
__asm__ volatile("clflush %0;\n\t" : : "m"(start)); __asm__ volatile("clflush %0;\n\t" : : "m"(start));
} }
__asm__ volatile("mfence;\n\t"); __asm__ volatile("mfence;\n\t");
} }
#endif /* CONFIG_CLFLUSH_INSTRUCTION_SUPPORTED || CLFLUSH_DETECT */ int arch_dcache_range(void *addr, size_t size, int op)
{
if (op & K_CACHE_WB) {
arch_dcache_flush(addr, size);
return 0;
}
#if defined(CONFIG_CLFLUSH_DETECT) || defined(CONFIG_CACHE_LINE_SIZE_DETECT) return -ENOTSUP;
}
#endif /* CONFIG_CLFLUSH_INSTRUCTION_SUPPORTED || CLFLUSH_DETECT */
#include <init.h> #include <init.h>
#if defined(CONFIG_CACHE_LINE_SIZE_DETECT) #if defined(CONFIG_DCACHE_LINE_SIZE_DETECT)
static void init_cache_line_size(void) static void init_cache_line_size(void)
{ {
sys_cache_line_size = z_cache_line_size_get(); sys_cache_line_size = z_cache_line_size_get();
} }
#endif
size_t arch_cache_line_size_get(void) size_t arch_cache_line_size_get(void)
{ {
#if defined(CONFIG_CACHE_LINE_SIZE_DETECT)
return sys_cache_line_size; return sys_cache_line_size;
#else
return 0;
#endif
} }
#endif
static int init_cache(const struct device *unused) static int init_dcache(const struct device *unused)
{ {
ARG_UNUSED(unused); ARG_UNUSED(unused);
#if defined(CONFIG_CACHE_LINE_SIZE_DETECT) #if defined(CONFIG_DCACHE_LINE_SIZE_DETECT)
init_cache_line_size(); init_cache_line_size();
#endif #endif
return 0; return 0;
} }
SYS_INIT(init_cache, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT); SYS_INIT(init_dcache, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
#endif /* CONFIG_CLFLUSH_DETECT || CONFIG_CACHE_LINE_SIZE_DETECT */

4
arch/x86/core/ia32/cache_s.S
View file

@ -58,7 +58,7 @@ SECTION_FUNC(TEXT, CACHE_FLUSH_NAME)
#endif /* !CONFIG_CLFLUSH_INSTRUCTION_SUPPORTED */ #endif /* !CONFIG_CLFLUSH_INSTRUCTION_SUPPORTED */
#if defined(CONFIG_CACHE_LINE_SIZE_DETECT) #if defined(CONFIG_DCACHE_LINE_SIZE_DETECT)
#define CPUID_CACHE_LINE_MASK (0xff << 8) #define CPUID_CACHE_LINE_MASK (0xff << 8)
@ -75,4 +75,4 @@ SECTION_FUNC(TEXT, z_cache_line_size_get)
popl %ebx popl %ebx
ret ret
#endif /* CONFIG_CACHE_LINE_SIZE_DETECT */ #endif /* CONFIG_DCACHE_LINE_SIZE_DETECT */