黄涛
405d7b87de
rk30: remove board-rk3066b-sdk-sdmmc.c, which is incompatible with latest sdmmc driver
2012-12-17 15:06:10 +08:00
黄涛
bdd4452e08
rk30: remove board-rk3108-tb-sdmmc.c, which is incompatible with latest sdmmc driver
2012-12-17 15:05:48 +08:00
黄涛
ec38d8e2ad
rk30: remove board-rk30-phone-sdmmc.c, which is incompatible with latest sdmmc driver
2012-12-17 15:05:20 +08:00
黄涛
c74c101efe
rk30: pm: printk while dump gpio inten and refactor rk30_pm_dump_irq
2012-12-17 14:42:38 +08:00
黄涛
9aa85a5edb
rk: fiq_debugger: add last_kmsg command
2012-12-17 14:42:38 +08:00
黄涛
46411181ae
rk: last_log: version 2.0, map log buf as noncached, add last_log_get API
2012-12-17 14:42:38 +08:00
hwg
6caae043e1
solve board-rk2928-sdk-sdmmc.c make error
2012-12-17 11:47:48 +08:00
chenxing
cac61e55e4
rk2928: update process of pll power up when resume from deep sleep, solve the problem: pll some times can not lock when resume from deep sleep mode
2012-12-17 10:19:18 +08:00
dkl
2decfb3f7c
RK292X:add VPU dvfs
2012-12-15 10:54:22 +08:00
hxy
8f55cd8314
rk3168:modified mmc config to fit new sdmmc interface
2012-12-14 18:05:54 +08:00
xxh
eae20b795e
3G dongle support
2012-12-14 17:25:52 +08:00
xkd
e4827b9506
Revert "3G dongle support"
...
This reverts commit d1f418ba3b .
2012-12-14 16:57:40 +08:00
hxy
9e024a6e4c
Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop-3.0
2012-12-14 16:21:58 +08:00
hxy
34e64f9f8e
rk3168:add rk3168 top board config
2012-12-14 16:18:51 +08:00
xkd
8f5def3780
Revert "Support more 3G dongle VID PID"
...
This reverts commit 1dc2de3109 .
2012-12-14 16:03:05 +08:00
xxh
1dc2de3109
Support more 3G dongle VID PID
2012-12-14 15:50:34 +08:00
xxh
d1f418ba3b
3G dongle support
2012-12-14 11:15:41 +08:00
黄涛
b77e0e8463
Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0
...
Conflicts:
Makefile
2012-12-12 17:18:39 +08:00
黄涛
04fa4e2458
rk30: fix wakeup bug when switch to 32K
2012-12-12 16:42:17 +08:00
黄涛
88023c1d74
rk: refactor gpio.h and add new gpio_is_valid
2012-12-12 16:28:10 +08:00
邱建斌
d0027a2696
rt5631: create source for phone or phonepad
2012-12-12 11:09:08 +08:00
xbw
687fe396a3
RK2928SDK use rk903-wifi
...
delete the compile error when use RK903-wifi, due to define the pin-iomux-name error.
2012-12-11 17:27:52 +08:00
ddl
5d41626d55
camera: ov5642/ov5640 add support const focus
2012-12-11 11:13:47 +08:00
Greg Kroah-Hartman
4eb15b7fe7
Linux 3.0.56
v3.0.56
2012-12-10 10:45:23 -08:00
Jan Kara
9012327529
scsi: Silence unnecessary warnings about ioctl to partition
...
commit 6d93592807 upstream.
Sometimes, warnings about ioctls to partition happen often enough that they
form majority of the warnings in the kernel log and users complain. In some
cases warnings are about ioctls such as SG_IO so it's not good to get rid of
the warnings completely as they can ease debugging of userspace problems
when ioctl is refused.
Since I have seen warnings from lots of commands, including some proprietary
userspace applications, I don't think disallowing the ioctls for processes
with CAP_SYS_RAWIO will happen in the near future if ever. So lets just
stop warning for processes with CAP_SYS_RAWIO for which ioctl is allowed.
Acked-by: Paolo Bonzini <pbonzini@redhat.com >
CC: James Bottomley <JBottomley@parallels.com >
CC: linux-scsi@vger.kernel.org
Signed-off-by: Jan Kara <jack@suse.cz >
Signed-off-by: Jens Axboe <axboe@kernel.dk >
Cc: Satoru Takeuchi <satoru.takeuchi@gmail.com >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
2012-12-10 10:45:08 -08:00
Chris Wilson
95b471a707
drm/i915: Add no-lvds quirk for Supermicro X7SPA-H
...
commit c31407a367 upstream.
Reported-and-tested-by: Francois Tigeot <ftigeot@wolfpond.org >
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=55375
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk >
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch >
Signed-off-by: Peter Huewe <peterhuewe@gmx.de >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
2012-12-10 10:45:08 -08:00
Calvin Walton
4d574d2d82
i915: Quirk no_lvds on Gigabyte GA-D525TUD ITX motherboard
...
commit a51d4ed01e upstream.
This board is incorrectly detected as having an LVDS connector,
resulting in the VGA output (the only available output on the board)
showing the console only in the top-left 1024x768 pixels, and an extra
LVDS connector appearing in X.
It's a desktop Mini-ITX board using an Atom D525 CPU with an NM10
chipset.
I've had this board for about a year, but this is the first time I
noticed the issue because I've been running it headless for most of its
life.
Signed-off-by: Calvin Walton <calvin.walton@kepstin.ca >
Signed-off-by: Peter Huewe <peterhuewe@gmx.de >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
2012-12-10 10:45:08 -08:00
Alan Cox
b0ce22dd5b
ACPI: missing break
...
commit 879dca019d upstream.
We handle NOTIFY_THROTTLING so don't then fall through to unsupported event.
Signed-off-by: Alan Cox <alan@linux.intel.com >
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com >
Signed-off-by: Peter Huewe <peterhuewe@gmx.de >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
2012-12-10 10:45:08 -08:00
Michal Kubecek
bc436ddffc
route: release dst_entry.hh_cache when handling redirects
...
Stable-3.0 commit 42ab5316 (ipv4: fix redirect handling) was
backport of mainline commit 9cc20b26 from 3.2-rc3 where hh
member of struct dst_entry was already gone.
However, in 3.0 we still have it and we have to clean it as
well, otherwise it keeps pointing to the cleaned up (and
unusable) hh_cache entry and packets cannot be sent out.
Signed-off-by: Michal Kubecek <mkubecek@suse.cz >
Cc: Eric Dumazet <eric.dumazet@gmail.com >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
2012-12-10 10:45:08 -08:00
Mike Galbraith
e86b690c96
Revert "sched, autogroup: Stop going ahead if autogroup is disabled"
...
commit fd8ef11730 upstream.
This reverts commit 800d4d30c8 .
Between commits 8323f26ce3 ("sched: Fix race in task_group()") and
800d4d30c8 ("sched, autogroup: Stop going ahead if autogroup is
disabled"), autogroup is a wreck.
With both applied, all you have to do to crash a box is disable
autogroup during boot up, then reboot.. boom, NULL pointer dereference
due to commit 800d4d30c8 not allowing autogroup to move things, and
commit 8323f26ce3 making that the only way to switch runqueues:
BUG: unable to handle kernel NULL pointer dereference at (null)
IP: [<ffffffff81063ac0>] effective_load.isra.43+0x50/0x90
Pid: 7047, comm: systemd-user-se Not tainted 3.6.8-smp #7 MEDIONPC MS-7502/MS-7502
RIP: effective_load.isra.43+0x50/0x90
Process systemd-user-se (pid: 7047, threadinfo ffff880221dde000, task ffff88022618b3a0)
Call Trace:
select_task_rq_fair+0x255/0x780
try_to_wake_up+0x156/0x2c0
wake_up_state+0xb/0x10
signal_wake_up+0x28/0x40
complete_signal+0x1d6/0x250
__send_signal+0x170/0x310
send_signal+0x40/0x80
do_send_sig_info+0x47/0x90
group_send_sig_info+0x4a/0x70
kill_pid_info+0x3a/0x60
sys_kill+0x97/0x1a0
? vfs_read+0x120/0x160
? sys_read+0x45/0x90
system_call_fastpath+0x16/0x1b
Code: 49 0f af 41 50 31 d2 49 f7 f0 48 83 f8 01 48 0f 46 c6 48 2b 07 48 8b bf 40 01 00 00 48 85 ff 74 3a 45 31 c0 48 8b 8f 50 01 00 00 <48> 8b 11 4c 8b 89 80 00 00 00 49 89 d2 48 01 d0 45 8b 59 58 4c
RIP [<ffffffff81063ac0>] effective_load.isra.43+0x50/0x90
RSP <ffff880221ddfbd8>
CR2: 0000000000000000
Signed-off-by: Mike Galbraith <efault@gmx.de >
Acked-by: Ingo Molnar <mingo@kernel.org >
Cc: Yong Zhang <yong.zhang0@gmail.com >
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
2012-12-10 10:45:08 -08:00
Mike Galbraith
cc3c85dfa1
workqueue: exit rescuer_thread() as TASK_RUNNING
...
commit 412d32e6c9 upstream.
A rescue thread exiting TASK_INTERRUPTIBLE can lead to a task scheduling
off, never to be seen again. In the case where this occurred, an exiting
thread hit reiserfs homebrew conditional resched while holding a mutex,
bringing the box to its knees.
PID: 18105 TASK: ffff8807fd412180 CPU: 5 COMMAND: "kdmflush"
#0 [ffff8808157e7670] schedule at ffffffff8143f489
#1 [ffff8808157e77b8] reiserfs_get_block at ffffffffa038ab2d [reiserfs]
#2 [ffff8808157e79a8] __block_write_begin at ffffffff8117fb14
#3 [ffff8808157e7a98] reiserfs_write_begin at ffffffffa0388695 [reiserfs]
#4 [ffff8808157e7ad8] generic_perform_write at ffffffff810ee9e2
#5 [ffff8808157e7b58] generic_file_buffered_write at ffffffff810eeb41
#6 [ffff8808157e7ba8] __generic_file_aio_write at ffffffff810f1a3a
#7 [ffff8808157e7c58] generic_file_aio_write at ffffffff810f1c88
#8 [ffff8808157e7cc8] do_sync_write at ffffffff8114f850
#9 [ffff8808157e7dd8] do_acct_process at ffffffff810a268f
[exception RIP: kernel_thread_helper]
RIP: ffffffff8144a5c0 RSP: ffff8808157e7f58 RFLAGS: 00000202
RAX: 0000000000000000 RBX: 0000000000000000 RCX: 0000000000000000
RDX: 0000000000000000 RSI: ffffffff8107af60 RDI: ffff8803ee491d18
RBP: 0000000000000000 R8: 0000000000000000 R9: 0000000000000000
R10: 0000000000000000 R11: 0000000000000000 R12: 0000000000000000
R13: 0000000000000000 R14: 0000000000000000 R15: 0000000000000000
ORIG_RAX: ffffffffffffffff CS: 0010 SS: 0018
Signed-off-by: Mike Galbraith <mgalbraith@suse.de >
Signed-off-by: Tejun Heo <tj@kernel.org >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
2012-12-10 10:45:07 -08:00
Naoya Horiguchi
11bcecc86d
mm: soft offline: split thp at the beginning of soft_offline_page()
...
commit 783657a7dc upstream.
When we try to soft-offline a thp tail page, put_page() is called on the
tail page unthinkingly and VM_BUG_ON is triggered in put_compound_page().
This patch splits thp before going into the main body of soft-offlining.
Signed-off-by: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com >
Cc: Andi Kleen <andi@firstfloor.org >
Cc: Tony Luck <tony.luck@intel.com >
Cc: Andi Kleen <andi.kleen@intel.com >
Cc: Wu Fengguang <fengguang.wu@intel.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
2012-12-10 10:45:07 -08:00
Jianguo Wu
8bec6507e7
mm/vmemmap: fix wrong use of virt_to_page
...
commit ae64ffcac3 upstream.
I enable CONFIG_DEBUG_VIRTUAL and CONFIG_SPARSEMEM_VMEMMAP, when doing
memory hotremove, there is a kernel BUG at arch/x86/mm/physaddr.c:20.
It is caused by free_section_usemap()->virt_to_page(), virt_to_page() is
only used for kernel direct mapping address, but sparse-vmemmap uses
vmemmap address, so it is going wrong here.
------------[ cut here ]------------
kernel BUG at arch/x86/mm/physaddr.c:20!
invalid opcode: 0000 [#1 ] SMP
Modules linked in: acpihp_drv acpihp_slot edd cpufreq_conservative cpufreq_userspace cpufreq_powersave acpi_cpufreq mperf fuse vfat fat loop dm_mod coretemp kvm crc32c_intel ipv6 ixgbe igb iTCO_wdt i7core_edac edac_core pcspkr iTCO_vendor_support ioatdma microcode joydev sr_mod i2c_i801 dca lpc_ich mfd_core mdio tpm_tis i2c_core hid_generic tpm cdrom sg tpm_bios rtc_cmos button ext3 jbd mbcache usbhid hid uhci_hcd ehci_hcd usbcore usb_common sd_mod crc_t10dif processor thermal_sys hwmon scsi_dh_alua scsi_dh_hp_sw scsi_dh_rdac scsi_dh_emc scsi_dh ata_generic ata_piix libata megaraid_sas scsi_mod
CPU 39
Pid: 6454, comm: sh Not tainted 3.7.0-rc1-acpihp-final+ #45 QCI QSSC-S4R/QSSC-S4R
RIP: 0010:[<ffffffff8103c908>] [<ffffffff8103c908>] __phys_addr+0x88/0x90
RSP: 0018:ffff8804440d7c08 EFLAGS: 00010006
RAX: 0000000000000006 RBX: ffffea0012000000 RCX: 000000000000002c
...
Signed-off-by: Jianguo Wu <wujianguo@huawei.com >
Signed-off-by: Jiang Liu <jiang.liu@huawei.com >
Reviewd-by: Wen Congyang <wency@cn.fujitsu.com >
Acked-by: Johannes Weiner <hannes@cmpxchg.org >
Reviewed-by: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com >
Reviewed-by: Michal Hocko <mhocko@suse.cz >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
2012-12-10 10:45:07 -08:00
Russell King - ARM Linux
6d62cb399d
Dove: Fix irq_to_pmu()
...
commit d356cf5a74 upstream.
PMU interrupts start at IRQ_DOVE_PMU_START, not IRQ_DOVE_PMU_START + 1.
Fix the condition. (It may have been less likely to occur had the code
been written "if (irq >= IRQ_DOVE_PMU_START" which imho is the easier
to understand notation, and matches the normal way of thinking about
these things.)
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk >
Signed-off-by: Jason Cooper <jason@lakedaemon.net >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
2012-12-10 10:45:07 -08:00
Russell King - ARM Linux
31a2aa119d
Dove: Attempt to fix PMU/RTC interrupts
...
commit 5d3df93542 upstream.
Fix the acknowledgement of PMU interrupts on Dove: some Dove hardware
has not been sensibly designed so that interrupts can be handled in a
race free manner. The PMU is one such instance.
The pending (aka 'cause') register is a bunch of RW bits, meaning that
these bits can be both cleared and set by software (confirmed on the
Armada-510 on the cubox.)
Hardware sets the appropriate bit when an interrupt is asserted, and
software is required to clear the bits which are to be processed. If
we write ~(1 << bit), then we end up asserting every other interrupt
except the one we're processing. So, we need to do a read-modify-write
cycle to clear the asserted bit.
However, any interrupts which occur in the middle of this cycle will
also be written back as zero, which will also clear the new interrupts.
The upshot of this is: there is _no_ way to safely clear down interrupts
in this register (and other similarly behaving interrupt pending
registers on this device.) The patch below at least stops us creating
new interrupts.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk >
Signed-off-by: Jason Cooper <jason@lakedaemon.net >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
2012-12-10 10:45:07 -08:00
xbw
73dd8b36cf
SDMMC: modify the definition of pin error in RK3066B platform.
2012-12-10 12:16:14 +08:00
ywj
38aef71c2c
modify build error rk29_keys.c update develop3.0
2012-12-10 10:52:17 +08:00
ywj
122a324361
modify build error rk29_keys.c
2012-12-10 10:47:35 +08:00
xbw
3df852b708
SDMMC: to To shield some debugging code
2012-12-09 19:35:32 +08:00
xbw
9e785d1d82
SDMMC:
...
add the number of protective measures. to prevent some compile error due to the pin-value not defined.
2012-12-09 19:13:58 +08:00
xbw
f7f3af18c7
SDMMC: for RK3066B project
...
Modify the difference between RK3066B and RK3066 architecture platform.
2012-12-09 18:21:04 +08:00
黄涛
194b5f525d
rk29_keys: fix compile error caused by commit d9f2bfa1
2012-12-07 19:37:21 +08:00
ywj
d9f2bfa16b
modify error for no key define in init.rk29board.rc second
2012-12-07 18:08:49 +08:00
ywj
f5c08b7ebb
modify error for no key define in init.rk29board.rc
2012-12-07 18:03:51 +08:00
yxj
99a2b98756
rk fb: load screen when open fb
2012-12-07 17:28:49 +08:00
yxj
f48dd4d935
rk hdmi sysfs: only plug in hdmi use screen scale
2012-12-07 17:28:49 +08:00
yxj
bdee11ddee
Revert "only plug in hdmi use screen scale"
...
This reverts commit f99dcc839e .
2012-12-07 17:28:48 +08:00
yxj
e6a80df673
add comment for some key fucntion
2012-12-07 17:28:48 +08:00
kfx
02541026a1
i2c: i2c_master_reg8_direct_recv
2012-12-07 16:05:54 +08:00
yangkai
1237967028
update actual transfer size for ep0 out
2012-12-07 15:40:42 +08:00