Commit Graph

640613 Commits

Author SHA1 Message Date
Weiguang Ruan
038eab447d wifi: add pci reinit and remove_reinit function [4/7]
PD#148564: add pci reinit and remove_reinit function

pci_reinit: power on/off then rescan pci device.

pci_remove_reinit: remove pci device first,
then power on/off, rescan pci device.

Change-Id: I03f3ceb7b526ce686b835eaacddbbd7f2ed2c384
Signed-off-by: Weiguang Ruan <Weiguang.ruan@amlogic.com>
2017-09-06 20:04:21 -07:00
Peifu Jiang
0d1f23ae52 reboot: add rpmbp reboot mode
PD#145456: Support RPMB shared secret provisioning [2/2]

[Problem]
RPMB requires a shared secret between host (AP) and device (eMMC flash)
in order to perform HMAC authentication.

[Solution]
This commit provides a special reboot mode, reboot rpmbp, to securely
provision the shared secret into eMMC flash device.

[Test]
Tested on GXL reference board P212. Passed.

Change-Id: I81dd482215d0f0232fe10efbc60b6af4ba2d9641
Signed-off-by: Peifu Jiang <peifu.jiang@amlogic.com>
2017-09-06 19:47:18 -07:00
Matthew Shyu
381b7140e0 crypto: crypto update for axg
PD#146628: crypto update for axg

1. KEY_IV now can only read 16 bytes a time
2. DES is completely disabled and TDES with three identical keys are
also disabled.  This creates a potential hole in TDES driver, and
thus TDES support is removed from dts in axg

Change-Id: Iface9c52d494b8b5232e4f5915e0f85a959863a4
Signed-off-by: Matthew Shyu <matthew.shyu@amlogic.com>
2017-09-06 19:23:58 -07:00
Xindong Xu
84edbc7284 md: use dm-anroid-verity [3/4]
PD#150024: md: use dm-android-verity.c for android dm-verity

Change-Id: I44ee22afb38aeb8f7c5958a6974f6bc48c721dbc
Signed-off-by: Xindong Xu <xindong.xu@amlogic.com>
2017-09-06 03:45:04 -07:00
Xindong Xu
4b84a16b03 dts: change a/b update partition table [3/3]
PD#150024 dts: change a/b update partition table

1. a/b update do not need recovery/cache
2. boot/system/vendor/odm need two slots: _a & _b

Change-Id: If74667eb4f7ebbd96a9ded3618d3d6b4c1fb8ae4
Signed-off-by: Xindong Xu <xindong.xu@amlogic.com>
2017-09-06 01:59:30 -07:00
Xindong Xu
dc59fda205 dts: p230: enlarge buffer size for omx & framebuffer [1/1]
PD#148907: enlarge buffer size for omx & framebuffer

Change-Id: I0c9725b1ce35ba1e330ca1b603e09d99a26e0a86
Signed-off-by: Xindong Xu <xindong.xu@amlogic.com>
2017-09-06 01:29:13 -07:00
Yao.Liu
ed85ef9aa5 amlvideo: set omx output buffer size to compWidth*compHeight
PD#150218: amlvideo: set omx output buffer size to compWidth*compHeight

Change-Id: I69ff2e5defb8344cd4aec05582f4696faa0abe7f
Signed-off-by: Yao.Liu <yao.liu@amlogic.com>
2017-09-05 23:39:12 -07:00
Yueguie He
e2aece4a0a mtd: nand : add slc ids
PD#150442: mtd: nand: add 128m FS33ND01GS108TFI0 nand

Change-Id: Ibda5d793825cef1a3c522cf42f277f74db3172f7
Signed-off-by: Yueguie He <yuegui.he@amlogic.com>
2017-09-05 22:41:45 -07:00
Nanxin Qin
4e0f3d95d6 frame_sync: replace the magic number with msecs_to_jiffies.
PD#150542: replace the magic number with msecs_to_jiffies.

Change-Id: I071da655a9ea3edf496fca65dc67167145ccc167
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
2017-09-05 21:26:20 -07:00
Nanxin Qin
c7d74f200d video_sink: modify modules dir in the sysfs to compatible with kernel 3.14 [1/3]
PD#150498: modify modules dir in the sysfs to compatible with kernel 3.14

Change-Id: If34cb6a153a4e5b97537faad1da04a1afec3fe4b
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
2017-09-05 21:13:02 -07:00
Jiamin Ma
3f88c71f4d scheduler: remove log info for cpu capacity updating
PD#138714: too much log info for cpu capacity updating

Change-Id: I14164903950afc2f29d7446d743ba0b0062edc19
Signed-off-by: Jiamin Ma <jiamin.ma@amlogic.com>
2017-09-05 19:51:57 -07:00
Yueguie He
6ce4848d04 nand: change boot partition size
PD#150531: nand: change boot partition size to 15M

Change-Id: I64e376b89908b882b6b70bfd370871bc540020f1
Signed-off-by: Yueguie He <yuegui.he@amlogic.com>
2017-09-05 19:16:44 -07:00
Nan Li
f2ce8a4f04 sd: add sd_uart support
PD#149976: add sd to uart support
modify emmc init min clk freq to 400k.

Change-Id: I204d68668497a1a6a1f37f5e06d944a2687412ff
Signed-off-by: Nan Li <nan.li@amlogic.com>
2017-09-05 04:06:35 -07:00
Tao Zeng
587e8e99f7 gcc: add options to limit large object and stack usage
PD#150373: gcc: add options to limit large object and stack usage

We should restrict limit large size of global object allocated in
driver code to reduce size of .data/.bss/.rodata sections. Also,
large array/many variables declared in a function is not allowed,
this behavior may cause kernel stack overflow especially in IRQ
context or recursion calls.
Right now we just set a very high limit in order to pass comiple.
Final target is to limit:

1. large global object size should not over 4096 bytes, a page size;
2. stack usage of each function should not over 256 bytes.

If your global object is larger than a page size, we advise allocate
it as a static pointer, and allocate it's memory during probe stage.

Change-Id: Ic14995f642bc1e0b47d3a07143468e6e1dac7bfc
Signed-off-by: Tao Zeng <tao.zeng@amlogic.com>
2017-09-05 00:13:46 -07:00
sky zhou
24963847bf osd: init osd output pt value to 1, and fix osd buf hnd leak. [1/3]
PD#148907: fix osd output fence error and framebuffer hnd leak.

Change-Id: Ic5a412d41b808766d6d0e05edeb770b2b20bb4a6
Signed-off-by: sky zhou <sky.zhou@amlogic.com>
2017-09-04 23:50:56 -07:00
Weiguang Ruan
75c300edb7 wifi: add wext and wext_priv [5/8]
PD#150114: add wext and wext_priv

select WIRELESS_EXT WEXT_PRIV in
driver/amlogic/wifi/Kconfig
qualcomm wifi drivers need wext support

Change-Id: I1f85481013ba6c35b304eeb45d0c4917a67c67eb
Signed-off-by: Weiguang Ruan <Weiguang.ruan@amlogic.com>
2017-09-04 19:29:45 -07:00
Jiyu Yang
3be51bb458 osd: use new fence api. [3/7]
PD#149525: osd use new fence api
Change-Id: I3c7f0acf63012a12cdc9a3b4512db0d3bd4f8927
Signed-off-by: Jiyu Yang <Jiyu.Yang@amlogic.com>
2017-09-03 21:51:04 -07:00
Jiyu Yang
64fb25d6ce sync: new fence api [2/7]
PD#149525: sync: new fence api

Change-Id: I3c957758a67fb6c0a0b3aa5031637b00d3d510e8
Signed-off-by: Jiyu Yang <Jiyu.Yang@amlogic.com>
2017-09-02 01:06:36 +08:00
Jiyu Yang
d531d0e9ae Revert "android: port fence driver from kernel-4.4 "[1/7]
PD#149525: Revert "android: port fence driver from kernel-4.4

This reverts commit 22f718c442.

Change-Id: I0ad1ad31fe6624b11bb840bc13d64c9c5af5d651
Signed-off-by: Jiyu Yang <Jiyu.Yang@amlogic.com>
2017-09-01 21:28:42 +08:00
jintao xu
020860ded7 ionvideo: omx support osd display
PD#150258: omx support osd display

Change-Id: I566e530e0ec2dc5e7eb73e33b90345552f6ae7fc
Signed-off-by: jintao xu <jintao.xu@amlogic.com>
2017-09-01 04:50:33 -07:00
Qi Duan
2e5f4dd444 USB: don't set softdisconnect when suspend
PD#148350: USB: don't set softdisconnect when suspend. [1/1]

Change-Id: I037d951f23c6d5c606af64f8c1b5550246256d79
Signed-off-by: Qi Duan <qi.duan@amlogic.com>
2017-09-01 04:01:21 -07:00
KeLe Bai
b8d267bda3 di: support muti decode
PD#150173: di: merge muti decode from bug143269

Change-Id: I821171c93aa3a6a77a1309429a9c8a37e704b17b
Signed-off-by: KeLe Bai <kele.bai@amlogic.com>
2017-09-01 03:50:59 -07:00
Ao Xu
510973a38c defconfig: add config to solve AndroidO CTS&VTS fail
PD#149771: add config to solve AndroidO CTS&VTS fail

add the following configs:
1. CONFIG_ARMV8_DEPRECATED=y
   CONFIG_SWP_EMULATION=y
   CONFIG_CP15_BARRIER_EMULATION=y
   CONFIG_SETEND_EMULATION=y
2. CONFIG_RANDOMIZE_BASE=y
3. CONFIG_PM_AUTOSLEEP=y
4. CONFIG_INET_DIAG_DESTROY=y
   CONFIG_NF_CONNTRACK_SECMARK=y
   CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=y
   CONFIG_NETFILTER_XT_TARGET_SECMARK=y
   CONFIG_IP_NF_SECURITY=y
5. CONFIG_PPPOLAC=y
   CONFIG_PPPOPNS=y
6. CONFIG_USB_CONFIGFS_F_PTP=y
   CONFIG_USB_CONFIGFS_F_ACC=y
   CONFIG_USB_CONFIGFS_F_AUDIO_SRC=y
   CONFIG_USB_CONFIGFS_F_MIDI=y
7. CONFIG_QUOTA_NETLINK_INTERFACE=y
8. CONFIG_SECURITY_PERF_EVENTS_RESTRICT=y
   CONFIG_HARDENED_USERCOPY=y

Change-Id: If0a9667682ed42790ed76addc9383dfdb62ff0c4
Signed-off-by: Ao Xu <ao.xu@amlogic.com>
2017-09-01 03:29:55 -07:00
Yueguie He
a274b9f1b9 dts: axg: sync dts config
PD#150185: dts: sync dts config

Change-Id: I3edcba36aefc1c487fcb8e31b4bdb23108b226cb
Signed-off-by: Yueguie He <yuegui.he@amlogic.com>
2017-09-01 02:12:51 -07:00
Zhi Zhou
dd50855cc4 media: codec_mm: fixed scatter cache bug
PD#150197: codec_mm: fixed tvp first wait long time bug

Change-Id: Ide5532c0e331948a70bdc809fe232b06b4a7076d
Signed-off-by: Zhi Zhou <zhi.zhou@amlogic.com>
2017-08-31 01:39:49 -07:00
Xing Wang
f8225ed348 audio: fix loopback channel map
PD#149869: audio: fix tdmin_lb channel mask and swap for loopback

Change-Id: I1bf2dd42a2869ca2404b72e1f0e57a267f365e23
Signed-off-by: Xing Wang <xing.wang@amlogic.com>
2017-08-30 23:12:57 -07:00
Victor Wan
3f653b7e57 Merge branch 'android-4.9' into amlogic-4.9-dev
Conflicts:
	arch/arm/configs/s3c2410_defconfig
	drivers/mmc/core/mmc.c

Signed-off-by: Victor Wan <victor.wan@amlogic.com>
2017-08-31 14:01:28 +08:00
Peipeng Zhao
27365be189 codec: fixed codec tlv320adc3101 driver clk error on 48K and 16K
PD#150168: fixed codec tlv320adc3101 record error on 48K and 16K

Change-Id: Ia672427de4c1a0e730eecdb00133d84640720785
Signed-off-by: Peipeng Zhao <peipeng.zhao@amlogic.com>
2017-08-30 18:34:39 -07:00
Kaifu Hu
593a00aecc hdmitx: fix 4k smpte no signal
PD#149239: hdmitx: fix 4k smpte no signal
when 4k smpte 444,10bit, div40 and scramble need be setted

Change-Id: Iadfc337519e1444c244b36086c3929d231bd80c4
Signed-off-by: Kaifu Hu <kaifu.hu@amlogic.com>
2017-08-30 02:39:12 -07:00
Evoke Zhang
eb484d7d1e vout: optimize tvout monitor function
PD#149868: vout: optimize tvout monitor function as below:
1.add vout_mutex lock to prevent tvout_monitor and vout_mode_store
  running at the same time;
2.vout_mode_store operation will stop tvout_monitor running.

Change-Id: Ic2578357edb17cf471b90bec50ba11eb9178a8e9
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
2017-08-29 21:28:48 -07:00
Yueguie He
dab18a1896 mtd: add slc ids
PD#150009: mtd: nand: add slc ids

     1. spansion 1024MB S34ML08G1

Change-Id: I5844574a21b0e59b10ab133db98b4f32f4547f1f
Signed-off-by: Yueguie He <yuegui.he@amlogic.com>
2017-08-29 19:57:43 -07:00
Ao Xu
91a4c424e5 defconfig: remove CONFIG_SYSVIPC to fix AndroidO CTS fail
PD#149771: remove CONFIG_SYSVIPC to fix AndroidO CTS fail

Change-Id: I16eca775b80480ca5ea1f8b5187b29ca1a5a8ed2
Signed-off-by: Ao Xu <ao.xu@amlogic.com>
2017-08-29 18:59:25 -07:00
Qiufang Dai
7f189cd740 pcie: move mipi gate control to pcie driver.
PD#147022: pcie: mipi share gate control.

Change-Id: I85d9676e39db548b39c4c9d3ece0ca1572bffe26
Signed-off-by: Qiufang Dai <qiufang.dai@amlogic.com>
2017-08-29 00:26:48 -07:00
yi.zeng
14ffc2f9d8 nand: fix nand key read issue
PD#146835: nand: fix the nand key read issue caused by overload memory

Change-Id: I53ce06da8ddf5f691898a7546b1b96bb9af486cd
Signed-off-by: yi.zeng <yi.zeng@amlogic.com>
2017-08-27 23:01:25 -07:00
Shuai Li
3ad6cafbff audio: add channel constrains for TDM
PD#149888: constrains max channels number by DTS lanes
and tx_mask configs. If not, FIFO will fetch the wrong
data and cause abnormal behavior for I2S data.

Change-Id: Ic10bb773f6360ad0dfee74c227adb279dcc47cec
Signed-off-by: Shuai Li <shuai.li@amlogic.com>
2017-08-28 11:21:47 +08:00
Shuai Li
c394c3d4da audio: fix codecs kcontrol bugs
PD#145715: kernel 4.9 use components to wrapper the codec instance.
When poring form early versions, we have no idea about
this change. And this commit fixes this issue.

Change-Id: I56357b45c1bf93844f77fe89a828911fa9779406
Signed-off-by: Shuai Li <shuai.li@amlogic.com>
2017-08-25 19:36:26 +08:00
Ao Xu
6160490e79 pstore: change pstore address to 0x7400000
PD#149300: pstore: change pstore address to 0x7400000

Change-Id: Ic8f4240a2c5c4c2137ad4c050a9af8692be15dba
Signed-off-by: Ao Xu <ao.xu@amlogic.com>
2017-08-24 18:41:36 -07:00
Nanxin Qin
435ded217d frame_sync: fixed the issure of the player that starts slowly [2/2]
PD#148146: modify checkin_firstvpts to 0xffffffff

Change-Id: I16d75f8cd0f7ed7582f731db42bc247c49580974
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
2017-08-24 04:07:16 -07:00
Ao Xu
c5a8273643 defconfig: enable configs to fix AndroidO CTS and VTS fail
PD#149771: enable configs to fix AndroidO CTS and VTS fail
CONFIG_IKCONFIG_PROC=y
CONFIG_TASKSTATS=y
CONFIG_TASK_DELAY_ACCT=y
CONFIG_TASK_XACCT=y
CONFIG_TASK_IO_ACCOUNTING=y
CONFIG_IKCONFIG=y
CONFIG_CPU_FREQ_STAT=y

In order to know how the kernel was configured via /proc,
select the CONFIG_IKCONFIG_PROC is a good choice.

Change-Id: Ief65788029157adfbd3351f6a1d589670e440d76
Signed-off-by: Ao Xu <ao.xu@amlogic.com>
2017-08-24 03:23:33 -07:00
Xindong Xu
f6e964fdda dts: adjust partition table for Android 8.0 [1/2]
PD#149137: dts: adjust partition table for Android 8.0

1. delete crypt
2. change tee to 32M
3. add param 16M
4. add cri_data 8M
5. add dto 8M
6. change logo to 8M
7. change misc to 8M
8. change boot to 16M
9. change recovery to 24M
10. change system to 1856M
11. change cache to 1120M

Change-Id: Ice80dee7736a127c555cac641bc3a8874aeb519e
Signed-off-by: Xindong Xu <xindong.xu@amlogic.com>
2017-08-23 22:59:30 -07:00
Yue Wang
b099141ced pcie: enable pcie pm.
PD#147022: pcie: enable pcie pm.

Change-Id: Ide75af5cbe2bb840887e36a174cbfec33691534c
Signed-off-by: Yue Wang <yue.wang@amlogic.com>
2017-08-23 19:29:06 -07:00
Haibing.An
166baac573 dts: axg: fix error when unistall wifi that call trace
PD#148250: S400 and S420

Change-Id: I690f3ab850e01d3ad8a48fc01d74625a89a8db11
Signed-off-by: Haibing.An <haibing.an@amlogic.com>
2017-08-23 02:03:26 -07:00
Yonghui Yu
5c04369dab nand: add toshiba 512M(TC58NVG2S0HTA00)
PD#149262: mtd:nand : add toshiba 512M(TC58NVG2S0HTA00)

Change-Id: Ib4e5abca5b1b99542df1e9a6dc3ed347474ecfa2
Signed-off-by: Yonghui Yu <yonghui.yu@amlogic.com>
2017-08-22 21:17:29 -07:00
Weiming Liu
cfc3eabe2f lcd_extern: fix i2c address mistake for dts config
PD#149233: lcd: add lcd_extern driver za7783
1.add lcd_extern driver za7783
2.modify the axg pll parameters
3.read under the dts lcd_extern i2c address errors

Change-Id: Ib059805a6a82d7896b2394d451d5aedb3f10ecb9
Signed-off-by: Weiming Liu <weiming.liu@amlogic.com>
2017-08-22 21:12:22 -07:00
binqi.zhang
ef37f7699a mm: export symbol for show_mem
PD#149671: mm: export symbol for show_mem.

export symbol for show_mem() and other modules can use the function

Change-Id: Ia4b0c595ada1db2326e07d67b136ad92c9d3cb67
Signed-off-by: binqi.zhang <binqi.zhang@amlogic.com>
(cherry picked from commit 53577ac0164bcd9e933ec43c18139f2f1c55ea56)
2017-08-22 05:35:03 -07:00
Nanxin Qin
1e8a600f17 rdma: fixed issure of crash on boot.
PD#149681: removed the operation of registers in the rdma_init

Change-Id: Iecf12be123952d0a5eb91b77e433d3fb67378d4e
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
2017-08-22 01:38:45 -07:00
Peipeng Zhao
fae3bc0f1d dts: axg: fix bluetooth pinmux problems
PD#149672:
	modified dts tdma data pinmux, tdma output data pin
	need be set tdma_out1. otherwise soc can not send data
	to Bluetooth.

Change-Id: I62a0ea89de092c6b9c3504223822e8c7fd58ecad
Signed-off-by: Peipeng Zhao <peipeng.zhao@amlogic.com>
2017-08-22 01:11:47 -07:00
Nanxin Qin
0a5e4639e4 media: merged code from 43177e6a on the amlogic-3.14-dev
PD#146152: merged code from 43177e6a on the amlogic-3.14-dev

1. support for multi-instance features
2. fixed in multi-instance codec_mm memory bugs and added some
debugging information
3. optimization of vfm problems

Change-Id: I43ba9d4894ae71d53c158df667490030735b9e1e
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
Signed-off-by: KeLe Bai <kele.bai@amlogic.com>
2017-08-21 20:30:19 +08:00
Ao Xu
2ea937e0a6 defconfig: add uid_sys_stats and cpu_freq_stat support
PD#149464: defconfig: add uid_sys_stats and cpu_freq_stat support
1. add CONFIG_CPU_FREQ_STAT
2. add CONFIG_UID_SYS_STATS
3. remove CONFIG_FHANDLE

Change-Id: I2b165676619a46e95ed2f75354e6e0a440cac43f
Signed-off-by: Ao Xu <ao.xu@amlogic.com>
2017-08-20 22:40:37 -07:00
Yueguie He
a66415a86b dts: axg: support 128m ddr
PD#148955: dts: support 128m ddr

Change-Id: I7694bb10659b748c4e43e665945dcd7e8082a68e
Signed-off-by: Yueguie He <yuegui.he@amlogic.com>
2017-08-20 22:20:29 -07:00