Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
MIPS: Outline udelay and fix a few issues.
MIPS: ioctl.h: Fix headers_check warnings
MIPS: Cobalt: PCI bus is always required to obtain the board ID
MIPS: Kconfig: Remove "Support for" from Cavium system type
MIPS: Sibyte: Honor CONFIG_CMDLINE
SSB: BCM47xx: Export ssb_watchdog_timer_set
+75
-101
+3
-2
arch/mips/Kconfig
+3
-2
arch/mips/Kconfig
···
72
72
select IRQ_CPU
73
73
select IRQ_GT641XX
74
74
select PCI_GT64XXX_PCI0
75
+
select PCI
75
76
select SYS_HAS_CPU_NEVADA
76
77
select SYS_HAS_EARLY_PRINTK
77
78
select SYS_SUPPORTS_32BIT_KERNEL
···
594
593
board, which is based on GT64120 bridge chip.
595
594
596
595
config CAVIUM_OCTEON_SIMULATOR
597
-
bool "Support for the Cavium Networks Octeon Simulator"
596
+
bool "Cavium Networks Octeon Simulator"
598
597
select CEVT_R4K
599
598
select 64BIT_PHYS_ADDR
600
599
select DMA_COHERENT
···
608
607
hardware.
609
608
610
609
config CAVIUM_OCTEON_REFERENCE_BOARD
611
-
bool "Support for the Cavium Networks Octeon reference board"
610
+
bool "Cavium Networks Octeon reference board"
612
611
select CEVT_R4K
613
612
select 64BIT_PHYS_ADDR
614
613
select DMA_COHERENT
+2
-2
arch/mips/include/asm/cpu-info.h
+2
-2
arch/mips/include/asm/cpu-info.h
···
39
39
#define MIPS_CACHE_PINDEX 0x00000020 /* Physically indexed cache */
40
40
41
41
struct cpuinfo_mips {
42
-
unsigned long udelay_val;
43
-
unsigned long asid_cache;
42
+
unsigned int udelay_val;
43
+
unsigned int asid_cache;
44
44
45
45
/*
46
46
* Capability and feature descriptor structure for MIPS CPU
+5
-87
arch/mips/include/asm/delay.h
+5
-87
arch/mips/include/asm/delay.h
···
11
11
#ifndef _ASM_DELAY_H
12
12
#define _ASM_DELAY_H
13
13
14
-
#include <linux/param.h>
15
-
#include <linux/smp.h>
14
+
extern void __delay(unsigned int loops);
15
+
extern void __ndelay(unsigned int ns);
16
+
extern void __udelay(unsigned int us);
16
17
17
-
#include <asm/compiler.h>
18
-
#include <asm/war.h>
19
-
20
-
static inline void __delay(unsigned long loops)
21
-
{
22
-
if (sizeof(long) == 4)
23
-
__asm__ __volatile__ (
24
-
" .set noreorder \n"
25
-
" .align 3 \n"
26
-
"1: bnez %0, 1b \n"
27
-
" subu %0, 1 \n"
28
-
" .set reorder \n"
29
-
: "=r" (loops)
30
-
: "0" (loops));
31
-
else if (sizeof(long) == 8 && !DADDI_WAR)
32
-
__asm__ __volatile__ (
33
-
" .set noreorder \n"
34
-
" .align 3 \n"
35
-
"1: bnez %0, 1b \n"
36
-
" dsubu %0, 1 \n"
37
-
" .set reorder \n"
38
-
: "=r" (loops)
39
-
: "0" (loops));
40
-
else if (sizeof(long) == 8 && DADDI_WAR)
41
-
__asm__ __volatile__ (
42
-
" .set noreorder \n"
43
-
" .align 3 \n"
44
-
"1: bnez %0, 1b \n"
45
-
" dsubu %0, %2 \n"
46
-
" .set reorder \n"
47
-
: "=r" (loops)
48
-
: "0" (loops), "r" (1));
49
-
}
50
-
51
-
52
-
/*
53
-
* Division by multiplication: you don't have to worry about
54
-
* loss of precision.
55
-
*
56
-
* Use only for very small delays ( < 1 msec). Should probably use a
57
-
* lookup table, really, as the multiplications take much too long with
58
-
* short delays. This is a "reasonable" implementation, though (and the
59
-
* first constant multiplications gets optimized away if the delay is
60
-
* a constant)
61
-
*/
62
-
63
-
static inline void __udelay(unsigned long usecs, unsigned long lpj)
64
-
{
65
-
unsigned long hi, lo;
66
-
67
-
/*
68
-
* The rates of 128 is rounded wrongly by the catchall case
69
-
* for 64-bit. Excessive precission? Probably ...
70
-
*/
71
-
#if defined(CONFIG_64BIT) && (HZ == 128)
72
-
usecs *= 0x0008637bd05af6c7UL; /* 2**64 / (1000000 / HZ) */
73
-
#elif defined(CONFIG_64BIT)
74
-
usecs *= (0x8000000000000000UL / (500000 / HZ));
75
-
#else /* 32-bit junk follows here */
76
-
usecs *= (unsigned long) (((0x8000000000000000ULL / (500000 / HZ)) +
77
-
0x80000000ULL) >> 32);
78
-
#endif
79
-
80
-
if (sizeof(long) == 4)
81
-
__asm__("multu\t%2, %3"
82
-
: "=h" (usecs), "=l" (lo)
83
-
: "r" (usecs), "r" (lpj)
84
-
: GCC_REG_ACCUM);
85
-
else if (sizeof(long) == 8 && !R4000_WAR)
86
-
__asm__("dmultu\t%2, %3"
87
-
: "=h" (usecs), "=l" (lo)
88
-
: "r" (usecs), "r" (lpj)
89
-
: GCC_REG_ACCUM);
90
-
else if (sizeof(long) == 8 && R4000_WAR)
91
-
__asm__("dmultu\t%3, %4\n\tmfhi\t%0"
92
-
: "=r" (usecs), "=h" (hi), "=l" (lo)
93
-
: "r" (usecs), "r" (lpj)
94
-
: GCC_REG_ACCUM);
95
-
96
-
__delay(usecs);
97
-
}
98
-
99
-
#define __udelay_val cpu_data[raw_smp_processor_id()].udelay_val
100
-
101
-
#define udelay(usecs) __udelay((usecs), __udelay_val)
18
+
#define ndelay(ns) __udelay(ns)
19
+
#define udelay(us) __udelay(us)
102
20
103
21
/* make sure "usecs *= ..." in udelay do not overflow. */
104
22
#if HZ >= 1000
+4
arch/mips/include/asm/ioctl.h
+4
arch/mips/include/asm/ioctl.h
···
60
60
((nr) << _IOC_NRSHIFT) | \
61
61
((size) << _IOC_SIZESHIFT))
62
62
63
+
#ifdef __KERNEL__
63
64
/* provoke compile error for invalid uses of size argument */
64
65
extern unsigned int __invalid_size_argument_for_IOC;
65
66
#define _IOC_TYPECHECK(t) \
66
67
((sizeof(t) == sizeof(t[1]) && \
67
68
sizeof(t) < (1 << _IOC_SIZEBITS)) ? \
68
69
sizeof(t) : __invalid_size_argument_for_IOC)
70
+
#else
71
+
#define _IOC_TYPECHECK(t) (sizeof(t))
72
+
#endif
69
73
70
74
/* used to create numbers */
71
75
#define _IO(type, nr) _IOC(_IOC_NONE, (type), (nr), 0)
+1
-1
arch/mips/kernel/proc.c
+1
-1
arch/mips/kernel/proc.c
···
42
42
seq_printf(m, fmt, __cpu_name[n],
43
43
(version >> 4) & 0x0f, version & 0x0f,
44
44
(fp_vers >> 4) & 0x0f, fp_vers & 0x0f);
45
-
seq_printf(m, "BogoMIPS\t\t: %lu.%02lu\n",
45
+
seq_printf(m, "BogoMIPS\t\t: %u.%02u\n",
46
46
cpu_data[n].udelay_val / (500000/HZ),
47
47
(cpu_data[n].udelay_val / (5000/HZ)) % 100);
48
48
seq_printf(m, "wait instruction\t: %s\n", cpu_wait ? "yes" : "no");
+2
-2
arch/mips/lib/Makefile
+2
-2
arch/mips/lib/Makefile
···
2
2
# Makefile for MIPS-specific library files..
3
3
#
4
4
5
-
lib-y += csum_partial.o memcpy.o memcpy-inatomic.o memset.o strlen_user.o \
6
-
strncpy_user.o strnlen_user.o uncached.o
5
+
lib-y += csum_partial.o delay.o memcpy.o memcpy-inatomic.o memset.o \
6
+
strlen_user.o strncpy_user.o strnlen_user.o uncached.o
7
7
8
8
obj-y += iomap.o
9
9
obj-$(CONFIG_PCI) += iomap-pci.o
+56
arch/mips/lib/delay.c
+56
arch/mips/lib/delay.c
···
1
+
/*
2
+
* This file is subject to the terms and conditions of the GNU General Public
3
+
* License. See the file "COPYING" in the main directory of this archive
4
+
* for more details.
5
+
*
6
+
* Copyright (C) 1994 by Waldorf Electronics
7
+
* Copyright (C) 1995 - 2000, 01, 03 by Ralf Baechle
8
+
* Copyright (C) 1999, 2000 Silicon Graphics, Inc.
9
+
* Copyright (C) 2007 Maciej W. Rozycki
10
+
*/
11
+
#include <linux/module.h>
12
+
#include <linux/param.h>
13
+
#include <linux/smp.h>
14
+
15
+
#include <asm/compiler.h>
16
+
#include <asm/war.h>
17
+
18
+
inline void __delay(unsigned int loops)
19
+
{
20
+
__asm__ __volatile__ (
21
+
" .set noreorder \n"
22
+
" .align 3 \n"
23
+
"1: bnez %0, 1b \n"
24
+
" subu %0, 1 \n"
25
+
" .set reorder \n"
26
+
: "=r" (loops)
27
+
: "0" (loops));
28
+
}
29
+
EXPORT_SYMBOL(__delay);
30
+
31
+
/*
32
+
* Division by multiplication: you don't have to worry about
33
+
* loss of precision.
34
+
*
35
+
* Use only for very small delays ( < 1 msec). Should probably use a
36
+
* lookup table, really, as the multiplications take much too long with
37
+
* short delays. This is a "reasonable" implementation, though (and the
38
+
* first constant multiplications gets optimized away if the delay is
39
+
* a constant)
40
+
*/
41
+
42
+
void __udelay(unsigned long us)
43
+
{
44
+
unsigned int lpj = current_cpu_data.udelay_val;
45
+
46
+
__delay((us * 0x000010c7 * HZ * lpj) >> 32);
47
+
}
48
+
EXPORT_SYMBOL(__udelay);
49
+
50
+
void __ndelay(unsigned long ns)
51
+
{
52
+
unsigned int lpj = current_cpu_data.udelay_val;
53
+
54
+
__delay((us * 0x00000005 * HZ * lpj) >> 32);
55
+
}
56
+
EXPORT_SYMBOL(__ndelay);
+1
-7
arch/mips/sibyte/cfe/setup.c
+1
-7
arch/mips/sibyte/cfe/setup.c
···
288
288
*/
289
289
cfe_cons_handle = cfe_getstdhandle(CFE_STDHANDLE_CONSOLE);
290
290
if (cfe_getenv("LINUX_CMDLINE", arcs_cmdline, CL_SIZE) < 0) {
291
-
if (argc < 0) {
292
-
/*
293
-
* It's OK for direct boot to not provide a
294
-
* command line
295
-
*/
296
-
strcpy(arcs_cmdline, "root=/dev/ram0 ");
297
-
} else {
291
+
if (argc >= 0) {
298
292
/* The loader should have set the command line */
299
293
/* too early for panic to do any good */
300
294
printk("LINUX_CMDLINE not defined in cfe.");