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

Commit 554e6e9f 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:
 "MIPS fixes across the field.  The only area that's standing out is the
  exception handling which received it's dose of breakage as part of the
  microMIPS patchset"

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
  MIPS: ralink: add missing SZ_1M multiplier
  MIPS: Compat: Fix cputime_to_timeval() arguments in compat binfmt_elf.
  MIPS: OCTEON: Improve _machine_halt implementation.
  MIPS: rtlx: Fix implicit declaration of function set_vi_handler()
  MIPS: Trap exception handling fixes
  MIPS: Quit exposing Kconfig symbols in uapi headers.
  MIPS: Remove duplicate definition of check_for_high_segbits.
parents 17d8dfcd cdfce539

arch/mips/cavium-octeon/setup.c

+9 −6
Original line number Diff line number Diff line
@@ -428,13 +428,16 @@ static void octeon_restart(char *command) 
 */

static void octeon_kill_core(void *arg)

{

	mb();

	if (octeon_is_simulation()) {

		/* The simulator needs the watchdog to stop for dead cores */

		cvmx_write_csr(CVMX_CIU_WDOGX(cvmx_get_core_num()), 0);

	if (octeon_is_simulation())

		/* A break instruction causes the simulator stop a core */

		asm volatile ("sync\nbreak");

	}

		asm volatile ("break" ::: "memory");



	local_irq_disable();

	/* Disable watchdog on this core. */

	cvmx_write_csr(CVMX_CIU_WDOGX(cvmx_get_core_num()), 0);

	/* Spin in a low power mode. */

	while (true)

		asm volatile ("wait" ::: "memory");

}

arch/mips/include/asm/ptrace.h

+32 −0
Original line number Diff line number Diff line
@@ -16,6 +16,38 @@ 
#include <asm/isadep.h>

#include <uapi/asm/ptrace.h>



/*

 * This struct defines the way the registers are stored on the stack during a

 * system call/exception. As usual the registers k0/k1 aren't being saved.

 */

struct pt_regs {

#ifdef CONFIG_32BIT

	/* Pad bytes for argument save space on the stack. */

	unsigned long pad0[6];

#endif



	/* Saved main processor registers. */

	unsigned long regs[32];



	/* Saved special registers. */

	unsigned long cp0_status;

	unsigned long hi;

	unsigned long lo;

#ifdef CONFIG_CPU_HAS_SMARTMIPS

	unsigned long acx;

#endif

	unsigned long cp0_badvaddr;

	unsigned long cp0_cause;

	unsigned long cp0_epc;

#ifdef CONFIG_MIPS_MT_SMTC

	unsigned long cp0_tcstatus;

#endif /* CONFIG_MIPS_MT_SMTC */

#ifdef CONFIG_CPU_CAVIUM_OCTEON

	unsigned long long mpl[3];	  /* MTM{0,1,2} */

	unsigned long long mtp[3];	  /* MTP{0,1,2} */

#endif

} __aligned(8);



struct task_struct;



extern int ptrace_getregs(struct task_struct *child, __s64 __user *data);

arch/mips/include/uapi/asm/ptrace.h

+2 −15
Original line number Diff line number Diff line
@@ -22,16 +22,12 @@ 
#define DSP_CONTROL	77

#define ACX		78



#ifndef __KERNEL__

/*

 * This struct defines the way the registers are stored on the stack during a

 * system call/exception. As usual the registers k0/k1 aren't being saved.

 */

struct pt_regs {

#ifdef CONFIG_32BIT

	/* Pad bytes for argument save space on the stack. */

	unsigned long pad0[6];

#endif



	/* Saved main processor registers. */

	unsigned long regs[32];
@@ -39,20 +35,11 @@ struct pt_regs { 
	unsigned long cp0_status;

	unsigned long hi;

	unsigned long lo;

#ifdef CONFIG_CPU_HAS_SMARTMIPS

	unsigned long acx;

#endif

	unsigned long cp0_badvaddr;

	unsigned long cp0_cause;

	unsigned long cp0_epc;

#ifdef CONFIG_MIPS_MT_SMTC

	unsigned long cp0_tcstatus;

#endif /* CONFIG_MIPS_MT_SMTC */

#ifdef CONFIG_CPU_CAVIUM_OCTEON

	unsigned long long mpl[3];	  /* MTM{0,1,2} */

	unsigned long long mtp[3];	  /* MTP{0,1,2} */

#endif

} __attribute__ ((aligned (8)));

#endif /* __KERNEL__ */



/* Arbitrarily choose the same ptrace numbers as used by the Sparc code. */

#define PTRACE_GETREGS		12

arch/mips/kernel/binfmt_elfn32.c

+11 −0
Original line number Diff line number Diff line
@@ -119,4 +119,15 @@ MODULE_AUTHOR("Ralf Baechle (ralf@linux-mips.org)"); 
#undef TASK_SIZE

#define TASK_SIZE TASK_SIZE32



#undef cputime_to_timeval

#define cputime_to_timeval cputime_to_compat_timeval

static __inline__ void

cputime_to_compat_timeval(const cputime_t cputime, struct compat_timeval *value)

{

	unsigned long jiffies = cputime_to_jiffies(cputime);



	value->tv_usec = (jiffies % HZ) * (1000000L / HZ);

	value->tv_sec = jiffies / HZ;

}



#include "../../../fs/binfmt_elf.c"

arch/mips/kernel/binfmt_elfo32.c

+11 −0
Original line number Diff line number Diff line
@@ -162,4 +162,15 @@ MODULE_AUTHOR("Ralf Baechle (ralf@linux-mips.org)"); 
#undef TASK_SIZE

#define TASK_SIZE TASK_SIZE32



#undef cputime_to_timeval

#define cputime_to_timeval cputime_to_compat_timeval

static __inline__ void

cputime_to_compat_timeval(const cputime_t cputime, struct compat_timeval *value)

{

	unsigned long jiffies = cputime_to_jiffies(cputime);



	value->tv_usec = (jiffies % HZ) * (1000000L / HZ);

	value->tv_sec = jiffies / HZ;

}



#include "../../../fs/binfmt_elf.c"