[9610][EVB] madera: support Aov driver update

Change-Id: I2f3e428be04c83a81b0162f2581ee9297f28d224
Signed-off-by: Karl Sun <Karl.sun@cirrus.com>

[9610][EVB] CS35L41: update hw parameters setting for bclk

Change-Id: I6937226e98df0f8c351c04fa6cc2e24471a1d65b
Signed-off-by: Karl Sun <Karl.sun@cirrus.com>

[9610][EVB] CS35L41: update the smart Pa driver to latest

Change-Id: I21a71a7c2bcbecb162514de93483fcb9090fc890
Signed-off-by: Karl Sun <Karl.sun@cirrus.com>

[9610][EVB] Support online tune with Cirrus tools

Change-Id: I2c05693a31ec616eeb68a79957a665c7e81670c6
Signed-off-by: Karl Sun <Karl.sun@cirrus.com>

[9610][EVB] arm64: dts: add exynos9609-robusta2_evb.dts

Change-Id: I77a1fde7f1fa51da003552c9ca8f85d89628b725
Signed-off-by: Youngmin Nam <youngmin.nam@samsung.com>

[9610][EVB] arm64: configs: add robusta2_evb_defconfig

Change-Id: I6bc5637425c486f88485d3deb96eacee584f536d
Signed-off-by: Youngmin Nam <youngmin.nam@samsung.com>

fix bootup issue after rebase

Change-Id: I8cadc551ccfb9de5b86aa94c55f1c70e1851cf8b

(CR):[kane]:kernel: add egis fps drivers

add egis fps drivers

Change-Id: I736e84fe6f565d9fb17a40bb541dd2394ca5b100
Signed-off-by: hq_guohongtao5_tmp <guohongtao5@huaqin.com>

(CR):[kane]:kernel: add sar sensor sx9325 drivers

add sar sensor sx9325 drivers

Change-Id: I701d32e90ad56d0444df5b8029de6225bf3acf10
Signed-off-by: hq_guohongtao5_tmp <guohongtao5@huaqin.com>

(CR):[kane]:dts: add sar sensor sx9325 drivers

add sar sensor sx9325 drivers

Change-Id: Ic383a09580dae90fda73fc90d130ec1e0f4fdbbf
Signed-off-by: hq_guohongtao5_tmp <guohongtao5@huaqin.com>

(CR):[kane]:configs: add sensor class drivers

add sensor class drivers

Change-Id: I867f54037f2c377fb14202dc782e53a112b58273
Signed-off-by: hq_guohongtao5_tmp <guohongtao5@huaqin.com>

(CR):[kane]:kernel: add sensor class drivers

add sensor class drivers for sar

Change-Id: I7709ed9d502bdb09324b658ea8f167e6abad7e57
Signed-off-by: hq_guohongtao5_tmp <guohongtao5@huaqin.com>

fix build errors after rebase samsung/exynos9609 branch

Change-Id: I4d3ec44b1e65826b549011bcbe02e13468623889
Signed-off-by: liuqiang <liuqiang6@huaqin.com>

[9609][WING] arm64: configs: run savedefconfig for nfc

Change-Id: Iee93d5c5b7a247a86780b50179dd4086c40c2944
Signed-off-by: kiwoo Kwon <kiwo.kwon@samsung.com>

[9609][WING] arm64: dts: add nfc driver

Change-Id: I6d92ac144fa193a7acd7961875fc375f617cee80
Signed-off-by: kiwoo Kwon <kiwo.kwon@samsung.com>

[9610][ERD] dtsi: chub: add wing board dt

Change-Id: I76f4563c6430e87cdecb85509b129124c7c97a59
Signed-off-by: Boojin Kim <boojin.kim@samsung.com>

[9609][WING] sensor: sar: fix build error by unused variable

Change-Id: I9c5c99de8db8cd6ebacac27ed01e17a892940b27
Signed-off-by: Youngmin Nam <youngmin.nam@samsung.com>

sensor: add sar sensor drivers

add sar sensor drivers

Bug:HQ00000000

Workaround:no

Change-Id: Ie19158a239feb69a76f7eb547b4ab5a96587c406
Signed-off-by: hq_guohongtao5_tmp <guohongtao5@huaqin.com>

[9610][WING] arm64: dts: enable AVB, ro.arch, system-as-root

Change-Id: I19098ea936e593a7e07a1d5b73081fc0de63073c
Signed-off-by: Youngmin Nam <youngmin.nam@samsung.com>

[9610][WING] arm64: dts: refactoring dts file

Change-Id: I6fc39e9ee5f48a0e43ea6397f613c9cbe27045f1
Signed-off-by: Youngmin Nam <youngmin.nam@samsung.com>

Documentation: samsung: USI guide docs

This patch include USIv1, USIv2 guide documentations.

Change-Id: I66fa3f70ddda6930b3456320028545a1f7159e25
Signed-off-by: Kyungwoo Kang <kwoo.kang@samsung.com>

[9610][WING] arm64: configs: disable FIMC features

Change-Id: Ia732208c4f0f7c31954866431f9178354f4c92a6
Signed-off-by: Youngmin Nam <youngmin.nam@samsung.com>

[9610][WING] arm64: dts: remove ERD board dtbo config

Change-Id: Icfa1cbe0a0bbdfd8a0359acc60152694e85800dc
Signed-off-by: Youngmin Nam <youngmin.nam@samsung.com>

[9610] arm64: dts: create dtbo image

Change-Id: I072da53b9b54b22ba44069e11e2af2e9d000abe1
Signed-off-by: Youngmin Nam <youngmin.nam@samsung.com>

[9610][WING] arm64: dts: enable dtbo overlay to make dtbo image

Change-Id: I196924b37c8b7482262cff47851b91625d5bb8d5
Signed-off-by: Youngmin Nam <youngmin.nam@samsung.com>

CS35L41: Disable Smart PA driver

[9609] Disable SPA driver

Bug:HQ00000000

Workaround:no

Change-Id: If396238631e7ddc99289cd46ba30b5ff26de12e2
Signed-off-by: Shinhyung Kang<s47.kang@samsung.com>

CS35L41: Smart PA driver

[CS35L41] Added SPA driver

Bug:HQ00000000

Workaround:no

Change-Id: I5d7232539dbd7b9ff97765e4d709e16165916a22
Signed-off-by: Shinhyung Kang<s47.kang@samsung.com>

abox: bring up the audio

[9609][WING] abox: bring up the audio

Bug:HQ00000000

Workaround:no

Change-Id: I4f7e317bf0dac9365809b1b445676c562e518251
Signed-off-by: Shinhyung Kang<s47.kang@samsung.com>

BSP: disable sd card detect pin pull up

[9609][WING] arm64: dts: disable sd card detect pin pull up

Bug:HQ00000000

Workaround:no

Change-Id: Ie0b5a449143291ffadb8e23c7312b18eda279ef0
Signed-off-by: Youngmin Nam <youngmin.nam@samsung.com>

BSP: WIFI BT control pin is chaged from I2C to GPIO pin

[9609][WING] arm64: dts: WIFI BT control pin is chaged from I2C to GPIO pin

Bug:HQ00000000

Workaround:no

Signed-off-by: youngss.kim <youngss.kim@samsung.com>
Signed-off-by: lijilai <lijilai@huaqin.com>
Change-Id: I4b741d07880ac640c2e7c444dedc8480da4aa7ec
Signed-off-by: lijilai <lijilai@huaqin.com>

BSP: IFPMIC Flash led driver

[9609][WING] Flash led driver

Bug:HQ00000000

Workaround:no

Change-Id: I2b49faec49ac6fe223a9f4cbcacafdca4cf380aa
Signed-off-by: Jinchul Kim <jinchul7.kim@samsung.com>
Signed-off-by: Keunho Hwang <keunho.hwang@samsung.com>

BSP: Unnecessary code is removed at panel reset

[9609][WING] fbdev: dpu: Unnecessary code is removed at panel reset

Bug:HQ00000000

Workaround:no

Change-Id: I2a1e2a075e2d12c252f3d1de8966918ae879d39d
Signed-off-by: hwangjae lee <hj-yo.lee@samsung.com>
Signed-off-by: lijilai <lijilai@huaqin.com>

BSP: NT36672A cabc mode config is added

[9609][WING] arm64: configs: NT35572A cabc mode config is added

Bug:HQ00000000

Workaround:no

Change-Id: I115fcb4233ade40410751fb632469838c2fa6eb2
Signed-off-by: hwangjae lee <hj-yo.lee@samsung.com>
Signed-off-by: lijilai <lijilai@huaqin.com>

BSP: NT36672A cabc mode control is added

[9609][WING] fbdev: dpu: NT35572A cabc mode control is added

Bug:HQ00000000

Workaround:no

Change-Id: Ic0e3d46e2ae0f23203254c31c52b5cccc3936544
Signed-off-by: hwangjae lee <hj-yo.lee@samsung.com>
Signed-off-by: lijilai <lijilai@huaqin.com>

BSP: IFPMIC Haptic device driver

[9609][WING] drivers: Haptic device driver for HW

Bug:HQ00000000

Workaround:no

Change-Id: I505807b054e99adac17b17abe109ee039c9d5d85
Signed-off-by: Jinchul Kim <jinchul7.kim@samsung.com>

BSP: disable synaptics touch

[9609][WING] arm64: config: disable synaptics touch

Bug:HQ00000000

Workaround:no

Change-Id: I4d5a30793c0f8856b3d3378673a5c803d5500958
Signed-off-by: Youngmin.nam <youngmin.nam@samsung.com>

BSP: IFPMIC check S2MCS02 with PDTA

[9609][WING] drivers: check S2MCS02 with PDTA
     it need to adjust input/charging current

Bug:HQ00000000

Workaround:no

Change-Id: Iddc58c3a96cc8dba82979b6c2da80344a32714f3
Signed-off-by: Jinchul Kim <jinchul7.kim@samsung.com>

BSP: change USB maximum speed as "high-speed"

[9609][WING] arm64: dts: change USB maximum speed as "high-speed"

Bug:HQ00000000

Workaround:no

Change-Id: Ifa55e568ff3c994e73e101d1adc5ec6322acae5c
Signed-off-by: lijilai <lijilai@huaqin.com>

BSP: run savedefconfig

[9609][WING] arm64: configs: run savedefconfig

Bug:HQ00000000

Workaround:no

Change-Id: If1ec0381a11ec779ee7478855c39c5c443b86708
Signed-off-by: Youngmin.nam <youngmin.nam@samsung.com>

BSP: NT36672A panel config is added

[9609][WING] arm64: configs: NT36672A panel config is added

Bug:HQ00000000

Workaround:no

Change-Id: Id6c62a41e6e56e7cd1b86a3fd13747e8f2fbbbe9
Signed-off-by: hwangjae lee <hj-yo.lee@samsung.com>
Signed-off-by: lijilai <lijilai@huaqin.com>

BSP: NT36672A panel driver files is added

[9609][WING] fbdev: dpu: NT36672A panel files is added

Bug:HQ00000000

Workaround:no

Change-Id: I021459610d5f805e74aeed72ddc3c2d1496075b4
Signed-off-by: hwangjae lee <hj-yo.lee@samsung.com>
Signed-off-by: lijilai <lijilai@huaqin.com>

BSP: NT36672A panel infomation is added

[9609][WING] arm64: dts: NT36672A panel information is added

Bug:HQ00000000

Workaround:no

Change-Id: Ia971201133a08c97c43fed2bbd3eed6d45d21574
Signed-off-by: hwangjae lee <hj-yo.lee@samsung.com>
Signed-off-by: lijilai <lijilai@huaqin.com>

BSP: enable USB3.0 PHY isolation

[9609][WING] arm64: dts: enable USB3.0 PHY isolation

Bug:HQ00000000

Workaround:no

Change-Id: I779e951e133ec87c8c198f2e5d50f73f4b2deb11
Signed-off-by: lijilai <lijilai@huaqin.com>

BSP: dts config for battery

[9609][WING] arm64: dts: dts config for battery

Bug:HQ00000000

Workaround:no

Change-Id: I528975a8cc18394c7a9b598aa60febc8fecabfce
Signed-off-by: Jinchul Kim <jinchul7.kim@samsung.com>

BSP: disable related audio codec dt node temporarily

[9609][WING] arm64: dts: disable related audio codec dt node temporarily

Bug:HQ00000000

Workaround:no

Change-Id: I75bae711e9788ddaa328e8129d24ab2726ce7742
Signed-off-by: Youngmin Nam <youngmin.nam@samsung.com>

BSP: disable related fimc dt node temporarily

[9609][WING] arm64: dts: disable related fimc temporarily

Bug:HQ00000000

Workaround:no

Change-Id: If36407d396e1a5bf5f9af62016c186fef55dac13
Signed-off-by: Youngmin Nam <youngmin.nam@samsung.com>

BSP: fix usbpd dt error msg

[9609][wing] ifpmic : fix usbpd dt error msg

Bug:HQ00000000

Workaround:no

Change-Id: I709353862157ad9ae18a66198693aa78031fe393
Signed-off-by: Junhan Bae <junhan84.bae@samsung.com>
Signed-off-by: lijilai <lijilai@huaqin.com>

BSP: fix usbpd build error

[9609][wing] ifpmic : fix usbpd build error

Bug:HQ00000000

Workaround:no

Change-Id: Ieadb5661958472d05535b3834e2df780f37614c3
Signed-off-by: lijilai <lijilai@huaqin.com>

BSP: remove unused gpio pin

[9609][wing] ifpmic : remove unused gpio pin

Bug:HQ00000000

Workaround:no

Change-Id: I260a6d4d552d11021f9e8d36fa09d3d1eb2e4091
Signed-off-by: lijilai <lijilai@huaqin.com>

BSP: add s2mu106 ifpmic driver

[9609][wing] ifpmic : add s2mu106 ifpmic driver

Bug:HQ00000000

Workaround:no

Change-Id: I186aaa9a3b83d421addb8c0310621b7d7e05afbb
Signed-off-by: lijilai <lijilai@huaqin.com>

BSP: add pinctrl for touch vdd

[9609][WING] arm64: dts: add pinctrl for touch vdd

Bug:HQ00000000

Workaround:no

Change-Id: I2fa1de9cb97315808e7a1f7748a91ff10559953b
Signed-off-by: Youngmin Nam <youngmin.nam@samsung.com>

BSP: enable nt36xxx touch driver

[9609][WING] touch: enable nt36xxx touch driver

Bug:HQ00000000

Workaround:no

Change-Id: I57acc6af84c0aa2391636247aba1d0815956a0ac
Signed-off-by: Youngmin Nam <youngmin.nam@samsung.com>

BSP: remove unused pmic node

[9609][WING] arm64: des: remove unused pmic node

Bug:HQ00000000

Workaround:no

Change-Id: I72099b19985324924ea0ab61a93c0ab5026ed73a
Signed-off-by: lijilai <lijilai@huaqin.com>
Signed-off-by: jinchul7.kim <jinchul7.kim@samsung.com>

BSP: remove sound dt node temporarily

[9609][WING] arm64: dts: remove sound dt node temporarily

Bug:HQ00000000

Workaround:no

Change-Id: Ied3482df39f7895f8e5694163d45a00cf3bfb73e
Signed-off-by: Youngmin Nam <youngmin.nam@samsung.com>
Signed-off-by: lijilai <lijilai@huaqin.com>

BSP: add nt36xxx touch device tree node

[9609][WING] arm64: dts: add nt36xxx touch device tree node

Bug:HQ00000000

Workaround:no

Change-Id: I3507930cbaa6c15daf729c08d8de68128c0be7ec
Signed-off-by: Youngmin Nam <youngmin.nam@samsung.com>
Signed-off-by: lijilai <lijilai@huaqin.com>

BSP: add nt36xxx touch driver

[9609][WING] touch: add nt36xxx touch driver

Bug:HQ00000000

Workaround:no

Change-Id: I2364fb4f434aae658ff3196b4ff5858fe1daa39c
Signed-off-by: Youngmin Nam <youngmin.nam@samsung.com>
Signed-off-by: lijilai <lijilai@huaqin.com>

BSP: remove i2c_3 node for wing board

[9609][WING] arm64: dts: remove i2c_3 node for wing board

Bug:HQ00000000

Workaround:no

Change-Id: I2f9da3d411a915b3bb546794b0d0ddedc6e3bf28
Signed-off-by: Youngmin Nam <youngmin.nam@samsung.com>
Signed-off-by: lijilai <lijilai@huaqin.com>

BSP: change USI mode for wing board

[9609][WING] arm64: dts: change for wing board

Bug:HQ00000000

Workaround:no

Change-Id: Ie5c19d0433354ef61585fed4154c0da2208456ed
Signed-off-by: Youngmin Nam <youngmin.nam@samsung.com>
Signed-off-by: lijilai <lijilai@huaqin.com>

BSP: add initial board dts for wing board

[9609][WING] arm64: dts: add initial board dts for wing board <youngmin.nam@samsung.com>

Bug:HQ00000000

Wrkaround:no

Change-Id: I5500c8867c6fb2fd60e5a0f0714cf404b763a22e
Signed-off-by: lijilai <lijilai@huaqin.com>

BSP: add initial defconfig for wing board

[9610][WING] arm64: configs: add initial defconfig for wing board <youngmin.nam@samsung.com>

Bug:HQ00000000

Workaround:no

Change-Id: I50b24875280bfcef4d40a712589a6004a49c8a35
Signed-off-by: lijilai <lijilai@huaqin.com>

ANDROID: sdcardfs: Change current->fs under lock

Adjusted from previous version to add missing include

bug: 111641492

Change-Id: I321d83f5d599efb3abdfaf2f3a4900ac512beca6
Reported-by: Jann Horn <jannh@google.com>
Signed-off-by: Daniel Rosenberg <drosen@google.com>

Revert "ANDROID: sdcardfs: Change current->fs under lock"

This reverts commit 1e6b0ff01fc5cb2701734de69a93fb1c42d894b5.

Change-Id: Ie3ab446da93fb1cea37078addd261a1c3b863237

[RAMEN9610-20799][ERD][9610] nfc: add config to control ldo37

Change-Id: I493d248552459c7b0eef5f2a14ee0fff44b35967
Signed-off-by: Jia Lee <jia0515.lee@samsung.com>

[RAMEN9610-20799][ERD][NEUS7920-623] [NEUS7920-263][9610] nfc: control nfc pvdd for low power mode

nfc pvdd should be low during phone off and USB charging mode.

Change-Id: I31aed59395e06d031895ad7cc2a4b82eccc75bd3
Signed-off-by: Jia Lee <jia0515.lee@samsung.com>

[RAMEN9610-20797][COMMON][MODAP-49152] misc: modem_if: fix the problem of free duplication

Change-Id: I83078bc3d9c44fac80ee56ab43f38b0ffb5fbe12
Signed-off-by: Jiyoung Jeong <ji_0.jeong@samsung.com>

[RAMEN9610-20794][nfc] Remove wake_lock

Change-Id: Ib608c39ab9a96488b067fc8951ac03dc18534992
Signed-off-by: Wonchul Shin <wchuls.shin@samsung.com>

[RAMEN9610-20778][9610] drivers: enable LEGACY_COMPAT after applying ion flushing patch

Change-Id: I1cfb9953f4b99c2d56e585cc6fe9d9c6ce91e639
Signed-off-by: Yoojin Park <yoojin1.park@samsung.com>

[RAMEN9610-20778][9610] drivers: gpu: check ion buffer is cached before flush v4

With LEGACY_COMPAT option enabled,
only flush an ion buffer if it is a cached buffer.

Update 19.10.17:
Prevent wrongly printed warning logs when non-cached buffer
is not flushed as intended

Change-Id: Icce58c5c39c8898f5804d47ea1bf6e83776ab02a
Signed-off-by: SeYeong Byeon <sy.byeon@samsung.com>

[RAMEN9610-20774][COMMON] drivers: modem_if: Apply LCD notification

Change-Id: I8a5fd610cfa8bdbe1904437663191b319c109002
Signed-off-by: Taejin Kim <tj7.kim@samsung.com>

[RAMEN9610-20773][COMMON] mm: remove dump log to reduce delay

Change-Id: I0fbceed7b0dff9a77adeba3e99a26b1654813d8e
Signed-off-by: Oh Eomji <eomji.oh@samsung.com>

[RAMEN9610-20773][9610] arm64: defconfig: add configuration for USB stable operation

Change-Id: Ic6ca94de23b4a85a139a238731ff5c714a06a246
Signed-off-by: Oh Eomji <eomji.oh@samsung.com>

[RAMEN9610-20768][9610] ifconn delete deadcode

Change-Id: Ib3816f68851274a70b46349deabe75eec37b7b0a
Signed-off-by: Jinsu Park <js00.park@samsung.com>

[RAMEN9610-20768][9610] s2mu106_usbpd delete deadcode

Change-Id: I2bac68122656f6f5276ff9dc4fb995eda15d4be3
Signed-off-by: Jinsu Park <js00.park@samsung.com>

[RAMEN9610-20768][9610] s2mu106_muic move break

Change-Id: Id0d99453289b85aabf12dbb5b04a057198c527d5
Signed-off-by: Jinsu Park <js00.park@samsung.com>

[RAMEN9610-20759]wlbt: Changes to set key type as IGTK for BIP_GMAC ciphers

Currently driver sets the key type as IGTK for cipher suite :
(0x000FAC, 6 :WLAN_CIPHER_SUITE_AES_CMAC).
Driver should set the key type to IGTK for cipher suites
WLAN_CIPHER_SUITE_BIP_GMAC_128, WLAN_CIPHER_SUITE_BIP_GMAC_256 also.

Change-Id: Idfeb67fe9c170a12ebba89d59c2235a1b37f36e5
SCSC-Bug-Id: HOST-11211
Signed-off-by: Sushant B Butta <b.sushant@samsung.com>

[RAMEN9610-20756][COMMON] scsi: ufs: Change SSU timeout from 5s to 23s.

Micron UFS SSU is spend 20s when disk full status.

Change-Id: Ic01638f71e82a9498d5f29ea595aeba298347f81
Signed-off-by: JaeHun Jung <jh0801.jung@samsung.com>

[RAMEN9610-20756][RAMEN9610-18380][COMMON] scsi: scsi_sysfs: Remove async_suspend.

async_suspend sometimes make watchdog reset when suspend.
So, Disable async_suspend.

Change-Id: Ifb9286003ef25aee9f89599c32e4ea6f370806de
Signed-off-by: JaeHun Jung <jh0801.jung@samsung.com>
Signed-off-by: Kim Gunho <gunho.kim@samsung.com>

[RAMEN9610-20756][RAMEN9610-18204][COMMON] scsi: ufs: Change timeout for start_stop from 60s to 5s

Watchdog is 26s.
60s is too long in mobile device.
So, Change it.

Change-Id: Ic874ce9dca62649e9d33d25ee6251cc123e2001d
Signed-off-by: JaeHun Jung <jh0801.jung@samsung.com>
Signed-off-by: Kim Gunho <gunho.kim@samsung.com>

[RAMEN9610-20756][COMMON] scsi: sd: Change scsi timeout form 30s to 5s.

UFS has very fast response device. So, We decrease timeout for recovery.

Change-Id: I4c0a6375413839a8495045a771ab50ff23edc614
Signed-off-by: JaeHun Jung <jh0801.jung@samsung.com>

[RAMEN9610-20754][9610] ASoC: abox: requested cpu gear to hold the usage count of PM

Change-Id: I71181515f075308319156c5964298cec18b71750
Signed-off-by: ShinHyung <s47.kang@samsung.com>

[RAMEN9610-20751]ext4: zero out the unused memory region in the extent tree block

commit 592acbf16821288ecdc4192c47e3774a4c48bb64 upstream.

This commit zeroes out the unused memory region in the buffer_head
corresponding to the extent metablock after writing the extent header
and the corresponding extent node entries.

This is done to prevent random uninitialized data from getting into
the filesystem when the extent block is synced.

This fixes CVE-2019-11833.

Change-Id: I3dcc0bd0e41a601134041953158d73506110a88a
Signed-off-by: Sriram Rajagopalan <sriramr@arista.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Cc: stable@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

[RAMEN9610-20751]BACKPORT: binder: Set end of SG buffer area properly.

In case the target node requests a security context, the
extra_buffers_size is increased with the size of the security context.
But, that size is not available for use by regular scatter-gather
buffers; make sure the ending of that buffer is marked correctly.

Bug: 136210786
Acked-by: Todd Kjos <tkjos@google.com>
Fixes: ec74136ded79 ("binder: create node flag to request sender's security context")
Signed-off-by: Martijn Coenen <maco@android.com>
Cc: stable@vger.kernel.org # 5.1+
Link: https://lore.kernel.org/r/20190709110923.220736-1-maco@android.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit a56587065094fd96eb4c2b5ad65571daad32156d)

Change-Id: I415785c0e210c51a5ae1c90e6783f2beb7bdd86c

[RAMEN9610-20751]binder: fix possible UAF when freeing buffer

commit a370003cc301d4361bae20c9ef615f89bf8d1e8a upstream.

There is a race between the binder driver cleaning
up a completed transaction via binder_free_transaction()
and a user calling binder_ioctl(BC_FREE_BUFFER) to
release a buffer. It doesn't matter which is first but
they need to be protected against running concurrently
which can result in a UAF.

Change-Id: I6b9b6a0b9e85b0953d5b53f62fb2ad35f62e1a23
Signed-off-by: Todd Kjos <tkjos@google.com>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

[ERD][RAMEN9610-20750][RAMEN9610-18757] fbdev: dpu: lcd status notifier is added

Change-Id: I283f452e6ae88ddff4a7229d1e2b71c90c2d53ff
Signed-off-by: hwangjae lee <hj-yo.lee@samsung.com>
Signed-off-by: ChiHun Won <chihun.won@samsung.com>

[RAMEN9610-20741]UPSTREAM: xfrm: Make set-mark default behavior backward compatible

Fixes 9b42c1f, which changed the default route lookup behavior for
tunnel mode SAs in the outbound direction to use the skb mark, whereas
previously mark=0 was used if the output mark was unspecified. In
mark-based routing schemes such as Android’s, this change in default
behavior causes routing loops or lookup failures.

This patch restores the default behavior of using a 0 mark while still
incorporating the skb mark if the SET_MARK (and SET_MARK_MASK) is
specified.

Tested with additions to Android's kernel unit test suite:
https://android-review.googlesource.com/c/kernel/tests/+/860150

Fixes: 9b42c1f ("xfrm: Extend the output_mark to support input direction and masking")
Signed-off-by: Benedict Wong <benedictwong@google.com>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
(cherry picked from commit e2612cd496e7b465711d219ea6118893d7253f52)
Bug: 122236988
Test: Passes kernel tests
Change-Id: I1289b5b7b1eb93c6d99a0ba7d28e24c3eb25883d
Signed-off-by: Benedict Wong <benedictwong@google.com>

[RAMEN9610-20741]UPSTREAM: xfrm: fix ptr_ret.cocci warnings

net/xfrm/xfrm_interface.c:692:1-3: WARNING: PTR_ERR_OR_ZERO can be used

 Use PTR_ERR_OR_ZERO rather than if(IS_ERR(...)) + PTR_ERR

Generated by: scripts/coccinelle/api/ptr_ret.cocci

Fixes: 44e2b838c24d ("xfrm: Return detailed errors from xfrmi_newlink")
CC: Benedict Wong <benedictwong@google.com>
Signed-off-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
(cherry picked from commit c6f5e017df9dfa9f6cbe70da008e7d716d726f1b)
Signed-off-by: Benedict Wong <benedictwong@google.com>
Bug: 113046120
Test: All kernel net-tests run, passing (20x repeated)
Change-Id: I4ec93c0427fded57ff5126dc7b3d97d9b5fd615b

[RAMEN9610-20741]UPSTREAM: xfrm: Return detailed errors from xfrmi_newlink

Currently all failure modes of xfrm interface creation return EEXIST.
This change improves the granularity of errnos provided by also
returning ENODEV or EINVAL if failures happen in looking up the
underlying interface, or a required parameter is not provided.

This change has been tested against the Android Kernel Networking Tests,
with additional xfrmi_newlink tests here:

https://android-review.googlesource.com/c/kernel/tests/+/715755

Signed-off-by: Benedict Wong <benedictwong@google.com>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
(cherry picked from commit 44e2b838c24d883dae8496dc7b6ddac7956ba53c)
Bug: 113046120
Change-Id: Ic680bf1e4a828aaae01b289223d9396a551eefd2

[RAMEN9610-20741]UPSTREAM: xfrm: Allow xfrmi if_id to be updated by UPDSA

Allow attaching an SA to an xfrm interface id after
the creation of the SA, so that tasks such as keying
which must be done as the SA is created, can remain
separate from the decision on how to route traffic
from an SA. This permits SA creation to be decomposed
in to three separate steps:
1) allocation of a SPI
2) algorithm and key negotiation
3) insertion into the data path

Signed-off-by: Nathan Harold <nharold@google.com>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
(cherry picked from commit 5baf4f9c0035f3e33bb693a1a1e87599f6e804e6)
Signed-off-by: Benedict Wong <benedictwong@google.com>
Bug: 113046120
Change-Id: I45a4bf725f3b8eaa8dae3266f9c411febb4c8720

[RAMEN9610-20741]UPSTREAM: xfrm: Remove xfrmi interface ID from flowi

In order to remove performance impact of having the extra u32 in every
single flowi, this change removes the flowi_xfrm struct, prefering to
take the if_id as a method parameter where needed.

In the inbound direction, if_id is only needed during the
__xfrm_check_policy() function, and the if_id can be determined at that
point based on the skb. As such, xfrmi_decode_session() is only called
with the skb in __xfrm_check_policy().

In the outbound direction, the only place where if_id is needed is the
xfrm_lookup() call in xfrmi_xmit2(). With this change, the if_id is
directly passed into the xfrm_lookup_with_ifid() call. All existing
callers can still call xfrm_lookup(), which uses a default if_id of 0.

This change does not change any behavior of XFRMIs except for improving
overall system performance via flowi size reduction.

This change has been tested against the Android Kernel Networking Tests:

https://android.googlesource.com/kernel/tests/+/master/net/test

Signed-off-by: Benedict Wong <benedictwong@google.com>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
(cherry picked from commit bc56b33404599edc412b91933d74b36873e8ea25)
Bug: 113046120
Change-Id: Icd3a1ea08427b91c54a64318d9dbb9acfb5d429a

[RAMEN9610-20741]UPSTREAM: xfrm: Allow Set Mark to be Updated Using UPDSA

Allow UPDSA to change "set mark" to permit
policy separation of packet routing decisions from
SA keying in systems that use mark-based routing.

The set mark, used as a routing and firewall mark
for outbound packets, is made update-able which
allows routing decisions to be handled independently
of keying/SA creation. To maintain consistency with
other optional attributes, the set mark is only
updated if sent with a non-zero value.

The per-SA lock and the xfrm_state_lock are taken in
that order to avoid a deadlock with
xfrm_timer_handler(), which also takes the locks in
that order.

Signed-off-by: Nathan Harold <nharold@google.com>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
(cherry picked from commit 6d8e85ffe17895d7bc632dfbaa9e2e33b22fe873)
Signed-off-by: Benedict Wong <benedictwong@google.com>
Bug: 113046120
Change-Id: Ie7ab34ca38aedb034cf5aa83457c552c43f4f566

[RAMEN9610-20741]UPSTREAM: xfrm: Add virtual xfrm interfaces

This patch adds support for virtual xfrm interfaces.
Packets that are routed through such an interface
are guaranteed to be IPsec transformed or dropped.
It is a generic virtual interface that ensures IPsec
transformation, no need to know what happens behind
the interface. This means that we can tunnel IPv4 and
IPv6 through the same interface and support all xfrm
modes (tunnel, transport and beet) on it.

Co-developed-by: Lorenzo Colitti <lorenzo@google.com>
Co-developed-by: Benedict Wong <benedictwong@google.com>
Signed-off-by: Lorenzo Colitti <lorenzo@google.com>
Signed-off-by: Benedict Wong <benedictwong@google.com>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Acked-by: Shannon Nelson <shannon.nelson@oracle.com>
Tested-by: Benedict Wong <benedictwong@google.com>
Tested-by: Antony Antony <antony@phenome.org>
Reviewed-by: Eyal Birger <eyal.birger@gmail.com>
(cherry picked from commit f203b76d78092faf248db3f851840fbecf80b40e)
Bug: 113046120
Change-Id: I05e8fe1e8a8a4b01886504ce694ddda29e4fbec6

[RAMEN9610-20741]UPSTREAM: xfrm: Add a new lookup key to match xfrm interfaces.

This patch adds the xfrm interface id as a lookup key
for xfrm states and policies. With this we can assign
states and policies to virtual xfrm interfaces.

Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Acked-by: Shannon Nelson <shannon.nelson@oracle.com>
Acked-by: Benedict Wong <benedictwong@google.com>
Tested-by: Benedict Wong <benedictwong@google.com>
Tested-by: Antony Antony <antony@phenome.org>
Reviewed-by: Eyal Birger <eyal.birger@gmail.com>
(cherry picked from commit 7e6526404adedf079279aa7aa11722deaca8fe2e)
Signed-off-by: Benedict Wong <benedictwong@google.com>
Bug: 113046120
Change-Id: I27d7757a374b0bd5f97c3e723773d6c7470a0717

[RAMEN9610-20741]UPSTREAM: flow: Extend flow informations with xfrm interface id.

Add a new flowi_xfrm structure with informations needed to do
a xfrm lookup. At the moment it keeps the informations about
the new xfrm interface id needed to lookup xfrm interfaces
that are introduced with a followup patch. We need this new
lookup key as other possible keys, like the ifindex is
already part of the xfrm selector and used as a key to
enforce the output device after the transformation in the
policy/state lookup.

Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Acked-by: Shannon Nelson <shannon.nelson@oracle.com>
Acked-by: Benedict Wong <benedictwong@google.com>
Tested-by: Benedict Wong <benedictwong@google.com>
Tested-by: Antony Antony <antony@phenome.org>
Reviewed-by: Eyal Birger <eyal.birger@gmail.com>
(cherry picked from commit d159ce7957eec306eacda672e5909e26675ca8ef)
Signed-off-by: Benedict Wong <benedictwong@google.com>
Bug: 113046120
Change-Id: I70b520d3cf67cd663e84868b0e7cc45ffa74d080

[RAMEN9610-20741]UPSTREAM: xfrm: Extend the output_mark to support input direction and masking.

We already support setting an output mark at the xfrm_state,
unfortunately this does not support the input direction and
masking the marks that will be applied to the skb. This change
adds support applying a masked value in both directions.

The existing XFRMA_OUTPUT_MARK number is reused for this purpose
and as it is now bi-directional, it is renamed to XFRMA_SET_MARK.

An additional XFRMA_SET_MARK_MASK attribute is added for setting the
mask. If the attribute mask not provided, it is set to 0xffffffff,
keeping the XFRMA_OUTPUT_MARK existing 'full mask' semantics.

Co-developed-by: Tobias Brunner <tobias@strongswan.org>
Co-developed-by: Eyal Birger <eyal.birger@gmail.com>
Co-developed-by: Lorenzo Colitti <lorenzo@google.com>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: Tobias Brunner <tobias@strongswan.org>
Signed-off-by: Eyal Birger <eyal.birger@gmail.com>
Signed-off-by: Lorenzo Colitti <lorenzo@google.com>
(cherry picked from commit 9b42c1f179a614e11893ae4619f0304a38f481ae)
Signed-off-by: Benedict Wong <benedictwong@google.com>
Bug: 113046120
Change-Id: I582f0b460dc58f01e0c30afb6167725aa337d054

[RAMEN9610-20741]UPSTREAM: xfrm: fix XFRMA_OUTPUT_MARK policy entry

This seems to be an obvious typo, NLA_U32 is type of the attribute, not its
(minimal) length.

Fixes: 077fbac405bf ("net: xfrm: support setting an output mark.")
Signed-off-by: Michal Kubecek <mkubecek@suse.cz>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
(cherry picked from commit e719135881f00c01ca400abb8a5dadaf297a24f9)
Signed-off-by: Benedict Wong <benedictwong@google.com>
Bug: 113046120
Change-Id: I4c1a8de03febfa246b99c7eb67d77f74a1e3ba93

[RAMEN9610-20734][COMMON] lib: dss: register valid reserved memory

for user build, debug snapshot minimize reserved area,
but both node exists in reserved mem node of device tree.
So, skip reserve invalid dss's reserved memory area.

Change-Id: I6d1c24edf61556d0a8c314cee7b2896e8c5c45a3
Signed-off-by: Donghyeok Choe <d7271.choe@samsung.com>

[RAMEN9610-20734][COMMON] soc: samsung: clean dump_en when DEBUG_SNAPSHOT is disabled

This commit supports CONFIG_DEBUG_SNAPSHOT is disabled.
If it does, dump_en bit is de-asserted, and then it prevents
into entering fastboot.

Change-Id: Ie4657ff6e4afcf93ece0e5139252aa469beec790
Signed-off-by: Hosung Kim <hosung0.kim@samsung.com>

[RAMEN9610-20734][COMMON] lib: dss: fix to support DSS disabled

This commit supports when CONFIG_DEBUG_SNAPSHOT is disabled.

Change-Id: I9706d1bb2b715fa7c4cf2a1059fa4498c9e451fc
Signed-off-by: Hosung Kim <hosung0.kim@samsung.com>

[ERD][RAMEN9610-20672][MODAP-49764][COMMON] chub_ipc: fix spin_unlock error with ipc evt full

This patch fixed spin_lock error with ipc evt full.
And then, Added the slient reset with ipc evt failure.

Change-Id: Ia5cef3f10b2b5fd1afe38ba54bbae085227872c0
Signed-off-by: Boojin Kim <boojin.kim@samsung.com>

[ERD][RAMEN9610-20672][MODAP-49617][COMMON] chub: run nanohub_kthread after contexthub_poweron

Change-Id: I3d17afb81db7606d4de4e037cb080a88d7196368
Signed-off-by: Boojin Kim <boojin.kim@samsung.com>