Commit Graph

643361 Commits

Author SHA1 Message Date
Yvonne Chen
a1e4958ced tee: add tee load dynamic control
PD#159071:  tee load dynamic control using disable_flag

using disable flag to disable tee load 

Change-Id: I9c138e3830412ee04dcd82812b1a00cbed1ab940
Signed-off-by: Yvonne Chen <yvonne.chen@amlogic.com>
2018-01-30 03:46:54 -08:00
Pengguang Zhu
6678c94da3 tee: firmware: add new parameter vdec type
PD#159071: add new parameter vdec type

Change-Id: Ib3d49d2bbc56a36844d0c53a7c8a46d30543ebdc
Signed-off-by: Pengguang Zhu <pengguang.zhu@amlogic.com>
2018-01-30 03:33:23 -08:00
Evoke Zhang
4b74c61a7e lcd: optimize lcd notifier event for power sequence
PD#158197: lcd: optimize lcd notifier event for power sequence

Change-Id: I6b91bf1c2c6e31dfa3133f078d37d32fdce2a5bd
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
2018-01-29 22:28:30 -08:00
wenfeng.guo
d636f6ddb9 di: optimize wire drawing in pulldown22 video appears on gxlx
PD#157033: di: optimize wire drawing in pulldown22 video appears on gxlx

Change-Id: I4c56cee942059794aac4969febbf35c0ef565fd3
Signed-off-by: wenfeng.guo <wenfeng.guo@amlogic.com>
2018-01-29 22:10:09 -08:00
Kaifu Hu
f8043428e5 hdmitx: add delay for plugout
PD#157869: hdmitx: add delay for plugout

1. add delay for plugout and ignore plugout work when boot.
2. delete set display when plugin.

Change-Id: I21fee9d3f68dc5fe84bcd76efc0a8572e3976ef6
Signed-off-by: Kaifu Hu <kaifu.hu@amlogic.com>
2018-01-29 21:16:22 -08:00
Bencheng Jing
827be37207 di: fix pulldown crash for 1080i&1088i timing
PD#159599: di: fix pulldown crash for 1080i&1088i timing

Change-Id: I1f89920e195feaaa643f94d9227bf2e1a0268b15
Signed-off-by: Bencheng Jing <bencheng.jing@amlogic.com>
2018-01-29 20:13:31 -08:00
Nian Jing
962ff2bb1d cvbs: fix display set mode block
PD#157658: add delaywork enable dac

Change-Id: I2682c80c7a28d8bfdb88e038141c3e83aea33c46
Signed-off-by: Nian Jing <nian.jing@amlogic.com>
2018-01-29 20:01:21 -08:00
hongmin hua
f869a01da6 cec: set reg map before irq enable
PD#158921: cec: change the order of irq in probe

Change-Id: I8099e918a06c9d741de890b773ec6ca47ab44aba
Signed-off-by: hongmin hua <hongmin.hua@amlogic.com>
2018-01-29 19:11:45 -08:00
Matthew Shyu
f9fc29dfa1 crypto: Enable EXT4_ENCRYPTION for file based encryption [2/4]
PD#158397: crypto: enable FBE

Encrypto CONFIG_EXT4_ENCRYPTION for file based encryption

Change-Id: Iaad3679bc9ac05eea1d44ad7c6d30a0324e82e89
Signed-off-by: Matthew Shyu <matthew.shyu@amlogic.com>
2018-01-29 01:28:31 -08:00
Tellen Yu
2f910981f0 ppmgr:enable ppmgr module [1/1]
PD#157786: enable ppmgr

enable txlx ppmgr feature

Change-Id: I3939724e5a9c51349875bc340e5fcd47c2774e12
Signed-off-by: Tellen Yu <tellen.yu@amlogic.com>
2018-01-28 23:37:37 -08:00
Peipeng Zhao
5a2011bc59 audio: add audio external loopback feature for axg chip
PD#159617: audio: add audio external loopback feature for axg chip

For S400 & S420 board, please modify dts to enable external loopback
please read following file:
Documentation/devicetree/bindings/amlogic/axg-sound-loopback.txt

Change-Id: Ie96d10eb8e6ae81aaff0b3e6965aa4e22f07f0b8
Signed-off-by: Peipeng Zhao <peipeng.zhao@amlogic.com>
2018-01-26 13:45:47 +08:00
Sunny Luo
d86163bbff touchscreen: goodix gt9xx driver support
PD#158973: goodix gt9xx driver support

Change-Id: Iffac9172ab1869521ecff731f7d50ddf7ea01b14
Signed-off-by: Sunny Luo <sunny.luo@amlogic.com>
2018-01-24 01:33:08 -07:00
Yi Zhou
27f6767cb7 hdmitx: update gxm dts
PD#154260: hdmitx: update gxm dts

Change-Id: Iddf3aa4512e5073f7e7dd1ba4558f38eb7998d58
Signed-off-by: Yi Zhou <yi.zhou@amlogic.com>
2018-01-23 22:48:16 -07:00
Kuibao Zhang
0f31ad4a47 dts: fix 8.1 r311 bt open fail
PD#159307: BT fix 8.1 r311 bt open fail
1.DTS,change bt en pin
2.FIX bt en pinmux

Change-Id: I59c5978a5b52b49f9aa1aeede93d2761bca62959
Signed-off-by: Kuibao Zhang <kuibao.zhang@amlogic.com>
2018-01-23 18:59:06 -07:00
Kaifu Hu
76d55ee5ec hdmitx: update txlx dts
PD#159209: hdmitx: update txlx dts

add hdcp22_skpclk and hdcp22_esmclk.

Change-Id: I2a1cc3fd31cf3bb5002cdc1673573f18349f612d
Signed-off-by: Kaifu Hu <kaifu.hu@amlogic.com>
2018-01-23 18:56:34 -07:00
Nian Jing
aa90ad1e9d vbi: fix vbi crash on switch channel
PD#158142: fix vbi crash on switch channel

Change-Id: I0d4a585479b142cc585db0b00efb9d8772cc61ee
Signed-off-by: Nian Jing <nian.jing@amlogic.com>
2018-01-23 17:27:58 +08:00
Weiming Liu
9fee745b2a lcd: add lcd_extern p070acb driver
PD#159016: lcd_extern: add p070acb driver

Change-Id: Id2fd949f37815de1ec9bbd90170dce459b661256
Signed-off-by: Weiming Liu <weiming.liu@amlogic.com>
2018-01-22 21:24:54 -07:00
Victor Wan
20946741c8 Merge branch 'android-4.9' into amlogic-4.9-dev
Conflicts:
	Makefile
	init/main.c
2018-01-22 20:17:25 +08:00
Liang Yang
6794963993 nand: Rsv zone bug fix
PD#156785: enhance rsv ecc&incomplete abnormal handler

NOTE: Relative commit(bug156785), patch together.

Change-Id: I05f9a4c521b75f5fcd071fdf09ca76a3f0aae033
Signed-off-by: Liang Yang <liang.yang@amlogic.com>
2018-01-21 21:19:24 -07:00
Xing Wang
105c91184a audio: dts: fix i2c for tas5707 and i2s pinmux
PD#159131: audio: dts : fix i2c for tas5707 and i2s pinmux

Change-Id: Ic4a2de8b5dcba668a793bf0c0c17d660418933b2
Signed-off-by: Xing Wang <xing.wang@amlogic.com>
2018-01-20 18:09:27 -07:00
Evoke Zhang
cfc68c2718 lcd: optimize gpio register function for init value
PD#158752: lcd: optimize gpio register function for init value

For gpio register required init value, we can't register gpio when
lcd probe, otherwise it maybe change the gpio value which is working
by bootloader init.
So we register gpio when first calling by lcd power step controlling.

Change-Id: I629143f50924aac7e3ea27aa1a2c4b12a1992b71
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
2018-01-20 18:04:59 -07:00
Jian Wang
5e67a17e72 ionvideo: update ionvideo dts for tv
PD#158997: update ionvideo dts for tv

Change-Id: Iefa4ed1b93dc244d23aa0892e04722aed2836eb7
Signed-off-by: Jian Wang <jian.wang@amlogic.com>
2018-01-20 18:02:09 -07:00
Sunny Luo
ebd2ef4e30 PD#158974: touchscreen: goodix GT1X driver support
Change-Id: I45b6e97a2fdba801c681e1858a155e2df7f050fd
Signed-off-by: Sunny Luo <sunny.luo@amlogic.com>
2018-01-19 23:57:39 -07:00
kele bai
ef927a5be3 di: add dummy buffer for first field
PD#158592: di: add dummy buffer for first field

1) only middle buffer can be process in di

Change-Id: Ide92f1a17428cf5c27468a6dfc086ad2f4685fe3
Signed-off-by: kele bai <kele.bai@amlogic.com>
2018-01-19 02:30:01 -07:00
Logan Gunthorpe
a62f090742 char_dev: extend dynamic allocation of majors into a higher range
PD#159028: char_dev: extend dynamic allocation of majors into a higher range

We've run into problems with running out of dynamicly assign char
device majors particullarly on automated test systems with
all-yes-configs. Roughly 40 dynamic assignments can be made with such
kernels at this time while space is reserved for only 20.

Currently, the kernel only prints a warning when dynamic allocation
overflows the reserved region. And when this happens drivers that have
fixed assignments can randomly fail depending on the order of
initialization of other drivers. Thus, adding a new char device can cause
unexpected failures in completely unrelated parts of the kernel.

This patch solves the problem by extending dynamic major number
allocations down from 511 once the 234-254 region fills up. Fixed
majors already exist above 255 so the infrastructure to support
high number majors is already in place. The patch reserves an
additional 128 major numbers which should hopefully last us a while.

Kernels that don't require more than 20 dynamic majors assigned (which
is pretty typical) should not be affected by this change.

Change-Id: Ibf1ddaf0b7ce623c9f1a18c42a1ad39a89bb3f41
Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Alan Cox <alan@linux.intel.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Linus Walleij <linus.walleij@linaro.org>
Link: https://lkml.org/lkml/2017/6/4/107
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Yixun Lan <yixun.lan@amlogic.com>
2018-01-18 19:17:32 -07:00
Xingyu Chen
24091d7c43 pinctrl: correct spelling mistakes for txlx and axg
PD#158937: pinctrl: correct spelling mistakes for txlx and axg

Change-Id: I465cd138b9b9a5e7089715c8495f47137d21e6ad
Signed-off-by: Xingyu Chen <xingyu.chen@amlogic.com>
2018-01-18 04:04:34 -07:00
Nanxin Qin
8474a382fb media: fixed the issure of crash when get pts rec num.
PD#158950: fixed the issure of crash when get pts rec num.

Change-Id: Iadba80bd5c0c1c4dc001e0321ed0e1a460c57ced
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
2018-01-18 02:34:31 -07:00
sky zhou
05a1bf9ad2 DRM: fix gem object leak in PRIME_EXPORT operation.
PD#158474: fixed exported fd leaked.

Exported fd didnot bind correct release function,
use core gem-prime function to re-write export function.
The import function is not provded, for now we only import
the buffer created from meson driver.

Change-Id: I15fad65741631ee2b367d088e733f20af8b0cf5a
Signed-off-by: sky zhou <sky.zhou@amlogic.com>
2018-01-18 02:18:53 -07:00
Sunny Luo
4f75f1bd8b PD#158972: touchscreen: focaltech ft3x27 driver support
Change-Id: I5e1de4a6074a75c288d52fd388323978415610bd
Signed-off-by: Sunny Luo <sunny.luo@amlogic.com>
2018-01-18 02:05:00 -07:00
Nan Li
6c8ce66989 sd: add txlx r311 sd_uart support
PD#158480: r321 sd_emmc_b port is sdio wifi,
so modify r321 dts b port pinname.

Change-Id: I6a7e44c7b567f1ba9467c2696b6d5637b12939de
Signed-off-by: Nan Li <nan.li@amlogic.com>
2018-01-18 01:42:14 -07:00
Nan Li
97329e72ae emmc: optimize emmc dts config
PD#158871: optimize emmc dts config,
delete "status" cfg.

Change-Id: I5ae2aa66384db84619ffcad7354facd4aa2bac54
Signed-off-by: Nan Li <nan.li@amlogic.com>
2018-01-17 20:14:50 -07:00
Yalong Liu
85254f4e37 Revert "drm: force ARGB8888 format to osd display"
PD#152825: Revert "drm: force ARGB8888 format to osd display"
This reverts commit 63a6fdd4fa.

Change-Id: Icc99d5ec3bcbf6e879bedf9385b4b56be679741b
Signed-off-by: Yalong Liu <yalong.liu@amlogic.com>
2018-01-18 08:17:39 +08:00
Renjun Xu
2449a4800e ledring: add suspend/resume for ledring
PD#158940: add suspend/resume for ledring

Change-Id: I64827cd230708481768be7aabc3b4f814af8b636
Signed-off-by: Renjun Xu <renjun.xu@amlogic.com>
2018-01-17 10:59:07 +08:00
tao zeng
c2603ea592 mm: fix compile error on other configs
PD#153120: mm:fix compile error on other configs

Change-Id: I8e72afa508c44149f69c6d8c34698d13848e539c
Signed-off-by: tao zeng <tao.zeng@amlogic.com>
2018-01-16 00:03:40 -07:00
Liang Yang
a9c605df2f nand: add llseek for fw_env tools
PD#158552: Implememt llseek for fw_printenv/fw_setenv tools

Change-Id: Ie6176903c7155cdb7daf17049a7356ed8f61e463
Signed-off-by: Liang Yang <liang.yang@amlogic.com>
2018-01-15 23:18:17 -07:00
Nan Li
0657999e80 sd: add txlx r311 sd_uart support
PD#158480: add sd_uart support on txlx r311.

Change-Id: I62a094e66ca5934e0992cc6a5cc44d14e8ce20c3
Signed-off-by: Nan Li <nan.li@amlogic.com>
2018-01-15 23:17:13 -07:00
tao zeng
5f97fc6b3d mm: close debug print of cma alloc
PD#153120: mm: close debug print of cma alloc

These print message may print a lot when video playback
And cause it not smooth.

Change-Id: If1f18d5e8a0234f1daca2c6e803a23ba90354414
Signed-off-by: tao zeng <tao.zeng@amlogic.com>
2018-01-14 23:12:59 -07:00
tao zeng
56ae65cd3d mm: check pfn overflow for low memory platform
PD#158373: mm: check pfn overflow for low memory platform

On ARM64 platform, when vmemmap_populate is called for reserve
memory for struct page, it reserved based 1GB a loop. And 16MB
memory will be reserved at least. This caused memory waste if
total RAM is less than 1GB.

Basically reserve memory size for struct page is calculated by:

    reserve size = sizeof(struct page) * number of pages.

For example, currently struct page is 64 bytes on ARM64. A page
is 4KB. So reserve size table can be:

    Memory  |  page count  |  reserve size(bytes)
-------------------------------------------------
     128MB  |       32768  |         2097152(2MB)
     256MB  |       65536  |         4194304(4MB)
     512MB  |      131072  |         8388608(8MB)

Note, This reserve is aligned at 2MB.

Change-Id: I912ab01252d68fd065eb94fa2c5556cefa59a256
Signed-off-by: tao zeng <tao.zeng@amlogic.com>
2018-01-12 00:42:50 -07:00
Renjun Xu
120ae475e8 ledring: modify ioctl support 32bit and 64bit
PD#157849: modify ioctl support 32bit and 64bit

Change-Id: I2f2395110454a2a05ec089601a937a1c884fa800
Signed-off-by: Renjun Xu <renjun.xu@amlogic.com>
2018-01-11 19:40:34 -07:00
Evoke Zhang
2d3ba04332 clkmsr: init clkmsr earlier for lcd driver called
PD#158608: clkmsr: init clkmsr earlier for lcd driver called.
also add missed pwm config in dts for backlight,
and add pwm pointer protection in backlight driver.

Change-Id: Ib3d435a0f4418e31d94e65b1cee9919f1f6325c8
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
2018-01-11 04:15:01 -07:00
Nan Li
0a20c93893 emmc: optimize emmc driver configs.
PD#158348: modify emmc dts config data to match data.

Change-Id: Id1f29a8f5b47342376cfa976c6dba7e88bcc5514
Signed-off-by: Nan Li <nan.li@amlogic.com>
2018-01-10 02:02:03 -07:00
Greg Kroah-Hartman
91549408ce Merge 4.9.76 into android-4.9
Changes in 4.9.76
	kernel/acct.c: fix the acct->needcheck check in check_free_space()
	crypto: n2 - cure use after free
	crypto: chacha20poly1305 - validate the digest size
	crypto: pcrypt - fix freeing pcrypt instances
	sunxi-rsb: Include OF based modalias in device uevent
	fscache: Fix the default for fscache_maybe_release_page()
	nbd: fix use-after-free of rq/bio in the xmit path
	kernel: make groups_sort calling a responsibility group_info allocators
	kernel/signal.c: protect the traced SIGNAL_UNKILLABLE tasks from SIGKILL
	kernel/signal.c: protect the SIGNAL_UNKILLABLE tasks from !sig_kernel_only() signals
	kernel/signal.c: remove the no longer needed SIGNAL_UNKILLABLE check in complete_signal()
	iommu/arm-smmu-v3: Don't free page table ops twice
	iommu/arm-smmu-v3: Cope with duplicated Stream IDs
	ARC: uaccess: dont use "l" gcc inline asm constraint modifier
	Input: elantech - add new icbody type 15
	x86/microcode/AMD: Add support for fam17h microcode loading
	parisc: Fix alignment of pa_tlb_lock in assembly on 32-bit SMP kernel
	parisc: qemu idle sleep support
	x86/tlb: Drop the _GPL from the cpu_tlbstate export
	Map the vsyscall page with _PAGE_USER
	mtd: nand: pxa3xx: Fix READOOB implementation
	Linux 4.9.76

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2018-01-10 09:51:38 +01:00
Yueguie He
2fdf85946c audio: tdm: set tdmin max channals by dts
PD#158473: set tdmin max channals by dts

Change-Id: Ia6ff262fec6b3c156ac35f89b72cd690621f12fc
Signed-off-by: Yueguie He <yuegui.he@amlogic.com>
2018-01-10 01:41:14 -07:00
kele bai
81d604264c di: add protection for no mirror function
PD#157314: di: add protection for no mirror function

1) disable mirror function, set keep frame to 0 avoid post process
   buffer
2) modify for keep function, avoid crash caused by calling de post
   in blankout mode
3) move mutex operation out of tasklet
4) remove framereset in hw disable function

Change-Id: I6166a855a7fe6ad38a21c570e9ad0a6f9a204424
Signed-off-by: kele bai <kele.bai@amlogic.com>
2018-01-10 01:40:57 -07:00
Greg Kroah-Hartman
7bbc6ca488 Linux 4.9.76 2018-01-10 09:29:55 +01:00
Boris Brezillon
5e1f377fc8 mtd: nand: pxa3xx: Fix READOOB implementation
commit fee4380f36 upstream.

In the current driver, OOB bytes are accessed in raw mode, and when a
page access is done with NDCR_SPARE_EN set and NDCR_ECC_EN cleared, the
driver must read the whole spare area (64 bytes in case of a 2k page,
16 bytes for a 512 page). The driver was only reading the free OOB
bytes, which was leaving some unread data in the FIFO and was somehow
leading to a timeout.

We could patch the driver to read ->spare_size + ->ecc_size instead of
just ->spare_size when READOOB is requested, but we'd better make
in-band and OOB accesses consistent.
Since the driver is always accessing in-band data in non-raw mode (with
the ECC engine enabled), we should also access OOB data in this mode.
That's particularly useful when using the BCH engine because in this
mode the free OOB bytes are also ECC protected.

Fixes: 43bcfd2bb2 ("mtd: nand: pxa3xx: Add driver-specific ECC BCH support")
Reported-by: Sean Nyekjær <sean.nyekjaer@prevas.dk>
Tested-by: Willy Tarreau <w@1wt.eu>
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Acked-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
Tested-by: Sean Nyekjaer <sean.nyekjaer@prevas.dk>
Acked-by: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Richard Weinberger <richard@nod.at>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2018-01-10 09:29:54 +01:00
Borislav Petkov
beca4e2d99 Map the vsyscall page with _PAGE_USER
This needs to happen early in kaiser_pagetable_walk(), before the
hierarchy is established so that _PAGE_USER permission can be really
set.

A proper fix would be to teach kaiser_pagetable_walk() to update those
permissions but the vsyscall page is the only exception here so ...

Signed-off-by: Borislav Petkov <bp@suse.de>
Acked-by: Hugh Dickins <hughd@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2018-01-10 09:29:54 +01:00
Thomas Gleixner
47f3cea393 x86/tlb: Drop the _GPL from the cpu_tlbstate export
commit 1e5476815f upstream.

The recent changes for PTI touch cpu_tlbstate from various tlb_flush
inlines. cpu_tlbstate is exported as GPL symbol, so this causes a
regression when building out of tree drivers for certain graphics cards.

Aside of that the export was wrong since it was introduced as it should
have been EXPORT_PER_CPU_SYMBOL_GPL().

Use the correct PER_CPU export and drop the _GPL to restore the previous
state which allows users to utilize the cards they payed for.

As always I'm really thrilled to make this kind of change to support the
#friends (or however the hot hashtag of today is spelled) from that closet
sauce graphics corp.

Fixes: 1e02ce4ccc ("x86: Store a per-cpu shadow copy of CR4")
Fixes: 6fd166aae7 ("x86/mm: Use/Fix PCID to optimize user/kernel switches")
Reported-by: Kees Cook <keescook@google.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Thomas Backlund <tmb@mageia.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2018-01-10 09:29:54 +01:00
Helge Deller
91dfc41e75 parisc: qemu idle sleep support
commit 310d82784f upstream.

Add qemu idle sleep support when running under qemu with SeaBIOS PDC
firmware.

Like the power architecture we use the "or" assembler instructions,
which translate to nops on real hardware, to indicate that qemu shall
idle sleep.

Signed-off-by: Helge Deller <deller@gmx.de>
Cc: Richard Henderson <rth@twiddle.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2018-01-10 09:29:54 +01:00
Helge Deller
14c06206b9 parisc: Fix alignment of pa_tlb_lock in assembly on 32-bit SMP kernel
commit 88776c0e70 upstream.

Qemu for PARISC reported on a 32bit SMP parisc kernel strange failures
about "Not-handled unaligned insn 0x0e8011d6 and 0x0c2011c9."

Those opcodes evaluate to the ldcw() assembly instruction which requires
(on 32bit) an alignment of 16 bytes to ensure atomicity.

As it turns out, qemu is correct and in our assembly code in entry.S and
pacache.S we don't pay attention to the required alignment.

This patch fixes the problem by aligning the lock offset in assembly
code in the same manner as we do in our C-code.

Signed-off-by: Helge Deller <deller@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2018-01-10 09:29:54 +01:00