commit 5a7d8a28080caed7fd4cb1b81d092adac4445e8e
Merge: e0ea404 eb37e6d
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu Sep 12 16:14:49 2013 -0700
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
Pull MIPS updates from Ralf Baechle:
"This has been sitting in -next for a while with no objections and all
MIPS defconfigs except one are building fine; that one platform got
broken by another patch in your tree and I'm going to submit a patch
separately.
- a handful of fixes that didn't make 3.11
- a few bits of Octeon 3 support with more to come for a later
release
- platform enhancements for Octeon, ath79, Lantiq, Netlogic and
Ralink SOCs
- a GPIO driver for the Octeon
- some dusting off of the DECstation code
- the usual dose of cleanups"
* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (65 commits)
MIPS: DMA: Fix BUG due to smp_processor_id() in preemptible code
MIPS: kexec: Fix random crashes while loading crashkernel
MIPS: kdump: Skip walking indirection page for crashkernels
MIPS: DECstation HRT calibration bug fixes
MIPS: Export copy_from_user_page() (needed by lustre)
MIPS: Add driver for the built-in PCI controller of the RT3883 SoC
MIPS: DMA: For BMIPS5000 cores flush region just like non-coherent R10000
MIPS: ralink: Add support for reset-controller API
MIPS: ralink: mt7620: Add cpu-feature-override header
MIPS: ralink: mt7620: Add spi clock definition
MIPS: ralink: mt7620: Add wdt clock definition
MIPS: ralink: mt7620: Improve clock frequency detection
MIPS: ralink: mt7620: This SoC has EHCI and OHCI hosts
MIPS: ralink: mt7620: Add verbose ram info
MIPS: ralink: Probe clocksources from OF
MIPS: ralink: Add support for systick timer found on newer ralink SoC
MIPS: ralink: Add support for periodic timer irq
MIPS: Netlogic: Built-in DTB for XLP2xx SoC boards
MIPS: Netlogic: Add support for USB on XLP2xx
MIPS: Netlogic: XLP2xx update for I2C controller
...
CLEAN .
CLEAN arch/microblaze/kernel
CLEAN kernel
CLEAN lib
CLEAN usr
CLEAN arch/microblaze/boot
CLEAN .tmp_versions
CLEAN scripts/basic
CLEAN scripts/dtc
CLEAN scripts/kconfig
CLEAN scripts/mod
CLEAN scripts
CLEAN include/config include/generated arch/microblaze/include/generated
CLEAN .config .version include/generated/uapi/linux/version.h Module.symvers
cp: cannot stat `vmlinux': No such file or directory
spawn ./qemu-run-nonet.sh
FDT: INTEL FLASH: baseaddr: 0xa0000000, size: 0x2000000
FDT: Unsupported peripheral invalidated ethernet@81c00000 compatibilities xlnx,xps-ll-temac-1.01.b
FDT: Unsupported peripheral invalidated i2c@81600000 compatibilities xlnx,xps-iic-2.00.a
FDT: Unsupported peripheral invalidated gpio@81400000 compatibilities xlnx,xps-gpio-1.00.a
FDT: Unsupported peripheral invalidated sysace@83600000 compatibilities xlnx,xps-sysace-1.00.a
FDT: Unsupported peripheral invalidated debug@84400000 compatibilities xlnx,mdm-1.00.d
FDT: Unsupported peripheral invalidated mpmc@90000000 compatibilities xlnx,mpmc-4.02.a
FDT: Creating QDEV model xilinx,intc (intc)
setting qdev prop "kind-of-intr" = 0x00000100
connected irq : (none)
FDT: Creating QDEV model xilinx,timer
setting qdev prop "frequency" = 0x03b20b80
setting qdev prop "nr-timers" = 0x00000002
connected irq : 3 (interrupt-controller@81800000)
FDT: Creating QDEV model xilinx,uartlite
setting qdev prop "chr" = 0x09bd64e0
connected irq : 8 (interrupt-controller@81800000)
FDT: Device tree scan complete
Early console on uartlite at 0x84000000
bootconsole [earlyser0] enabled
Ramdisk addr 0x00000000,
FDT at 0x9044dc90
Linux version 3.11.0-09420-gd5d04bb (monstr@monstr-desktop) (gcc version 4.1.2) #1 Thu Sep 12 12:09:10 CEST 2013
setup_cpuinfo: initialising
setup_cpuinfo: Using full CPU PVR support
wt_msr
setup_memory: Main mem: 0x90000000, size 0x10000000
setup_memory: kernel addr:0x90000000-0x9044a000 size=0x0044a000
setup_memory: max_mapnr: 0x10000
setup_memory: min_low_pfn: 0x90000
setup_memory: max_low_pfn: 0xa0000
setup_memory: max_pfn: 0xa0000
Zone ranges:
DMA [mem 0x90000000-0x9fffffff]
Normal empty
Movable zone start for each node
Early memory node ranges
node 0: [mem 0x90000000-0x9fffffff]
On node 0 totalpages: 65536
free_area_init_node: node 0, pgdat 902fa108, node_mem_map 9044c000
DMA zone: 512 pages used for memmap
DMA zone: 0 pages reserved
DMA zone: 65536 pages, LIFO batch:0
early_printk_console remapping from 0x84000000 to 0x84000000
pcpu-alloc: s0 r0 d32768 u32768 alloc=1*32768
pcpu-alloc: [0] 0
Built 1 zonelists in Zone order, mobility grouping on. Total pages: 65024
Kernel command line: console=ttyUL0,115200 highres=on
PID hash table entries: 1024 (order: 0, 4096 bytes)
Dentry cache hash table entries: 32768 (order: 5, 131072 bytes)
Inode-cache hash table entries: 16384 (order: 4, 65536 bytes)
Sorting __ex_table...
Memory: 255452K/262144K available (2281K kernel code, 90K rwdata, 640K rodata, 1012K init, 323K bss, 6692K reserved)
NR_IRQS:33
/plb@0/interrupt-controller@81800000: num_irq=9, edge=0x100
/plb@0/timer@83c00000: irq=3
xilinx_timer_set_mode: shutdown
xilinx_timer_set_mode: periodic
ODEBUG: 2 of 2 active objects replaced
ODEBUG: selftest passed
Calibrating delay loop... 117.65 BogoMIPS (lpj=588288)
pid_max: default: 4096 minimum: 301
Mount-cache hash table entries: 512
NET: Registered protocol family 16
bio: create slab <bio-0> at 0
Switched to clocksource xilinx_clocksource
NET: Registered protocol family 2
xilinx_timer_set_mode: oneshot
TCP established hash table entries: 2048 (order: 2, 16384 bytes)
TCP bind hash table entries: 2048 (order: 1, 8192 bytes)
TCP: Hash tables configured (established 2048 bind 2048)
TCP: reno registered
UDP hash table entries: 256 (order: 0, 4096 bytes)
UDP-Lite hash table entries: 256 (order: 0, 4096 bytes)
NET: Registered protocol family 1
RPC: Registered named UNIX socket transport module.
RPC: Registered udp transport module.
RPC: Registered tcp transport module.
RPC: Registered tcp NFSv4.1 backchannel transport module.
OF: no ranges; cannot translate
OF: no ranges; cannot translate
ROMFS MTD (C) 2007 Red Hat, Inc.
msgmni has been set to 498
io scheduler noop registered
io scheduler deadline registered
io scheduler cfq registered (default)
84000000.serial: ttyUL0 at MMIO 0x84000000 (irq = 8, base_baud = 0) is a uartlite
console [ttyUL0] enabled, bootconsole disabled
console [ttyUL0] enabled, bootconsole disabled
brd: module loaded
nbd: registered device at major 43
TCP: cubic registered
NET: Registered protocol family 17
Freeing unused kernel memory: 1012K (902fb000 - 903f8000)
Bad inittab entry at line 3
Mounting proc:
Mounting var:
Populating /var:
Running local start scripts.
Mounting sysfs:
Setting hostname:
Setting up interface lo:
Setting up interface eth0:
ifconfig: SIOCSIFADDR: No such device
Starting syslogd:
Starting httpd:
Mounting nfs server
uclinux login: root
Passwordpass ok
:
/root # ifconfig
lo Link encap:Local Loopback
inet addr:127.0.0.1 Mask:255.0.0.0
UP LOOPBACK RUNNING MTU:65536 Metric:1
RX packets:0 errors:0 dropped:0 overruns:0 frame:0
TX packets:0 errors:0 dropped:0 overruns:0 carrier:0
collisions:0 txqueuelen:0
RX bytes:0 (0.0 B) TX bytes:0 (0.0 B)
/root # cat /proc/cpuinfo
CPU-Family: MicroBlaze
FPGA-Arch: virtex5
CPU-Ver: 7.10.d, big endian
CPU-MHz: 125.00
BogoMips: 117.65
HW:
Shift: yes
MSR: yes
PCMP: yes
DIV: yes
MMU: 3
MUL: v2
FPU: v2
Exc: op0x0 unal ill zero fpu
Stream-insns: privileged
Icache: no
Dcache: no
HW-Debug: no
PVR-USR1: 00
PVR-USR2: 00000000
Page size: 4096
/root # strace ls /
strace: applet not found
/root #
Statistic
3.11.0-09420-gd5d04bb
4.1.2