openrisc: Add cacheinfo support and introduce new utility functions
v6 cover openrisc: Add cacheinfo support and introduce new utility functions
Hi,
The main purpose of this series is to expose CPU cache attributes for OpenRISC in sysfs using the cacheinfo API. The core implementation to achieve this is in patch #3. Patch #1 and #2 add certain enhancements to simplify the implementation of cacheinfo support.
The difference between this patch series and the previous version [1] is minor. The email address used in 'From' and 'signed-off-by' are now the same so checkpatch does not throw a FROM_SIGN_OFF_MISMATCH warning.
The patch also addresses a build warning that was caught by the kernel test robot [2] and addressed in a standalone patch earlier [3].
Thanks,
Sahil
[1] https://lore.kernel.org/openrisc/[email protected]/T/#m67aed7737e79675352815470cd1e3b9ed6814b05
[2] https://lore.kernel.org/openrisc/[email protected]/T/#md4b867e8d721f8894368ddc209875e262c1e2b60
[3] https://lore.kernel.org/openrisc/aAMwri9RK2oNuC_p@antec/T/#mc42cafae92957171cef94065f25257e5bed37ed6
Sahil Siddiq (3):
openrisc: Refactor struct cpuinfo_or1k to reduce duplication
openrisc: Introduce new utility functions to flush and invalidate
caches
openrisc: Add cacheinfo support
arch/openrisc/include/asm/cacheflush.h | 17 ++++ arch/openrisc/include/asm/cpuinfo.h | 24 ++++-- arch/openrisc/kernel/Makefile | 2 +- arch/openrisc/kernel/cacheinfo.c | 104 +++++++++++++++++++++++++ arch/openrisc/kernel/dma.c | 18 +---- arch/openrisc/kernel/setup.c | 45 +---------- arch/openrisc/mm/cache.c | 56 ++++++++++--- arch/openrisc/mm/init.c | 5 +- 8 files changed, 196 insertions(+), 75 deletions(-) create mode 100644 arch/openrisc/kernel/cacheinfo.c
base-commit: 183601b78a9b1c3da2b59f2bee915f97ba745c0b
prerequisite-patch-id: 3ec7c4c93dc2780c9978de0775bf46ae43c00b83
prerequisite-patch-id: 0b455477c75ef34d81032b9419d8ad3d5e74043d
Signature · 1 line
2.48.1
PATCH v6 1/3 openrisc: Refactor struct cpuinfo_or1k to reduce duplication
The "cpuinfo_or1k" structure currently has identical data members for different cache components.
Remove these fields out of struct cpuinfo_or1k and into its own struct. This reduces duplication while keeping cpuinfo_or1k extensible so more cache descriptors can be added in the future.
Also add a new field "sets" to the new structure.
---
Changes v5 -> v6:
- Changed 'From' and signed-off-by email addresses.
arch/openrisc/include/asm/cpuinfo.h | 16 +++++----- arch/openrisc/kernel/setup.c | 45 ++++++++++++++--------------- 2 files changed, 31 insertions(+), 30 deletions(-)
arch/openrisc/include/asm/cpuinfo.h +9 -7
@@ -15,16 +15,18 @@#ifndef __ASM_OPENRISC_CPUINFO_H#define __ASM_OPENRISC_CPUINFO_H +struct cache_desc { +u32 size; +u32 sets; +u32 block_size; +u32 ways; +}; +struct cpuinfo_or1k {u32 clock_frequency; -u32 icache_size; -u32 icache_block_size; -u32 icache_ways; - -u32 dcache_size; -u32 dcache_block_size; -u32 dcache_ways; +struct cache_desc icache; +struct cache_desc dcache;u16 coreid; };
arch/openrisc/kernel/setup.c +22 -23
77 lines not on this page · raw message
Signature · 1 line
2.48.1
PATCH v6 2/3 openrisc: Introduce new utility functions to flush and invalidate caches
In reply to Sahil SiddiqAccording to the OpenRISC architecture manual, the dcache and icache may not be present. When these caches are present, the invalidate and flush registers may be absent. The current implementation does not perform checks to verify their presence before utilizing cache registers, or invalidating and flushing cache blocks.
Introduce new functions to detect the presence of cache components and related special-purpose registers.
There are a few places where a range of addresses have to be flushed or invalidated and the implementation is duplicated. Introduce new utility functions and macros that generalize this implementation and reduce duplication.
---
Changes v5 -> v6:
- Changed 'From' and signed-off-by email addresses.
- cache.c:
(cache_loop): Make 'reg' unsigned short. (cache_loop_page): Use __always_inline and make 'reg' unsigned short.
arch/openrisc/include/asm/cacheflush.h | 17 ++++++++ arch/openrisc/include/asm/cpuinfo.h | 8 ++++ arch/openrisc/kernel/dma.c | 18 ++------- arch/openrisc/mm/cache.c | 56 +++++++++++++++++++++----- arch/openrisc/mm/init.c | 5 ++- 5 files changed, 79 insertions(+), 25 deletions(-)
arch/openrisc/include/asm/cacheflush.h +17 -0
@@ -23,6 +23,9 @@*/ extern void local_dcache_page_flush (struct page *page);extern void local_icache_page_inv (struct page *page); +extern void local_dcache_range_flush (unsigned long start,unsigned long end); +extern void local_dcache_range_inv (unsigned long start,unsigned long end); +extern void local_icache_range_inv (unsigned long start,unsigned long end);/* * Data cache flushing always happen on the local cpu. Instruction cache
@@ -38,6 +41,20 @@ extern void local_icache_page_inv(struct page *page);extern void smp_icache_page_inv (struct page *page);#endif /* CONFIG_SMP */ +/* +* Even if the actual block size is larger than L1_CACHE_BYTES, paddr +* can be incremented by L1_CACHE_BYTES. When paddr is written to the +* invalidate register, the entire cache line encompassing this address +* is invalidated. Each subsequent reference to the same cache line will +* not affect the invalidation process. +*/ +#define local_dcache_block_flush (addr) \ + local_dcache_range_flush(addr, addr + L1_CACHE_BYTES) +#define local_dcache_block_inv (addr) \ + local_dcache_range_inv(addr, addr + L1_CACHE_BYTES) +#define local_icache_block_inv (addr) \ + local_icache_range_inv(addr, addr + L1_CACHE_BYTES) +/* * Synchronizes caches. Whenever a cpu writes executable code to memory, this * should be called to make sure the processor sees the newly written code.
arch/openrisc/include/asm/cpuinfo.h +8 -0
@@ -15,6 +15,9 @@ #ifndef __ASM_OPENRISC_CPUINFO_H #define __ASM_OPENRISC_CPUINFO_H +#include <asm/spr.h> +#include <asm/spr_defs.h> + struct cache_desc { u32 size; u32 sets;
@@ -34,4 +37,9 @@ struct cpuinfo_or1k {extern struct cpuinfo_or1k cpuinfo_or1k[NR_CPUS ];extern void setup_cpuinfo (void ); +/* +* Check if the cache component exists. +*/ +extern bool cpu_cache_is_present (const unsigned int cache_type); +#endif /* __ASM_OPENRISC_CPUINFO_H */
arch/openrisc/kernel/dma.c +4 -14
@@ -17,6 +17,7 @@#include <linux/pagewalk.h> #include <asm/cpuinfo.h> +#include <asm/cacheflush.h> #include <asm/spr_defs.h> #include <asm/tlbflush.h>
@@ -24,9 +25,6 @@ static int page_set_nocache(pte_t *pte, unsigned long addr, unsigned long next, struct mm_walk *walk) { -unsigned long cl; -struct cpuinfo_or1k *cpuinfo = &cpuinfo_or1k[smp_processor_id ()]; -pte_val (*pte) |= _PAGE_CI;/*
@@ -36,8 +34,7 @@ page_set_nocache(pte_t *pte, unsigned long addr,flush_tlb_kernel_range (addr, addr +PAGE_SIZE );/* Flush page out of dcache */ -for (cl =__pa (addr); cl <__pa (next); cl += cpuinfo->dcache_block_size) -mtspr (SPR_DCBFR , cl); +local_dcache_range_flush (__pa (addr),__pa (next));return 0 ; }
@@ -98,21 +95,14 @@ void arch_dma_clear_uncached(void *cpu_addr, size_t size)void arch_sync_dma_for_device (phys_addr_t addr,size_t size,enum dma_data_direction dir) { -unsigned long cl; -struct cpuinfo_or1k *cpuinfo = &cpuinfo_or1k[smp_processor_id ()]; -switch (dir) {case DMA_TO_DEVICE :/* Flush the dcache for the requested range */ -for (cl = addr; cl < addr + size; - cl += cpuinfo->dcache_block_size) -mtspr (SPR_DCBFR , cl); +local_dcache_range_flush (addr, addr + size);break ;case DMA_FROM_DEVICE :/* Invalidate the dcache for the requested range */ -for (cl = addr; cl < addr + size; - cl += cpuinfo->dcache_block_size) -mtspr (SPR_DCBIR , cl); +local_dcache_range_inv (addr, addr + size);break ;default :/*
arch/openrisc/mm/cache.c +47 -9
82 lines not on this page · raw message
arch/openrisc/mm/init.c +3 -2
@@ -35,6 +35,7 @@#include <asm/fixmap.h> #include <asm/tlbflush.h> #include <asm/sections.h> +#include <asm/cacheflush.h> int mem_init_done;
@@ -176,8 +177,8 @@ void __init paging_init(void)barrier ();/* Invalidate instruction caches after code modification */ -mtspr (SPR_ICBIR ,0x900 ); -mtspr (SPR_ICBIR ,0xa00 ); +local_icache_block_inv (0x900 ); +local_icache_block_inv (0xa00 );/* New TLB miss handlers and kernel page tables are in now place. * Make sure that page flags get updated for all pages in TLB by
Signature · 1 line
2.48.1
PATCH v6 3/3 openrisc: Add cacheinfo support
In reply to Sahil SiddiqAdd cacheinfo support for OpenRISC.
Currently, a few CPU cache attributes pertaining to OpenRISC processors are exposed along with other unrelated CPU attributes in the procfs file system (/proc/cpuinfo). However, a few cache attributes remain unexposed.
Provide a mechanism that the generic cacheinfo infrastructure can employ to expose these attributes via the sysfs file system. These attributes can then be exposed in /sys/devices/system/cpu/cpuX/cache/indexN. Move the implementation to pull cache attributes from the processor's registers from arch/openrisc/kernel/setup.c with a few modifications.
This implementation is based on similar work done for MIPS and LoongArch.
---
Changes v5 -> v6:
- Changed 'From' and signed-off-by email addresses.
arch/openrisc/kernel/Makefile | 2 +- arch/openrisc/kernel/cacheinfo.c | 104 +++++++++++++++++++++++++++++++ arch/openrisc/kernel/setup.c | 44 +------------ 3 files changed, 108 insertions(+), 42 deletions(-) create mode 100644 arch/openrisc/kernel/cacheinfo.c
arch/openrisc/kernel/Makefile +1 -1
@@ -7,7 +7,7 @@ extra-y := vmlinux.lds obj-y := head.o setup.o or32_ksyms.o process.o dma.o \ traps.o time.o irq.o entry.o ptrace.o signal.o \ - sys_call_table.o unwinder.o + sys_call_table.o unwinder.o cacheinfo.o obj-$(CONFIG_SMP) += smp.o sync-timer.o obj-$(CONFIG_STACKTRACE) += stacktrace.o
arch/openrisc/kernel/cacheinfo.c new file +104 -0
104 lines not on this page · raw message
arch/openrisc/kernel/setup.c +3 -41
79 lines not on this page · raw message
Signature · 1 line
2.48.1