The main change here is a significant head.S rework that allows us to boot on machines with physical memory at a really high address without having to increase our mapped VA range. Other changes include: - AES performance boost for Cortex-A57 - AArch32 (compat) userspace with 64k pages - Cortex-A53 erratum workaround for #845719 - defconfig updates (new platforms, PCI, ...) -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABCgAGBQJVLnQpAAoJELescNyEwWM03RIH/iwcDc0MBZgkwfD5cnY+29p4 m89lMDo3SyGQT4NynHSw7P3R7c3zULmI+9hmJMw/yfjjjL6m7X+vVAF3xj1Am4Al OzCqYLHyFnlRktzJ6dWeF1Ese7tWqPpxn+OCXgYNpz/r5MfF/HhlyX/qNzAQPKrw ZpDvnt44DgUfweqjTbwQUg2wkyCRjmz57MQYxDcmJStdpHIu24jWOvDIo3OJGjyS L49I9DU6DGUhkISZmmBE0T7vmKMD1BcgI7OIzX2WIqn521QT+GSLMhRxaHmK1s1V A8gaMTwpo0xFhTAt7sbw/5+2663WmfRdZI+FtduvORsoxX6KdDn7DH1NQixIm8s= =+F0I -----END PGP SIGNATURE----- Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux Pull arm64 updates from Will Deacon: "Here are the core arm64 updates for 4.1. Highlights include a significant rework to head.S (allowing us to boot on machines with physical memory at a really high address), an AES performance boost on Cortex-A57 and the ability to run a 32-bit userspace with 64k pages (although this requires said userspace to be built with a recent binutils). The head.S rework spilt over into KVM, so there are some changes under arch/arm/ which have been acked by Marc Zyngier (KVM co-maintainer). In particular, the linker script changes caused us some issues in -next, so there are a few merge commits where we had to apply fixes on top of a stable branch. Other changes include: - AES performance boost for Cortex-A57 - AArch32 (compat) userspace with 64k pages - Cortex-A53 erratum workaround for #845719 - defconfig updates (new platforms, PCI, ...)" * tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: (39 commits) arm64: fix midr range for Cortex-A57 erratum 832075 arm64: errata: add workaround for cortex-a53 erratum #845719 arm64: Use bool function return values of true/false not 1/0 arm64: defconfig: updates for 4.1 arm64: Extract feature parsing code from cpu_errata.c arm64: alternative: Allow immediate branch as alternative instruction arm64: insn: Add aarch64_insn_decode_immediate ARM: kvm: round HYP section to page size instead of log2 upper bound ARM: kvm: assert on HYP section boundaries not actual code size arm64: head.S: ensure idmap_t0sz is visible arm64: pmu: add support for interrupt-affinity property dt: pmu: extend ARM PMU binding to allow for explicit interrupt affinity arm64: head.S: ensure visibility of page tables arm64: KVM: use ID map with increased VA range if required arm64: mm: increase VA range of identity map ARM: kvm: implement replacement for ld's LOG2CEIL() arm64: proc: remove unused cpu_get_pgd macro arm64: enforce x1|x2|x3 == 0 upon kernel entry as per boot protocol arm64: remove __calc_phys_offset arm64: merge __enable_mmu and __turn_mmu_on ...
		
			
				
	
	
		
			172 lines
		
	
	
	
		
			5.5 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			172 lines
		
	
	
	
		
			5.5 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * Copyright (C) 2012 ARM Ltd.
 | 
						|
 *
 | 
						|
 * This program is free software; you can redistribute it and/or modify
 | 
						|
 * it under the terms of the GNU General Public License version 2 as
 | 
						|
 * published by the Free Software Foundation.
 | 
						|
 *
 | 
						|
 * This program is distributed in the hope that it will be useful,
 | 
						|
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
						|
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | 
						|
 * GNU General Public License for more details.
 | 
						|
 *
 | 
						|
 * You should have received a copy of the GNU General Public License
 | 
						|
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
						|
 */
 | 
						|
#ifndef __ASM_PGTABLE_HWDEF_H
 | 
						|
#define __ASM_PGTABLE_HWDEF_H
 | 
						|
 | 
						|
#define PTRS_PER_PTE		(1 << (PAGE_SHIFT - 3))
 | 
						|
 | 
						|
/*
 | 
						|
 * PMD_SHIFT determines the size a level 2 page table entry can map.
 | 
						|
 */
 | 
						|
#if CONFIG_PGTABLE_LEVELS > 2
 | 
						|
#define PMD_SHIFT		((PAGE_SHIFT - 3) * 2 + 3)
 | 
						|
#define PMD_SIZE		(_AC(1, UL) << PMD_SHIFT)
 | 
						|
#define PMD_MASK		(~(PMD_SIZE-1))
 | 
						|
#define PTRS_PER_PMD		PTRS_PER_PTE
 | 
						|
#endif
 | 
						|
 | 
						|
/*
 | 
						|
 * PUD_SHIFT determines the size a level 1 page table entry can map.
 | 
						|
 */
 | 
						|
#if CONFIG_PGTABLE_LEVELS > 3
 | 
						|
#define PUD_SHIFT		((PAGE_SHIFT - 3) * 3 + 3)
 | 
						|
#define PUD_SIZE		(_AC(1, UL) << PUD_SHIFT)
 | 
						|
#define PUD_MASK		(~(PUD_SIZE-1))
 | 
						|
#define PTRS_PER_PUD		PTRS_PER_PTE
 | 
						|
#endif
 | 
						|
 | 
						|
/*
 | 
						|
 * PGDIR_SHIFT determines the size a top-level page table entry can map
 | 
						|
 * (depending on the configuration, this level can be 0, 1 or 2).
 | 
						|
 */
 | 
						|
#define PGDIR_SHIFT		((PAGE_SHIFT - 3) * CONFIG_PGTABLE_LEVELS + 3)
 | 
						|
#define PGDIR_SIZE		(_AC(1, UL) << PGDIR_SHIFT)
 | 
						|
#define PGDIR_MASK		(~(PGDIR_SIZE-1))
 | 
						|
#define PTRS_PER_PGD		(1 << (VA_BITS - PGDIR_SHIFT))
 | 
						|
 | 
						|
/*
 | 
						|
 * Section address mask and size definitions.
 | 
						|
 */
 | 
						|
#define SECTION_SHIFT		PMD_SHIFT
 | 
						|
#define SECTION_SIZE		(_AC(1, UL) << SECTION_SHIFT)
 | 
						|
#define SECTION_MASK		(~(SECTION_SIZE-1))
 | 
						|
 | 
						|
/*
 | 
						|
 * Hardware page table definitions.
 | 
						|
 *
 | 
						|
 * Level 1 descriptor (PUD).
 | 
						|
 */
 | 
						|
#define PUD_TYPE_TABLE		(_AT(pudval_t, 3) << 0)
 | 
						|
#define PUD_TABLE_BIT		(_AT(pgdval_t, 1) << 1)
 | 
						|
#define PUD_TYPE_MASK		(_AT(pgdval_t, 3) << 0)
 | 
						|
#define PUD_TYPE_SECT		(_AT(pgdval_t, 1) << 0)
 | 
						|
 | 
						|
/*
 | 
						|
 * Level 2 descriptor (PMD).
 | 
						|
 */
 | 
						|
#define PMD_TYPE_MASK		(_AT(pmdval_t, 3) << 0)
 | 
						|
#define PMD_TYPE_FAULT		(_AT(pmdval_t, 0) << 0)
 | 
						|
#define PMD_TYPE_TABLE		(_AT(pmdval_t, 3) << 0)
 | 
						|
#define PMD_TYPE_SECT		(_AT(pmdval_t, 1) << 0)
 | 
						|
#define PMD_TABLE_BIT		(_AT(pmdval_t, 1) << 1)
 | 
						|
 | 
						|
/*
 | 
						|
 * Section
 | 
						|
 */
 | 
						|
#define PMD_SECT_VALID		(_AT(pmdval_t, 1) << 0)
 | 
						|
#define PMD_SECT_PROT_NONE	(_AT(pmdval_t, 1) << 58)
 | 
						|
#define PMD_SECT_USER		(_AT(pmdval_t, 1) << 6)		/* AP[1] */
 | 
						|
#define PMD_SECT_RDONLY		(_AT(pmdval_t, 1) << 7)		/* AP[2] */
 | 
						|
#define PMD_SECT_S		(_AT(pmdval_t, 3) << 8)
 | 
						|
#define PMD_SECT_AF		(_AT(pmdval_t, 1) << 10)
 | 
						|
#define PMD_SECT_NG		(_AT(pmdval_t, 1) << 11)
 | 
						|
#define PMD_SECT_PXN		(_AT(pmdval_t, 1) << 53)
 | 
						|
#define PMD_SECT_UXN		(_AT(pmdval_t, 1) << 54)
 | 
						|
 | 
						|
/*
 | 
						|
 * AttrIndx[2:0] encoding (mapping attributes defined in the MAIR* registers).
 | 
						|
 */
 | 
						|
#define PMD_ATTRINDX(t)		(_AT(pmdval_t, (t)) << 2)
 | 
						|
#define PMD_ATTRINDX_MASK	(_AT(pmdval_t, 7) << 2)
 | 
						|
 | 
						|
/*
 | 
						|
 * Level 3 descriptor (PTE).
 | 
						|
 */
 | 
						|
#define PTE_TYPE_MASK		(_AT(pteval_t, 3) << 0)
 | 
						|
#define PTE_TYPE_FAULT		(_AT(pteval_t, 0) << 0)
 | 
						|
#define PTE_TYPE_PAGE		(_AT(pteval_t, 3) << 0)
 | 
						|
#define PTE_TABLE_BIT		(_AT(pteval_t, 1) << 1)
 | 
						|
#define PTE_USER		(_AT(pteval_t, 1) << 6)		/* AP[1] */
 | 
						|
#define PTE_RDONLY		(_AT(pteval_t, 1) << 7)		/* AP[2] */
 | 
						|
#define PTE_SHARED		(_AT(pteval_t, 3) << 8)		/* SH[1:0], inner shareable */
 | 
						|
#define PTE_AF			(_AT(pteval_t, 1) << 10)	/* Access Flag */
 | 
						|
#define PTE_NG			(_AT(pteval_t, 1) << 11)	/* nG */
 | 
						|
#define PTE_PXN			(_AT(pteval_t, 1) << 53)	/* Privileged XN */
 | 
						|
#define PTE_UXN			(_AT(pteval_t, 1) << 54)	/* User XN */
 | 
						|
 | 
						|
/*
 | 
						|
 * AttrIndx[2:0] encoding (mapping attributes defined in the MAIR* registers).
 | 
						|
 */
 | 
						|
#define PTE_ATTRINDX(t)		(_AT(pteval_t, (t)) << 2)
 | 
						|
#define PTE_ATTRINDX_MASK	(_AT(pteval_t, 7) << 2)
 | 
						|
 | 
						|
/*
 | 
						|
 * 2nd stage PTE definitions
 | 
						|
 */
 | 
						|
#define PTE_S2_RDONLY		(_AT(pteval_t, 1) << 6)   /* HAP[2:1] */
 | 
						|
#define PTE_S2_RDWR		(_AT(pteval_t, 3) << 6)   /* HAP[2:1] */
 | 
						|
 | 
						|
#define PMD_S2_RDONLY		(_AT(pmdval_t, 1) << 6)   /* HAP[2:1] */
 | 
						|
#define PMD_S2_RDWR		(_AT(pmdval_t, 3) << 6)   /* HAP[2:1] */
 | 
						|
 | 
						|
/*
 | 
						|
 * Memory Attribute override for Stage-2 (MemAttr[3:0])
 | 
						|
 */
 | 
						|
#define PTE_S2_MEMATTR(t)	(_AT(pteval_t, (t)) << 2)
 | 
						|
#define PTE_S2_MEMATTR_MASK	(_AT(pteval_t, 0xf) << 2)
 | 
						|
 | 
						|
/*
 | 
						|
 * EL2/HYP PTE/PMD definitions
 | 
						|
 */
 | 
						|
#define PMD_HYP			PMD_SECT_USER
 | 
						|
#define PTE_HYP			PTE_USER
 | 
						|
 | 
						|
/*
 | 
						|
 * Highest possible physical address supported.
 | 
						|
 */
 | 
						|
#define PHYS_MASK_SHIFT		(48)
 | 
						|
#define PHYS_MASK		((UL(1) << PHYS_MASK_SHIFT) - 1)
 | 
						|
 | 
						|
/*
 | 
						|
 * TCR flags.
 | 
						|
 */
 | 
						|
#define TCR_T0SZ_OFFSET		0
 | 
						|
#define TCR_T1SZ_OFFSET		16
 | 
						|
#define TCR_T0SZ(x)		((UL(64) - (x)) << TCR_T0SZ_OFFSET)
 | 
						|
#define TCR_T1SZ(x)		((UL(64) - (x)) << TCR_T1SZ_OFFSET)
 | 
						|
#define TCR_TxSZ(x)		(TCR_T0SZ(x) | TCR_T1SZ(x))
 | 
						|
#define TCR_TxSZ_WIDTH		6
 | 
						|
#define TCR_IRGN_NC		((UL(0) << 8) | (UL(0) << 24))
 | 
						|
#define TCR_IRGN_WBWA		((UL(1) << 8) | (UL(1) << 24))
 | 
						|
#define TCR_IRGN_WT		((UL(2) << 8) | (UL(2) << 24))
 | 
						|
#define TCR_IRGN_WBnWA		((UL(3) << 8) | (UL(3) << 24))
 | 
						|
#define TCR_IRGN_MASK		((UL(3) << 8) | (UL(3) << 24))
 | 
						|
#define TCR_ORGN_NC		((UL(0) << 10) | (UL(0) << 26))
 | 
						|
#define TCR_ORGN_WBWA		((UL(1) << 10) | (UL(1) << 26))
 | 
						|
#define TCR_ORGN_WT		((UL(2) << 10) | (UL(2) << 26))
 | 
						|
#define TCR_ORGN_WBnWA		((UL(3) << 10) | (UL(3) << 26))
 | 
						|
#define TCR_ORGN_MASK		((UL(3) << 10) | (UL(3) << 26))
 | 
						|
#define TCR_SHARED		((UL(3) << 12) | (UL(3) << 28))
 | 
						|
#define TCR_TG0_4K		(UL(0) << 14)
 | 
						|
#define TCR_TG0_64K		(UL(1) << 14)
 | 
						|
#define TCR_TG0_16K		(UL(2) << 14)
 | 
						|
#define TCR_TG1_16K		(UL(1) << 30)
 | 
						|
#define TCR_TG1_4K		(UL(2) << 30)
 | 
						|
#define TCR_TG1_64K		(UL(3) << 30)
 | 
						|
#define TCR_ASID16		(UL(1) << 36)
 | 
						|
#define TCR_TBI0		(UL(1) << 37)
 | 
						|
 | 
						|
#endif
 |