Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dc939cd8 authored by Pawel Moll's avatar Pawel Moll Committed by Will Deacon
Browse files

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: default avatarPawel Moll <pawel.moll@arm.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent 18b9dc13

arch/arm/mm/proc-v7.S

+24 −43
Original line number Diff line number Diff line
@@ -421,33 +421,36 @@ __v7_setup_stack: 


	.section ".proc.info.init", #alloc, #execinstr



	.type   __v7_ca9mp_proc_info, #object

__v7_ca9mp_proc_info:

	.long	0x410fc090		@ Required ID value

	.long	0xff0ffff0		@ Mask for ID

	ALT_SMP(.long \

		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_ca9mp_setup

	/*

	 * Standard v7 proc info content

	 */

.macro __v7_proc initfunc, mm_mmuflags = 0, io_mmuflags = 0, hwcaps = 0

	ALT_SMP(.long	PMD_TYPE_SECT | PMD_SECT_AP_WRITE | PMD_SECT_AP_READ | \

			PMD_FLAGS_SMP | \mm_mmuflags)

	ALT_UP(.long	PMD_TYPE_SECT | PMD_SECT_AP_WRITE | PMD_SECT_AP_READ | \

			PMD_FLAGS_UP | \mm_mmuflags)

	.long	PMD_TYPE_SECT | PMD_SECT_XN | PMD_SECT_AP_WRITE | \

		PMD_SECT_AP_READ | \io_mmuflags

	W(b)	\initfunc

	.long	cpu_arch_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	v7_processor_functions

	.long	v7wbi_tlb_fns

	.long	v6_user_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



	/*
@@ -457,27 +460,5 @@ __v7_ca9mp_proc_info: 
__v7_proc_info:

	.long	0x000f0000		@ Required ID value

	.long	0x000f0000		@ Mask for ID

	ALT_SMP(.long \

		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

	__v7_proc __v7_setup

	.size	__v7_proc_info, . - __v7_proc_info