Commit Graph

979352 Commits

Author SHA1 Message Date
Kyle Tso
f4c6dc5b4e FROMGIT: usb: typec: tcpm: Ignore Vsafe0v in PR_SWAP_SNK_SRC_SOURCE_ON state
In PR_SWAP_SNK_SRC_SOURCE_ON state, Vsafe0v is expected as well so do
nothing here to avoid state machine going into SNK_UNATTACHED.

Fixes: 28b43d3d74 ("usb: typec: tcpm: Introduce vsafe0v for vbus")
Cc: stable <stable@vger.kernel.org>
Reviewed-by: Badhri Jagan Sridharan <badhri@google.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Acked-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Kyle Tso <kyletso@google.com>
Link: https://lore.kernel.org/r/20210615173206.1646477-1-kyletso@google.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit fed09e0bf9
 https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb-next)
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Iec2977b857bd6a743cc554349191c7871ae92be1
2021-06-18 10:14:52 +02:00
Badhri Jagan Sridharan
133443a393 FROMGIT: usb: typec: tcpci: Fix up sink disconnect thresholds for PD
"Table 4-3 VBUS Sink Characteristics" of "Type-C Cable and Connector
Specification" defines the disconnect voltage thresholds of various
configurations. This change fixes the disconnect threshold voltage
calculation based on vSinkPD_min and vSinkDisconnectPD as defined
by the table.

Fixes: e1a97bf80a ("usb: typec: tcpci: Implement Auto discharge disconnect callbacks")
Cc: stable <stable@vger.kernel.org>
Acked-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Badhri Jagan Sridharan <badhri@google.com>
Link: https://lore.kernel.org/r/20210615174323.1160132-1-badhri@google.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 4288debeaa
 https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb-next)
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Iefff860a879d5ae383272ca116ba6e34bbedc823
2021-06-18 10:14:52 +02:00
Maciej Żenczykowski
66ab983e19 ANDROID: minor fixups of xt_IDLETIMER support
Add missing newline termination to a bunch of pr_debug()/pr_err()

Test: builds, and kernel net tests passes
Bug: 183485987
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I53eccc88c383259bc7a71ea688f728a0908fa765
2021-06-17 16:12:37 +00:00
Greg Kroah-Hartman
71594e9899 Merge branch 'android12-5.10' into 'android13-5.10'
Catch up on lots of commits that only went into the 12 branch that also
need to be here in the 13 branch.

This consists of the following commits merged:

76081a5f72 FROMLIST: kbuild: mkcompile_h: consider timestamp if KBUILD_BUILD_TIMESTAMP is set
fbf19aeacc gki_config: Disable CONFIG_DEBUG_STACK_USAGE
b44e46bb04 FROMGIT: mm: improve mprotect(R|W) efficiency on pages referenced once
54e7412d4f FROMGIT: mm: slub: move sysfs slab alloc/free interfaces to debugfs
45d0c6c5aa ANDROID: gki - CONFIG_NET_SCH_FQ=y
79f44ef795 ANDROID: GKI: Kconfig.gki: Add GKI_HIDDEN_ETHERNET_CONFIGS
79258e28eb FROMLIST: media: Kconfig: Fix DVB_CORE can't be selected as module
0451e8af91 ANDROID: Update ABI and symbol list
1ac622485e Revert "net: usb: cdc_ncm: don't spew notifications"
9e08e97ec6 Merge 5.10.43 into android12-5.10
b9ae3287e3 ANDROID: Fips 140: move fips symbols entirely in own list
3871aa16fd ANDROID: core of xt_IDLETIMER send_nl_msg support
b4355a880a ANDROID: start to re-add xt_IDLETIMER send_nl_msg support
a11dacedd6 ANDROID: add fips140.ko symbols to module ABI
868be244bb ANDROID: inject correct HMAC digest into fips140.ko at build time
6be141eb36 ANDROID: crypto: fips140 - perform load time integrity check
0672a69424 FROMLIST: crypto: shash - stop comparing function pointers to avoid breaking CFI
254da9ba36 ANDROID: arm64: module: preserve RELA sections for FIPS140 integrity selfcheck
15f0fc91e1 ANDROID: arm64: simd: omit capability check in may_use_simd()
6772dcc141 ANDROID: kbuild: lto: permit the use of .a archives in LTO modules
ddea30c684 ANDROID: arm64: only permit certain alternatives in the FIPS140 module
9c556792b7 ANDROID: crypto: lib/aes - add vendor hooks for AES library routines
7a689ebc67 ANDROID: crypto: lib/sha256 - add vendor hook for sha256() routine
4190dbd6ad UPSTREAM: KVM: arm64: Mark the host stage-2 memory pools static
6288fa47f4 UPSTREAM: arm64: mm: don't use CON and BLK mapping if KFENCE is enabled
e44e1f38be UPSTREAM: x86/build: Fix location of '-plugin-opt=' flags
5df654d642 UPSTREAM: binder: Return EFAULT if we fail BINDER_ENABLE_ONEWAY_SPAM_DETECTION
2aee873ab2 UPSTREAM: usb: dwc3: imx8mp: fix error return code in dwc3_imx8mp_probe()
ff1eb3fcd0 UPSTREAM: usb: dwc3: core: Add missing GHWPARAMS9 doc
52ce94e8bf UPSTREAM: KVM: arm64: Fix error return code in init_hyp_mode()
67d005b0ac UPSTREAM: KVM: arm64: Support PREL/PLT relocs in EL2 code
c04f2026cf UPSTREAM: iommu/mediatek: Always enable the clk on resume
c46f002566 UPSTREAM: mm: page_alloc: ignore init_on_free=1 for debug_pagealloc=1
282faf9977 UPSTREAM: dt-bindings: iommu: mediatek: update mediatek,iommu.yaml references
db8e491a1b UPSTREAM: media: mtk: fix mtk-smi dependency
def7a8e7d7 UPSTREAM: software node: Allow node addition to already existing device
d0db984f3e UPSTREAM: coresight: etm-perf: Fix define build issue when built as module
3ddee7b2ee UPSTREAM: kbuild: lto: Merge module sections if and only if CONFIG_LTO_CLANG is enabled
94cf2b2d1d UPSTREAM: kunit: tool: Disable PAGE_POISONING under --alltests
a1cc08d515 UPSTREAM: gpiolib: Fix error return code in gpiolib_dev_init()
5f7ec0f4c3 UPSTREAM: memblock: fix section mismatch warning
96fd9e07c0 UPSTREAM: software node: Fix device_add_software_node()
4378c305d9 UPSTREAM: gpio: fix NULL-deref-on-deregistration regression
2fc5237198 BACKPORT: kbuild: fix UNUSED_KSYMS_WHITELIST for Clang LTO
f107d073ce UPSTREAM: kbuild: lto: add _mcount to list of used symbols
9bf26f0ace UPSTREAM: arm64: Add missing ISB after invalidating TLB in enter_vhe
b1843022a9 UPSTREAM: kbuild: Move .thinlto-cache removal to 'make clean'
4150d73816 UPSTREAM: parisc: select FTRACE_MCOUNT_USE_PATCHABLE_FUNCTION_ENTRY
e11b323bca UPSTREAM: kbuild: prevent CC_FLAGS_LTO self-bloating on recursive rebuilds
631b4dba04 UPSTREAM: regulator: qcom-rpmh: fix build after QCOM_COMMAND_DB is tristate
4e0d16b049 UPSTREAM: dma-buf: cma_heap: Include linux/vmalloc.h to fix build failures on MIPS
4fef0d39b8 UPSTREAM: signal/parisc: Remove parisc specific definition of __ARCH_UAPI_SA_FLAGS
259e0a28b9 UPSTREAM: nl80211: fix kernel-doc warning in the new SAE attribute
8cc6bf3aaf ANDROID: abi_gki_aarch64_qcom: Add cpuidle_psci and gic_resume symbols
5fd82d3115 ANDROID: gic-v3: Export gic_resume() for vendor GIC enhancements
fb49b843af ANDROID: cpuidle-psci: Add vendor hook for cpuidle psci enter and exit
6227516eed FROMGIT: usb: typec: mux: Fix copy-paste mistake in typec_mux_match
623c68fc85 FROMGIT: usb: typec: ucsi: Clear PPM capability data in ucsi_init() error path
a685bf3fce ANDROID: export cpuset_cpus_allowed()for GKI purpose.
12be942aad ANDROID: GKI: Update abi_gki_aarch64_qcom list for shmem reclaim
4373261be0 ANDROID: tracing: Add generic flag for register tracing disable
c9b8fa644f ANDROID: user: Add vendor hook to user for GKI purpose
9975da5f43 ANDROID: mm: allow fast reclaim of shmem pages
13af062abf ANDROID: vendor_hooks: Export the tracepoints sched_stat_sleep and sched_waking to let module probe them
d7f8a548b8 FROMLIST: remoteproc: use freezable workqueue for crash notifications
06229c49eb UPSTREAM: erofs: support adjust lz4 history window size
0a24d25f08 UPSTREAM: erofs: use sync decompression for atomic contexts only
0ca4eafb39 UPSTREAM: erofs: use workqueue decompression for atomic contexts only
5a44e4bc13 UPSTREAM: erofs: avoid memory allocation failure during rolling decompression
4ae1c8a4d0 UPSTREAM: erofs: force inplace I/O under low memory scenario
46a00756cb UPSTREAM: erofs: insert to managed cache after adding to pcl
b1c757466f UPSTREAM: erofs: get rid of magical Z_EROFS_MAPPING_STAGING
567f25f92d ANDROID: abi_gki_aarch64_qcom: Add thermal_cooling_device_register
027f748df3 ANDROID: ABI: Update allowed list for QCOM
87378c6fbc FROMGIT: usb: typec: tcpm: Do not finish VDM AMS for retrying Responses
72133c19f5 FROMGIT: usb: fix various gadget panics on 10gbps cabling
912ecda3a6 FROMGIT: usb: fix various gadgets null ptr deref on 10gbps cabling.
9953e42b79 FROMGIT: usb: f_ncm: only first packet of aggregate needs to start timer
0b198ecef5 FROMGIT: USB: f_ncm: ncm_bitrate (speed) is unsigned
569693970c ANDROID: gki - CONFIG_NET_SCH_{CODEL,FQ_CODEL,SFQ}=y
ebab44be93 ANDROID: gki - enable CONFIG_USB_CONFIGFS_{EEM,ECM}=y
0dd4d6b58c ANDROID: gki - enable CONFIG_USB_NET_CDC_EEM=y
57743c387e ANDROID: gki - enable CONFIG_USB_RTL8150=y
2699fa478d ANDROID: mm: vmscan: support equal reclaim for anon and file pages
4a819fbf90 ANDROID: qcom: Add more neighbor and dev related symbols
5267b2b574 ANDROID: GKI: Update abi_gki_aarch64_qcom for process killed symbol
813d6c9121 ANDROID: mm/memory_hotplug: Relax remove_memory_subsection error checking
d98a1df787 ANDROID: usb: typec: tcpm: Fixup the wait time for SNK_DISCOVERY
bb6f011afc FROMGIT: usb: typec: tcpm: Fix misuses of AMS invocation
1139005f05 ANDROID: Update the ABI representation
0ba59d42cb ANDROID: Update the generic symbol list
2a1bc2387d ANDROID: abi_gki_aarch64_qcom: Add symbols for 32bit execve
3f5e8b830c ANDROID: sched: create trace points for 32bit execve
79cb255c79 BACKPORT: FROMGIT: mm: arch: remove indirection level in alloc_zeroed_user_highpage_movable()
5083a1ca9d UPSTREAM: arm64: kasan: Set TCR_EL1.TBID1 when KASAN_HW_TAGS is enabled
a1580311c3 ANDROID: freezer: Add vendor hook to freezer for GKI purpose.
00dc4c64e6 ANDROID: kernel: Fix passing NULL to __pa_symbol()
27c285003d ANDROID: sched: Add vendor hook to select ilb cpu
5ed6c99c8f ANDROID: GKI: enable CONFIG_EROFS_FS=y
2d5c7aedc0 FROMGIT: dt-bindings: connector: Replace BIT macro with generic bit ops
505d41dcf1 FROMGIT: usb: dwc3: debugfs: Add and remove endpoint dirs dynamically
4c323ffd1c FROMGIT: dt-bindings: connector: Add PD rev 2.0 VDO definition
bbdac2c2ad FROMGIT: usb: typec: tcpm: Correct the responses in SVDM Version 2.0 DFP
22116da321 FROMGIT: Revert "usb: dwc3: core: Add shutdown callback for dwc3"
4fa67303ce Merge remote-tracking branch 'aosp/upstream-f2fs-stable-linux-5.10.y' into android12-5.10
5cf77864a3 ANDROID: arm scmi: add vendor hook to adjust the rx timeout.
89e44fb838 FROMGIT: userfaultfd: fix UFFDIO_CONTINUE ioctl request definition
72863addaa FROMGIT: userfaultfd/selftests: exercise minor fault handling shmem support
c2c081d009 BACKPORT: FROMGIT: userfaultfd/selftests: reinitialize test context in each test
b96a58e012 FROMGIT: userfaultfd/selftests: create alias mappings in the shmem test
9f837b909a FROMGIT: userfaultfd/selftests: use memfd_create for shmem test type
0b161cf6fc FROMGIT: userfaultfd/shmem: modify shmem_mfill_atomic_pte to use install_pte()
6a41f38998 FROMGIT: userfaultfd/shmem: advertise shmem minor fault support
81231b63ad FROMGIT: userfaultfd/shmem: support UFFDIO_CONTINUE for shmem
0c959cd889 BACKPORT: FROMGIT: userfaultfd/shmem: support minor fault registration for shmem
5f6dc07839 BACKPORT: FROMGIT: userfaultfd/shmem: combine shmem_{mcopy_atomic,mfill_zeropage}_pte
84330a5f50 Revert "BACKPORT: FROMGIT: userfaultfd: support minor fault handling for shmem"
13e14ca0e0 Revert "FROMGIT: userfaultfd/selftests: use memfd_create for shmem test type"
72a3f935ad Revert "FROMGIT: userfaultfd/selftests: create alias mappings in the shmem test"
8f6445acee Revert "BACKPORT: FROMGIT: userfaultfd/selftests: reinitialize test context in each test"
442b6e0704 Revert "FROMGIT: userfaultfd/selftests: exercise minor fault handling shmem support"
21a8683a8b Revert "FROMLIST: userfaultfd/shmem: fix minor fault page leak"
f57e3e5112 ANDROID: GKI: 6/4/2021 KMI update
f1a161b019 ANDROID: media: v4l2-core: extend the v4l2 format to support request
bf769b7216 ANDROID: vendor_hooks: add hook and OEM data for slab shrink
0b76ef69f6 ANDROID: sched: Add oem data in struct rq
f88eb0d245 ANDROID: android: Add nr_swap_pages to debug_symbols driver
9b5c870516 ANDROID: GKI: Enable CONFIG_PCIEAER for arm64 andx86_64
186313055b UPSTREAM: media: docs: Document CLL and Mastering display colorimetry controls
43461c878a UPSTREAM: media: v4l: Add HDR10 static metadata controls
683232ea4c UPSTREAM: media: uapi: Move the H264 stateless control types out of staging
372b24bad2 ANDROID: GKI: Add OEM data to mutex/rwsem
b3df6eb195 FROMGIT: usb: typec: tcpci: Make symbol 'tcpci_apply_rc' static
29be10211c FROMGIT: usb: typec: tcpci: Implement callback for apply_rc
750135f7ae FROMGIT: usb: typec: tcpm: Move TCPC to APPLY_RC state during PR_SWAP
a7d161dc5a ANDROID: GKI: device.h: add rcu_head back to struct device_link
60ea20ed1e FROMGIT: drivers: base: Reduce device link removal code duplication
cead4664c2 FROMGIT: drivers: base: Fix device link removal
fb57fa3d60 UPSTREAM: scsi: ufs-mediatek: Keep VCC always-on for specific devices
caa3c2bab0 UPSTREAM: scsi: ufs: Allow regulators being always-on
4ac5f3e178 UPSTREAM: scsi: ufs-mediatek: Use correct path to fix compile error
1898121800 UPSTREAM: scsi: ufs-mediatek: Introduce event_notify implementation
c88e6599d2 BACKPORT: scsi: ufs: Introduce event_notify variant function
f92f904d55 Revert "Revert "clocksource/drivers/timer-ti-dm: Handle dra7 timer wrap errata i940""
e86d688e51 Revert "Revert "PM: runtime: Fix unpaired parent child_count for force_resume""
df50ab971a Revert "Revert "kyber: fix out of bounds access when preempted""
a993cac61a Revert "Revert "usb: typec: ucsi: Retrieve all the PDOs instead of just the first 4""
556758235b Revert "Revert "mm: fix struct page layout on 32-bit systems""
e1611d8751 ANDROID: GKI: Enlarge OEM data reserved in task_struct
474a726efd ANDROID: GKI: add OEM data in cma struct
ab20ac9696 FROMGIT: scsi: ufs: Remove redundant checks of !hba in suspend/resume callbacks
523a4fd3f4 FROMGIT: scsi: ufs: Minor adjustments to error handling
8fbb826868 BACKPORT: FROMGIT: scsi: ufs: Clean up and refactor clk-scaling feature
099309ec7b FROMGIT: scsi: ufs: Remove redundant null checking of devfreq instance
6440a2c00d FROMGIT: scsi: ufs: Refactor cancelling clkscaling works
67eb703be2 FROMGIT: scsi: ufs: Give clk scaling min gear a value
0226db1f3a BACKPORT: FROMGIT: scsi: ufs: Refactor ufshcd_init/exit_clk_scaling/gating()
5ee06e06fb BACKPORT: FROMGIT: scsi: ufs: Protect some contexts from unexpected clock scaling
e0d506a786 FROMGIT: scsi: ufs: Stop hardcoding the scale down gear
b9a049ac4e FROMGIT: Revert "Make sure clk scaling happens only when HBA is runtime ACTIVE"
3a3b24ef29 BACKPORT: FROMGIT: scsi: ufs: Protect PM ops and err_handler from user access through sysfs
47149e58f4 ANDROID: Update the ABI xml and symbol list
18eae90751 FROMGIT: timer_list: Print name of per-cpu wakeup device
41b08205cb FROMGIT: tick/broadcast: Program wakeup timer when entering idle if required
130cd0ecfa FROMGIT: tick/broadcast: Prefer per-cpu oneshot wakeup timers to broadcast
4b3ac410bc FROMGIT: tick/broadcast: Split __tick_broadcast_oneshot_control() into a helper
fbcfac4490 FROMGIT: tick/broadcast: Drop unneeded CONFIG_GENERIC_CLOCKEVENTS_BROADCAST guard
5621e45f70 FROMGIT: usb: gadget: f_fs: Ensure io_completion_wq is idle during unbind
7b163b6295 FROMGIT: usb: typec: tcpm: cancel send discover hrtimer when unregister tcpm port
f793ff4b81 FROMGIT: usb: typec: tcpm: cancel frs hrtimer when unregister tcpm port
693c200239 FROMGIT: usb: typec: tcpm: cancel vdm and state machine hrtimer when unregister tcpm port
e4046d6ecc FROMGIT: usb: typec: tcpm: Properly handle Alert and Status Messages
e3e4ee0e9f ANDROID: usb: export tracepoint for dwc3_complete_trb
da4b3a9637 ANDROID: GKI: Request enable some kernel configs for background speed limit function
016d3f7b69 ANDROID: vendor_hooks: Export the tracepoints task_rename
f2d87eb3a0 Revert "Revert "ANDROID: usb: dwc3: gadget: don't cancel the started requests""
3bcdb496f4 ANDROID: signal: Add vendor hook for memory reaping
3f491d10dc Revert "ANDROID: mm: oom_kill: reap memory of a task that receives SIGKILL"
4794cb419d FROMGIT: kfence: unconditionally use unbound work queue
cdd895c318 FROMLIST: bootconfig: Share the checksum function with tools
88fa7f8bf0 FROMLIST: docs: bootconfig: Update for mixing value and subkeys
0b3bf71fa3 FROMLIST: tools/bootconfig: Support mixed value and subkey test cases
a504731003 FROMLIST: bootconfig: Support mixing a value and subkeys under a key
7559923b1a FROMLIST: bootconfig: Change array value to use child node
d5554e5096 FROMLIST: tools/bootconfig: Fix a build error accroding to undefined fallthrough
4c1097df5d ANDROID: Add an extra wake flag for android vendor use
28e408cd4c Revert "drivers: base: Fix device link removal"
c5d480cd47 Merge 5.10.42 into android12-5.10
4a85b01172 Revert "FROMLIST: Makefile: add -fuse-ld=lld to KBUILD_HOSTLDFLAGS when LLVM=1"
247a0be702 Revert "ANDROID: Makefile: add compiler-rt dependency explicitly"
45bd3ff939 FROMLIST: crypto: arm64/aes-ce - stop using SIMD helper for skciphers
2dabae8b98 FROMLIST: crypto: arm64/aes-neonbs - stop using SIMD helper for skciphers
71b39cf2e5 ANDROID: cgroup/cpuset: Do not access task_cs(p) outside of RCU
1099a4407d ANDROID: dma-heap: Let system heap report total pool size
196f1975a8 ANDROID: sched: Gate sched_stat tracepoint exports on CONFIG_SCHEDSTATS
4a9c2f05e4 ANDROID: GKI: Update abi_gki_aarch64_qcom list
a4fbf60f6e ANDROID: vmlinux.lds.h: Keep .eh_frame with CFI
bcfe28b62f ANDROID: vendor_hooks: Add vendor hook for tcpm logs
2e2fd329bb UPSTREAM: usb: pd: Set PD_T_SINK_WAIT_CAP to 310ms
b4c4426985 UPSTREAM: usb: dwc3: gadget: Disable gadget IRQ during pullup disable
7a9089951e FROMLIST: sched: Defer wakeup in ttwu() for unschedulable frozen tasks
3128f5e30c FROMLIST: freezer: Add frozen_or_skipped() helper function
7b04b63e1c Revert "ANDROID: vmlinux.lds.h: Define SANITIZER_DISCARDS with CONFIG_CFI_CLANG"
a6bb1af39d ANDROID: vendor_hooks: Export the tracepoints sched_stat_iowait, sched_stat_blocked, sched_stat_wait to let modules probe them
db81ae3c3e FROMGIT: kasan: speed up mte_set_mem_tag_range
3983753280 ANDROID: vendor_hooks: Add hooks for cpufreq_acct_update_power
7a36600f99 ANDROID: GKI: add symbol list file for xiaomi
6f33bce13a ANDROID: usb: export tracepoint for usb gadget connect/disconnect
0c811ab6f7 ANDROID: usb: add EXPORT_TRACE_SYMBOL to export tracepoint
fe2ecaf37f ANDROID: usb: add EXPORT_TRACE_SYMBOL to export tracepoint
4d5d751670 UPSTREAM: usb: core: reduce power-on-good delay time of root hub
2c6791b32f UPSTREAM: fuse: fix matching of FUSE_DEV_IOC_CLONE command
5e424f8596 ANDROID: fuse/passthrough: API V2 with __u32 open argument
b6996d317c UPSTREAM: usb: typec: ucsi: Clear pending after acking connector change
37af541faf UPSTREAM: xhci: Fix 5.12 regression of missing xHC cache clearing command after a Stall
fb808d7c18 UPSTREAM: xhci: fix giving back URB with incorrect status regression in 5.12
12b1e5746c Merge 5.10.41 into android12-5.10
22bc7e38f1 BACKPORT: FROMGIT: scsi: ufs: Fix a possible NULL pointer issue
a0b04503a2 FROMGIT: scsi: ufs: Replace sprintf and snprintf with sysfs_emit
24455210fa FROMGIT: usb: typec: tcpm: Refactor logic to enable/disable auto vbus dicharge
ee87839030 FROMGIT: usb: typec: tcpm: Fix up PR_SWAP when vsafe0v is signalled
cadbca1c5e ANDROID: vendor_hooks: Add a hook for task tagging
4968ab31d1 Merge 5.10.40 into android12-5.10
9f8cf79e74 ANDROID: Update virtual platform symbol list
347bb119f5 ANDROID: dm-user: Fix build warnings
77d89f6d91 ANDROID: abi_gki_aarch64_qcom: Add devfreq_get_devfreq_by_node symbol
629a82a0f3 ANDROID: abi_gki_aarch64_mtk: Remove execute permissions
fbdf9cd38a FROMLIST: mm: page_alloc: dump migrate-failed pages only at -EBUSY
8c944335a3 ANDROID: Fix access invalid addr because it is not initialized
3134ed20c7 f2fs: introduce FI_COMPRESS_RELEASED instead of using IMMUTABLE bit
e79067da34 f2fs: compress: remove unneeded preallocation
42bbf0bcc2 f2fs: avoid attaching SB_ACTIVE flag during mount/remount
df59b5b285 f2fs: atgc: export entries for better tunability via sysfs
b6202381e2 f2fs: compress: fix to disallow temp extension
c3e569d5b8 f2fs: let's allow compression for mmap files
6662ac477e f2fs: add MODULE_SOFTDEP to ensure crc32 is included in the initramfs
c23597effb f2fs: return success if there is no work to do
5a18a6da18 UPSTREAM: kasan: slab: always reset the tag in get_freepointer_safe()
df15808ad3 ANDROID: abi_gki_aarch64_qcom: Add topology update symbols
9d80dbe0a3 ANDROID: dm-user: Fail the IO if there is no daemon
78a9cd650a ANDROID: add initial symbol list for mtk
4b280e66ee ANDROID: fix a warning due to type mismatch in pr_warn
2f056f11e8 ANDROID: sched: fix race with CPU hot-unplug when overriding affinity
b6cab5d17d ANDROID: GKI: Enable CONFIG_IOMMU_IO_PGTABLE_ARMV7S
5212e0235f ANDROID: abi_gki_aarch64_qcom: Add kthread cgroup migration rvh symbol
80fef39de7 ANDROID: usb: gadget: Resolve NULL pointer dereference in composite_disconnect
2ea27b7efa ANDROID: GKI: Kconfig.gki: enable CONFIG_HMM_MIRROR with HIDDEN GPU
3a71ca1496 ANDROID: mm: page_pinner: skip marking failure on freeable pages
0249af9c0e ANDROID: mm: page_alloc: skip dump pages for freeable page
72488b3be4 ANDROID: mm, oom: add vendor hook to prevent oom panic
83aa0320cf FROMLIST: kthread: Fix kthread_mod_delayed_work vs kthread_cancel_delayed_work_sync race
844b79385a f2fs: compress: clean up parameter of __f2fs_cluster_blocks()
11297f9ea4 f2fs: compress: remove unneeded f2fs_put_dnode()
bb5f20d10c f2fs: atgc: fix to set default age threshold
b0d1189801 f2fs: Prevent swap file in LFS mode
f69aba5779 f2fs: fix to avoid racing on fsync_entry_slab by multi filesystem instances
bdc14e1a49 f2fs: restructure f2fs page.private layout
e7eb6b5377 f2fs: add cp_error check in f2fs_write_compressed_pages
1a200c451e f2fs: compress: rename __cluster_may_compress
3b14b6a653 FROMGIT: usb: typec: tcpm: Respond Not_Supported if no snk_vdo
5b94901e9e FROMGIT: usb: typec: tcpm: Properly interrupt VDM AMS
d79aca773d FROMGIT: usb: typec: tcpm: Use LE to CPU conversion when accessing msg->header
855f802610 Merge 5.10.39 into android12-5.10
762674c166 UPSTREAM: swiotlb: Fix the type of index
26a8c2ab13 ANDROID: Don't add image to all target with KBUILD_MIXED_TREE
1592e43590 ANDROID: I3C: Enable I3C core framework
211fb51c3b ANDROID: GKI: Update abi_gki_aarch64_qcom for hung task detect
14fbfc9c0e ANDROID: GKI: 5/21 KMI update
3a173ef887 FROMGIT: blk-mq: clearing flush request reference in tags->rqs[]
72018550d7 FROMGIT: blk-mq: clear stale request in tags->rq[] before freeing one request pool
c944b0c934 FROMGIT: blk-mq: grab rq->refcount before calling ->fn in blk_mq_tagset_busy_iter
0270bff881 Revert "ANDROID: GKI: Enable CONFIG_KUNIT"
ad14489b58 BACKPORT: block: Remove queue_limits.bio_max_bytes
c141d9773b FROMGIT: kasan: use dump_stack_lvl(KERN_ERR) to print stacks
53efd89f41 FROMGIT: fix for "printk: introduce dump_stack_lvl()"
359a038bbf FROMGIT: printk: introduce dump_stack_lvl()
0aa48437bf UPSTREAM: arm64: mte: Remove unused mte_assign_mem_tag_range()
63990c63c3 UPSTREAM: arm64: mte: make the per-task SCTLR_EL1 field usable elsewhere
8bc6337823 ANDROID: vendor_hooks: add hooks for slab memory leak debugging
70094f39c7 Revert "Revert "ANDROID: GKI: Change UCLAMP_BUCKETS_COUNT to 20""
17f9730086 ANDROID: GKI: Disable CONFIG_ZONE_DMA on arm64
065b3eabbd ANDROID: abi_gki_aarch64_qcom: Add *gic_v3_set_affinity trace syms
e80bcd4627 ANDROID: mmc: Add vendor hooks
3bd9ad7eb4 ANDROID: gic-v3: Change GIC v3 vendor hook to restricted
0dc97b664f ANDROID: GKI: enable hidden configs for DMA
6f3a72c462 ANDROID: GKI: remove kernel_read from abi symbol list
51dc321c7d Revert "Revert "mmc: block: Issue a cache flush only when it's enabled""
e606ad4aae Revert "ANDROID: GKI: restore a part of "struct mmc_host""
71a3aa889d Revert "Revert "media: v4l2-ctrls: fix reference to freed memory""
4cef9277ba Revert "Revert "sched,fair: Alternative sched_slice()""
63524ab60a FROMGIT: usb: typec: tcpm: Send DISCOVER_IDENTITY from dedicated work
60b53937ab FROMGIT: usb: typec: ucsi: Retrieve all the PDOs instead of just the first 4
10823e5b1e Revert "Revert "nvme-pci: set min_align_mask""
c53986ee8b Revert "Revert "swiotlb: respect min_align_mask""
a4094253bf Revert "Revert "swiotlb: don't modify orig_addr in swiotlb_tbl_sync_single""
9bd37c7924 Revert "Revert "swiotlb: refactor swiotlb_tbl_map_single""
8ebef45db5 Revert "Revert "swiotlb: clean up swiotlb_tbl_unmap_single""
2893baee79 Revert "Revert "swiotlb: factor out a nr_slots helper""
7b5e000065 Revert "Revert "swiotlb: factor out an io_tlb_offset helper""
fb0759a0d9 Revert "Revert "swiotlb: add a IO_TLB_SIZE define""
20fa297001 Revert "Revert "driver core: add a min_align_mask field to struct device_dma_parameters""
4d55905007 Revert "Revert "capabilities: require CAP_SETFCAP to map uid 0""
b73471e4e7 Revert "ANDROID: usb: typec: ucsi: Ensure bounds check when accessing src_pdos"
167612c1d4 ANDROID: Fix compilation error with huge_pmd_share()
f2f8d7326a UPSTREAM: mm: memblock: add more debug logs
a46e3fa139 UPSTREAM: mm: memblock: drop __init from memblock functions to make it inline
c8df669b7c ANDROID: modpost: Check for KBUILD_MIXED_TREE for Modules.symvers
17b9c24b25 ANDROID: hung_task: Add vendor hook for hung task detect
1b6f2f6e29 ANDROID: vendor_hooks: add hook to balance_dirty_pages()
dc5241048f ANDROID: vendor_hooks: Add hooks for reducing virtual address fragmentation
f150653471 ANDROID: abi_gki_aarch64_qcom: Add aes_encrypt/aes_expandkey
15acc8fac6 ANDROID: iommu: Add vendor hook for iova allocation and free tracking
9b6836900e ANDROID: iommu/io-pgtable-arm: Fix unmapping loop in __arm_lpae_unmap()
bb0eadd830 ANDROID: kernel: Fix debug_kinfo warning message
c34cd7750e Revert "mm: fix struct page layout on 32-bit systems"
4940c943b4 Revert "usb: typec: ucsi: Retrieve all the PDOs instead of just the first 4"
59870a78d4 Revert "kyber: fix out of bounds access when preempted"
6120544b9b Revert "PM: runtime: Fix unpaired parent child_count for force_resume"
cb23d3ef63 Revert "clocksource/drivers/timer-ti-dm: Handle dra7 timer wrap errata i940"
76002c201f Merge 5.10.38 into android12-5.10
4f99801693 ANDROID: ABI: Update allowed list for QCOM
f0fb442d31 ANDROID: Update the ABI xml
86eb213d08 ANDROID: Update the generic symbol list
8848be1eb3 ANDROID: Update the generic symbol list
ebe59c0c1a ANDROID: Update the generic symbol list
5330d613ad ANDROID: abi_gki_aarch64_qcom: Add missing symbols for i3c
394f893451 ANDROID: dm-user: Drop additional reference
560fdb20e4 FROMGIT: scsi: ufs: ufs-mediatek: Fix power down spec violation
b5b3246504 UPSTREAM: scsi: ufs-mediatek: Support option to disable auto-hibern8
12386e9df6 UPSTREAM: scsi: ufs-mediatek: Decouple features from platform bindings
78a43fa169 BACKPORT: scsi: ufs-mediatek: Support VA09 regulator operations
d711e7960c UPSTREAM: scsi: ufs: Add retry flow for failed HBA enabling
f72ddd6f7c UPSTREAM: module: unexport find_module and module_mutex
58980df739 FROMLIST: scsi: ufs: Increase the usable queue depth
8b1ed7526f ANDROID: abi_gki_aarch64_qcom: Add vmemdup_user
2bb462a3af ANDROID: cgroup: add vendor hook to cgroup .attach()
fe24b7f8cd ANDROID: gki_defconfig: Enable HID_BETOP_FF JOYSTICK_XPAD_FF and JOYSTICK_XPAD_LEDS
64d5c84867 ANDROID: abi_gki_aarch64_qcom: Add devm_rproc_* APIs
b6e60f0673 ANDROID: Incremental fs: Add uid to INCFS_IOC_GET_LAST_READ_ERROR
25c3b9e0fe ANDROID: Incremental fs: Make sysfs_name changeable on remount
ed8f5159f0 ANDROID: Incremental fs: Count pending_reads even when very short
f57d242977 ANDROID: sched/fair: export sysctl_sched_min_granularity symbol
73599c263e ANDROID: Fix compat hwcap reporting on asymmetric 32-bit SoCs
17f230fd93 Revert "ANDROID: usb: dwc3: gadget: don't cancel the started requests"
262fd53a10 BACKPORT: sched/uclamp: Allow to reset a task uclamp constraint value
db77ed2052 ANDROID: GKI: restore termiox fields
18593eb97f Revert "spi: Fix use-after-free with devm_spi_alloc_*"
e054456ced Merge 5.10.37 into android12-5.10
5c5381fe0a Merge remote-tracking branch 'aosp/upstream-f2fs-stable-linux-5.10.y' into android12-5.10
d8ef677e32 FROMGIT: block: avoid double io accounting for flush request
56cfcf6cbd UPSTREAM: kasan: fix kasan_byte_accessible() to be consistent with actual checks
e4d47d9a03 FROMLIST: blk-mq: Swap two calls in blk_mq_exit_queue()
fdbfae0347 ANDROID: FUSE OWNERS pointing to android-mainline OWNERS
3b80f9485d BACKPORT: scsi: ufs: Refactor ufshcd_setup_clocks() to remove skip_ref_clk
ac75369368 Revert "xfrm: Use actual socket sk instead of skb socket for xfrm_output_resume"
f66d96b14a ANDROID: vendor_hooks: Add hooks to dup_task_struct
727ab0f839 ANDROID: arm64: enable compat vdso
0c4574ebd8 UPSTREAM: arm64: vdso32: drop -no-integrated-as flag
ff128c2d77 BACKPORT: scsi: ufs-mediatek: Add HS-G4 support
371de759e9 UPSTREAM: scsi: ufs: Add enums for UniPro version higher than 1.6
d1d160b6ee FROMGIT: usb: typec: tcpm: Fix SINK_DISCOVERY current limit for Rp-default
5aafea29ad FROMGIT: xhci: Do not use GFP_KERNEL in (potentially) atomic context
22ae3660e8 FROMGIT: xhci: Fix giving back cancelled URBs even if halted endpoint can't reset
41fe558317 ANDROID: usb: gadget: f_accessory: update SS/SSP descriptors
3d24408745 Revert "sched,fair: Alternative sched_slice()"
36b2c4814a Revert "media: v4l2-ctrls: fix reference to freed memory"
a12132f848 ANDROID: GKI: restore a part of "struct mmc_host"
36c1596556 Revert "mmc: block: Issue a cache flush only when it's enabled"
a1ac3f3093 Merge 5.10.36 into android12-5.10
3c75179a31 ANDROID: iommu/io-pgtable-arm: Free underlying page tables for large mappings
345f1259a0 Revert "UPSTREAM: usb: gadget: f_uac2: validate input parameters"
fe580539f6 ANDROID: vendor_hooks: Add hooks for account irqtime process tick
cf061f35b0 BACKPORT: arm64: fpsimd: run kernel mode NEON with softirqs disabled
7fd5bd54c4 UPSTREAM: arm64: assembler: introduce wxN aliases for wN registers
dccc5bf4b7 BACKPORT: arm64: assembler: remove conditional NEON yield macros
a9e54b6010 UPSTREAM: fsverity: relax build time dependency on CRYPTO_SHA256
f90c8ffbd8 UPSTREAM: fscrypt: relax Kconfig dependencies for crypto API algorithms
57e54404ba UPSTREAM: crypto: arm64/gcm - move authentication tag check to SIMD domain
18525713bb UPSTREAM: crypto: arm64/crc-t10dif - move NEON yield to C code
3249282a95 UPSTREAM: crypto: arm64/aes-ce-mac - simplify NEON yield
4e2acf6395 UPSTREAM: crypto: arm64/aes-neonbs - remove NEON yield calls
2a5f8c85c5 UPSTREAM: crypto: arm64/sha512-ce - simplify NEON yield
cfb375ea9f UPSTREAM: crypto: arm64/sha3-ce - simplify NEON yield
7878a8b055 UPSTREAM: crypto: arm64/sha2-ce - simplify NEON yield
0c278c4b40 UPSTREAM: crypto: arm64/sha1-ce - simplify NEON yield
e7b1004dbf UPSTREAM: arm64: assembler: add cond_yield macro
665fe01c67 UPSTREAM: crypto: remove cipher routines from public crypto API
acff6cbc94 UPSTREAM: chcr_ktls: use AES library for single use cipher
bc6ca71187 ANDROID: add OWNERS for sysfs-fs-f2fs
4738608080 FROMGIT: mm/memory_hotplug: rate limit page migration warnings
b3a1591e82 ANDROID: db845c_gki.fragment: Add QCOM_TSENSE config to avoid thermal crashes
5abbf39685 UPSTREAM: usb: gadget: f_uac2: validate input parameters
5feadee52b UPSTREAM: usb: f_uac2: adds support for SS and SSP
030ee5e654 f2fs: return EINVAL for hole cases in swap file
446e972fab ANDROID: Update the ABI xml and symbol list
2f998899f3 f2fs: avoid swapon failure by giving a warning first
ae8c2a7501 ANDROID: topology: Add flag to indicate topology has been updated
4c4dcb8c24 f2fs: compress: fix to assign cc.cluster_idx correctly
7c6c8dacd4 f2fs: compress: fix race condition of overwrite vs truncate
4de3199a4a f2fs: compress: fix to free compress page correctly
4b1ceab67b f2fs: support iflag change given the mask
fd97226b07 f2fs: avoid null pointer access when handling IPU error
101a64c6c8 ANDROID: Update the ABI xml and symbol list
27eb5ffcb7 ANDROID: Add missing CFI jump table symbols to kallsyms
a1fbf0ead8 Revert "BACKPORT: bio: limit bio max size"
a4af23d274 ANDROID: thermal: Add vendor thermal_pm_notify_suspend function
68d3da6c97 ANDROID: qcom: Add neighbor related symbols
cd04f7fab9 ANDROID: usb: typec: ucsi: Ensure bounds check when accessing src_pdos
107ad0ea68 FROMGIT: usb: typec: tcpm: Fix wrong handling for Not_Supported in VDM AMS
93d7a4c7ea ANDROID: Update the ABI xml and symbol list
c0df53e0ee FROMGIT: usb: dwc3: omap: improve extcon initialization
96d46a7342 FROMGIT: usb: typec: ucsi: Put fwnode in any case during ->probe()
e9c04db1d5 FROMGIT: usb: dwc3: gadget: Return success always for kick transfer in ep queue
c3f92e5f6c FROMGIT: usb: dwc3: gadget: Free gadget structure only after freeing endpoints
56f681803f FROMGIT: usb: dwc2: Fix gadget DMA unmap direction
28ceb4d07f FROMGIT: usb: dwc3: gadget: Rename EOPF event macros to Suspend
36695d0e77 FROMGIT: usb: dwc3: gadget: Enable suspend events
d9d0c09e0a Revert "capabilities: require CAP_SETFCAP to map uid 0"
0ddd59c5da Revert "driver core: add a min_align_mask field to struct device_dma_parameters"
17ba7dfe20 Revert "swiotlb: add a IO_TLB_SIZE define"
78957dcb2c Revert "swiotlb: factor out an io_tlb_offset helper"
cb27079661 Revert "swiotlb: factor out a nr_slots helper"
28a2f5f10f Revert "swiotlb: clean up swiotlb_tbl_unmap_single"
0fb49e91d4 Revert "swiotlb: refactor swiotlb_tbl_map_single"
2201384121 Revert "swiotlb: don't modify orig_addr in swiotlb_tbl_sync_single"
b4ae4430ab Revert "swiotlb: respect min_align_mask"
abc5254824 Revert "nvme-pci: set min_align_mask"
bfac7b85a0 Merge 5.10.35 into android12-5.10
be6f5cf52c UPSTREAM: block: fix inflight statistics of part0
79d3d549f9 ANDROID: GKI: 5/7 KMI update
9458fa0dda BACKPORT: bio: limit bio max size
f9d86ad18a ANDROID: i2c: Add vendor hook to allow assign dev_name to I2C devices
0493c72d6d UPSTREAM: binder: tell userspace to dump current backtrace when detected oneway spamming
f0e99852cb ANDROID: arm64: module: add RELA metadata for FIPS140 use
85f86ef6a8 ANDROID: GKI: rename filp_open to filp_open_block in symbol lists
81ab760224 ANDROID: GKI: dwc3: add Android ABI padding to some structures
866797c77d FROMGIT: usb: dwc3: gadget: Handle DEV_TXF_FLUSH_BYPASS capability
e275019d8c FROMGIT: usb: dwc3: Capture new capability register GHWPARAMS9
b48bcb27ae FROMGIT: usb: dwc3: core: Do core softreset when switch mode
bc1dd753bd ANDROID: android: Add symbols to debug_symbols driver
0cf9435352 BACKPORT: FROMGIT: remoteproc: add is_iomem to da_to_va
775d6f9faf FROMGIT: remoteproc: introduce is_iomem to rproc_mem_entry
f6fdbe9edc ANDROID: abi_gki_aarch64_qcom: Add __bitmap_andnot and cpumask_any_but
188186232a ANDROID: abi_gki_aarch64_qcom: Add __kfifo_free
75a0e03539 ANDROID: abi_gki_aarch64_qcom: Add __page_pinner_migration_failed
8219786218 ANDROID: vendor_hooks: set debugging data when rt_mutex is working
938dc2b9b0 ANDROID: abi_gki_aarch64_qcom: Add irq_do_set_affinity
32b8d85352 ANDROID: Update the ABI xml and symbol list
99fdfd2fa3 ANDROID: ABI: Update the generic symbol list
d88c1e77fd ANDROID: irq: manage: Export irq_do_set_affinity symbol
8c32ea7937 FROMLIST: usb: typec: tcpm: Fix wrong handling in GET_SINK_CAP
44a71750f2 ANDROID: GKI: Enable CONFIG_USB_CONFIGFS_F_UAC2
03cd19b0ae ANDROID: Update the ABI xml and symbol list
2b223f9af1 UPSTREAM: remoteproc: core: Remove casting to rproc_handle_resource_t
14d632886f ANDROID: GKI: enable CONFIG_MTK_TIMER
f7128c7533 ANDROID: sched: Add vendor hooks for update_topology
70d7834861 fsverity: relax build time dependency on CRYPTO_SHA256
5e76a34a26 fscrypt: relax Kconfig dependencies for crypto API algorithms
26e61ea36d ANDROID: GKI: Enable CONFIG_EXFAT_FS in gki_defconfig
29203f8c8f ANDROID: cgroup: Add android_rvh_cgroup_force_kthread_migration
7fe4b54bf0 ANDROID: Update the ABI xml and symbol list
2bb3e44126 FROMLIST: sched: Fix out-of-bound access in uclamp
458e81ecf7 ANDROID: mm: spf: fix task fault accounting
348fb920cf ANDROID: Update the ABI xml and symbol list
e765451bf1 Merge 5.10.34 into android12-5.10
15d55f1f0a Revert "ANDROID: gki_defconfig: temporarily disable KFENCE in GKI"
f423a39522 ANDROID: Update the ABI xml and symbol list
514f06c0b0 FROMGIT: mmc: sdhci: Check for reset prior to DMA address unmap
25a0835d5e ANDROID: ABI: Add symbols for CONFIG_PAGE_PINNER
94acc25d0e ANDROID: GKI: Enable CONFIG_PAGE_PINNER
d600eedfb6 ANDROID: mm: page_pinner: use put_user_page at unstable_tree_search_insert
c2b7c24bc1 ANDROID: mm: page_pinner: unattribute follow_page in munlock_vma_pages_range
ec1dbc10ad ANDROID: mm: page_pinner: use put_user_page at add_page_for_migration
67668f721b ANDROID: mm: page_pinner: use put_user_page at dump_user_range
d14850835c ANDROID: mm: page_pinner: use put_user_page at seq_print_vma_name
2de28a0bdd ANDROID: mm: page_pinner: use put_user_page at fuse_copy_finish
f8d9ffe242 ANDROID: mm: page_pinner: use put_user_page at get_futex_key
d3b077bc15 ANDROID: mm: page_pinner: use put_user_page at copy_string
df9a9d821c ANDROID: mm: page_pinner: use put_user_page at access_remote_vm
ddc4a48797 ANDROID: mm: page_pinner: introduce failure_tracking feature
6e12c5b7d4 ANDROID: mm: introduce page_pinner
926cf69af5 ANDROID: vendor_hooks: Fix psi_event build warning
35014985c2 ANDROID: vendor_hooks: Add hooks for binder proc transaction
577f73412f ANDROID: vendor_hooks: tune reclaim inactive ratio
32124e310c ANDROID: dma-buf: Make DMA-BUF sysfs stats kobjects not send uevents
396a6adfd3 ANDROID: vendor_hooks: bypass shrink slab
0907114be2 Merge 5.10.33 into android12-5.10
9dd11f75e9 FROMGIT: kbuild: update config_data.gz only when the content of .config is changed
ea2c091f13 ANDROID: arm64: Initialise mismatched compat hwcaps from CPU notifier
c5de0d2e10 UPSTREAM: ARM: 9039/1: assembler: generalize byte swapping macro into rev_l
d3f36ae0bb UPSTREAM: ARM: 9035/1: uncompress: Add be32tocpu macro
f72dbeced2 FROMGIT: kfence: use power-efficient work queue to run delayed work
f696af3d11 FROMGIT: kfence: maximize allocation wait timeout duration
b9bb7f3153 FROMGIT: kfence: await for allocation using wait_event
cb42770670 FROMGIT: kfence: zero guard page after out-of-bounds access
372e663644 UPSTREAM: kfence: make compatible with kmemleak
fba94942cc UPSTREAM: kfence: fix reports if constant function prefixes exist
0dedbe7401 UPSTREAM: kfence: fix printk format for ptrdiff_t
7919cae0a9 ANDROID: Support disabling symbol trimming
327b2266d2 ANDROID: Incremental fs: Fix pseudo-file attributes
a64f42d1df ANDROID: sched: Fix missing RQCF_UPDATED in migrate_tasks
28b4b1588e FROMLIST: mm, thp: Relax the VM_DENYWRITE constraint on file-backed THPs
c2c576792a ANDROID: GKI: Update the generic symbol list
edc5c62da7 ANDROID: ABI: Add symbols for crypto
5a641fb83f ANDROID: ABI: Update the ABI XML
39111fc404 Revert "ANDROID: GKI: Change UCLAMP_BUCKETS_COUNT to 20"
2337b9185a ANDROID: vendor_hooks: Add hook for binder
cf881c74d3 UPSTREAM: crypto: arm/blake2s - fix for big endian
0126a08dcd UPSTREAM: crypto: arm/blake2b - drop unnecessary return statement
ccc8708bde FROMGIT: kasan, arm64: tests supports for HW_TAGS async mode
d5a19199c7 FROMGIT: arm64: mte: Report async tag faults before suspend
27ecc98407 FROMGIT: arm64: mte: Enable async tag check fault
c3ca7ea141 FROMGIT: arm64: mte: Conditionally compile mte_enable_kernel_*()
a2f1f07ff4 ANDROID: ABI: Update the ABI xml
621d2bbc84 ANDROID: ABI: Update the generic symbol list
c8bf55afd9 f2fs: drop inplace IO if fs status is abnormal
99139afb1f f2fs: compress: remove unneed check condition
28a1e40c06 f2fs: clean up left deprecated IO trace codes
f35a48edeb f2fs: avoid using native allocate_segment_by_default()
12a68f402e f2fs: remove unnecessary struct declaration
546252f29c ANDROID: selinux: add vendor hook in selinux
4870b68f3f FROMGIT: arm64: mte: Enable TCO in functions that can read beyond buffer limits
f3f8d55011 ANDROID: sched: Add vendor hooks for update_load_avg
2f77dca33d ANDROID: Update ABI with __traceiter_*() additions
6ac06f08b2 ANDROID: Update the cf symbol list
eef08d7dc9 ANDROID: Update the qcom symbol list
020f00a46d ANDROID: Update the hikey960 symbol list
2d2d6428cd ANDROID: Update the generic symbol list
dbe96fb1b9 ANDROID: Update the exynos symbol list
da07f99f19 ANDROID: Update the db845c symbol list
c7d0729a2c UPSTREAM: arm64: Move PSTATE.TCO setting to separate functions
9a928af2cc FROMGIT: kasan: Add report for async mode
f47de37f1f FROMGIT: arm64: mte: Drop arch_enable_tagging()
8bd9e809e9 ANDROID: GKI: 4/23 KMI update
563c7d9596 FROMGIT: kasan: Add KASAN mode kernel parameter
433b85479b FROMGIT: arm64: mte: Add asynchronous mode support
ea97f39295 ANDROID: GKI: update ABI description
4ccc2a6dbc FROMLIST: remoteproc: core: Move cdev add before device add
35eacb5c87 ANDROID: mm: allow vmas with vm_ops to be speculatively handled
77e791866b ANDROID: sched: Add ANDROID_OEM_DATA_ARRAY in user_struct.
54f66141a8 ANDROID: sched: Add vendor hooks for sched.
58b10706f3 ANDROID: sched: Add vendor hooks to compute new cpu freq.
a629454175 Revert "Revert "net: xfrm: Localize sequence counter per network namespace""
2d9841f98d FROMGIT: usb: typec: tcpm: Allow slow charging loops to comply to pSnkStby
4e2ca165ba FROMGIT: usb: dwc3: gadget: Check for disabled LPM quirk
a6b8e73972 ANDROID: GKI: arm64: reserve space in cpu_hwcaps and cpu_hwcap_keys arrays
0f9bfa0e99 FROMLIST: export: Make CRCs robust to symbol trimming
e67935d786 ANDROID: Kconfig.gki Add SND_SOC_TOPOLOGY
327402e1e9 ANDROID: GKI: Change UCLAMP_BUCKETS_COUNT to 20
8451e2e48e FROMGIT: ASoC: soc-component: Add snd_soc_pcm_component_ack
ce1a244af8 UPSTREAM: ASoC: dmaengine_pcm: add peripheral configuration
1dbf9d8dbc UPSTREAM: dmaengine: add peripheral configuration
fb8304fcb8 UPSTREAM: PM: domains: use device's next wakeup to determine domain idle state
e049d04424 UPSTREAM: PM: domains: inform PM domain of a device's next wakeup
98de9de261 Revert "FROMLIST: PM / Domains: add domain feature flag for next wakeup"
14f2208945 Revert "FROMLIST: PM / domains: inform PM domain of a device's next wakeup"
f316415fb2 Revert "FROMLIST: PM / Domains: use device's next wakeup to determine domain idle state"
76782b5633 FROMGIT: mm: cma: add the CMA instance name to cma trace events
1cfa9bc019 FROMGIT: mm: cma: Add the CMA instance name to the cma_alloc_start trace event
c453643efa FROMGIT: mm: cma: add trace events for CMA alloc perf testing
48b3f756ed ANDROID: mm: compaction: fix isolate_and_split_free_page() redefinition
2ead8661c3 ANDROID: vendor_hooks: Fix build-break due to psi_event
d651e1d63c ANDROID: GKI: Update abi_gki_aarch64_qcom list for kprobe module
9b4e02e2ee ANDROID: GKI: Enable CONFIG_HIST_TRIGGERS
1e5b2db654 FROMGIT: tick/broadcast: Allow late registered device to enter oneshot mode
5a1b7a90e9 UPSTREAM: arm64: uaccess: split user/kernel routines
1eb51cfdb4 UPSTREAM: arm64: uaccess: refactor __{get,put}_user
800a0f7b36 BACKPORT: arm64: uaccess: rename privileged uaccess routines
acc13a8440 ANDROID: Incremental fs: Add INCFS_IOC_GET_LAST_READ_ERROR
6cce4fa251 ANDROID: Incremental fs: Fix INCFS_MAGIC_NUMBER casts
44ffa65110 ANDROID: Incremental fs: Add status to sysfs
3d471f0108 ANDROID: Incremental fs: fix u64 integer cast to pointer
ba9602b155 ANDROID: Incremental fs: stat should return actual used blocks
f4c368a3f9 ANDROID: Incremental fs: Add FS_IOC_READ_VERITY_METADATA
16350016d8 ANDROID: export find_user() & free_uid()for GKI purpose.
bc7711817e ANDROID: GKI: update ABI description
e38df2d204 ANDROID: GKI: Update abi_gki_aarch64_qcom for kgsl AO tracing support
52f8b40ff6 ANDROID: ABI: update symbols to unisoc whitelist for the fifth time
50aa353c69 ANDROID: sched: Add vendor hooks for cpu affinity.
0d74600d22 ANDROID: GKI: Update abi_gki_aarch64_qcom list for reverse migration
9197f16834 ANDROID: abi_gki_aarch64_generic: Add a few more symbols
14d08ba7a0 FROMGIT: usb: dwc3: gadget: Remove FS bInterval_m1 limitation
f8f7b2e9e7 ANDROID: abi_gki_aarch64_qcom: Add __bitmap_or
ad02576760 ANDROID: GKI: Update abi_gki_aarch64_qcom for gpio block read tracepoint
002566e608 FROMGIT: dt-bindings: connector: Add slow-charger-loop definition
ee5af5cb09 FROMGIT: usb: dwc3: gadget: Fix START_TRANSFER link state check
fcd2a56bb0 FROMGIT: usb: gadget: Fix double free of device descriptor pointers
3f315db5f8 FROMGIT: usb: typec: tcpm: Fix error while calculating PPS out values
32b16a3a3f Merge 5.10.32 into android12-5.10
b9836d4090 ANDROID: inline isolate_and_split_free_page
2e04650661 ANDROID: kernel: clear debug_kinfo precisely
295ce88224 ANDROID: cgroup: Add vendor hook for cpuset.
e162c57223 ANDROID: GKI: Update abi_gki_aarch64_qcom for PSI tracepoints
b79d1815c4 ANDROID: psi: Add vendor hooks for PSI tracing
25ede723cd ANDROID: abi_gki_aarch64_qcom: Add android_rvh_sched_setaffinity
ef4ff626b3 ANDROID: gki_defconfig: temporarily disable KFENCE in GKI
91a4e8d8c8 ANDROID: GKI: Update abi_gki_aarch64_qcom list for minidump
8cd9aa93b7 ANDROID: implement wrapper for reverse migration
ea527a52d1 ANDROID: cpuidle: enable TEO and MENU governors in gki_defconfig
3b9e4bd9f0 ANDROID: abi_gki_aarch64_qcom: Update symbol list
f096764239 ANDROID: clang: update to 12.0.5
e16264e625 ANDROID: Add initial Exynos symbol list
e98d2de6a6 ANDROID: mm: fix mixed declaration and code warning
73ae4bff1d ANDROID: sched/fair: call set_next_entity() on the replaced next task
6c3c18a4c9 FROMGIT: binder: fix the missing BR_FROZEN_REPLY in binder_return_strings
da9a1b44ee FROMLIST: drivers/clocksource/timer-of: Remove __init markings
23e7d05d56 ANDROID: GKI: Add support for a GKI_DEFCONFIG_FRAGMENT
de777f121d ANDROID: GKI: Update abi_gki_aarch64_qcom for logbuf tracepoint
ab8b108b0a Merge 5.10.31 into android12-5.10
47b8276da1 ANDROID: PCI: dwc: Export symbols for ep driver
005be5a71b ANDROID: abi_gki_aarch64_qcom: Add sock_setsockopt to list
35dafe72dd ANDROID: vendor_hooks: tune reclaim swappiness or scan type
edb1a85895 FROMGIT: media: docs: Document colorimetry class
e6b18e4945 FROMGIT: media: v4l: Add new Colorimetry Class
a0ac76fc0c FROMGIT: media: v4l2-ctrl: Add decoder conceal color control
a6edc4212b FROMGIT: media: v4l2-ctrl: add controls for long term reference.
e628415846 FROMGIT: media: v4l2-ctrls: Add control for AUD generation
9c6ccd3184 FROMGIT: media: docs: Deprecate mfc display delay controls
f677d55e99 FROMGIT: media: s5p-mfc: Use display delay and display enable std controls
2a3e5b8c90 FROMGIT: media: v4l2-ctrl: Make display delay and display enable std controls
308e49bc5f ANDROID: Make KMI_SYMBOL_LIST_STRICT_MODE overrideable
34fde61f72 ANDROID: logbuf: vendor hook for logbuf dump on oops
fc380a2a73 ANDROID: Incremental fs: fix minor printk format warning
1aff922933 Revert "net: xfrm: Localize sequence counter per network namespace"
9a705f0463 Merge 5.10.30 into android12-5.10
7d5e1de98e ANDROID: Kbuild: Add support for KBUILD_MIXED_TREE
e41d160482 ANDROID: build.config: Add vmlinux.symvers and modules.builtin to DIST_DIR
ef07904022 ANDROID: abi_gki_aarch64_qcom: Add thermal zone enable and unregister
b248dd37db FROMGIT: usb: typec: tcpm: Honour pSnkStdby requirement during negotiation
eed5187d41 FROMGIT: dm verity fec: fix misaligned RS roots IO
5ef36bda8f Revert "Revert "dm verity: fix FEC for RS roots unaligned to blo..."
fc503912fd Revert "Revert "dm bufio: subtract the number of initial sectors..."
2feb4789b7 ANDROID: smp: fix preprocessor conditional warning
f226790096 ANDROID: mm/memory_hotplug: fix minor printk format warnings
615edf1635 ANDROID: power_supply: inline empty power_supply_get_by_phandle_array()
3ab775d150 FROMGIT: usb: dwc3: core: Add shutdown callback for dwc3
fbb0ff48a7 FROMGIT: usb: dwc3: gadget: Ignore Packet Pending bit
8d92227969 ANDROID: usb: typec: tcpm: Update tcpm_update_sink_capabilities
c50ebbb88d ANDROID: GKI: Update the ABI xml
750af2afbe ANDROID: GKI: Add generic aarch64 symbol list
01a0d1ea31 ANDROID: usb: host: Use old init scheme when hook unavailable
6aee238019 Revert "dm bufio: subtract the number of initial sectors in dm_bufio_get_device_size"
59977fca5c Revert "dm verity: fix FEC for RS roots unaligned to block size"
ea2cf4bea8 Revert "ANDROID: AVB error handler to invalidate vbmeta partition."
6125b201cc f2fs: fix to avoid NULL pointer dereference
e4947f414c f2fs: avoid duplicated codes for cleanup
e882e7aeff f2fs: document: add description about compressed space handling
d2521bc897 ANDROID: gki_defconfig: reduce KFENCE pool size
c70d90263c FROMGIT: virt_wifi: Return micros for BSS TSF values
09eafb2817 ANDROID: stacktrace: export stack_trace_save_tsk/regs
6f6d8bb444 ANDROID: arm64: declare system_32bit_el0_cpumask as export
b492fa8a50 ANDROID: Fix compilation warning in __iommu_map_pages()
947f7639b3 ANDROID: iommu/io-pgtable-arm: Fix arguments for __arm_lpae_map()
40537e85f7 ANDROID: GKI: Bump KMI_GENERATION, ABI representation
af0bfc5b9d ANDROID: GKI: Update virtual device symbol list
216fe64b61 ANDROID: usb: host: free the offload TR by vendor hook
f10ea3ce74 f2fs: clean up build warnings
c62f09151d Merge 5.10.29 into android12-5.10
1d3b80670f ANDROID: Add GKI_HIDDEN_MM_CONFIGS to support ballooning.
92de566762 ANDROID: usb: dwc3: gadget: don't cancel the started requests
fbcbe0a7a6 FROMGIT: usb: typec: tcpm: update power supply once partner accepts
18a943bbaf FROMGIT: usb: typec: tcpm: Address incorrect values of tcpm psy for pps supply
97e02abb86 FROMGIT: usb: typec: tcpm: Address incorrect values of tcpm psy for fixed supply
8a4d1dc880 ANDROID: first 4/9/2021 KMI update
b73c7360d9 ANDROID: Add a new core symbol list
28949c3e70 FROMLIST: iommu/arm-smmu: Implement the map_pages() IOMMU driver callback
8bc46bd74b FROMLIST: iommu/arm-smmu: Implement the unmap_pages() IOMMU driver callback
83dda912b3 FROMLIST: iommu/io-pgtable-arm-v7s: Implement arm_v7s_map_pages()
a9b45f6174 FROMLIST: iommu/io-pgtable-arm-v7s: Implement arm_v7s_unmap_pages()
ac3994447c FROMLIST: iommu/io-pgtable-arm: Implement arm_lpae_map_pages()
4ad6f2a43c FROMLIST: iommu/io-pgtable-arm: Implement arm_lpae_unmap_pages()
40ec873a9a BACKPORT: FROMLIST: iommu/io-pgtable-arm: Prepare PTE methods for handling multiple entries
08d46858c7 FROMLIST: iommu: Add support for the map_pages() callback
b9a5924547 FROMLIST: iommu: Hook up '->unmap_pages' driver callback
dcf8af32e6 FROMLIST: iommu: Split 'addr_merge' argument to iommu_pgsize() into separate parts
35dde30a45 FROMLIST: iommu: Use bitmap to calculate page size in iommu_pgsize()
16cabf65c7 BACKPORT: FROMLIST: iommu: Add a map_pages() op for IOMMU drivers
ba575b2222 BACKPORT: FROMLIST: iommu/io-pgtable: Introduce map_pages() as a page table op
ced8a6da9c FROMLIST: iommu: Add an unmap_pages() op for IOMMU drivers
1e74a0fd95 FROMLIST: iommu/io-pgtable: Introduce unmap_pages() as a page table op
46074eb650 Revert "Revert "net: introduce CAN specific pointer in the struct net_device""
e094831fec Revert "Revert "bpf: Use NOP_ATOMIC5 instead of emit_nops(&prog, 5) for BPF_TRAMP_F_CALL_ORIG""
b16bfd6279 Revert "Revert "bpf: Fix fexit trampoline.""
acff98ad6e Revert "ANDROID: GKI: hack to handle genksyms change in sound/soc/soc-core.c"
421e0ec416 Revert "Revert "can: dev: Move device back to init netns on owning netns delete""
fa5fc9f474 Revert "Revert "net: phy: broadcom: Fix RGMII delays for BCM50160 and BCM50610M""
ccd273758c Revert "Revert "net: phy: broadcom: Set proper 1000BaseX/SGMII interface mode for BCM54616S""
15ba58936b Revert "Revert "net: phy: broadcom: Avoid forward for bcm54xx_config_clock_delay()""
c4ac290425 Revert "Revert "net: phy: introduce phydev->port""
81d375222a ANDROID: abi_gki_aarch64_qcom: Add __tracepoint_android_rvh_replace_next_task_fair
a038be9b2c ANDROID: sched: Update android_rvh_check_preempt_wakeup hook
087cb51ae7 FROMGIT: scsi: ufs: ufs-debugfs: Add error counters
7c6fce275c FROMGIT: scsi: ufs: Refine error history functions
ed2197ba47 ANDROID: GKI: Add android_rvh_cpu_cgroup_online to qcom symbol list
ddeb3cdc3a ANDROID: sched: Add android_rvh_cpu_cgroup_online hook
02732576b1 FROMLIST: userfaultfd/shmem: fix minor fault page leak
26d1bb8087 FROMLIST: userfaultfd/hugetlbfs: Fix minor fault page leak
606bb05382 BACKPORT: FROMGIT: userfaultfd/selftests: unify error handling
642412b1ac FROMGIT: userfaultfd/selftests: only dump counts if mode enabled
f4ab74004a FROMGIT: userfaultfd/selftests: drop VERIFY check in locking_thread
56cfdd46b8 FROMGIT: userfaultfd/selftests: remove the time() check on delayed uffd
1e1eb31e95 FROMGIT: userfaultfd/selftests: use user mode only
2039d96cb7 FROMGIT: userfaultfd/selftests: exercise minor fault handling shmem support
91b66856b8 BACKPORT: FROMGIT: userfaultfd/selftests: reinitialize test context in each test
4a460b5cba FROMGIT: userfaultfd/selftests: create alias mappings in the shmem test
94f1573615 FROMGIT: userfaultfd/selftests: use memfd_create for shmem test type
d672123ec4 BACKPORT: FROMGIT: userfaultfd: support minor fault handling for shmem
357700fcc3 FROMGIT: userfaultfd/selftests: add test exercising minor fault handling
0dc6a0929f FROMGIT: userfaultfd: update documentation to describe minor fault handling
4a5cf92412 BACKPORT: FROMGIT: userfaultfd: add UFFDIO_CONTINUE ioctl
e6bf076c2a BACKPORT: FROMGIT: userfaultfd: hugetlbfs: only compile UFFD helpers if config enabled
2c64edbe69 FROMGIT: userfaultfd: disable huge PMD sharing for MINOR registered VMAs
4d3dd339de BACKPORT: FROMGIT: userfaultfd: add minor fault registration mode
343cacfa06 FROMGIT: hugetlb/userfaultfd: unshare all pmds for hugetlbfs when register wp
5c3d6acc99 FROMGIT: mm/hugetlb: move flush_hugetlb_tlb_range() into hugetlb.h
8b03b57113 FROMGIT: mm/hugetlb: fix build with !ARCH_WANT_HUGE_PMD_SHARE
f1d8bd5b4b FROMGIT: hugetlb/userfaultfd: forbid huge pmd sharing when uffd enabled
59caf93f36 BACKPORT: FROMGIT: hugetlb: pass vma into huge_pte_alloc() and huge_pmd_share()
9905016d1b ANDROID: arm64: coresight: Fix a sparse warning
1f99f71f2c ANDROID: usb: dwc3: export tracepoint for dwc3 read/write
c64c734708 ANDROID: GKI: hack to handle genksyms change in sound/soc/soc-core.c
bc751d322e Revert "bpf: Fix fexit trampoline."
21e2297dae Revert "bpf: Use NOP_ATOMIC5 instead of emit_nops(&prog, 5) for BPF_TRAMP_F_CALL_ORIG"
4a23c8ded3 Revert "net: introduce CAN specific pointer in the struct net_device"
e92949726c Merge 5.10.28 into android12-5.10
d623f1ff72 ANDROID: Add vendor hooks to signal.
128b8a7ad2 ANDROID: mm: cma: Add forward definition of cma in vendor hook
da3074b19c ANDROID: arm64/mm: fix minor printk format warning
db6a2dd55a FROMLIST: gcov: re-fix clang-11+ support
ad5be8a9b1 ANDROID: GKI: Add deferred_free to qcom symbol list
aeecae11f9 ANDROID: android/OWNERS: drop gki-abi-approvers@
1cdf332fe5 ANDROID: GKI: Update abi_gki_aarch64_qcom for VBO support
34fc082d21 ANDROID: qcom: Add dev, inet and skb related symbols
70249b572c FROMGIT: arm64: fix inline asm in load_unaligned_zeropad()
c51e9f8bf8 ANDROID: Add Image.lz4 to arm64 GKI outputs
a9b76c4519 UPSTREAM: drm/drm_vblank: set the dma-fence timestamp during send_vblank_event
430a4283cb UPSTREAM: dma-fence: allow signaling drivers to set fence timestamp
c18ab1d162 ANDROID: sched: Initialize arguments of android_rvh_replace_next_task_fair
6804a59039 ANDROID: usb: typec: tcpm: Add vendor hook to update current limit
c6e85ea56b ANDROID: mm: cma: add vendor hoook in cma_alloc()
180ab1b1e5 ANDROID: GKI: Update ABI XML
63785deb40 ANDROID: GKI: Update virtual_device symbol list
126c2fc191 ANDROID: dma-heap: Make the page-pool/deferred-free libraries built-in
8f3f46d77c ANDROID: vendor_hooks: Add hooks to recognize special worker thread.
af7214914a ANDROID: usb: typec: tcpm: Add vendor hook to store partner source capabilities
73be6141e9 UPSTREAM: KVM: arm64: Fix CPU interface MMIO compatibility detection
9b42d1c8d4 f2fs: modify open brace '{' following function definitions
1757598ffa f2fs: fix the periodic wakeups of discard thread
d731e43cfc f2fs: fix to avoid accessing invalid fio in f2fs_allocate_data_block()
380faaa0aa f2fs: fix to avoid GC/mmap race with f2fs_truncate()
52840dfa57 FROMGIT: xhci: prevent double-fetch of transfer and transfer event TRBs
c037ca6598 FROMGIT: xhci: fix potential array out of bounds with several interrupters
d535e4b2ca FROMGIT: xhci: check control context is valid before dereferencing it.
a201b4369c FROMGIT: xhci: check port array allocation was successful before dereferencing it
412bd71850 ANDROID: tracing: Make automounting in debugfs optional
eacad94c98 ANDROID: usb: add EXPORT_TRACE_SYMBOL to export tracepoint
70cf1983fe ANDROID: Add a build config fragment for KHWASan.
60aabb9a5b FROMGIT: driver core: Use unbound workqueue for deferred probes
519c8c6b2e ANDROID: usb: host: xhci: provide function prototype for xhci_address_device
5113fd3158 ANDROID: usb: host: add bus_suspend/bus_resume to xhci overrides
285973b22e ANDROID: usb: host: add address_device to xhci overrides
2e4b322b06 ANDROID: Add OWNERS files referring to the respective android-mainline OWNERS
9d10efa2a0 ANDROID: usb: host: add max packet parameter on alloc_transfer_ring hook
3390f5d0dc ANDROID: usb: host: add xhci hooks for vendor specific container context
a7d2724e52 ANDROID: ABI: Update allowed symbol list for QCOM
a4d0971961 ANDROID: abi_gki_aarch64_qcom: Add android_rvh_probe_register
7361785b8f f2fs: set checkpoint_merge by default
e15d220552 f2fs: Fix a hungtask problem in atomic write
e4491f8134 f2fs: fix to restrict mount condition on readonly block device
b667340b25 f2fs: introduce gc_merge mount option
79d06e20a4 f2fs: fix to cover __allocate_new_section() with curseg_lock
6defd53006 f2fs: fix wrong alloc_type in f2fs_do_replace_block
f74afaf1bf f2fs: delete empty compress.h
cc4ff1f3de f2fs: fix a typo in inode.c
528611246f f2fs: allow to change discard policy based on cached discard cmds
adbeec301c f2fs: fix to avoid touching checkpointed data in get_victim()
e457ef6709 f2fs: fix to update last i_size if fallocate partially succeeds
c4346bbb51 f2fs: fix error path of f2fs_remount()
fcbab6e80b f2fs: fix wrong comment of nat_tree_lock
0d36b38e1e f2fs: fix to avoid out-of-bounds memory access
a940a9ad96 f2fs: don't start checkpoint thread in readonly mountpoint
f7dca8471d f2fs: do not use AT_SSR mode in FG_GC & high urgent BG_GC
48b532703f f2fs: add sysfs nodes to get runtime compression stat
a5717d2ca6 f2fs: fix to use per-inode maxbytes in f2fs_fiemap
26423921ac f2fs: fix to align to section for fallocate() on pinned file
a5407f50d3 f2fs: expose # of overprivision segments
672d8b3cab f2fs: fix error handling in f2fs_end_enable_verity()
5459e25504 f2fs: fix a redundant call to f2fs_balance_fs if an error occurs
60eac71600 f2fs: remove unused file_clear_encrypt()
533d45fefd f2fs: check if swapfile is section-alligned
e0a507f5c5 f2fs: fix last_lblock check in check_swap_activate_fast
8e8184cc49 f2fs: remove unnecessary IS_SWAPFILE check
54af5b35f4 f2fs: Replace one-element array with flexible-array member
1e2bd9c6c2 f2fs: compress: Allow modular (de)compression algorithms
7688fb401d f2fs: check discard command number before traversing discard pending list
6cd5fef390 f2fs: update comments for explicit memory barrier
14d0fdac3c f2fs: remove unused FORCE_FG_GC macro
b8719b37cd f2fs: avoid unused f2fs_show_compress_options()
841a52ae07 f2fs: fix panic during f2fs_resize_fs()
ba25abde92 f2fs: fix to allow migrating fully valid segment
c6acf57aeb f2fs: fix a spelling error
e262ecf61b f2fs: fix a spacing coding style

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ic746701c2cc25419fe66f07ddc616618c9d39444
2021-06-17 14:45:33 +02:00
Alistair Delva
7f8b63a38e Revert "ANDROID: AVB error handler to invalidate vbmeta partition."
This driver is not used and can cause problems if used on modern
devices. Remove it.

This reverts commit 6115619831.

Bug: 185178770
Signed-off-by: Alistair Delva <adelva@google.com>
Change-Id: I1d5acb96dda765a1e3ea0cf62a3bf4b2a78892ea
(cherry picked from commit d9d3fe628e)
Signed-off-by: Carlos Llamas <cmllamas@google.com>
2021-06-16 17:49:01 +00:00
Greg Kroah-Hartman
82ea18a920 Revert "Revert "can: dev: Move device back to init netns on owning netns delete""
This reverts commit 4ca012d8ea.

It is ok to bring this back now, as the ABI does not need to be
preserved anymore.

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I3b19aef8e3332f23ef1f5d7919c9addb205e2ed1
2021-06-16 18:02:05 +02:00
Greg Kroah-Hartman
b7d2c0cacc Revert "Revert "net: phy: broadcom: Fix RGMII delays for BCM50160 and BCM50610M""
This reverts commit d649abddc6.

It is ok to bring this back now, as the ABI does not need to be
preserved anymore.

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I1de37d6a4e061430c5236265e842dd7851be3cb7
2021-06-16 18:02:05 +02:00
Greg Kroah-Hartman
8ad761788d Revert "Revert "net: phy: broadcom: Set proper 1000BaseX/SGMII interface mode for BCM54616S""
This reverts commit e444b4e1e9.

It is ok to bring this back now, as the ABI does not need to be
preserved anymore.

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I154d732042f13244b8720e98682b4d2d9e5e6ffd
2021-06-16 18:02:05 +02:00
Greg Kroah-Hartman
c2cdc1c31d Revert "Revert "net: phy: broadcom: Avoid forward for bcm54xx_config_clock_delay()""
This reverts commit 168edc7ef3.

It is ok to bring this back now, as the ABI does not need to be
preserved anymore.

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Idac9168616388726a4d68d225b9966d2fc1f8d1c
2021-06-16 18:02:04 +02:00
Greg Kroah-Hartman
43ff5a335f Revert "Revert "net: phy: introduce phydev->port""
This reverts commit 9eb951b2e1.

It is ok to bring this back now, as the ABI does not need to be
preserved anymore.

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I6abcbbd10aecf799ef485c0a8f67c1911e10e059
2021-06-16 18:02:04 +02:00
Greg Kroah-Hartman
8ba1da1234 Merge 5.10.44 into android13-5.10
Changes in 5.10.44
	proc: Track /proc/$pid/attr/ opener mm_struct
	ASoC: max98088: fix ni clock divider calculation
	ASoC: amd: fix for pcm_read() error
	spi: Fix spi device unregister flow
	spi: spi-zynq-qspi: Fix stack violation bug
	bpf: Forbid trampoline attach for functions with variable arguments
	net/nfc/rawsock.c: fix a permission check bug
	usb: cdns3: Fix runtime PM imbalance on error
	ASoC: Intel: bytcr_rt5640: Add quirk for the Glavey TM800A550L tablet
	ASoC: Intel: bytcr_rt5640: Add quirk for the Lenovo Miix 3-830 tablet
	vfio-ccw: Reset FSM state to IDLE inside FSM
	vfio-ccw: Serialize FSM IDLE state with I/O completion
	ASoC: sti-sas: add missing MODULE_DEVICE_TABLE
	spi: sprd: Add missing MODULE_DEVICE_TABLE
	usb: chipidea: udc: assign interrupt number to USB gadget structure
	isdn: mISDN: netjet: Fix crash in nj_probe:
	bonding: init notify_work earlier to avoid uninitialized use
	netlink: disable IRQs for netlink_lock_table()
	net: mdiobus: get rid of a BUG_ON()
	cgroup: disable controllers at parse time
	wq: handle VM suspension in stall detection
	net/qla3xxx: fix schedule while atomic in ql_sem_spinlock
	RDS tcp loopback connection can hang
	net:sfc: fix non-freed irq in legacy irq mode
	scsi: bnx2fc: Return failure if io_req is already in ABTS processing
	scsi: vmw_pvscsi: Set correct residual data length
	scsi: hisi_sas: Drop free_irq() of devm_request_irq() allocated irq
	scsi: target: qla2xxx: Wait for stop_phase1 at WWN removal
	net: macb: ensure the device is available before accessing GEMGXL control registers
	net: appletalk: cops: Fix data race in cops_probe1
	net: dsa: microchip: enable phy errata workaround on 9567
	nvme-fabrics: decode host pathing error for connect
	MIPS: Fix kernel hang under FUNCTION_GRAPH_TRACER and PREEMPT_TRACER
	dm verity: fix require_signatures module_param permissions
	bnx2x: Fix missing error code in bnx2x_iov_init_one()
	nvme-tcp: remove incorrect Kconfig dep in BLK_DEV_NVME
	nvmet: fix false keep-alive timeout when a controller is torn down
	powerpc/fsl: set fsl,i2c-erratum-a004447 flag for P2041 i2c controllers
	powerpc/fsl: set fsl,i2c-erratum-a004447 flag for P1010 i2c controllers
	spi: Don't have controller clean up spi device before driver unbind
	spi: Cleanup on failure of initial setup
	i2c: mpc: Make use of i2c_recover_bus()
	i2c: mpc: implement erratum A-004447 workaround
	ALSA: seq: Fix race of snd_seq_timer_open()
	ALSA: firewire-lib: fix the context to call snd_pcm_stop_xrun()
	ALSA: hda/realtek: headphone and mic don't work on an Acer laptop
	ALSA: hda/realtek: fix mute/micmute LEDs and speaker for HP Elite Dragonfly G2
	ALSA: hda/realtek: fix mute/micmute LEDs and speaker for HP EliteBook x360 1040 G8
	ALSA: hda/realtek: fix mute/micmute LEDs for HP EliteBook 840 Aero G8
	ALSA: hda/realtek: fix mute/micmute LEDs for HP ZBook Power G8
	spi: bcm2835: Fix out-of-bounds access with more than 4 slaves
	Revert "ACPI: sleep: Put the FACS table after using it"
	drm: Fix use-after-free read in drm_getunique()
	drm: Lock pointer access in drm_master_release()
	perf/x86/intel/uncore: Fix M2M event umask for Ice Lake server
	KVM: X86: MMU: Use the correct inherited permissions to get shadow page
	kvm: avoid speculation-based attacks from out-of-range memslot accesses
	staging: rtl8723bs: Fix uninitialized variables
	async_xor: check src_offs is not NULL before updating it
	btrfs: return value from btrfs_mark_extent_written() in case of error
	btrfs: promote debugging asserts to full-fledged checks in validate_super
	cgroup1: don't allow '\n' in renaming
	ftrace: Do not blindly read the ip address in ftrace_bug()
	mmc: renesas_sdhi: abort tuning when timeout detected
	mmc: renesas_sdhi: Fix HS400 on R-Car M3-W+
	USB: f_ncm: ncm_bitrate (speed) is unsigned
	usb: f_ncm: only first packet of aggregate needs to start timer
	usb: pd: Set PD_T_SINK_WAIT_CAP to 310ms
	usb: dwc3-meson-g12a: fix usb2 PHY glue init when phy0 is disabled
	usb: dwc3: meson-g12a: Disable the regulator in the error handling path of the probe
	usb: dwc3: gadget: Bail from dwc3_gadget_exit() if dwc->gadget is NULL
	usb: dwc3: ep0: fix NULL pointer exception
	usb: musb: fix MUSB_QUIRK_B_DISCONNECT_99 handling
	usb: typec: wcove: Use LE to CPU conversion when accessing msg->header
	usb: typec: ucsi: Clear PPM capability data in ucsi_init() error path
	usb: typec: intel_pmc_mux: Put fwnode in error case during ->probe()
	usb: typec: intel_pmc_mux: Add missed error check for devm_ioremap_resource()
	usb: gadget: f_fs: Ensure io_completion_wq is idle during unbind
	USB: serial: ftdi_sio: add NovaTech OrionMX product ID
	USB: serial: omninet: add device id for Zyxel Omni 56K Plus
	USB: serial: quatech2: fix control-request directions
	USB: serial: cp210x: fix alternate function for CP2102N QFN20
	usb: gadget: eem: fix wrong eem header operation
	usb: fix various gadgets null ptr deref on 10gbps cabling.
	usb: fix various gadget panics on 10gbps cabling
	usb: typec: tcpm: cancel vdm and state machine hrtimer when unregister tcpm port
	usb: typec: tcpm: cancel frs hrtimer when unregister tcpm port
	regulator: core: resolve supply for boot-on/always-on regulators
	regulator: max77620: Use device_set_of_node_from_dev()
	regulator: bd718x7: Fix the BUCK7 voltage setting on BD71837
	regulator: fan53880: Fix missing n_voltages setting
	regulator: bd71828: Fix .n_voltages settings
	regulator: rtmv20: Fix .set_current_limit/.get_current_limit callbacks
	phy: usb: Fix misuse of IS_ENABLED
	usb: dwc3: gadget: Disable gadget IRQ during pullup disable
	usb: typec: mux: Fix copy-paste mistake in typec_mux_match
	drm/mcde: Fix off by 10^3 in calculation
	drm/msm/a6xx: fix incorrectly set uavflagprd_inv field for A650
	drm/msm/a6xx: update/fix CP_PROTECT initialization
	drm/msm/a6xx: avoid shadow NULL reference in failure path
	RDMA/ipoib: Fix warning caused by destroying non-initial netns
	RDMA/mlx4: Do not map the core_clock page to user space unless enabled
	ARM: cpuidle: Avoid orphan section warning
	vmlinux.lds.h: Avoid orphan section with !SMP
	tools/bootconfig: Fix error return code in apply_xbc()
	phy: cadence: Sierra: Fix error return code in cdns_sierra_phy_probe()
	ASoC: core: Fix Null-point-dereference in fmt_single_name()
	ASoC: meson: gx-card: fix sound-dai dt schema
	phy: ti: Fix an error code in wiz_probe()
	gpio: wcd934x: Fix shift-out-of-bounds error
	perf: Fix data race between pin_count increment/decrement
	sched/fair: Keep load_avg and load_sum synced
	sched/fair: Make sure to update tg contrib for blocked load
	sched/fair: Fix util_est UTIL_AVG_UNCHANGED handling
	x86/nmi_watchdog: Fix old-style NMI watchdog regression on old Intel CPUs
	KVM: x86: Ensure liveliness of nested VM-Enter fail tracepoint message
	IB/mlx5: Fix initializing CQ fragments buffer
	NFS: Fix a potential NULL dereference in nfs_get_client()
	NFSv4: Fix deadlock between nfs4_evict_inode() and nfs4_opendata_get_inode()
	perf session: Correct buffer copying when peeking events
	kvm: fix previous commit for 32-bit builds
	NFS: Fix use-after-free in nfs4_init_client()
	NFSv4: Fix second deadlock in nfs4_evict_inode()
	NFSv4: nfs4_proc_set_acl needs to restore NFS_CAP_UIDGID_NOMAP on error.
	scsi: core: Fix error handling of scsi_host_alloc()
	scsi: core: Fix failure handling of scsi_add_host_with_dma()
	scsi: core: Put .shost_dev in failure path if host state changes to RUNNING
	scsi: core: Only put parent device if host state differs from SHOST_CREATED
	tracing: Correct the length check which causes memory corruption
	proc: only require mm_struct for writing
	Linux 5.10.44

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I0f42a46e99786aaaf72d4f065f8095323cbec541
2021-06-16 18:01:35 +02:00
Matthias Maennich
76081a5f72 FROMLIST: kbuild: mkcompile_h: consider timestamp if KBUILD_BUILD_TIMESTAMP is set
To avoid unnecessary recompilations, mkcompile_h does not regenerate
compile.h if just the timestamp changed.
Though, if KBUILD_BUILD_TIMESTAMP is set, an explicit timestamp for the
build was requested, in which case we should not ignore it.

If a user follows the documentation for reproducible builds [1] and
defines KBUILD_BUILD_TIMESTAMP as the git commit timestamp, a clean
build will have the correct timestamp. A subsequent cherry-pick (or
amend) changes the commit timestamp and if an incremental build is done
with a different KBUILD_BUILD_TIMESTAMP now, that new value is not taken
into consideration. But it should for reproducibility.

Hence, whenever KBUILD_BUILD_TIMESTAMP is explicitly set, do not ignore
UTS_VERSION when making a decision about whether the regenerated version
of compile.h should be moved into place.

[1] https://www.kernel.org/doc/html/latest/kbuild/reproducible-builds.html

Cc: Masahiro Yamada <masahiroy@kernel.org>
Cc: linux-kbuild@vger.kernel.org
Bug: 189077755
Link: https://lore.kernel.org/r/20210612141838.1073085-1-maennich@google.com
Signed-off-by: Matthias Maennich <maennich@google.com>
Change-Id: I47a1b9e079346be82794ec93a449258e086945eb
2021-06-16 12:19:04 +00:00
Greg Kroah-Hartman
f2b1fc360f Linux 5.10.44
Link: https://lore.kernel.org/r/20210614102652.964395392@linuxfoundation.org
Tested-by: Fox Chen <foxhlchen@gmail.com>
Tested-by: Jon Hunter <jonathanh@nvidia.com>
Tested-by: Florian Fainelli <f.fainelli@gmail.com>
Tested-by: Pavel Machek (CIP) <pavel@denx.de>
Tested-by: Hulk Robot <hulkrobot@huawei.com>
Link: https://lore.kernel.org/r/20210614161424.091266895@linuxfoundation.org
Tested-by: Jon Hunter <jonathanh@nvidia.com>
Tested-by: Fox Chen <foxhlchen@gmail.com>
Tested-by: Pavel Machek (CIP) <pavel@denx.de>
Tested-by: Florian Fainelli <f.fainelli@gmail.com>
Tested-by: Salvatore Bonaccorso <carnil@debian.org>
Tested-by: Shuah Khan <skhan@linuxfoundation.org>
Tested-by: Jason Self <jason@bluehome.net>
Tested-by: Hulk Robot <hulkrobot@huawei.com>
Tested-by: Sudip Mukherjee <sudip.mukherjee@codethink.co.uk>
Tested-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2021-06-16 12:01:47 +02:00
Linus Torvalds
ef9a0d224b proc: only require mm_struct for writing
commit 94f0b2d4a1 upstream.

Commit 591a22c14d ("proc: Track /proc/$pid/attr/ opener mm_struct") we
started using __mem_open() to track the mm_struct at open-time, so that
we could then check it for writes.

But that also ended up making the permission checks at open time much
stricter - and not just for writes, but for reads too.  And that in turn
caused a regression for at least Fedora 29, where NIC interfaces fail to
start when using NetworkManager.

Since only the write side wanted the mm_struct test, ignore any failures
by __mem_open() at open time, leaving reads unaffected.  The write()
time verification of the mm_struct pointer will then catch the failure
case because a NULL pointer will not match a valid 'current->mm'.

Link: https://lore.kernel.org/netdev/YMjTlp2FSJYvoyFa@unreal/
Fixes: 591a22c14d ("proc: Track /proc/$pid/attr/ opener mm_struct")
Reported-and-tested-by: Leon Romanovsky <leon@kernel.org>
Cc: Kees Cook <keescook@chromium.org>
Cc: Christian Brauner <christian.brauner@ubuntu.com>
Cc: Andrea Righi <andrea.righi@canonical.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2021-06-16 12:01:47 +02:00
Liangyan
43c32c2225 tracing: Correct the length check which causes memory corruption
commit 3e08a9f976 upstream.

We've suffered from severe kernel crashes due to memory corruption on
our production environment, like,

Call Trace:
[1640542.554277] general protection fault: 0000 [#1] SMP PTI
[1640542.554856] CPU: 17 PID: 26996 Comm: python Kdump: loaded Tainted:G
[1640542.556629] RIP: 0010:kmem_cache_alloc+0x90/0x190
[1640542.559074] RSP: 0018:ffffb16faa597df8 EFLAGS: 00010286
[1640542.559587] RAX: 0000000000000000 RBX: 0000000000400200 RCX:
0000000006e931bf
[1640542.560323] RDX: 0000000006e931be RSI: 0000000000400200 RDI:
ffff9a45ff004300
[1640542.560996] RBP: 0000000000400200 R08: 0000000000023420 R09:
0000000000000000
[1640542.561670] R10: 0000000000000000 R11: 0000000000000000 R12:
ffffffff9a20608d
[1640542.562366] R13: ffff9a45ff004300 R14: ffff9a45ff004300 R15:
696c662f65636976
[1640542.563128] FS:  00007f45d7c6f740(0000) GS:ffff9a45ff840000(0000)
knlGS:0000000000000000
[1640542.563937] CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
[1640542.564557] CR2: 00007f45d71311a0 CR3: 000000189d63e004 CR4:
00000000003606e0
[1640542.565279] DR0: 0000000000000000 DR1: 0000000000000000 DR2:
0000000000000000
[1640542.566069] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7:
0000000000000400
[1640542.566742] Call Trace:
[1640542.567009]  anon_vma_clone+0x5d/0x170
[1640542.567417]  __split_vma+0x91/0x1a0
[1640542.567777]  do_munmap+0x2c6/0x320
[1640542.568128]  vm_munmap+0x54/0x70
[1640542.569990]  __x64_sys_munmap+0x22/0x30
[1640542.572005]  do_syscall_64+0x5b/0x1b0
[1640542.573724]  entry_SYSCALL_64_after_hwframe+0x44/0xa9
[1640542.575642] RIP: 0033:0x7f45d6e61e27

James Wang has reproduced it stably on the latest 4.19 LTS.
After some debugging, we finally proved that it's due to ftrace
buffer out-of-bound access using a debug tool as follows:
[   86.775200] BUG: Out-of-bounds write at addr 0xffff88aefe8b7000
[   86.780806]  no_context+0xdf/0x3c0
[   86.784327]  __do_page_fault+0x252/0x470
[   86.788367]  do_page_fault+0x32/0x140
[   86.792145]  page_fault+0x1e/0x30
[   86.795576]  strncpy_from_unsafe+0x66/0xb0
[   86.799789]  fetch_memory_string+0x25/0x40
[   86.804002]  fetch_deref_string+0x51/0x60
[   86.808134]  kprobe_trace_func+0x32d/0x3a0
[   86.812347]  kprobe_dispatcher+0x45/0x50
[   86.816385]  kprobe_ftrace_handler+0x90/0xf0
[   86.820779]  ftrace_ops_assist_func+0xa1/0x140
[   86.825340]  0xffffffffc00750bf
[   86.828603]  do_sys_open+0x5/0x1f0
[   86.832124]  do_syscall_64+0x5b/0x1b0
[   86.835900]  entry_SYSCALL_64_after_hwframe+0x44/0xa9

commit b220c049d5 ("tracing: Check length before giving out
the filter buffer") adds length check to protect trace data
overflow introduced in 0fc1b09ff1, seems that this fix can't prevent
overflow entirely, the length check should also take the sizeof
entry->array[0] into account, since this array[0] is filled the
length of trace data and occupy addtional space and risk overflow.

Link: https://lkml.kernel.org/r/20210607125734.1770447-1-liangyan.peng@linux.alibaba.com

Cc: stable@vger.kernel.org
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Xunlei Pang <xlpang@linux.alibaba.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Fixes: b220c049d5 ("tracing: Check length before giving out the filter buffer")
Reviewed-by: Xunlei Pang <xlpang@linux.alibaba.com>
Reviewed-by: yinbinbin <yinbinbin@alibabacloud.com>
Reviewed-by: Wetp Zhang <wetp.zy@linux.alibaba.com>
Tested-by: James Wang <jnwang@linux.alibaba.com>
Signed-off-by: Liangyan <liangyan.peng@linux.alibaba.com>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2021-06-16 12:01:47 +02:00
Ming Lei
5b537408f2 scsi: core: Only put parent device if host state differs from SHOST_CREATED
commit 1e0d4e6225 upstream.

get_device(shost->shost_gendev.parent) is called after host state has
switched to SHOST_RUNNING. scsi_host_dev_release() shouldn't release the
parent device if host state is still SHOST_CREATED.

Link: https://lore.kernel.org/r/20210602133029.2864069-5-ming.lei@redhat.com
Cc: Bart Van Assche <bvanassche@acm.org>
Cc: John Garry <john.garry@huawei.com>
Cc: Hannes Reinecke <hare@suse.de>
Tested-by: John Garry <john.garry@huawei.com>
Reviewed-by: John Garry <john.garry@huawei.com>
Signed-off-by: Ming Lei <ming.lei@redhat.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2021-06-16 12:01:47 +02:00
Ming Lei
0a31d1237a scsi: core: Put .shost_dev in failure path if host state changes to RUNNING
commit 11714026c0 upstream.

scsi_host_dev_release() only frees dev_name when host state is
SHOST_CREATED. After host state has changed to SHOST_RUNNING,
scsi_host_dev_release() no longer cleans up.

Fix this by doing a put_device(&shost->shost_dev) in the failure path when
host state is SHOST_RUNNING. Move get_device(&shost->shost_gendev) before
device_add(&shost->shost_dev) so that scsi_host_cls_release() can do a put
on this reference.

Link: https://lore.kernel.org/r/20210602133029.2864069-4-ming.lei@redhat.com
Cc: Bart Van Assche <bvanassche@acm.org>
Cc: Hannes Reinecke <hare@suse.de>
Reported-by: John Garry <john.garry@huawei.com>
Tested-by: John Garry <john.garry@huawei.com>
Reviewed-by: John Garry <john.garry@huawei.com>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Ming Lei <ming.lei@redhat.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2021-06-16 12:01:47 +02:00
Ming Lei
146446a43b scsi: core: Fix failure handling of scsi_add_host_with_dma()
commit 3719f4ff04 upstream.

When scsi_add_host_with_dma() returns failure, the caller will call
scsi_host_put(shost) to release everything allocated for this host
instance. Consequently we can't also free allocated stuff in
scsi_add_host_with_dma(), otherwise we will end up with a double free.

Strictly speaking, host resource allocations should have been done in
scsi_host_alloc(). However, the allocations may need information which is
not yet provided by the driver when that function is called. So leave the
allocations where they are but rely on host device's release handler to
free resources.

Link: https://lore.kernel.org/r/20210602133029.2864069-3-ming.lei@redhat.com
Cc: Bart Van Assche <bvanassche@acm.org>
Cc: John Garry <john.garry@huawei.com>
Cc: Hannes Reinecke <hare@suse.de>
Tested-by: John Garry <john.garry@huawei.com>
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Reviewed-by: John Garry <john.garry@huawei.com>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Ming Lei <ming.lei@redhat.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2021-06-16 12:01:47 +02:00
Ming Lei
7a696ce1d5 scsi: core: Fix error handling of scsi_host_alloc()
commit 66a834d092 upstream.

After device is initialized via device_initialize(), or its name is set via
dev_set_name(), the device has to be freed via put_device().  Otherwise
device name will be leaked because it is allocated dynamically in
dev_set_name().

Fix the leak by replacing kfree() with put_device(). Since
scsi_host_dev_release() properly handles IDA and kthread removal, remove
special-casing these from the error handling as well.

Link: https://lore.kernel.org/r/20210602133029.2864069-2-ming.lei@redhat.com
Cc: Bart Van Assche <bvanassche@acm.org>
Cc: John Garry <john.garry@huawei.com>
Cc: Hannes Reinecke <hare@suse.de>
Tested-by: John Garry <john.garry@huawei.com>
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Reviewed-by: John Garry <john.garry@huawei.com>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Ming Lei <ming.lei@redhat.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2021-06-16 12:01:47 +02:00
Dai Ngo
6e13b9bc66 NFSv4: nfs4_proc_set_acl needs to restore NFS_CAP_UIDGID_NOMAP on error.
commit f8849e206e upstream.

Currently if __nfs4_proc_set_acl fails with NFS4ERR_BADOWNER it
re-enables the idmapper by clearing NFS_CAP_UIDGID_NOMAP before
retrying again. The NFS_CAP_UIDGID_NOMAP remains cleared even if
the retry fails. This causes problem for subsequent setattr
requests for v4 server that does not have idmapping configured.

This patch modifies nfs4_proc_set_acl to detect NFS4ERR_BADOWNER
and NFS4ERR_BADNAME and skips the retry, since the kernel isn't
involved in encoding the ACEs, and return -EINVAL.

Steps to reproduce the problem:

 # mount -o vers=4.1,sec=sys server:/export/test /tmp/mnt
 # touch /tmp/mnt/file1
 # chown 99 /tmp/mnt/file1
 # nfs4_setfacl -a A::unknown.user@xyz.com:wrtncy /tmp/mnt/file1
 Failed setxattr operation: Invalid argument
 # chown 99 /tmp/mnt/file1
 chown: changing ownership of ‘/tmp/mnt/file1’: Invalid argument
 # umount /tmp/mnt
 # mount -o vers=4.1,sec=sys server:/export/test /tmp/mnt
 # chown 99 /tmp/mnt/file1
 #

v2: detect NFS4ERR_BADOWNER and NFS4ERR_BADNAME and skip retry
       in nfs4_proc_set_acl.
Signed-off-by: Dai Ngo <dai.ngo@oracle.com>
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2021-06-16 12:01:47 +02:00
Trond Myklebust
d973bd0d6e NFSv4: Fix second deadlock in nfs4_evict_inode()
commit c3aba897c6 upstream.

If the inode is being evicted but has to return a layout first, then
that too can cause a deadlock in the corner case where the server
reboots.

Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2021-06-16 12:01:46 +02:00
Anna Schumaker
c3b6cf64df NFS: Fix use-after-free in nfs4_init_client()
commit 476bdb04c5 upstream.

KASAN reports a use-after-free when attempting to mount two different
exports through two different NICs that belong to the same server.

Olga was able to hit this with kernels starting somewhere between 5.7
and 5.10, but I traced the patch that introduced the clear_bit() call to
4.13. So something must have changed in the refcounting of the clp
pointer to make this call to nfs_put_client() the very last one.

Fixes: 8dcbec6d20 ("NFSv41: Handle EXCHID4_FLAG_CONFIRMED_R during NFSv4.1 migration")
Cc: stable@vger.kernel.org # 4.13+
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2021-06-16 12:01:46 +02:00
Paolo Bonzini
9064c9d544 kvm: fix previous commit for 32-bit builds
commit 4422829e80 upstream.

array_index_nospec does not work for uint64_t on 32-bit builds.
However, the size of a memory slot must be less than 20 bits wide
on those system, since the memory slot must fit in the user
address space.  So just store it in an unsigned long.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2021-06-16 12:01:46 +02:00
Leo Yan
351075bcfe perf session: Correct buffer copying when peeking events
[ Upstream commit 197eecb6ec ]

When peeking an event, it has a short path and a long path.  The short
path uses the session pointer "one_mmap_addr" to directly fetch the
event; and the long path needs to read out the event header and the
following event data from file and fill into the buffer pointer passed
through the argument "buf".

The issue is in the long path that it copies the event header and event
data into the same destination address which pointer "buf", this means
the event header is overwritten.  We are just lucky to run into the
short path in most cases, so we don't hit the issue in the long path.

This patch adds the offset "hdr_sz" to the pointer "buf" when copying
the event data, so that it can reserve the event header which can be
used properly by its caller.

Fixes: 5a52f33adf ("perf session: Add perf_session__peek_event()")
Signed-off-by: Leo Yan <leo.yan@linaro.org>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
Acked-by: Jiri Olsa <jolsa@redhat.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lore.kernel.org/lkml/20210605052957.1070720-1-leo.yan@linaro.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
2021-06-16 12:01:46 +02:00
Trond Myklebust
b4651cea43 NFSv4: Fix deadlock between nfs4_evict_inode() and nfs4_opendata_get_inode()
[ Upstream commit dfe1fe75e0 ]

If the inode is being evicted, but has to return a delegation first,
then it can cause a deadlock in the corner case where the server reboots
before the delegreturn completes, but while the call to iget5_locked() in
nfs4_opendata_get_inode() is waiting for the inode free to complete.
Since the open call still holds a session slot, the reboot recovery
cannot proceed.

In order to break the logjam, we can turn the delegation return into a
privileged operation for the case where we're evicting the inode. We
know that in that case, there can be no other state recovery operation
that conflicts.

Reported-by: zhangxiaoxu (A) <zhangxiaoxu5@huawei.com>
Fixes: 5fcdfacc01 ("NFSv4: Return delegations synchronously in evict_inode")
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
2021-06-16 12:01:46 +02:00
Dan Carpenter
279ad78a00 NFS: Fix a potential NULL dereference in nfs_get_client()
[ Upstream commit 09226e8303 ]

None of the callers are expecting NULL returns from nfs_get_client() so
this code will lead to an Oops.  It's better to return an error
pointer.  I expect that this is dead code so hopefully no one is
affected.

Fixes: 31434f496a ("nfs: check hostname in nfs_get_client")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
2021-06-16 12:01:46 +02:00
Alaa Hleihel
91f7fdc4cc IB/mlx5: Fix initializing CQ fragments buffer
commit 2ba0aa2fee upstream.

The function init_cq_frag_buf() can be called to initialize the current CQ
fragments buffer cq->buf, or the temporary cq->resize_buf that is filled
during CQ resize operation.

However, the offending commit started to use function get_cqe() for
getting the CQEs, the issue with this change is that get_cqe() always
returns CQEs from cq->buf, which leads us to initialize the wrong buffer,
and in case of enlarging the CQ we try to access elements beyond the size
of the current cq->buf and eventually hit a kernel panic.

 [exception RIP: init_cq_frag_buf+103]
  [ffff9f799ddcbcd8] mlx5_ib_resize_cq at ffffffffc0835d60 [mlx5_ib]
  [ffff9f799ddcbdb0] ib_resize_cq at ffffffffc05270df [ib_core]
  [ffff9f799ddcbdc0] llt_rdma_setup_qp at ffffffffc0a6a712 [llt]
  [ffff9f799ddcbe10] llt_rdma_cc_event_action at ffffffffc0a6b411 [llt]
  [ffff9f799ddcbe98] llt_rdma_client_conn_thread at ffffffffc0a6bb75 [llt]
  [ffff9f799ddcbec8] kthread at ffffffffa66c5da1
  [ffff9f799ddcbf50] ret_from_fork_nospec_begin at ffffffffa6d95ddd

Fix it by getting the needed CQE by calling mlx5_frag_buf_get_wqe() that
takes the correct source buffer as a parameter.

Fixes: 388ca8be00 ("IB/mlx5: Implement fragmented completion queue (CQ)")
Link: https://lore.kernel.org/r/90a0e8c924093cfa50a482880ad7e7edb73dc19a.1623309971.git.leonro@nvidia.com
Signed-off-by: Alaa Hleihel <alaa@nvidia.com>
Signed-off-by: Leon Romanovsky <leonro@nvidia.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2021-06-16 12:01:46 +02:00
Sean Christopherson
d046f724bb KVM: x86: Ensure liveliness of nested VM-Enter fail tracepoint message
commit f31500b0d4 upstream.

Use the __string() machinery provided by the tracing subystem to make a
copy of the string literals consumed by the "nested VM-Enter failed"
tracepoint.  A complete copy is necessary to ensure that the tracepoint
can't outlive the data/memory it consumes and deference stale memory.

Because the tracepoint itself is defined by kvm, if kvm-intel and/or
kvm-amd are built as modules, the memory holding the string literals
defined by the vendor modules will be freed when the module is unloaded,
whereas the tracepoint and its data in the ring buffer will live until
kvm is unloaded (or "indefinitely" if kvm is built-in).

This bug has existed since the tracepoint was added, but was recently
exposed by a new check in tracing to detect exactly this type of bug.

  fmt: '%s%s
  ' current_buffer: ' vmx_dirty_log_t-140127  [003] ....  kvm_nested_vmenter_failed: '
  WARNING: CPU: 3 PID: 140134 at kernel/trace/trace.c:3759 trace_check_vprintf+0x3be/0x3e0
  CPU: 3 PID: 140134 Comm: less Not tainted 5.13.0-rc1-ce2e73ce600a-req #184
  Hardware name: ASUS Q87M-E/Q87M-E, BIOS 1102 03/03/2014
  RIP: 0010:trace_check_vprintf+0x3be/0x3e0
  Code: <0f> 0b 44 8b 4c 24 1c e9 a9 fe ff ff c6 44 02 ff 00 49 8b 97 b0 20
  RSP: 0018:ffffa895cc37bcb0 EFLAGS: 00010282
  RAX: 0000000000000000 RBX: ffffa895cc37bd08 RCX: 0000000000000027
  RDX: 0000000000000027 RSI: 00000000ffffdfff RDI: ffff9766cfad74f8
  RBP: ffffffffc0a041d4 R08: ffff9766cfad74f0 R09: ffffa895cc37bad8
  R10: 0000000000000001 R11: 0000000000000001 R12: ffffffffc0a041d4
  R13: ffffffffc0f4dba8 R14: 0000000000000000 R15: ffff976409f2c000
  FS:  00007f92fa200740(0000) GS:ffff9766cfac0000(0000) knlGS:0000000000000000
  CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
  CR2: 0000559bd11b0000 CR3: 000000019fbaa002 CR4: 00000000001726e0
  Call Trace:
   trace_event_printf+0x5e/0x80
   trace_raw_output_kvm_nested_vmenter_failed+0x3a/0x60 [kvm]
   print_trace_line+0x1dd/0x4e0
   s_show+0x45/0x150
   seq_read_iter+0x2d5/0x4c0
   seq_read+0x106/0x150
   vfs_read+0x98/0x180
   ksys_read+0x5f/0xe0
   do_syscall_64+0x40/0xb0
   entry_SYSCALL_64_after_hwframe+0x44/0xae

Cc: Steven Rostedt <rostedt@goodmis.org>
Fixes: 380e0055bc ("KVM: nVMX: trace nested VM-Enter failures detected by H/W")
Signed-off-by: Sean Christopherson <seanjc@google.com>
Reviewed-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Message-Id: <20210607175748.674002-1-seanjc@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2021-06-16 12:01:46 +02:00
CodyYao-oc
4921feb0e5 x86/nmi_watchdog: Fix old-style NMI watchdog regression on old Intel CPUs
commit a8383dfb21 upstream.

The following commit:

   3a4ac121c2 ("x86/perf: Add hardware performance events support for Zhaoxin CPU.")

Got the old-style NMI watchdog logic wrong and broke it for basically every
Intel CPU where it was active. Which is only truly old CPUs, so few people noticed.

On CPUs with perf events support we turn off the old-style NMI watchdog, so it
was pretty pointless to add the logic for X86_VENDOR_ZHAOXIN to begin with ... :-/

Anyway, the fix is to restore the old logic and add a 'break'.

[ mingo: Wrote a new changelog. ]

Fixes: 3a4ac121c2 ("x86/perf: Add hardware performance events support for Zhaoxin CPU.")
Signed-off-by: CodyYao-oc <CodyYao-oc@zhaoxin.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lore.kernel.org/r/20210607025335.9643-1-CodyYao-oc@zhaoxin.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2021-06-16 12:01:46 +02:00
Dietmar Eggemann
190a7f9089 sched/fair: Fix util_est UTIL_AVG_UNCHANGED handling
commit 68d7a19068 upstream.

The util_est internal UTIL_AVG_UNCHANGED flag which is used to prevent
unnecessary util_est updates uses the LSB of util_est.enqueued. It is
exposed via _task_util_est() (and task_util_est()).

Commit 92a801e5d5 ("sched/fair: Mask UTIL_AVG_UNCHANGED usages")
mentions that the LSB is lost for util_est resolution but
find_energy_efficient_cpu() checks if task_util_est() returns 0 to
return prev_cpu early.

_task_util_est() returns the max value of util_est.ewma and
util_est.enqueued or'ed w/ UTIL_AVG_UNCHANGED.
So task_util_est() returning the max of task_util() and
_task_util_est() will never return 0 under the default
SCHED_FEAT(UTIL_EST, true).

To fix this use the MSB of util_est.enqueued instead and keep the flag
util_est internal, i.e. don't export it via _task_util_est().

The maximal possible util_avg value for a task is 1024 so the MSB of
'unsigned int util_est.enqueued' isn't used to store a util value.

As a caveat the code behind the util_est_se trace point has to filter
UTIL_AVG_UNCHANGED to see the real util_est.enqueued value which should
be easy to do.

This also fixes an issue report by Xuewen Yan that util_est_update()
only used UTIL_AVG_UNCHANGED for the subtrahend of the equation:

  last_enqueued_diff = ue.enqueued - (task_util() | UTIL_AVG_UNCHANGED)

Fixes: b89997aa88 sched/pelt: Fix task util_est update filtering
Signed-off-by: Dietmar Eggemann <dietmar.eggemann@arm.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Xuewen Yan <xuewen.yan@unisoc.com>
Reviewed-by: Vincent Donnefort <vincent.donnefort@arm.com>
Reviewed-by: Vincent Guittot <vincent.guittot@linaro.org>
Link: https://lore.kernel.org/r/20210602145808.1562603-1-dietmar.eggemann@arm.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2021-06-16 12:01:46 +02:00
Vincent Guittot
32e22db8b2 sched/fair: Make sure to update tg contrib for blocked load
commit 02da26ad5e upstream.

During the update of fair blocked load (__update_blocked_fair()), we
update the contribution of the cfs in tg->load_avg if cfs_rq's pelt
has decayed.  Nevertheless, the pelt values of a cfs_rq could have
been recently updated while propagating the change of a child. In this
case, cfs_rq's pelt will not decayed because it has already been
updated and we don't update tg->load_avg.

__update_blocked_fair
  ...
  for_each_leaf_cfs_rq_safe: child cfs_rq
    update cfs_rq_load_avg() for child cfs_rq
    ...
    update_load_avg(cfs_rq_of(se), se, 0)
      ...
      update cfs_rq_load_avg() for parent cfs_rq
		-propagation of child's load makes parent cfs_rq->load_sum
		 becoming null
        -UPDATE_TG is not set so it doesn't update parent
		 cfs_rq->tg_load_avg_contrib
  ..
  for_each_leaf_cfs_rq_safe: parent cfs_rq
    update cfs_rq_load_avg() for parent cfs_rq
      - nothing to do because parent cfs_rq has already been updated
		recently so cfs_rq->tg_load_avg_contrib is not updated
    ...
    parent cfs_rq is decayed
      list_del_leaf_cfs_rq parent cfs_rq
	  - but it still contibutes to tg->load_avg

we must set UPDATE_TG flags when propagting pending load to the parent

Fixes: 039ae8bcf7 ("sched/fair: Fix O(nr_cgroups) in the load balancing path")
Reported-by: Odin Ugedal <odin@uged.al>
Signed-off-by: Vincent Guittot <vincent.guittot@linaro.org>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Odin Ugedal <odin@uged.al>
Link: https://lkml.kernel.org/r/20210527122916.27683-3-vincent.guittot@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2021-06-16 12:01:45 +02:00
Vincent Guittot
4c37b062ed sched/fair: Keep load_avg and load_sum synced
commit 7c7ad626d9 upstream.

when removing a cfs_rq from the list we only check _sum value so we must
ensure that _avg and _sum stay synced so load_sum can't be null whereas
load_avg is not after propagating load in the cgroup hierarchy.

Use load_avg to compute load_sum similarly to what is done for util_sum
and runnable_sum.

Fixes: 0e2d2aaaae ("sched/fair: Rewrite PELT migration propagation")
Reported-by: Odin Ugedal <odin@uged.al>
Signed-off-by: Vincent Guittot <vincent.guittot@linaro.org>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Odin Ugedal <odin@uged.al>
Link: https://lkml.kernel.org/r/20210527122916.27683-2-vincent.guittot@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2021-06-16 12:01:45 +02:00
Marco Elver
c64a3be39f perf: Fix data race between pin_count increment/decrement
commit 6c605f8371 upstream.

KCSAN reports a data race between increment and decrement of pin_count:

  write to 0xffff888237c2d4e0 of 4 bytes by task 15740 on cpu 1:
   find_get_context		kernel/events/core.c:4617
   __do_sys_perf_event_open	kernel/events/core.c:12097 [inline]
   __se_sys_perf_event_open	kernel/events/core.c:11933
   ...
  read to 0xffff888237c2d4e0 of 4 bytes by task 15743 on cpu 0:
   perf_unpin_context		kernel/events/core.c:1525 [inline]
   __do_sys_perf_event_open	kernel/events/core.c:12328 [inline]
   __se_sys_perf_event_open	kernel/events/core.c:11933
   ...

Because neither read-modify-write here is atomic, this can lead to one
of the operations being lost, resulting in an inconsistent pin_count.
Fix it by adding the missing locking in the CPU-event case.

Fixes: fe4b04fa31 ("perf: Cure task_oncpu_function_call() races")
Reported-by: syzbot+142c9018f5962db69c7e@syzkaller.appspotmail.com
Signed-off-by: Marco Elver <elver@google.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20210527104711.2671610-1-elver@google.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2021-06-16 12:01:45 +02:00
Srinivas Kandagatla
e0b518a2eb gpio: wcd934x: Fix shift-out-of-bounds error
commit dbec64b11c upstream.

bit-mask for pins 0 to 4 is BIT(0) to BIT(4) however we ended up with BIT(n - 1)
which is not right, and this was caught by below usban check

UBSAN: shift-out-of-bounds in drivers/gpio/gpio-wcd934x.c:34:14

Fixes: 59c3246834 ("gpio: wcd934x: Add support to wcd934x gpio controller")
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2021-06-16 12:01:45 +02:00
Yang Li
56a388a9cc phy: ti: Fix an error code in wiz_probe()
commit b8203ec7f5 upstream.

When the code execute this if statement, the value of ret is 0.
However, we can see from the dev_err() log that the value of
ret should be -EINVAL.

Clean up smatch warning:

drivers/phy/ti/phy-j721e-wiz.c:1216 wiz_probe() warn: missing error code 'ret'

Reported-by: Abaci Robot <abaci@linux.alibaba.com>
Fixes: c9f9eba066 ("phy: ti: j721e-wiz: Manage typec-gpio-dir")
Signed-off-by: Yang Li <yang.lee@linux.alibaba.com>
Link: https://lore.kernel.org/r/1621939832-65535-1-git-send-email-yang.lee@linux.alibaba.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2021-06-16 12:01:45 +02:00
Jerome Brunet
62d891861f ASoC: meson: gx-card: fix sound-dai dt schema
commit d031d99b02 upstream.

There is a fair amount of warnings when running 'make dtbs_check' with
amlogic,gx-sound-card.yaml.

Ex:
arch/arm64/boot/dts/amlogic/meson-gxm-q200.dt.yaml: sound: dai-link-0:sound-dai:0:1: missing phandle tag in 0
arch/arm64/boot/dts/amlogic/meson-gxm-q200.dt.yaml: sound: dai-link-0:sound-dai:0:2: missing phandle tag in 0
arch/arm64/boot/dts/amlogic/meson-gxm-q200.dt.yaml: sound: dai-link-0:sound-dai:0: [66, 0, 0] is too long

The reason is that the sound-dai phandle provided has cells, and in such
case the schema should use 'phandle-array' instead of 'phandle'.

Fixes: fd00366b8e ("ASoC: meson: gx: add sound card dt-binding documentation")
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
Link: https://lore.kernel.org/r/20210524093448.357140-1-jbrunet@baylibre.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2021-06-16 12:01:45 +02:00
Kefeng Wang
0e2c9aeb00 ASoC: core: Fix Null-point-dereference in fmt_single_name()
commit 41daf6ba59 upstream.

Check the return value of devm_kstrdup() in case of
Null-point-dereference.

Fixes: 45dd9943fc ("ASoC: core: remove artificial component and DAI name constraint")
Cc: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Link: https://lore.kernel.org/r/20210524024941.159952-1-wangkefeng.wang@huawei.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2021-06-16 12:01:45 +02:00
Wang Wensheng
d83075c25a phy: cadence: Sierra: Fix error return code in cdns_sierra_phy_probe()
commit 6411e386db upstream.

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

Fixes: a43f72ae13 ("phy: cadence: Sierra: Change MAX_LANES of Sierra to 16")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Wang Wensheng <wangwensheng4@huawei.com>
Link: https://lore.kernel.org/r/20210517015749.127799-1-wangwensheng4@huawei.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2021-06-16 12:01:45 +02:00
Zhen Lei
c9cb5837e9 tools/bootconfig: Fix error return code in apply_xbc()
commit e8ba0b2b64 upstream.

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

Link: https://lkml.kernel.org/r/20210508034216.2277-1-thunder.leizhen@huawei.com

Fixes: a995e6bc05 ("tools/bootconfig: Fix to check the write failure correctly")
Reported-by: Hulk Robot <hulkci@huawei.com>
Acked-by: Masami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2021-06-16 12:01:45 +02:00
Nathan Chancellor
16ccdcdfe6 vmlinux.lds.h: Avoid orphan section with !SMP
commit d4c6399900 upstream.

With x86_64_defconfig and the following configs, there is an orphan
section warning:

CONFIG_SMP=n
CONFIG_AMD_MEM_ENCRYPT=y
CONFIG_HYPERVISOR_GUEST=y
CONFIG_KVM=y
CONFIG_PARAVIRT=y

ld: warning: orphan section `.data..decrypted' from `arch/x86/kernel/cpu/vmware.o' being placed in section `.data..decrypted'
ld: warning: orphan section `.data..decrypted' from `arch/x86/kernel/kvm.o' being placed in section `.data..decrypted'

These sections are created with DEFINE_PER_CPU_DECRYPTED, which
ultimately turns into __PCPU_ATTRS, which in turn has a section
attribute with a value of PER_CPU_BASE_SECTION + the section name. When
CONFIG_SMP is not set, the base section is .data and that is not
currently handled in any linker script.

Add .data..decrypted to PERCPU_DECRYPTED_SECTION, which is included in
PERCPU_INPUT -> PERCPU_SECTION, which is include in the x86 linker
script when either CONFIG_X86_64 or CONFIG_SMP is unset, taking care of
the warning.

Fixes: ac26963a11 ("percpu: Introduce DEFINE_PER_CPU_DECRYPTED")
Link: https://github.com/ClangBuiltLinux/linux/issues/1360
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Nathan Chancellor <nathan@kernel.org>
Tested-by: Nick Desaulniers <ndesaulniers@google.com> # build
Signed-off-by: Kees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/20210506001410.1026691-1-nathan@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2021-06-16 12:01:45 +02:00
Arnd Bergmann
c25ec6386a ARM: cpuidle: Avoid orphan section warning
commit d94b93a910 upstream.

Since commit 83109d5d5f ("x86/build: Warn on orphan section placement"),
we get a warning for objects in orphan sections. The cpuidle implementation
for OMAP causes this when CONFIG_CPU_IDLE is disabled:

arm-linux-gnueabi-ld: warning: orphan section `__cpuidle_method_of_table' from `arch/arm/mach-omap2/pm33xx-core.o' being placed in section `__cpuidle_method_of_table'
arm-linux-gnueabi-ld: warning: orphan section `__cpuidle_method_of_table' from `arch/arm/mach-omap2/pm33xx-core.o' being placed in section `__cpuidle_method_of_table'
arm-linux-gnueabi-ld: warning: orphan section `__cpuidle_method_of_table' from `arch/arm/mach-omap2/pm33xx-core.o' being placed in section `__cpuidle_method_of_table'

Change the definition of CPUIDLE_METHOD_OF_DECLARE() to silently
drop the table and all code referenced from it when CONFIG_CPU_IDLE
is disabled.

Fixes: 06ee7a950b ("ARM: OMAP2+: pm33xx-core: Add cpuidle_ops for am335x/am437x")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Miguel Ojeda <ojeda@kernel.org>
Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
Signed-off-by: Kees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/20201230155506.1085689-1-arnd@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2021-06-16 12:01:44 +02:00
Shay Drory
cb1aa1da04 RDMA/mlx4: Do not map the core_clock page to user space unless enabled
commit 404e5a1269 upstream.

Currently when mlx4 maps the hca_core_clock page to the user space there
are read-modifiable registers, one of which is semaphore, on this page as
well as the clock counter. If user reads the wrong offset, it can modify
the semaphore and hang the device.

Do not map the hca_core_clock page to the user space unless the device has
been put in a backwards compatibility mode to support this feature.

After this patch, mlx4 core_clock won't be mapped to user space on the
majority of existing devices and the uverbs device time feature in
ibv_query_rt_values_ex() will be disabled.

Fixes: 52033cfb5a ("IB/mlx4: Add mmap call to map the hardware clock")
Link: https://lore.kernel.org/r/9632304e0d6790af84b3b706d8c18732bc0d5e27.1622726305.git.leonro@nvidia.com
Signed-off-by: Shay Drory <shayd@nvidia.com>
Signed-off-by: Leon Romanovsky <leonro@nvidia.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2021-06-16 12:01:44 +02:00
Kamal Heib
67cf4e447b RDMA/ipoib: Fix warning caused by destroying non-initial netns
commit a3e74fb924 upstream.

After the commit 5ce2dced8e ("RDMA/ipoib: Set rtnl_link_ops for ipoib
interfaces"), if the IPoIB device is moved to non-initial netns,
destroying that netns lets the device vanish instead of moving it back to
the initial netns, This is happening because default_device_exit() skips
the interfaces due to having rtnl_link_ops set.

Steps to reporoduce:
  ip netns add foo
  ip link set mlx5_ib0 netns foo
  ip netns delete foo

WARNING: CPU: 1 PID: 704 at net/core/dev.c:11435 netdev_exit+0x3f/0x50
Modules linked in: xt_CHECKSUM xt_MASQUERADE xt_conntrack ipt_REJECT
nf_reject_ipv4 nft_compat nft_counter nft_chain_nat nf_nat nf_conntrack
nf_defrag_ipv6 nf_defrag_ipv4 nf_tables nfnetlink tun d
 fuse
CPU: 1 PID: 704 Comm: kworker/u64:3 Tainted: G S      W  5.13.0-rc1+ #1
Hardware name: Dell Inc. PowerEdge R630/02C2CP, BIOS 2.1.5 04/11/2016
Workqueue: netns cleanup_net
RIP: 0010:netdev_exit+0x3f/0x50
Code: 48 8b bb 30 01 00 00 e8 ef 81 b1 ff 48 81 fb c0 3a 54 a1 74 13 48
8b 83 90 00 00 00 48 81 c3 90 00 00 00 48 39 d8 75 02 5b c3 <0f> 0b 5b
c3 66 66 2e 0f 1f 84 00 00 00 00 00 66 90 0f 1f 44 00
RSP: 0018:ffffb297079d7e08 EFLAGS: 00010206
RAX: ffff8eb542c00040 RBX: ffff8eb541333150 RCX: 000000008010000d
RDX: 000000008010000e RSI: 000000008010000d RDI: ffff8eb440042c00
RBP: ffffb297079d7e48 R08: 0000000000000001 R09: ffffffff9fdeac00
R10: ffff8eb5003be000 R11: 0000000000000001 R12: ffffffffa1545620
R13: ffffffffa1545628 R14: 0000000000000000 R15: ffffffffa1543b20
FS:  0000000000000000(0000) GS:ffff8ed37fa00000(0000) knlGS:0000000000000000
CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 00005601b5f4c2e8 CR3: 0000001fc8c10002 CR4: 00000000003706e0
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
Call Trace:
 ops_exit_list.isra.9+0x36/0x70
 cleanup_net+0x234/0x390
 process_one_work+0x1cb/0x360
 ? process_one_work+0x360/0x360
 worker_thread+0x30/0x370
 ? process_one_work+0x360/0x360
 kthread+0x116/0x130
 ? kthread_park+0x80/0x80
 ret_from_fork+0x22/0x30

To avoid the above warning and later on the kernel panic that could happen
on shutdown due to a NULL pointer dereference, make sure to set the
netns_refund flag that was introduced by commit 3a5ca85707 ("can: dev:
Move device back to init netns on owning netns delete") to properly
restore the IPoIB interfaces to the initial netns.

Fixes: 5ce2dced8e ("RDMA/ipoib: Set rtnl_link_ops for ipoib interfaces")
Link: https://lore.kernel.org/r/20210525150134.139342-1-kamalheib1@gmail.com
Signed-off-by: Kamal Heib <kamalheib1@gmail.com>
Reviewed-by: Leon Romanovsky <leonro@nvidia.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2021-06-16 12:01:44 +02:00
Jonathan Marek
fd681a8c7a drm/msm/a6xx: avoid shadow NULL reference in failure path
commit ce86c239e4 upstream.

If a6xx_hw_init() fails before creating the shadow_bo, the a6xx_pm_suspend
code referencing it will crash. Change the condition to one that avoids
this problem (note: creation of shadow_bo is behind this same condition)

Fixes: e8b0b994c3 ("drm/msm/a6xx: Clear shadow on suspend")
Signed-off-by: Jonathan Marek <jonathan@marek.ca>
Reviewed-by: Akhil P Oommen <akhilpo@codeaurora.org>
Link: https://lore.kernel.org/r/20210513171431.18632-6-jonathan@marek.ca
Signed-off-by: Rob Clark <robdclark@chromium.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2021-06-16 12:01:44 +02:00
Jonathan Marek
0bc79f4b7a drm/msm/a6xx: update/fix CP_PROTECT initialization
commit 4084340369 upstream.

Update CP_PROTECT register programming based on downstream.

A6XX_PROTECT_RW is renamed to A6XX_PROTECT_NORDWR to make things aligned
and also be more clear about what it does.

Note that this required switching to use the CP_ALWAYS_ON_COUNTER as the
GMU counter is not accessible from the cmdstream.  Which also means
using the CPU counter for the msm_gpu_submit_flush() tracepoint (as
catapult depends on being able to compare this to the start/end values
captured in cmdstream).  This may need to be revisited when IFPC is
enabled.

Also, compared to downstream, this opens up CP_PERFCTR_CP_SEL as the
userspace performance tooling (fdperf and pps-producer) expect to be
able to configure the CP counters.

Fixes: 4b565ca5a2 ("drm/msm: Add A6XX device support")
Signed-off-by: Jonathan Marek <jonathan@marek.ca>
Reviewed-by: Akhil P Oommen <akhilpo@codeaurora.org>
Link: https://lore.kernel.org/r/20210513171431.18632-5-jonathan@marek.ca
[switch to CP_ALWAYS_ON_COUNTER, open up CP_PERFCNTR_CP_SEL, and spiff
 up commit msg]
Signed-off-by: Rob Clark <robdclark@chromium.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2021-06-16 12:01:44 +02:00
Jonathan Marek
5b7dc8329d drm/msm/a6xx: fix incorrectly set uavflagprd_inv field for A650
commit b4387eaf38 upstream.

Value was shifted in the wrong direction, resulting in the field always
being zero, which is incorrect for A650.

Fixes: d0bac4e9cd ("drm/msm/a6xx: set ubwc config for A640 and A650")
Signed-off-by: Jonathan Marek <jonathan@marek.ca>
Reviewed-by: Akhil P Oommen <akhilpo@codeaurora.org>
Link: https://lore.kernel.org/r/20210513171431.18632-4-jonathan@marek.ca
Signed-off-by: Rob Clark <robdclark@chromium.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2021-06-16 12:01:44 +02:00
Linus Walleij
5a61f69da3 drm/mcde: Fix off by 10^3 in calculation
commit c8a5704439 upstream.

The calclulation of how many bytes we stuff into the
DSI pipeline for video mode panels is off by three
orders of magnitude because we did not account for the
fact that the DRM mode clock is in kilohertz rather
than hertz.

This used to be:
drm_mode_vrefresh(mode) * mode->htotal * mode->vtotal
which would become for example for s6e63m0:
60 x 514 x 831 = 25628040 Hz, but mode->clock is
25628 as it is in kHz.

This affects only the Samsung GT-I8190 "Golden" phone
right now since it is the only MCDE device with a video
mode display.

Curiously some specimen work with this code and wild
settings in the EOL and empty packets at the end of the
display, but I have noticed an eeire flicker until now.
Others were not so lucky and got black screens.

Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reported-by: Stephan Gerhold <stephan@gerhold.net>
Fixes: 920dd1b142 ("drm/mcde: Use mode->clock instead of reverse calculating it from the vrefresh")
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Tested-by: Stephan Gerhold <stephan@gerhold.net>
Reviewed-by: Stephan Gerhold <stephan@gerhold.net>
Link: https://patchwork.freedesktop.org/patch/msgid/20210608213318.3897858-1-linus.walleij@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2021-06-16 12:01:44 +02:00
Bjorn Andersson
d688892980 usb: typec: mux: Fix copy-paste mistake in typec_mux_match
commit 142d0b24c1 upstream.

Fix the copy-paste mistake in the return path of typec_mux_match(),
where dev is considered a member of struct typec_switch rather than
struct typec_mux.

The two structs are identical in regards to having the struct device as
the first entry, so this provides no functional change.

Fixes: 3370db3519 ("usb: typec: Registering real device entries for the muxes")
Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20210610002132.3088083-1-bjorn.andersson@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2021-06-16 12:01:44 +02:00
Wesley Cheng
9e0677c2e3 usb: dwc3: gadget: Disable gadget IRQ during pullup disable
commit 8212937305 upstream.

Current sequence utilizes dwc3_gadget_disable_irq() alongside
synchronize_irq() to ensure that no further DWC3 events are generated.
However, the dwc3_gadget_disable_irq() API only disables device
specific events.  Endpoint events can still be generated.  Briefly
disable the interrupt line, so that the cleanup code can run to
prevent device and endpoint events. (i.e. __dwc3_gadget_stop() and
dwc3_stop_active_transfers() respectively)

Without doing so, it can lead to both the interrupt handler and the
pullup disable routine both writing to the GEVNTCOUNT register, which
will cause an incorrect count being read from future interrupts.

Fixes: ae7e86108b ("usb: dwc3: Stop active transfers before halting the controller")
Signed-off-by: Wesley Cheng <wcheng@codeaurora.org>
Link: https://lore.kernel.org/r/1621571037-1424-1-git-send-email-wcheng@codeaurora.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2021-06-16 12:01:44 +02:00
Chen Li
cc440da4aa phy: usb: Fix misuse of IS_ENABLED
commit 7c2fc79250 upstream.

While IS_ENABLED() is perfectly fine for CONFIG_* symbols, it is not
for other symbols such as __BIG_ENDIAN that is provided directly by
the compiler.

Switch to use CONFIG_CPU_BIG_ENDIAN instead of __BIG_ENDIAN.

Signed-off-by: Chen Li <chenli@uniontech.com>
Reviewed-by: Al Cooper <alcooperx@gmail.com>
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
Fixes: 94583a4104 ("phy: usb: Restructure in preparation for adding 7216 USB support")
Link: https://lore.kernel.org/r/87czuggpra.wl-chenli@uniontech.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2021-06-16 12:01:43 +02:00