GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-21 22:51:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

MIPS: Split I & D cache line size config

Browse source 
Allow L1 Icache & L1 Dcache line size to be specified separately, since
there's no architectural mandate that they be the same. The
[id]cache_line_size functions are tidied up to take advantage of the
fact that the Kconfig entries are always present to simply check them
for zero rather than needing to #ifdef on their presence.

Signed-off-by: Paul Burton <paul.burton@imgtec.com>
[removed CONFIG_SYS_CACHELINE_SIZE in include/configs/pic32mzdask.h]
Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
This commit is contained in:
Paul Burton 2016-05-27 14:28:05 +01:00 • committed by Daniel Schwierzeck
parent ace3be4f15
commit 372286217f
12 changed files with 54 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
arch/mips/Kconfig
View file

@ -252,21 +252,27 @@ config SYS_DCACHE_SIZE
help help
The total size of the L1 Dcache, if known at compile time. The total size of the L1 Dcache, if known at compile time.
config SYS_DCACHE_LINE_SIZE
hex
default 0
help
The size of L1 Dcache lines, if known at compile time.
config SYS_ICACHE_SIZE config SYS_ICACHE_SIZE
int int
default 0 default 0
help help
The total size of the L1 ICache, if known at compile time. The total size of the L1 ICache, if known at compile time.
config SYS_CACHELINE_SIZE config SYS_ICACHE_LINE_SIZE
int int
default 0 default 0
help help
The size of L1 cache lines, if known at compile time. The size of L1 Icache lines, if known at compile time.
config SYS_CACHE_SIZE_AUTO config SYS_CACHE_SIZE_AUTO
def_bool y if SYS_DCACHE_SIZE = 0 && SYS_ICACHE_SIZE = 0 && \ def_bool y if SYS_DCACHE_SIZE = 0 && SYS_ICACHE_SIZE = 0 && \
SYS_CACHELINE_SIZE = 0 SYS_DCACHE_LINE_SIZE = 0 && SYS_ICACHE_LINE_SIZE = 0
help help
Select this (or let it be auto-selected by not defining any cache Select this (or let it be auto-selected by not defining any cache
sizes) in order to allow U-Boot to automatically detect the sizes sizes) in order to allow U-Boot to automatically detect the sizes

7
arch/mips/include/asm/cache.h
View file

@ -12,4 +12,11 @@
#define ARCH_DMA_MINALIGN (L1_CACHE_BYTES) #define ARCH_DMA_MINALIGN (L1_CACHE_BYTES)
/*
* CONFIG_SYS_CACHELINE_SIZE is still used in various drivers primarily for
* DMA buffer alignment. Satisfy those drivers by providing it as a synonym
* of ARCH_DMA_MINALIGN for now.
*/
#define CONFIG_SYS_CACHELINE_SIZE ARCH_DMA_MINALIGN
#endif /* __MIPS_CACHE_H__ */ #endif /* __MIPS_CACHE_H__ */

24
arch/mips/lib/cache.c
View file

@ -9,23 +9,13 @@
#include <asm/cacheops.h> #include <asm/cacheops.h>
#include <asm/mipsregs.h> #include <asm/mipsregs.h>
#ifndef CONFIG_SYS_CACHE_SIZE_AUTO
static inline unsigned long icache_line_size(void)
{
return CONFIG_SYS_CACHELINE_SIZE;
}
static inline unsigned long dcache_line_size(void)
{
return CONFIG_SYS_CACHELINE_SIZE;
}
#else /* !CONFIG_SYS_CACHELINE_SIZE */
static inline unsigned long icache_line_size(void) static inline unsigned long icache_line_size(void)
{ {
unsigned long conf1, il; unsigned long conf1, il;
if (!config_enabled(CONFIG_SYS_CACHE_SIZE_AUTO))
return CONFIG_SYS_ICACHE_LINE_SIZE;
conf1 = read_c0_config1(); conf1 = read_c0_config1();
il = (conf1 & MIPS_CONF1_IL) >> MIPS_CONF1_IL_SHF; il = (conf1 & MIPS_CONF1_IL) >> MIPS_CONF1_IL_SHF;
if (!il) if (!il)
@ -36,6 +26,10 @@ static inline unsigned long icache_line_size(void)
static inline unsigned long dcache_line_size(void) static inline unsigned long dcache_line_size(void)
{ {
unsigned long conf1, dl; unsigned long conf1, dl;
if (!config_enabled(CONFIG_SYS_CACHE_SIZE_AUTO))
return CONFIG_SYS_DCACHE_LINE_SIZE;
conf1 = read_c0_config1(); conf1 = read_c0_config1();
dl = (conf1 & MIPS_CONF1_DL) >> MIPS_CONF1_DL_SHF; dl = (conf1 & MIPS_CONF1_DL) >> MIPS_CONF1_DL_SHF;
if (!dl) if (!dl)
@ -43,8 +37,6 @@ static inline unsigned long dcache_line_size(void)
return 2 << dl; return 2 << dl;
} }
#endif /* !CONFIG_SYS_CACHELINE_SIZE */
void flush_cache(ulong start_addr, ulong size) void flush_cache(ulong start_addr, ulong size)
{ {
unsigned long ilsize = icache_line_size(); unsigned long ilsize = icache_line_size();

4
arch/mips/lib/cache_init.S
View file

@ -101,14 +101,14 @@
LEAF(mips_cache_reset) LEAF(mips_cache_reset)
#ifndef CONFIG_SYS_CACHE_SIZE_AUTO #ifndef CONFIG_SYS_CACHE_SIZE_AUTO
li t2, CONFIG_SYS_ICACHE_SIZE li t2, CONFIG_SYS_ICACHE_SIZE
li t8, CONFIG_SYS_CACHELINE_SIZE li t8, CONFIG_SYS_ICACHE_LINE_SIZE
#else #else
l1_info t2, t8, MIPS_CONF1_IA_SHF l1_info t2, t8, MIPS_CONF1_IA_SHF
#endif #endif
#ifndef CONFIG_SYS_CACHE_SIZE_AUTO #ifndef CONFIG_SYS_CACHE_SIZE_AUTO
li t3, CONFIG_SYS_DCACHE_SIZE li t3, CONFIG_SYS_DCACHE_SIZE
li t9, CONFIG_SYS_CACHELINE_SIZE li t9, CONFIG_SYS_DCACHE_LINE_SIZE
#else #else
l1_info t3, t9, MIPS_CONF1_DA_SHF l1_info t3, t9, MIPS_CONF1_DA_SHF
#endif #endif

5
board/dbau1x00/Kconfig
View file

@ -15,10 +15,13 @@ config SYS_TEXT_BASE
config SYS_DCACHE_SIZE config SYS_DCACHE_SIZE
default 16384 default 16384
config SYS_DCACHE_LINE_SIZE
default 32
config SYS_ICACHE_SIZE config SYS_ICACHE_SIZE
default 16384 default 16384
config SYS_CACHELINE_SIZE config SYS_ICACHE_LINE_SIZE
default 32 default 32
menu "dbau1x00 board options" menu "dbau1x00 board options"

5
board/micronas/vct/Kconfig
View file

@ -15,10 +15,13 @@ config SYS_TEXT_BASE
config SYS_DCACHE_SIZE config SYS_DCACHE_SIZE
default 16384 default 16384
config SYS_DCACHE_LINE_SIZE
default 32
config SYS_ICACHE_SIZE config SYS_ICACHE_SIZE
default 16384 default 16384
config SYS_CACHELINE_SIZE config SYS_ICACHE_LINE_SIZE
default 32 default 32
menu "vct board options" menu "vct board options"

5
board/pb1x00/Kconfig
View file

@ -15,10 +15,13 @@ config SYS_TEXT_BASE
config SYS_DCACHE_SIZE config SYS_DCACHE_SIZE
default 16384 default 16384
config SYS_DCACHE_LINE_SIZE
default 32
config SYS_ICACHE_SIZE config SYS_ICACHE_SIZE
default 16384 default 16384
config SYS_CACHELINE_SIZE config SYS_ICACHE_LINE_SIZE
default 32 default 32
endif endif

5
board/qca/ap121/Kconfig
View file

@ -15,10 +15,13 @@ config SYS_TEXT_BASE
config SYS_DCACHE_SIZE config SYS_DCACHE_SIZE
default 32768 default 32768
config SYS_DCACHE_LINE_SIZE
default 32
config SYS_ICACHE_SIZE config SYS_ICACHE_SIZE
default 65536 default 65536
config SYS_CACHELINE_SIZE config SYS_ICACHE_LINE_SIZE
default 32 default 32
endif endif

5
board/qca/ap143/Kconfig
View file

@ -15,10 +15,13 @@ config SYS_TEXT_BASE
config SYS_DCACHE_SIZE config SYS_DCACHE_SIZE
default 32768 default 32768
config SYS_DCACHE_LINE_SIZE
default 32
config SYS_ICACHE_SIZE config SYS_ICACHE_SIZE
default 65536 default 65536
config SYS_CACHELINE_SIZE config SYS_ICACHE_LINE_SIZE
default 32 default 32
endif endif

5
board/qemu-mips/Kconfig
View file

@ -14,10 +14,13 @@ config SYS_TEXT_BASE
config SYS_DCACHE_SIZE config SYS_DCACHE_SIZE
default 16384 default 16384
config SYS_DCACHE_LINE_SIZE
default 32
config SYS_ICACHE_SIZE config SYS_ICACHE_SIZE
default 16384 default 16384
config SYS_CACHELINE_SIZE config SYS_ICACHE_LINE_SIZE
default 32 default 32
endif endif

5
board/tplink/wdr4300/Kconfig
View file

@ -18,10 +18,13 @@ config SYS_TEXT_BASE
config SYS_DCACHE_SIZE config SYS_DCACHE_SIZE
default 32768 default 32768
config SYS_DCACHE_LINE_SIZE
default 32
config SYS_ICACHE_SIZE config SYS_ICACHE_SIZE
default 65536 default 65536
config SYS_CACHELINE_SIZE config SYS_ICACHE_LINE_SIZE
default 32 default 32
endif endif

1
include/configs/pic32mzdask.h
View file

@ -100,7 +100,6 @@
* USB Configuration * USB Configuration
*/ */
#define CONFIG_USB_MUSB_PIO_ONLY #define CONFIG_USB_MUSB_PIO_ONLY
#define CONFIG_SYS_CACHELINE_SIZE 16
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
* File System Configuration * File System Configuration