Commit Graph

270284 Commits

Author SHA1 Message Date
黄涛
019f162a10 rk3188: fix cpu aix init 2013-01-23 23:09:20 +08:00
chenxing
9e3247da3b rk3188: clock clock_data debug 2013-01-23 22:57:44 +08:00
黄涛
0b71f3b2c5 rk3188: disable cpu axi init and ddr init temporily 2013-01-23 21:40:34 +08:00
黄涛
9941e8038a rk3168: tb: fix lcdc name 2013-01-23 21:32:07 +08:00
yxj
8c362ed4e1 rk3066b m701 defconfig:add RK610 LVDS config 2013-01-23 19:20:04 +08:00
yxj
9a7854d888 dp501:add more config for low power,now the total for dp501 is 265mw 2013-01-23 19:20:03 +08:00
Zheng Yang
ed44c956cb rk2928 codec: add soft reset. 2013-01-23 18:15:37 +08:00
kfx
a03b81c357 fixed spi compile error 2013-01-23 17:27:16 +08:00
xbw
aa983c08c4 SDMMC: Eliminate some small flaws after supporting new iomux-API. 2013-01-23 14:36:21 +08:00
yxj
3414163949 board rk2928 tb:use get_fb_size instead of macro RK30_FB0_MEM_SIZE 2013-01-23 12:11:10 +08:00
yxj
3f5f4acbd4 lcd screen hsd100pxn:add interface get_fb_size 2013-01-23 12:09:32 +08:00
yxj
024dbf593e board rk30 sdk,LR097 DS1006H,rk3168 tb:use get_fb_size instead of RK30_FB0_MEM_SIZE 2013-01-23 11:39:30 +08:00
yxj
4673caa440 rk screen:add interface to calculator fb size by screen resolution 2013-01-23 11:39:30 +08:00
黄涛
52f00e5c34 Revert "move rk_screen.h from board.h"
This reverts commit 1e2026750b.
2013-01-23 11:33:56 +08:00
XieKedi
efde9d0386 rk3168 ds1006h : config do not set "Disable external hubs" by default 2013-01-23 11:26:18 +08:00
黄涛
ba3b02ae4b rk: usb_detect: enable bvalid irq when usb uart enabled 2013-01-23 10:18:28 +08:00
wuhao
880c9f656c rk3168 ds1006: config hdmi support 2013-01-23 10:09:53 +08:00
chenxing
fd3afc9b05 rk30: export dvfs_get_freq_volt_table/dvfs_set_freq_volt_table functions 2013-01-23 10:00:09 +08:00
黄涛
f34f67b545 Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0
Merge v3.0.60
Conflicts:
	Makefile
2013-01-23 09:49:26 +08:00
yxj
92cac13785 rk610_tv.h:use rk_fb.h instead of fb.h 2013-01-22 20:51:23 +08:00
yxj
1e2026750b move rk_screen.h from board.h 2013-01-22 20:51:23 +08:00
yxj
5e438e8a06 board rk30sdk,ds1006h,rk3168 tb:register display devices fb,lcdc,backlight by rk_platform_add_display_devices 2013-01-22 20:51:23 +08:00
yxj
90051d6c76 rkfb:add interface __rk_platform_add_display_devices 2013-01-22 20:51:23 +08:00
chenxing
1d1462a4be rk3168: ds1006h: update dvfs table 2013-01-22 20:31:07 +08:00
chenxing
f46c7fc881 rk3188: add pm support 2013-01-22 18:26:50 +08:00
xbw
71b5193722 Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop-3.0 2013-01-22 18:07:11 +08:00
xbw
0befc1d5ba SDMMC:
1.Compatible with the new interface function of IOMUX-API.
2.To simplify the configuration of the sd-sdio-wifi.
2013-01-22 18:06:47 +08:00
xxx
644021fd57 forget adding dvfs.c,so submit again 2013-01-22 18:06:06 +08:00
xbw
f6b516bd86 Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop-3.0 2013-01-22 17:59:07 +08:00
xbw
872f197c55 SDMMC:
1.Compatible with the new interface function of IOMUX-API
2.Eliminate the intererupt-card-det cause the wakeup.
2013-01-22 17:54:47 +08:00
xxx
b746443883 add dvfs.c in mach-rk3188 file 2013-01-22 17:52:44 +08:00
xkd
7cf7fc9784 reboot system if power off with dc charger pluged in 2013-01-22 17:33:40 +08:00
wuhao
55707d1295 rk3168 ds1006: camera flash sgm3140 2013-01-22 17:32:14 +08:00
luowei
e11798334a SPIM:fix SPI_MODE_2 bug 2013-01-22 17:25:49 +08:00
xxx
bf10222721 gpu clk adn gpu aclk is set at on time for rk3168 and rk3066B 2013-01-22 17:23:22 +08:00
yxj
54ebf17ad7 rk30 lcdc:enable frame start irq 2013-01-22 16:29:00 +08:00
yxj
08f41d9e25 board rk30 sdk:modify fb_io_enable/disable function 2013-01-22 16:17:15 +08:00
yxj
1159a4907f dp501: add config for low power,now the all power of dp501 is 303ma 2013-01-22 15:39:31 +08:00
chenxing
2d5d725f05 rk3168/rk3188: update dvfs table to fit rk3188 2013-01-22 14:37:16 +08:00
chenxing
c705010c4a rk30: fix a dvfs error judgement 2013-01-22 14:11:10 +08:00
xxx
3d9b8ec97e arm gpu ddr rate is limited by cpufreq_frequency_table in board-xxx.c 2013-01-22 12:31:39 +08:00
黄涛
d00b319768 rk_timer: support sched_clock 2013-01-22 11:31:55 +08:00
xxx
d95e7313ca extern rk30_dvfs_init() in /mach-rk3188/clock_data.c 2013-01-22 10:40:13 +08:00
黄涛
f27da4121a rk: sram.h: fix gcc error: unknown type name 'uint' 2013-01-22 10:35:02 +08:00
Greg Kroah-Hartman
d418434701 Linux 3.0.60 v3.0.60 2013-01-21 11:48:40 -08:00
Ben Hutchings
42e29fded9 staging: vt6656: Fix inconsistent structure packing
commit 1ee4c55fc9 upstream.

vt6656 has several headers that use the #pragma pack(1) directive to
enable structure packing, but never disable it.  The layout of
structures defined in other headers can then depend on which order the
various headers are included in, breaking the One Definition Rule.

In practice this resulted in crashes on x86_64 until the order of header
inclusion was changed for some files in commit 11d404cb56 ('staging:
vt6656: fix headers and add cfg80211.').  But we need a proper fix that
won't be affected by future changes to the order of inclusion.

This removes the #pragma pack(1) directives and adds __packed to the
structure definitions for which packing appears to have been intended.

Reported-and-tested-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-01-21 11:45:00 -08:00
chao bi
904e718cc7 serial:ifx6x60:Delete SPI timer when shut down port
commit 014b9b4ce8 upstream.

When shut down SPI port, it's possible that MRDY has been asserted and a SPI
timer was activated waiting for SRDY assert, in the case, it needs to delete
this timer.

Signed-off-by: Chen Jun <jun.d.chen@intel.com>
Signed-off-by: channing <chao.bi@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-01-21 11:45:00 -08:00
Bjørn Mork
f21c75c02c USB: option: blacklist network interface on ONDA MT8205 4G LTE
Signed-off-by: Bjørn Mork <bjorn@mork.no>

commit 2291dff02e upstream.

The driver description files gives these names to the vendor specific
functions on this modem:

 Diag   VID_19D2&PID_0265&MI_00
 NMEA   VID_19D2&PID_0265&MI_01
 AT cmd VID_19D2&PID_0265&MI_02
 Modem  VID_19D2&PID_0265&MI_03
 Net    VID_19D2&PID_0265&MI_04

Signed-off-by: Bjørn Mork <bjorn@mork.no>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-01-21 11:45:00 -08:00
Bjørn Mork
da1213a915 USB: option: add TP-LINK HSUPA Modem MA180
commit 99beb2e968 upstream.

The driver description files gives these names to the vendor specific
functions on this modem:

 Diagnostics VID_2357&PID_0201&MI_00
 NMEA        VID_2357&PID_0201&MI_01
 Modem       VID_2357&PID_0201&MI_03
 Networkcard VID_2357&PID_0201&MI_04

Reported-by: Thomas Schäfer <tschaefer@t-online.de>
Signed-off-by: Bjørn Mork <bjorn@mork.no>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-01-21 11:45:00 -08:00
Frediano Ziglio
a5b0529675 xen: Fix stack corruption in xen_failsafe_callback for 32bit PVOPS guests.
commit 9174adbee4 upstream.

This fixes CVE-2013-0190 / XSA-40

There has been an error on the xen_failsafe_callback path for failed
iret, which causes the stack pointer to be wrong when entering the
iret_exc error path.  This can result in the kernel crashing.

In the classic kernel case, the relevant code looked a little like:

        popl %eax      # Error code from hypervisor
        jz 5f
        addl $16,%esp
        jmp iret_exc   # Hypervisor said iret fault
5:      addl $16,%esp
                       # Hypervisor said segment selector fault

Here, there are two identical addls on either option of a branch which
appears to have been optimised by hoisting it above the jz, and
converting it to an lea, which leaves the flags register unaffected.

In the PVOPS case, the code looks like:

        popl_cfi %eax         # Error from the hypervisor
        lea 16(%esp),%esp     # Add $16 before choosing fault path
        CFI_ADJUST_CFA_OFFSET -16
        jz 5f
        addl $16,%esp         # Incorrectly adjust %esp again
        jmp iret_exc

It is possible unprivileged userspace applications to cause this
behaviour, for example by loading an LDT code selector, then changing
the code selector to be not-present.  At this point, there is a race
condition where it is possible for the hypervisor to return back to
userspace from an interrupt, fault on its own iret, and inject a
failsafe_callback into the kernel.

This bug has been present since the introduction of Xen PVOPS support
in commit 5ead97c84 (xen: Core Xen implementation), in 2.6.23.

Signed-off-by: Frediano Ziglio <frediano.ziglio@citrix.com>
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-01-21 11:44:59 -08:00