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

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

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

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [MIPS] Fix warning in mips-boards generic PCI
  [MIPS] SMTC: Synchronize cp0 counters on bootup.
  [MIPS] SMTC: Fix crash if # of TC's > # of VPE's after pt_regs irq cleanup.
  [MIPS] 16K & 64K page size fixes
parents f9dadfa7 67cac1eb

arch/mips/kernel/asm-offsets.c

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
#define offset(string, ptr, member) \

	__asm__("\n@@@" string "%0" : : "i" (_offset(ptr, member)))

#define constant(string, member) \

	__asm__("\n@@@" string "%x0" : : "ri" (member))

	__asm__("\n@@@" string "%X0" : : "ri" (member))

#define size(string, size) \

	__asm__("\n@@@" string "%0" : : "i" (sizeof(size)))

#define linefeed text("")

arch/mips/kernel/entry.S

+3 −0
Original line number Diff line number Diff line
@@ -83,7 +83,10 @@ FEXPORT(syscall_exit) 
FEXPORT(restore_all)			# restore full frame

#ifdef CONFIG_MIPS_MT_SMTC

/* Detect and execute deferred IPI "interrupts" */

	LONG_L	s0, TI_REGS($28)

	LONG_S	sp, TI_REGS($28)

	jal	deferred_smtc_ipi

	LONG_S	s0, TI_REGS($28)

/* Re-arm any temporarily masked interrupts not explicitly "acked" */

	mfc0	v0, CP0_TCSTATUS

	ori	v1, v0, TCSTATUS_IXMT

arch/mips/kernel/head.S

+2 −1
Original line number Diff line number Diff line
@@ -189,7 +189,8 @@ NESTED(kernel_entry, 16, sp) # kernel entry point 


	MTC0		zero, CP0_CONTEXT	# clear context register

	PTR_LA		$28, init_thread_union

	PTR_ADDIU	sp, $28, _THREAD_SIZE - 32

	PTR_LI		sp, _THREAD_SIZE - 32

	PTR_ADDU	sp, $28

	set_saved_sp	sp, t0, t1

	PTR_SUBU	sp, 4 * SZREG		# init stack pointer

arch/mips/kernel/r4k_switch.S

+5 −0
Original line number Diff line number Diff line
@@ -85,7 +85,12 @@ 
	move	$28, a2

	cpu_restore_nonscratch a1



#if (_THREAD_SIZE - 32) < 0x10000

	PTR_ADDIU	t0, $28, _THREAD_SIZE - 32

#else

	PTR_LI		t0, _THREAD_SIZE - 32

	PTR_ADDU	t0, $28

#endif

	set_saved_sp	t0, t1, t2

#ifdef CONFIG_MIPS_MT_SMTC

	/* Read-modify-writes of Status must be atomic on a VPE */

arch/mips/kernel/smtc-asm.S

+6 −1
Original line number Diff line number Diff line
@@ -101,7 +101,9 @@ FEXPORT(__smtc_ipi_vector) 
	lw	t0,PT_PADSLOT5(sp)

	/* Argument from sender passed in stack pad slot 4 */

	lw	a0,PT_PADSLOT4(sp)

	PTR_LA	ra, _ret_from_irq

	LONG_L	s0, TI_REGS($28)

	LONG_S	sp, TI_REGS($28)

	PTR_LA	ra, ret_from_irq

	jr	t0



/*
@@ -119,7 +121,10 @@ LEAF(self_ipi) 
	subu	t1,sp,PT_SIZE

	sw	ra,PT_EPC(t1)

	sw	a0,PT_PADSLOT4(t1)

	LONG_L	s0, TI_REGS($28)

	LONG_S	sp, TI_REGS($28)

	la	t2,ipi_decode

	LONG_S	s0, TI_REGS($28)

	sw	t2,PT_PADSLOT5(t1)

	/* Save pre-disable value of TCStatus */

	sw	t0,PT_TCSTATUS(t1)