Commit 0dd4ce65 authored by Joerg Roedel's avatar Joerg Roedel
Browse files

Merge tag 'arm-smmu-updates' of... 

Merge tag 'arm-smmu-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into arm/smmu

Arm SMMU updates for 5.10

- Continued SVM enablement, where page-table is shared with CPU

- Groundwork to support integrated SMMU with Adreno GPU

- Allow disabling of MSI-based polling on the kernel command-line

- Minor driver fixes and cleanups (octal permissions, error messages, ...)
parents f75aef39 e2eae099

MAINTAINERS

+1 −2
Original line number Diff line number Diff line
@@ -1506,8 +1506,7 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 
S:	Maintained

F:	Documentation/devicetree/bindings/iommu/arm,smmu*

F:	drivers/iommu/arm/

F:	drivers/iommu/io-pgtable-arm-v7s.c

F:	drivers/iommu/io-pgtable-arm.c

F:	drivers/iommu/io-pgtable-arm*









ARM SUB-ARCHITECTURES









L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
































arch/arm64/include/asm/barrier.h



+1
−0






























Original line number
Diff line number
Diff line







@@ -45,6 +45,7 @@







#define rmb()		dsb(ld)









#define wmb()		dsb(st)



















#define dma_mb()	dmb(osh)









#define dma_rmb()	dmb(oshld)









#define dma_wmb()	dmb(oshst)










































arch/arm64/include/asm/io.h



+1
−0






























Original line number
Diff line number
Diff line







@@ -110,6 +110,7 @@ static inline u64 __raw_readq(const volatile void __iomem *addr)

















#define __io_par(v)		__iormb(v)









#define __iowmb()		dma_wmb()









#define __iomb()		dma_mb()



















/*









 * Relaxed I/O memory access primitives. These follow the Device memory
































arch/arm64/include/asm/mmu.h



+3
−0






























Original line number
Diff line number
Diff line







@@ -17,11 +17,14 @@

















#ifndef __ASSEMBLY__



















#include <linux/refcount.h>



















typedef struct {









	atomic64_t	id;









#ifdef CONFIG_COMPAT









	void		*sigpage;









#endif









	refcount_t	pinned;









	void		*vdso;









	unsigned long	flags;









} mm_context_t;
































arch/arm64/include/asm/mmu_context.h



+10
−1






























Original line number
Diff line number
Diff line







@@ -177,7 +177,13 @@ static inline void cpu_replace_ttbr1(pgd_t *pgdp)







#define destroy_context(mm)		do { } while(0)









void check_and_switch_context(struct mm_struct *mm);



















#define init_new_context(tsk,mm)	({ atomic64_set(&(mm)->context.id, 0); 0; })









static inline int









init_new_context(struct task_struct *tsk, struct mm_struct *mm)









{









	atomic64_set(&mm->context.id, 0);









	refcount_set(&mm->context.pinned, 0);









	return 0;









}



















#ifdef CONFIG_ARM64_SW_TTBR0_PAN









static inline void update_saved_ttbr0(struct task_struct *tsk,








@@ -248,6 +254,9 @@ switch_mm(struct mm_struct *prev, struct mm_struct *next,







void verify_cpu_asid_bits(void);









void post_ttbr_update_workaround(void);



















unsigned long arm64_mm_context_get(struct mm_struct *mm);









void arm64_mm_context_put(struct mm_struct *mm);



















#endif /* !__ASSEMBLY__ */



















#endif /* !__ASM_MMU_CONTEXT_H */