Commit Graph

641877 Commits

Author SHA1 Message Date
tao zeng
de9dedcaed mm: correct page stat API
PD#156236: mm: correct page stat API

Using mod_zone_page_state instead of __mod_zone_page_state to
avoid SMP warning of __this_cpu_preempt_check

Change-Id: I3f95768beabf5d330d13189d189b32aef39448cd
Signed-off-by: tao zeng <tao.zeng@amlogic.com>
2017-12-11 16:34:05 +08:00
tao zeng
b0c8f6e30f mm: show more informations when catch user fault
PD#154260: mm: show more informations when catch user fault

1. show pfn for all registers;
2. show memory around all registers;
3. show vma maps around pc/lr.

Change-Id: Ibc92f3aea2727c749c3e865495ca7a4920d4e7a0
Signed-off-by: tao zeng <tao.zeng@amlogic.com>
2017-12-10 19:21:25 -07:00
tao zeng
3e1038b0aa mm: fix deadlock due to too_many_isolated
PD#156236: mm: fix deadlock due to too_many_isolated

When CMA allocating, allocation task  may be dead lock
in following backtrace. So add a count for CMA isolated
to avoid this case.

[<0000000000000000>] __switch_to+0x98/0xac
[<0000000000000000>] congestion_wait+0xa0/0x188
[<0000000000000000>] shrink_inactive_list+0x4a0/0x528
[<0000000000000000>] shrink_node_memcg.isra.71+0x684/0x714
[<0000000000000000>] shrink_node+0x74/0x1e0
[<0000000000000000>] try_to_free_pages+0x1bc/0x4c0
[<0000000000000000>] __alloc_pages_nodemask+0x57c/0xcf4
[<0000000000000000>] alloc_migrate_target+0x2c/0x34
[<0000000000000000>] migrate_pages+0xe0/0x890
[<0000000000000000>] __alloc_contig_migrate_range+0x94/0x1a4
[<0000000000000000>] cma_boost_work_func+0xd0/0x168
[<0000000000000000>] process_one_work+0x140/0x418
[<0000000000000000>] worker_thread+0x154/0x480
[<0000000000000000>] kthread+0x10c/0x120
[<0000000000000000>] ret_from_fork+0x10/0x50

Change-Id: Ib1c5d8f25ac966170292ed6b6f078e8b447e99a8
Signed-off-by: tao zeng <tao.zeng@amlogic.com>
2017-12-10 19:06:03 -07:00
Baocheng Sun
aa641abe46 binder: fix binderDriverInterfaceTest fail [1/1]
PD#155252: bind: fix binderDriverInterfaceTest fail

Commit "ANDROID: binder: Add thread->process_todo flag." brings one
binderDriverInterfaceTest failure. The commit is for improving the
performance of synchronous transactions. So we just workround not
revert it. And the patch do not impact performance.

Before patch:
Benchmark                       Time           CPU Iterations
-------------------------------------------------------------
BM_sendVec_binder/4         55697 ns      33263 ns      21198
BM_sendVec_binder/8         56630 ns      33161 ns      21074
BM_sendVec_binder/16        56569 ns      33155 ns      21156
BM_sendVec_binder/32        56469 ns      33465 ns      21003
BM_sendVec_binder/64        58141 ns      33785 ns      20483
BM_sendVec_binder/128       57505 ns      33845 ns      20512
BM_sendVec_binder/256       57711 ns      33844 ns      20434
BM_sendVec_binder/512       58497 ns      34360 ns      20243
BM_sendVec_binder/1024      59609 ns      34893 ns      20012
BM_sendVec_binder/2k        61486 ns      36065 ns      19495
BM_sendVec_binder/4k        67373 ns      38824 ns      17904
BM_sendVec_binder/8k        80915 ns      45374 ns      15254
BM_sendVec_binder/16k      115286 ns      62732 ns      11189
BM_sendVec_binder/32k      202865 ns     104122 ns       6728
BM_sendVec_binder/64k      601649 ns     309523 ns       2259

After patch
Benchmark                       Time           CPU Iterations
-------------------------------------------------------------
BM_sendVec_binder/4         55247 ns      33132 ns      21086
BM_sendVec_binder/8         56771 ns      33465 ns      21094
BM_sendVec_binder/16        56517 ns      33476 ns      20850
BM_sendVec_binder/32        56732 ns      33413 ns      20964
BM_sendVec_binder/64        57548 ns      33977 ns      20515
BM_sendVec_binder/128       60491 ns      34868 ns      20404
BM_sendVec_binder/256       59150 ns      34609 ns      20293
BM_sendVec_binder/512       59519 ns      34914 ns      19970
BM_sendVec_binder/1024      60230 ns      35313 ns      19832
BM_sendVec_binder/2k        65008 ns      37580 ns      18866
BM_sendVec_binder/4k        69085 ns      39789 ns      17511
BM_sendVec_binder/8k        84204 ns      47321 ns      14894
BM_sendVec_binder/16k      118609 ns      64363 ns      10730
BM_sendVec_binder/32k      207010 ns     106080 ns       6547
BM_sendVec_binder/64k      605543 ns     312110 ns       2256

Change-Id: If70094a330082122c47259c8e1df8ef7eee219dd
Signed-off-by: Baocheng Sun <baocheng.sun@amlogic.com>
2017-12-07 19:08:55 -07:00
Yi Zhou
c0d4c5b3b3 tx: fix the system crash
PD#152848: fix the system crash

When box authenticate with TV under hdcp 2.2, the hdcp 2.2 must
be reset in syspend function.

Change-Id: I0c85070893b7a2e17606b05c2df068a8ceb8f774
Signed-off-by: Yi Zhou <yi.zhou@amlogic.com>
2017-12-07 04:33:13 -07:00
Yueguie He
b25bacca88 dts: update boot partition size
PD#155853: update boot partiton size

Change-Id: I5b3ab48e522f7ed4c33084d43b62d4a14a64afef
Signed-off-by: Yueguie He <yuegui.he@amlogic.com>
2017-12-06 19:41:57 -07:00
John Einar Reitan
1654b625ef sync_file: Return consistent status in SYNC_IOC_FILE_INFO [2/3]
PD#153134:to solve dEQP-EGL.functional.get_frame_timestamps issues

sync_file_ioctl_fence_info has a race between filling the status
of the underlying fences and the overall status of the sync_file.
If fence transitions in the time frame between its sync_fill_fence_info
and the later dma_fence_is_signaled for the sync_file, the returned
information is inconsistent showing non-signaled underlying fences but
an overall signaled state.

This patch changes sync_file_ioctl_fence_info to track what has been
encoded and using that as the overall sync_file status.

Change-Id: I8d785bb04510be99e250dbd017eef883faca147b
Tested-by: Vamsidhar Reddy Gaddam <vamsidhar.gaddam@arm.com>
Signed-off-by: John Einar Reitan <john.reitan@arm.com>
Cc: Sumit Semwal <sumit.semwal@linaro.org>
Cc: Gustavo Padovan <gustavo@padovan.org>
Cc: dri-devel@lists.freedesktop.org
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171009134936.27219-1-john.reitan@arm.com
2017-12-06 05:56:21 -07:00
Yi Zeng
1d6e27d5b3 storage: fix the source of register base
PD#155205: storage: fix the source of register base

The register base get from dts now,no longer from macro.

Change-Id: Ic763db5a9380396cfbfde0333d85ffb08c601713
Signed-off-by: Yi Zeng <yi.zeng@amlogic.com>
2017-12-06 03:36:24 -07:00
Xindong Xu
229bd2a709 dts: partition: add slotselect to fsmgr_flags [1/1]
PD#156037: dts: add slotselect to fsmgr_flags

Change-Id: I48baedc6e5079233d5320748c6a5d623d3ad15fa
Signed-off-by: Xindong Xu <xindong.xu@amlogic.com>
2017-12-05 20:10:43 -07:00
Victor Wan
1e547d2935 Merge branch 'android-4.9' into amlogic-4.9-dev 2017-12-02 16:52:23 +08:00
Nan Li
fa5d2eff77 emmc: driver defect clean up
PD#152884: driver defect clean up
#307.

Change-Id: Ie81654ecc710bb322e5411d8f66d670388e563ee
Signed-off-by: Nan Li <nan.li@amlogic.com>
2017-11-30 22:52:33 -07:00
Zhigang Yu
7b32d317ce dts: add misc partition for upgrade store bcb command[1/3].
PD#150940: add misc partition for S400 nand

Change-Id: I69a8e9223ee5fa431dad610a33d04ab33eed1edc
Signed-off-by: Zhigang Yu <zhigang.yu@amlogic.com>
2017-11-29 20:22:37 -07:00
Zan Peng
6b4b9550ba remote: add mouse function to 4.9
PD#154561: remote mouse function to 4.9

1. need execute remotecfg to config it
    remotecfg -t remote-mouse.tab
2. config exp, default to set 0xffff
    fn_key_scancode = 0x15 (ir scancode)
    cursor_left_scancode = 0x1c
    cursor_right_scancode = 0x48
    cursor_up_scancode = 0x44
    cursor_down_scancode = 0x1d
    cursor_ok_scancode = 0x5c
3. mv rc_common.h {include/uapi/linux => drivers/amlogic/input/remote}

Change-Id: I7f62e0d5a6dfaa1ad7f56358a30fd968f84b543a
Signed-off-by: Zan Peng <zan.peng@amlogic.com>
2017-11-29 20:11:59 -07:00
Zongdong Jiao
f6a4349c69 hdmitx: fix a series of ddc issues
PD#155588: hdmitx: fix a series of ddc issues
1. 149535 issue sw i2c transaction to take advantage of SDA recovery logic
2. 150784/152582 add I2C HW REACTIVE when RX serves as master
3. 151088 using only scdc.tmds.configuration
4. 152584 reduce ddc activities and add mutex to sequence ddc

Change-Id: I3f69a0fbd04ce54c4f794271fce38753f63f3b5f
Signed-off-by: Zongdong Jiao <zongdong.jiao@amlogic.com>
2017-11-29 04:22:40 -07:00
Zhiwei Gong
8262aeec1b dts: gxl: add gpio_keypad for p230[1/1]
PD#153251: gpio_keypad: add gpio_keypad for p230

Change-Id: I4a7f5fe6d263d415fecc490dbfc937e9e63a4b86
Signed-off-by: Zhiwei Gong <zhiwei.gong@amlogic.com>
2017-11-28 19:19:20 -07:00
Yao.Liu
921c011316 media: video layer keep last frame [2/4]
PD#152306: dont display frames which are dropped by apk

PD#152104: video layer keep last frame

Change-Id: I271ee268b8d768fe42cd60b57d1f10b12fac7fa6
Signed-off-by: Yao.Liu <yao.liu@amlogic.com>
2017-11-28 02:09:03 -07:00
Evoke Zhang
8c1fba7f28 lcd: add gpio support for mipi_dsi init cmd
PD#155126: lcd: add gpio support for mipi_dsi init cmd
add data_type 0xf0 for gpio operation

Change-Id: I58b5fc2456b8ceaf3ca97f3ca1626430d723212d
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
2017-11-27 18:57:45 -07:00
Yi Zhou
fcec451b2d hdmitx: add the hdmi change mode op
PD#153294: hdmitx: add the hdmi change mode op

add switch when changing display mode
if the display mode is NULL, the switch can't be opened.

Change-Id: I2a0bdbda6950c401ad3a7b29d810976436558c14
Signed-off-by: Yi Zhou <yi.zhou@amlogic.com>
Signed-off-by: Kaifu Hu <kaifu.hu@amlogic.com>
2017-11-27 18:55:26 -07:00
Frank Chen
a8aba76b55 dts: axg: modify Audiopdm-in and loopback setting[2/2]
PD#155244: audio: modify pdm-in and loopback setting

support 7 channel pdm-in and 1 channel loopback

Change-Id: Ia8e2314a5f80e0dc5eeee7252af9b836e921873e
Signed-off-by: Frank Chen <frank.chen@amlogic.com>
2017-11-23 18:38:20 -07:00
Bo Yang
84a1058529 watchdog: meson-wdt: fix reboot notify to stop reset
PD#154679: watchdog: meson-wdt: fix reboot notify to stop reset

In some cases, the watchdog reboot notify will not disable
watchdog. The watchdog reset workqueue will continue work
in the first cpu that invokes panic(oops). So the hardware
watchdog will not reboot.

Cancel the delayed workqueue to stop reset the watchdog in
reboot notify.
And move the print message to the right location.

Change-Id: I7d85d49f2f5d780f7c5f2612e64494e77957dfff
Signed-off-by: Bo Yang <bo.yang@amlogic.com>
2017-11-23 15:29:28 +08:00
xingyu.chen
26e3ae09aa adc_keypad: update the property file path
PD#150908: adc_keypad: update the property file path

move the property file "table" from "/sys/devices/platform/adc_keypad/"
to "/sys/class/adc_keypad/"

Change-Id: I99ebb2f49df4ef336a3db422f60cb32a49bf2936
Signed-off-by: xingyu.chen <xingyu.chen@amlogic.com>
2017-11-22 00:39:23 -07:00
siming chen
d5da43e066 dts: add gxl p241 v2 dts[1/3]
PD# 154923: dts: add gxl p241 board v2 dts



Change-Id: Iad6947b9af8bd76b3805cfcf95b2bb0c87ad08f6
Signed-off-by: siming chen <siming.chen@amlogic.com>
2017-11-20 20:27:55 -07:00
binqi.zhang
9896903ded ion_dev: enlarge cma heap size . [1/1]
PD#153134: some dEQP cases should always use direct render

Change-Id: I3d65b7c34e948e5a1f6d5d745713c2caa3eb89d5
Signed-off-by: binqi.zhang <binqi.zhang@amlogic.com>
2017-11-18 04:15:54 -07:00
Nan Li
fa1fa680a2 emmc: driver defect cleanup
PD#152912: driver defect cleanup:
376

Change-Id: I25e7cbdd63b7b797aec17df7b858588e60bb5be7
Signed-off-by: Nan Li <nan.li@amlogic.com>
2017-11-17 01:36:55 -07:00
Baocheng Sun
639e70ce35 defconfig: enable sdcardfs file system support [1/2]
PD#154195: enable sdcardfs file system support

CONFIG_SDCARD_FS=y

Change-Id: I4ec6cac934eaabb3c7c5b0320ded63debc1a8f78
Signed-off-by: Baocheng Sun <baocheng.sun@amlogic.com>
2017-11-16 06:07:11 -07:00
Yi Zeng
92b67373dc nand: fix the bad block awareness error of K9F4G08U0F
PD#153602: fix the bad block awareness error of K9F4G08U0F

The slc-nand K9F4G08U0F has a factory bug, we need send a pre-command
before we send read command to get the block status.

Change-Id: I6468f05d8cf984d70f40abd997395d740c22d5e4
Signed-off-by: Yi Zeng <yi.zeng@amlogic.com>
2017-11-16 03:16:06 -07:00
Nian Jing
3c0ea5f05f cvbs: close cvbsoutput when disable module.
PD#154762: cvbs should be closed when cvbs module disabled

Change-Id: Id1dc4ae24e4eea7671ebffbc0f7767a6b4cc9100
Signed-off-by: Nian Jing <nian.jing@amlogic.com>
2017-11-16 16:36:03 +08:00
Yi Zhou
f0f00eddbf hdmitx: add non-standard hdr treatment mechanism
PD#154082: hdmitx: add non-standard hdr treatment mechanism

1.add non-standard hdr
2.add hlg function

Change-Id: I8a1dbbd1583809b25ef50d6e0bfbfb6e6403b60c
Signed-off-by: Yi Zhou <yi.zhou@amlogic.com>
2017-11-14 21:21:54 -07:00
Victor Wan
ee46236755 Merge branch 'android-4.9' into amlogic-4.9-dev 2017-11-14 17:18:44 +08:00
Yvonne Chen
0395d41260 tee: open tee load support
PD#153479: tee: open tee load support

Change-Id: I45f01f47677e0f8c76624e4f03f033356bb663b6
Signed-off-by: Yvonne Chen <yvonne.chen@amlogic.com>
2017-11-13 19:04:40 -07:00
jintao xu
cededce3ad ionvideo: frame_sync: rm logs for vts
PD#152092: rm logs for vts

Change-Id: I42db4d660fa098a870252426d8e1fafab210c820
Signed-off-by: jintao xu <jintao.xu@amlogic.com>
2017-11-13 03:58:06 -07:00
Wei Wang
d55e63001f BACKPORT: net/tcp-fastopen: Add new API support
This patch adds a new socket option, TCP_FASTOPEN_CONNECT, as an
alternative way to perform Fast Open on the active side (client). Prior
to this patch, a client needs to replace the connect() call with
sendto(MSG_FASTOPEN). This can be cumbersome for applications who want
to use Fast Open: these socket operations are often done in lower layer
libraries used by many other applications. Changing these libraries
and/or the socket call sequences are not trivial. A more convenient
approach is to perform Fast Open by simply enabling a socket option when
the socket is created w/o changing other socket calls sequence:
  s = socket()
    create a new socket
  setsockopt(s, IPPROTO_TCP, TCP_FASTOPEN_CONNECT …);
    newly introduced sockopt
    If set, new functionality described below will be used.
    Return ENOTSUPP if TFO is not supported or not enabled in the
    kernel.

  connect()
    With cookie present, return 0 immediately.
    With no cookie, initiate 3WHS with TFO cookie-request option and
    return -1 with errno = EINPROGRESS.

  write()/sendmsg()
    With cookie present, send out SYN with data and return the number of
    bytes buffered.
    With no cookie, and 3WHS not yet completed, return -1 with errno =
    EINPROGRESS.
    No MSG_FASTOPEN flag is needed.

  read()
    Return -1 with errno = EWOULDBLOCK/EAGAIN if connect() is called but
    write() is not called yet.
    Return -1 with errno = EWOULDBLOCK/EAGAIN if connection is
    established but no msg is received yet.
    Return number of bytes read if socket is established and there is
    msg received.

The new API simplifies life for applications that always perform a write()
immediately after a successful connect(). Such applications can now take
advantage of Fast Open by merely making one new setsockopt() call at the time
of creating the socket. Nothing else about the application's socket call
sequence needs to change.

Backport of upstream commit 19f6d3f3c8 ("net/tcp-fastopen: Add new API
support")

Bug: 63449462
Test: Tests in https://android-review.googlesource.com/535357/ pass
Change-Id: Icc181febd74e3117c2fc835d7ed935e107b5815e
Signed-off-by: Wei Wang <weiwan@google.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Acked-by: Yuchung Cheng <ycheng@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry-picked from commit 19f6d3f3c8)
2017-11-13 15:18:49 +08:00
Wei Wang
9fd54650c4 UPSTREAM: net: Remove __sk_dst_reset() in tcp_v6_connect()
Remove __sk_dst_reset() in the failure handling because __sk_dst_reset()
will eventually get called when sk is released. No need to handle it in
the protocol specific connect call.
This is also to make the code path consistent with ipv4.

Bug: 63449462
Test: Tests in https://android-review.googlesource.com/535357/ pass
Change-Id: I91d59909d1482b093904bd92703fc58af34d570f
Signed-off-by: Wei Wang <weiwan@google.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry-picked from commit 25776aa943)
2017-11-13 15:18:31 +08:00
Wei Wang
b9fde3e805 UPSTREAM: net/tcp-fastopen: refactor cookie check logic
Refactor the cookie check logic in tcp_send_syn_data() into a function.
This function will be called else where in later changes.

Bug: 63449462
Test: Tests in https://android-review.googlesource.com/535357/ pass
Change-Id: I14b0fadd8f97569f773a2e2f15f0b4e8dca48402
Signed-off-by: Wei Wang <weiwan@google.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Acked-by: Yuchung Cheng <ycheng@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry-picked from commit 065263f40f)
2017-11-13 15:17:40 +08:00
Jiamin Ma
f7b7bd3df5 efuse: fix INCOMPATIBLE_CAST and NEGATIVE_RETURNS errs
PD#152879: driver defect clean up
 #299
 #300
 #320
 #321

Change-Id: I3756489ea81520ab042c74642b0483f36bff6fba
Signed-off-by: Jiamin Ma <jiamin.ma@amlogic.com>
2017-11-12 23:21:16 -07:00
Jiamin Ma
24e08553c1 iomap: remove unnecessary comparison
PD#152908: driver defect clean up

#364
#365
#366

Change-Id: I53c4bd4cbe1cc82408ec3f0b30b3b8e696ea1fc2
Signed-off-by: Jiamin Ma <jiamin.ma@amlogic.com>
2017-11-12 23:20:12 -07:00
pengcheng chen
5160004744 osd: add osd dump cmd for drm
PD#152825: add osd dump cmd for drm

Change-Id: I9557ee84cecf00036b6ed59819aedd8e53ec6693
Signed-off-by: pengcheng chen <pengcheng.chen@amlogic.com>
2017-11-12 23:04:49 -07:00
tao zeng
b99ebebc62 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: I77920e902189ab4aa1ec594d351749ee4aa3a3ee
Signed-off-by: tao zeng <tao.zeng@amlogic.com>
2017-11-12 22:29:12 -07:00
Quentin Perret
904c79c425 sched: compute task utilisation with WALT consistently
Using WALT, the utilisation of a task is computed with a resolution
scaling factor that has been used inconsistently in the code with either
hardcoded values or macros (NICE_0_LOAD_SHIFT in this case). Changes in
these macros (as the 32 to 64 bits resolution shift of 2159197d66)
happened to break the utilisation calculation wherever they have been
used whilst results remained correct in other places. This commit fixes
this issue by using SCHED_CAPACITY_SCALE as resolution scaling factor
consistently.

Change-Id: Ic5418f8a5dfc455a22bafbebb4142b4665b61c6f
Signed-off-by: Quentin Perret <quentin.perret@arm.com>
2017-11-10 14:16:08 +00:00
pengcheng chen
e720c7885d osd: fix logo error when plugin hdmi after system power on
PD#152816: osd: fix logo error when plugin hdmi after power on
                by exchange osd and vout probe

Change-Id: Ieb89d12a975813dd238bbe4fa805bc2bcfdd682a
Signed-off-by: pengcheng chen <pengcheng.chen@amlogic.com>
2017-11-10 01:27:31 -07:00
Qiufang Dai
cdc628fd6c clk: axg fix_pll use frac mode
PD#154040: axg fix_pll enable frac mode describe

Change-Id: I1223b5710687a2e9902d953fd7c8eac9c8574f4d
Signed-off-by: Qiufang Dai <qiufang.dai@amlogic.com>
2017-11-10 01:13:34 -07:00
Xing Wang
2cedfd7494 audio: fixed pdm clk and pamaraters for fixed pll decimal mode
PD#154040: fixed pdm record data is only DC value issue.
1. fixed pdm sys clk to 133m
2. fixed sample count according to dclk

Change-Id: Ica8a21c9877c9bf81f157e5590fd08e2860140f9
Signed-off-by: Xing Wang <xing.wang@amlogic.com>
2017-11-10 01:13:12 -07:00
kunpeng.tang
56136d1572 media: ionvideo: fix adaptiveEosFlushSeek bug
PD#152800: init inovideo queue when flush

Change-Id: I3fdf24407586ef191905a37cfad1957dab2c9f6c
Signed-off-by: kunpeng.tang <kunpeng.tang@amlogic.com>
2017-11-10 00:26:13 -07:00
shihong.zheng
442caae23c media: recover calculated disp pts for video
PD#153240: add disp pts in vf for some unstable pts

Change-Id: I1d4cfd04c94feafac109bd69be3bd422aca3d8bf
Signed-off-by: shihong.zheng <shihong.zheng@amlogic.com>
2017-11-09 23:14:50 -07:00
Peipeng Zhao
d383851245 led: fixed led driver for is31fl32xx
PD#154214: fixed led is31fl32xx driver for D605 board

please add CONFIG_LEDS_IS31FL32XX=y on kernel  defconfig

please read Documentation/leds/leds-is31fl32xx.txt
in order to configure dts

Change-Id: Ib9903c5d628fd392bde3787786a4dfb2e90911a6
Signed-off-by: Peipeng Zhao <peipeng.zhao@amlogic.com>
2017-11-09 18:58:24 -07:00
Zhi Zhou
420cb9b88e media: vfm: fixed vfm crash bug [1/1]
PD#141785: fixed vframe provider debug
	merged from 7.1
        for o bug:153539
	old commit:5f5fcfa9c618 & 3bcf5865b002fa
	print info's buffer may freeed so dump old provider
	infos may crash.
	used  buffer array now.

Change-Id: I537f62fda4bd541513b929fa5a2e289b1ea66558
Signed-off-by: Zhi Zhou <zhi.zhou@amlogic.com>
2017-11-09 02:00:54 -07:00
Peipeng Zhao
f6a3271ab8 audio: add audio codec es7243 driver
PD#153483: codec: add sound codec es7243 driver

Change-Id: I3e4e76026bca7ea75df2ad8b0c5e6a730826c4bc
Signed-off-by: Peipeng Zhao <peipeng.zhao@amlogic.com>
2017-11-09 12:22:07 +08:00
Mark Salyzyn
a93e3124db FROMLIST: arm64: Avoid aligning normal memory pointers in __memcpy_{to,from}io
(cherry picked from arm64/for-next/core commit 9ca255bf04)

__memcpy_{to,from}io fall back to byte-at-a-time copying if both the
source and destination pointers are not 8-byte aligned. Since one of the
pointers always points at normal memory, this is unnecessary and
detrimental to performance, so only do byte copying until we hit an 8-byte
boundary for the device pointer.

This change was motivated by performance issues in the pstore driver.
On a test platform, measuring probe time for pstore, console buffer
size of 1/4MB and pmsg of 1/2MB, was in the 90-107ms region. Change
managed to reduce it to 10-25ms, an improvement in boot time.

Cc: Kees Cook <keescook@chromium.org>
Cc: Anton Vorontsov <anton@enomsg.org>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Anton Vorontsov <anton@enomsg.org>
Cc: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Mark Salyzyn <salyzyn@android.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Bug: 63716230
Change-Id: I245545e8243a54b44d30fbb0d0c71a9b8a77ef63
2017-11-08 21:20:34 +00:00
Greg Kroah-Hartman
c4789f87f6 Merge 4.9.61 into android-4.9
Changes in 4.9.61
	ALSA: timer: Add missing mutex lock for compat ioctls
	ALSA: seq: Fix nested rwsem annotation for lockdep splat
	cifs: check MaxPathNameComponentLength != 0 before using it
	KEYS: return full count in keyring_read() if buffer is too small
	KEYS: fix out-of-bounds read during ASN.1 parsing
	ASoC: adau17x1: Workaround for noise bug in ADC
	arm64: ensure __dump_instr() checks addr_limit
	arm/arm64: KVM: set right LR register value for 32 bit guest when inject abort
	arm/arm64: kvm: Disable branch profiling in HYP code
	ARM: 8715/1: add a private asm/unaligned.h
	drm/amdgpu: return -ENOENT from uvd 6.0 early init for harvesting
	ocfs2: fstrim: Fix start offset of first cluster group during fstrim
	drm/i915/edp: read edp display control registers unconditionally
	drm/msm: Fix potential buffer overflow issue
	drm/msm: fix an integer overflow test
	tracing/samples: Fix creation and deletion of simple_thread_fn creation
	Fix tracing sample code warning.
	cpufreq: Do not clear real_cpus mask on policy init
	crypto: ccp - Set the AES size field for all modes
	staging: fsl-mc: Add missing header
	IB/mlx5: Assign DSCP for R-RoCE QPs Address Path
	PM / wakeirq: report a wakeup_event on dedicated wekup irq
	scsi: megaraid_sas: Do not set fp_possible if TM capable for non-RW syspdIO, change fp_possible to bool
	mmc: s3cmci: include linux/interrupt.h for tasklet_struct
	mfd: ab8500-sysctrl: Handle probe deferral
	mfd: axp20x: Fix axp288 PEK_DBR and PEK_DBF irqs being swapped
	bnxt_en: Added PCI IDs for BCM57452 and BCM57454 ASICs
	staging: rtl8712u: Fix endian settings for structs describing network packets
	PCI/MSI: Return failure when msix_setup_entries() fails
	net: mvneta: fix build errors when linux/phy*.h is removed from net/dsa.h
	ext4: fix stripe-unaligned allocations
	ext4: do not use stripe_width if it is not set
	net/ena: change driver's default timeouts
	i2c: riic: correctly finish transfers
	drm/amdgpu: when dpm disabled, also need to stop/start vce.
	perf tools: Only increase index if perf_evsel__new_idx() succeeds
	iwlwifi: mvm: use the PROBE_RESP_QUEUE to send deauth to unknown station
	drm/fsl-dcu: check for clk_prepare_enable() error
	clocksource/drivers/arm_arch_timer: Add dt binding for hisilicon-161010101 erratum
	net: phy: dp83867: Recover from "port mirroring" N/A MODE4
	cx231xx: Fix I2C on Internal Master 3 Bus
	ath10k: fix reading sram contents for QCA4019
	clk: sunxi-ng: Check kzalloc() for errors and cleanup error path
	mtd: nand: sunxi: Fix the non-polling case in sunxi_nfc_wait_events()
	gpio: mcp23s08: Select REGMAP/REGMAP_I2C to fix build error
	xen/manage: correct return value check on xenbus_scanf()
	scsi: aacraid: Process Error for response I/O
	platform/x86: intel_mid_thermal: Fix module autoload
	staging: lustre: llite: don't invoke direct_IO for the EOF case
	staging: lustre: hsm: stack overrun in hai_dump_data_field
	staging: lustre: ptlrpc: skip lock if export failed
	staging: lustre: lmv: Error not handled for lmv_find_target
	brcmfmac: check brcmf_bus_get_memdump result for error
	vfs: open() with O_CREAT should not create inodes with unknown ids
	ASoC: Intel: boards: remove .pm_ops in all Atom/DPCM machine drivers
	exynos4-is: fimc-is: Unmap region obtained by of_iomap()
	mei: return error on notification request to a disconnected client
	s390/dasd: check for device error pointer within state change interrupts
	s390/prng: Adjust generation of entropy to produce real 256 bits.
	s390/crypto: Extend key length check for AES-XTS in fips mode.
	bt8xx: fix memory leak
	drm/exynos: g2d: prevent integer overflow in
	PCI: Avoid possible deadlock on pci_lock and p->pi_lock
	powerpc/64: Don't try to use radix MMU under a hypervisor
	xen: don't print error message in case of missing Xenstore entry
	staging: r8712u: Fix Sparse warning in rtl871x_xmit.c
	ARM: dts: mvebu: pl310-cache disable double-linefill
	Linux 4.9.61

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2017-11-08 10:44:28 +01:00
Greg Kroah-Hartman
5caae9d141 Linux 4.9.61 2017-11-08 10:08:37 +01:00