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

Commit 24c82fbb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'parisc-4.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux 

Pull parisc updates from Helge Deller:

 - Add native high-resolution timing code for sched_clock() and other
   timing functions based on the processor internal cr16 cycle counters

 - Add syscall tracepoint support

 - Add regset support

 - Speed up get_user() and put_user() functions

 - Updated futex.h to match generic implementation (John David Anglin)

 - A few smaller ftrace build fixes

 - Fixed thuge-gen kernel self test to utilize architectured MAP_HUGETLB
   value

 - Added parisc architecture to seccomp_bpf kernel self test

 - Various typo fixes (Andrea Gelmini)

* 'parisc-4.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: Whitespace cleanups in unistd.h
  parisc: Use long jump to reach ftrace_return_to_handler()
  parisc: Fix typo in fpudispatch.c
  parisc: Fix typos in eisa_eeprom.h
  parisc: Fix typo in ldcw.h
  parisc: Fix typo in pdc.h
  parisc: Update futex.h to match generic implementation
  parisc: Merge ftrace C-helper and assembler functions into .text.hot section
  selftests/thuge-gen: Use platform specific MAP_HUGETLB value
  parisc: Add native high-resolution sched_clock() implementation
  parisc: Add ARCH_TRACEHOOK and regset support
  parisc: Add 64bit get_user() and put_user() for 32bit kernel
  parisc: Simplify and speed up get_user() and put_user()
  parisc: Add syscall tracepoint support
parents 28165ec7 784c2213

arch/parisc/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ config PARISC 
	select HAVE_OPROFILE

	select HAVE_FUNCTION_TRACER

	select HAVE_FUNCTION_GRAPH_TRACER

	select HAVE_SYSCALL_TRACEPOINTS

	select ARCH_WANT_FRAME_POINTERS

	select RTC_CLASS

	select RTC_DRV_GENERIC
@@ -31,6 +32,8 @@ config PARISC 
	select HAVE_DEBUG_STACKOVERFLOW

	select HAVE_ARCH_AUDITSYSCALL

	select HAVE_ARCH_SECCOMP_FILTER

	select HAVE_ARCH_TRACEHOOK

	select HAVE_UNSTABLE_SCHED_CLOCK if (SMP || !64BIT)

	select ARCH_NO_COHERENT_DMA_MMAP

	select CPU_NO_EFFICIENT_FFS

arch/parisc/include/asm/cmpxchg.h

+5 −4
Original line number Diff line number Diff line
@@ -52,8 +52,7 @@ extern void __cmpxchg_called_with_bad_pointer(void); 
/* __cmpxchg_u32/u64 defined in arch/parisc/lib/bitops.c */

extern unsigned long __cmpxchg_u32(volatile unsigned int *m, unsigned int old,

				   unsigned int new_);

extern unsigned long __cmpxchg_u64(volatile unsigned long *ptr,

				   unsigned long old, unsigned long new_);

extern u64 __cmpxchg_u64(volatile u64 *ptr, u64 old, u64 new_);



/* don't worry...optimizer will get rid of most of this */

static inline unsigned long
@@ -61,7 +60,7 @@ __cmpxchg(volatile void *ptr, unsigned long old, unsigned long new_, int size) 
{

	switch (size) {

#ifdef CONFIG_64BIT

	case 8: return __cmpxchg_u64((unsigned long *)ptr, old, new_);

	case 8: return __cmpxchg_u64((u64 *)ptr, old, new_);

#endif

	case 4: return __cmpxchg_u32((unsigned int *)ptr,

				     (unsigned int)old, (unsigned int)new_);
@@ -86,7 +85,7 @@ static inline unsigned long __cmpxchg_local(volatile void *ptr, 
{

	switch (size) {

#ifdef CONFIG_64BIT

	case 8:	return __cmpxchg_u64((unsigned long *)ptr, old, new_);

	case 8:	return __cmpxchg_u64((u64 *)ptr, old, new_);

#endif

	case 4:	return __cmpxchg_u32(ptr, old, new_);

	default:
@@ -111,4 +110,6 @@ static inline unsigned long __cmpxchg_local(volatile void *ptr, 
#define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n))

#endif



#define cmpxchg64(ptr, o, n) __cmpxchg_u64(ptr, o, n)



#endif /* _ASM_PARISC_CMPXCHG_H_ */

arch/parisc/include/asm/eisa_eeprom.h

+2 −2
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ struct eeprom_eisa_slot_info 
#define HPEE_MEMORY_DECODE_24BITS 0x04

#define HPEE_MEMORY_DECODE_32BITS 0x08

/* byte 2 and 3 are a 16bit LE value

 * containging the memory size in kilobytes */

 * containing the memory size in kilobytes */

/* byte 4,5,6 are a 24bit LE value

 * containing the memory base address */
@@ -135,7 +135,7 @@ struct eeprom_eisa_slot_info 
#define HPEE_PORT_SHARED    0x40

#define HPEE_PORT_MORE      0x80

/* byte 1 and 2 is a 16bit LE value

 * conating the start port number */

 * containing the start port number */



#define HPEE_PORT_INIT_MAX_LEN     60 /* in bytes here */

/* port init entry byte 0 */

arch/parisc/include/asm/ftrace.h

+2 −0
Original line number Diff line number Diff line
@@ -6,6 +6,8 @@ extern void mcount(void); 


#define MCOUNT_INSN_SIZE 4



extern unsigned long sys_call_table[];



extern unsigned long return_address(unsigned int);



#define ftrace_return_address(n) return_address(n)

arch/parisc/include/asm/futex.h

+29 −41
Original line number Diff line number Diff line
@@ -35,70 +35,57 @@ static inline int 
futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr)

{

	unsigned long int flags;

	u32 val;

	int op = (encoded_op >> 28) & 7;

	int cmp = (encoded_op >> 24) & 15;

	int oparg = (encoded_op << 8) >> 20;

	int cmparg = (encoded_op << 20) >> 20;

	int oldval = 0, ret;

	int oldval, ret;

	u32 tmp;



	if (encoded_op & (FUTEX_OP_OPARG_SHIFT << 28))

		oparg = 1 << oparg;



	if (!access_ok(VERIFY_WRITE, uaddr, sizeof(*uaddr)))

		return -EFAULT;



	_futex_spin_lock_irqsave(uaddr, &flags);

	pagefault_disable();



	_futex_spin_lock_irqsave(uaddr, &flags);

	ret = -EFAULT;

	if (unlikely(get_user(oldval, uaddr) != 0))

		goto out_pagefault_enable;



	ret = 0;

	tmp = oldval;



	switch (op) {

	case FUTEX_OP_SET:

		/* *(int *)UADDR2 = OPARG; */

		ret = get_user(oldval, uaddr);

		if (!ret)

			ret = put_user(oparg, uaddr);

		tmp = oparg;

		break;

	case FUTEX_OP_ADD:

		/* *(int *)UADDR2 += OPARG; */

		ret = get_user(oldval, uaddr);

		if (!ret) {

			val = oldval + oparg;

			ret = put_user(val, uaddr);

		}

		tmp += oparg;

		break;

	case FUTEX_OP_OR:

		/* *(int *)UADDR2 |= OPARG; */

		ret = get_user(oldval, uaddr);

		if (!ret) {

			val = oldval | oparg;

			ret = put_user(val, uaddr);

		}

		tmp |= oparg;

		break;

	case FUTEX_OP_ANDN:

		/* *(int *)UADDR2 &= ~OPARG; */

		ret = get_user(oldval, uaddr);

		if (!ret) {

			val = oldval & ~oparg;

			ret = put_user(val, uaddr);

		}

		tmp &= ~oparg;

		break;

	case FUTEX_OP_XOR:

		/* *(int *)UADDR2 ^= OPARG; */

		ret = get_user(oldval, uaddr);

		if (!ret) {

			val = oldval ^ oparg;

			ret = put_user(val, uaddr);

		}

		tmp ^= oparg;

		break;

	default:

		ret = -ENOSYS;

	}



	_futex_spin_unlock_irqrestore(uaddr, &flags);

	if (ret == 0 && unlikely(put_user(tmp, uaddr) != 0))

		ret = -EFAULT;



out_pagefault_enable:

	pagefault_enable();

	_futex_spin_unlock_irqrestore(uaddr, &flags);



	if (!ret) {

	if (ret == 0) {

		switch (cmp) {

		case FUTEX_OP_CMP_EQ: ret = (oldval == cmparg); break;

		case FUTEX_OP_CMP_NE: ret = (oldval != cmparg); break;
@@ -112,12 +99,10 @@ futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr) 
	return ret;

}



/* Non-atomic version */

static inline int

futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,

			      u32 oldval, u32 newval)

{

	int ret;

	u32 val;

	unsigned long flags;
@@ -137,17 +122,20 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr, 
	 */



	_futex_spin_lock_irqsave(uaddr, &flags);

	if (unlikely(get_user(val, uaddr) != 0)) {

		_futex_spin_unlock_irqrestore(uaddr, &flags);

		return -EFAULT;

	}



	ret = get_user(val, uaddr);



	if (!ret && val == oldval)

		ret = put_user(newval, uaddr);

	if (val == oldval && unlikely(put_user(newval, uaddr) != 0)) {

		_futex_spin_unlock_irqrestore(uaddr, &flags);

		return -EFAULT;

	}



	*uval = val;



	_futex_spin_unlock_irqrestore(uaddr, &flags);



	return ret;

	return 0;

}



#endif /*__KERNEL__*/