Commit b3ee4edd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus 

Pull MIPS fixes from Ralf Baechle:

 - Three highmem fixes:
    + Fixed mapping initialization
    + Adjust the pkmap location
    + Ensure we use at most one page for PTEs

 - Fix makefile dependencies for .its targets to depend on vmlinux

 - Fix reversed condition in BNEZC and JIALC software branch emulation

 - Only flush initialized flush_insn_slot to avoid NULL pointer
   dereference

 - perf: Remove incorrect odd/even counter handling for I6400

 - ftrace: Fix init functions tracing

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
  MIPS: .its targets depend on vmlinux
  MIPS: Fix bnezc/jialc return address calculation
  MIPS: kprobes: flush_insn_slot should flush only if probe initialised
  MIPS: ftrace: fix init functions tracing
  MIPS: mm: adjust PKMAP location
  MIPS: highmem: ensure that we don't use more than one page for PTEs
  MIPS: mm: fixed mappings: correct initialisation
  MIPS: perf: Remove incorrect odd/even counter handling for I6400
parents edf9364d bcd7c45e

arch/mips/boot/Makefile

+5 −5
Original line number Diff line number Diff line
@@ -128,19 +128,19 @@ quiet_cmd_cpp_its_S = ITS $@ 
			-DADDR_BITS=$(ADDR_BITS) \

			-DADDR_CELLS=$(itb_addr_cells)



$(obj)/vmlinux.its: $(srctree)/arch/mips/$(PLATFORM)/vmlinux.its.S FORCE

$(obj)/vmlinux.its: $(srctree)/arch/mips/$(PLATFORM)/vmlinux.its.S $(VMLINUX) FORCE

	$(call if_changed_dep,cpp_its_S,none,vmlinux.bin)



$(obj)/vmlinux.gz.its: $(srctree)/arch/mips/$(PLATFORM)/vmlinux.its.S FORCE

$(obj)/vmlinux.gz.its: $(srctree)/arch/mips/$(PLATFORM)/vmlinux.its.S $(VMLINUX) FORCE

	$(call if_changed_dep,cpp_its_S,gzip,vmlinux.bin.gz)



$(obj)/vmlinux.bz2.its: $(srctree)/arch/mips/$(PLATFORM)/vmlinux.its.S FORCE

$(obj)/vmlinux.bz2.its: $(srctree)/arch/mips/$(PLATFORM)/vmlinux.its.S $(VMLINUX)  FORCE

	$(call if_changed_dep,cpp_its_S,bzip2,vmlinux.bin.bz2)



$(obj)/vmlinux.lzma.its: $(srctree)/arch/mips/$(PLATFORM)/vmlinux.its.S FORCE

$(obj)/vmlinux.lzma.its: $(srctree)/arch/mips/$(PLATFORM)/vmlinux.its.S $(VMLINUX) FORCE

	$(call if_changed_dep,cpp_its_S,lzma,vmlinux.bin.lzma)



$(obj)/vmlinux.lzo.its: $(srctree)/arch/mips/$(PLATFORM)/vmlinux.its.S FORCE

$(obj)/vmlinux.lzo.its: $(srctree)/arch/mips/$(PLATFORM)/vmlinux.its.S $(VMLINUX) FORCE

	$(call if_changed_dep,cpp_its_S,lzo,vmlinux.bin.lzo)



quiet_cmd_itb-image = ITB     $@

arch/mips/include/asm/highmem.h

+5 −0
Original line number Diff line number Diff line
@@ -35,7 +35,12 @@ extern pte_t *pkmap_page_table; 
 * easily, subsequent pte tables have to be allocated in one physical

 * chunk of RAM.

 */

#ifdef CONFIG_PHYS_ADDR_T_64BIT

#define LAST_PKMAP 512

#else

#define LAST_PKMAP 1024

#endif



#define LAST_PKMAP_MASK (LAST_PKMAP-1)

#define PKMAP_NR(virt)	((virt-PKMAP_BASE) >> PAGE_SHIFT)

#define PKMAP_ADDR(nr)	(PKMAP_BASE + ((nr) << PAGE_SHIFT))

arch/mips/include/asm/kprobes.h

+2 −1
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ typedef union mips_instruction kprobe_opcode_t; 


#define flush_insn_slot(p)						\

do {									\

	if (p->addr)							\

		flush_icache_range((unsigned long)p->addr,		\

			   (unsigned long)p->addr +			\

			   (MAX_INSN_SIZE * sizeof(kprobe_opcode_t)));	\

arch/mips/include/asm/pgtable-32.h

+6 −1
Original line number Diff line number Diff line
@@ -19,6 +19,10 @@ 
#define __ARCH_USE_5LEVEL_HACK

#include <asm-generic/pgtable-nopmd.h>



#ifdef CONFIG_HIGHMEM

#include <asm/highmem.h>

#endif



extern int temp_tlb_entry;



/*
@@ -62,7 +66,8 @@ extern int add_temporary_entry(unsigned long entrylo0, unsigned long entrylo1, 


#define VMALLOC_START	  MAP_BASE



#define PKMAP_BASE		(0xfe000000UL)

#define PKMAP_END	((FIXADDR_START) & ~((LAST_PKMAP << PAGE_SHIFT)-1))

#define PKMAP_BASE	(PKMAP_END - PAGE_SIZE * LAST_PKMAP)



#ifdef CONFIG_HIGHMEM

# define VMALLOC_END	(PKMAP_BASE-2*PAGE_SIZE)

arch/mips/kernel/branch.c

+3 −1
Original line number Diff line number Diff line
@@ -804,8 +804,10 @@ int __compute_return_epc_for_insn(struct pt_regs *regs, 
			break;

		}

		/* Compact branch: BNEZC || JIALC */

		if (insn.i_format.rs)

		if (!insn.i_format.rs) {

			/* JIALC: set $31/ra */

			regs->regs[31] = epc + 4;

		}

		regs->cp0_epc += 8;

		break;

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE