Commit Graph

640987 Commits

Author SHA1 Message Date
Yi Zhou
e447a4bccb hdmitx: clean up deadcode
PD#151236: driver defect clean up:
#252
#270~283

Change-Id: I009c06dcb14bd3fb686c46a155418093bc7f7514
Signed-off-by: Yi Zhou <yi.zhou@amlogic.com>
2017-10-18 04:51:49 -07:00
Yao.Liu
a09f71110c ionvideo: modify ionvideo print info to pass the vts test
PD#151634: modify ionvideo print info to pass the vts test

Change-Id: I32e6bba500f7dc3cc0c987c65187e1354efc424e
Signed-off-by: Yao.Liu <yao.liu@amlogic.com>
2017-10-16 03:06:06 -07:00
Ao Xu
a7ed492099 defconfig: disable CONFIG_ANDROID_LOGGER
PD#149771: disable CONFIG_ANDROID_LOGGER

No need CONFIG_ANDROID_LOGGER from Android L.
Android uses a service called logd to provide the
same function as the driver did.

Change-Id: I89c9d3bdb3dc3786e817c5f4055856f41babfc5a
Signed-off-by: Ao Xu <ao.xu@amlogic.com>
2017-10-16 03:04:25 -07:00
Yi Zeng
b04de58cb3 nand: add slc nand support:F59L1G81LA (2Y),F59L1G81MA (2Y)
PD#151128: nand: add slc nand support:F59L1G81LA (2Y),F59L1G81MA (2Y)

Change-Id: I695e222c305aa4a7c9ca33d6e17c20d57bcf0191
Signed-off-by: Yi Zeng <yi.zeng@amlogic.com>
2017-10-16 02:10:33 -07:00
Yan Wang
cbfe6c2ec4 unifykey: check secure check secure storage valid before SMC call ATF.
PD#150482: unifykey: check secure storage valid before SMC call ATF.

  same as PD#150483.

    ATF use CONFIG to enable/disable secure storage.
    If ATF disable secure storage, secure storage code will be
    compiled out. Kernel should check if secure stroage exists before
    SMC call ATF.

Change-Id: Ifd5e3c42a181bb814dcedad13bebb4596ae95e27
Signed-off-by: Yan Wang <yan.wang@amlogic.com>
2017-10-12 23:13:31 -07:00
Qi Duan
53160bf7b0 USB: gadget: add wake lock when gadget connect.[1/1]
PD#151886: usb: gadget: add wake lock when gadget connect
       this case,not real suspend.

Change-Id: I0c371ad2c051b3f4fc64b96f8372fdc3be795145
Signed-off-by: Qi Duan <qi.duan@amlogic.com>
2017-10-12 01:50:12 -07:00
Qi Duan
ce4ac9bd2d UART: add spinlock for tx protect in interrupt. [1/1]
PD#151632: UART: add spinlock for tx protect in interrupt.

Change-Id: Ie2c7e6d3003d8b4248f05a72acd6c5242d45441f
Signed-off-by: Qi Duan <qi.duan@amlogic.com>
2017-10-12 01:30:10 -07:00
Pengcheng Chen
ef7a3d0d29 osd: null pointer risk protect
PD#151241: null pointer risk protect

driver defect clean up:
#284

Change-Id: I05ffb3df451b0f62de0ef00a688edc6bc33b1964
Signed-off-by: Pengcheng Chen <pengcheng.chen@amlogic.com>
2017-10-11 19:17:34 -07:00
MingLiang Dong
0a19c008ff amvecm: fix hdr no effect
PD#151008: fix hdr no effect

Change-Id: I9edc076cb74783d26e1f16ebeaceb48dbb7e6bfe
Signed-off-by: MingLiang Dong <mingliang.dong@amlogic.com>
2017-10-10 22:10:37 -07:00
Jiamin Ma
0385280d28 uart: fix NULL pointer deferencing in suspend/resume
PD#151229: driver defect clean up
#235
#236

Change-Id: I59acc448a4ece1f385d0b6d602721d34ce60e02c
Signed-off-by: Jiamin Ma <jiamin.ma@amlogic.com>
2017-10-10 19:47:08 -07:00
Jiamin Ma
cc619fdedb clocksource: fix NULL pointer deferencing issue
PD#151226: driver defect clean up
#229

Change-Id: Ie37dc17d5036813958180415d2b9b4405a44c793
Signed-off-by: Jiamin Ma <jiamin.ma@amlogic.com>
2017-10-10 19:43:02 -07:00
wenfeng.guo
07d62d0088 amvecm: incorrect free pointer event
PD#150076: incorrect free pointer event

driver defect clean up:
#4
#7

Change-Id: Iec9d38a5fd71d26c36115eefe98326b909f85527
Signed-off-by: wenfeng.guo <wenfeng.guo@amlogic.com>
2017-10-10 19:13:21 -07:00
Yvonne Chen
190a64cb3a tee: open tee loading under optee
PD#151855: open tee loading under optee

Change-Id: Id18ff381bedadb724ace5f22cc820ef64f4666f6
Signed-off-by: Yvonne Chen <yvonne.chen@amlogic.com>
2017-10-09 01:29:59 -07:00
Victor Wan
ff27e33bf8 Merge branch 'android-4.9' into amlogic-4.9-dev 2017-10-09 15:30:18 +08:00
KeLe Bai
ccfeb711a7 di: driver defect clean up
PD#151224: driver defect clean up:

#227
#238~239
#249
#257~258
#285~287
#384
#466~467
#472~474
#585
#655
#659~660

Change-Id: I241d863318a8754c0e7c5fa1155247d99a21eb9e
Signed-off-by: KeLe Bai <kele.bai@amlogic.com>
2017-10-08 22:44:58 -07:00
Pengcheng Chen
eb47732293 osd: osd display error when work in 1080i and cvbs
PD#151305: osd: osd display error when work in 1080i and cvbs

Change-Id: I75dbc06ceddf724210f3a2a858bc10685c829fcf
Signed-off-by: Pengcheng Chen <pengcheng.chen@amlogic.com>
2017-10-08 20:18:54 -07:00
Nan Li
5192b8a28a emmc: clr emmc pinmux fail
PD#151924: clear emmc pimux fail on m8b,
because BOOT gpio pin number error.

Change-Id: Ic67dff49d28c99e208929f7b142849ecd44d53cc
Signed-off-by: Nan Li <nan.li@amlogic.com>
2017-09-30 10:01:24 +08:00
Yvonne Chen
3eb13b447c tee: disable tee secure firmware load temporary
PD#150992: disable tee secure firmware load

disable tee secure firmware load temporary

Change-Id: I2acf75b340fc9abea6238f57b635fff4862166f7
Signed-off-by: Yvonne Chen <yvonne.chen@amlogic.com>
2017-09-27 19:54:06 -07:00
Pengcheng Chen
1298608c66 ge2d: merge 3.14 ge2d fix to 4.9
PD#151061: merge 3.14 ge2d fix to 4.9
1. ge2d: fix yv12 format phy addr error(73c2443a1744)
2. ge2d: adjust ge2d clk according vpu clk(28d6c91a495c)

Change-Id: I215d1bec2f359b16176daf1b7c9c4cf838e1eed0
Signed-off-by: Pengcheng Chen <pengcheng.chen@amlogic.com>
2017-09-27 03:23:09 -07:00
Rongjun Chen
90f6215eb1 dts: p230: add bt-dev to fix bt open fail issue
PD#151283: BT: add bt-dev to p230 dts

Change-Id: I8c15fd7112037fcbde4c1fdd096aa5400cbe8337
Signed-off-by: Rongjun Chen <rongjun.chen@amlogic.com>
2017-09-26 01:06:03 -07:00
Baocheng Sun
6d7bb54ee1 fs: add exfat file system support
PD#147260: add exfat file system support

Change-Id: Id3ec5e1959b8e34d8fc54e04318677295d8ccbf9
Signed-off-by: Baocheng Sun <baocheng.sun@amlogic.com>
2017-09-26 00:32:37 -07:00
Shuai Li
6040daab70 audio: enable continuous clks
PD#150879: if continuous-clock is configed, the audio clock don't
gate off when there is audio stream. Also, this commit could simply
set the same MPLL source to make PDM-in and TDM-out work synchronously.

Change-Id: Iac488b4d4813f758f0bc1ebd8bb5f35f9a8dfff1
Signed-off-by: Shuai Li <shuai.li@amlogic.com>
2017-09-24 23:32:09 -07:00
Jiamin Ma
84cc35e6e1 mmc: remove unnecessary call to single_release
PD#151361: Oops when doing OTA upgrading

    in single_release file->private_data will be dereferenced,
which is assigned a value by single_open. So if signle_open
is not called before single_release, an "unable to handle
kernel NULL pointer..." issue will appear.
    But in this case, since single_open and seq_read is not
called, there is no need calling single_release to release
mem allocated by single_open and seq_read. Simpley remove
calling single_release is the best choise

Change-Id: I21882da33cc2509c1b5b42daabbd7c6f3fdc4542
Signed-off-by: Jiamin Ma <jiamin.ma@amlogic.com>
2017-09-22 02:24:06 -07:00
Dezhi Kong
905ac8c7f3 video_sink: disable hdmiin frame check default
PD#151428: disable hdmiin frame check default

Change-Id: I7378dcfecf8c72203dcd10ed0ee8c0c4aa0bea3d
Signed-off-by: Dezhi Kong <dezhi.kong@amlogic.com>
2017-09-22 01:24:51 -07:00
Qiufang Dai
92b88f4e77 PM/sleep: add freeze op for gx
PD#148982: add freeze op to distinguish freeze mode vs mem mode
Signed-off-by: Qiufang Dai <qiufang.dai@amlogic.com>
Change-Id: I3bec4d687a933603a29aeb7a44422aa81e47cea7
2017-09-21 23:07:52 -07:00
Baocheng Sun
0200b57890 defconfig: enable ntfs file system support
PD#147260: support ntfs file system, CONFIG_NTFS_FS=y

Change-Id: I24926eb04dd129a1d691ee8221f46b09e014c93f
Signed-off-by: Baocheng Sun <baocheng.sun@amlogic.com>
2017-09-21 01:28:00 -07:00
hong.guo
7f2c3c884b gpio_key: add gpio key driver
PD#150152: gpio_key:add gpio key's driver for  wakeup function

1. add gpio key driver,drivers/amlogic/input/gpio_key/*.
2.press gpio key can suspend/wakeup system.

Change-Id: Id2069eb3fe762f751661569a08d0c4d6847ccf7c
Signed-off-by: hong.guo <hong.guo@amlogic.com>
2017-09-21 01:09:55 -07:00
Jiamin Ma
0356d571a0 config: enable sysrq
PD#150578: enable sysrq
CONFIG_MAGIC_SYSRQ is selected by CONFIG_KGDB_SERIAL_CONSOLE in Kconfig,
so CONFIG_MAGIC_SYSRQ should by enabled to enable syrq after KGDB is
disabled

Change-Id: I09207781dba9369b6f0a505492f8840526474acf
Signed-off-by: Jiamin Ma <jiamin.ma@amlogic.com>
2017-09-20 23:51:57 -07:00
Long Yu
24c8af87be emmc: modify the RPMB mark
PD#151126: emmc: modify the RPMB mark

1. modify the RPMB mark in AMLSD.c file

2. add debug debugging methods

Change-Id: Iae4f87612c8976520c8283188d331e9e94e72784
Signed-off-by: Long Yu <long.yu@amlogic.com>
2017-09-20 19:00:57 -07:00
Yueguie He
85917585fc dts: change s420 amlogic-dt-id
PD#151313: dts: change s420 dts amlogic dt id

Change-Id: I4bf3a4eb4e798f876e048b190ab8c49b9882cb57
Signed-off-by: Yueguie He <yuegui.he@amlogic.com>
2017-09-20 19:09:50 +08:00
Ao Xu
4d6daca6b7 defconfig: disable CONFIG_DEVPORT on arm64 systems
PD#149771: disable CONFIG_DEVPORT on arm64 systems

CONFIG_DEVPORT should not be used on arm64 systems.
It cannot really be used.

Change-Id: I2ed538e3c9dc7596be55789dbc23480ed92b13f9
Signed-off-by: Ao Xu <ao.xu@amlogic.com>
2017-09-20 02:40:55 -07:00
Ao Xu
bd6adeed26 defconfig: remove meson64_audio_defconfig
PD#149771: remove meson64_audio_defconfig

Change-Id: I80e92b3f7eae3895371bc2ad91d78f4538740937
Signed-off-by: Ao Xu <ao.xu@amlogic.com>
2017-09-20 17:30:05 +08:00
jianxin.pan
de86ad980b dts: fix arch timer irq trigger type warning
PD#151167: fix arm_arch_timer irq trigger type warning
irq: type mismatch, failed to map hwirq-29 for /interrupt-controller

Change-Id: I51cee425500596a3c48fb440e04c74d647688650
Signed-off-by: jianxin.pan <jianxin.pan@amlogic.com>
2017-09-20 00:00:27 -07:00
Rongjun Chen
1b17f19345 dts: wifi: fix irq type mismatch, failed to map error
PD#151167: del interrupts = <  0 68 4> to fix irq: type mismatch issue
test on p212 board

Change-Id: I003175f59f77fd7711297a2472e1986fea8f3609
Signed-off-by: Rongjun Chen <rongjun.chen@amlogic.com>
2017-09-19 23:46:49 -07:00
Weiming Liu
1e0437fabf lcd: synchronous lcd driver from linux3.14
PD#150981: synchronous lcd driver linux3.14 to linux4.9

	1.add bl_level bootargs parameter

	2.repair unifykey bl_level error

	3.update the mechanism of 50/60hz switch

	4.add pwm & enable sequence reverse support

	5.add vbyone special control adjust support

Change-Id: I63136af6b96d793691eed23c064e7515e1d50aff
Signed-off-by: Weiming Liu <weiming.liu@amlogic.com>
2017-09-19 21:32:15 -07:00
Jiyu Yang
7e23b2c3a1 dts: gxl: update ion mem region size [3/3]
PD#151016: update ion mem region size

Change-Id: I4488f42757c9bf41a13e995c87a2204a5246dad6
Signed-off-by: Jiyu Yang <Jiyu.Yang@amlogic.com>
2017-09-19 19:40:42 -07:00
Xindong Xu
e9a1bcc3d8 p230: use a/b partition.dtsi default [1/2]
PD#151146: p230: use a/b partition.dtsi default

Change-Id: I7ebc40783aad7a50690403f3e28bed9be89d1b11
Signed-off-by: Xindong Xu <xindong.xu@amlogic.com>
2017-09-19 01:30:00 -07:00
Pengcheng Chen
afcba67e26 dts: fix fb_reserved/logo_reserved alloc failed
PD#150868: fix fb_reserved/logo_reserved alloc failed

Change-Id: Ibae0efc18b221bc72c419b99d908bf4ae1267d4b
Signed-off-by: Pengcheng Chen <pengcheng.chen@amlogic.com>
2017-09-19 00:43:38 -07:00
Jiamin Ma
9487af325b memleek: using single_open/seq_read and single_release in pair
PD#149178: memleek when single_open/seq_readwithout single_release

single_open/seq_read will apply for one page and two small
slab memory. If we do not release them in single_release,
the system will crash for memory leeking

Change-Id: I2b74a0c6faec415e96164d0c20ba0676836e55eb
Signed-off-by: Jiamin Ma <jiamin.ma@amlogic.com>
2017-09-18 23:55:39 -07:00
Tao Zeng
b661774b52 mm: optimize for cma allocation/free time
PD#150914: mm: optimize for cma allocation/free time

1. NOT use __GFP_COLD during cma is under allcating to
  avoid page lock long time;
2. Mark __GFP_BDEV for alloc_migrate_target to avoid
   migrate allocate cma page again in cma allocate;
3. use SMP to allocate cma;
4. try to free large order of pages for cma.

Change-Id: I2213444a089ce27ee6486c84dea03e0584086cd3
Signed-off-by: Tao Zeng <tao.zeng@amlogic.com>
2017-09-18 22:45:27 -07:00
Pengcheng Chen
d6168e9768 osd: merge 3.14 osd fix to 4.9
PD#151059: merge 3.14 osd fix to 4.9
1. osd: fix dummy data caused green line issue(190f842)
2. osd: add debug for direct-render(cee727f)
3. osd: fix screen zoom in/out error(9854bdc)
4. osd: cursor can't full screen osd1 in 2xscaler(afadaff)
5. osd: osd_reserved caused direct render display wrong(fc55e9b)
6. osd: fix osd crash when bringup Android8.0(206fbe6)
7. osd: fix osd cursor distortion in 1080I mode(612eead)
8. osd: fix error when screen zoom in/out in osd_reverse(2243eb6)

Change-Id: Icfef7a66fcb1d0d42fe2aa57bb370f9e9a7ad5a4
Signed-off-by: Pengcheng Chen <pengcheng.chen@amlogic.com>
2017-09-18 21:33:12 -07:00
Guosong Zhou
1fab8743b1 amlvideo2: fix unuse code and bad compare
PD#150094: driver defect clean up:
#32
#86
#90
#92
#97
#101
#103
#152
#155
#157~#158
#164
#167
#169~#179
#187~#191
#193~#199
#201~#210
#212~#213
#316~#319
#385
#572
#693~#694
#696~#697

Change-Id: I9669e5c0d717ee2287faf57a271ff27692039802
Signed-off-by: Guosong Zhou <guosong.zhou@amlogic.com>
2017-09-18 04:39:23 -07:00
Jiamin Ma
a0abf7e982 security: fix security issues about mem corruption and info leakage
PD#150578: kernel4.9 secure review issues
1. Kernel Debugging Options Enabled

2. Exploit Mitigations (KASLR, Stack Protector)
   Not Enabled In Kernel Config

3. Buffer Overflow in Amvideo Driver file_name
   SysFS Attribute

4. Memory Corruption in VFM Driver SysFS Attribute

5. Kernel Syslog Accessible To  Unprivileged Users

6. Kernel Memory Corruption in EFuse Driver

7. Kernel Memory Corruption in Unifykey IOCTL

Change-Id: I277c449f4cb14141bf37f90fd66764b8dccaaee0
Signed-off-by: Jiamin Ma <jiamin.ma@amlogic.com>
2017-09-17 20:06:01 -07:00
Pengcheng Chen
905253988f osd: create logo_reserved node in dts in Android O
PD#150868: create logo_reserved node in dts in Android O

Change-Id: I4057aef2e40504920a9d3b086d31d96aa23bb52f
Signed-off-by: Pengcheng Chen <pengcheng.chen@amlogic.com>
2017-09-15 00:23:40 -07:00
Victor Wan
50d9fb95d9 Merge branch 'android-4.9' into amlogic-4.9-dev 2017-09-15 14:23:48 +08:00
Yi Zhou
2f938ee3dc hdmitx: fix DEADCODE errors
PD#150471: hdmitx: driver defect clean up:
#168
#186
#200
#211
#192

Change-Id: Iffafec12c39cd98f8260a99417cb709ccc94935d
Signed-off-by: Yi Zhou <yi.zhou@amlogic.com>
2017-09-14 22:44:02 -07:00
Pengcheng Chen
00cd01eb12 osd: fix move cursor caused android O reboot issue
PD#150952: fix move cursor caused android O reboot issue

Change-Id: Iba352617d7250167666029f80f82fd8bc9e4de3f
Signed-off-by: Pengcheng Chen <pengcheng.chen@amlogic.com>
2017-09-14 22:31:34 -07:00
Yixun Lan
7a8f830bf4 eth: stmmac: fix timer expire issue in resume stage
PD#150780: eth: stmmac: fix timer expire issue in resume stage

Change-Id: I1d154c1eb581972d6131871901ade2272a1192ad
Signed-off-by: Yixun Lan <yixun.lan@amlogic.com>
2017-09-14 20:23:43 -07:00
Greg Kroah-Hartman
f7d2974f34 Merge 4.9.50 into android-4.9
Changes in 4.9.50
	mtd: nand: mxc: Fix mxc_v1 ooblayout
	mtd: nand: qcom: fix read failure without complete bootchain
	mtd: nand: qcom: fix config error for BCH
	nvme-fabrics: generate spec-compliant UUID NQNs
	btrfs: resume qgroup rescan on rw remount
	selftests/x86/fsgsbase: Test selectors 1, 2, and 3
	mm/memory.c: fix mem_cgroup_oom_disable() call missing
	locktorture: Fix potential memory leak with rw lock test
	ALSA: msnd: Optimize / harden DSP and MIDI loops
	Bluetooth: Properly check L2CAP config option output buffer length
	ARM64: dts: marvell: armada-37xx: Fix GIC maintenance interrupt
	ARM: 8692/1: mm: abort uaccess retries upon fatal signal
	NFS: Fix 2 use after free issues in the I/O code
	NFS: Sync the correct byte range during synchronous writes
	xfs: XFS_IS_REALTIME_INODE() should be false if no rt device present
	Linux 4.9.50

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2017-09-14 09:14:13 -07:00
Nanxin Qin
6470478320 media: merged code from c502feca7 on the amlogic-3.14-dev [1/3]
PD#150739: merged code from c502feca7 on the amlogic-3.14-dev
1.codec_mm: fixed tvp first wait long time bug
2.pcrmaster: fix some avsync issue in pcrmaster mode
3.vfm: fix vf provider crash issue

Change-Id: I64202a38a3ed0c50ba665fb477caea26c67ddcb0
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
2017-09-14 04:16:12 -07:00