Merge LA.UM.7.5.2.r1-03200-8x96.0 of https://source.codeaurora.org/quic/la/kernel/msm-4.4 into lineage-16.0

bcf671504f41 Merge "msm: adsprpc: maintain local copy of rpra offloaded to DSP" into kernel.lnx.4.4.r37-rel
621c16b0342c Merge "arm: dts: msm: Add avs-version dt property for 8996" into kernel.lnx.4.4.r37-rel
22fbeb474b52 Merge "msm: sensor: actuator: fix out of bound read for bivcm region params" into kernel.lnx.4.4.r37-rel
579b4b461cca Merge "diag: Prevent out-of-bound access while processing userspace data" into kernel.lnx.4.4.r37-rel
aff3d9629d10 arm: dts: msm: Add avs-version dt property for 8996
fbf5254e319b msm: sensor: actuator: fix out of bound read for bivcm region params
d73a74c20cb2 msm: adsprpc: maintain local copy of rpra offloaded to DSP
3c1b5fa08460 diag: Prevent out-of-bound access while processing userspace data
d929c539a8e5 msm: ais: sensor: actuator: fix out of bound read for bivcm region params
77a2432a11c2 ASoC: msm: Add support for AVS version check
51ae92e6a401 Merge commit '06ceb6bb61d15d96906733a0a4e1ca5a53a9fe3e' into HEAD
06ceb6bb61d1 Merge "msm: ipa3: Fix to validate check for IP type"
c7c174351b81 Merge "diag: Prevent out-of-bound access while processing non-hdlc pkt"
bc914679ea33 msm: ipa3: Fix to validate check for IP type
f275209c759d diag: Prevent out-of-bound access while processing non-hdlc pkt
77b17af341a0 Merge "ARM: dts: msm: Add support for float charger detection on MSM8996"
c9c1e20784b5 Merge "phy: qusb: Add support for DP DM pulsing for HS PHY"
5c004decb393 Merge "dsp: afe: check for minimum size before payload access"
f7f2404ce1e5 Merge "soc: msm8998: Add 16ch playback and record support for TDM"
0ee704100065 dsp: afe: check for minimum size before payload access
074cdf9e72eb Merge "cnss2: Return failure if bus type do not match"
f73796d0e9f6 Merge "asoc: Update max channels for TDM ports"
3691a75c38f2 soc: msm8998: Add 16ch playback and record support for TDM
4067f83f16aa Merge "ARM: dts: msm: Enable DP DM pulsing support on MSM8996"
ced9c94ab135 Merge "soc: qcom: hab: Add open local-cancel and compiler warning fixes"
1058027c8de2 Merge "msm: ipa: fix to validate input parameters"
c53f4c9b5b07 Merge "net: sockev: avoid races between sockev and socket_close"
c447f451f23b msm: ipa: fix to validate input parameters
0e71405de372 phy: qusb: Add support for DP DM pulsing for HS PHY
923d660f4f8e ARM: dts: msm: Add support for float charger detection on MSM8996
669f50368505 usb: dwc3: Support float charger detection
b924e5efad9c net: sockev: avoid races between sockev and socket_close
ecf5d04a091c i2c: add virtual i2c driver
3973929bb0c0 asoc: Update max channels for TDM ports
f5b94d9b13a2 Merge "fbdev: msm: check the length of the external input buffer properly"
866e7cab7632 Merge "power: qpnp-smbcharger: Add support for dpdm pulsing"
69b14d87db0c Merge "diag: Prevent out-of-bound access while processing dci transaction"
16819b1724ca Merge "diag: Prevent out-of-bound access while processing mask commands"
77b2a5118029 Merge "soc: qcom: smem: validate fields of shared structures"
9c9f59ad526d Merge "msm: mdss: assign block_id for INTF_3"
9482fdb2ac26 Merge "asoc: Ratelimit error logs to avoid excessive logging"
c0d5faa72def ARM: dts: msm: Enable DP DM pulsing support on MSM8996
20cff2eff8b0 soc: qcom: hab: Add open local-cancel and compiler warning fixes
2835220d65c2 power: qpnp-smbcharger: Add support for dpdm pulsing
705aac6195a3 Merge "msm: ais : Lock Implementation for avoid race condition"
e405d025f373 cnss2: Return failure if bus type do not match
cce422722518 soc: qcom: smem: validate fields of shared structures
24cedeb24492 Merge "Merge android-4.4.180 (71cb827) into msm-4.4"
01fcd88c0f94 fbdev: msm: check the length of the external input buffer properly
2f6ef8a30b78 Merge "usb: f_gsi: Increase max control transfer size to 8K"
cfb05dba8254 Merge "msm: ipa_v2: Protect ipa default routing table"
44607545fc3a Merge "qcom: smcinvoke: Fix stack overflow for arr_filp"
b29d59a33d59 Merge "defconfig: msm8996: Enable radio configs"
fa9dbbba7210 qcom: smcinvoke: Fix stack overflow for arr_filp
17fe44d6eb8a msm: ais : Lock Implementation for avoid race condition
547234bc3905 Merge "arm: dts: msm: Add usbin-vadc dt property for 8996"
780ec0d56272 Merge android-4.4.180 (71cb827) into msm-4.4
fe304a42badc Merge "power: qpnp-smbcharger: Add voltage now property in usb psy"
01abac7367ec Merge "soc: qcom: ipc_router_mhi_xprt: Handle error condition"
d1a5c0380504 Merge "ARM: dts: msm: Enable HDMI audio support for 8996"
f5704ee3fc16 Merge "defconfig: Enable REGMAP_ALLOW_WRITE_DEBUGFS"
726ccfec942d power: qpnp-smbcharger: Add voltage now property in usb psy
c77bbe685168 Merge "msm: ais: handle the error value returned during get clock"
765d3befd4ec msm: ais: handle the error value returned during get clock
716a46317a4f power: qpnp-smbcharger: Add support for float charger detection
f228ed90951d Merge "ARM: dts: msm: Update avb flag and partition names for auto"
fde6bcd6f665 arm: dts: msm: Add usbin-vadc dt property for 8996
f8572fa1920f Merge "ASoC: msm: Update codec name in HDMI dai link"
64c7fea7a615 Merge "serial: msm_serial_hs: Align to HW assisted flow control support"
4249d4516299 asoc: Ratelimit error logs to avoid excessive logging
095ed32dd71f serial: msm_serial_hs: Align to HW assisted flow control support
a4cc4b94d2cc usb: f_gsi: Increase max control transfer size to 8K
14ff0dc12ed0 Merge "ARM: dts: msm: add support for apq8096pro CDP"
6666379ae0e6 msm: mdss: assign block_id for INTF_3
79e903bcd908 soc: qcom: ipc_router_mhi_xprt: Handle error condition
4efd54ad69f1 Merge "pwm: pwm-qpnp: Fix the order of configuring PWM value"
af0d3ed849b5 Merge "msm: camera: jpegdma: Added missing lock for dqbuf and streamon"
71cb827c0249 Merge 4.4.180 into android-4.4
0f654c12cd72 Linux 4.4.180
5f3cf6b82211 powerpc/lib: fix book3s/32 boot failure due to code patching
95100d253fee powerpc/booke64: set RI in default MSR
9db489ed4971 drivers/virt/fsl_hypervisor.c: prevent integer overflow in ioctl
f518072d1ae1 drivers/virt/fsl_hypervisor.c: dereferencing error pointers in ioctl
7a22a4ea67b7 bonding: fix arp_validate toggling in active-backup mode
6e72e6897efe ipv4: Fix raw socket lookup for local traffic
6e36b31c1b07 vrf: sit mtu should not be updated when vrf netdev is the link
6044ab2a05f6 vlan: disable SIOCSHWTSTAMP in container
bf4d21eed0d7 packet: Fix error path in packet_init
1261f44db98c net: ucc_geth - fix Oops when changing number of buffers in the ring
24d2a86b8968 bridge: Fix error path for kobject_init_and_add()
b8bb7bc326f2 powerpc/64s: Include cpu header
27d9e822a716 USB: serial: fix unthrottle races
f2387d0c3467 USB: serial: use variable for status
6db8c0882912 x86/bugs: Change L1TF mitigation string to match upstream
71041afe26a3 x86/speculation/mds: Fix documentation typo
693eb3bdaf19 Documentation: Correct the possible MDS sysfs values
0f961ec59305 x86/mds: Add MDSUM variant to the MDS documentation
3092ad5c4f2e x86/speculation/mds: Add 'mitigations=' support for MDS
a50e2ca5757f x86/speculation: Support 'mitigations=' cmdline option
31a2c5f7a25b cpu/speculation: Add 'mitigations=' cmdline option
2b26dff34698 x86/speculation/mds: Print SMT vulnerable on MSBDS with mitigations off
0144cbc12474 x86/speculation/mds: Fix comment
e2896d6b1e48 x86/speculation/mds: Add SMT warning message
06deb655ae26 x86/speculation: Move arch_smt_update() call to after mitigation decisions
5b0f1f5b4f58 x86/cpu/bugs: Use __initconst for 'const' init data
48204fd98023 Documentation: Add MDS vulnerability documentation
e0e64cdc7fd9 Documentation: Move L1TF to separate directory
9fe26a407f0e x86/speculation/mds: Add mitigation mode VMWERV
3fb41b4e2d38 x86/speculation/mds: Add sysfs reporting for MDS
1e9a9ef67033 x86/speculation/l1tf: Document l1tf in sysfs
8c7398befdf1 x86/speculation/mds: Add mitigation control for MDS
d4c1e6cbbcdc x86/speculation/mds: Conditionally clear CPU buffers on idle entry
a41a2dee403d x86/speculation/mds: Clear CPU buffers on exit to user
7a6c2a6c4235 x86/speculation/mds: Add mds_clear_cpu_buffers()
f223c10cf176 x86/kvm: Expose X86_FEATURE_MD_CLEAR to guests
adef560d1ef8 x86/speculation/mds: Add BUG_MSBDS_ONLY
179adc415f94 x86/speculation/mds: Add basic bug infrastructure for MDS
8be7f1183d2f x86/speculation: Consolidate CPU whitelists
683f9fba8c27 x86/msr-index: Cleanup bit defines
6eb1dfb0e945 kvm: x86: Report STIBP on GET_SUPPORTED_CPUID
f8515b2d8c86 x86/speculation: Provide IBPB always command line options
867931a6cc51 x86/speculation: Add seccomp Spectre v2 user space protection mode
0ec9baa28b62 x86/speculation: Enable prctl mode for spectre_v2_user
ff99c966c627 x86/speculation: Add prctl() control for indirect branch speculation
bc8a006cb385 x86/speculation: Prevent stale SPEC_CTRL msr content
b784ff22d682 x86/speculation: Prepare arch_smt_update() for PRCTL mode
29652de33320 x86/speculation: Split out TIF update
e2dafdd0084b x86/speculation: Prepare for conditional IBPB in switch_mm()
708f3ed763fc x86/speculation: Avoid __switch_to_xtra() calls
2db6cf1eba01 x86/process: Consolidate and simplify switch_to_xtra() code
2959c3e36f65 x86/speculation: Prepare for per task indirect branch speculation control
a5e8a06268dc x86/speculation: Add command line control for indirect branch speculation
92bc99ff0724 x86/speculation: Unify conditional spectre v2 print functions
3d2149a49e7b x86/speculataion: Mark command line parser data __initdata
ad70092da835 x86/speculation: Mark string arrays const correctly
77aaa118c5d1 x86/speculation: Reorder the spec_v2 code
892d9881b437 x86/speculation: Rework SMT state change
1f562beba75c sched: Add sched_smt_active()
f576a78075ba x86/Kconfig: Select SCHED_SMT if SMP enabled
f68790685aa5 x86/speculation: Reorganize speculation control MSRs update
41ebb68d9a67 x86/speculation: Rename SSBD update functions
9ef693a75208 x86/speculation: Disable STIBP when enhanced IBRS is in use
6a598ce52f69 x86/speculation: Move STIPB/IBPB string conditionals out of cpu_show_common()
fb4a4fc139a5 x86/speculation: Remove unnecessary ret variable in cpu_show_common()
809e50eb21e5 x86/speculation: Clean up spectre_v2_parse_cmdline()
f97a530be08f x86/speculation: Update the TIF_SSBD comment
0440c2c5e2d2 x86/speculation: Propagate information about RSB filling mitigation to sysfs
dc23d0241b97 x86/speculation: Enable cross-hyperthread spectre v2 STIBP mitigation
4a215a1155ce x86/speculation: Apply IBPB more strictly to avoid cross-process data leak
122b3ad3a068 x86/mm: Use WRITE_ONCE() when setting PTEs
7c50deefa1e9 KVM: x86: SVM: Call x86_spec_ctrl_set_guest/host() with interrupts disabled
2422db18b660 x86/cpu: Sanitize FAM6_ATOM naming
2329f765b53a x86/microcode: Update the new microcode revision unconditionally
0ee359e14c08 x86/microcode: Make sure boot_cpu_data.microcode is up-to-date
12043f0eb5fd x86/speculation: Remove SPECTRE_V2_IBRS in enum spectre_v2_mitigation
9029b6908e1d x86/bugs: Fix the AMD SSBD usage of the SPEC_CTRL MSR
8d1385ea4c67 locking/atomics, asm-generic: Move some macros from <linux/bitops.h> to a new <linux/bits.h> file
76869c022795 x86/bugs: Switch the selection of mitigation from CPU vendor to CPU features
a9f354ad1c1d x86/bugs: Add AMD's SPEC_CTRL MSR usage
99bd3817b6d7 x86/bugs: Add AMD's variant of SSB_NO
2b8e34665e8f x86/speculation: Simplify the CPU bug detection logic
efcb85dd2644 x86/speculation: Support Enhanced IBRS on future CPUs
042c6aee6572 x86/cpufeatures: Hide AMD-specific speculation flags
dc7e3b052ab4 x86/MCE: Save microcode revision in machine check records
30c66b528e1f x86/microcode/intel: Check microcode revision before updating sibling threads
c2a357d9b429 bitops: avoid integer overflow in GENMASK(_ULL)
d7a711b64ff8 x86: stop exporting msr-index.h to userland
98cc1464cfd6 x86/microcode/intel: Add a helper which gives the microcode revision
5ec6421c21c6 locking/static_keys: Provide DECLARE and well as DEFINE macros
40f6c72df9d8 Don't jump to compute_result state from check_result state
07d35512e494 x86/vdso: Pass --eh-frame-hdr to the linker
9767260be0b4 cw1200: fix missing unlock on error in cw1200_hw_scan()
ccc2b0f8d4be gpu: ipu-v3: dp: fix CSC handling
795c76f4e50f selftests/net: correct the return value for run_netsocktests
83494cfb0d29 s390: ctcm: fix ctcm_new_device error return code
4c78631d884d ipvs: do not schedule icmp errors from tunnels
2b46b98576cb init: initialize jump labels before command line option parsing
a54c490cecd5 tools lib traceevent: Fix missing equality check for strcmp
5664d3298b3b KVM: x86: avoid misreporting level-triggered irqs as edge-triggered in tracing
b79c1ea82e3b s390/3270: fix lockdep false positive on view->lock
825c6401f9e9 s390/dasd: Fix capacity calculation for large volumes
905b8964c9d9 libnvdimm/btt: Fix a kmemdup failure check
3007ae4bbf26 HID: input: add mapping for keyboard Brightness Up/Down/Toggle keys
c15b4f9f4699 HID: input: add mapping for Expose/Overview key
45679938dc6f iio: adc: xilinx: fix potential use-after-free on remove
619c8933e4af platform/x86: sony-laptop: Fix unintentional fall-through
8ce5ae6912e3 netfilter: compat: initialize all fields in xt_init
a9bdfbd494da timer/debug: Change /proc/timer_stats from 0644 to 0600
e212945fe525 ASoC: Intel: avoid Oops if DMA setup fails
faf458605614 ipv6: fix a potential deadlock in do_ipv6_setsockopt()
dcb33fe3d9a6 UAS: fix alignment of scatter/gather segments
d016dc1bd29a Bluetooth: Align minimum encryption key size for LE and BR/EDR connections
dd150bcc93ff Bluetooth: hidp: fix buffer overflow
15a12bde0fd9 scsi: qla2xxx: Fix incorrect region-size setting in optrom SYSFS routines
88246eb7bf37 usb: dwc3: Fix default lpm_nyet_threshold value
1aec586c25ee genirq: Prevent use-after-free and work list corruption
2984aa6d4a78 iommu/amd: Set exclusion range correctly
4294ec58537d scsi: csiostor: fix missing data copy in csio_scsi_err_handler()
93beb0decfe2 perf/x86/intel: Fix handling of wakeup_events for multi-entry PEBS
5ea6b626b917 ASoC: tlv320aic32x4: Fix Common Pins
b7bbb5ce955b ASoC: cs4270: Set auto-increment bit for register writes
79132626f8c7 ASoC:soc-pcm:fix a codec fixup issue in TDM case
fe3f6511c9af scsi: libsas: fix a race condition when smp task timeout
0f83a55ca07e media: v4l2: i2c: ov7670: Fix PLL bypass register values
d96fc7729c44 x86/mce: Improve error message when kernel cannot recover, p2
08794d181ff6 selinux: never allow relabeling on context mounts
3bf16c452b91 Input: snvs_pwrkey - initialize necessary driver data before enabling IRQ
90b8ab9ee10f staging: iio: adt7316: fix the dac write calculation
7c4744e2c75c staging: iio: adt7316: fix the dac read calculation
a45018ff3c06 staging: iio: adt7316: allow adt751x to use internal vref for all dacs
55153b108922 usb: usbip: fix isoc packet num validation in get_pipe
3401512b7831 ARM: iop: don't use using 64-bit DMA masks
03fd6e162398 ARM: orion: don't use using 64-bit DMA masks
9fcbabe209a2 xsysace: Fix error handling in ace_setup
66c57ab148a0 hugetlbfs: fix memory leak for resv_map
550ce5b3b45b net: hns: Fix WARNING when remove HNS driver with SMMU enabled
c8d4b98eeed4 net: hns: Use NAPI_POLL_WEIGHT for hns driver
4af8444aff7c scsi: storvsc: Fix calculation of sub-channel count
4328fca13020 vfio/pci: use correct format characters
891c92860383 rtc: da9063: set uie_unsupported when relevant
02395682f19b debugfs: fix use-after-free on symlink traversal
90a015d4d782 jffs2: fix use-after-free on symlink traversal
cd43ccbfb5fb bonding: show full hw address in sysfs for slave entries
88020a14a0b7 igb: Fix WARN_ONCE on runtime suspend
6c24038d84a7 rtc: sh: Fix invalid alarm warning for non-enabled alarm
e9358b9a5db1 HID: debug: fix race condition with between rdesc_show() and device removal
1b2b6db7765e USB: core: Fix bug caused by duplicate interface PM usage counter
b384399a518c USB: core: Fix unterminated string returned by usb_string()
7a52b950902d USB: w1 ds2490: Fix bug caused by improper use of altsetting array
438b075fc77d USB: yurex: Fix protection fault after device removal
c6ae8a5a4396 packet: validate msg_namelen in send directly
aed15cc2ced6 bnxt_en: Improve multicast address setup logic.
c7a9d69b727a ipv6: invert flowlabel sharing check in process and user mode
82ae1a89b134 ipv6/flowlabel: wait rcu grace period before put_pid()
0fe65e4eac33 ipv4: ip_do_fragment: Preserve skb_iif during fragmentation
bdbc15205b51 ALSA: line6: use dynamic buffers
e1a5cdbf7cb3 vfio/type1: Limit DMA mappings per container
e0d9031feb2f kconfig/[mn]conf: handle backspace (^H) key
8c2bbe210936 libata: fix using DMA buffers on stack
4767c30a2bac scsi: zfcp: reduce flood of fcrscn1 trace records on multi-element RSCN
cd2bdca329c1 ceph: fix use-after-free on symlink traversal
4663cb7947dd usb: u132-hcd: fix resource leak
783552a9865c scsi: qla4xxx: fix a potential NULL pointer dereference
f18c946e6cf1 net: ethernet: ti: fix possible object reference leak
64206dd039fd net: ibm: fix possible object reference leak
ae35f101789b net: xilinx: fix possible object reference leak
c0d641aa264a net: ks8851: Set initial carrier state to down
f41b4fd83fef net: ks8851: Delay requesting IRQ until opened
195aac29efe3 net: ks8851: Reassert reset pin if chip ID check fails
36b1240d4e47 net: ks8851: Dequeue RX packets explicitly
1710b4ad56db ARM: dts: pfla02: increase phy reset duration
fd1f90b4fa83 usb: gadget: net2272: Fix net2272_dequeue()
61fb6fa9b32b usb: gadget: net2280: Fix net2280_dequeue()
4ff888ea38c1 usb: gadget: net2280: Fix overrun of OUT messages
b9cf1bc4e31e sc16is7xx: missing unregister/delete driver on error in sc16is7xx_init()
6e361910119b netfilter: bridge: set skb transport_header before entering NF_INET_PRE_ROUTING
d311479911c7 qlcnic: Avoid potential NULL pointer dereference
1652d1194af5 usbnet: ipheth: fix potential null pointer dereference in ipheth_carrier_set
4f2df9fd0769 usbnet: ipheth: prevent TX queue timeouts when device not ready
aa24636d3dc2 Documentation: Add nospectre_v1 parameter
c816ec25621b powerpc/fsl: Add FSL_PPC_BOOK3E as supported arch for nospectre_v2 boot arg
6a56ecdfd3b2 powerpc/fsl: Fixed warning: orphan section `__btb_flush_fixup'
1a26467578d8 powerpc/fsl: Sanitize the syscall table for NXP PowerPC 32 bit platforms
42b46e985c99 powerpc/fsl: Flush the branch predictor at each kernel entry (32 bit)
5bed4b351268 powerpc/fsl: Emulate SPRN_BUCSR register
4168b2e356bc powerpc/fsl: Flush branch predictor when entering KVM
ec206826323a powerpc/fsl: Enable runtime patching if nospectre_v2 boot arg is used
389fd9776f3e ipv4: set the tcp_min_rtt_wlen range from 0 to one day
8cab9c87ee0f net: stmmac: move stmmac_check_ether_addr() to driver probe
1990e41b2339 team: fix possible recursive locking when add slaves
510a733497d3 ipv4: add sanity checks in ipv4_link_failure()
f480eb03c88a Revert "block/loop: Use global lock for ioctl() operation."
f08db490b406 bpf: reject wrong sized filters earlier
0b7d9b8571ad tipc: check link name with right length in tipc_nl_compat_link_set
625634be3b8b tipc: check bearer name with right length in tipc_nl_compat_bearer_enable
cafee685fb48 netfilter: ebtables: CONFIG_COMPAT: drop a bogus WARN_ON
cec54a8e694c NFS: Forbid setting AF_INET6 to "struct sockaddr_in"->sin_family.
76c279c7b6f8 fs/proc/proc_sysctl.c: Fix a NULL pointer dereference
28bd672e7a9f intel_th: gth: Fix an off-by-one in output unassigning
20159939a8b4 slip: make slhc_free() silently accept an error pointer
2996e89c2d62 tipc: handle the err returned from cmd header function
9d688aa11077 powerpc/fsl: Fix the flush of branch predictor.
990c7be76516 powerpc/security: Fix spectre_v2 reporting
5f9678d9c8c7 powerpc/fsl: Update Spectre v2 reporting
0454f7b3282b powerpc/fsl: Flush the branch predictor at each kernel entry (64bit)
932e8acaa806 powerpc/fsl: Add nospectre_v2 command line argument
4cbfad23be50 powerpc/fsl: Fix spectre_v2 mitigations reporting
b76f9074d0f3 powerpc/fsl: Add macro to flush the branch predictor
526adfdf029e powerpc/fsl: Add infrastructure to fixup branch predictor flush
7fe905d0973e powerpc: Avoid code patching freed init sections
ee1a6e164cac powerpc/powernv: Query firmware for count cache flush settings
67fb764be590 powerpc/pseries: Query hypervisor for count cache flush settings
bda04af8692d powerpc/64s: Add support for software count cache flush
bfeafa01fa09 powerpc/64s: Add new security feature flags for count cache flush
a8d13b364862 powerpc/asm: Add a patch_site macro & helpers for patching instructions
0273c6d73a03 powerpc/fsl: Add barrier_nospec implementation for NXP PowerPC Book3E
b7f47c8f0f4c powerpc/64: Make meltdown reporting Book3S 64 specific
04a682df27c1 powerpc/64: Call setup_barrier_nospec() from setup_arch()
e7b3fb43b970 powerpc/64: Add CONFIG_PPC_BARRIER_NOSPEC
4fb0382d987e powerpc/64: Make stf barrier PPC_BOOK3S_64 specific.
58dbc8def949 powerpc/64: Disable the speculation barrier from the command line
d000015f6283 powerpc64s: Show ori31 availability in spectre_v1 sysfs file not v2
b6a4dce40cb7 powerpc/64s: Enhance the information in cpu_show_spectre_v1()
1110c3ad0b66 powerpc: Use barrier_nospec in copy_from_user()
2a90ebba2fcc powerpc/64: Use barrier_nospec in syscall entry
990ce72a3bab powerpc/64s: Enable barrier_nospec based on firmware settings
39e71d5ae83f powerpc/64s: Patch barrier_nospec in modules
083c37a1bb61 powerpc/64s: Add support for ori barrier_nospec patching
fde08a5d395e powerpc/64s: Add barrier_nospec
7b9f9ce1a7a0 powerpc/64s: Add support for a store forwarding barrier at kernel entry/exit
27296b7879d5 powerpc/64s: Fix section mismatch warnings from setup_rfi_flush()
8b1f9a4e2136 powerpc/pseries: Restore default security feature flags on setup
adde5de432d6 powerpc: Move default security feature flags
b3be4dcbd1a2 powerpc/pseries: Fix clearing of security feature flags
d9594148817b powerpc/64s: Wire up cpu_show_spectre_v2()
fe126d25bad7 powerpc/64s: Wire up cpu_show_spectre_v1()
5097bf81e845 powerpc/pseries: Use the security flags in pseries_setup_rfi_flush()
10f8cd737a03 powerpc/powernv: Use the security flags in pnv_setup_rfi_flush()
495c34251785 powerpc/64s: Enhance the information in cpu_show_meltdown()
dde12e9b3e86 powerpc/64s: Move cpu_show_meltdown()
3b99b3b3fb97 powerpc/powernv: Set or clear security feature flags
2b206ee648f3 powerpc/pseries: Set or clear security feature flags
d34ea7873f82 powerpc: Add security feature flags for Spectre/Meltdown
8249ee94a9ca powerpc/rfi-flush: Call setup_rfi_flush() after LPM migration
7777d9cb2c1c powerpc/pseries: Add new H_GET_CPU_CHARACTERISTICS flags
e5c8265abdbb powerpc/rfi-flush: Differentiate enabled and patched flush types
8b58add49fef powerpc/rfi-flush: Always enable fallback flush on pseries
22c697163e4d powerpc/rfi-flush: Make it possible to call setup_rfi_flush() again
d04664376129 powerpc/rfi-flush: Move the logic to avoid a redo into the debugfs code
f93ae3415cf7 powerpc/powernv: Support firmware disable of RFI flush
e1759aacdd16 powerpc/pseries: Support firmware disable of RFI flush
d9052a2ede31 powerpc/64s: Improve RFI L1-D cache flush fallback
13dc9b34c873 powerpc/xmon: Add RFI flush related fields to paca dump
80c305aeeb09 USB: Consolidate LPM checks to avoid enabling LPM twice
9dad11965ed2 USB: Add new USB LPM helpers
fad515213059 sunrpc: don't mark uninitialised items as VALID.
498e9066b480 nfsd: Don't release the callback slot unless it was actually held
b8d15c06cf0c ceph: fix ci->i_head_snapc leak
811fb30278b4 ceph: ensure d_name stability in ceph_dentry_hash()
2f14dae91560 sched/numa: Fix a possible divide-by-zero
10dbe2292758 trace: Fix preempt_enable_no_resched() abuse
15c2ac78cb73 MIPS: scall64-o32: Fix indirect syscall number load
fd49607468ba cifs: do not attempt cifs operation on smb2+ rename error
4c78eadb3489 KVM: fail KVM_SET_VCPU_EVENTS with invalid exception number
485d15db01ca kbuild: simplify ld-option implementation
cd1e9004ddd5 Merge "defconfig: msm8996: Enable PAN emulation"
a4b99d2c643c Merge "defconfig: msm8996: Disable DEVPORT"
b79e25fe5818 msm: camera : Lock Implementation for avoid race condition
ce469a70f3bc ANDROID: cuttlefish_defconfig: Disable DEVTMPFS
d5f7b0a5556b diag: Prevent out-of-bound access while processing dci transaction
cfef4f88308a diag: Prevent out-of-bound access while processing mask commands
c9fa4db90a83 pwm: pwm-qpnp: Fix the order of configuring PWM value
fe15f47306a1 ANDROID: Move from clang r349610 to r353983c.
8cb9bdaac97a Merge upstream-f2fs-stable-linux-4.4.y into android-4.4
592adc484920 drm/msm: ensure display driver probe completion
77c04577d922 Merge "msm: camera_v2: handle the error value returned during get clock"
5e144157195d icnss: Add check on msa region
6183ceb8d1e7 msm: camera_v2: handle the error value returned during get clock
779dfa61f7b1 msm: ipa_v2: Protect ipa default routing table
8b5d9f6f8eac ARM: dts: msm: add support for apq8096pro CDP
59dda5e0dcec ASoC: msm: Update codec name in HDMI dai link
0cba1d4c1422 f2fs: fix to avoid accessing xattr across the boundary
f32a4e2decb0 ARM: dts: msm: Enable HDMI audio support for 8996
c44c78fab1a2 ARM: dts: msm: Update avb flag and partition names for auto
ee588a7f2329 f2fs: fix to avoid potential race on sbi->unusable_block_count access/update
993543bcbad2 f2fs: add tracepoint for f2fs_filemap_fault()
b60ff4b3605c f2fs: introduce DATA_GENERIC_ENHANCE
43c33bc93b79 f2fs: fix to handle error in f2fs_disable_checkpoint()
9ca2000e9d76 f2fs: remove redundant check in f2fs_file_write_iter()
b6bb1574fce6 f2fs: fix to be aware of readonly device in write_checkpoint()
04139be9047a f2fs: fix to skip recovery on readonly device
25f68cbbdb86 f2fs: fix to consider multiple device for readonly check
a90ff12b2ff5 f2fs: relocate chksum_offset for large_nat_bitmap feature
ad199c5f600f f2fs: allow unfixed f2fs_checkpoint.checksum_offset
a3df88564441 f2fs: Replace spaces with tab
12a9d38a0b11 f2fs: insert space before the open parenthesis '('
e3057056de10 f2fs: allow address pointer number of dnode aligning to specified size
c351f529e220 f2fs: introduce f2fs_read_single_page() for cleanup
8ac217148510 f2fs: mark is_extension_exist() inline
2c8359eee2ad f2fs: fix to set FI_UPDATE_WRITE correctly
5f2085bab2e2 f2fs: fix to avoid panic in f2fs_inplace_write_data()
d6fe88aef4c1 f2fs: fix to do sanity check on valid block count of segment
1c3e295f67d0 f2fs: fix to do sanity check on valid node/block count
4ffbe8fee8a4 f2fs: fix to avoid panic in do_recover_data()
65f109d717d4 f2fs: fix to do sanity check on free nid
c60f9c6ced33 f2fs: fix to do checksum even if inode page is uptodate
9a080abdc30b f2fs: fix to avoid panic in f2fs_remove_inode_page()
c0bcbe425670 f2fs: fix to clear dirty inode in error path of f2fs_iget()
299dea1adf40 f2fs: remove new blank line of f2fs kernel message
9b4fc7359ca2 f2fs: fix wrong __is_meta_io() macro
02fb7afdd5f0 f2fs: fix to avoid panic in dec_valid_node_count()
5caebe607e13 f2fs: fix to avoid panic in dec_valid_block_count()
b5bc76046b10 f2fs: fix to use inline space only if inline_xattr is enable
9bc578bf83ee f2fs: fix to retrieve inline xattr space
0d7333632d79 f2fs: fix error path of recovery
b9973998d9df f2fs: fix to avoid deadloop in foreground GC
5047402dec0e f2fs: data: fix warning Using plain integer as NULL pointer
5bed19fbbba0 f2fs: add tracepoint for f2fs_file_write_iter()
7e37cc9d7161 f2fs: add comment for conditional compilation statement
00e77f15eb1d f2fs: fix potential recursive call when enabling data_flush
6b25d4ac2e7d f2fs: improve discard handling with multi-device volumes
c4c54093c71d f2fs: Reduce zoned block device memory usage
2c124ddd98a9 f2fs: Fix use of number of devices
8e638383c1bf msm: camera: jpegdma: Added missing lock for dqbuf and streamon
2bc83184b422 defconfig: Enable REGMAP_ALLOW_WRITE_DEBUGFS
81bbb1b91ed2 defconfig: msm8996: Enable radio configs
0b570560f091 radio: add Silabs FM radio support for msm8996
152bacdd85c4 ANDROID: Communicates LMK events to userland where they can be logged
dc0d6bda9e08 defconfig: msm8996: Disable DEVPORT
70d7ff1aa709 defconfig: msm8996: Disable EXT2 and EXT3 FS configs
339eab8aede0 defconfig: msm8996: Enable PAN emulation

Signed-off-by: Davide Garberi <dade.garberi@gmail.com>
Change-Id: Iac613f6970faeadc98d9ed40aae0d96042502ce4

10 files changed, 120 insertions, 27 deletions

diff --git a/include/linux/bitops.h b/include/linux/bitops.h
index defeaac0745f..e76d03f44c80 100644
--- a/include/linux/bitops.h
+++ b/include/linux/bitops.h
@@ -1,28 +1,9 @@
 #ifndef _LINUX_BITOPS_H
 #define _LINUX_BITOPS_H
 #include <asm/types.h>
+#include <linux/bits.h>
 
-#ifdef	__KERNEL__
-#define BIT(nr)			(1UL << (nr))
-#define BIT_ULL(nr)		(1ULL << (nr))
-#define BIT_MASK(nr)		(1UL << ((nr) % BITS_PER_LONG))
-#define BIT_WORD(nr)		((nr) / BITS_PER_LONG)
-#define BIT_ULL_MASK(nr)	(1ULL << ((nr) % BITS_PER_LONG_LONG))
-#define BIT_ULL_WORD(nr)	((nr) / BITS_PER_LONG_LONG)
-#define BITS_PER_BYTE		8
 #define BITS_TO_LONGS(nr)	DIV_ROUND_UP(nr, BITS_PER_BYTE * sizeof(long))
-#endif
-
-/*
- * Create a contiguous bitmask starting at bit position @l and ending at
- * position @h. For example
- * GENMASK_ULL(39, 21) gives us the 64bit vector 0x000000ffffe00000.
- */
-#define GENMASK(h, l) \
-	(((~0UL) << (l)) & (~0UL >> (BITS_PER_LONG - 1 - (h))))
-
-#define GENMASK_ULL(h, l) \
-	(((~0ULL) << (l)) & (~0ULL >> (BITS_PER_LONG_LONG - 1 - (h))))
 
 extern unsigned int __sw_hweight8(unsigned int w);
 extern unsigned int __sw_hweight16(unsigned int w);
diff --git a/include/linux/bits.h b/include/linux/bits.h
new file mode 100644
index 000000000000..2b7b532c1d51
--- /dev/null
+++ b/include/linux/bits.h
@@ -0,0 +1,26 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef __LINUX_BITS_H
+#define __LINUX_BITS_H
+#include <asm/bitsperlong.h>
+
+#define BIT(nr)			(1UL << (nr))
+#define BIT_ULL(nr)		(1ULL << (nr))
+#define BIT_MASK(nr)		(1UL << ((nr) % BITS_PER_LONG))
+#define BIT_WORD(nr)		((nr) / BITS_PER_LONG)
+#define BIT_ULL_MASK(nr)	(1ULL << ((nr) % BITS_PER_LONG_LONG))
+#define BIT_ULL_WORD(nr)	((nr) / BITS_PER_LONG_LONG)
+#define BITS_PER_BYTE		8
+
+/*
+ * Create a contiguous bitmask starting at bit position @l and ending at
+ * position @h. For example
+ * GENMASK_ULL(39, 21) gives us the 64bit vector 0x000000ffffe00000.
+ */
+#define GENMASK(h, l) \
+	(((~0UL) - (1UL << (l)) + 1) & (~0UL >> (BITS_PER_LONG - 1 - (h))))
+
+#define GENMASK_ULL(h, l) \
+	(((~0ULL) - (1ULL << (l)) + 1) & \
+	 (~0ULL >> (BITS_PER_LONG_LONG - 1 - (h))))
+
+#endif	/* __LINUX_BITS_H */
diff --git a/include/linux/cpu.h b/include/linux/cpu.h
index ec088f5729fb..960f2750bc42 100644
--- a/include/linux/cpu.h
+++ b/include/linux/cpu.h
@@ -63,6 +63,8 @@ extern ssize_t cpu_show_spec_store_bypass(struct device *dev,
 					  struct device_attribute *attr, char *buf);
 extern ssize_t cpu_show_l1tf(struct device *dev,
 			     struct device_attribute *attr, char *buf);
+extern ssize_t cpu_show_mds(struct device *dev,
+			    struct device_attribute *attr, char *buf);
 
 extern __printf(4, 5)
 struct device *cpu_device_create(struct device *parent, void *drvdata,
@@ -312,6 +314,23 @@ bool cpu_wait_death(unsigned int cpu, int seconds);
 bool cpu_report_death(void);
 #endif /* #ifdef CONFIG_HOTPLUG_CPU */
 
+/*
+ * These are used for a global "mitigations=" cmdline option for toggling
+ * optional CPU mitigations.
+ */
+enum cpu_mitigations {
+	CPU_MITIGATIONS_OFF,
+	CPU_MITIGATIONS_AUTO,
+};
+
+extern enum cpu_mitigations cpu_mitigations;
+
+/* mitigations=off */
+static inline bool cpu_mitigations_off(void)
+{
+	return cpu_mitigations == CPU_MITIGATIONS_OFF;
+}
+
 #define IDLE_START 1
 #define IDLE_END 2
 
diff --git a/include/linux/f2fs_fs.h b/include/linux/f2fs_fs.h
index b19433738690..de8f11461536 100644
--- a/include/linux/f2fs_fs.h
+++ b/include/linux/f2fs_fs.h
@@ -164,6 +164,10 @@ struct f2fs_checkpoint {
 	unsigned char sit_nat_version_bitmap[1];
 } __packed;
 
+#define CP_CHKSUM_OFFSET	4092	/* default chksum offset in checkpoint */
+#define CP_MIN_CHKSUM_OFFSET						\
+	(offsetof(struct f2fs_checkpoint, sit_nat_version_bitmap))
+
 /*
  * For orphan inode management
  */
@@ -198,11 +202,12 @@ struct f2fs_extent {
 					get_extra_isize(inode))
 #define DEF_NIDS_PER_INODE	5	/* Node IDs in an Inode */
 #define ADDRS_PER_INODE(inode)	addrs_per_inode(inode)
-#define ADDRS_PER_BLOCK		1018	/* Address Pointers in a Direct Block */
+#define DEF_ADDRS_PER_BLOCK	1018	/* Address Pointers in a Direct Block */
+#define ADDRS_PER_BLOCK(inode)	addrs_per_block(inode)
 #define NIDS_PER_BLOCK		1018	/* Node IDs in an Indirect Block */
 
 #define ADDRS_PER_PAGE(page, inode)	\
-	(IS_INODE(page) ? ADDRS_PER_INODE(inode) : ADDRS_PER_BLOCK)
+	(IS_INODE(page) ? ADDRS_PER_INODE(inode) : ADDRS_PER_BLOCK(inode))
 
 #define	NODE_DIR1_BLOCK		(DEF_ADDRS_PER_INODE + 1)
 #define	NODE_DIR2_BLOCK		(DEF_ADDRS_PER_INODE + 2)
@@ -267,7 +272,7 @@ struct f2fs_inode {
 } __packed;
 
 struct direct_node {
-	__le32 addr[ADDRS_PER_BLOCK];	/* array of data block address */
+	__le32 addr[DEF_ADDRS_PER_BLOCK];	/* array of data block address */
 } __packed;
 
 struct indirect_node {
diff --git a/include/linux/jump_label.h b/include/linux/jump_label.h
index 68904469fba1..2209eb0740b0 100644
--- a/include/linux/jump_label.h
+++ b/include/linux/jump_label.h
@@ -267,9 +267,15 @@ struct static_key_false {
 #define DEFINE_STATIC_KEY_TRUE(name)	\
 	struct static_key_true name = STATIC_KEY_TRUE_INIT
 
+#define DECLARE_STATIC_KEY_TRUE(name)	\
+	extern struct static_key_true name
+
 #define DEFINE_STATIC_KEY_FALSE(name)	\
 	struct static_key_false name = STATIC_KEY_FALSE_INIT
 
+#define DECLARE_STATIC_KEY_FALSE(name)	\
+	extern struct static_key_false name
+
 extern bool ____wrong_branch_error(void);
 
 #define static_key_enabled(x)							\
diff --git a/include/linux/ptrace.h b/include/linux/ptrace.h
index 81fdf4b8aba4..8b1e2bd46bb7 100644
--- a/include/linux/ptrace.h
+++ b/include/linux/ptrace.h
@@ -57,14 +57,17 @@ extern void exit_ptrace(struct task_struct *tracer, struct list_head *dead);
 #define PTRACE_MODE_READ	0x01
 #define PTRACE_MODE_ATTACH	0x02
 #define PTRACE_MODE_NOAUDIT	0x04
-#define PTRACE_MODE_FSCREDS 0x08
-#define PTRACE_MODE_REALCREDS 0x10
+#define PTRACE_MODE_FSCREDS	0x08
+#define PTRACE_MODE_REALCREDS	0x10
+#define PTRACE_MODE_SCHED	0x20
+#define PTRACE_MODE_IBPB	0x40
 
 /* shorthands for READ/ATTACH and FSCREDS/REALCREDS combinations */
 #define PTRACE_MODE_READ_FSCREDS (PTRACE_MODE_READ | PTRACE_MODE_FSCREDS)
 #define PTRACE_MODE_READ_REALCREDS (PTRACE_MODE_READ | PTRACE_MODE_REALCREDS)
 #define PTRACE_MODE_ATTACH_FSCREDS (PTRACE_MODE_ATTACH | PTRACE_MODE_FSCREDS)
 #define PTRACE_MODE_ATTACH_REALCREDS (PTRACE_MODE_ATTACH | PTRACE_MODE_REALCREDS)
+#define PTRACE_MODE_SPEC_IBPB (PTRACE_MODE_ATTACH_REALCREDS | PTRACE_MODE_IBPB)
 
 /**
  * ptrace_may_access - check whether the caller is permitted to access
@@ -82,6 +85,20 @@ extern void exit_ptrace(struct task_struct *tracer, struct list_head *dead);
  */
 extern bool ptrace_may_access(struct task_struct *task, unsigned int mode);
 
+/**
+ * ptrace_may_access - check whether the caller is permitted to access
+ * a target task.
+ * @task: target task
+ * @mode: selects type of access and caller credentials
+ *
+ * Returns true on success, false on denial.
+ *
+ * Similar to ptrace_may_access(). Only to be called from context switch
+ * code. Does not call into audit and the regular LSM hooks due to locking
+ * constraints.
+ */
+extern bool ptrace_may_access_sched(struct task_struct *task, unsigned int mode);
+
 static inline int ptrace_reparented(struct task_struct *child)
 {
 	return !same_thread_group(child->real_parent, child->parent);
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 7b1178df2ed1..4b0047a30b72 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -2469,6 +2469,8 @@ static inline void memalloc_noio_restore(unsigned int flags)
 #define PFA_SPREAD_SLAB  2      /* Spread some slab caches over cpuset */
 #define PFA_SPEC_SSB_DISABLE		4	/* Speculative Store Bypass disabled */
 #define PFA_SPEC_SSB_FORCE_DISABLE	5	/* Speculative Store Bypass force disabled*/
+#define PFA_SPEC_IB_DISABLE		6	/* Indirect branch speculation restricted */
+#define PFA_SPEC_IB_FORCE_DISABLE	7	/* Indirect branch speculation permanently restricted */
 
 
 #define TASK_PFA_TEST(name, func)					\
@@ -2499,6 +2501,13 @@ TASK_PFA_CLEAR(SPEC_SSB_DISABLE, spec_ssb_disable)
 TASK_PFA_TEST(SPEC_SSB_FORCE_DISABLE, spec_ssb_force_disable)
 TASK_PFA_SET(SPEC_SSB_FORCE_DISABLE, spec_ssb_force_disable)
 
+TASK_PFA_TEST(SPEC_IB_DISABLE, spec_ib_disable)
+TASK_PFA_SET(SPEC_IB_DISABLE, spec_ib_disable)
+TASK_PFA_CLEAR(SPEC_IB_DISABLE, spec_ib_disable)
+
+TASK_PFA_TEST(SPEC_IB_FORCE_DISABLE, spec_ib_force_disable)
+TASK_PFA_SET(SPEC_IB_FORCE_DISABLE, spec_ib_force_disable)
+
 /*
  * task->jobctl flags
  */
diff --git a/include/linux/sched/smt.h b/include/linux/sched/smt.h
new file mode 100644
index 000000000000..559ac4590593
--- /dev/null
+++ b/include/linux/sched/smt.h
@@ -0,0 +1,20 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef _LINUX_SCHED_SMT_H
+#define _LINUX_SCHED_SMT_H
+
+#include <linux/atomic.h>
+
+#ifdef CONFIG_SCHED_SMT
+extern atomic_t sched_smt_present;
+
+static __always_inline bool sched_smt_active(void)
+{
+	return atomic_read(&sched_smt_present);
+}
+#else
+static inline bool sched_smt_active(void) { return false; }
+#endif
+
+void arch_smt_update(void);
+
+#endif
diff --git a/include/linux/usb.h b/include/linux/usb.h
index e27df29a298e..eab41e3be816 100644
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -127,7 +127,6 @@ enum usb_interface_condition {
  * @dev: driver model's view of this device
  * @usb_dev: if an interface is bound to the USB major, this will point
  *	to the sysfs representation for that device.
- * @pm_usage_cnt: PM usage counter for this interface
  * @reset_ws: Used for scheduling resets from atomic context.
  * @resetting_device: USB core reset the device, so use alt setting 0 as
  *	current; needs bandwidth alloc after reset.
@@ -184,7 +183,6 @@ struct usb_interface {
 
 	struct device dev;		/* interface specific device info */
 	struct device *usb_dev;
-	atomic_t pm_usage_cnt;		/* usage counter for autosuspend */
 	struct work_struct reset_ws;	/* for resets in atomic context */
 };
 #define	to_usb_interface(d) container_of(d, struct usb_interface, dev)
diff --git a/include/linux/usb/phy.h b/include/linux/usb/phy.h
index d25125402fda..f066d65ac3dd 100644
--- a/include/linux/usb/phy.h
+++ b/include/linux/usb/phy.h
@@ -126,6 +126,9 @@ struct usb_phy {
 
 	/* reset the PHY clocks */
 	int	(*reset)(struct usb_phy *x);
+
+	/* return linestate with Idp_src (used for DCD with USB2 PHY) */
+	int (*dpdm_with_idp_src)(struct usb_phy *x);
 };
 
 /**
@@ -209,6 +212,15 @@ usb_phy_reset(struct usb_phy *x)
 	return 0;
 }
 
+static inline int
+usb_phy_dpdm_with_idp_src(struct usb_phy *x)
+{
+	if (x && x->dpdm_with_idp_src)
+		return x->dpdm_with_idp_src(x);
+
+	return 0;
+}
+
 /* for usb host and peripheral controller drivers */
 #if IS_ENABLED(CONFIG_USB_PHY)
 extern struct usb_phy *usb_get_phy(enum usb_phy_type type);