[9610] thermal: Fix conflict exynos tmu code

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

videobuf2: fix conflict during updating 4.14.113

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

spi: s3c64xx: fix conflict during updating 4.14.113

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

tty: serial: samsung: fix conflict during updating 4.14.113

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

compiler: fix conflict related kasan during updating 4.14.113

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

printk: fix conflict during updating 4.14.113

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

usb: fix conflict for kernel minor update 4.14.113

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

[COMMON] clocksource: exynos_mct: restore TCNTB value in resume

This commit restores TCNTB value in resume of CPU0.
Other CPUs are controlled hotplug framework while suspend/resume.
But CPU0 is except in this sequence. So some register setting
is needed like TCNTB value.

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

clocksource/drivers/exynos_mct: fix conflict during updating 4.14.113

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

android: binder: fix conflict during updating 4.14.113

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

[COMMON] storage: fix conflict during updating 4.14.113

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

android: ion: fix conflict during updating 4.14.113

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

Merge branch 'android-4.14-p' into android-exynos-4.14-ww-9610-minor_up-dev

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

Revert "Revert "dm verity: switch to using asynchronous hash crypto API""

This reverts commit 6ae9d6ee589365676e1ff13eed18a9fe07f89994.

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

Fix 'Merge 4.14.111 into android-4.14-p'

mutex -> spinlock changes from android-4.14

Change-Id: I7da3ad92a12fc9ba60d7b602e9178d04e0fb5c1d
Signed-off-by: Alistair Strachan <astrachan@google.com>

ANDROID: cuttlefish_defconfig: Remove non-present options

Change-Id: I7c0d434a77bb0acb5bae14479a0ca7ca64ff9ffc
Signed-off-by: Alistair Strachan <astrachan@google.com>

ANDROID: Move from clang r346389b to r349610.

Bug: 123635022
Test: make ARCH=arm64 cuttlefish_defconfig && make ARCH=arm64
Test: make ARCH=x86_64 x86_64_cuttlefish_defconfig && make ARCH=x86_64
Change-Id: Icc02ea92c13435fa5a6ecd33d8878629762fd2f7
Signed-off-by: Alistair Strachan <astrachan@google.com>

ANDROID: Move from clang r328903 to r346389b.

Bug: 120439617
Bug: 120503084
Change-Id: I21bb183cac03753d1ba719a69305e2199c3f3227
Signed-off-by: Alistair Strachan <astrachan@google.com>

ANDROID: cuttlefish_defconfig: Enable CONFIG_INPUT_MOUSEDEV

Bug: 120439617
Bug: 128633328
Change-Id: I2186d8070f7885937925a25e85ce7b5722a73d57
Signed-off-by: Alistair Strachan <astrachan@google.com>

ANDROID: cuttlefish: enable CONFIG_INET_UDP_DIAG=y

This is to mirror:
  https://android-review.googlesource.com/c/kernel/configs/+/721208
  android-base.cfg: enable CONFIG_INET_UDP_DIAG

Generated via:
  echo 'CONFIG_INET_UDP_DIAG=y' >> arch/x86/configs/x86_64_cuttlefish_defconfig
  echo 'CONFIG_INET_UDP_DIAG=y' >> arch/arm64/configs/cuttlefish_defconfig
  make ARCH=x86_64 x86_64_cuttlefish_defconfig
  make ARCH=x86_64 savedefconfig
  cat defconfig > arch/x86/configs/x86_64_cuttlefish_defconfig
  make ARCH=arm64 cuttlefish_defconfig
  make ARCH=arm64 savedefconfig
  cat defconfig > arch/arm64/configs/cuttlefish_defconfig
  rm defconfig

Bug: 127981801
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I5d4533b7c3b9a11e45e96b0346a70b3f93d4a812

ANDROID: cuttlefish_defconfig: L2TP/PPTP to OLAC/OPNS

Change-Id: Idafb69ff5b4ecfe73d2f5b7c46c4e9523ef37c08
Signed-off-by: Alistair Strachan <astrachan@google.com>

ANDROID: cuttlefish_defconfig: Enable CONFIG_FUSE_FS

Bug: 120439617
Bug: 129901600
Change-Id: Iff554123147f7761ca639b89612138b82a4a400a
Signed-off-by: Alistair Strachan <astrachan@google.com>

ANDROID: cuttlefish_defconfig: Add support for AC97 audio

Enable driver support for the ac97 emulation provided by QEMU and
crosvm. This is for the older 'ac97' soundhw, not 'hda'.

Bug: 126955561
Test: local build and test of sound from cuttlefish
Change-Id: I6c29e352e0be161e2a1dc35fde50b888b7dbf86e
Signed-off-by: Alistair Strachan <astrachan@google.com>

ANDROID: cuttlefish: enable CONFIG_NETFILTER_XT_TARGET_CT=y

This is to mirror:
  https://android-review.googlesource.com/c/kernel/configs/+/919855
  android-4.9+: add CONFIG_NETFILTER_XT_TARGET_CT=y to base config

Generated via:
  echo 'CONFIG_NETFILTER_XT_TARGET_CT=y' >> arch/x86/configs/x86_64_cuttlefish_defconfig
  echo 'CONFIG_NETFILTER_XT_TARGET_CT=y' >> arch/arm64/configs/cuttlefish_defconfig
  make ARCH=x86_64 x86_64_cuttlefish_defconfig
  make ARCH=x86_64 savedefconfig
  cat defconfig > arch/x86/configs/x86_64_cuttlefish_defconfig
  make ARCH=arm64 cuttlefish_defconfig
  make ARCH=arm64 savedefconfig
  cat defconfig > arch/arm64/configs/cuttlefish_defconfig
  rm defconfig

Bug: 124361845
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I6035ef8e75f9daada706a9233999368a22904c4e

Make arm64 serial port config compatible with crosvm

BUG: 118442619
Test: Ran ~/bin/crosvm run --disable-sandbox ~/image, saw output
Change-Id: If086af28b69eca5353a101228ae986653bc1465e
Signed-off-by: Greg Hartman <ghartman@google.com>
(cherry picked from commit 2860dfe869a94c8c1950effb55da116f83ebc740)

ANDROID: cuttlefish_defconfig: Enable CONFIG_RTC_HCTOSYS

This configuration is required for the VTS test
VtsKernelApiSysfsTest#testRtcHctosys to pass.

Bug: 123860857
Test: run vts-kernel -m VtsKernelApiSysfsTest
Signed-off-by: Matthias Maennich <maennich@google.com>
Change-Id: Icae17c74460bcd2aef4cf4e3ec5381de9ea0a66c

ANDROID: cuttlefish_defconfig: Enable vsock options

Bug: 121166534
Test: Ran cuttlefish with common kernel + vsock adb tunnel
Signed-off-by: Cody Schuffelen <schuffelen@google.com>
Change-Id: I8168a710052c7daada306a915c56230c961accd4

ANDROID: cuttlefish_defconfig: Enable VIRTIO_INPUT

Bug: 120439617
Change-Id: I83fdb2088f17e71f377e5864d217655b47839267
Signed-off-by: Alistair Strachan <astrachan@google.com>

ANDROID: cuttlefish_defconfig: Enable VIRT_WIFI

Bug: 120439617
Bug: 120682817
Change-Id: Ia1b66528bd9cb1e6e95bd75ac60f393978caa582
Signed-off-by: Alistair Strachan <astrachan@google.com>

ANDROID: cuttlefish_defconfig: Enable CONFIG_ARM64_LSE_ATOMICS

Enabling this was previously blocked by a lack of support for this
feature in clang, but that problem has been resolved in a newer version
of the compiler.

Bug: 120439617
Change-Id: I0f5fd2439c5a71ee0988648970576b46b2c4d20b
Signed-off-by: Alistair Strachan <astrachan@google.com>

ANDROID: arm64 defconfig / build config for cuttlefish

Add an arm64 defconfig with the Android and cuttlefish feature sets
merged in. This has been boot tested only on the QEMU virt model for
AArch64.

$ qemu-system-aarch64 -M virt -cpu cortex-a57 \
    -kernel arch/arm64/boot/Image.gz -serial stdio

Bug: 118442619
Change-Id: I99f3b78af85de8d051226f202351bd852a032248
Signed-off-by: Alistair Strachan <astrachan@google.com>

UPSTREAM: virt_wifi: Remove REGULATORY_WIPHY_SELF_MANAGED

REGULATORY_WIPHY_SELF_MANAGED as set here breaks NL80211_CMD_GET_REG,
because it expects the wiphy to do regulatory management. Since
virt_wifi does not do regulatory management, this triggers a WARN_ON in
NL80211_CMD_GET_REG and fails the netlink command.

Removing REGULATORY_WIPHY_SELF_MANAGED fixes the problem and the virtual
wireless network continues to work.

Signed-off-by: Cody Schuffelen <schuffelen@google.com>
Acked-by: Alistair Strachan <astrachan@google.com>
Acked-by: Greg Hartman <ghartman@google.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
(cherry picked from commit f440b125450dfc65ce0386eb231da2f663c45ca0)
Bug: 119771992
Change-Id: Ida660b77a2f091e7aaabcecf8a60e66cc2f1f91d
Signed-off-by: Alistair Strachan <astrachan@google.com>

UPSTREAM: virt_wifi: fix error return code in virt_wifi_newlink()

Fix to return a negative error code from the error handling
case instead of 0, as done elsewhere in this function.

Fixes: c7cdba31ed8b ("mac80211-next: rtnetlink wifi simulation device")
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
(cherry picked from commit f9d672f1c2ca36b788511bbd773d650c744e109a)
Change-Id: Ia6290ab996afca7b33e1a8e9b8bcfc0ecbe252f4
Signed-off-by: Cody Schuffelen <schuffelen@google.com>

FROMGIT, BACKPORT: mac80211-next: rtnetlink wifi simulation device

This device takes over an existing network device and produces a
new one that appears like a wireless connection, returning enough canned
responses to nl80211 to satisfy a standard connection manager. If
necessary, it can also be set up one step removed from an existing
network device, such as through a vlan/80211Q or macvlan connection to
not disrupt the existing network interface.

To use it to wrap a bare ethernet connection:

ip link add link eth0 name wlan0 type virt_wifi

You may have to rename or otherwise hide the eth0 from your connection
manager, as the original network link will become unusuable and only
the wireless wrapper will be functional. This can also be combined with
vlan or macvlan links on top of eth0 to share the network between
distinct links, but that requires support outside the machine for
accepting vlan-tagged packets or packets from multiple MAC addresses.

This is being used for Google's Remote Android Virtual Device project,
which runs Android devices in virtual machines. The standard network
interfaces provided inside the virtual machines are all ethernet.
However, Android is not interested in ethernet devices and would rather
connect to a wireless interface. This patch allows the virtual machine
guest to treat one of its network connections as wireless rather than
ethernet, satisfying Android's network connection requirements.

We believe this is a generally useful driver for simulating wireless
network connections in other environments where a wireless connection is
desired by some userspace process but is not available.

This is distinct from other testing efforts such as mac80211_hwsim by
being a cfg80211 device instead of mac80211 device, allowing straight
pass-through on the data plane instead of forcing packaging of ethernet
data into mac80211 frames.

Signed-off-by: A. Cody Schuffelen <schuffelen@google.com>
Acked-by: Alistair Strachan <astrachan@google.com>
Acked-by: Greg Hartman <ghartman@google.com>
Acked-by: Tristan Muntsinger <muntsinger@google.com>
[make it a tristate]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
(cherry picked from commit c7cdba31ed8b87526db978976392802d3f93110c)
[astrachan: taken from mac80211-next/master]
[astrachan: removed 'extack' from call to netdev_upper_dev_link()]
Bug: 120682817
Test: boot tested cuttlefish and enabled wifi, saw AndroidWifi
Change-Id: I726ec28617574c0217d937da049089f0ab8e0da8
Signed-off-by: Alistair Strachan <astrachan@google.com>

[RAMEN9610-14520] [COMMON] arm64: defconfig: enable SAMSUNG COMPOSITE

Change-Id: I2a044fc9b1830506dd8b7f3cbac2d25181f2403b
Signed-off-by: Kisang Lee <kisang80.lee@samsung.com>

[RAMEN9610-14520] [COMMON] usb: ignore USB disconnect message at reset

Change-Id: I5ecee0ab18945062ac2518e23c48f2146ddf9627
Signed-off-by: Kisang Lee <kisang80.lee@samsung.com>

[RAMEN9610-14503] [COMMON] scsi: ufs: Remove debug dump for UIC error.

UIC_ERROR registers are can make ITMON timeout by race condition.
When ufshcd_abort was working at other cores. And ufshcd_intr can work core0.
In case of when other core read UIC_ERROR register and if core0 execute regiseter write.
It can be make BUS hang in FSYS.(timeout)

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

[RAMEN9610-14503] [COMMON] Revert "[COMMON] scsi: ufs: Add delay for UIC_ERROR access."

This reverts commit 3d4959596cfd2a020fd539ea9dbb63fb00531666.

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

[RAMEN9610-14499][common][9610] wlbt: fix completion and use completion_done API

When we get rapid requests for SABLE generation, to serialise while processing current request,
we ignore requests other than "fw_panic" in wlbtd and send a msg "ignoring" back to kernel.
We must complete in this case as well.

We must complete one completion upon message from wlbtdi, which has
waiter(s). completion_done() API does the check without modifying
the completion in anyway and returns false if there are waiters and
true otherwise

SCSC-Bug-Id: ssb-51156
previous patch :
-Change-Id: Ieabcd8377a3040bdcfe51e4310eb55d84c693446
-Signed-off-by: Purnendu Kapadia <p.kapadia@samsung.com>

Change-Id: Id6ff01e96b2e1e3de7f940c9e2ef1a75211ae5dd
Signed-off-by: Youngsoo <youngss.kim@samsung.com>

[RAMEN9610-14474] [COMMON] usb: remove W/A code to avoid kernel panic

The W/A code for other AP could make kernel panic rarely.

Change-Id: Ic0b44fdcfc4d9c189d0fc37da2398043720424e7
Signed-off-by: Kisang Lee <kisang80.lee@samsung.com>

[ERD][APR-125] Camera code sync to latest.

Change-Id: Ia58c0082b2b7b882c6945c8fc6acda055e0c506e
Signed-off-by: Wooyeon Kim <wooy88.kim@samsung.com>

[RAMEN9610-14454] [COMMON] sched: ems: Fix possibility of slab-out-of-bounds error

Change-Id: Ieeecdd4d811479d3e23d2638ff93069e75c5cedf
Signed-off-by: Daeyeong Lee <daeyeong.lee@samsung.com>

[RAMEN9610-14444] [COMMON] scsi: ufs: Add delay for UIC_ERROR access.

It can be make ITMON timeout.

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

[RAMEN9610-14440] ANDROID: kbuild: disable LTO_CLANG with KASAN

Using LTO with KASAN currently results in "inlinable function call
in a function with debug info must have a !dbg location" errors for
memset and several of the __asan_report_* functions.

As combining these options doesn't provide significant benefits,
this change disables LTO_CLANG when KASAN is selected.

Bug: 113246877
Change-Id: I06cd27d1e9ab74627de4771548453abe3593fcb5
Signed-off-by: Sami Tolvanen <samitolvanen@google.com>

[RAMEN9610-14440] UPSTREAM: kasan: add functions for unpoisoning stack variables

As a code-size optimization, LLVM builds since r279383 may bulk-manipulate
the shadow region when (un)poisoning large memory blocks.  This requires
new callbacks that simply do an uninstrumented memset().

This fixes linking the Clang-built kernel when using KASAN.

[arnd@arndb.de: add declarations for internal functions]
Link: http://lkml.kernel.org/r/20180105094112.2690475-1-arnd@arndb.de
[fengguang.wu@intel.com: __asan_set_shadow_00 can be static]
Link: http://lkml.kernel.org/r/20171223125943.GA74341@lkp-ib03
[ghackmann@google.com: fix memset() parameters, and tweak commit message to describe new callbacks]
Link: http://lkml.kernel.org/r/20171204191735.132544-6-paullawrence@google.com
Signed-off-by: Alexander Potapenko <glider@google.com>
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Signed-off-by: Paul Lawrence <paullawrence@google.com>
Signed-off-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Andrey Ryabinin <aryabinin@virtuozzo.com>
Cc: Dmitry Vyukov <dvyukov@google.com>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Matthias Kaehlcke <mka@chromium.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
(Cherry-picked from d321599cf6b861beefe92327476b617435c7fc4a)

Change-Id: I001286850420109547c7d6defefe2fbd6915170d
Signed-off-by: Paul Lawrence <paullawrence@google.com>

[RAMEN9610-14440] UPSTREAM: kasan: add tests for alloca poisoning

Link: http://lkml.kernel.org/r/20171204191735.132544-5-paullawrence@google.com
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Signed-off-by: Paul Lawrence <paullawrence@google.com>
Acked-by: Andrey Ryabinin <aryabinin@virtuozzo.com>
Cc: Alexander Potapenko <glider@google.com>
Cc: Dmitry Vyukov <dvyukov@google.com>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Matthias Kaehlcke <mka@chromium.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
(Cherry-picked from 00a14294bb33af533f7ac002fb20623fdd8ea0d7)

Change-Id: Ibefa500b2f3d7eca9cdbb3ea58b65743700f19ab
Signed-off-by: Paul Lawrence <paullawrence@google.com>

[RAMEN9610-14440] UPSTREAM: kasan: support alloca() poisoning

clang's AddressSanitizer implementation adds redzones on either side of
alloca()ed buffers.  These redzones are 32-byte aligned and at least 32
bytes long.

__asan_alloca_poison() is passed the size and address of the allocated
buffer, *excluding* the redzones on either side.  The left redzone will
always be to the immediate left of this buffer; but AddressSanitizer may
need to add padding between the end of the buffer and the right redzone.
If there are any 8-byte chunks inside this padding, we should poison
those too.

__asan_allocas_unpoison() is just passed the top and bottom of the dynamic
stack area, so unpoisoning is simpler.

Link: http://lkml.kernel.org/r/20171204191735.132544-4-paullawrence@google.com
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Signed-off-by: Paul Lawrence <paullawrence@google.com>
Acked-by: Andrey Ryabinin <aryabinin@virtuozzo.com>
Cc: Alexander Potapenko <glider@google.com>
Cc: Dmitry Vyukov <dvyukov@google.com>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Matthias Kaehlcke <mka@chromium.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
(Cherry-picked from 342061ee4ef3d80001d1ae494378f3979c861dba)

Change-Id: I3da748cd5aa5190b2b40deab9d32da0030f4d465
Signed-off-by: Paul Lawrence <paullawrence@google.com>

[RAMEN9610-14440] UPSTREAM: kasan/Makefile: support LLVM style asan parameters

LLVM doesn't understand GCC-style paramters ("--param asan-foo=bar"), thus
we currently we don't use inline/globals/stack instrumentation when
building the kernel with clang.

Add support for LLVM-style parameters ("-mllvm -asan-foo=bar") to enable
all KASAN features.

Link: http://lkml.kernel.org/r/20171204191735.132544-3-paullawrence@google.com
Signed-off-by: Andrey Ryabinin <aryabinin@virtuozzo.com>
Signed-off-by: Paul Lawrence <paullawrence@google.com>
Reviewed-by: Alexander Potapenko <glider@google.com>
Cc: Dmitry Vyukov <dvyukov@google.com>
Cc: Greg Hackmann <ghackmann@google.com>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Matthias Kaehlcke <mka@chromium.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
(Cherry-picked from 1a69e7ce8391a8bc808baf04e06d88ab4024ca47)

Change-Id: I6cf05bf35de7caff85a2f46b9f8581468ba9703e
Signed-off-by: Paul Lawrence <paullawrence@google.com>

[RAMEN9610-14440] BACKPORT: kasan: add compiler support for clang

Patch series "kasan: support alloca, LLVM", v4.

This patch (of 5):

For now we can hard-code ASAN ABI level 5, since historical clang builds
can't build the kernel anyway.  We also need to emulate gcc's
__SANITIZE_ADDRESS__ flag, or memset() calls won't be instrumented.

Link: http://lkml.kernel.org/r/20171204191735.132544-2-paullawrence@google.com
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Signed-off-by: Paul Lawrence <paullawrence@google.com>
Acked-by: Andrey Ryabinin <aryabinin@virtuozzo.com>
Cc: Alexander Potapenko <glider@google.com>
Cc: Dmitry Vyukov <dvyukov@google.com>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Matthias Kaehlcke <mka@chromium.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
(Cherry-picked from 53a98ed73b848432a51631346b02049bb7fa039d)

Change-Id: I76b74e70633abadfe430f5cdc397b77abcaab382
Signed-off-by: Paul Lawrence <paullawrence@google.com>

[RAMEN9610-14414][9610] dtsi: added audio extra binary

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

[RAMEN9610-14365][9610] media: radio: Add register r/w for debugging

Change-Id: I401e3b3e824adbfd73d88caeafc76e7ecea17b70
Signed-off-by: Yunsu Kim <iamyunsu.kim@samsung.com>

[RAMEN9610-14284][COMMON][Bug Fix]s2mcs02 wrong probe

Change-Id: I9649ab2663858dd7e9eb33a829f1488a34a1ee26

[RAMEN9610-13839] [COMMON]initialize partner before first used

one kernel panic issue found in product_show , due to
dwc3_otg_init() use uninitialized local variable partner to call typec_register_partner,
it result in partner->identity is setted with unexpected value.
reproduce steps: adb shell cat /sys/class/typec/port0-partner/identity/product

Change-Id: Id0e2d04c20b510563b8b0a0ef786ba4e89d6a50c

[ERD][RAMEN9610-13779] arm64: dts: remove fm elna

Change-Id: Ife31d8e44fa37e4ecbea0d9381e66ae7decd360e
Signed-off-by: Yunsu Kim <iamyunsu.kim@samsung.com>

[RAMEN9610-14378][COMMON] scsi: ufs: Revert "single ton pointer"

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

[RAMEN9610-14333][COMMON][9610] drivers : fix typec role swap

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

[RAMEN9610-14324] [9610] gpu: tHEx: r16p0: fix the prevent defect

Change-Id: I557043dffbb9c1d9c03475248e96081851a845bc
Signed-off-by: Jaewoong, Han <ssm20.han@samsung.com>

[RAMEN9610-14313] [COMMON] scsi: ufs: Prevent bug fix.

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

[RAMEN9610-14257] [COMMON] scsi: ufs: Disable UFS UIC interrupt when UIC error.

Sometimes UFS interrupts storm was occur when UIC error.
So, Disable interrupts for recovery.

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

[RAMEN9610-14257] [COMMON] scsi: ufs: Move SFR dump to workqueue from ISR.

Too many prints in the ISR when UFS error case.
So, Move to workqueue for system.

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

[RAMEN9610-14252] [9610] usb: phy: add iounmap and NULL check of ioremap

Change-Id: Ieb62e64bfd9ff925740b02197cdbe8b0d0928899
Signed-off-by: Daehwan Jung <dh10.jung@samsung.com>

[RAMEN9610-14249][9610] drivers: battery: update pre-processor for small charger

Change-Id: Ie83dd4460dc8efc87abbf666f3ce699d06f6e181
Signed-off-by: Keunho Hwang <keunho.hwang@samsung.com>

[RAMEN9610-14248] [9610] extcon: madera: Changed the order of the jack detection event reporting.

-Problem: Disconnecting the headset during music playback causes noise.

-Reason:  The problem is caused by the difference between the Audio Codec jack detection reporting
and the implementation of the Android wiredaccessary manager.

-Solution: Changed the order of the jack detection event reporting.

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

[RAMEN9610-14248][9610] extcon: madera: modified the impedence of LINE OUT

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

[RAMEN9610-14248] extcon: line out  support

Change-Id: Ic5ea097aa97305a093076ce5ebc5e36ad926fabb
Signed-off-by: Satish Kumar Reddy <palli.satish@samsung.com>

[RAMEN9610-14248] abox: lineout device added in sound type

Change-Id: Iaf4bf28ed0ff8d5d824e5cac2f5484739181e458
Signed-off-by: Satish Kumar Reddy <palli.satish@samsung.com>

[RAMEN9610-14247] [COMMON][9610] drivers : fix sink vbus from 4.5v to 3.5v

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

[ERD][APR-103] [COMMON]Modify DT for multi-os

Change-Id: Id23c028336dea47d4026172f1b757d9d3838f2c4

[ERD][APR-103] [COMMON]chub: fix sendCmd error

This patch fix sendCmd error by wakelock timeout

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

[ERD][APR-103] [COMMON]chub: fix kernel panic by runtime error

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

[ERD][APR-103] [COMMON]chub: ipc: fix ipc loss issue with ipc_read timeout

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

[ERD][APR-103] [COMMON]chub: ipc: change irq allocation scheme from round robin to scan

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

[ERD][APR-103] [COMMON]prevent copying ack signal into event packet

Change-Id: I04a9b94b1cd7e934e0d13a739753eca1236f65db
Signed-off-by: Sukwon Ryoo <sw.ryoo@samsung.com>

[ERD][APR-103] [COMMON]chub: runtimelog supports newline

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

[ERD][APR-103] [COMMON]chub: sensorlist fail fix

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

[ERD][APR-103] [COMMON]chub: update runtimelog

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

[ERD][APR-103] [COMMON]chub: ipc: don't use printf before logbuf setup

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

[ERD][APR-103] [COMMON]chub: support runtimelog

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

[ERD][APR-103] [COMMON]CHUB: skip os select after 1st boot

add character driver
get os number and modify os_name
if os_name is 0th or invalid, go to os select

Change-Id: If19182f1f2c1bd9a8ea022b6aee9263d240fb77a
Signed-off-by: Sukwon Ryoo <sw.ryoo@samsung.com>

[ERD][APR-103] [COMMON]chub: enable force reset by sensor driver request

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

[ERD][APR-103] [COMMON]chub: synchronize the nanohub_open and chub poweron

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

[ERD][APR-103] [COMMON]chub: add ipc magic

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

[ERD][APR-103] [COMMON]chub: add slient reset for chub error

Change-Id: I18bdbc2ee03bde8cd7992e50c367db4652971fa1
Signed-off-by: Boyoung <eric.by.kim@samsung.com>

[ERD][APR-103] [COMMON]chub: change name of kernel log flag to wake flag

Change-Id: I6f5e1e936e8ea451695a7750c522d925669019b3
Signed-off-by: Sukwon Ryoo <sw.ryoo@samsung.com>

[ERD][APR-103] chub: support active sensor

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

[ERD][APR-103] [COMMON]chub: ipc: add error handling

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

[ERD][APR-103] [COMMON]chub: use chrehal io

Change-Id: Ia99e73a31d98d4739efeac143a1cea34ae9a7f69
Signed-off-by: Boyoung <eric.by.kim@samsung.com>

[ERD][APR-103] [COMMON]chub: increase chub fw error threshold

chub sensor driver detects invalid error
if chub fw booting is delaied with multi-os booting

Change-Id: Ie3712367ad39b6b25062d605380b222017ce76b5
Signed-off-by: Boyoung <eric.by.kim@samsung.com>

[ERD][APR-103] [COMMON]chub: ipc: add to check irq pending

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

[ERD][APR-103] [COMMON]chub: stop send message to AP in suspend mode

Change-Id: I4ce8006221e7ffe4c9db6f4a074d0609f185b1e4
Signed-off-by: Sukwon Ryoo <sw.ryoo@samsung.com>

[ERD][APR-103] [COMMON]chub: suppport dump on reset

chub driver requests to dump to sensor hal

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

[ERD][APR-103] [COMMON]chub: fix wrong confict fix

This patch recoveries '[9610] chub: ipc: version 181024' patch
that is removed by 'chub : support multi-os for various sensors' patch confict.

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

[ERD][APR-103] [COMMON]chub : support multi-os for various sensors

Change-Id: I0768a2ba0d87fed58ce7e18877e60d5583f53529
Signed-off-by: Boyoung <eric.by.kim@samsung.com>

Merge 4.14.113 into android-4.14-p

Changes in 4.14.113
ARC: u-boot args: check that magic number is correct
arc: hsdk_defconfig: Enable CONFIG_BLK_DEV_RAM
perf/core: Restore mmap record type correctly
ext4: add missing brelse() in add_new_gdb_meta_bg()
ext4: report real fs size after failed resize
ALSA: echoaudio: add a check for ioremap_nocache
ALSA: sb8: add a check for request_region
auxdisplay: hd44780: Fix memory leak on ->remove()
IB/mlx4: Fix race condition between catas error reset and aliasguid flows
mmc: davinci: remove extraneous __init annotation
ALSA: opl3: fix mismatch between snd_opl3_drum_switch definition and declaration
thermal/intel_powerclamp: fix __percpu declaration of worker_data
thermal: bcm2835: Fix crash in bcm2835_thermal_debugfs
thermal/int340x_thermal: Add additional UUIDs
thermal/int340x_thermal: fix mode setting
thermal/intel_powerclamp: fix truncated kthread name
scsi: iscsi: flush running unbind operations when removing a session
x86/mm: Don't leak kernel addresses
tools/power turbostat: return the exit status of a command
perf list: Don't forget to drop the reference to the allocated thread_map
perf config: Fix an error in the config template documentation
perf config: Fix a memory leak in collect_config()
perf build-id: Fix memory leak in print_sdt_events()
perf top: Fix error handling in cmd_top()
perf hist: Add missing map__put() in error case
perf evsel: Free evsel->counts in perf_evsel__exit()
perf tests: Fix a memory leak of cpu_map object in the openat_syscall_event_on_all_cpus test
perf tests: Fix memory leak by expr__find_other() in test__expr()
perf tests: Fix a memory leak in test__perf_evsel__tp_sched_test()
irqchip/mbigen: Don't clear eventid when freeing an MSI
x86/hpet: Prevent potential NULL pointer dereference
x86/cpu/cyrix: Use correct macros for Cyrix calls on Geode processors
drm/nouveau/debugfs: Fix check of pm_runtime_get_sync failure
iommu/vt-d: Check capability before disabling protected memory
x86/hw_breakpoints: Make default case in hw_breakpoint_arch_parse() return an error
fix incorrect error code mapping for OBJECTID_NOT_FOUND
ext4: prohibit fstrim in norecovery mode
gpio: pxa: handle corner case of unprobed device
rsi: improve kernel thread handling to fix kernel panic
9p: do not trust pdu content for stat item size
9p locks: add mount option for lock retry interval
f2fs: fix to do sanity check with current segment number
netfilter: xt_cgroup: shrink size of v2 path
serial: uartps: console_setup() can't be placed to init section
powerpc/pseries: Remove prrn_work workqueue
media: au0828: cannot kfree dev before usb disconnect
HID: i2c-hid: override HID descriptors for certain devices
ARM: samsung: Limit SAMSUNG_PM_CHECK config option to non-Exynos platforms
usbip: fix vhci_hcd controller counting
ACPI / SBS: Fix GPE storm on recent MacBookPro's
KVM: nVMX: restore host state in nested_vmx_vmexit for VMFail
compiler.h: update definition of unreachable()
cifs: fallback to older infolevels on findfirst queryinfo retry
kernel: hung_task.c: disable on suspend
crypto: sha256/arm - fix crash bug in Thumb2 build
crypto: sha512/arm - fix crash bug in Thumb2 build
iommu/dmar: Fix buffer overflow during PCI bus notification
soc/tegra: pmc: Drop locking from tegra_powergate_is_powered()
lkdtm: Print real addresses
lkdtm: Add tests for NULL pointer dereference
drm/panel: panel-innolux: set display off in innolux_panel_unprepare
crypto: axis - fix for recursive locking from bottom half
Revert "ACPI / EC: Remove old CLEAR_ON_RESUME quirk"
coresight: cpu-debug: Support for CA73 CPUs
drm/nouveau/volt/gf117: fix speedo readout register
ARM: 8839/1: kprobe: make patch_lock a raw_spinlock_t
drm/amdkfd: use init_mqd function to allocate object for hid_mqd (CI)
appletalk: Fix use-after-free in atalk_proc_exit
lib/div64.c: off by one in shift
include/linux/swap.h: use offsetof() instead of custom __swapoffset macro
bpf: fix use after free in bpf_evict_inode
dm: disable CRYPTO_TFM_REQ_MAY_SLEEP to fix a GFP_KERNEL recursion deadlock
bpf: reduce verifier memory consumption
bpf: fix verifier memory leaks
bpf: fix verifier NULL pointer dereference
bpf: fix stack state printing in verifier log
bpf: move {prev_,}insn_idx into verifier env
bpf: move tmp variable into ax register in interpreter
bpf: enable access to ax register also from verifier rewrite
bpf: restrict map value pointer arithmetic for unprivileged
bpf: restrict stack pointer arithmetic for unprivileged
bpf: restrict unknown scalars of mixed signed bounds for unprivileged
bpf: fix check_map_access smin_value test when pointer contains offset
bpf: prevent out of bounds speculation on pointer arithmetic
bpf: fix sanitation of alu op with pointer / scalar type from different paths
bpf: fix inner map masking to prevent oob under speculation
bpf: do not restore dst_reg when cur_state is freed
bpf: fix sanitation rewrite in case of non-pointers
bpf: Fix selftests are changes for CVE 2019-7308
net: stmmac: Set dma ring length before enabling the DMA
mm: hide incomplete nr_indirectly_reclaimable in sysfs
appletalk: Fix compile regression
Linux 4.14.113

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

Linux 4.14.113

appletalk: Fix compile regression

[ Upstream commit 27da0d2ef998e222a876c0cec72aa7829a626266 ]

A bugfix just broke compilation of appletalk when CONFIG_SYSCTL
is disabled:

In file included from net/appletalk/ddp.c:65:
net/appletalk/ddp.c: In function 'atalk_init':
include/linux/atalk.h:164:34: error: expected expression before 'do'
 #define atalk_register_sysctl()  do { } while(0)
                                  ^~
net/appletalk/ddp.c:1934:7: note: in expansion of macro 'atalk_register_sysctl'
  rc = atalk_register_sysctl();

This is easier to avoid by using conventional inline functions
as stubs rather than macros. The header already has inline
functions for other purposes, so I'm changing over all the
macros for consistency.

Fixes: 6377f787aeb9 ("appletalk: Fix use-after-free in atalk_proc_exit")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>

mm: hide incomplete nr_indirectly_reclaimable in sysfs

In upstream branch this fixed by commit b29940c1abd7 ("mm: rename and
change semantics of nr_indirectly_reclaimable_bytes").

This fixes /sys/devices/system/node/node*/vmstat format:

...
nr_dirtied 6613155
nr_written 5796802
 11089216
...

Cc: <stable@vger.kernel.org> # 4.19.y
Fixes: 7aaf77272358 ("mm: don't show nr_indirectly_reclaimable in /proc/vmstat")
Signed-off-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
Cc: Roman Gushchin <guro@fb.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

net: stmmac: Set dma ring length before enabling the DMA

This was fixed in upstream by commit 7d9e6c5afab6 ("net: stmmac: Integrate
XGMAC into main driver flow") that is a new feature commit.

We found a race condition in the DMA init sequence that hits if the
PHY already has link up during stmmac_hw_setup. Since the ring length
was programmed after enabling the RX path, we might receive a packet
before the correct ring length is programmed. When that happened we
could not get reliable interrupts for DMA RX and the MTL complained
about RX FIFO overrun.

Signed-off-by: Lars Persson <larper@axis.com>
Cc: stable@vger.kernel.org # 4.14.x
Cc: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Cc: Alexandre Torgue <alexandre.torgue@st.com>
Cc: Jose Abreu <joabreu@synopsys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

bpf: Fix selftests are changes for CVE 2019-7308

The changes to fix the CVE 2019-7308 make the bpf verifier stricter
with respect to operations that were allowed earlier in unprivileged
mode. Fixup the test cases so that the error messages now correctly
reflect pointer arithmetic going out of range for tests.

Signed-off-by: Balbir Singh <sblbir@amzn.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

bpf: fix sanitation rewrite in case of non-pointers

commit 3612af783cf52c74a031a2f11b82247b2599d3cd upstream.

Marek reported that he saw an issue with the below snippet in that
timing measurements where off when loaded as unpriv while results
were reasonable when loaded as privileged:

    [...]
    uint64_t a = bpf_ktime_get_ns();
    uint64_t b = bpf_ktime_get_ns();
    uint64_t delta = b - a;
    if ((int64_t)delta > 0) {
    [...]

Turns out there is a bug where a corner case is missing in the fix
d3bd7413e0ca ("bpf: fix sanitation of alu op with pointer / scalar
type from different paths"), namely fixup_bpf_calls() only checks
whether aux has a non-zero alu_state, but it also needs to test for
the case of BPF_ALU_NON_POINTER since in both occasions we need to
skip the masking rewrite (as there is nothing to mask).

Fixes: d3bd7413e0ca ("bpf: fix sanitation of alu op with pointer / scalar type from different paths")
Reported-by: Marek Majkowski <marek@cloudflare.com>
Reported-by: Arthur Fabre <afabre@cloudflare.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Link: https://lore.kernel.org/netdev/CAJPywTJqP34cK20iLM5YmUMz9KXQOdu1-+BZrGMAGgLuBWz7fg@mail.gmail.com/T/
Acked-by: Song Liu <songliubraving@fb.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: Balbir Singh <sblbir@amzn.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>