[NEUS7920-133][9610][7885][7872][7570] wlbt: Addition of blocking scan condition, during Scan List Updation in Driver.

During Driver Connect Scan, cfg80211_scan_req is
not available. Hence add a blocking scan
condition as well, during the Scan List Updation
in Driver.

Change-Id: I35e002e72857cf5a393bb855266c2bc350418a1f
SCSC-Bug-Id: SSB-51608
Signed-off-by: Mohit Ghuley <mohit.ghuley@samsung.com>

[NEUS7920-133][9610][7885][7872][7570] wlbt: Kernel logging improvement.

Host changes for kernel logging improvement.Generate appropriate
logs for initial connection.

Change-Id: Ic4a62660958534aa37a5901a58b5cd19c78af7a7
SCSC-Bug-Id: SSB-51392
Signed-off-by: Himani Gupta <himani.g2@samsung.com>

[NEUS7920-133]wlbt: Lerna character device

Create character device for userspace <-> firmware configuration
communications.

Change-Id: I45662d621280b0cec3a973f5489333c6c6103b57
SCSC-Bug-Id: SSB-50557

[NEUS7920-133]wlbt: track shared DRAM allocations

Add instrumentation to track shared DRAM allocators
in procfs

Change-Id: I90c9da7c10f54dadf9c6968bcf047e16de5c83fc
SCSC-Bug-Id: SSB-50917
Signed-off-by: Ivan Priest <i.priest@samsung.com>

[NEUS7920-133]wlbt: Return -EACCES from scsc_bt_shm_h4_read when copy_from_user fails

Otherwise it could end up in an infinite loop.

Change-Id: I98d2729e669c8846e3c1e939fc3453f957ae2a3e
SCSC-Bug-Id: SSB-45750
Signed-off-by: Jes Andersen <jes.andersen@samsung.com>

[NEUS7920-133][9610][7885][7872][7570] wlbt: p2p state to be set to scanning in slsi_scan

p2p state is not set to proper state when there is a race condition between disconnect handle and full scan.

SCSC-Bug-Id: SSB-50669

Change-Id: Iee95bd09d30b6f2de058abda022f74c78887bb1c
Signed-off-by: Kavitha Velayutham <k.velayutham@samsung.com>

[NEUS7920-133][9610][7885][7872][7570] wlbt: Disable ch12/13,when cellular is off.

Driver shall disable ch 12/13 when cellular is off on receiving
GETREGULATORY 0.

Change-Id: Iee0e32e2d9b629344e6ac24e89da78c2efc5c9d2
SCSC-Bug-Id: SSB-50468
Signed-off-by: Himani Gupta <himani.g2@samsung.com>

[NEUS7920-133][9610] wlbt: NAN fixes & code cleanup

Fix back to back NAN start causing FW panic.
Fix response type values not matching HAL.
Remove hardcoded MIB PSIDs, use PSIDs from mib.h

Change-Id: Iad3cc72ceb20dbfd8183d4697af409d6c51ff742
SCSC-Bug-Id: SSB-51027
Signed-off-by: Jaya Prakash Sangaru <j.sangaru@samsung.com>

[NEUS7920-133]wlbt: report miframman usage in /proc

Add /proc/driver/mifctrl/rammanX/used,free

This is to track shared DRAM usage.

Change-Id: Icafc2ae0a08701428f3d9e92a5993c1145f043c6
SCSC-Bug-Id: SSB-49317
Signed-off-by: Ivan Priest <i.priest@samsung.com>

[NEUS7920-133][7885][9610] wlbt: ACS scan cleanup

Changes done to stop scan and free related driver
data ,when AP is stopped during ongoing ACS scan.

Change-Id: Ifce7072a54f58844a335f4ed3c4a16532278e5cb
SCSC-Bug-Id: SSB-50724
Signed-off-by: Srishti Piplani <srishti.p@samsung.com>

[NEUS7920-133][7570][7872][7885][9610] wlbt: Prevent issue in mgt.c

Change done to fix prevent issue in mgt.c file.
Dereferencing mib_entry.value.u.octetValue.data,
which is known to be NULL.

Change-Id: Ife4eb902e260070ad2ab6042610cc20c99610115
SCSC-Bug-Id: SSB-51047
Signed-off-by: Srishti Piplani <srishti.p@samsung.com>

[NEUS7920-133][9610] wlbt: Fix compilation error

Fix compilation error when SCSC_DEBUG_COMPATIBILITY
is set to N.

Change-Id: Id7170a0d86e879c3628d5514c384bff8e17f68d6
SCSC-Bug-Id: SSB-509704
Signed-off-by: Albert Cano <a.canocamps@samsung.com>

[NEUS7920-133][9610] wlbt: Add observer information in sbl header

Sable user should be notified of the presence of one or more observers
when the trigger collection occurs. This will help to indicate that the
mxlog and udi chunks might be out of date.

The presence of observer[s] is included in a new field of the sable
header.

To indicate to the decoder the new header structure, it has been decided
to increase the sbl version from 2.0 to 2.1

Change-Id: I6b87ab2f950300482d2025a0c79914c5d24751b8
SCSC-Bug-Id: SSB-50521
Signed-off-by: Albert Cano <a.canocamps@samsung.com>

[NEUS7920-133][9610] wlbt: Add "support mode" field for GETSTAINFO

Added support mode field to the output of GETSTAINFO
,which gives information about the 11ax, 11ac and
11n support, extracted from assoc IE's.

Change-Id: I048e96af9e1f6b08d324c630ea09d82158732f82
SCSC-Bug-Id: SSB-50443
Signed-off-by: Srishti Piplani <srishti.p@samsung.com>

[NEUS7920-133][9610][7885] wlbt: Increase timeout waiting for mlme cfm/ind

Sometimes when system is heavily loaded, HIP needs more time to
retrive cfms/ind, So increase this timeout to 6 secs.

Change-Id: Ie1972509ef47edf1d631a355fa49511af89a7d69
SCSC-Bug-Id: SSB-50283
Signed-off-by: Jaya Prakash Sangaru <j.sangaru@samsung.com>

[NEUS7920-133][9610][7885][7872][7570] wlbt: Ignore address(mac/mask) sent by CFG when randomization is disabled in Fw

Ignore the Mac address sent by cfg when mac randomization is enabled in host and disabled in fw.
so that Fw has the control of enabling/disabling Mac randomization

Change-Id: If3dfd5925b0271fd93c9c4c0e462bd1ea9031ce3
SCSC-Bug-Id: SB-50533
Signed-off-by: Kavitha Velayutham <k.velayutham@samsung.com>

[NEUS7920-133]wlbt: mxman_suspend() don't block suspend when FW failed

The call to mxman_suspend() returned an error if WLBT FW
is failed, this prevents platform suspend if the firmware
does not recover. Return success even though message is
dropped.

Change-Id: I8c293aaa69dc356ad8125d37f06321392894978c
SCSC-Bug-Id: SSB-50585
Signed-off-by: Ivan Priest <i.priest@samsung.com>

[NEUS7920-133]wlbt: wifilogger - remove incorrect kfree

Remove kfree() from scsc_wlog_register_debugfs_entry()
error path. The function is passed static memory.

Change-Id: If94cef6aec198abef34fefab5aacc4689f6b12dc
SCSC-Bug-Id: SSB-50600
Signed-off-by: Ivan Priest <i.priest@samsung.com>

[NEUS7920-133][9610] wlbt: Use single threaded wq in hip4 bh

We have recently (A50 project) observed several issues to schedule
hip4_wq work, most likely because the kernel is blocked and is not
granting us CPU cycles.

In current implementation the work is added in the systemwq. Systemwq
might be easily affected by other subsystems adding batch works that
might eventually block our pending work.

In order to avoid using systemwq, the patch creates a new singlethread
workqueue and adds the non-napi process context bottom half works in there.

Change-Id: I0cc69779aa91c26777f00a2e7b1cd840336f553d
SCSC-Bug-Id: SSB-50566
Signed-off-by: Albert Cano <a.canocamps@samsung.com>

[NEUS7920-133][9610] wlbt: Unset channel is sent at  work expiry of 600ms delay

This may increase the time duration of listen by 600ms in that channel which would help in p2p discovery
to find the devices faster.

Change-Id: I8b16e32aa25e6b406bc48f0cf842df2495c15a50
SCSC-Bug-Id: SSB-49471
Signed-off-by: Kavitha Velayutham <k.velayutham@samsung.com>

[RAMEN9610-14596] [COMMON] usb: add simmian gadget function for camera tuning

Change-Id: I8b7e1cd362c880c4211d589d9bee86ac52798ff2
Signed-off-by: k.t.lee <k.t.lee@samsung.com>

[RAMEN9610-14574] [COMMON] scsi: ufs: Dump SFR move to ISR.

This is can make "Synchronous External Abort"
by SFR access race condition between ISR and workqueue.

Revert "[EKTROIKA-189][Troika][COMMON] scsi: ufs: Move SFR dump to workqueue from ISR."

=====================================================================
<3>[   21.625697] [pid:57,cpu0,in irq]Synchronous External Abort: synchronous external abort (0x96000210) at 0xffffff800b05d040
<0>[   21.625720] [pid:57,cpu0,in irq]Internal error: : 96000210 [#1] PREEMPT SMP
<4>[   21.625733] [pid:57,cpu0,in irq]Modules linked in:
<0>[   21.625767] [pid:57,cpu0,in irq]debug-snapshot: core register saved(CPU:0)
<2>[   21.625778] [pid:3963,cpu6,storaged]Bad mode in Error handler detected on CPU6, code 0xbf000002 -- SError
<0>[   21.625784] [pid:57,cpu0,in irq]L2ECTLR_EL1: 0000000000000007
<0>[   21.625803] [pid:57,cpu0,in irq]L2ECTLR_EL1 valid_bit(30) is NOT set (0x0)
<0>[   21.625818] [pid:57,cpu0,in irq]CPUMERRSR: 0000000008040321, L2MERRSR: 0000000012000000
<0>[   21.625833] [pid:57,cpu0,in irq]CPUMERRSR valid_bit(31) is NOT set (0x0)
<0>[   21.625847] [pid:57,cpu0,in irq]L2MERRSR valid_bit(31) is NOT set (0x0)
<0>[   21.625861] [pid:57,cpu0,in irq]debug-snapshot: context saved(CPU:0)
<6>[   21.625907] [pid:57,cpu0,in irq]debug-snapshot: item - log_kevents is disabled
<6>[   21.625918] [pid:57,cpu0,in irq]TIF_FOREIGN_FPSTATE: 0, FP/SIMD depth 0, cpu: 0
<4>[   21.625931] [pid:57,cpu0,in irq]CPU: 0 PID: 57 Comm: kworker/0:1 Tainted: G S              4.14.56-gb8dc9cd #1
<4>[   21.625938] [pid:57,cpu0,in irq]Hardware name: kane (DT)
<4>[   21.625955] [pid:57,cpu0,in irq]Workqueue: events ufshcd_err_handler
<4>[   21.625969] [pid:57,cpu0,in irq]task: ffffffc876beb680 task.stack: ffffff800b5e8000
<4>[   21.625982] [pid:57,cpu0,in irq]PC is at ufshcd_intr+0x19c/0x34c
<4>[   21.625991] [pid:57,cpu0,in irq]LR is at ufshcd_intr+0x120/0x34c
=====================================================================

This reverts commit c63c2451c3ecb705e7a23b361e8ca8d7e8a0b5e4.

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

[RAMEN9610-14573] [COMMON][9610] drivers : add self soft reset when cc attach

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

[HACK] fbdev: dpu20: modify sub-dev shutdown callback.

Change-Id: I972b84ca6beaa45d5ef28aad071d99dd8aec69e4
Signed-off-by: Jaehoe Yang <jaehoe.yang@samsung.com>
Signed-off-by: hwangjae lee <hj-yo.lee@samsung.com>

[9610] arm64: dtsi: fix build warning

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

fs: confict fix for 4.14 9610 minor version up

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

Restore "Revert: smp/hotplug: Differentiate the AP-work lockdep class between up and down"

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

lmk: fix conflict of kernel minor upgrade of 4.14.113

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

[COMMON] kernel: cpu: fix conflict

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

ANDROID: mnt: fix conflict during updating 4.14.113

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

dm-crypt: 4.14 fix a confict ivmode

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

watchdog: fix build error

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

[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