audio: no_mclk for amp [1/1]

PD#SWPL-15422

Problem:
Play video without HDMI connection, no sound output

Solution:
no_mclk for amp

Verify:
Verify by Android P w400

Change-Id: Ic95a1e28f8ccbf6e3ba4a21f7d7b329f5854ea49
Signed-off-by: GongWei Chen <gongwei.chen@amlogic.com>

vpp: sr software flow improvement [1/1]

PD#SWPL-13633

Problem:
sr input size need improvement

Solution:
improvement sr software flow

Verify:
verified by sm1

Change-Id: I10b9dd6d057fc8906ce312576623480aa14ae8a3
Signed-off-by: Pengcheng Chen <pengcheng.chen@amlogic.com>

hdmitx: add missing 'product_desc' in SPD infoframe [1/1]

PD#SWPL-14801

Problem:
Sharp/LCD-42GX50A TV will be black when it receives vendor_name
but without product_desc in SPD infoframe

Solution:
Add missing 'product_desc' in SPD infoframe

Verify:
G12A/U212

Change-Id: I630fa416580855883a80be2747d39887ef67ef5c
Signed-off-by: Zongdong Jiao <zongdong.jiao@amlogic.com>
Signed-off-by: Luan Yuan <luan.yuan@amlogic.com>

vpp: dynamic adjust scaler path according to supsc0 h&v ratio [2/2]

PD#SWPL-12202

Problem:
scaler path need adjust according to supsc0 h&v ratio

Solution:
add dynamic adjust scaler path

Verify:
g12a&sm1

Change-Id: If00b4c321e24910ff7abd166d9a828dc424ab0d0
Signed-off-by: Bencheng Jing <bencheng.jing@amlogic.com>

vpp: set the sr position reg correctly [1/1]

PD#SWPL-14963

Problem:
The position bits of super scaler is incorrect.

Solution:
Set the position bits correctly

Verify:
Verified on U212

Change-Id: I133662859456f65e130b8795f574da845039c717
Signed-off-by: Brian Zhu <brian.zhu@amlogic.com>

vpp: sr: disable more latch ctrl for SR0 [1/1]

PD#TV-7673

Problem:
SR0 register enabled the latch function, it will cause
frame size setting out of sync when bypass sr0.

Solution:
Disable the latch option.

Verify:
Verified with X301

Change-Id: Ibfc4c5f8f695757ddd7d7d9e50e4b5be23268388
Signed-off-by: Brian Zhu <brian.zhu@amlogic.com>

ion: ion_sync_for_device use swiotlb_dma_ops not dummy_dma_ops [1/1]

PD#OTT-5276

Problem:
CTS EncodeDecodeTest failed. Ion sync ioctrl was
forwarded to a dummy implementation. So cached dma buffer
syncing between device and driver was inconsistent occasionally.

Solution:
Changed the dummy_dma_ops to swiotbl_dma_ops when ion_sync_for_device

Verify:
franklin, hertz

Change-Id: I16863bba6c3fe16b9c3b2b410ade6e45c9e74826
Signed-off-by: baocheng sun <baocheng.sun@amlogic.com>

Revert "fbcon: use soft cursor instead of hardware cursor"

This reverts commit c2da0df06c3df7c5af2ab636564a70278004aa11.

camera: VIM3: enable IRCUT

Signed-off-by: Nick Xie <nick@khadas.com>

VIM3: add camera os08a10 support

Signed-off-by: Nick Xie <nick@khadas.com>

VIM3: add isp module

sync from buildroot

commit 9a8a34f0418c851f89494357ec83c4d8c3514b8f
Author: Jiacheng Mei <jiacheng.mei@amlogic.com>
Date:   Wed Jul 17 19:52:57 2019 +0800

     rm sreg node when rmmod

     Change-Id: I2c2c885670913fb5162748951def90f4ee8b7582
Signed-off-by: Jiacheng Mei <jiacheng.mei@amlogic.com>
Signed-off-by: Nick Xie <nick@khadas.com>

tp: enble tp in w400 dts [2/2]

PD#SWPL-15292

Problem:
W400 is not touch panel

Solution:
add touch panel in w400

Verify:
verify by w400

Change-Id: Ibb4323458a2e84ba9fa84177fe6c747611277c55
Signed-off-by: GongWei Chen <gongwei.chen@amlogic.com>

lcd: add lcd_init_level to control lcd display [2/2]

PD#TV-9856

Problem:
need change display driver for cool boot to enter
kernel stage freeze mode

Solution:
add lcd_panel_ctrl to control lcd display

Verify:
t962x2-x301

Change-Id: I8b58ab0a0f87c49791af7dddf7b05db37f7ad716
Signed-off-by: shaochan.liu <shaochan.liu@amlogic.com>

lcd: add lcd_ctrl bootargs for lcd driver control [2/2]

PD#SWPL-4097

Problem:
add lcd_ctrl bootargs for lcd driver control

Solution:
add lcd_ctrl bootargs for lcd driver advance control
and debug function in kernel

Verify:
verify by t962x2-r311

Change-Id: I4d741eef42505e259b54cd4f00e395d09edf7604
Signed-off-by: Shaochan Liu <shaochan.liu@amlogic.com>

arm64: dts: dvfs: VIM3L: update cpufreq table for sm1 corner

Signed-off-by: Nick Xie <nick@khadas.com>

dvfs: update cpufreq table for sm1 corner [1/1]

PD#SWPL-13264

Problem:
update cpufreq table for sm1 corner

Solution:
update cpufreq table for sm1 corner

Verify:
test pass on sm1_ac200

Change-Id: Iba08ceb00dc00994e1c383090d6ff5d9dfb91ce3
Signed-off-by: Hong Guo <hong.guo@amlogic.com>
Signed-off-by: Luan Yuan <luan.yuan@amlogic.com>

dts: update s905x3 vddcpu pwm to 30 steps [1/1]

PD#SWPL-11792

Problem:
update s905x3 vddcpu pwm to 30 steps

Solution:
update s905x3 vddcpu pwm to 30 steps

Verify:
test pass on S905X3_AC213

Change-Id: I30bfe855e3bb0a4b0a33f6d9029a718b7de68829
Signed-off-by: Hong Guo <hong.guo@amlogic.com>
Signed-off-by: Luan Yuan <luan.yuan@amlogic.com>

CPUFREQ: use gp1 pll for cpufreq. [1/1]

PD#SWPL-3826

Problem:
use gp1 pll for cpufreq.

Solution:
use gp1 pll for cpufreq.

Verify:
x301_tl1

Change-Id: Iefb6d31ec40ba304f41024e4b7adceec881d043e
Signed-off-by: Hong Guo <hong.guo@amlogic.com>
Signed-off-by: Luan Yuan <luan.yuan@amlogic.com>

dvfs: update cpu clk after adjust cpufeq for g12b big core [1/1]

PD#SWPL-11796

Problem:
update cpu clk after adjust cpufeq

Solution:
update cpu clk after adjust cpufeq

Verify:
test pass on g12b_w400

Change-Id: I5e4593e4b65de5f7536ddde793d682cc67df0e64
Signed-off-by: Hong Guo <hong.guo@amlogic.com>

cpufreq: dynamic adjustment dsu clk with tl1 cpu clk [1/3]

PD#SWPL-2842

Problem:
dynamic adjustment dsu clk with cpu clk.

Solution:
dynamic adjustment dsu clk with cpu clk.

Verify:
tl1_x301, verify pass

Change-Id: I75f97d9e259dee2c3067e5989b3626e38cf20337
Signed-off-by: Hong Guo <hong.guo@amlogic.com>
Signed-off-by: Luan Yuan <luan.yuan@amlogic.com>

dts: A311D W400 add camera os08a10 [1/1]

PD#SWPL-15086

Problem:
A311D W400 add camera os08a10

Solution:
A311D W400 add camera os08a10

Verify:
Verify by Android P w400

Change-Id: I60cdfe3996ee5bf54bfba24972c3e0c46005401a
Signed-off-by: GongWei Chen <gongwei.chen@amlogic.com>

arm64: dts: VIM3/VIM3L has only hdmi output by default, panel has no output

Solution:
modify clk

Signed-off-by: Nick Xie <nick@khadas.com>

dtsi: A311D w400 has only hdmi output by default, panel has no output [1/3]

PD#SWPL-15024

Problem:
A311D w400 has only hdmi output by default, panel has no output

Solution:
modify clk

Verify:
Verify by Android P w400

Change-Id: I90d2defc509de2e559bb1ae1f4fcbcf38012b93c
Signed-off-by: GongWei Chen <gongwei.chen@amlogic.com>

dts: add platform W200 [2/3]

PD#SWPL-15005

Problem:
need add platform W200

Solution:
add platform W200

Verify:
Verify by Android P w200

Change-Id: Ia1baacb5c62182fd17c4e1730a4ad6aeeaa71dda
Signed-off-by: GongWei Chen <gongwei.chen@amlogic.com>

cvbsout: fix cgms bit mistake for NTSC [1/1]

PD#OTT-5683

Problem:
NTSC cgms data bit is incorrect

Solution:
fix cgms bit mistake

Verify:
u212

Change-Id: If1d26714eeed9061773c25871715713b122d9980
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>

hdmitx: reduce the delay time of plugout [1/1]

PD#OTT-6369

Problem:
The HPD low time of some Monitor(such as LG) is about 30ms, less than 100ms

Solution:
Reduce the delay time of plugout

Verify:
G12A/U212

Change-Id: I343223b5ef0696da035f0b3b179bdbfbce68c859
Signed-off-by: Zongdong Jiao <zongdong.jiao@amlogic.com>

arm64: dts: amvecm: VIM3/VIM3L: add viu2 vsync support for gamma

Signed-off-by: Nick Xie <nick@khadas.com>

amvecm: add viu2 vsync support for gamma [1/1]

PD#SWPL-14450

Problem:
gamma can't support viu2 vsync

Solution:
add viu2 vsync support for gamma

Verify:
u202

Change-Id: I5f490b254f58a130451ff69a456c218e6e4dcc94
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
Conflicts:
drivers/amlogic/media/enhancement/amvecm/amve.c

hdmitx: force to update glitch time after hdcp22 unmux [1/1]

PD#SWPL-11894

Problem:
glitch time in bl31 may not be updated after hdcp22 unmux,
because get hdcp auth result function in bl31 will not be
called after hdcp mode set to 0. In a result, the glitch
hdcp22 result may take place of the actual hdcp22 auth
status after mode change, and feedback to systemcontrol
to clear/set video mute by wrong

Solution:
force to update glitch time after hdcp22 unmux

Verify:
U200/g12a

Change-Id: I497ead5f8f5c46959560ffc0c8702acca1a3f46c
Signed-off-by: Hang Cheng <hang.cheng@amlogic.com>

eth: compatible internal phy enet efuse map for some chip [1/1]

PD#SWPL-14596

Problem:
some g12a chip,efuse map for enet is diff
So need compatible for these chip

Solution:
read valid bit from valid block,not data block

Verify:
verified by tl1 and g12a

Change-Id: I564209d865cbc2ff1151df07d06593b12ea225d8
Signed-off-by: qi duan <qi.duan@amlogic.com>

amvecm: add addr protect for register program [1/1]

PD#SWPL-14333

Problem:
invalid address is allowed for register program
which cause kernel panic

Solution:
add protection, programming on invalid addr will
be terminated

Verify:
tl1

Change-Id: I44bedec256ee5c386b53188fb2d8e40ae8c3f553
Signed-off-by: Xihai Zhu <xihai.zhu@amlogic.com>

eth: clk invert bit compatible for 100M when exphy [1/1]

PD#SWPL-14033

Problem:
if clk invert bit set, 100M will not connect

Solution:
don't invert clk when connect 100M network

Verify:
w400

Change-Id: I4c3acbcc0d05fc2c99b5a982461ab3d5ff83fe26
Signed-off-by: qi duan <qi.duan@amlogic.com>

osd: mali afbcd memory out of bound [1/1]

PD#TV-6683

Problem:
DMC error log as "ID:VPU READ1, sub: 7"

Solution:
make afbc disable, if afbc phy addr is 0

Verify:
verified on TL1-X301

Change-Id: I111c8e2e922877904dd8b8d1f276f79ca4f68e94
Signed-off-by: Jian Cao <jian.cao@amlogic.com>

osd: add osd blend reg config check. [1/4]

PD#SWPL-2049

Problem:
osd3 din blend config may be incorrect when viu2 is enable

Solution:
add osd blend reg config check

Verify:
verify by AC202(sm1)

Change-Id: I3d8ff0d247226d4df1386808caba2a21a34f0b10
Signed-off-by: Dezhi Kong <dezhi.kong@amlogic.com>

csc: add vinfo check for csc process [1/1]

PD#SWPL-13491

Problem:
After plugging and unplugging HDMITX,
the panel screen color display is abnormal
for dual display platform.

Solution:
add vinfo->mode check for csc process,
avoid process null and invalid vinfo case.

Verify:
verify by AC202(sm1)

Change-Id: I54c54adcf2a0fc9a02e35b0ef24a720a55a8781a
Signed-off-by: Dezhi Kong <dezhi.kong@amlogic.com>
Signed-off-by: Luan Yuan <luan.yuan@amlogic.com>

dts: ge2d: correct the ge2d irq number [1/1]

PD#SWPL-13669

Problem:
Ge2d irq number is wrong on g12a/g12b/sm1.

Solution:
Replace the correct number

Verify:
Verified on u212

Change-Id: Ia3d202dc10cb978033892efb1de251bf5cf1df31
Signed-off-by: Brian Zhu <brian.zhu@amlogic.com>

arm64: dts: VIM3: cpufreq: update dvfs voltage and pwm for g12b revb

Signed-off-by: Nick Xie <nick@khadas.com>

cpufreq: update dvfs voltage and pwm for g12b revb [1/1]

PD#SWPL-7636

Problem:
update dvfs voltage and pwm for g12b revb

Solution:
update dvfs voltage and pwm for g12b revb

Verify:
update dvfs voltage and pwm for g12b revb

Change-Id: I29deea791126fcb1819be380ed81bc2aa29eeec6
Signed-off-by: Hong Guo <hong.guo@amlogic.com>
Signed-off-by: Luan Yuan <luan.yuan@amlogic.com>
Conflicts:
arch/arm/boot/dts/amlogic/g12b_a311d_w400_drm_buildroot.dts
arch/arm64/boot/dts/amlogic/g12b_a311d_w400_drm_buildroot.dts

arm64: dts: VIm3/VIM3L: add video11 and video12 for screencontrol

Signed-off-by: Nick Xie <nick@khadas.com>

dts: add video11 and video12 for screencontrol [2/6]

PD#SWPL-13022

Problem:
mbox needs to support screencontrol

Solution:
add video11 and video12 node

Verify:
SM1-AC202

Change-Id: Idac331731c6c3b7666ba5335a5341b14b13b6f8f
Signed-off-by: huijie.huang <huijie.huang@amlogic.com>

cvbsout: fix cgms config mistake for NTSC [1/1]

PD#OTT-5683

Problem:
NTSC cgms signal is incorrect

Solution:
fix cgms config mistake

Verify:
u212

Change-Id: I4a3dce8d6b3439be974a8aea48ca1d445feee25b
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>

dolby: Display flickers with garbage image [1/1]

PD#OTT-5577

Problem:
when scale down, scaler+dolby h-timing too tight

Solution:
reduce htotal_add to 0xc0 when 4k output

Verify:
u212

Change-Id: I190ec235370d9ed75f9c1f477c1419c383b0a8e7
Signed-off-by: yao liu <yao.liu@amlogic.com>

ETH: remove release open when resume for amlogic phy. [1/1]

PD#SWPL-13132

Problem:
stammac release/open when resume will change the dma addr.
if stmmac_xmit and stmmac_tx_work are running at the same time
it will cause panic

Solution:
remove stmmac_release/open call in stmmac_resume for chip
g12a/g12b/tl1/tm2

Verify:
verify on TL1

Change-Id: I5abf2ccf72c39483bbd1cce7b9e24bf596f30d0f
Signed-off-by: qi duan <qi.duan@amlogic.com>

ETH: do eth reset bit when resume. [1/1]

PD#SWPL-12780

Problem:
internal phy can not connect network probably
after long stress suspend test

Solution:
In suspend/resume sequeue, add eth reset

Verify:
verify on TL1 and G12b

Change-Id: Id8f6767686f4e4d52774d9ac28dac46549a52d4c
Signed-off-by: qi duan <qi.duan@amlogic.com>
Signed-off-by: Luan Yuan <luan.yuan@amlogic.com>

camera: fix gc2145 mipi camera mirror [1/1]

PD#SWPL-12760

Problem:
camera preview interface left and right invert

Solution:
adjust gc2145 mipi camera mirror register

Verify:
S905D3-AC200

Change-Id: I1789e5d055bf8661e6ec30f67e6e8db4a6fc99f6
Signed-off-by: Guosong Zhou <guosong.zhou@amlogic.com>

hdmitx: remove unnecessary sentences [2/2]

PD#SWPL-12305

Problem:
Rx may lost synchronization when Tx switches modes

Solution:
remove unnecessary sentences

Verify:
SM1/AC213

Change-Id: Iba88a9a558cce822ff939ad98a992dcf5161eba7
Signed-off-by: Zongdong Jiao <zongdong.jiao@amlogic.com>

time: fix fail to read generic timer's counter value correctly [1/1]

PD#SWPL-6837

Problem:
The return value of arch_counter_get_cntvct is always abnormal
when it is in irq stack. In this case, arch_counter_get_cntvct
trys to access a variable in 8Bytes via a 4Bytes aligned addr-
ess, which vialates the rule: The address that is accessed
should be aligned to the size of the data element being
accessed

Solution:
after switching to irq stack, force the base sp value to be
16Bytes aligned. Since the address of variable in irq stack is
based on the base sp and arranged automatically, all the data
accessing in irq stack will be aligned.

Verify:
Ampere

Change-Id: I3b30a56491dd0720d1c885bfaf2ca98d1b103fdd
Signed-off-by: Jiamin Ma <jiamin.ma@amlogic.com>
(cherry picked from commit 043ae971bf47dcae687412d7f52a8e7818244742)

audio: add enable count for PDM module [1/1]

PD#IPTV-3723

Problem:
One use case is PDM module is sendig data
to both PDM device and LOOPBACK device.
Close one will make another useless.

Solution:
Add management of the PDM module by
a enable count.

Verify:
SM1.

Change-Id: Iceeb756c02671b16dbc3c49a9b793a50e6e559b5
Signed-off-by: Shuai Li <shuai.li@amlogic.com>

camera: fix take picture stuck when camera recording [1/1]

PD#SWPL-12300

Problem:
gc2145 mipi camera take picture will stuck when recording

Solution:
add the right size to picture array

Verify:
verify on S905D3

Change-Id: Iee797d59053050d41448fda601a3bd7226cf9f37
Signed-off-by: Guosong Zhou <guosong.zhou@amlogic.com>

arm64: dts: VIM3L: audio: SM1 tdmouta gated by earc

Signed-off-by: Nick Xie <nick@khadas.com>

audio: SM1 tdmouta gated by earc [1/1]

PD#IPTV-3732

Problem:
TMDOUTA is gated by earc clk gate.
There is a bug in sm1 clk gating.

Solution:
Fix the wrong map of clk mapping.

Verify:
SM1.

Change-Id: Ia395d3307c249ef0cd64b715bb936dea3e2925ac
Signed-off-by: Shuai Li <shuai.li@amlogic.com>

di: fix pulldown 22 enter slow patch from vlsi-LiuYanling [1/1]

PD#SWPL-12061

Problem:
film 22 detection threshold is high

Solution:
adjust the threshold lower

Verify:
sm1

Change-Id: I8e01e910b4a08aefdbde18fe1033bcb45e85b338
Signed-off-by: Bencheng Jing <bencheng.jing@amlogic.com>

Dolby: Metadata Conformance test mismatch [1/1]

PD#SWPL-11390

Problem:
No 227/228/229/230 fail

Solution:
1.Set video priotiry, to prevent num_ext_blocks is set to 0
2.Turn off osd, to make gmax=gmin=0
3.Update md_tool.exe to version 0.4.1
4.Add padding data 0 to 512 bytes for metadata

By the way, fix some coverity check error

Verify:
sm1

Change-Id: I316e33bac3d84bb3bd7763031c28b33cfe7762ac
Signed-off-by: yao liu <yao.liu@amlogic.com>

di: fix the sawtooth because of not into pulldown 22 timely [1/1]

PD#SWPL-10382

Problem:
not into pulldown 22 timely

Solution:
The judgment condition is wider for pulldown 22

Verify:
sm1

Change-Id: Id99c0c997b0954dee0a06b7e6dfd60feded73b30
Signed-off-by: Bencheng Jing <bencheng.jing@amlogic.com>

di: fix the abnormal white color noise [1/2]

PD#SWPL-7049

Problem:
abnormal white color noise

Solution:
add G12a/G12b/sm1 chip in the deghost patch

Verify:
sm1

Change-Id: Ib3f4f0500712ff2aac8d5eb9cd137f8a3d3fe0f1
Signed-off-by: Bencheng Jing <bencheng.jing@amlogic.com>

di: fix the flash mosaic caused by cue [1/1]

PD#SWPL-11034

Problem:
flash mosaic when play VTS_13_1.VOB

Solution:
adjust cue function

Verify:
sm1

Change-Id: If188f49f3972e5da2b2fe4e917bb6e1b14163569
Signed-off-by: Bencheng Jing <bencheng.jing@amlogic.com>

di: fix sawtooth in the lower patr of AV video [1/1]

PD#SWPL-10831

Problem:
sawtooth in the lower patr of AV video

Solution:
adjust motion num condition

Verify:
marconi

Change-Id: Id42f1cb2d3f702e04cd640dbc99c4f7a97447faf
Signed-off-by: Wenfeng Guo <wenfeng.guo@amlogic.com>

deinterlace: add condition for force_prog [1/1]

PD#SWPL-11550

Problem:
force_prog only for progressive.

Solution:
add condition for force_prog

Verify:
TL1

Change-Id: I44e165c779eefcefcc18a286e66a598ffef1294f
Signed-off-by: Jihong Sui <jihong.sui@amlogic.com>

ethernet: debug function for reset [1/1]

PD#SWPL-11505

Problem:
STR may crash

Solution:
improve the suspend/rusume flow

Verify:
verify on g12a u200 board

Change-Id: Ie7b4759fd0d801c83eb3c1c314c402ae470b5e3f
Signed-off-by: Zhuo Wang <zhuo.wang@amlogic.com>

mcdi: keep g12a/g12b/sm1 reg_mcdi_qmeen same as gxlx2 [1/2]

PD#SWPL-10411

Problem:
reg_mcdi_qmeen is enable by driver

Solution:
disable reg_mcdi_qmeen

Verify:
u212

Change-Id: I02887fab37a0bbeb43bfa83a4a5a2e446bebb9c1
Signed-off-by: Bencheng Jing <bencheng.jing@amlogic.com>

dts: sm1: camera preview would cause garbage [1/1]

PD#SWPL-11884

Problem:
camera preview would cause garbage.

Solution:
modify the previous change:38e45fb998269d36f41a7b004be51ba9f1e7bef9
not to remove vdin0_cma_reserved.

Verify:
test passed on sm1

Change-Id: Ie20de9b3562f7c83fa73bd88acab7770ca8c3b0a
Signed-off-by: changqing.gao <changqing.gao@amlogic.com>
Signed-off-by: Luan Yuan <luan.yuan@amlogic.com>

audio: Fix panic on add_timer [1/1]

PD#TV-7920

Problem:
Audio drive caused kernel panic.
BUG_ON timer_pending.

Solution:
Add timer will panic calling add_timer.
If timer is pending we need use mod_timer
to deal with this case.

Verify:
T962

Change-Id: Ib4143de384af40803609c3513ad07eeb3fe59bbf
Signed-off-by: Shuai Li <shuai.li@amlogic.com>

hdmitx: optimise the mode setting sequence [2/2]

PD#SWPL-10600

Problem:
When hdmitx output deep color modes (30 or 36 bits), the Hactive
may set wrong values, offset +1.

Solution:
Optimise the mode setting sequence: disable VENC, PHY configure,
core configure / reset, enable VENC

Verify:
G12B/W400

Change-Id: Id19b4441ccee3a7d3d81c3d55dbd9102762fe992
Signed-off-by: Zongdong Jiao <zongdong.jiao@amlogic.com>

hdr: fix hlg2hdr green screen issue [1/1]

PD#SWPL-12079

Problem:
hlg2hdr convert video green

Solution:
hlg2hdr mtx conver coef is wrong

Verify:
verify on sm1

Change-Id: I7d16bb35a4f5ec94da70c3d3c60daefa96743ac2
Signed-off-by: MingLiang Dong <mingliang.dong@amlogic.com>

ethernet: g12a/b exphy use autocali [1/1]

PD#SWPL-10391

Problem:
g12b revA and revB need one code for two parameter

Solution:
if autocali in uboot, use autocali result
if no autocali,use the dts para

Verify:
verify on g12b w400 board,revA and revB

Change-Id: I4b48c67fba25eba4cb286470557ff0777009ec9f
Signed-off-by: qi duan <qi.duan@amlogic.com>

VIM3L: NPU: add sm1 S905D3-N0N NPU support

cherry-picked from Android

Signed-off-by: Nick Xie <nick@khadas.com>

WOL: add forcereset support

Signed-off-by: Nick Xie <nick@khadas.com>

Revert "deinterlace.c: bypass on progressive"

This reverts commit 61e7b5465a1ea7e7582c0f2d4df6788abc05ad9b.

Revert "amlogic/deinterlace: Don't bypass if the stream is mixed Interlaced and Progressive"

This reverts commit 343e049ec8dfa03c6d0836942b8e8462f4ac5da6.

LTE: add HauWei 4G model support

Signed-off-by: Nick Xie <nick@khadas.com>

MCU: FAN: fix VIM1 V14 temperature read issue

Signed-off-by: Nick Xie <nick@khadas.com>

MCU: add MCU reset node

Signed-off-by: Nick Xie <nick@khadas.com>

MCU: add WOL function check

Signed-off-by: Nick Xie <nick@khadas.com>

MCU: move USB/PCIe switch node to mcu class

Signed-off-by: Nick Xie <nick@khadas.com>

MCU: tidy up

Signed-off-by: Nick Xie <nick@khadas.com>

arm64: dts: led: VIM1/VIM2: use gpio leds driver

Signed-off-by: Nick Xie <nick@khadas.com>

usb: xHCI host not responding to stop endpoint command [1/1]

PD#OTT-4738

Problem:
Read and write simultaneously on two disks on a hub,
and then the XHCI controller would halted.

Solution:
Set the GUCTL1 BIT 17 to 1 for disable park mode.

Verify:
test pass on u200, ODROID-N2

Change-Id: I007804fa6b97a103da4a05be12c1193b9dd422cb
Signed-off-by: he.he <he.he@amlogic.com>

VIM3: NPU: update to 6.3.3.4

  commit a8db826d6eacdeab880188398cf9c6a8c70cdeb4
  Author: deng.liu <deng.liu@amlogic.com>
  Date:   Mon Jun 24 15:15:31 2019 +0800

      npu: upload patch to fix memory leak on buildroot [1/1]

      PD#SH-540

      Problem:
      NN_Detection: memory not cleanup after model release

      Solution:
      upload patch to fix memory leak issue on buildroot

      Verify:
      Local on w400

      Change-Id: If3f897ad5acb1381185c84f6e1352bd206a90e94
Signed-off-by: deng.liu <deng.liu@amlogic.com>
Signed-off-by: Nick Xie <nick@khadas.com>

VIM3/VIM3L: add NPU module

sync from buildroot release V201904

commit 97dd19ce55abc6f93a12d2b3805355d220a3d2b4
Author: deng.liu <deng.liu@amlogic.com>
Date:   Thu Apr 18 14:41:02 2019 +0800

    nanoq: upload 32bit npu sharelib [1/1]

    PD#SH-484

    Problem:
    32bit NPU support remaining issue:revA run error

    Solution:
    fix revA 32bit npu run error issue

    Verify:
    Local

    Change-Id: I60bb41007a77229eb00ef50313b798bfdb574e46
Signed-off-by: deng.liu <deng.liu@amlogic.com>
Signed-off-by: Nick Xie <nick@khadas.com>

MCU: add FAN support for VIM1 V14

Signed-off-by: Nick Xie <nick@khadas.com>

TS: add touch screen support

Signed-off-by: Waylon <waylon@khadas.com>
Signed-off-by: Nick Xie <nick@khadas.com>

panel: TS050: fixup display issue

Signed-off-by: Nick Xie <nick@khadas.com>

tca6408: set LCD_RESET & LCD_EN to high by default

avoid to power off LCD in kernel stage

Signed-off-by: Nick Xie <nick@khadas.com>

LCD: disable debug information

Signed-off-by: Nick Xie <nick@khadas.com>

fixup! VIM3/VIM3L: add Khadas TS050 MIPI LCD support

Signed-off-by: Nick Xie <nick@khadas.com>

Merge tag 'v4.9.190' into khadas-vims-4.9.y

This is the 4.9.190 stable release

Merge tag 'v4.9.189' into khadas-vims-4.9.y

This is the 4.9.189 stable release

 Conflicts:
net/ipv6/ip6_tunnel.c

Merge tag 'v4.9.188' into khadas-vims-4.9.y

This is the 4.9.188 stable release

 Conflicts:
drivers/android/binder.c

Merge tag 'v4.9.187' into khadas-vims-4.9.y

This is the 4.9.187 stable release

Linux 4.9.190

bonding: Add vlan tx offload to hw_enc_features

[ Upstream commit d595b03de2cb0bdf9bcdf35ff27840cc3a37158f ]

As commit 30d8177e8ac7 ("bonding: Always enable vlan tx offload")
said, we should always enable bonding's vlan tx offload, pass the
vlan packets to the slave devices with vlan tci, let them to handle
vlan implementation.

Now if encapsulation protocols like VXLAN is used, skb->encapsulation
may be set, then the packet is passed to vlan device which based on
bonding device. However in netif_skb_features(), the check of
hw_enc_features:

 if (skb->encapsulation)
                 features &= dev->hw_enc_features;

clears NETIF_F_HW_VLAN_CTAG_TX/NETIF_F_HW_VLAN_STAG_TX. This results
in same issue in commit 30d8177e8ac7 like this:

vlan_dev_hard_start_xmit
  -->dev_queue_xmit
    -->validate_xmit_skb
      -->netif_skb_features //NETIF_F_HW_VLAN_CTAG_TX is cleared
      -->validate_xmit_vlan
        -->__vlan_hwaccel_push_inside //skb->tci is cleared
...
 --> bond_start_xmit
   --> bond_xmit_hash //BOND_XMIT_POLICY_ENCAP34
     --> __skb_flow_dissect // nhoff point to IP header
        -->  case htons(ETH_P_8021Q)
             // skb_vlan_tag_present is false, so
             vlan = __skb_header_pointer(skb, nhoff, sizeof(_vlan),
             //vlan point to ip header wrongly

Fixes: b2a103e6d0af ("bonding: convert to ndo_fix_features")
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
Acked-by: Jay Vosburgh <jay.vosburgh@canonical.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

team: Add vlan tx offload to hw_enc_features

[ Upstream commit 227f2f030e28d8783c3d10ce70ff4ba79cad653f ]

We should also enable team's vlan tx offload in hw_enc_features,
pass the vlan packets to the slave devices with vlan tci, let the
slave handle vlan tunneling offload implementation.

Fixes: 3268e5cb494d ("team: Advertise tunneling offload features")
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

net/mlx5e: Use flow keys dissector to parse packets for ARFS

[ Upstream commit 405b93eb764367a670e729da18e54dc42db32620 ]

The current ARFS code relies on certain fields to be set in the SKB
(e.g. transport_header) and extracts IP addresses and ports by custom
code that parses the packet. The necessary SKB fields, however, are not
always set at that point, which leads to an out-of-bounds access. Use
skb_flow_dissect_flow_keys() to get the necessary information reliably,
fix the out-of-bounds access and reuse the code.

Fixes: 18c908e477dc ("net/mlx5e: Add accelerated RFS support")
Signed-off-by: Maxim Mikityanskiy <maximmi@mellanox.com>
Reviewed-by: Tariq Toukan <tariqt@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

net/mlx5e: Only support tx/rx pause setting for port owner

[ Upstream commit 466df6eb4a9e813b3cfc674363316450c57a89c5 ]

Only support changing tx/rx pause frame setting if the net device
is the vport group manager.

Fixes: 3c2d18ef22df ("net/mlx5e: Support ethtool get/set_pauseparam")
Signed-off-by: Huy Nguyen <huyn@mellanox.com>
Reviewed-by: Parav Pandit <parav@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

xen/netback: Reset nr_frags before freeing skb

[ Upstream commit 3a0233ddec554b886298de2428edb5c50a20e694 ]

At this point nr_frags has been incremented but the frag does not yet
have a page assigned so freeing the skb results in a crash. Reset
nr_frags before freeing the skb to prevent this.

Signed-off-by: Ross Lagerwall <ross.lagerwall@citrix.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

sctp: fix the transport error_count check

[ Upstream commit a1794de8b92ea6bc2037f445b296814ac826693e ]

As the annotation says in sctp_do_8_2_transport_strike():

  "If the transport error count is greater than the pf_retrans
   threshold, and less than pathmaxrtx ..."

It should be transport->error_count checked with pathmaxrxt,
instead of asoc->pf_retrans.

Fixes: 5aa93bcf66f4 ("sctp: Implement quick failover draft from tsvwg")
Signed-off-by: Xin Long <lucien.xin@gmail.com>
Acked-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

net/packet: fix race in tpacket_snd()

[ Upstream commit 32d3182cd2cd29b2e7e04df7b0db350fbe11289f ]

packet_sendmsg() checks tx_ring.pg_vec to decide
if it must call tpacket_snd().

Problem is that the check is lockless, meaning another thread
can issue a concurrent setsockopt(PACKET_TX_RING ) to flip
tx_ring.pg_vec back to NULL.

Given that tpacket_snd() grabs pg_vec_lock mutex, we can
perform the check again to solve the race.

syzbot reported :

kasan: CONFIG_KASAN_INLINE enabled
kasan: GPF could be caused by NULL-ptr deref or user memory access
general protection fault: 0000 [#1] PREEMPT SMP KASAN
CPU: 1 PID: 11429 Comm: syz-executor394 Not tainted 5.3.0-rc4+ #101
Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011
RIP: 0010:packet_lookup_frame+0x8d/0x270 net/packet/af_packet.c:474
Code: c1 ee 03 f7 73 0c 80 3c 0e 00 0f 85 cb 01 00 00 48 8b 0b 89 c0 4c 8d 24 c1 48 b8 00 00 00 00 00 fc ff df 4c 89 e1 48 c1 e9 03 <80> 3c 01 00 0f 85 94 01 00 00 48 8d 7b 10 4d 8b 3c 24 48 b8 00 00
RSP: 0018:ffff88809f82f7b8 EFLAGS: 00010246
RAX: dffffc0000000000 RBX: ffff8880a45c7030 RCX: 0000000000000000
RDX: 0000000000000000 RSI: 1ffff110148b8e06 RDI: ffff8880a45c703c
RBP: ffff88809f82f7e8 R08: ffff888087aea200 R09: fffffbfff134ae50
R10: fffffbfff134ae4f R11: ffffffff89a5727f R12: 0000000000000000
R13: 0000000000000001 R14: ffff8880a45c6ac0 R15: 0000000000000000
FS:  00007fa04716f700(0000) GS:ffff8880ae900000(0000) knlGS:0000000000000000
CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 00007fa04716edb8 CR3: 0000000091eb4000 CR4: 00000000001406e0
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
Call Trace:
 packet_current_frame net/packet/af_packet.c:487 [inline]
 tpacket_snd net/packet/af_packet.c:2667 [inline]
 packet_sendmsg+0x590/0x6250 net/packet/af_packet.c:2975
 sock_sendmsg_nosec net/socket.c:637 [inline]
 sock_sendmsg+0xd7/0x130 net/socket.c:657
 ___sys_sendmsg+0x3e2/0x920 net/socket.c:2311
 __sys_sendmmsg+0x1bf/0x4d0 net/socket.c:2413
 __do_sys_sendmmsg net/socket.c:2442 [inline]
 __se_sys_sendmmsg net/socket.c:2439 [inline]
 __x64_sys_sendmmsg+0x9d/0x100 net/socket.c:2439
 do_syscall_64+0xfd/0x6a0 arch/x86/entry/common.c:296
 entry_SYSCALL_64_after_hwframe+0x49/0xbe

Fixes: 69e3c75f4d54 ("net: TX_RING and packet mmap")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Reported-by: syzbot <syzkaller@googlegroups.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

bnx2x: Fix VF's VLAN reconfiguration in reload.

[ Upstream commit 4a4d2d372fb9b9229327e2ed01d5d9572eddf4de ]

Commit 04f05230c5c13 ("bnx2x: Remove configured vlans as
part of unload sequence."), introduced a regression in driver
that as a part of VF's reload flow, VLANs created on the VF
doesn't get re-configured in hardware as vlan metadata/info
was not getting cleared for the VFs which causes vlan PING to stop.

This patch clears the vlan metadata/info so that VLANs gets
re-configured back in the hardware in VF's reload flow and
PING/traffic continues for VLANs created over the VFs.

Fixes: 04f05230c5c13 ("bnx2x: Remove configured vlans as part of unload sequence.")
Signed-off-by: Manish Chopra <manishc@marvell.com>
Signed-off-by: Sudarsana Kalluru <skalluru@marvell.com>
Signed-off-by: Shahed Shaikh <shshaikh@marvell.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

iommu/amd: Move iommu_init_pci() to .init section

commit 24d2c521749d8547765b555b7a85cca179bb2275 upstream.

The function is only called from another __init function, so
it should be moved to .init too.

Signed-off-by: Joerg Roedel <jroedel@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Input: psmouse - fix build error of multiple definition

commit 49e6979e7e92cf496105b5636f1df0ac17c159c0 upstream.

trackpoint_detect() should be static inline while
CONFIG_MOUSE_PS2_TRACKPOINT is not set, otherwise, we build fails:

drivers/input/mouse/alps.o: In function `trackpoint_detect':
alps.c:(.text+0x8e00): multiple definition of `trackpoint_detect'
drivers/input/mouse/psmouse-base.o:psmouse-base.c:(.text+0x1b50): first defined here

Reported-by: Hulk Robot <hulkci@huawei.com>
Fixes: 55e3d9224b60 ("Input: psmouse - allow disabing certain protocol extensions")
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: Hui Wang <hui.wang@canonical.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>