CRIS changes for 3.20

-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (GNU/Linux)
 
 iEYEABECAAYFAlTgZOMACgkQ31LbvUHyf1dBWgCfddXF7asJyWtL6o/4lPuDCS4T
 UbAAnR2w1qM6KlGvhjUqFgng4qadt3h+
 =tIwX
 -----END PGP SIGNATURE-----

Merge tag 'cris-for-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris

Pull CRIS changes from Jesper Nilsson.

* tag 'cris-for-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris:
  CRIS: Whitespace cleanup
  CRIS: macro whitespace fixes in uaccess.h
  CRIS: uaccess: fix sparse errors
  CRISv32: Remove unnecessary KERN_INFO from sync_serial
  CRIS: Fix missing NR_CPUS in menuconfig
  CRISv32: Avoid warning of unused variable
  CRIS: Avoid warning in cris mm/fault.c
  CRIS: Export csum_partial_copy_nocheck
This commit is contained in:
Linus Torvalds 2015-02-15 18:02:02 -08:00
commit 1fa185ebcb
6 changed files with 111 additions and 76 deletions

View File

@ -57,6 +57,10 @@ config HZ
int int
default 100 default 100
config NR_CPUS
int
default "1"
source "init/Kconfig" source "init/Kconfig"
source "kernel/Kconfig.freezer" source "kernel/Kconfig.freezer"

View File

@ -1286,7 +1286,7 @@ static void start_dma_out(struct sync_port *port, const char *data, int count)
tr_cfg.tr_en = regk_sser_yes; tr_cfg.tr_en = regk_sser_yes;
REG_WR(sser, port->regi_sser, rw_tr_cfg, tr_cfg); REG_WR(sser, port->regi_sser, rw_tr_cfg, tr_cfg);
DEBUGTRDMA(pr_info(KERN_INFO "dma s\n");); DEBUGTRDMA(pr_info("dma s\n"););
} else { } else {
DMA_CONTINUE_DATA(port->regi_dmaout); DMA_CONTINUE_DATA(port->regi_dmaout);
DEBUGTRDMA(pr_info("dma c\n");); DEBUGTRDMA(pr_info("dma c\n"););
@ -1443,7 +1443,7 @@ static inline void handle_rx_packet(struct sync_port *port)
reg_dma_rw_ack_intr ack_intr = { .data = regk_dma_yes }; reg_dma_rw_ack_intr ack_intr = { .data = regk_dma_yes };
unsigned long flags; unsigned long flags;
DEBUGRXINT(pr_info(KERN_INFO "!")); DEBUGRXINT(pr_info("!"));
spin_lock_irqsave(&port->lock, flags); spin_lock_irqsave(&port->lock, flags);
/* If we overrun the user experience is crap regardless if we /* If we overrun the user experience is crap regardless if we

View File

@ -107,8 +107,10 @@ static short int watchdog_key = 42; /* arbitrary 7 bit number */
* is used though, so set this really low. */ * is used though, so set this really low. */
#define WATCHDOG_MIN_FREE_PAGES 8 #define WATCHDOG_MIN_FREE_PAGES 8
#if defined(CONFIG_ETRAX_WATCHDOG_NICE_DOGGY)
/* for reliable NICE_DOGGY behaviour */ /* for reliable NICE_DOGGY behaviour */
static int bite_in_progress; static int bite_in_progress;
#endif
void reset_watchdog(void) void reset_watchdog(void)
{ {
@ -155,7 +157,9 @@ void handle_watchdog_bite(struct pt_regs *regs)
nmi_enter(); nmi_enter();
oops_in_progress = 1; oops_in_progress = 1;
#if defined(CONFIG_ETRAX_WATCHDOG_NICE_DOGGY)
bite_in_progress = 1; bite_in_progress = 1;
#endif
printk(KERN_WARNING "Watchdog bite\n"); printk(KERN_WARNING "Watchdog bite\n");
/* Check if forced restart or unexpected watchdog */ /* Check if forced restart or unexpected watchdog */

View File

@ -1,4 +1,4 @@
/* /*
* Authors: Bjorn Wesen (bjornw@axis.com) * Authors: Bjorn Wesen (bjornw@axis.com)
* Hans-Peter Nilsson (hp@axis.com) * Hans-Peter Nilsson (hp@axis.com)
*/ */
@ -35,7 +35,7 @@
#define MAKE_MM_SEG(s) ((mm_segment_t) { (s) }) #define MAKE_MM_SEG(s) ((mm_segment_t) { (s) })
/* addr_limit is the maximum accessible address for the task. we misuse /* addr_limit is the maximum accessible address for the task. we misuse
* the KERNEL_DS and USER_DS values to both assign and compare the * the KERNEL_DS and USER_DS values to both assign and compare the
* addr_limit values through the equally misnamed get/set_fs macros. * addr_limit values through the equally misnamed get/set_fs macros.
* (see above) * (see above)
*/ */
@ -47,12 +47,13 @@
#define get_fs() (current_thread_info()->addr_limit) #define get_fs() (current_thread_info()->addr_limit)
#define set_fs(x) (current_thread_info()->addr_limit = (x)) #define set_fs(x) (current_thread_info()->addr_limit = (x))
#define segment_eq(a,b) ((a).seg == (b).seg) #define segment_eq(a, b) ((a).seg == (b).seg)
#define __kernel_ok (segment_eq(get_fs(), KERNEL_DS)) #define __kernel_ok (segment_eq(get_fs(), KERNEL_DS))
#define __user_ok(addr,size) (((size) <= TASK_SIZE)&&((addr) <= TASK_SIZE-(size))) #define __user_ok(addr, size) \
#define __access_ok(addr,size) (__kernel_ok || __user_ok((addr),(size))) (((size) <= TASK_SIZE) && ((addr) <= TASK_SIZE-(size)))
#define access_ok(type,addr,size) __access_ok((unsigned long)(addr),(size)) #define __access_ok(addr, size) (__kernel_ok || __user_ok((addr), (size)))
#define access_ok(type, addr, size) __access_ok((unsigned long)(addr), (size))
#include <arch/uaccess.h> #include <arch/uaccess.h>
@ -69,8 +70,7 @@
* on our cache or tlb entries. * on our cache or tlb entries.
*/ */
struct exception_table_entry struct exception_table_entry {
{
unsigned long insn, fixup; unsigned long insn, fixup;
}; };
@ -92,56 +92,74 @@ struct exception_table_entry
* CRIS, we can just do these as direct assignments. (Of course, the * CRIS, we can just do these as direct assignments. (Of course, the
* exception handling means that it's no longer "just"...) * exception handling means that it's no longer "just"...)
*/ */
#define get_user(x,ptr) \ #define get_user(x, ptr) \
__get_user_check((x),(ptr),sizeof(*(ptr))) __get_user_check((x), (ptr), sizeof(*(ptr)))
#define put_user(x,ptr) \ #define put_user(x, ptr) \
__put_user_check((__typeof__(*(ptr)))(x),(ptr),sizeof(*(ptr))) __put_user_check((__typeof__(*(ptr)))(x), (ptr), sizeof(*(ptr)))
#define __get_user(x,ptr) \ #define __get_user(x, ptr) \
__get_user_nocheck((x),(ptr),sizeof(*(ptr))) __get_user_nocheck((x), (ptr), sizeof(*(ptr)))
#define __put_user(x,ptr) \ #define __put_user(x, ptr) \
__put_user_nocheck((__typeof__(*(ptr)))(x),(ptr),sizeof(*(ptr))) __put_user_nocheck((__typeof__(*(ptr)))(x), (ptr), sizeof(*(ptr)))
extern long __put_user_bad(void); extern long __put_user_bad(void);
#define __put_user_size(x,ptr,size,retval) \ #define __put_user_size(x, ptr, size, retval) \
do { \ do { \
retval = 0; \ retval = 0; \
switch (size) { \ switch (size) { \
case 1: __put_user_asm(x,ptr,retval,"move.b"); break; \ case 1: \
case 2: __put_user_asm(x,ptr,retval,"move.w"); break; \ __put_user_asm(x, ptr, retval, "move.b"); \
case 4: __put_user_asm(x,ptr,retval,"move.d"); break; \ break; \
case 8: __put_user_asm_64(x,ptr,retval); break; \ case 2: \
default: __put_user_bad(); \ __put_user_asm(x, ptr, retval, "move.w"); \
} \ break; \
case 4: \
__put_user_asm(x, ptr, retval, "move.d"); \
break; \
case 8: \
__put_user_asm_64(x, ptr, retval); \
break; \
default: \
__put_user_bad(); \
} \
} while (0) } while (0)
#define __get_user_size(x,ptr,size,retval) \ #define __get_user_size(x, ptr, size, retval) \
do { \ do { \
retval = 0; \ retval = 0; \
switch (size) { \ switch (size) { \
case 1: __get_user_asm(x,ptr,retval,"move.b"); break; \ case 1: \
case 2: __get_user_asm(x,ptr,retval,"move.w"); break; \ __get_user_asm(x, ptr, retval, "move.b"); \
case 4: __get_user_asm(x,ptr,retval,"move.d"); break; \ break; \
case 8: __get_user_asm_64(x,ptr,retval); break; \ case 2: \
default: (x) = __get_user_bad(); \ __get_user_asm(x, ptr, retval, "move.w"); \
} \ break; \
case 4: \
__get_user_asm(x, ptr, retval, "move.d"); \
break; \
case 8: \
__get_user_asm_64(x, ptr, retval); \
break; \
default: \
(x) = __get_user_bad(); \
} \
} while (0) } while (0)
#define __put_user_nocheck(x,ptr,size) \ #define __put_user_nocheck(x, ptr, size) \
({ \ ({ \
long __pu_err; \ long __pu_err; \
__put_user_size((x),(ptr),(size),__pu_err); \ __put_user_size((x), (ptr), (size), __pu_err); \
__pu_err; \ __pu_err; \
}) })
#define __put_user_check(x,ptr,size) \ #define __put_user_check(x, ptr, size) \
({ \ ({ \
long __pu_err = -EFAULT; \ long __pu_err = -EFAULT; \
__typeof__(*(ptr)) *__pu_addr = (ptr); \ __typeof__(*(ptr)) *__pu_addr = (ptr); \
if (access_ok(VERIFY_WRITE,__pu_addr,size)) \ if (access_ok(VERIFY_WRITE, __pu_addr, size)) \
__put_user_size((x),__pu_addr,(size),__pu_err); \ __put_user_size((x), __pu_addr, (size), __pu_err); \
__pu_err; \ __pu_err; \
}) })
struct __large_struct { unsigned long buf[100]; }; struct __large_struct { unsigned long buf[100]; };
@ -149,21 +167,21 @@ struct __large_struct { unsigned long buf[100]; };
#define __get_user_nocheck(x,ptr,size) \ #define __get_user_nocheck(x, ptr, size) \
({ \ ({ \
long __gu_err, __gu_val; \ long __gu_err, __gu_val; \
__get_user_size(__gu_val,(ptr),(size),__gu_err); \ __get_user_size(__gu_val, (ptr), (size), __gu_err); \
(x) = (__typeof__(*(ptr)))__gu_val; \ (x) = (__force __typeof__(*(ptr)))__gu_val; \
__gu_err; \ __gu_err; \
}) })
#define __get_user_check(x,ptr,size) \ #define __get_user_check(x, ptr, size) \
({ \ ({ \
long __gu_err = -EFAULT, __gu_val = 0; \ long __gu_err = -EFAULT, __gu_val = 0; \
const __typeof__(*(ptr)) *__gu_addr = (ptr); \ const __typeof__(*(ptr)) *__gu_addr = (ptr); \
if (access_ok(VERIFY_READ,__gu_addr,size)) \ if (access_ok(VERIFY_READ, __gu_addr, size)) \
__get_user_size(__gu_val,__gu_addr,(size),__gu_err); \ __get_user_size(__gu_val, __gu_addr, (size), __gu_err); \
(x) = (__typeof__(*(ptr)))__gu_val; \ (x) = (__force __typeof__(*(ptr)))__gu_val; \
__gu_err; \ __gu_err; \
}) })
@ -180,7 +198,7 @@ static inline unsigned long
__generic_copy_to_user(void __user *to, const void *from, unsigned long n) __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
{ {
if (access_ok(VERIFY_WRITE, to, n)) if (access_ok(VERIFY_WRITE, to, n))
return __copy_user(to,from,n); return __copy_user(to, from, n);
return n; return n;
} }
@ -188,7 +206,7 @@ static inline unsigned long
__generic_copy_from_user(void *to, const void __user *from, unsigned long n) __generic_copy_from_user(void *to, const void __user *from, unsigned long n)
{ {
if (access_ok(VERIFY_READ, from, n)) if (access_ok(VERIFY_READ, from, n))
return __copy_user_zeroing(to,from,n); return __copy_user_zeroing(to, from, n);
return n; return n;
} }
@ -196,7 +214,7 @@ static inline unsigned long
__generic_clear_user(void __user *to, unsigned long n) __generic_clear_user(void __user *to, unsigned long n)
{ {
if (access_ok(VERIFY_WRITE, to, n)) if (access_ok(VERIFY_WRITE, to, n))
return __do_clear_user(to,n); return __do_clear_user(to, n);
return n; return n;
} }
@ -210,6 +228,7 @@ static inline long
strncpy_from_user(char *dst, const char __user *src, long count) strncpy_from_user(char *dst, const char __user *src, long count)
{ {
long res = -EFAULT; long res = -EFAULT;
if (access_ok(VERIFY_READ, src, 1)) if (access_ok(VERIFY_READ, src, 1))
res = __do_strncpy_from_user(dst, src, count); res = __do_strncpy_from_user(dst, src, count);
return res; return res;
@ -223,6 +242,7 @@ static inline unsigned long
__constant_copy_from_user(void *to, const void __user *from, unsigned long n) __constant_copy_from_user(void *to, const void __user *from, unsigned long n)
{ {
unsigned long ret = 0; unsigned long ret = 0;
if (n == 0) if (n == 0)
; ;
else if (n == 1) else if (n == 1)
@ -273,6 +293,7 @@ static inline unsigned long
__constant_copy_to_user(void __user *to, const void *from, unsigned long n) __constant_copy_to_user(void __user *to, const void *from, unsigned long n)
{ {
unsigned long ret = 0; unsigned long ret = 0;
if (n == 0) if (n == 0)
; ;
else if (n == 1) else if (n == 1)
@ -323,6 +344,7 @@ static inline unsigned long
__constant_clear_user(void __user *to, unsigned long n) __constant_clear_user(void __user *to, unsigned long n)
{ {
unsigned long ret = 0; unsigned long ret = 0;
if (n == 0) if (n == 0)
; ;
else if (n == 1) else if (n == 1)
@ -350,20 +372,20 @@ __constant_clear_user(void __user *to, unsigned long n)
} }
#define clear_user(to, n) \ #define clear_user(to, n) \
(__builtin_constant_p(n) ? \ (__builtin_constant_p(n) ? \
__constant_clear_user(to, n) : \ __constant_clear_user(to, n) : \
__generic_clear_user(to, n)) __generic_clear_user(to, n))
#define copy_from_user(to, from, n) \ #define copy_from_user(to, from, n) \
(__builtin_constant_p(n) ? \ (__builtin_constant_p(n) ? \
__constant_copy_from_user(to, from, n) : \ __constant_copy_from_user(to, from, n) : \
__generic_copy_from_user(to, from, n)) __generic_copy_from_user(to, from, n))
#define copy_to_user(to, from, n) \ #define copy_to_user(to, from, n) \
(__builtin_constant_p(n) ? \ (__builtin_constant_p(n) ? \
__constant_copy_to_user(to, from, n) : \ __constant_copy_to_user(to, from, n) : \
__generic_copy_to_user(to, from, n)) __generic_copy_to_user(to, from, n))
/* We let the __ versions of copy_from/to_user inline, because they're often /* We let the __ versions of copy_from/to_user inline, because they're often
* used in fast paths and have only a small space overhead. * used in fast paths and have only a small space overhead.
@ -373,29 +395,31 @@ static inline unsigned long
__generic_copy_from_user_nocheck(void *to, const void __user *from, __generic_copy_from_user_nocheck(void *to, const void __user *from,
unsigned long n) unsigned long n)
{ {
return __copy_user_zeroing(to,from,n); return __copy_user_zeroing(to, from, n);
} }
static inline unsigned long static inline unsigned long
__generic_copy_to_user_nocheck(void __user *to, const void *from, __generic_copy_to_user_nocheck(void __user *to, const void *from,
unsigned long n) unsigned long n)
{ {
return __copy_user(to,from,n); return __copy_user(to, from, n);
} }
static inline unsigned long static inline unsigned long
__generic_clear_user_nocheck(void __user *to, unsigned long n) __generic_clear_user_nocheck(void __user *to, unsigned long n)
{ {
return __do_clear_user(to,n); return __do_clear_user(to, n);
} }
/* without checking */ /* without checking */
#define __copy_to_user(to,from,n) __generic_copy_to_user_nocheck((to),(from),(n)) #define __copy_to_user(to, from, n) \
#define __copy_from_user(to,from,n) __generic_copy_from_user_nocheck((to),(from),(n)) __generic_copy_to_user_nocheck((to), (from), (n))
#define __copy_from_user(to, from, n) \
__generic_copy_from_user_nocheck((to), (from), (n))
#define __copy_to_user_inatomic __copy_to_user #define __copy_to_user_inatomic __copy_to_user
#define __copy_from_user_inatomic __copy_from_user #define __copy_from_user_inatomic __copy_from_user
#define __clear_user(to,n) __generic_clear_user_nocheck((to),(n)) #define __clear_user(to, n) __generic_clear_user_nocheck((to), (n))
#define strlen_user(str) strnlen_user((str), 0x7ffffffe) #define strlen_user(str) strnlen_user((str), 0x7ffffffe)

View File

@ -67,3 +67,4 @@ EXPORT_SYMBOL(schedule_usleep);
#endif #endif
EXPORT_SYMBOL(csum_partial); EXPORT_SYMBOL(csum_partial);
EXPORT_SYMBOL(csum_partial_copy_from_user); EXPORT_SYMBOL(csum_partial_copy_from_user);
EXPORT_SYMBOL(csum_partial_copy_nocheck);

View File

@ -219,6 +219,9 @@ retry:
/* User mode accesses just cause a SIGSEGV */ /* User mode accesses just cause a SIGSEGV */
if (user_mode(regs)) { if (user_mode(regs)) {
#ifdef CONFIG_NO_SEGFAULT_TERMINATION
DECLARE_WAIT_QUEUE_HEAD(wq);
#endif
printk(KERN_NOTICE "%s (pid %d) segfaults for page " printk(KERN_NOTICE "%s (pid %d) segfaults for page "
"address %08lx at pc %08lx\n", "address %08lx at pc %08lx\n",
tsk->comm, tsk->pid, tsk->comm, tsk->pid,
@ -229,7 +232,6 @@ retry:
show_registers(regs); show_registers(regs);
#ifdef CONFIG_NO_SEGFAULT_TERMINATION #ifdef CONFIG_NO_SEGFAULT_TERMINATION
DECLARE_WAIT_QUEUE_HEAD(wq);
wait_event_interruptible(wq, 0 == 1); wait_event_interruptible(wq, 0 == 1);
#else #else
info.si_signo = SIGSEGV; info.si_signo = SIGSEGV;