mirros/rockchip-kernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'csky-for-linus-5.14-rc1' of git://github.com/c-sky/csky-linux

Browse Source 
Pull arch/csky updates from Guo Ren:
 "A small cleanup and a fixup"

* tag 'csky-for-linus-5.14-rc1' of git://github.com/c-sky/csky-linux:
  csky: Kconfig: Remove unused selects
  csky: syscache: Fixup duplicate cache flush
This commit is contained in:
Linus Torvalds
2021-07-04 12:07:54 -07:00
parent 0c66a95c7e 90dc8c0e66
commit 0d4d4c6ff6
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arch/csky/Kconfig
View File

@@ -76,8 +76,6 @@ config CSKY
select PERF_USE_VMALLOC if CPU_CK610 select PERF_USE_VMALLOC if CPU_CK610
select RTC_LIB select RTC_LIB
select TIMER_OF select TIMER_OF
select USB_ARCH_HAS_EHCI
select USB_ARCH_HAS_OHCI
select GENERIC_PCI_IOMAP select GENERIC_PCI_IOMAP
select HAVE_PCI select HAVE_PCI
select PCI_DOMAINS_GENERIC if PCI select PCI_DOMAINS_GENERIC if PCI
@@ -245,7 +243,6 @@ endchoice
menuconfig HAVE_TCM menuconfig HAVE_TCM
bool "Tightly-Coupled/Sram Memory" bool "Tightly-Coupled/Sram Memory"
select GENERIC_ALLOCATOR
help help
The implementation are not only used by TCM (Tightly-Coupled Meory) The implementation are not only used by TCM (Tightly-Coupled Meory)
but also used by sram on SOC bus. It follow existed linux tcm but also used by sram on SOC bus. It follow existed linux tcm

12
arch/csky/mm/syscache.c
View File

@@ -12,15 +12,17 @@ SYSCALL_DEFINE3(cacheflush,
int, cache) int, cache)
{ {
switch (cache) { switch (cache) {
case ICACHE:
case BCACHE: case BCACHE:
flush_icache_mm_range(current->mm,
(unsigned long)addr,
(unsigned long)addr + bytes);
fallthrough;
case DCACHE: case DCACHE:
dcache_wb_range((unsigned long)addr, dcache_wb_range((unsigned long)addr,
(unsigned long)addr + bytes); (unsigned long)addr + bytes);
if (cache != BCACHE)
break;
fallthrough;
case ICACHE:
flush_icache_mm_range(current->mm,
(unsigned long)addr,
(unsigned long)addr + bytes);
break; break;
default: default:
return -EINVAL; return -EINVAL;