Commit Graph

406660 Commits

Author SHA1 Message Date
Mark Yao
245c3c536f video: lcdc: rk3228: add vop tvout support
Change-Id: Ibfa16c73735132e0a50f7b52efb75681e61d9b20
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2015-11-06 08:36:28 +08:00
Mark Yao
a60b6e8e10 video: lcdc: rk3228: fix interlace display
New version H/W don't need yszie div 2 anymore.

Change-Id: I1c8927ad5dd00fd1af16ef9ca60c9979b4db696e
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2015-11-06 08:36:27 +08:00
Mark Yao
2b0be80c6a video: hdmi: judge interlace mode from vmode bit mask
Vmode is a flag with bit mask, we can't judge interlace mode
from equal compare, need mask its bit.

Change-Id: Iad69bd52173c5ea179639deaff25f9a4ed3fc5d3
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2015-11-06 08:36:27 +08:00
Mark Yao
05d226be7e video: lcdc: judge interlace mode from vmode bit mask
Vmode is a flag with bit mask, we can't judge interlace mode
from equal compare, need mask its bit.

Change-Id: I0cc53503198f98dc58369f4c9e6dd78b47095968
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2015-11-06 08:36:27 +08:00
Mark Yao
849343d1a7 rk_fb: add RGB BT709/BT2020 format
Change-Id: I9581f78955c3efe77375bfa5e8ac571ac1d5aae4
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2015-11-06 08:36:26 +08:00
Mark Yao
ddcff9a5c3 rk_fb: set interlace flag for dts timing
Change-Id: I8711cefdf224af88214ed39d9ae225be8bc62304
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2015-11-06 08:36:26 +08:00
zyc
67214f7efa camera: rk_camsys: rk3288: change gpio map method in camsys_gpio.h
rk3288 gpio bank0 only has 24 pins not 32 pins,so modify the gpio map
method for rk3288.

Change-Id: I1d59b25d9acb0f51f9a1ad8ec74db2952534b1f2
Signed-off-by: ZhongYichong <zyc@rock-chips.com>
2015-11-05 14:14:45 +08:00
Zhaoyifeng
31d8fc59d8 ARM: dts: rk3228-sdk: enable nandc
Change-Id: I449544595eb93f6cb9d7154aced253bebe1dceb7
Signed-off-by: Zhaoyifeng <zyf@rock-chips.com>
2015-11-04 12:03:12 +08:00
Zhaoyifeng
f5509c80dd ARM: dts: rk3228: add nandc support
Change-Id: I40ddba4f4ce56a34ca5e448f1dfbcc06c2ad445c
Signed-off-by: Zhaoyifeng <zyf@rock-chips.com>
2015-11-04 11:35:02 +08:00
Romain Izard
6a6bfd15df mmc: Allow forward compatibility for eMMC
As stated by the eMMC 5.0 specification, a chip should not be rejected
only because of the revision stated in the EXT_CSD_REV field of the
EXT_CSD register.

Remove the control on this value, the control of the CSD_STRUCTURE field
should be sufficient to reject future incompatible changes.

Change-Id: Ib69314bee902a4036183ef9a3565d9f0423ec971
Signed-off-by: Romain Izard <romain.izard.pro@gmail.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2015-11-04 09:45:30 +08:00
Jianhong Chen
8777e58b88 ARM: dts: rk3228-sdk: enable psci
Change-Id: I0d965a15e2938f8b54d056d0b7e21ec9ce33ee57
Signed-off-by: Jianhong Chen <chenjh@rock-chips.com>
2015-11-02 14:56:04 +08:00
Jianhong Chen
2aef250139 ARM: dtsi: rk3228: add psci support
This is just add psci code into kernel, if you want to enable psci,
you must add psci=enable in the Command Line.

Change-Id: Iaf0e0116cbaba0d210cb99d59c0ee82768bf54bb
Signed-off-by: Jianhong Chen <chenjh@rock-chips.com>
2015-11-02 14:56:03 +08:00
Jianhong Chen
9ad64eb2bf ARM: rockchip: support arch32 psci suspend
Change-Id: I0341d1c019b8c00376af574cd9f51e87fafa8601
Signed-off-by: Jianhong Chen <chenjh@rock-chips.com>
2015-11-02 14:56:03 +08:00
Huang zhibao
11d43ed737 arm: rockchip: rk3228: dts: add pwm remote-ctrl
Change-Id: Iccb31c2472238887b24ca61d7c7bdcb54a1e0778
Signed-off-by: Huang zhibao <hzb@rock-chips.com>
2015-11-02 09:40:33 +08:00
Zheng Yang
209c26642c video: rockchip: fb: delete DISPLAY_POLICY_BOX_TEMP
Change-Id: I59147b833754d5417d2813eb902923b4f700a9b0
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2015-10-30 16:52:16 +08:00
Zheng Yang
83611653ad ARM: dts: rk3288-box: set disp-policy to DISPLAY_POLICY_BOX
Change-Id: I3ede07d2c26aaef44ec7165353a3b3d6a6177f6e
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2015-10-30 16:47:59 +08:00
Zheng Yang
6b99398a8e ARM64: dts: rk3368-box: set disp-policy to DISPLAY_POLICY_BOX
Change-Id: Ib97c581b7488926d5f4203ea1d61ff706118bcc5
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2015-10-30 16:42:54 +08:00
David Wu
67e6de73b6 i2c: rockchip: fix power off issue for rk818
The power off sequence is behind of i2c bus shutdown func,
it would prevent the rk818 to do power off action. The irq was
disabled when rk818 power off, it could let rk818 to power off
through i2c bus.

Change-Id: Ia6155f137ab2fa36dbe19e06878b0228670b1398
Signed-off-by: David Wu <wdc@rock-chips.com>
2015-10-30 16:25:50 +08:00
Shen Zhenyi
22cd957182 hdmi: cec: add HDMI_IOCTL_CECWAKESTATE
android HDMI CEC HAL need to know cec state when resume,
so we add the HDMI_IOCTL_CECWAKESTATE.

Change-Id: Iff942c6085d10891200cd873cc2ba53e9a2d6cad
Signed-off-by: Shen Zhenyi <szy@rock-chips.com>
2015-10-30 15:24:38 +08:00
Xiao Feng
40b2e9e44d arm64: rockchip: rk3368: dts: modify dvfs_table for core
Change-Id: I73c4a277b9fa38160f5206ebd8603984535f0ade
Signed-off-by: Xiao Feng <xf@rock-chips.com>
2015-10-30 11:29:00 +08:00
David Wu
d189d8cf8c pinctrl: rockchip: fix crashed issue during pinctrl suspend
if the chip was rk3288, it didn't use pinctrl-rk3368.c,
but pinctrl-rockchip.c, driver of pinctrl-rk3368 was not registered.
It would make the NULL pointer at pinctrl-rk3368 suspend func.

Change-Id: I09dd4fb9b8bf001a4222ed9bef62347785b9906f
Signed-off-by: David Wu <wdc@rock-chips.com>
2015-10-30 09:11:59 +08:00
chenzhen
1009af00c3 rk312x, mali_400: upgrade rk_ko_ver to 5.
Change-Id: If1851d44e75ef16e1b916ecb910526f749822be0
Signed-off-by: chenzhen <chenzhen@rock-chips.com>
2015-10-29 16:29:09 +08:00
Jianqun Xu
773a19827f ion: rockchip-ion: add API to set memory region secured
Add ion ioctl command -ION_IOC_SET_SECURED
for user to set memory region secured.

Change-Id: Ic4a7432ab8d2fd9f60fdfe7457e92f7c99768e12
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2015-10-29 09:36:18 +08:00
Jianqun Xu
c35ed767ce ARM: rockchip-psci: add interface for ion to set memory secured
Add function "psci_set_memory_secure" for device to set memory
region secured.

Change-Id: Ife807c91d37ae66a5e1a0a3d8263c68cd601937d
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2015-10-29 09:35:34 +08:00
chenzhen
1804151a2e rk312x, mali_400: make it more 'difficult' to dump down in mali_dvfs_list.
Change-Id: If5fd646aa6ca7f7383db70c84ff71f1570fe23b1
Signed-off-by: chenzhen <chenzhen@rock-chips.com>
2015-10-28 17:18:10 +08:00
Huang, Tao
d852f860d0 ARM: rockchip: rockchip_defconfig enable IP_MULTICAST
Change-Id: Ic40cb94753f9fedc548ae6a77b36d0bed5754d88
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-10-28 16:43:20 +08:00
Huang, Tao
dd52f9d076 ARM: rockchip: rockchip_defconfig enable UID_CPUTIME
Change-Id: Ifb92e539e868ed15561ae8698b226422fae5fee8
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-10-28 16:43:10 +08:00
Huang, Tao
7f34bc7954 ARM: rockchip: rockchip_defconfig enable kernel-mode NEON and NEON based cypto
Change-Id: Ie3975cd780bbbedaaa2e3384d49e9f90734b65fe
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-10-28 16:36:06 +08:00
Jianqun Xu
f6e70b0e4e ARM: rockchip-psci: add function id for secure memory set
Change-Id: I73c0b2c603a4b72f07804c684cd89bc82e5529c4
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2015-10-28 15:53:47 +08:00
Jianhong Chen
3be2246332 ARM: rockchip: psci support arch32 and arch64 smc call
Change-Id: I736c6c15cbb41d52aa9ef1e98cb9ebdd6ac9ebfc
Signed-off-by: Jianhong Chen <chenjh@rock-chips.com>
2015-10-28 15:06:53 +08:00
Huang, Tao
4f9bfd54e6 arm64: rockchip: rockchip_defconfig enable IP_MULTICAST
Change-Id: I07f7ad04f89c54b582b756c43d9841d99883e6df
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-10-28 14:27:11 +08:00
Huang, Tao
12573e2017 arm64: rockchip: rockchip_defconfig enable UID_CPUTIME
Change-Id: Ia6f86bf86220261eda27ae1bba880fdf61241d5c
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-10-28 13:56:24 +08:00
Jianqun Xu
7be89ff81f ARM: dts: rk3228: add ion node
Add ion node, with two memory reserved region,
cma-heap and system-heap

Change-Id: Ic6c4da56e0c608135653f901f37adfed7bc7cb15
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2015-10-28 10:57:49 +08:00
Huang, Tao
1ec4e2b4f1 arm64: rockchip: rockchip_defconfig enable ARM v8 crypto
Change-Id: I67d9ab8d0e8412e9899e64378beba8dd0764b310
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-10-27 19:55:45 +08:00
Huang, Tao
203f1b0cba arm64: rockchip: add support for kernel mode NEON
Change-Id: I964c5dad5562f0342b1d11d9a0483fcac0394e4d
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-10-27 19:54:13 +08:00
Huang, Tao
24220c2bb4 rockchip: quiet module_request personality-8
In Android-M, below change in bionic was introduced
https://android-review.googlesource.com/122131

Which caused lot of SELinux denials to be logged regarding
module_request (similar to below one) for 32bit systems,
There is quite a lot of module_request denials when any 32bit
executable is executed.

type=1400 audit(946685139.719:12): avc: denied { module_request }
for pid=1970 comm="tzdatacheck" kmod="personality-8"
scontext=u:r:tzdatacheck:s0 tcontext=u:r:kernel:s0 tclass=system
permissive=1

So we patch the kernel to not attempt module loading for alternate
execution environments.

Change-Id: I7bd2c5fc08fd00fa7ff53d3ced401564b474fad4
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-10-27 19:30:46 +08:00
Shawn Lin
8312c2733c mmc: dw_mmc: fix the max_blk_count in IDMAC
Even though 1MB is reserved for descriptor table in IDMAC,
the dw_mmc host driver is allowed to receive only maximum
128KB block length in one request. This is caused by setting
improper max_blk_count. It needs to be e adjusted so that
descriptor table is used fully. It is found that the performance
is improved with the increased the max_blk_count.

Change-Id: Ie4042f9e1924e0f575b9865aa721b7b61305c13d
Signed-off-by: Seungwon Jeon <tgih.jun@samsung.com>
Acked-by: Jaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: Alim Akhtar <alim.akhtar@samsung.com>
Reviewed-by: Shawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
2015-10-27 18:13:21 +08:00
Zheng Yang
4e642b3d5d ARM: dts: rk3228: hdmi: add pinctrl and pclk_hdmi_phy
Change-Id: I5570a3bf1970e6f8748cab55fea06a11af5c4f3e
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2015-10-27 17:57:42 +08:00
Huang, Tao
800979108b Merge branch 'android-3.10'
Exclude:
ext4 crypto
nl80211: fix scheduled scan RSSI matchset attribute confusion
mmc
Add wlan platform partial_resume handler
wlan: Add WLAN_PLAT_AP_FLAG for SOFTAP country code
ipc
zram
2015-10-27 17:35:20 +08:00
Ruchi Kandoi
d7670225d3 uid_cputime: Check for the range while removing range of UIDs.
Checking if the uid_entry->uid matches the uid intended to be removed will
prevent deleting unwanted uid_entry.
Type cast the key for the hashtable to the same size, as when they were
inserted. This will make sure that we can find the uid_entry we want.

Bug: 25195548
Change-Id: I567942123cfb20e4b61ad624da19ec4cc84642c1
Signed-off: Ruchi kandoi <kandoiruchi@google.com>
(cherry picked from commit 170458885df2e4e081d3f8489cfd4f66a9598995)
2015-10-27 17:22:46 +08:00
Riley Andrews
35d9cc3d71 Revert "android: binder: Change binder mutex to rtmutex."
This reverts commit ebce7cd30b.

This ends up doing more damage than good on most devices. Go back to
using a standard mutex.

(cherry picked from commit ea93186577de4fae3a2273c296bfcf1839048df0)
2015-10-27 17:14:39 +08:00
Eric Dumazet
4582a29e6b ipv6: inet6_sk() should use sk_fullsock()
SYN_RECV & TIMEWAIT sockets are not full blown, they do not have a pinet6
pointer.

Bug: 24163529
Change-Id: I6ce67a190d67d200c6ebeb81d2daeb9c86cd7581
Fixes: ca6fb06518 ("tcp: attach SYNACK messages to request sockets instead of listener")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Lorenzo Colitti <lorenzo@google.com>
(cherry picked from commit feee3c175c23ae72ed17154caaa82a3002de0023)
2015-10-27 17:14:21 +08:00
Eric Dumazet
d1d2a95cc6 net: add sk_fullsock() helper
We have many places where we want to check if a socket is
not a timewait or request socket. Use a helper to avoid
hard coding this.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

[backported from net-next 1d0ab25387]
[lorenzo@google.com: removed TCPF_NEW_SYN_RECV, and added a comment to add it back.]

Signed-off-by: Lorenzo Colitti <lorenzo@google.com>

Bug: 24163529
Change-Id: Ibf09017e1ab00af5e6925273117c335d7f515d73
(cherry picked from commit cdab04e3612c55f0906c84c3c05996a0507eab7d)
2015-10-27 17:14:07 +08:00
Martijn Coenen
4937dd7952 lowmemorykiller: trace kill events.
Allows for capturing lmk kill events and
their rationale.

Change-Id: Ibe215db5bb9806fc550c72c0b9832c85cbd56bf6
Signed-off-by: Martijn Coenen <maco@google.com>
(cherry picked from commit 6cfb58f07af4b913508f087fe551a08f5a21eb88)
2015-10-27 16:48:44 +08:00
Ard Biesheuvel
53a95fc774 arm64/crypto: use crypto instructions to generate AES key schedule
(cherry pick from commit 12ac3efe74)

This patch implements the AES key schedule generation using ARMv8
Crypto Instructions. It replaces the table based C implementation
in aes_generic.ko, which means we can drop the dependency on that
module.

Tested-by: Steve Capper <steve.capper@linaro.org>
Acked-by: Steve Capper <steve.capper@linaro.org>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Mark Salyzyn <salyzyn@google.com>
Bug: 23181629
(cherry picked from commit 60b9dd6043fdc26860d850c364fd92b1f4e170fc)
2015-10-27 16:48:16 +08:00
Riley Andrews
d2d46598ca arm64: crypto: Change priority of arm64 aes cipher.
(cherry pick from commit d802476e8db2eb616d47d0a06310276532cc2ffa)

Change-Id: I0c614e0eca71b65945ff8bd17c65b03a02918b18
Signed-off-by: Riley Andrews <riandrews@google.com>
Signed-off-by: Mark Salyzyn <salyzyn@google.com>
Bug: 23181629
(cherry picked from commit 52d464160266101140ce95992256c25cc03e2bb3)
2015-10-27 16:47:58 +08:00
Jeff Vander Stoep
3841b3185d selinux: do not check open perm on ftruncate call
Use the ATTR_FILE attribute to distinguish between truncate()
and ftruncate() system calls. The two other cases where
do_truncate is called with a filp (and therefore ATTR_FILE is set)
are for coredump files and for open(O_TRUNC). In both of those cases
the open permission has already been checked during file open and
therefore does not need to be repeated.

Commit 95dbf73931 ("SELinux: check OPEN on truncate calls")
fixed a major issue where domains were allowed to truncate files
without the open permission. However, it introduced a new bug where
a domain with the write permission can no longer ftruncate files
without the open permission, even when they receive an already open
file.

(cherry picked from commit b21800f304392ee5d20f411c37470183cc779f11)

Bug: 22567870
Change-Id: Id7c305e46beba5091c2c777529bd468216aae1c3

Signed-off-by: Jeff Vander Stoep <jeffv@google.com>
Acked-by: Stephen Smalley <sds@tycho.nsa.gov>
Signed-off-by: Paul Moore <pmoore@redhat.com>
(cherry picked from commit df46bc83c1fc9b64b2e86290935a3ad550b2e56e)
2015-10-27 16:47:05 +08:00
Lorenzo Colitti
abe081915c Fix NULL pointer dereference in tcp_nuke_addr.
tcp_nuke addr only grabs the bottom half socket lock, but not the
userspace socket lock. This allows a userspace program to call
close() while the socket is running, which causes a NULL pointer
dereference in inet_put_port.

Bug: 23663111
Bug: 24072792
Change-Id: Iecb63af68c2db4764c74785153d1c9054f76b94f
Signed-off-by: Lorenzo Colitti <lorenzo@google.com>
(cherry picked from commit 74d66ee756afcc3269e4c1341f793c52be629af9)
2015-10-27 16:46:47 +08:00
Amit Pundir
0f5728d8fa usb: phy: fix dual role sysfs build if kernel modules are supported
Add a missing ";" after EXPORT_SYMBOL() otherwise we run
into following build error if Kernel Modules are supported:
----------
  CC      drivers/usb/phy/class-dual-role.o
drivers/usb/phy/class-dual-role.c:91:1: error: expected ',' or ';' before 'int'
 int dual_role_get_property(struct dual_role_phy_instance *dual_role,
 ^
make[3]: *** [drivers/usb/phy/class-dual-role.o] Error 1
----------

Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
(cherry picked from commit 9ff158f4c245c2fecb1489a4aae62ca67c0846a1)

Change-Id: I7ec77584b3a753448ddc50a74204a20f4636f8a4
(cherry picked from commit f5af56b478111455ce9041d958b83f13bc742af6)
2015-10-27 16:45:44 +08:00
Vinil Cheeramvelil
a7858114c4 ion: Handle the memory mapping correctly on x86
This patch modifies the ion page pool code to address
limitation in x86 PAT. When one physical page is mapped
to multiple virtual pages, the same cache policy
should be used. Add set_memory_wc/uc call to avoid aliases.
If not, all mappings will be cached(write back).

Change-Id: I98ee8902df0c80135dddfa998c4ca4c2bb44e40e
Signed-off-by: Zhebin Jin <zhebin.jin@intel.com>
Signed-off-by: Vinil Cheeramvelil <vinil.cheeramvelil@intel.com>
(cherry picked from commit 6db47cc7e2f1d8dd8fc84912202ed749d6781a76)

Conflicts:
	drivers/staging/android/ion/Kconfig
	drivers/staging/android/ion/ion_priv.h
2015-10-27 16:42:39 +08:00