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

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

Pull Sparc bugfixes from David Miller:
 "Four bug fixes:

   1) Enable snoop tags properly on Sparc32/LEON, from Andreas Larsson

   2) strcpy() length check fix from Chen Gang.

   3) Forgotten unregister_netdev() in sunvnet driver, from Dave
      Kleikamp.

   4) Fix broken assembler offsets used in vm_area_struct accesses on
      sparc32, from Olivier DANET."

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  [PATCH] sparc32: vm_area_struct access for old Sun SPARCs.
  sunvnet: vnet_port_remove must call unregister_netdev
  sparc32, leon: Require separate snoop tags set to regard snooping to be enabled
  arch: sparc: kernel: check the memory length before use strcpy().
parents 4ece92df 961246b4

arch/sparc/include/asm/leon.h

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ static inline int sparc_leon3_snooping_enabled(void) 
{

	u32 cctrl;

	__asm__ __volatile__("lda [%%g0] 2, %0\n\t" : "=r"(cctrl));

        return (cctrl >> 23) & 1;

	return ((cctrl >> 23) & 1) && ((cctrl >> 17) & 1);

};



static inline void sparc_leon3_disable_cache(void)

arch/sparc/kernel/asm-offsets.c

+2 −0
Original line number Diff line number Diff line
@@ -49,6 +49,8 @@ int foo(void) 
	DEFINE(AOFF_task_thread, offsetof(struct task_struct, thread));

	BLANK();

	DEFINE(AOFF_mm_context, offsetof(struct mm_struct, context));

	BLANK();

	DEFINE(VMA_VM_MM,    offsetof(struct vm_area_struct, vm_mm));



	/* DEFINE(NUM_USER_SEGMENTS, TASK_SIZE>>28); */

	return 0;

arch/sparc/kernel/ds.c

+10 −0
Original line number Diff line number Diff line
@@ -783,6 +783,16 @@ void ldom_set_var(const char *var, const char *value) 
		char  *base, *p;

		int msg_len, loops;



		if (strlen(var) + strlen(value) + 2 >

		    sizeof(pkt) - sizeof(pkt.header)) {

			printk(KERN_ERR PFX

				"contents length: %zu, which more than max: %lu,"

				"so could not set (%s) variable to (%s).\n",

				strlen(var) + strlen(value) + 2,

				sizeof(pkt) - sizeof(pkt.header), var, value);

			return;

		}



		memset(&pkt, 0, sizeof(pkt));

		pkt.header.data.tag.type = DS_DATA;

		pkt.header.data.handle = cp->handle;

arch/sparc/mm/hypersparc.S

+4 −4
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ hypersparc_flush_cache_mm_out: 


	/* The things we do for performance... */

hypersparc_flush_cache_range:

	ld	[%o0 + 0x0], %o0		/* XXX vma->vm_mm, GROSS XXX */

	ld	[%o0 + VMA_VM_MM], %o0

#ifndef CONFIG_SMP

	ld	[%o0 + AOFF_mm_context], %g1

	cmp	%g1, -1
@@ -163,7 +163,7 @@ hypersparc_flush_cache_range_out: 
	 */

	/* Verified, my ass... */

hypersparc_flush_cache_page:

	ld	[%o0 + 0x0], %o0		/* XXX vma->vm_mm, GROSS XXX */

	ld	[%o0 + VMA_VM_MM], %o0

	ld	[%o0 + AOFF_mm_context], %g2

#ifndef CONFIG_SMP

	cmp	%g2, -1
@@ -284,7 +284,7 @@ hypersparc_flush_tlb_mm_out: 
	 sta	%g5, [%g1] ASI_M_MMUREGS



hypersparc_flush_tlb_range:

	ld	[%o0 + 0x00], %o0	/* XXX vma->vm_mm GROSS XXX */

	ld	[%o0 + VMA_VM_MM], %o0

	mov	SRMMU_CTX_REG, %g1

	ld	[%o0 + AOFF_mm_context], %o3

	lda	[%g1] ASI_M_MMUREGS, %g5
@@ -307,7 +307,7 @@ hypersparc_flush_tlb_range_out: 
	 sta	%g5, [%g1] ASI_M_MMUREGS



hypersparc_flush_tlb_page:

	ld	[%o0 + 0x00], %o0	/* XXX vma->vm_mm GROSS XXX */

	ld	[%o0 + VMA_VM_MM], %o0

	mov	SRMMU_CTX_REG, %g1

	ld	[%o0 + AOFF_mm_context], %o3

	andn	%o1, (PAGE_SIZE - 1), %o1

arch/sparc/mm/swift.S

+4 −4
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ swift_flush_cache_mm_out: 


	.globl	swift_flush_cache_range

swift_flush_cache_range:

	ld	[%o0 + 0x0], %o0		/* XXX vma->vm_mm, GROSS XXX */

	ld	[%o0 + VMA_VM_MM], %o0

	sub	%o2, %o1, %o2

	sethi	%hi(4096), %o3

	cmp	%o2, %o3
@@ -116,7 +116,7 @@ swift_flush_cache_range: 


	.globl	swift_flush_cache_page

swift_flush_cache_page:

	ld	[%o0 + 0x0], %o0		/* XXX vma->vm_mm, GROSS XXX */

	ld	[%o0 + VMA_VM_MM], %o0

70:

	ld	[%o0 + AOFF_mm_context], %g2

	cmp	%g2, -1
@@ -219,7 +219,7 @@ swift_flush_sig_insns: 
	.globl	swift_flush_tlb_range

	.globl	swift_flush_tlb_all

swift_flush_tlb_range:

	ld	[%o0 + 0x00], %o0	/* XXX vma->vm_mm GROSS XXX */

	ld	[%o0 + VMA_VM_MM], %o0

swift_flush_tlb_mm:

	ld	[%o0 + AOFF_mm_context], %g2

	cmp	%g2, -1
@@ -233,7 +233,7 @@ swift_flush_tlb_all_out: 


	.globl	swift_flush_tlb_page

swift_flush_tlb_page:

	ld	[%o0 + 0x00], %o0	/* XXX vma->vm_mm GROSS XXX */

	ld	[%o0 + VMA_VM_MM], %o0

	mov	SRMMU_CTX_REG, %g1

	ld	[%o0 + AOFF_mm_context], %o3

	andn	%o1, (PAGE_SIZE - 1), %o1

CRA Git | Maintained and supported by SUSTech CRA and CCSE