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

Commit 89c5a946 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'arc-v3.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc 

Pull ARC changes from Vineet Gupta:

 - ARC MM changes:
    - preparation for MMUv4 (accomodate new PTE bits, new cmds)
    - Rework the ASID allocation algorithm to remove asid-mm reverse map
 - Boilerplate code consolidation in Exception Handlers
 - Disable FRAME_POINTER for ARC
 - Unaligned Access Emulation for Big-Endian from Noam
 - Bunch of fixes (udelay, missing accessors) from Mischa

* tag 'arc-v3.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
  ARC: fix new Section mismatches in build (post __cpuinit cleanup)
  Kconfig.debug: Add FRAME_POINTER anti-dependency for ARC
  ARC: Fix __udelay calculation
  ARC: remove console_verbose() from setup_arch()
  ARC: Add read*_relaxed to asm/io.h
  ARC: Handle un-aligned user space access in BE.
  ARC: [ASID] Track ASID allocation cycles/generations
  ARC: [ASID] activate_mm() == switch_mm()
  ARC: [ASID] get_new_mmu_context() to conditionally allocate new ASID
  ARC: [ASID] Refactor the TLB paranoid debug code
  ARC: [ASID] Remove legacy/unused debug code
  ARC: No need to flush the TLB in early boot
  ARC: MMUv4 preps/3 - Abstract out TLB Insert/Delete
  ARC: MMUv4 preps/2 - Reshuffle PTE bits
  ARC: MMUv4 preps/1 - Fold PTE K/U access flags
  ARC: Code cosmetics (Nothing semantical)
  ARC: Entry Handler tweaks: Optimize away redundant IRQ_DISABLE_SAVE
  ARC: Exception Handlers Code consolidation
  ARC: Add some .gitignore entries
parents 833ae40b 07b9b651

arch/arc/boot/.gitignore

0 → 100644
+1 −0
Original line number Diff line number Diff line 
*.dtb*

arch/arc/include/asm/cache.h

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ 


extern void arc_cache_init(void);

extern char *arc_cache_mumbojumbo(int cpu_id, char *buf, int len);

extern void __init read_decode_cache_bcr(void);

extern void read_decode_cache_bcr(void);



#endif	/* !__ASSEMBLY__ */

arch/arc/include/asm/delay.h

+2 −3
Original line number Diff line number Diff line
@@ -53,11 +53,10 @@ static inline void __udelay(unsigned long usecs) 
{

	unsigned long loops;



	/* (long long) cast ensures 64 bit MPY - real or emulated

	/* (u64) cast ensures 64 bit MPY - real or emulated

	 * HZ * 4295 is pre-evaluated by gcc - hence only 2 mpy ops

	 */

	loops = ((long long)(usecs * 4295 * HZ) *

		 (long long)(loops_per_jiffy)) >> 32;

	loops = ((u64) usecs * 4295 * HZ * loops_per_jiffy) >> 32;



	__delay(loops);

}

arch/arc/include/asm/entry.h

+23 −1
Original line number Diff line number Diff line
@@ -365,7 +365,7 @@ 
 * it to memory (non-SMP case) or SCRATCH0 Aux Reg (SMP).

 *

 * Before saving the full regfile - this reg is restored back, only

 * to be saved again on kernel mode stack, as part of ptregs.

 * to be saved again on kernel mode stack, as part of pt_regs.

 *-------------------------------------------------------------*/

.macro EXCPN_PROLOG_FREEUP_REG	reg

#ifdef CONFIG_SMP
@@ -383,6 +383,28 @@ 
#endif

.endm



/*--------------------------------------------------------------

 * Exception Entry prologue

 * -Switches stack to K mode (if not already)

 * -Saves the register file

 *

 * After this it is safe to call the "C" handlers

 *-------------------------------------------------------------*/

.macro EXCEPTION_PROLOGUE



	/* Need at least 1 reg to code the early exception prologue */

	EXCPN_PROLOG_FREEUP_REG r9



	/* U/K mode at time of exception (stack not switched if already K) */

	lr  r9, [erstatus]



	/* ARC700 doesn't provide auto-stack switching */

	SWITCH_TO_KERNEL_STK



	/* save the regfile */

	SAVE_ALL_SYS

.endm



/*--------------------------------------------------------------

 * Save all registers used by Exceptions (TLB Miss, Prot-V, Mem err etc)

 * Requires SP to be already switched to kernel mode Stack

arch/arc/include/asm/io.h

+4 −0
Original line number Diff line number Diff line
@@ -100,6 +100,10 @@ static inline void __raw_writel(u32 w, volatile void __iomem *addr) 


}



#define readb_relaxed readb

#define readw_relaxed readw

#define readl_relaxed readl



#include <asm-generic/io.h>



#endif /* _ASM_ARC_IO_H */