mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 10:57:46 +00:00
ARM: proc: convert v7 proc infos into a common macro
As most of the proc info content is common across all v7 processors, this patch converts existing A9 and generic v7 descriptions into a macro (allowing extra flags in future). Signed-off-by: Pawel Moll <pawel.moll@arm.com> Signed-off-by: Will Deacon <will.deacon@arm.com>
This commit is contained in:
parent
18b9dc130c
commit
dc939cd835
1 changed files with 24 additions and 43 deletions
|
@ -421,33 +421,36 @@ __v7_setup_stack:
|
||||||
|
|
||||||
.section ".proc.info.init", #alloc, #execinstr
|
.section ".proc.info.init", #alloc, #execinstr
|
||||||
|
|
||||||
.type __v7_ca9mp_proc_info, #object
|
/*
|
||||||
__v7_ca9mp_proc_info:
|
* Standard v7 proc info content
|
||||||
.long 0x410fc090 @ Required ID value
|
*/
|
||||||
.long 0xff0ffff0 @ Mask for ID
|
.macro __v7_proc initfunc, mm_mmuflags = 0, io_mmuflags = 0, hwcaps = 0
|
||||||
ALT_SMP(.long \
|
ALT_SMP(.long PMD_TYPE_SECT | PMD_SECT_AP_WRITE | PMD_SECT_AP_READ | \
|
||||||
PMD_TYPE_SECT | \
|
PMD_FLAGS_SMP | \mm_mmuflags)
|
||||||
PMD_SECT_AP_WRITE | \
|
ALT_UP(.long PMD_TYPE_SECT | PMD_SECT_AP_WRITE | PMD_SECT_AP_READ | \
|
||||||
PMD_SECT_AP_READ | \
|
PMD_FLAGS_UP | \mm_mmuflags)
|
||||||
PMD_FLAGS_SMP)
|
.long PMD_TYPE_SECT | PMD_SECT_XN | PMD_SECT_AP_WRITE | \
|
||||||
ALT_UP(.long \
|
PMD_SECT_AP_READ | \io_mmuflags
|
||||||
PMD_TYPE_SECT | \
|
W(b) \initfunc
|
||||||
PMD_SECT_AP_WRITE | \
|
|
||||||
PMD_SECT_AP_READ | \
|
|
||||||
PMD_FLAGS_UP)
|
|
||||||
.long PMD_TYPE_SECT | \
|
|
||||||
PMD_SECT_XN | \
|
|
||||||
PMD_SECT_AP_WRITE | \
|
|
||||||
PMD_SECT_AP_READ
|
|
||||||
W(b) __v7_ca9mp_setup
|
|
||||||
.long cpu_arch_name
|
.long cpu_arch_name
|
||||||
.long cpu_elf_name
|
.long cpu_elf_name
|
||||||
.long HWCAP_SWP|HWCAP_HALF|HWCAP_THUMB|HWCAP_FAST_MULT|HWCAP_EDSP|HWCAP_TLS
|
.long HWCAP_SWP | HWCAP_HALF | HWCAP_THUMB | HWCAP_FAST_MULT | \
|
||||||
|
HWCAP_EDSP | HWCAP_TLS | \hwcaps
|
||||||
.long cpu_v7_name
|
.long cpu_v7_name
|
||||||
.long v7_processor_functions
|
.long v7_processor_functions
|
||||||
.long v7wbi_tlb_fns
|
.long v7wbi_tlb_fns
|
||||||
.long v6_user_fns
|
.long v6_user_fns
|
||||||
.long v7_cache_fns
|
.long v7_cache_fns
|
||||||
|
.endm
|
||||||
|
|
||||||
|
/*
|
||||||
|
* ARM Ltd. Cortex A9 processor.
|
||||||
|
*/
|
||||||
|
.type __v7_ca9mp_proc_info, #object
|
||||||
|
__v7_ca9mp_proc_info:
|
||||||
|
.long 0x410fc090
|
||||||
|
.long 0xff0ffff0
|
||||||
|
__v7_proc __v7_ca9mp_setup
|
||||||
.size __v7_ca9mp_proc_info, . - __v7_ca9mp_proc_info
|
.size __v7_ca9mp_proc_info, . - __v7_ca9mp_proc_info
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -457,27 +460,5 @@ __v7_ca9mp_proc_info:
|
||||||
__v7_proc_info:
|
__v7_proc_info:
|
||||||
.long 0x000f0000 @ Required ID value
|
.long 0x000f0000 @ Required ID value
|
||||||
.long 0x000f0000 @ Mask for ID
|
.long 0x000f0000 @ Mask for ID
|
||||||
ALT_SMP(.long \
|
__v7_proc __v7_setup
|
||||||
PMD_TYPE_SECT | \
|
|
||||||
PMD_SECT_AP_WRITE | \
|
|
||||||
PMD_SECT_AP_READ | \
|
|
||||||
PMD_FLAGS_SMP)
|
|
||||||
ALT_UP(.long \
|
|
||||||
PMD_TYPE_SECT | \
|
|
||||||
PMD_SECT_AP_WRITE | \
|
|
||||||
PMD_SECT_AP_READ | \
|
|
||||||
PMD_FLAGS_UP)
|
|
||||||
.long PMD_TYPE_SECT | \
|
|
||||||
PMD_SECT_XN | \
|
|
||||||
PMD_SECT_AP_WRITE | \
|
|
||||||
PMD_SECT_AP_READ
|
|
||||||
W(b) __v7_setup
|
|
||||||
.long cpu_arch_name
|
|
||||||
.long cpu_elf_name
|
|
||||||
.long HWCAP_SWP|HWCAP_HALF|HWCAP_THUMB|HWCAP_FAST_MULT|HWCAP_EDSP|HWCAP_TLS
|
|
||||||
.long cpu_v7_name
|
|
||||||
.long v7_processor_functions
|
|
||||||
.long v7wbi_tlb_fns
|
|
||||||
.long v6_user_fns
|
|
||||||
.long v7_cache_fns
|
|
||||||
.size __v7_proc_info, . - __v7_proc_info
|
.size __v7_proc_info, . - __v7_proc_info
|
||||||
|
|
Loading…
Reference in a new issue