system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-07-23 03:29:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

MIPS: Loongson: Unify LOONGSON3/LOONGSON64 Kconfig usage

Browse source 
There are mixed LOONGSON3/LOONGSON64 usages in recently changes, let's
establish some rules:

1, In Kconfig symbols, we only use CPU_LOONGSON64, MACH_LOONGSON64 and
SYS_HAS_CPU_LOONGSON64, all other derived symbols use "LOONGSON3" since
they all not widely-used symbols and sometimes not suitable for all
64-bit Loongson processors. E.g., we use symbols LOONGSON3_ENHANCEMENT,
CPU_LOONGSON3_WORKAROUNDS, etc.

2, Hide GSx64/GSx64E in Kconfig title since it is not useful for
general users. However, in the full description we use a more detailed
manner. E.g., GS264/GS464/GS464E/GS464V.

All Kconfig titles and descriptions of Loongson processors and machines
have also been updated in this patch for consistency.

Signed-off-by: Huacai Chen <chenhc@lemote.com>
Signed-off-by: Paul Burton <paulburton@kernel.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: James Hogan <jhogan@kernel.org>
Cc: Paul Burton <paul.burton@mips.com>
Cc: linux-mips@linux-mips.org
Cc: linux-mips@vger.kernel.org
Cc: Fuxin Zhang <zhangfx@lemote.com>
Cc: Zhangjin Wu <wuzhangjin@gmail.com>
Cc: Huacai Chen <chenhuacai@gmail.com>
This commit is contained in:
Huacai Chen 2019-11-04 14:11:21 +08:00 committed by Paul Burton
parent b2afb64ccc
commit caed1d1b20
No known key found for this signature in database
GPG key ID: 3EA79FACB57500DD
3 changed files with 24 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
arch/mips/Kconfig
View file

@ -444,7 +444,7 @@ config LASAT
select SYS_SUPPORTS_LITTLE_ENDIAN select SYS_SUPPORTS_LITTLE_ENDIAN
config MACH_LOONGSON32 config MACH_LOONGSON32
bool "Loongson-1 family of machines" bool "Loongson 32-bit family of machines"
select SYS_SUPPORTS_ZBOOT select SYS_SUPPORTS_ZBOOT
help help
This enables support for the Loongson-1 family of machines. This enables support for the Loongson-1 family of machines.
@ -460,7 +460,7 @@ config MACH_LOONGSON2EF
This enables the support of early Loongson-2E/F family of machines. This enables the support of early Loongson-2E/F family of machines.
config MACH_LOONGSON64 config MACH_LOONGSON64
bool "Loongson-2/3 GSx64 family of machines" bool "Loongson 64-bit family of machines"
select ARCH_SPARSEMEM_ENABLE select ARCH_SPARSEMEM_ENABLE
select ARCH_MIGHT_HAVE_PC_PARPORT select ARCH_MIGHT_HAVE_PC_PARPORT
select ARCH_MIGHT_HAVE_PC_SERIO select ARCH_MIGHT_HAVE_PC_SERIO
@ -489,8 +489,12 @@ config MACH_LOONGSON64
select ZONE_DMA32 select ZONE_DMA32
select NUMA select NUMA
help help
This enables the support of Loongson-2/3 family of processors with This enables the support of Loongson-2/3 family of machines.
GSx64 microarchitecture.
Loongson-2 and Loongson-3 are 64-bit general-purpose processors with
GS264/GS464/GS464E/GS464V microarchitecture (except old Loongson-2E
and Loongson-2F which will be removed), developed by the Institute
of Computing Technology (ICT), Chinese Academy of Sciences (CAS).
config MACH_PISTACHIO config MACH_PISTACHIO
bool "IMG Pistachio SoC based boards" bool "IMG Pistachio SoC based boards"
@ -1432,7 +1436,7 @@ choice
default CPU_R4X00 default CPU_R4X00
config CPU_LOONGSON64 config CPU_LOONGSON64
bool "Loongson GSx64 CPU" bool "Loongson 64-bit CPU"
depends on SYS_HAS_CPU_LOONGSON64 depends on SYS_HAS_CPU_LOONGSON64
select ARCH_HAS_PHYS_TO_DMA select ARCH_HAS_PHYS_TO_DMA
select CPU_SUPPORTS_64BIT_KERNEL select CPU_SUPPORTS_64BIT_KERNEL
@ -1448,17 +1452,20 @@ config CPU_LOONGSON64
select GPIOLIB select GPIOLIB
select SWIOTLB select SWIOTLB
help help
The Loongson GSx64 series of processor cores implements the The Loongson GSx64(GS264/GS464/GS464E/GS464V) series of processor
MIPS64R2 instruction set with many extensions. cores implements the MIPS64R2 instruction set with many extensions,
including most 64-bit Loongson-2 (2H, 2K) and Loongson-3 (3A1000,
3B1000, 3B1500, 3A2000, 3A3000 and 3A4000) processors. However, old
Loongson-2E/2F is not covered here and will be removed in future.
config LOONGSON64_ENHANCEMENT config LOONGSON3_ENHANCEMENT
bool "New Loongson GSx64E CPU Enhancements" bool "New Loongson-3 CPU Enhancements"
default n default n
select CPU_MIPSR2 select CPU_MIPSR2
select CPU_HAS_PREFETCH select CPU_HAS_PREFETCH
depends on CPU_LOONGSON64 depends on CPU_LOONGSON64
help help
New Loongson GSx64E cores (since Loongson-3A R2, as opposed to Loongson-3A New Loongson-3 cores (since Loongson-3A R2, as opposed to Loongson-3A
R1, Loongson-3B R1 and Loongson-3B R2) has many enhancements, such as R1, Loongson-3B R1 and Loongson-3B R2) has many enhancements, such as
FTLB, L1-VCache, EI/DI/Wait/Prefetch instruction, DSP/DSPr2 ASE, User FTLB, L1-VCache, EI/DI/Wait/Prefetch instruction, DSP/DSPr2 ASE, User
Local register, Read-Inhibit/Execute-Inhibit, SFB (Store Fill Buffer), Local register, Read-Inhibit/Execute-Inhibit, SFB (Store Fill Buffer),
@ -1467,17 +1474,17 @@ config LOONGSON64_ENHANCEMENT
This option enable those enhancements which are not probed at run This option enable those enhancements which are not probed at run
time. If you want a generic kernel to run on all Loongson 3 machines, time. If you want a generic kernel to run on all Loongson 3 machines,
please say 'N' here. If you want a high-performance kernel to run on please say 'N' here. If you want a high-performance kernel to run on
new Loongson 3 machines only, please say 'Y' here. new Loongson-3 machines only, please say 'Y' here.
config CPU_LOONGSON3_WORKAROUNDS config CPU_LOONGSON3_WORKAROUNDS
bool "Old Loongson 3 LLSC Workarounds" bool "Old Loongson-3 LLSC Workarounds"
default y if SMP default y if SMP
depends on CPU_LOONGSON64 depends on CPU_LOONGSON64
help help
Loongson 3 processors have the llsc issues which require workarounds. Loongson-3 processors have the llsc issues which require workarounds.
Without workarounds the system may hang unexpectedly. Without workarounds the system may hang unexpectedly.
Newer Loongson 3 will fix these issues and no workarounds are needed. Newer Loongson-3 will fix these issues and no workarounds are needed.
The workarounds have no significant side effect on them but may The workarounds have no significant side effect on them but may
decrease the performance of the system so this option should be decrease the performance of the system so this option should be
disabled unless the kernel is intended to be run on old systems. disabled unless the kernel is intended to be run on old systems.

4
arch/mips/include/asm/hazards.h
View file

@ -23,7 +23,7 @@
* TLB hazards * TLB hazards
*/ */
#if (defined(CONFIG_CPU_MIPSR2) || defined(CONFIG_CPU_MIPSR6)) && \ #if (defined(CONFIG_CPU_MIPSR2) || defined(CONFIG_CPU_MIPSR6)) && \
!defined(CONFIG_CPU_CAVIUM_OCTEON) && !defined(CONFIG_LOONGSON64_ENHANCEMENT) !defined(CONFIG_CPU_CAVIUM_OCTEON) && !defined(CONFIG_LOONGSON3_ENHANCEMENT)
/* /*
* MIPSR2 defines ehb for hazard avoidance * MIPSR2 defines ehb for hazard avoidance
@ -158,7 +158,7 @@ do { \
} while (0) } while (0)
#elif defined(CONFIG_MIPS_ALCHEMY) || defined(CONFIG_CPU_CAVIUM_OCTEON) || \ #elif defined(CONFIG_MIPS_ALCHEMY) || defined(CONFIG_CPU_CAVIUM_OCTEON) || \
defined(CONFIG_CPU_LOONGSON2EF) || defined(CONFIG_LOONGSON64_ENHANCEMENT) || \ defined(CONFIG_CPU_LOONGSON2EF) || defined(CONFIG_LOONGSON3_ENHANCEMENT) || \
defined(CONFIG_CPU_R10000) || defined(CONFIG_CPU_R5500) || defined(CONFIG_CPU_XLR) defined(CONFIG_CPU_R10000) || defined(CONFIG_CPU_R5500) || defined(CONFIG_CPU_XLR)
/* /*

2
arch/mips/loongson64/Kconfig
View file

@ -3,7 +3,7 @@ if MACH_LOONGSON64
config RS780_HPET config RS780_HPET
bool "RS780/SBX00 HPET Timer" bool "RS780/SBX00 HPET Timer"
depends on CONFIG_MACH_LOONGSON64 depends on MACH_LOONGSON64
select MIPS_EXTERNAL_TIMER select MIPS_EXTERNAL_TIMER
help help
This option enables the hpet timer of AMD RS780/SBX00. This option enables the hpet timer of AMD RS780/SBX00.