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

Commit 8be7eb35 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile 

* 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
  arch/tile: fix formatting bug in register dumps
  arch/tile: fix memcpy_fromio()/memcpy_toio() signatures
  arch/tile: Save and restore extra user state for tilegx
  arch/tile: Change struct sigcontext to be more useful
  arch/tile: finish const-ifying sys_execve()
parents 3a919cf0 7040dea4

arch/tile/include/arch/chip_tile64.h

+3 −0
Original line number Diff line number Diff line
@@ -150,6 +150,9 @@ 
/** Is the PROC_STATUS SPR supported? */

#define CHIP_HAS_PROC_STATUS_SPR() 0



/** Is the DSTREAM_PF SPR supported? */

#define CHIP_HAS_DSTREAM_PF() 0



/** Log of the number of mshims we have. */

#define CHIP_LOG_NUM_MSHIMS() 2

arch/tile/include/arch/chip_tilepro.h

+3 −0
Original line number Diff line number Diff line
@@ -150,6 +150,9 @@ 
/** Is the PROC_STATUS SPR supported? */

#define CHIP_HAS_PROC_STATUS_SPR() 1



/** Is the DSTREAM_PF SPR supported? */

#define CHIP_HAS_DSTREAM_PF() 0



/** Log of the number of mshims we have. */

#define CHIP_LOG_NUM_MSHIMS() 2

arch/tile/include/asm/compat.h

+3 −2
Original line number Diff line number Diff line
@@ -214,8 +214,9 @@ extern int compat_setup_rt_frame(int sig, struct k_sigaction *ka, 
struct compat_sigaction;

struct compat_siginfo;

struct compat_sigaltstack;

long compat_sys_execve(char __user *path, compat_uptr_t __user *argv,

		       compat_uptr_t __user *envp);

long compat_sys_execve(const char __user *path,

		       const compat_uptr_t __user *argv,

		       const compat_uptr_t __user *envp);

long compat_sys_rt_sigaction(int sig, struct compat_sigaction __user *act,

			     struct compat_sigaction __user *oact,

			     size_t sigsetsize);

arch/tile/include/asm/io.h

+4 −4
Original line number Diff line number Diff line
@@ -164,22 +164,22 @@ static inline void _tile_writeq(u64 val, unsigned long addr) 
#define iowrite32 writel

#define iowrite64 writeq



static inline void *memcpy_fromio(void *dst, void *src, int len)

static inline void memcpy_fromio(void *dst, const volatile void __iomem *src,

				 size_t len)

{

	int x;

	BUG_ON((unsigned long)src & 0x3);

	for (x = 0; x < len; x += 4)

		*(u32 *)(dst + x) = readl(src + x);

	return dst;

}



static inline void *memcpy_toio(void *dst, void *src, int len)

static inline void memcpy_toio(volatile void __iomem *dst, const void *src,

				size_t len)

{

	int x;

	BUG_ON((unsigned long)dst & 0x3);

	for (x = 0; x < len; x += 4)

		writel(*(u32 *)(src + x), dst + x);

	return dst;

}



/*

arch/tile/include/asm/processor.h

+12 −0
Original line number Diff line number Diff line
@@ -103,6 +103,18 @@ struct thread_struct { 
	/* Any other miscellaneous processor state bits */

	unsigned long proc_status;

#endif

#if !CHIP_HAS_FIXED_INTVEC_BASE()

	/* Interrupt base for PL0 interrupts */

	unsigned long interrupt_vector_base;

#endif

#if CHIP_HAS_TILE_RTF_HWM()

	/* Tile cache retry fifo high-water mark */

	unsigned long tile_rtf_hwm;

#endif

#if CHIP_HAS_DSTREAM_PF()

	/* Data stream prefetch control */

	unsigned long dstream_pf;

#endif

#ifdef CONFIG_HARDWALL

	/* Is this task tied to an activated hardwall? */

	struct hardwall_info *hardwall;