Commit 2eb5866c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm 

Pull ARM fixes from Russell King:

 - quieten the spectre-bhb prints

 - mark flattened device tree sections as shareable

 - remove some obsolete CPU domain code and help text

 - fix thumb unaligned access abort emulation

 - fix amba_device_add() refcount underflow

 - fix literal placement

* tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm:
  ARM: 9208/1: entry: add .ltorg directive to keep literals in range
  ARM: 9207/1: amba: fix refcount underflow if amba_device_add() fails
  ARM: 9214/1: alignment: advance IT state after emulating Thumb instruction
  ARM: 9213/1: Print message about disabled Spectre workarounds only once
  ARM: 9212/1: domain: Modify Kconfig help text
  ARM: 9211/1: domain: drop modify_domain()
  ARM: 9210/1: Mark the FDT_FIXED sections as shareable
  ARM: 9209/1: Spectre-BHB: avoid pr_info() every time a CPU comes out of idle
parents 097da1a4 29589ca0

arch/arm/include/asm/domain.h

+0 −13
Original line number Diff line number Diff line
@@ -112,19 +112,6 @@ static __always_inline void set_domain(unsigned int val) 
}

#endif



#ifdef CONFIG_CPU_USE_DOMAINS

#define modify_domain(dom,type)					\

	do {							\

		unsigned int domain = get_domain();		\

		domain &= ~domain_mask(dom);			\

		domain = domain | domain_val(dom, type);	\

		set_domain(domain);				\

	} while (0)



#else

static inline void modify_domain(unsigned dom, unsigned type)	{ }

#endif



/*

 * Generate the T (user) versions of the LDR/STR and related

 * instructions (inline assembly)

arch/arm/include/asm/mach/map.h

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ enum { 
	MT_HIGH_VECTORS,

	MT_MEMORY_RWX,

	MT_MEMORY_RW,

	MT_MEMORY_RO,

	MT_ROM,

	MT_MEMORY_RWX_NONCACHED,

	MT_MEMORY_RW_DTCM,

arch/arm/include/asm/ptrace.h

+26 −0
Original line number Diff line number Diff line
@@ -163,5 +163,31 @@ static inline unsigned long user_stack_pointer(struct pt_regs *regs) 
		((current_stack_pointer | (THREAD_SIZE - 1)) - 7) - 1;	\

})





/*

 * Update ITSTATE after normal execution of an IT block instruction.

 *

 * The 8 IT state bits are split into two parts in CPSR:

 *	ITSTATE<1:0> are in CPSR<26:25>

 *	ITSTATE<7:2> are in CPSR<15:10>

 */

static inline unsigned long it_advance(unsigned long cpsr)

{

	if ((cpsr & 0x06000400) == 0) {

		/* ITSTATE<2:0> == 0 means end of IT block, so clear IT state */

		cpsr &= ~PSR_IT_MASK;

	} else {

		/* We need to shift left ITSTATE<4:0> */

		const unsigned long mask = 0x06001c00;  /* Mask ITSTATE<4:0> */

		unsigned long it = cpsr & mask;

		it <<= 1;

		it |= it >> (27 - 10);  /* Carry ITSTATE<2> to correct place */

		it &= mask;

		cpsr &= ~mask;

		cpsr |= it;

	}

	return cpsr;

}



#endif /* __ASSEMBLY__ */

#endif

arch/arm/kernel/entry-common.S

+1 −0
Original line number Diff line number Diff line
@@ -302,6 +302,7 @@ local_restart: 
	b	ret_fast_syscall

#endif

ENDPROC(vector_swi)

	.ltorg



	/*

	 * This is the really slow path.  We're going to be doing

arch/arm/mm/Kconfig

+5 −1
Original line number Diff line number Diff line
@@ -631,7 +631,11 @@ config CPU_USE_DOMAINS 
	bool

	help

	  This option enables or disables the use of domain switching

	  via the set_fs() function.

	  using the DACR (domain access control register) to protect memory

	  domains from each other. In Linux we use three domains: kernel, user

	  and IO. The domains are used to protect userspace from kernelspace

	  and to handle IO-space as a special type of memory by assigning

	  manager or client roles to running code (such as a process).



config CPU_V7M_NUM_IRQ

	int "Number of external interrupts connected to the NVIC"