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

Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile 

Pull tile architecture updates from Chris Metcalf:
 "A few stray changes"

* git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
  tile: Define AT_VECTOR_SIZE_ARCH for ARCH_DLINFO
  tile: support gcc 7 optimization to use __multi3
  tile 32-bit big-endian: fix bugs in syscall argument order
  tile: allow disabling CONFIG_EARLY_PRINTK
parents ba4f6789 cdf8b463

arch/tile/include/asm/elf.h

+1 −0
Original line number Diff line number Diff line
@@ -129,6 +129,7 @@ extern int dump_task_regs(struct task_struct *, elf_gregset_t *); 
struct linux_binprm;

extern int arch_setup_additional_pages(struct linux_binprm *bprm,

				       int executable_stack);

/* update AT_VECTOR_SIZE_ARCH if the number of NEW_AUX_ENT entries changes */

#define ARCH_DLINFO \

do { \

	NEW_AUX_ENT(AT_SYSINFO_EHDR, VDSO_BASE); \

arch/tile/include/asm/setup.h

+5 −0
Original line number Diff line number Diff line
@@ -25,7 +25,12 @@ 
#define MAXMEM_PFN	PFN_DOWN(MAXMEM)



int tile_console_write(const char *buf, int count);



#ifdef CONFIG_EARLY_PRINTK

void early_panic(const char *fmt, ...);

#else

#define early_panic panic

#endif



/* Init-time routine to do tile-specific per-cpu setup. */

void setup_cpu(int boot);

arch/tile/include/uapi/asm/auxvec.h

+2 −0
Original line number Diff line number Diff line
@@ -18,4 +18,6 @@ 
/* The vDSO location. */

#define AT_SYSINFO_EHDR         33



#define AT_VECTOR_SIZE_ARCH 1 /* entries in ARCH_DLINFO */



#endif /* _ASM_TILE_AUXVEC_H */

arch/tile/kernel/compat.c

+22 −13
Original line number Diff line number Diff line
@@ -23,42 +23,50 @@ 
#include <linux/uaccess.h>

#include <linux/signal.h>

#include <asm/syscalls.h>

#include <asm/byteorder.h>



/*

 * Syscalls that take 64-bit numbers traditionally take them in 32-bit

 * "high" and "low" value parts on 32-bit architectures.

 * In principle, one could imagine passing some register arguments as

 * fully 64-bit on TILE-Gx in 32-bit mode, but it seems easier to

 * adapt the usual convention.

 * adopt the usual convention.

 */



#ifdef __BIG_ENDIAN

#define SYSCALL_PAIR(name) u32, name ## _hi, u32, name ## _lo

#else

#define SYSCALL_PAIR(name) u32, name ## _lo, u32, name ## _hi

#endif



COMPAT_SYSCALL_DEFINE4(truncate64, char __user *, filename, u32, dummy,

                       u32, low, u32, high)

		       SYSCALL_PAIR(length))

{

	return sys_truncate(filename, ((loff_t)high << 32) | low);

	return sys_truncate(filename, ((loff_t)length_hi << 32) | length_lo);

}



COMPAT_SYSCALL_DEFINE4(ftruncate64, unsigned int, fd, u32, dummy,

                       u32, low, u32, high)

		       SYSCALL_PAIR(length))

{

	return sys_ftruncate(fd, ((loff_t)high << 32) | low);

	return sys_ftruncate(fd, ((loff_t)length_hi << 32) | length_lo);

}



COMPAT_SYSCALL_DEFINE6(pread64, unsigned int, fd, char __user *, ubuf,

                       size_t, count, u32, dummy, u32, low, u32, high)

		       size_t, count, u32, dummy, SYSCALL_PAIR(offset))

{

	return sys_pread64(fd, ubuf, count, ((loff_t)high << 32) | low);

	return sys_pread64(fd, ubuf, count,

			   ((loff_t)offset_hi << 32) | offset_lo);

}



COMPAT_SYSCALL_DEFINE6(pwrite64, unsigned int, fd, char __user *, ubuf,

                       size_t, count, u32, dummy, u32, low, u32, high)

		       size_t, count, u32, dummy, SYSCALL_PAIR(offset))

{

	return sys_pwrite64(fd, ubuf, count, ((loff_t)high << 32) | low);

	return sys_pwrite64(fd, ubuf, count,

			    ((loff_t)offset_hi << 32) | offset_lo);

}



COMPAT_SYSCALL_DEFINE6(sync_file_range2, int, fd, unsigned int, flags,

                       u32, offset_lo, u32, offset_hi,

                       u32, nbytes_lo, u32, nbytes_hi)

		       SYSCALL_PAIR(offset), SYSCALL_PAIR(nbytes))

{

	return sys_sync_file_range(fd, ((loff_t)offset_hi << 32) | offset_lo,

				   ((loff_t)nbytes_hi << 32) | nbytes_lo,
@@ -66,8 +74,7 @@ COMPAT_SYSCALL_DEFINE6(sync_file_range2, int, fd, unsigned int, flags, 
}



COMPAT_SYSCALL_DEFINE6(fallocate, int, fd, int, mode,

                       u32, offset_lo, u32, offset_hi,

                       u32, len_lo, u32, len_hi)

		       SYSCALL_PAIR(offset), SYSCALL_PAIR(len))

{

	return sys_fallocate(fd, mode, ((loff_t)offset_hi << 32) | offset_lo,

			     ((loff_t)len_hi << 32) | len_lo);
@@ -77,6 +84,8 @@ COMPAT_SYSCALL_DEFINE6(fallocate, int, fd, int, mode, 
 * Avoid bug in generic sys_llseek() that specifies offset_high and

 * offset_low as "unsigned long", thus making it possible to pass

 * a sign-extended high 32 bits in offset_low.

 * Note that we do not use SYSCALL_PAIR here since glibc passes the

 * high and low parts explicitly in that order.

 */

COMPAT_SYSCALL_DEFINE5(llseek, unsigned int, fd, unsigned int, offset_high,

		       unsigned int, offset_low, loff_t __user *, result,

arch/tile/kernel/sys.c

+10 −3
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include <asm/pgtable.h>

#include <asm/homecache.h>

#include <asm/cachectl.h>

#include <asm/byteorder.h>

#include <arch/chip.h>



SYSCALL_DEFINE3(cacheflush, unsigned long, addr, unsigned long, len,
@@ -59,13 +60,19 @@ SYSCALL_DEFINE3(cacheflush, unsigned long, addr, unsigned long, len, 


#if !defined(__tilegx__) || defined(CONFIG_COMPAT)



ssize_t sys32_readahead(int fd, u32 offset_lo, u32 offset_hi, u32 count)

#ifdef __BIG_ENDIAN

#define SYSCALL_PAIR(name) u32 name ## _hi, u32 name ## _lo

#else

#define SYSCALL_PAIR(name) u32 name ## _lo, u32 name ## _hi

#endif



ssize_t sys32_readahead(int fd, SYSCALL_PAIR(offset), u32 count)

{

	return sys_readahead(fd, ((loff_t)offset_hi << 32) | offset_lo, count);

}



int sys32_fadvise64_64(int fd, u32 offset_lo, u32 offset_hi,

		       u32 len_lo, u32 len_hi, int advice)

int sys32_fadvise64_64(int fd, SYSCALL_PAIR(offset),

		       SYSCALL_PAIR(len), int advice)

{

	return sys_fadvise64_64(fd, ((loff_t)offset_hi << 32) | offset_lo,

				((loff_t)len_hi << 32) | len_lo, advice);

CRA Git | Maintained and supported by SUSTech CRA and CCSE