- Page table fixes (PROT_NONE, shareability attribute, TLB invalidation)

- Secondary CPUs entry endianness fix
 - Make NR_CPUS default to 8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.9 (GNU/Linux)
 
 iQIcBAABAgAGBQJSogkcAAoJEGvWsS0AyF7xJz0P/RQ8J+Lt5/q2U/9QOAQ97+rd
 U/oqrQ7HThgo+w+YJtG24OCVcYfmwmqVIsawF7IvzCcNQLZYe1EoowQ4T8/jrc3d
 FUlQMKjRJdoolhv1SZ9rtdkbMQXuRwpC3lcD8TOvYxjdAHnK8SKVwv+yBmIyYGsJ
 BqX46ZAHHuDkQV66doZfIcyoXJv0uJp+p1yfGSH0KKPXMMYqxYdSwqR5mo+m6Zem
 UT4k9M8VpE2E8ALYVyTuJlXuQQ4bSXkhRzdb7ewk5ArhAn/x+Py+TlHhs364ezQq
 bohXRP/Kb7maEUlUYC1RTD4RkWeh5iTtIRJhW19KJS4Im7NHF9m0EDDYS9tU8CCi
 XpRS6CGW6bebxBz/Rg1P8sn0YcbWuwNu143if7oBwkNqzdzjiR+rjH+VtKHJdl6A
 +goRowx2AbEGcc5Syii8se49/jIIbwY44viefv/VaIc7WOOlx6jXiDWZZ4LzBHXb
 CO/WPrblaqi7dnP97EgbFn9jBrY+MN8xRAoD5sliGMzQlq9rcyauArmMxpKUZk+r
 yOCe9PD4t9bjjRONtj1ea0KAfWv9K2UsJLUt7v7oTPVnI12Mq0EXU9Vxj+xLNSM9
 1idzda/7OMwQ6UrZiMHdb7gFSi0GObMjEsjAlMZRAr4DuIkLoRjoKlSxZmzYLROs
 poPwiv09bS/9u213KWL7
 =3yQ/
 -----END PGP SIGNATURE-----

Merge tag 'arm64-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64

Pull ARM64 fixes from Catalin Marinas:
 - Page table fixes (PROT_NONE, shareability attribute, TLB
   invalidation)
 - Secondary CPUs entry endianness fix
 - Make NR_CPUS default to 8

* tag 'arm64-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64:
  arm64: mm: Fix PMD_SECT_PROT_NONE definition
  arm64: Fix memory shareability attribute for ioremap_wc/cache
  arm64: kernel: add code to set cpu boot mode to secondary_entry shim
  arm64: make default NR_CPUS 8
  arm64: ensure completion of TLB invalidatation

arch/arm64/Kconfig

@@ -159,8 +159,7 @@ config NR_CPUS
 	range 2 32
 	depends on SMP
 	# These have to remain sorted largest to smallest
-	default "8" if ARCH_XGENE
-	default "4"
+	default "8"
 
 config HOTPLUG_CPU
 	bool "Support for hot-pluggable CPUs"

arch/arm64/include/asm/io.h

@@ -229,7 +229,7 @@ extern void __iomem *__ioremap(phys_addr_t phys_addr, size_t size, pgprot_t prot
 extern void __iounmap(volatile void __iomem *addr);
 extern void __iomem *ioremap_cache(phys_addr_t phys_addr, size_t size);
 
-#define PROT_DEFAULT		(PTE_TYPE_PAGE | PTE_AF | PTE_DIRTY)
+#define PROT_DEFAULT		(pgprot_default | PTE_DIRTY)
 #define PROT_DEVICE_nGnRE	(PROT_DEFAULT | PTE_PXN | PTE_UXN | PTE_ATTRINDX(MT_DEVICE_nGnRE))
 #define PROT_NORMAL_NC		(PROT_DEFAULT | PTE_ATTRINDX(MT_NORMAL_NC))
 #define PROT_NORMAL		(PROT_DEFAULT | PTE_ATTRINDX(MT_NORMAL))

arch/arm64/include/asm/pgtable-hwdef.h

@@ -43,7 +43,7 @@
  * Section
  */
 #define PMD_SECT_VALID		(_AT(pmdval_t, 1) << 0)
-#define PMD_SECT_PROT_NONE	(_AT(pmdval_t, 1) << 2)
+#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)

arch/arm64/kernel/head.S

@@ -282,8 +282,9 @@ ENDPROC(secondary_holding_pen)
 	 * be used where CPUs are brought online dynamically by the kernel.
 	 */
 ENTRY(secondary_entry)
-	bl	__calc_phys_offset		// x2=phys offset
 	bl	el2_setup			// Drop to EL1
+	bl	__calc_phys_offset		// x24=PHYS_OFFSET, x28=PHYS_OFFSET-PAGE_OFFSET
+	bl	set_cpu_boot_mode_flag
 	b	secondary_startup
 ENDPROC(secondary_entry)
 

arch/arm64/mm/proc.S

@@ -111,12 +111,12 @@ ENTRY(__cpu_setup)
 	bl	__flush_dcache_all
 	mov	lr, x28
 	ic	iallu				// I+BTB cache invalidate
+	tlbi	vmalle1is			// invalidate I + D TLBs
 	dsb	sy
 
 	mov	x0, #3 << 20
 	msr	cpacr_el1, x0			// Enable FP/ASIMD
 	msr	mdscr_el1, xzr			// Reset mdscr_el1
-	tlbi	vmalle1is			// invalidate I + D TLBs
 	/*
 	 * Memory region attributes for LPAE:
 	 *