redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

arch: remove the ARCH_PHYS_ADDR_T_64BIT config symbol 

Instead select the PHYS_ADDR_T_64BIT for 32-bit architectures that need a
64-bit phys_addr_t type directly.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: James Hogan <jhogan@kernel.org>
hifive-unleashed-5.1
Christoph Hellwig 2018-04-03 16:24:20 +02:00
parent f616ab59c2
commit d4a451d5fc
10 changed files with 15 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arc/Kconfig
View File

@ -453,13 +453,11 @@ config ARC_HAS_PAE40
default n default n
depends on ISA_ARCV2 depends on ISA_ARCV2
select HIGHMEM select HIGHMEM
select PHYS_ADDR_T_64BIT
help help
Enable access to physical memory beyond 4G, only supported on Enable access to physical memory beyond 4G, only supported on
ARC cores with 40 bit Physical Addressing support ARC cores with 40 bit Physical Addressing support
config ARCH_PHYS_ADDR_T_64BIT
def_bool ARC_HAS_PAE40
config ARCH_DMA_ADDR_T_64BIT config ARCH_DMA_ADDR_T_64BIT
bool bool

2
arch/arm/kernel/setup.c
View File

@ -754,7 +754,7 @@ int __init arm_add_memory(u64 start, u64 size)
else else
size -= aligned_start - start; size -= aligned_start - start;
#ifndef CONFIG_ARCH_PHYS_ADDR_T_64BIT #ifndef CONFIG_PHYS_ADDR_T_64BIT
if (aligned_start > ULONG_MAX) { if (aligned_start > ULONG_MAX) {
pr_crit("Ignoring memory at 0x%08llx outside 32-bit physical address space\n", pr_crit("Ignoring memory at 0x%08llx outside 32-bit physical address space\n",
(long long)start); (long long)start);

4
arch/arm/mm/Kconfig
View File

@ -661,6 +661,7 @@ config ARM_LPAE
bool "Support for the Large Physical Address Extension" bool "Support for the Large Physical Address Extension"
depends on MMU && CPU_32v7 && !CPU_32v6 && !CPU_32v5 && \ depends on MMU && CPU_32v7 && !CPU_32v6 && !CPU_32v5 && \
!CPU_32v4 && !CPU_32v3 !CPU_32v4 && !CPU_32v3
select PHYS_ADDR_T_64BIT
help help
Say Y if you have an ARMv7 processor supporting the LPAE page Say Y if you have an ARMv7 processor supporting the LPAE page
table format and you would like to access memory beyond the table format and you would like to access memory beyond the
@ -673,9 +674,6 @@ config ARM_PV_FIXUP
def_bool y def_bool y
depends on ARM_LPAE && ARM_PATCH_PHYS_VIRT && ARCH_KEYSTONE depends on ARM_LPAE && ARM_PATCH_PHYS_VIRT && ARCH_KEYSTONE
config ARCH_PHYS_ADDR_T_64BIT
def_bool ARM_LPAE
config ARCH_DMA_ADDR_T_64BIT config ARCH_DMA_ADDR_T_64BIT
bool bool

3
arch/arm64/Kconfig
View File

@ -151,9 +151,6 @@ config ARM64
config 64BIT config 64BIT
def_bool y def_bool y
config ARCH_PHYS_ADDR_T_64BIT
def_bool y
config MMU config MMU
def_bool y def_bool y

15
arch/mips/Kconfig
View File

@ -131,7 +131,7 @@ config MIPS_GENERIC
config MIPS_ALCHEMY config MIPS_ALCHEMY
bool "Alchemy processor based machines" bool "Alchemy processor based machines"
select ARCH_PHYS_ADDR_T_64BIT select PHYS_ADDR_T_64BIT
select CEVT_R4K select CEVT_R4K
select CSRC_R4K select CSRC_R4K
select IRQ_MIPS_CPU select IRQ_MIPS_CPU
@ -889,7 +889,7 @@ config CAVIUM_OCTEON_SOC
bool "Cavium Networks Octeon SoC based boards" bool "Cavium Networks Octeon SoC based boards"
select CEVT_R4K select CEVT_R4K
select ARCH_HAS_PHYS_TO_DMA select ARCH_HAS_PHYS_TO_DMA
select ARCH_PHYS_ADDR_T_64BIT select PHYS_ADDR_T_64BIT
select DMA_COHERENT select DMA_COHERENT
select SYS_SUPPORTS_64BIT_KERNEL select SYS_SUPPORTS_64BIT_KERNEL
select SYS_SUPPORTS_BIG_ENDIAN select SYS_SUPPORTS_BIG_ENDIAN
@ -935,7 +935,7 @@ config NLM_XLR_BOARD
select SWAP_IO_SPACE select SWAP_IO_SPACE
select SYS_SUPPORTS_32BIT_KERNEL select SYS_SUPPORTS_32BIT_KERNEL
select SYS_SUPPORTS_64BIT_KERNEL select SYS_SUPPORTS_64BIT_KERNEL
select ARCH_PHYS_ADDR_T_64BIT select PHYS_ADDR_T_64BIT
select SYS_SUPPORTS_BIG_ENDIAN select SYS_SUPPORTS_BIG_ENDIAN
select SYS_SUPPORTS_HIGHMEM select SYS_SUPPORTS_HIGHMEM
select DMA_COHERENT select DMA_COHERENT
@ -961,7 +961,7 @@ config NLM_XLP_BOARD
select HW_HAS_PCI select HW_HAS_PCI
select SYS_SUPPORTS_32BIT_KERNEL select SYS_SUPPORTS_32BIT_KERNEL
select SYS_SUPPORTS_64BIT_KERNEL select SYS_SUPPORTS_64BIT_KERNEL
select ARCH_PHYS_ADDR_T_64BIT select PHYS_ADDR_T_64BIT
select GPIOLIB select GPIOLIB
select SYS_SUPPORTS_BIG_ENDIAN select SYS_SUPPORTS_BIG_ENDIAN
select SYS_SUPPORTS_LITTLE_ENDIAN select SYS_SUPPORTS_LITTLE_ENDIAN
@ -1101,7 +1101,7 @@ config FW_CFE
bool bool
config ARCH_DMA_ADDR_T_64BIT config ARCH_DMA_ADDR_T_64BIT
def_bool (HIGHMEM && ARCH_PHYS_ADDR_T_64BIT) || 64BIT def_bool (HIGHMEM && PHYS_ADDR_T_64BIT) || 64BIT
config ARCH_SUPPORTS_UPROBES config ARCH_SUPPORTS_UPROBES
bool bool
@ -1766,7 +1766,7 @@ config CPU_MIPS32_R5_XPA
depends on SYS_SUPPORTS_HIGHMEM depends on SYS_SUPPORTS_HIGHMEM
select XPA select XPA
select HIGHMEM select HIGHMEM
select ARCH_PHYS_ADDR_T_64BIT select PHYS_ADDR_T_64BIT
default n default n
help help
Choose this option if you want to enable the Extended Physical Choose this option if you want to enable the Extended Physical
@ -2398,9 +2398,6 @@ config SB1_PASS_2_1_WORKAROUNDS
default y default y
config ARCH_PHYS_ADDR_T_64BIT
bool
choice choice
prompt "SmartMIPS or microMIPS ASE support" prompt "SmartMIPS or microMIPS ASE support"

5
arch/powerpc/Kconfig
View File

@ -13,11 +13,8 @@ config 64BIT
bool bool
default y if PPC64 default y if PPC64
config ARCH_PHYS_ADDR_T_64BIT
def_bool PPC64 || PHYS_64BIT
config ARCH_DMA_ADDR_T_64BIT config ARCH_DMA_ADDR_T_64BIT
def_bool ARCH_PHYS_ADDR_T_64BIT def_bool PHYS_ADDR_T_64BIT
config MMU config MMU
bool bool

1
arch/powerpc/platforms/Kconfig.cputype
View File

@ -222,6 +222,7 @@ config PTE_64BIT
config PHYS_64BIT config PHYS_64BIT
bool 'Large physical address support' if E500 || PPC_86xx bool 'Large physical address support' if E500 || PPC_86xx
depends on (44x || E500 || PPC_86xx) && !PPC_83xx && !PPC_82xx depends on (44x || E500 || PPC_86xx) && !PPC_83xx && !PPC_82xx
select PHYS_ADDR_T_64BIT
---help--- ---help---
This option enables kernel support for larger than 32-bit physical This option enables kernel support for larger than 32-bit physical
addresses. This feature may not be available on all cores. addresses. This feature may not be available on all cores.

6
arch/riscv/Kconfig
View File

@ -5,6 +5,8 @@
config RISCV config RISCV
def_bool y def_bool y
# even on 32-bit, physical (and DMA) addresses are > 32-bits
select PHYS_ADDR_T_64BIT
select OF select OF
select OF_EARLY_FLATTREE select OF_EARLY_FLATTREE
select OF_IRQ select OF_IRQ
@ -38,10 +40,6 @@ config RISCV
config MMU config MMU
def_bool y def_bool y
# even on 32-bit, physical (and DMA) addresses are > 32-bits
config ARCH_PHYS_ADDR_T_64BIT
def_bool y
config ZONE_DMA32 config ZONE_DMA32
bool bool
default y default y

5
arch/x86/Kconfig
View File

@ -1451,6 +1451,7 @@ config HIGHMEM
config X86_PAE config X86_PAE
bool "PAE (Physical Address Extension) Support" bool "PAE (Physical Address Extension) Support"
depends on X86_32 && !HIGHMEM4G depends on X86_32 && !HIGHMEM4G
select PHYS_ADDR_T_64BIT
select SWIOTLB select SWIOTLB
---help--- ---help---
PAE is required for NX support, and furthermore enables PAE is required for NX support, and furthermore enables
@ -1478,10 +1479,6 @@ config X86_5LEVEL
Say N if unsure. Say N if unsure.
config ARCH_PHYS_ADDR_T_64BIT
def_bool y
depends on X86_64 || X86_PAE
config ARCH_DMA_ADDR_T_64BIT config ARCH_DMA_ADDR_T_64BIT
def_bool y def_bool y
depends on X86_64 || HIGHMEM64G depends on X86_64 || HIGHMEM64G

2
mm/Kconfig
View File

@ -266,7 +266,7 @@ config ARCH_ENABLE_THP_MIGRATION
bool bool
config PHYS_ADDR_T_64BIT config PHYS_ADDR_T_64BIT
def_bool 64BIT || ARCH_PHYS_ADDR_T_64BIT def_bool 64BIT
config BOUNCE config BOUNCE
bool "Enable bounce buffers" bool "Enable bounce buffers"