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

Commit 7ab366e4 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:

 - clear buffers allocated with FORCE_CONTIGUOUS explicitly until the
   CMA code honours __GFP_ZERO

 - notrace annotation for secondary_start_kernel()

 - use early_param() instead of __setup() for "kpti=" as it is needed
   for the cpufeature callback remapping swapper to non-global mappings

 - ensure writes to swapper are ordered wrt subsequent cache maintenance
   in the kpti non-global remapping code

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  arm64: mm: Ensure writes to swapper are ordered wrt subsequent cache maintenance
  arm64: kpti: Use early_param for kpti= command-line option
  arm64: make secondary_start_kernel() notrace
  arm64: dma-mapping: clear buffers allocated with FORCE_CONTIGUOUS flag
parents 8b88ed3c 71c8fc0c

arch/arm64/kernel/cpufeature.c

+1 −1
Original line number Diff line number Diff line
@@ -937,7 +937,7 @@ static int __init parse_kpti(char *str) 
	__kpti_forced = enabled ? 1 : -1;

	return 0;

}

__setup("kpti=", parse_kpti);

early_param("kpti", parse_kpti);

#endif	/* CONFIG_UNMAP_KERNEL_AT_EL0 */



#ifdef CONFIG_ARM64_HW_AFDBM

arch/arm64/kernel/smp.c

+1 −1
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ int __cpu_up(unsigned int cpu, struct task_struct *idle) 
 * This is the secondary CPU boot entry.  We're using this CPUs

 * idle thread stack, but a set of temporary page tables.

 */

asmlinkage void secondary_start_kernel(void)

asmlinkage notrace void secondary_start_kernel(void)

{

	u64 mpidr = read_cpuid_mpidr() & MPIDR_HWID_BITMASK;

	struct mm_struct *mm = &init_mm;

arch/arm64/mm/dma-mapping.c

+5 −4
Original line number Diff line number Diff line
@@ -583,13 +583,14 @@ static void *__iommu_alloc_attrs(struct device *dev, size_t size, 
						    size >> PAGE_SHIFT);

			return NULL;

		}

		if (!coherent)

			__dma_flush_area(page_to_virt(page), iosize);



		addr = dma_common_contiguous_remap(page, size, VM_USERMAP,

						   prot,

						   __builtin_return_address(0));

		if (!addr) {

		if (addr) {

			memset(addr, 0, size);

			if (!coherent)

				__dma_flush_area(page_to_virt(page), iosize);

		} else {

			iommu_dma_unmap_page(dev, *handle, iosize, 0, attrs);

			dma_release_from_contiguous(dev, page,

						    size >> PAGE_SHIFT);

arch/arm64/mm/proc.S

+3 −2
Original line number Diff line number Diff line
@@ -217,8 +217,9 @@ ENDPROC(idmap_cpu_replace_ttbr1) 


	.macro __idmap_kpti_put_pgtable_ent_ng, type

	orr	\type, \type, #PTE_NG		// Same bit for blocks and pages

	str	\type, [cur_\()\type\()p]	// Update the entry and ensure it

	dc	civac, cur_\()\type\()p		// is visible to all CPUs.

	str	\type, [cur_\()\type\()p]	// Update the entry and ensure

	dmb	sy				// that it is visible to all

	dc	civac, cur_\()\type\()p		// CPUs.

	.endm



/*