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

Commit 112eb072 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm 

Pull ARM fixes from Russell King:
 "Three fixes this time around:

   - Two fixes for noMMU, fixing the decompressor header layout, and
     preventing a build error with some configurations.

   - Fixing the hyp-stub updates that went in during the merge window
     for platforms that use MCPM"

* 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm:
  ARM: 8677/1: boot/compressed: fix decompressor header layout for v7-M
  ARM: 8676/1: NOMMU: provide pgprot_device() macro
  ARM: 8675/1: MCPM: ensure not to enter __hyp_soft_restart from loopback and cpu_power_down
parents 3c2993b8 06a4b6d0

arch/arm/boot/compressed/efi-header.S

+1 −3
Original line number Diff line number Diff line
@@ -17,14 +17,12 @@ 
		@ there.

		.inst	'M' | ('Z' << 8) | (0x1310 << 16)   @ tstne r0, #0x4d000

#else

		mov	r0, r0

		W(mov)	r0, r0

#endif

		.endm



		.macro	__EFI_HEADER

#ifdef CONFIG_EFI_STUB

		b	__efi_start



		.set	start_offset, __efi_start - start

		.org	start + 0x3c

		@

arch/arm/boot/compressed/head.S

+10 −7
Original line number Diff line number Diff line
@@ -130,19 +130,22 @@ start: 
		.rept	7

		__nop

		.endr

   ARM(		mov	r0, r0		)

   ARM(		b	1f		)

 THUMB(		badr	r12, 1f		)

 THUMB(		bx	r12		)

#ifndef CONFIG_THUMB2_KERNEL

		mov	r0, r0

#else

 AR_CLASS(	sub	pc, pc, #3	)	@ A/R: switch to Thumb2 mode

  M_CLASS(	nop.w			)	@ M: already in Thumb2 mode

		.thumb

#endif

		W(b)	1f



		.word	_magic_sig	@ Magic numbers to help the loader

		.word	_magic_start	@ absolute load/run zImage address

		.word	_magic_end	@ zImage end address

		.word	0x04030201	@ endianness flag



 THUMB(		.thumb			)

1:		__EFI_HEADER



		__EFI_HEADER

1:

 ARM_BE8(	setend	be		)	@ go BE8 if compiled for BE8

 AR_CLASS(	mrs	r9, cpsr	)

#ifdef CONFIG_ARM_VIRT_EXT

arch/arm/common/mcpm_entry.c

+3 −3
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ int mcpm_cpu_power_up(unsigned int cpu, unsigned int cluster) 
	return ret;

}



typedef void (*phys_reset_t)(unsigned long);

typedef typeof(cpu_reset) phys_reset_t;



void mcpm_cpu_power_down(void)

{
@@ -300,7 +300,7 @@ void mcpm_cpu_power_down(void) 
	 * on the CPU.

	 */

	phys_reset = (phys_reset_t)(unsigned long)__pa_symbol(cpu_reset);

	phys_reset(__pa_symbol(mcpm_entry_point));

	phys_reset(__pa_symbol(mcpm_entry_point), false);



	/* should never get here */

	BUG();
@@ -389,7 +389,7 @@ static int __init nocache_trampoline(unsigned long _arg) 
	__mcpm_cpu_down(cpu, cluster);



	phys_reset = (phys_reset_t)(unsigned long)__pa_symbol(cpu_reset);

	phys_reset(__pa_symbol(mcpm_entry_point));

	phys_reset(__pa_symbol(mcpm_entry_point), false);

	BUG();

}

arch/arm/include/asm/pgtable-nommu.h

+1 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ typedef pte_t *pte_addr_t; 
#define pgprot_noncached(prot)	(prot)

#define pgprot_writecombine(prot) (prot)

#define pgprot_dmacoherent(prot) (prot)

#define pgprot_device(prot)	(prot)





/*