Commit 1ee1ceaf authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc 

Pull sparc fixes from David Miller:
 "A small bunch of bug fixes, in particular:

   1) On older cpus we need a different chunk of virtual address space
      to map the huge page TSB.

   2) Missing memory barrier in Niagara2 memcpy.

   3) trinity showed some places where fault validation was
      unnecessarily loud on sparc64

   4) Some sysfs printf's need a type adjustment, from Toralf Förster"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc64: fix format string mismatch in arch/sparc/kernel/sysfs.c
  sparc64: Add membar to Niagara2 memcpy code.
  sparc64: Fix huge TSB mapping on pre-UltraSPARC-III cpus.
  sparc64: Don't bark so loudly about 32-bit tasks generating 64-bit fault addresses.
parents 5fa6a683 8ecc1bad

arch/sparc/include/asm/pgtable_64.h

+4 −2
Original line number Diff line number Diff line
@@ -24,7 +24,8 @@ 


/* The kernel image occupies 0x4000000 to 0x6000000 (4MB --> 96MB).

 * The page copy blockops can use 0x6000000 to 0x8000000.

 * The TSB is mapped in the 0x8000000 to 0xa000000 range.

 * The 8K TSB is mapped in the 0x8000000 to 0x8400000 range.

 * The 4M TSB is mapped in the 0x8400000 to 0x8800000 range.

 * The PROM resides in an area spanning 0xf0000000 to 0x100000000.

 * The vmalloc area spans 0x100000000 to 0x200000000.

 * Since modules need to be in the lowest 32-bits of the address space,
@@ -33,7 +34,8 @@ 
 * 0x400000000.

 */

#define	TLBTEMP_BASE		_AC(0x0000000006000000,UL)

#define	TSBMAP_BASE		_AC(0x0000000008000000,UL)

#define	TSBMAP_8K_BASE		_AC(0x0000000008000000,UL)

#define	TSBMAP_4M_BASE		_AC(0x0000000008400000,UL)

#define MODULES_VADDR		_AC(0x0000000010000000,UL)

#define MODULES_LEN		_AC(0x00000000e0000000,UL)

#define MODULES_END		_AC(0x00000000f0000000,UL)

arch/sparc/kernel/sysfs.c

+1 −1
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ static ssize_t store_mmustat_enable(struct device *s, 
			size_t count)

{

	unsigned long val, err;

	int ret = sscanf(buf, "%ld", &val);

	int ret = sscanf(buf, "%lu", &val);



	if (ret != 1)

		return -EINVAL;

arch/sparc/lib/NG2memcpy.S

+1 −0
Original line number Diff line number Diff line
@@ -236,6 +236,7 @@ FUNC_NAME: /* %o0=dst, %o1=src, %o2=len */ 
	 */

	VISEntryHalf



	membar		#Sync

	alignaddr	%o1, %g0, %g0



	add		%o1, (64 - 1), %o4

arch/sparc/mm/fault_64.c

+1 −15
Original line number Diff line number Diff line
@@ -281,18 +281,6 @@ static void noinline __kprobes bogus_32bit_fault_tpc(struct pt_regs *regs) 
	show_regs(regs);

}



static void noinline __kprobes bogus_32bit_fault_address(struct pt_regs *regs,

							 unsigned long addr)

{

	static int times;



	if (times++ < 10)

		printk(KERN_ERR "FAULT[%s:%d]: 32-bit process "

		       "reports 64-bit fault address [%lx]\n",

		       current->comm, current->pid, addr);

	show_regs(regs);

}



asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs)

{

	enum ctx_state prev_state = exception_enter();
@@ -322,11 +310,9 @@ asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs) 
				goto intr_or_no_mm;

			}

		}

		if (unlikely((address >> 32) != 0)) {

			bogus_32bit_fault_address(regs, address);

		if (unlikely((address >> 32) != 0))

			goto intr_or_no_mm;

	}

	}



	if (regs->tstate & TSTATE_PRIV) {

		unsigned long tpc = regs->tpc;

arch/sparc/mm/tsb.c

+13 −1
Original line number Diff line number Diff line
@@ -133,7 +133,19 @@ static void setup_tsb_params(struct mm_struct *mm, unsigned long tsb_idx, unsign 
	mm->context.tsb_block[tsb_idx].tsb_nentries =

		tsb_bytes / sizeof(struct tsb);



	base = TSBMAP_BASE;

	switch (tsb_idx) {

	case MM_TSB_BASE:

		base = TSBMAP_8K_BASE;

		break;

#if defined(CONFIG_HUGETLB_PAGE) || defined(CONFIG_TRANSPARENT_HUGEPAGE)

	case MM_TSB_HUGE:

		base = TSBMAP_4M_BASE;

		break;

#endif

	default:

		BUG();

	}



	tte = pgprot_val(PAGE_KERNEL_LOCKED);

	tsb_paddr = __pa(mm->context.tsb_block[tsb_idx].tsb);

	BUG_ON(tsb_paddr & (tsb_bytes - 1UL));

CRA Git | Maintained and supported by SUSTech CRA and CCSE