Commit 53262d12 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux 

Pull arm64 fixes from Catalin Marinas:
 - __cpu_suspend mm switching fix after warm boot
 - arch_setup_dma_ops implementation
 - pgd_page compilation error fix
 - defconfig updates

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  arm64: mm: Add pgd_page to support RCU fast_gup
  arm64: defconfig: defconfig update for 3.19
  arm64: kernel: fix __cpu_suspend mm switch on warm-boot
  arm64: Replace set_arch_dma_coherent_ops with arch_setup_dma_ops
parents aa39477b 5d96e0cb

arch/arm64/configs/defconfig

+5 −4
Original line number Diff line number Diff line 
# CONFIG_LOCALVERSION_AUTO is not set

CONFIG_SYSVIPC=y

CONFIG_POSIX_MQUEUE=y

CONFIG_FHANDLE=y

CONFIG_AUDIT=y

CONFIG_NO_HZ_IDLE=y

CONFIG_HIGH_RES_TIMERS=y
@@ -13,14 +14,12 @@ CONFIG_TASK_IO_ACCOUNTING=y 
CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_LOG_BUF_SHIFT=14

CONFIG_RESOURCE_COUNTERS=y

CONFIG_MEMCG=y

CONFIG_MEMCG_SWAP=y

CONFIG_MEMCG_KMEM=y

CONFIG_CGROUP_HUGETLB=y

# CONFIG_UTS_NS is not set

# CONFIG_IPC_NS is not set

# CONFIG_PID_NS is not set

# CONFIG_NET_NS is not set

CONFIG_SCHED_AUTOGROUP=y

CONFIG_BLK_DEV_INITRD=y
@@ -92,7 +91,6 @@ CONFIG_SERIAL_AMBA_PL011_CONSOLE=y 
CONFIG_SERIAL_OF_PLATFORM=y

CONFIG_VIRTIO_CONSOLE=y

# CONFIG_HW_RANDOM is not set

# CONFIG_HMC_DRV is not set

CONFIG_SPI=y

CONFIG_SPI_PL022=y

CONFIG_GPIO_PL061=y
@@ -133,6 +131,8 @@ CONFIG_EXT3_FS=y 
CONFIG_EXT4_FS=y

CONFIG_FANOTIFY=y

CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y

CONFIG_QUOTA=y

CONFIG_AUTOFS4_FS=y

CONFIG_FUSE_FS=y

CONFIG_CUSE=y

CONFIG_VFAT_FS=y
@@ -152,14 +152,15 @@ CONFIG_MAGIC_SYSRQ=y 
CONFIG_DEBUG_KERNEL=y

CONFIG_LOCKUP_DETECTOR=y

# CONFIG_SCHED_DEBUG is not set

# CONFIG_DEBUG_PREEMPT is not set

# CONFIG_FTRACE is not set

CONFIG_KEYS=y

CONFIG_SECURITY=y

CONFIG_CRYPTO_ANSI_CPRNG=y

CONFIG_ARM64_CRYPTO=y

CONFIG_CRYPTO_SHA1_ARM64_CE=y

CONFIG_CRYPTO_SHA2_ARM64_CE=y

CONFIG_CRYPTO_GHASH_ARM64_CE=y

CONFIG_CRYPTO_AES_ARM64_CE=y

CONFIG_CRYPTO_AES_ARM64_CE_CCM=y

CONFIG_CRYPTO_AES_ARM64_CE_BLK=y

CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y

arch/arm64/include/asm/dma-mapping.h

+6 −5
Original line number Diff line number Diff line
@@ -52,13 +52,14 @@ static inline void set_dma_ops(struct device *dev, struct dma_map_ops *ops) 
	dev->archdata.dma_ops = ops;

}



static inline int set_arch_dma_coherent_ops(struct device *dev)

static inline void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size,

				      struct iommu_ops *iommu, bool coherent)

{

	dev->archdata.dma_coherent = true;

	dev->archdata.dma_coherent = coherent;

	if (coherent)

		set_dma_ops(dev, &coherent_swiotlb_dma_ops);

	return 0;

}

#define set_arch_dma_coherent_ops	set_arch_dma_coherent_ops

#define arch_setup_dma_ops	arch_setup_dma_ops



/* do not use this function in a driver */

static inline bool is_device_dma_coherent(struct device *dev)

arch/arm64/include/asm/pgtable.h

+3 −2
Original line number Diff line number Diff line
@@ -298,7 +298,6 @@ void pmdp_splitting_flush(struct vm_area_struct *vma, unsigned long address, 
#define pfn_pmd(pfn,prot)	(__pmd(((phys_addr_t)(pfn) << PAGE_SHIFT) | pgprot_val(prot)))

#define mk_pmd(page,prot)	pfn_pmd(page_to_pfn(page),prot)



#define pmd_page(pmd)           pfn_to_page(__phys_to_pfn(pmd_val(pmd) & PHYS_MASK))

#define pud_write(pud)		pte_write(pud_pte(pud))

#define pud_pfn(pud)		(((pud_val(pud) & PUD_MASK) & PHYS_MASK) >> PAGE_SHIFT)
@@ -401,7 +400,7 @@ static inline pmd_t *pmd_offset(pud_t *pud, unsigned long addr) 
	return (pmd_t *)pud_page_vaddr(*pud) + pmd_index(addr);

}



#define pud_page(pud)           pmd_page(pud_pmd(pud))

#define pud_page(pud)		pfn_to_page(__phys_to_pfn(pud_val(pud) & PHYS_MASK))



#endif	/* CONFIG_ARM64_PGTABLE_LEVELS > 2 */
@@ -437,6 +436,8 @@ static inline pud_t *pud_offset(pgd_t *pgd, unsigned long addr) 
	return (pud_t *)pgd_page_vaddr(*pgd) + pud_index(addr);

}



#define pgd_page(pgd)		pfn_to_page(__phys_to_pfn(pgd_val(pgd) & PHYS_MASK))



#endif  /* CONFIG_ARM64_PGTABLE_LEVELS > 3 */



#define pgd_ERROR(pgd)		__pgd_error(__FILE__, __LINE__, pgd_val(pgd))

arch/arm64/kernel/suspend.c

+13 −1
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
#include <asm/debug-monitors.h>

#include <asm/pgtable.h>

#include <asm/memory.h>

#include <asm/mmu_context.h>

#include <asm/smp_plat.h>

#include <asm/suspend.h>

#include <asm/tlbflush.h>
@@ -98,7 +99,18 @@ int __cpu_suspend(unsigned long arg, int (*fn)(unsigned long)) 
	 */

	ret = __cpu_suspend_enter(arg, fn);

	if (ret == 0) {

		/*

		 * We are resuming from reset with TTBR0_EL1 set to the

		 * idmap to enable the MMU; restore the active_mm mappings in

		 * TTBR0_EL1 unless the active_mm == &init_mm, in which case

		 * the thread entered __cpu_suspend with TTBR0_EL1 set to

		 * reserved TTBR0 page tables and should be restored as such.

		 */

		if (mm == &init_mm)

			cpu_set_reserved_ttbr0();

		else

			cpu_switch_mm(mm->pgd, mm);



		flush_tlb_all();



		/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE