Commit Graph

405725 Commits

Author SHA1 Message Date
Huang, Tao
ceaeb4796f add support show process information on printks
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-06-03 17:40:01 +08:00
hjc
36cb2472e4 rk fb: if win close we have to set 4 area state to 0, otherwise will lead to pagefault
Signed-off-by: hjc <hjc@rock-chips.com>
2015-06-03 11:38:39 +08:00
hjc
1061576f98 rk fb: 2 pixel align for interlace and xact offset
Signed-off-by: hjc <hjc@rock-chips.com>
2015-06-03 11:29:37 +08:00
hjc
cc3e63b852 rk3368 lcdc: in interlace mode & resolutation is p to i scale, disable vscale done and enable gt2
Signed-off-by: hjc <hjc@rock-chips.com>
2015-06-03 11:29:37 +08:00
hwg
361c76b08d rfkill-wlan.c: solve mac addr all zero error, cause can't connect ap problem 2015-06-03 09:28:46 +08:00
Huang, Tao
5d2ba06a56 arm64: rockchip: rockchip_defconfig sync with samsung product
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-06-02 18:24:18 +08:00
Huang, Tao
d40a582a8c rk: RK_CONSOLE_THREAD no depends on FIQ_DEBUGGER_CONSOLE
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-06-02 18:24:18 +08:00
zxl
5d82dfee2f RK3368 GPU version: Rogue L 0.17
1. Support gpu disable dvfs case.
2. Add rk_tf_check_version to compatible for rk3328.
3. merge 1.4_ED3573678 DDK code.
   Tip: Need update RK3368 GPU so version to L0.17(@vendor/rockchip/common).
2015-06-02 16:07:27 +08:00
Huang, Tao
46f1476d2d rk: gcc-wrapper.py fix psci ignore
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-06-02 14:26:58 +08:00
Huang, Tao
e82146650e Merge branch android-common-3.10 2015-06-02 11:25:51 +08:00
Huang, Tao
3ca9efa2f8 Merge tag 'lsk-v3.10-15.05-android' into develop-3.10 2015-06-02 11:25:34 +08:00
Huang, Tao
668e3ed51f Revert "zram: don't grab mutex in zram_slot_free_noity"
This reverts commit 66db73c14b.
2015-06-02 11:25:10 +08:00
Huang, Tao
d365bf6679 arm64: rockchip: efuse: support set system serial
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-06-02 11:04:51 +08:00
hwg
a9f10c0192 bcmdhd wifi: update to 1.201.59.4 2015-06-01 15:54:19 +08:00
hwg
94dfc90f19 rfkill-wlan, solve rockchip_wifi_mac_addr error 2015-06-01 15:41:27 +08:00
Zheng Yang
d6f81d1133 HDMI: add mutex lock to edid modelist operation.
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2015-05-29 10:08:34 +08:00
Riley Andrews
67680c1419 android: drivers: workaround debugfs race in binder
If a /d/binder/proc/[pid] entry is kept open after linux has
torn down the associated process, binder_proc_show can deference
an invalid binder_proc that has been stashed in the debugfs
inode.  Validate that the binder_proc ptr passed into binder_proc_show
has not been freed by looking for it within the global process list
whilst the global lock is held. If the ptr is not valid, print nothing.

Bug 19587483
Change-Id: Ice878c171db51ef9a4879c2f9299a2deb873d255
Signed-off-by: Riley Andrews <riandrews@android.com>
2015-05-28 14:32:35 -07:00
hwg
1fb8cff52e esp8089 wifi: solve warning in 64bit, new method 2015-05-28 14:35:42 +08:00
CMY
47b2346ab1 rk: iommu: support iommu region guard
Add an guard area after each iommu region, it is used to detect cross-border access

Signed-off-by: CMY <cmy@rock-chips.com>
Signed-off-by: XXM <xxm@rock-chips.com>
2015-05-28 11:54:57 +08:00
hjc
3a354c544c rk fb: act_height should be 2 pix align for interlace output
Signed-off-by: hjc <hjc@rock-chips.com>
2015-05-28 10:13:44 +08:00
Erik Kline
e4a6d6ba5a neigh: Better handling of transition to NUD_PROBE state
[1] When entering NUD_PROBE state via neigh_update(), perhaps received
    from userspace, correctly (re)initialize the probes count to zero.

    This is useful for forcing revalidation of a neighbor (for example
    if the host is attempting to do DNA [IPv4 4436, IPv6 6059]).

[2] Notify listeners when a neighbor goes into NUD_PROBE state.

    By sending notifications on entry to NUD_PROBE state listeners get
    more timely warnings of imminent connectivity issues.

    The current notifications on entry to NUD_STALE have somewhat
    limited usefulness: NUD_STALE is a perfectly normal state, as is
    NUD_DELAY, whereas notifications on entry to NUD_FAILURE come after
    a neighbor reachability problem has been confirmed (typically after
    three probes).

Change-Id: I1d01d40ef3bc4753b0eaa79da2b27235425b1934
Signed-off-by: Erik Kline <ek@google.com>
Acked-By: Lorenzo Colitti <lorenzo@google.com>
Acked-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-05-28 05:59:03 +09:00
Mark Salyzyn
9de69da198 New Build Breakage in branch: kernel-m-dev-tegra-flounder-3.10 @ 1960706
Signed-off-by: Mark Salyzyn <salyzyn@google.com>
Change-Id: I5682198bce94e66ff3de52989c7e361ffc25ba51
2015-05-27 11:13:39 -07:00
Mark Salyzyn
7449299aa1 net/unix: sk_socket can disappear when state is unlocked
got a rare NULL pointer dereference in clear_bit

Signed-off-by: Mark Salyzyn <salyzyn@google.com>
Bug: 21252747
Change-Id: I27e70f2543034097c8a590a212c2c6fa846fe695
2015-05-27 08:53:07 -07:00
Huang, Tao
a8f65c2c61 rm64: rockchip: rockchip_defconfig disable EARLY_PRINTK
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-05-27 16:51:40 +08:00
Huang, Tao
f75022e471 arm64: rockchip: check tf version later
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-05-27 16:49:32 +08:00
Herman Chen
663f6441d7 vcodec: add soft reset after reading dec registers
Sometimes decoder got a timeout error and can not recover from error status.
We need to add soft reset after reading dec registers.

Signed-off-by: Herman Chen <herman.chen@rock-chips.com>
2015-05-27 10:53:37 +08:00
Herman Chen
41dad664eb vcodec: fix enable race condition when power on/off
When multi-instances power on at same time the condition enabled maybe
set mutli-times. Use atomic function to replace orginal
read/compare/change operation to avoid multi-instances.
Also add power on/off count to debugfs for checking

Signed-off-by: Herman Chen <herman.chen@rock-chips.com>
2015-05-27 10:52:05 +08:00
xxx
8967167af2 add func: check tf ver 2015-05-27 09:04:58 +08:00
hjc
5a5e21e9b1 rk3368 lcdc: update hdmi overscan config path
Signed-off-by: hjc <hjc@rock-chips.com>
2015-05-26 17:12:04 +08:00
hjc
4f8e3e9837 rk fb: fix in interlace mode switch between ntsc and pal lead to pagefault
Signed-off-by: hjc <hjc@rock-chips.com>
2015-05-26 17:12:04 +08:00
hjc
90a0e96562 rk3368 lcdc: add wait frame start for uboot logo switch kernel logo and enable iommu
Signed-off-by: hjc <hjc@rock-chips.com>
2015-05-26 17:12:04 +08:00
hjc
35b4a244eb rk fb: fix uboot logo switch to kernel logo splash screen
Signed-off-by: hjc <hjc@rock-chips.com>
2015-05-26 17:12:04 +08:00
Xiao Feng
12b31e041a dvfs: rockchip: add cpu thermal management test nodes
Signed-off-by: Xiao Feng <xf@rock-chips.com>
2015-05-26 16:27:04 +08:00
Zheng Yang
ed4fba9d34 Makefile: revert to 899286fb6a 2015-05-26 16:17:05 +08:00
Zheng Yang
5f9c0c92dc display-sys: fix compile warning
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2015-05-26 16:14:09 +08:00
Zheng Yang
899286fb6a display-sys: function mode_string check input parameter.
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2015-05-26 14:57:22 +08:00
xxx
3f5c5381d9 modify smc call func id to Standard sip id for efuse and pm-rk3368 2015-05-26 14:53:55 +08:00
hjc
97b97440a4 rk3368 lcdc: fix iommu crash when resume
Signed-off-by: hjc <hjc@rock-chips.com>
2015-05-25 16:52:38 +08:00
Huang, Tao
03e19aa6a8 arm64: rockchip: rk3368: refactor efuse code
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-05-25 15:53:03 +08:00
Huang, Tao
88fe0132cc arm64: rockchip: rk3368: dts: add rockchip,rk3368-efuse-256
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-05-25 15:53:03 +08:00
Shengqin.Zhang
bfecf47813 fix rga mmu buf cause system crash when use ion mmu buf
Signed-off-by: Shengqin.Zhang <zsq@rock-chips.com>
2015-05-25 15:30:20 +08:00
Simon
9b27f65bf6 rk3368: iommu: fix region free position when iovmm_activate failed
Signed-off-by: Simon <xxm@rock-chips.com>
2015-05-25 11:54:39 +08:00
Shawn Lin
66944054a5 Revert "mmc: rk_sdmmc: manually zero desc after allocated on ARM64 platform."
This reverts commit e68d16d336.
2015-05-25 10:50:47 +08:00
Zhangfei Gao
3c8fa1c0b7 mmc: dw_mmc: init desc in dw_mci_idmac_init
Set 0 to des1 in 32bit case.
Otherwise the random value of des1 will be used in
dw_mci_translate_sglist: IDMAC_SET_BUFFER1_SIZE(desc, length)

Signed-off-by: Fei Wang <w.f@huawei.com>
Signed-off-by: Zhangfei Gao <zhangfei.gao@linaro.org>
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2015-05-25 10:50:03 +08:00
Shawn Lin
828028c3fa dts: arm64: rk3368: fix wrong property for esd
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
cc: Sam Guo <sam.guo@rock-chips.com>
cc: Xiao Yao <xiaoyao@rock-chips.com>
2015-05-25 10:11:57 +08:00
ShenZhengyi
efa7b70012 CVBS: Add gm7122 driver.
If you use it, should add board information to dts file, such as i2c address, sleep pin.
      like that:
	gm7122_tve@44 {
		compatible = "gm7122_tve";
		reg = <0x44>;
		rockchip,source = <0>; //0: LCDC0; 1: LCDC1
		rockchip,prop = <PRMRY>;//<EXTEND>
		gpio-reset = <&gpio0 GPIO_A1 GPIO_ACTIVE_HIGH>;
		gpio-sleep = <&gpio0 GPIO_C6 GPIO_ACTIVE_HIGH>;
		status = "okay";
	};

Signed-off-by: ShenZhengyi <szy@rock-chips.com>
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2015-05-23 16:17:32 +08:00
Zheng Yang
1f03967adf HDMI: No need to set audio when hdmi is not connected.
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2015-05-23 11:08:49 +08:00
Peng Du
a3a744d4df arm64: kernel: add system revision support
Bug 1248538

Change-Id: I272a264ba2904dfc7a2c6d74ab4fbfdd301b8985
Signed-off-by: Peng Du <pdu@nvidia.com>
Reviewed-on: http://git-master/r/260756
Reviewed-by: Alexander Van Brunt <avanbrunt@nvidia.com>
2015-05-22 22:27:05 +08:00
Stephen Smalley
6f4f0dc1bc selinux: enable genfscon labeling for sysfs and pstore files
Support per-file labeling of sysfs and pstore files based on
genfscon policy entries.  This is safe because the sysfs
and pstore directory tree cannot be manipulated by userspace,
except to unlink pstore entries.
This provides an alternative method of assigning per-file labeling
to sysfs or pstore files without needing to set the labels from
userspace on each boot.  The advantages of this approach are that
the labels are assigned as soon as the dentry is first instantiated
and userspace does not need to walk the sysfs or pstore tree and
set the labels on each boot.  The limitations of this approach are
that the labels can only be assigned based on pathname prefix matching.
You can initially assign labels using this mechanism and then change
them at runtime via setxattr if allowed to do so by policy.

Change-Id: If5999785fdc1d24d869b23ae35cd302311e94562
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
Suggested-by: Dominick Grift <dac.override@gmail.com>
2015-05-22 10:26:04 -04:00
Zheng Yang
ab64cd261a HDMI: register display type according lcdc property.
If property of lcdc connected by HDMI is EXTERN,
	we register HDMI as a aux display device.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2015-05-22 18:38:01 +08:00