5183d3514ae6e8257386cc2d1384438d3da170b5
1037 Commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
lucaswei
|
95ddbb8a09 |
Merge LA.UM.9.12.R1.10.00.00.597.042 via branch 'qcom-msm-4.19-7250' into android-msm-pixel-4.19
Conflicts: Documentation/ABI/testing/sysfs-fs-f2fs Documentation/filesystems/f2fs.txt Documentation/filesystems/fscrypt.rst Documentation/filesystems/fsverity.rst Makefile arch/arm64/configs/vendor/kona_defconfig arch/arm64/configs/vendor/lito_defconfig block/blk-core.c build.config.common drivers/base/core.c drivers/base/power/main.c drivers/clk/clk.c drivers/clk/qcom/clk-alpha-pll.c drivers/dma-buf/dma-buf.c drivers/gpu/msm/kgsl_pool.c drivers/input/misc/qpnp-power-on.c drivers/iommu/dma-mapping-fast.c drivers/iommu/io-pgtable-fast.c drivers/iommu/io-pgtable-msm-secure.c drivers/iommu/io-pgtable.c drivers/of/property.c drivers/platform/msm/ipa/ipa_clients/ipa_gsb.c drivers/platform/msm/ipa/ipa_clients/ipa_mhi_client.c drivers/platform/msm/ipa/ipa_v3/ipa_mpm.c drivers/power/supply/power_supply_sysfs.c drivers/power/supply/qcom/qg-core.h drivers/power/supply/qcom/qpnp-qg.c drivers/soc/qcom/scm.c drivers/staging/android/ion/ion_page_pool.c drivers/tty/serial/msm_geni_serial.c fs/crypto/Kconfig fs/crypto/bio.c fs/crypto/crypto.c fs/crypto/fname.c fs/crypto/fscrypt_private.h fs/crypto/hooks.c fs/crypto/keyinfo.c fs/crypto/policy.c fs/ext4/ext4.h fs/ext4/hash.c fs/ext4/inode.c fs/ext4/namei.c fs/ext4/page-io.c fs/ext4/readpage.c fs/ext4/super.c fs/ext4/verity.c fs/f2fs/Makefile fs/f2fs/data.c fs/f2fs/dir.c fs/f2fs/f2fs.h fs/f2fs/file.c fs/f2fs/gc.c fs/f2fs/hash.c fs/f2fs/inline.c fs/f2fs/namei.c fs/f2fs/segment.c fs/f2fs/super.c fs/f2fs/sysfs.c fs/f2fs/verity.c fs/inode.c fs/ubifs/dir.c fs/unicode/utf8-core.c fs/verity/enable.c fs/verity/fsverity_private.h fs/verity/hash_algs.c fs/verity/open.c fs/verity/verify.c include/linux/coresight.h include/linux/device.h include/linux/dma-buf.h include/linux/f2fs_fs.h include/linux/fscrypt.h include/linux/fsverity.h include/linux/fwnode.h include/linux/leds-qpnp-flash.h include/linux/perf_event.h include/linux/power_supply.h include/linux/unicode.h include/soc/qcom/scm.h include/uapi/linux/nl80211.h kernel/events/core.c kernel/sched/core.c kernel/sched/fair.c lib/Kconfig.debug lib/Makefile lib/test_meminit.c mm/slub.c mm/swapfile.c mm/vmalloc.c net/wireless/nl80211.c security/selinux/include/security.h Bug: 153823050 Bug: 153825378 Signed-off-by: lucaswei <lucaswei@google.com> Change-Id: Ia2bfb56f0d48504ba600b52bdde958a76d5bff72 |
||
|
Robin Peng
|
58a95695aa |
Merge LA.UM.9.12.R1.10.00.00.597.032 via branch 'qcom-msm-4.19-7250' into android-msm-pixel-4.19
Conflicts: arch/arm64/configs/vendor/kona_defconfig arch/arm64/configs/vendor/lito_defconfig arch/arm64/include/asm/traps.h drivers/power/supply/qcom/qpnp-smb5.c kernel/sched/sched.h Bug: 151568484 Change-Id: I6ed9ae8bc29d93e42b8527ae25074db334c640da Signed-off-by: Robin Peng <robinpeng@google.com> |
||
|
Tri Vo
|
cc81490830 |
BACKPORT: PM / wakeup: Show wakeup sources stats in sysfs
Add an ID and a device pointer to 'struct wakeup_source'. Use them to to
expose wakeup sources statistics in sysfs under
/sys/class/wakeup/wakeup<ID>/*.
Bug: 129087298
Bug: 151789966
Co-developed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Co-developed-by: Stephen Boyd <swboyd@chromium.org>
Signed-off-by: Stephen Boyd <swboyd@chromium.org>
Signed-off-by: Tri Vo <trong@android.com>
Tested-by: Kalesh Singh <kaleshsingh@google.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
(cherry picked from commit c8377adfa78103be5380200eb9dab764d7ca890e)
Signed-off-by: Tri Vo <trong@google.com>
(cherry picked from commit
|
||
|
Tri Vo
|
02ba99da90 |
UPSTREAM: PM / wakeup: Use wakeup_source_register() in wakelock.c
kernel/power/wakelock.c duplicates wakeup source creation and
registration code from drivers/base/power/wakeup.c.
Change struct wakelock's wakeup source to a pointer and use
wakeup_source_register() function to create and register said wakeup
source. Use wakeup_source_unregister() on cleanup path.
Signed-off-by: Tri Vo <trong@android.com>
Reviewed-by: Stephen Boyd <swboyd@chromium.org>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
(cherry picked from commit 2434aea58e652a9fe114181ac90aa60e2f2e1b25)
Bug: 129087298
Signed-off-by: Tri Vo <trong@google.com>
Change-Id: I4e6b3c613c561fb382f17c3c31b6584aebabfb5d
(cherry picked from commit
|
||
|
Miguel de Dios
|
5fdabf90e9 |
power: Add detailed suspend abort reason.
Test: dumpsys batterystats Bug: 144326354 Change-Id: If7d7d39b5d18f4331147ef8c97494c03be80b1a9 Signed-off-by: Miguel de Dios <migueldedios@google.com> (cherry picked from commit 9f668bc11157ff5211cf67f9e9cdcb36e485b7e9) Signed-off-by: hsinyitseng <hsinyitseng@google.com> |
||
|
Mark Salyzyn
|
9aa46ff071 |
resolve merge conflicts of c61884b4963ba913df06e9ff5a1f98338ae4db67 to android-msm-pixel-4.19-gki-dev
SideEffect: must export kern_addr_valid to build, followup patch fixes. Bug: None Test: compile tested on bramble and kona, runtime test on kona Change-Id: I629358f2d61ac04787b1c82b1167ae7935e24acb |
||
|
lucaswei
|
19587463dd |
Merge branch 'LA.UM.8.13.R1.08.00.00.571.029' via branch 'qcom-msm-4.19-7250' into android-msm-pixel-4.19
Conflicts: drivers/power/supply/power_supply_sysfs.c drivers/power/supply/qcom/qpnp-smb5.c drivers/power/supply/qcom/smb5-lib.h drivers/scsi/ufs/ufs.h drivers/scsi/ufs/ufshcd.c drivers/scsi/ufs/ufshcd.h drivers/tty/serial/msm_geni_serial.c fs/pstore/inode.c include/linux/msm_drm_notify.h include/linux/power_supply.h include/uapi/scsi/ufs/ufs.h Bug: 144659331 Bug: 144685052 Change-Id: I00d543204bba9d0a839611102b82ef556a60cf75 Signed-off-by: lucaswei <lucaswei@google.com> |
||
|
Ivaylo Georgiev
|
4c30d46517 |
Merge android-4.19.95 (5da1114) into msm-4.19
* refs/heads/tmp-5da1114:
Revert crypto changes from android-4.19.79-95
Revert "UPSTREAM: PM / wakeup updates"
Revert "ANDROID: of: property: Enable of_devlink by default"
Revert "UPSTREAM: dt-bindings: arm: coresight: Add support for coresight-loses-context-with-cpu"
UPSTREAM: net: usbnet: Fix -Wcast-function-type
UPSTREAM: USB: dummy-hcd: use usb_urb_dir_in instead of usb_pipein
UPSTREAM: USB: dummy-hcd: increase max number of devices to 32
ANDROID: tty: serdev: Fix broken serial console input
ANDROID: update kernel ABI (perf_event changes)
BACKPORT: perf_event: Add support for LSM and SELinux checks
UPSTREAM: iommu: Allow io-pgtable to be used outside of drivers/iommu/
ANDROID: update abi for 4.19.94 release
ANDROID: update abi due to revert
Revert "BACKPORT: perf_event: Add support for LSM and SELinux checks"
UPSTREAM: selinux: sidtab reverse lookup hash table
UPSTREAM: selinux: avoid atomic_t usage in sidtab
UPSTREAM: selinux: check sidtab limit before adding a new entry
UPSTREAM: selinux: fix context string corruption in convert_context()
UPSTREAM: selinux: overhaul sidtab to fix bug and improve performance
UPSTREAM: selinux: refactor mls_context_to_sid() and make it stricter
UPSTREAM: selinux: use separate table for initial SID lookup
UPSTREAM: selinux: make "selinux_policycap_names[]" const char *
UPSTREAM: selinux: refactor sidtab conversion
ANDROID: Update ABI representation
ANDROID: GKI: clk: Don't disable unused clocks with sync state support
ANDROID: GKI: clk: Add support for clock providers with sync state
ANDROID: GKI: driver core: Add dev_has_sync_state()
ANDROID: update kernel ABI representation
BACKPORT: perf_event: Add support for LSM and SELinux checks
ANDROID: update ABI representation
UPSTREAM: exit: panic before exit_mm() on global init exit
ANDROID: serdev: Fix platform device support
ANDROID: Kconfig.gki: Add Hidden SPRD DRM configs
ANDROID: gki_defconfig: Disable TRANSPARENT_HUGEPAGE
ANDROID: gki_defconfig: Enable CONFIG_GNSS_CMDLINE_SERIAL
ANDROID: gnss: Add command line test driver
ANDROID: serdev: add platform device support
ANDROID: gki_defconfig: enable ARM64_SW_TTBR0_PAN
ANDROID: gki_defconfig: Set BINFMT_MISC as =m
UPSTREAM: binder: fix incorrect calculation for num_valid
ABI: Update ABI after f2fs merge
ANDROID: add initial ABI whitelist for android-4.19
ANDROID: staging: android: ion: Fix build when CONFIG_ION_SYSTEM_HEAP=n
ANDROID: staging: android: ion: Expose total heap and pool sizes via sysfs
ANDROID: Update ABI representation due to vmstat counter changes
UPSTREAM: include/linux/slab.h: fix sparse warning in kmalloc_type()
UPSTREAM: mm, slab: shorten kmalloc cache names for large sizes
UPSTREAM: mm, proc: add KReclaimable to /proc/meminfo
UPSTREAM: mm: rename and change semantics of nr_indirectly_reclaimable_bytes
UPSTREAM: dcache: allocate external names from reclaimable kmalloc caches
UPSTREAM: mm, slab/slub: introduce kmalloc-reclaimable caches
UPSTREAM: mm, slab: combine kmalloc_caches and kmalloc_dma_caches
ANDROID: abi update for 4.19.89
ANDROID: update abi_gki_aarch64.xml for LTO, CFI, and SCS
ANDROID: gki_defconfig: enable LTO, CFI, and SCS
ANDROID: update abi_gki_aarch64.xml for CONFIG_GNSS
ANDROID: cuttlefish_defconfig: Enable CONFIG_GNSS
UPSTREAM: arm64: Validate tagged addresses in access_ok() called from kernel threads
ANDROID: mm: Throttle rss_stat tracepoint
UPSTREAM: mm: slub: really fix slab walking for init_on_free
ANDROID: update abi_gki_aarch64.xml for nf change
ANDROID: kbuild: limit LTO inlining
ANDROID: kbuild: merge module sections with LTO
ANDROID: netfilter: nf_nat: remove static from nf_nat_ipv4_fn
UPSTREAM: drm/client: remove the exporting of drm_client_close
ANDROID: f2fs: fix possible merge of unencrypted with encrypted I/O
UPSTREAM: binder: Add binder_proc logging to binderfs
UPSTREAM: binder: Make transaction_log available in binderfs
UPSTREAM: binder: Add stats, state and transactions files
UPSTREAM: binder: add a mount option to show global stats
UPSTREAM: binder: Validate the default binderfs device names.
UPSTREAM: binder: Add default binder devices through binderfs when configured
UPSTREAM: binder: fix CONFIG_ANDROID_BINDER_DEVICES
UPSTREAM: android: binder: use kstrdup instead of open-coding it
UPSTREAM: binderfs: remove separate device_initcall()
UPSTREAM: binderfs: respect limit on binder control creation
UPSTREAM: binderfs: switch from d_add() to d_instantiate()
UPSTREAM: binderfs: drop lock in binderfs_binder_ctl_create
UPSTREAM: binderfs: kill_litter_super() before cleanup
UPSTREAM: binderfs: rework binderfs_binder_device_create()
UPSTREAM: binderfs: rework binderfs_fill_super()
UPSTREAM: binderfs: prevent renaming the control dentry
UPSTREAM: binderfs: remove outdated comment
UPSTREAM: binderfs: fix error return code in binderfs_fill_super()
UPSTREAM: binderfs: handle !CONFIG_IPC_NS builds
UPSTREAM: binderfs: reserve devices for initial mount
UPSTREAM: binderfs: rename header to binderfs.h
UPSTREAM: binderfs: implement "max" mount option
UPSTREAM: binderfs: make each binderfs mount a new instance
UPSTREAM: binderfs: remove wrong kern_mount() call
UPSTREAM: binder: implement binderfs
UPSTREAM: binder: remove BINDER_DEBUG_ENTRY()
ANDROID: Don't base allmodconfig on gki_defconfig
ANDROID: Disable UNWINDER_ORC for allmodconfig
ANDROID: update abi_gki_aarch64.xml for 4.19.87
BACKPORT: ARM: 8905/1: Emit __gnu_mcount_nc when using Clang 10.0.0 or newer
ANDROID: update abi_gki_aarch64.xml
ANDROID: gki_defconfig: =m's applied for virtio configs in arm64
UPSTREAM: of: property: Add device link support for interrupt-parent, dmas and -gpio(s)
UPSTREAM: of: property: Add device link support for "iommu-map"
UPSTREAM: of: property: Fix the semantics of of_is_ancestor_of()
UPSTREAM: i2c: of: Populate fwnode in of_i2c_get_board_info()
UPSTREAM: driver core: Clarify documentation for fwnode_operations.add_links()
UPSTREAM: dt-bindings: arm: coresight: Add support for coresight-loses-context-with-cpu
BACKPORT: coresight: etm4x: Save/restore state across CPU low power states
ANDROID: Update ABI representation
ANDROID: gki_defconfig: IIO=y
f2fs: stop GC when the victim becomes fully valid
f2fs: expose main_blkaddr in sysfs
f2fs: choose hardlimit when softlimit is larger than hardlimit in f2fs_statfs_project()
f2fs: Fix deadlock in f2fs_gc() context during atomic files handling
f2fs: show f2fs instance in printk_ratelimited
f2fs: fix potential overflow
f2fs: fix to update dir's i_pino during cross_rename
f2fs: support aligned pinned file
f2fs: avoid kernel panic on corruption test
f2fs: fix wrong description in document
f2fs: cache global IPU bio
f2fs: fix to avoid memory leakage in f2fs_listxattr
f2fs: check total_segments from devices in raw_super
f2fs: update multi-dev metadata in resize_fs
f2fs: mark recovery flag correctly in read_raw_super_block()
f2fs: fix to update time in lazytime mode
vfs: don't allow writes to swap files
mm: set S_SWAPFILE on blockdev swap devices
BACKPORT: ARM: 8900/1: UNWINDER_FRAME_POINTER implementation for Clang
ANDROID: update abi_gki_aarch64.xml for 4.19.87
ANDROID: gki_defconfig: FW_CACHE to no
FROMGIT: firmware_class: make firmware caching configurable
FROMLIST: arm64: implement Shadow Call Stack
FROMLIST: arm64: disable SCS for hypervisor code
BACKPORT: FROMLIST: arm64: vdso: disable Shadow Call Stack
FROMLIST: arm64: efi: restore x18 if it was corrupted
FROMLIST: arm64: preserve x18 when CPU is suspended
FROMLIST: arm64: reserve x18 from general allocation with SCS
FROMLIST: arm64: disable function graph tracing with SCS
FROMLIST: scs: add support for stack usage debugging
FROMLIST: scs: add accounting
FROMLIST: add support for Clang's Shadow Call Stack (SCS)
FROMLIST: arm64: kernel: avoid x18 in __cpu_soft_restart
FROMLIST: arm64: kvm: stop treating register x18 as caller save
FROMLIST: arm64/lib: copy_page: avoid x18 register in assembler code
FROMLIST: arm64: mm: avoid x18 in idmap_kpti_install_ng_mappings
ANDROID: use non-canonical CFI jump tables
ANDROID: arm64: add __nocfi to __apply_alternatives
ANDROID: arm64: add __pa_function
ANDROID: arm64: allow ThinLTO to be selected
ANDROID: soc/tegra: disable ARCH_TEGRA_210_SOC with LTO
FROMLIST: arm64: fix alternatives with LLVM's integrated assembler
ANDROID: irqchip/gic-v3: rename gic_of_init to work around a ThinLTO+CFI bug
ANDROID: init: ensure initcall ordering with LTO
Revert "ANDROID: init: ensure initcall ordering with LTO"
ANDROID: add support for ThinLTO
ANDROID: clang: update to 10.0.1
ANDROID: gki_defconfig: enable CONFIG_REGULATOR_FIXED_VOLTAGE
ANDROID: gki_defconfig: removed CONFIG_PM_WAKELOCKS
ANDROID: gki_defconfig: enable CONFIG_IKHEADERS as m
FROMGIT: pinctrl: devicetree: Avoid taking direct reference to device name string
ANDROID: update abi_gki_aarch64.xml for 4.19.86 update
ANDROID: Update ABI representation
ANDROID: gki_defconfig: disable FUNCTION_TRACER
ANDROID: Update the ABI representation
ANDROID: update ABI representation
ANDROID: add unstripped modules to the distribution
FROMLIST: vsprintf: Inline call to ptr_to_hashval
UPSTREAM: rss_stat: Add support to detect RSS updates of external mm
UPSTREAM: mm: emit tracepoint when RSS changes
FROMGIT: driver core: Allow device link operations inside sync_state()
ANDROID: uid_sys_stats: avoid double accounting of dying threads
ANDROID: scsi: ufs-qcom: Enable BROKEN_CRYPTO quirk flag
ANDROID: scsi: ufs-hisi: Enable BROKEN_CRYPTO quirk flag
ANDROID: scsi: ufs: Add quirk bit for controllers that don't play well with inline crypto
ANDROID: scsi: ufs: UFS init should not require inline crypto
ANDROID: scsi: ufs: UFS crypto variant operations API
ANDROID: gki_defconfig: enable inline encryption
BACKPORT: FROMLIST: ext4: add inline encryption support
BACKPORT: FROMLIST: f2fs: add inline encryption support
BACKPORT: FROMLIST: fscrypt: add inline encryption support
BACKPORT: FROMLIST: scsi: ufs: Add inline encryption support to UFS
BACKPORT: FROMLIST: scsi: ufs: UFS crypto API
BACKPORT: FROMLIST: scsi: ufs: UFS driver v2.1 spec crypto additions
BACKPORT: FROMLIST: block: blk-crypto for Inline Encryption
ANDROID: block: Fix bio_crypt_should_process WARN_ON
BACKPORT: FROMLIST: block: Add encryption context to struct bio
BACKPORT: FROMLIST: block: Keyslot Manager for Inline Encryption
FROMLIST: f2fs: add support for IV_INO_LBLK_64 encryption policies
FROMLIST: ext4: add support for IV_INO_LBLK_64 encryption policies
BACKPORT: FROMLIST: fscrypt: add support for IV_INO_LBLK_64 policies
FROMLIST: fscrypt: zeroize fscrypt_info before freeing
FROMLIST: fscrypt: remove struct fscrypt_ctx
BACKPORT: FROMLIST: fscrypt: invoke crypto API for ESSIV handling
ANDROID: build kernels with llvm-nm and llvm-objcopy
ANDROID: Fix allmodconfig build with CC=clang
UPSTREAM: mm/page_poison: expose page_poisoning_enabled to kernel modules
FROMGIT: of: property: Add device link support for iommus, mboxes and io-channels
FROMGIT: of: property: Make it easy to add device links from DT properties
FROMGIT: of: property: Minor style clean up of of_link_to_phandle()
Revert "ANDROID: of/property: Add device link support for iommus"
ANDROID: Add allmodconfig build.configs for x86_64 and aarch64
ANDROID: fix allmodconfig build
ANDROID: nf: IDLETIMER: Fix possible use before initialization in idletimer_resume
BACKPORT: coresight: funnel: Support static funnel
BACKPORT:FROMGIT: coresight: replicator: Fix missing spin_lock_init()
BACKPORT:FROMGIT: coresight: funnel: Fix missing spin_lock_init()
BACKPORT:FROMGIT: coresight: Serialize enabling/disabling a link device.
UPSTREAM: coresight: tmc-etr: Add barrier packets when moving offset forward
UPSTREAM: coresight: tmc-etr: Decouple buffer sync and barrier packet insertion
UPSTREAM: coresight: tmc: Make memory width mask computation into a function
UPSTREAM: coresight: tmc-etr: Fix perf_data check
UPSTREAM: coresight: tmc-etr: Fix updating buffer in not-snapshot mode.
UPSTREAM: coresight: tmc-etr: Check if non-secure access is enabled
UPSTREAM: coresight: tmc-etr: Handle memory errors
BACKPORT: coresight: etr_buf: Consolidate refcount initialization
UPSTREAM: coresight: Fix DEBUG_LOCKS_WARN_ON for uninitialized attribute
UPSTREAM: coresight: Use coresight device names for sinks in PMU attribute
UPSTREAM: coresight: tmc-etr: alloc_perf_buf: Do not call smp_processor_id from preemptible
UPSTREAM: coresight: tmc-etr: Do not call smp_processor_id() from preemptible
UPSTREAM: coresight: perf: Don't set the truncated flag in snapshot mode
UPSTREAM: coresight: tmc-etf: Fix snapshot mode update function
UPSTREAM: coresight: tmc-etr: Properly set AUX buffer head in snapshot mode
UPSTREAM: coresight: tmc-etr: Add support for CPU-wide trace scenarios
UPSTREAM: coresight: tmc-etr: Allocate and free ETR memory buffers for CPU-wide scenarios
UPSTREAM: coresight: tmc-etr: Introduce the notion of IDR to ETR devices
UPSTREAM: coresight: tmc-etr: Introduce the notion of reference counting to ETR devices
UPSTREAM: coresight: tmc-etr: Introduce the notion of process ID to ETR devices
UPSTREAM: coresight: tmc-etr: Create per-thread buffer allocation function
UPSTREAM: coresight: tmc-etr: Refactor function tmc_etr_setup_perf_buf()
UPSTREAM: coresight: Communicate perf event to sink buffer allocation functions
UPSTREAM: coresight: perf: Refactor function free_event_data()
UPSTREAM: coresight: perf: Clean up function etm_setup_aux()
UPSTREAM: coresight: Properly address concurrency in sink::update() functions
UPSTREAM: coresight: Properly address errors in sink::disable() functions
UPSTREAM: coresight: Move reference counting inside sink drivers
UPSTREAM: coresight: Adding return code to sink::disable() operation
UPSTREAM: coresight: etm4x: Configure tracers to emit timestamps
UPSTREAM: coresight: etm4x: Skip selector pair 0
UPSTREAM: coresight: etm4x: Add kernel configuration for CONTEXTID
UPSTREAM: coresight: pmu: Adding ITRACE property to cs_etm PMU
UPSTREAM: coresight: tmc: Cleanup power management
UPSTREAM: coresight: Fix freeing up the coresight connections
UPSTREAM: coresight: tmc: Report DMA setup failures
UPSTREAM: coresight: catu: fix clang build warning
UPSTREAM: perf/core: Fix the address filtering fix
UPSTREAM: perf, pt, coresight: Fix address filters for vmas with non-zero offset
UPSTREAM: perf: Copy parent's address filter offsets on clone
UPSTREAM: coresight: Use event attributes for sink selection
UPSTREAM: coresight: perf: Add "sinks" group to PMU directory
UPSTREAM: coresight: etb10: Add support for CLAIM tag
UPSTREAM: coreisght: tmc: Claim device before use
UPSTREAM: coresight: dynamic-replicator: Claim device for use
UPSTREAM: coresight: funnel: Claim devices before use
UPSTREAM: coresight: etmx: Claim devices before use
UPSTREAM: coresight: Add support for CLAIM tag protocol
UPSTREAM: coresight: dynamic-replicator: Handle multiple connections
UPSTREAM: coresight: etb10: Handle errors enabling the device
UPSTREAM: coresight: etm3: Add support for handling errors
UPSTREAM: coresight: etm4x: Add support for handling errors
UPSTREAM: coresight: tmc-etb/etf: Prepare to handle errors enabling
UPSTREAM: coresight: tmc-etr: Handle errors enabling CATU
UPSTREAM: coresight: tmc-etr: Refactor for handling errors
UPSTREAM: coresight: Handle failures in enabling a trace path
UPSTREAM: coresight: tmc: Fix byte-address alignment for RRP
UPSTREAM: coresight: etm4x: Configure EL2 exception level when kernel is running in HYP
UPSTREAM: coresight: etb10: Splitting function etb_enable()
UPSTREAM: coresight: etb10: Refactor etb_drvdata::mode handling
UPSTREAM: coresight: etm-perf: Add support for ETR backend
UPSTREAM: coresight: perf: Remove set_buffer call back
UPSTREAM: coresight: perf: Add helper to retrieve sink configuration
UPSTREAM: coresight: perf: Remove reset_buffer call back for sinks
UPSTREAM: coresight: Convert driver messages to dev_dbg
UPSTREAM: coresight: tmc-etr: Relax collection of trace from sysfs mode
UPSTREAM: coresight: tmc-etr: Handle driver mode specific ETR buffers
UPSTREAM: coresight: perf: Disable trace path upon source error
UPSTREAM: coresight: perf: Allow tracing on hotplugged CPUs
UPSTREAM: coresight: perf: Avoid unncessary CPU hotplug read lock
UPSTREAM: coresight: perf: Fix per cpu path management
UPSTREAM: coresight: Fix handling of sinks
UPSTREAM: coresight: Use ERR_CAST instead of ERR_PTR
UPSTREAM: coresight: Fix remote endpoint parsing
UPSTREAM: coresight: platform: Fix leaking device reference
UPSTREAM: coresight: platform: Fix refcounting for graph nodes
UPSTREAM: coresight: platform: Refactor graph endpoint parsing
UPSTREAM: coresight: Document error handling in coresight_register
ANDROID: regression introduced override_creds=off
ANDROID: overlayfs: internal getxattr operations without sepolicy checking
ANDROID: overlayfs: add __get xattr method
ANDROID: Add optional __get xattr method paired to __vfs_getxattr
UPSTREAM: scsi: ufs: override auto suspend tunables for ufs
UPSTREAM: scsi: core: allow auto suspend override by low-level driver
FROMGIT: of: property: Skip adding device links to suppliers that aren't devices
ANDROID: gki_defconfig: enable CONFIG_KEYBOARD_GPIO
UPSTREAM: dm bufio: introduce a global cache replacement
UPSTREAM: dm bufio: remove old-style buffer cleanup
UPSTREAM: dm bufio: introduce a global queue
UPSTREAM: dm bufio: refactor adjust_total_allocated
UPSTREAM: dm bufio: call adjust_total_allocated from __link_buffer and __unlink_buffer
ANDROID: dummy_cpufreq: Implement get()
ANDROID: gki_defconfig: enable CONFIG_CPUSETS
ANDROID: virtio: virtio_input: Set the amount of multitouch slots in virtio input
rtlwifi: Fix potential overflow on P2P code
ANDROID: cpufreq: create dummy cpufreq driver
ANDROID: Allow DRM_IOCTL_MODE_*_DUMB for render clients.
Cuttlefish Wifi: Add data ops in virt_wifi driver for scan data simulation
ANDROID: of: property: Enable of_devlink by default
ANDROID: of: property: Make sure child dependencies don't block probing of parent
ANDROID: driver core: Allow fwnode_operations.add_links to differentiate errors
ANDROID: driver core: Allow a device to wait on optional suppliers
ANDROID: driver core: Add device link support for SYNC_STATE_ONLY flag
FROMGIT: docs: driver-model: Add documentation for sync_state
FROMGIT: driver: core: Improve documentation for fwnode_operations.add_links()
FROMGIT: of: property: Minor code formatting/style clean ups
ANDROID: of/property: Add device link support for iommus
ANDROID: move up spin_unlock_bh() ahead of remove_proc_entry()
BACKPORT: arm64: tags: Preserve tags for addresses translated via TTBR1
UPSTREAM: arm64: memory: Implement __tag_set() as common function
UPSTREAM: arm64/mm: fix variable 'tag' set but not used
UPSTREAM: arm64: avoid clang warning about self-assignment
ANDROID: sdcardfs: evict dentries on fscrypt key removal
ANDROID: fscrypt: add key removal notifier chain
ANDROID: refactor build.config files to remove duplication
ANDROID: Move from clang r353983c to r365631c
ANDROID: gki_defconfig: remove PWRSEQ_EMMC and PWRSEQ_SIMPLE
ANDROID: unconditionally compile sig_ok in struct module
ANDROID: gki_defconfig: enable fs-verity
UPSTREAM: mm: vmalloc: show number of vmalloc pages in /proc/meminfo
BACKPORT: PM/sleep: Expose suspend stats in sysfs
UPSTREAM: power: supply: Init device wakeup after device_add()
UPSTREAM: PM / wakeup: Unexport wakeup_source_sysfs_{add,remove}()
UPSTREAM: PM / wakeup: Register wakeup class kobj after device is added
UPSTREAM: PM / wakeup: Fix sysfs registration error path
UPSTREAM: PM / wakeup: Show wakeup sources stats in sysfs
UPSTREAM: PM / wakeup: Use wakeup_source_register() in wakelock.c
UPSTREAM: PM / wakeup: Drop wakeup_source_init(), wakeup_source_prepare()
UPSTREAM: PM / wakeup: Drop wakeup_source_drop()
UPSTREAM: PM / core: Add support to skip power management in device/driver model
gki_defconfig: Enable CONFIG_DM_SNAPSHOT
ANDROID: gki_defconfig: enable accelerated AES and SHA-256
ANDROID: fix overflow in /proc/uid_cputime/remove_uid_range
ANDROID: kasan: fix has_attribute check on older GCC versions
ANDROID: gki_defconfig: enable CONFIG_PARAVIRT and CONFIG_HYPERVISOR_GUEST
ANDROID: gki_defconfig: enable CONFIG_NLS_*
ANDROID: gki_defconfig: Enable BPF_JIT and BPF_JIT_ALWAYS_ON
FROMGIT: of: property: Create device links for all child-supplier depencencies
FROMGIT: of/platform: Pause/resume sync state during init and of_platform_populate()
BACKPORT: FROMGIT: driver core: Add sync_state driver/bus callback
BACKPORT: FROMGIT: of: property: Add functional dependency link from DT bindings
FROMGIT: driver core: Add support for linking devices during device addition
FROMGIT: driver core: Add fwnode_to_dev() to look up device from fwnode
UPSTREAM: mm: untag user pointers in mmap/munmap/mremap/brk
UPSTREAM: vfio/type1: untag user pointers in vaddr_get_pfn
UPSTREAM: tee/shm: untag user pointers in tee_shm_register
UPSTREAM: media/v4l2-core: untag user pointers in videobuf_dma_contig_user_get
UPSTREAM: drm/radeon: untag user pointers in radeon_gem_userptr_ioctl
BACKPORT: drm/amdgpu: untag user pointers
UPSTREAM: userfaultfd: untag user pointers
UPSTREAM: fs/namespace: untag user pointers in copy_mount_options
UPSTREAM: mm: untag user pointers in get_vaddr_frames
UPSTREAM: mm: untag user pointers in mm/gup.c
UPSTREAM: mm: untag user pointers passed to memory syscalls
BACKPORT: lib: untag user pointers in strn*_user
UPSTREAM: arm64: Fix reference to docs for ARM64_TAGGED_ADDR_ABI
UPSTREAM: selftests, arm64: add kernel headers path for tags_test
BACKPORT: arm64: Relax Documentation/arm64/tagged-pointers.rst
UPSTREAM: arm64: Define Documentation/arm64/tagged-address-abi.rst
UPSTREAM: arm64: Change the tagged_addr sysctl control semantics to only prevent the opt-in
UPSTREAM: arm64: Tighten the PR_{SET, GET}_TAGGED_ADDR_CTRL prctl() unused arguments
UPSTREAM: selftests, arm64: fix uninitialized symbol in tags_test.c
UPSTREAM: arm64: mm: Really fix sparse warning in untagged_addr()
UPSTREAM: selftests, arm64: add a selftest for passing tagged pointers to kernel
BACKPORT: arm64: Introduce prctl() options to control the tagged user addresses ABI
UPSTREAM: arm64: untag user pointers in access_ok and __uaccess_mask_ptr
UPSTREAM: uaccess: add noop untagged_addr definition
BACKPORT: block: annotate refault stalls from IO submission
f2fs: add a condition to detect overflow in f2fs_ioc_gc_range()
f2fs: fix to add missing F2FS_IO_ALIGNED() condition
f2fs: fix to fallback to buffered IO in IO aligned mode
f2fs: fix to handle error path correctly in f2fs_map_blocks
f2fs: fix extent corrupotion during directIO in LFS mode
f2fs: check all the data segments against all node ones
f2fs: Add a small clarification to CONFIG_FS_F2FS_FS_SECURITY
f2fs: fix inode rwsem regression
f2fs: fix to avoid accessing uninitialized field of inode page in is_alive()
f2fs: avoid infinite GC loop due to stale atomic files
f2fs: Fix indefinite loop in f2fs_gc()
f2fs: convert inline_data in prior to i_size_write
f2fs: fix error path of f2fs_convert_inline_page()
f2fs: add missing documents of reserve_root/resuid/resgid
f2fs: fix flushing node pages when checkpoint is disabled
f2fs: enhance f2fs_is_checkpoint_ready()'s readability
f2fs: clean up __bio_alloc()'s parameter
f2fs: fix wrong error injection path in inc_valid_block_count()
f2fs: fix to writeout dirty inode during node flush
f2fs: optimize case-insensitive lookups
f2fs: introduce f2fs_match_name() for cleanup
f2fs: Fix indefinite loop in f2fs_gc()
f2fs: allocate memory in batch in build_sit_info()
f2fs: support FS_IOC_{GET,SET}FSLABEL
f2fs: fix to avoid data corruption by forbidding SSR overwrite
f2fs: Fix build error while CONFIG_NLS=m
Revert "f2fs: avoid out-of-range memory access"
f2fs: cleanup the code in build_sit_entries.
f2fs: fix wrong available node count calculation
f2fs: remove duplicate code in f2fs_file_write_iter
f2fs: fix to migrate blocks correctly during defragment
f2fs: use wrapped f2fs_cp_error()
f2fs: fix to use more generic EOPNOTSUPP
f2fs: use wrapped IS_SWAPFILE()
f2fs: Support case-insensitive file name lookups
f2fs: include charset encoding information in the superblock
fs: Reserve flag for casefolding
f2fs: fix to avoid call kvfree under spinlock
fs: f2fs: Remove unnecessary checks of SM_I(sbi) in update_general_status()
f2fs: disallow direct IO in atomic write
f2fs: fix to handle quota_{on,off} correctly
f2fs: fix to detect cp error in f2fs_setxattr()
f2fs: fix to spread f2fs_is_checkpoint_ready()
f2fs: support fiemap() for directory inode
f2fs: fix to avoid discard command leak
f2fs: fix to avoid tagging SBI_QUOTA_NEED_REPAIR incorrectly
f2fs: fix to drop meta/node pages during umount
f2fs: disallow switching io_bits option during remount
f2fs: fix panic of IO alignment feature
f2fs: introduce {page,io}_is_mergeable() for readability
f2fs: fix livelock in swapfile writes
f2fs: add fs-verity support
ext4: update on-disk format documentation for fs-verity
ext4: add fs-verity read support
ext4: add basic fs-verity support
fs-verity: support builtin file signatures
fs-verity: add SHA-512 support
fs-verity: implement FS_IOC_MEASURE_VERITY ioctl
fs-verity: implement FS_IOC_ENABLE_VERITY ioctl
fs-verity: add data verification hooks for ->readpages()
fs-verity: add the hook for file ->setattr()
fs-verity: add the hook for file ->open()
fs-verity: add inode and superblock fields
fs-verity: add Kconfig and the helper functions for hashing
fs: uapi: define verity bit for FS_IOC_GETFLAGS
fs-verity: add UAPI header
fs-verity: add MAINTAINERS file entry
fs-verity: add a documentation file
ext4: fix kernel oops caused by spurious casefold flag
ext4: fix coverity warning on error path of filename setup
ext4: optimize case-insensitive lookups
ext4: fix dcache lookup of !casefolded directories
unicode: update to Unicode 12.1.0 final
unicode: add missing check for an error return from utf8lookup()
ext4: export /sys/fs/ext4/feature/casefold if Unicode support is present
unicode: refactor the rule for regenerating utf8data.h
ext4: Support case-insensitive file name lookups
ext4: include charset encoding information in the superblock
unicode: update unicode database unicode version 12.1.0
unicode: introduce test module for normalized utf8 implementation
unicode: implement higher level API for string handling
unicode: reduce the size of utf8data[]
unicode: introduce code for UTF-8 normalization
unicode: introduce UTF-8 character database
ext4 crypto: fix to check feature status before get policy
fscrypt: document the new ioctls and policy version
ubifs: wire up new fscrypt ioctls
f2fs: wire up new fscrypt ioctls
ext4: wire up new fscrypt ioctls
fscrypt: require that key be added when setting a v2 encryption policy
fscrypt: add FS_IOC_REMOVE_ENCRYPTION_KEY_ALL_USERS ioctl
fscrypt: allow unprivileged users to add/remove keys for v2 policies
fscrypt: v2 encryption policy support
fscrypt: add an HKDF-SHA512 implementation
fscrypt: add FS_IOC_GET_ENCRYPTION_KEY_STATUS ioctl
fscrypt: add FS_IOC_REMOVE_ENCRYPTION_KEY ioctl
fscrypt: add FS_IOC_ADD_ENCRYPTION_KEY ioctl
fscrypt: rename keyinfo.c to keysetup.c
fscrypt: move v1 policy key setup to keysetup_v1.c
fscrypt: refactor key setup code in preparation for v2 policies
fscrypt: rename fscrypt_master_key to fscrypt_direct_key
fscrypt: add ->ci_inode to fscrypt_info
fscrypt: use FSCRYPT_* definitions, not FS_*
fscrypt: use FSCRYPT_ prefix for uapi constants
fs, fscrypt: move uapi definitions to new header <linux/fscrypt.h>
fscrypt: use ENOPKG when crypto API support missing
fscrypt: improve warnings for missing crypto API support
fscrypt: improve warning messages for unsupported encryption contexts
fscrypt: make fscrypt_msg() take inode instead of super_block
fscrypt: clean up base64 encoding/decoding
fscrypt: remove loadable module related code
Updated following files to fix build errors:
drivers/gpu/msm/kgsl_pool.c
drivers/hwtracing/coresight/coresight-dummy.c
drivers/iommu/dma-mapping-fast.c
drivers/iommu/io-pgtable-fast.c
drivers/iommu/io-pgtable-msm-secure.c
kernel/taskstats.c
mm/vmalloc.c
security/selinux/ss/sidtab.h
Conflicts:
arch/arm/Makefile
arch/arm64/Kconfig
arch/x86/include/asm/syscall_wrapper.h
build.config.common
drivers/clk/clk.c
drivers/hwtracing/coresight/coresight-etm-perf.c
drivers/hwtracing/coresight/coresight-funnel.c
drivers/hwtracing/coresight/coresight-tmc-etf.c
drivers/hwtracing/coresight/coresight-tmc-etr.c
drivers/hwtracing/coresight/coresight-tmc.c
drivers/hwtracing/coresight/coresight-tmc.h
drivers/hwtracing/coresight/coresight.c
drivers/hwtracing/coresight/of_coresight.c
drivers/iommu/arm-smmu.c
drivers/iommu/io-pgtable-arm.c
drivers/iommu/io-pgtable.c
drivers/scsi/scsi_sysfs.c
drivers/scsi/sd.c
drivers/scsi/ufs/ufshcd.c
drivers/scsi/ufs/ufshcd.h
drivers/staging/android/ion/ion.c
drivers/staging/android/ion/ion.h
drivers/staging/android/ion/ion_page_pool.c
fs/ext4/readpage.c
fs/f2fs/data.c
fs/f2fs/f2fs.h
fs/f2fs/file.c
fs/f2fs/segment.c
fs/f2fs/super.c
include/linux/clk-provider.h
include/linux/compiler_types.h
include/linux/coresight.h
include/linux/mmzone.h
include/scsi/scsi_device.h
include/trace/events/kmem.h
kernel/events/core.c
kernel/sched/core.c
mm/vmstat.c
Change-Id: I2eca52b08b484f2b5c30437671cab8cb0195b8d6
Signed-off-by: Ivaylo Georgiev <irgeorgiev@codeaurora.org>
|
||
|
Ivaylo Georgiev
|
45417b1316 |
Revert "UPSTREAM: PM / wakeup updates"
This is a preparation change for merging android-4.19.95 into msm-4.19 branch. The following changes are reverted. They will be reintroduced to msm-4.19 at later stage. |
||
|
Ivaylo Georgiev
|
a025b6c910 |
Merge android-4.19.78 (75337a6) into msm-4.19
* refs/heads/tmp-75337a6:
ANDROID: usb: gadget: Fix dependency for f_accessory
ANDROID: properly export new symbols with _GPL tag
UPSTREAM: mm/kasan: fix false positive invalid-free reports with CONFIG_KASAN_SW_TAGS=y
UPSTREAM: kasan: initialize tag to 0xff in __kasan_kmalloc
UPSTREAM: x86/boot: Provide KASAN compatible aliases for string routines
UPSTREAM: x86/uaccess, kasan: Fix KASAN vs SMAP
BACKPORT: x86/uaccess: Introduce user_access_{save,restore}()
UPSTREAM: kasan: fix variable 'tag' set but not used warning
UPSTREAM: Revert "x86_64: Increase stack size for KASAN_EXTRA"
UPSTREAM: kasan: fix coccinelle warnings in kasan_p*_table
UPSTREAM: kasan: fix kasan_check_read/write definitions
BACKPORT: kasan: remove use after scope bugs detection.
BACKPORT: kasan: turn off asan-stack for clang-8 and earlier
UPSTREAM: slub: fix a crash with SLUB_DEBUG + KASAN_SW_TAGS
UPSTREAM: kasan, slab: remove redundant kasan_slab_alloc hooks
UPSTREAM: kasan, slab: make freelist stored without tags
UPSTREAM: kasan, slab: fix conflicts with CONFIG_HARDENED_USERCOPY
UPSTREAM: kasan: prevent tracing of tags.c
UPSTREAM: kasan: fix random seed generation for tag-based mode
UPSTREAM: slub: fix SLAB_CONSISTENCY_CHECKS + KASAN_SW_TAGS
UPSTREAM: kasan, slub: fix more conflicts with CONFIG_SLAB_FREELIST_HARDENED
UPSTREAM: kasan, slub: fix conflicts with CONFIG_SLAB_FREELIST_HARDENED
UPSTREAM: kasan, slub: move kasan_poison_slab hook before page_address
UPSTREAM: kasan, kmemleak: pass tagged pointers to kmemleak
UPSTREAM: kasan: fix assigning tags twice
UPSTREAM: kasan: mark file common so ftrace doesn't trace it
UPSTREAM: kasan, arm64: remove redundant ARCH_SLAB_MINALIGN define
UPSTREAM: kasan: fix krealloc handling for tag-based mode
UPSTREAM: kasan: make tag based mode work with CONFIG_HARDENED_USERCOPY
UPSTREAM: kasan, arm64: use ARCH_SLAB_MINALIGN instead of manual aligning
BACKPORT: mm/memblock.c: skip kmemleak for kasan_init()
UPSTREAM: kasan: add SPDX-License-Identifier mark to source files
UPSTREAM: kasan: update documentation
UPSTREAM: kasan, arm64: select HAVE_ARCH_KASAN_SW_TAGS
UPSTREAM: kasan: add __must_check annotations to kasan hooks
UPSTREAM: kasan, mm, arm64: tag non slab memory allocated via pagealloc
UPSTREAM: kasan, arm64: add brk handler for inline instrumentation
UPSTREAM: kasan: add hooks implementation for tag-based mode
UPSTREAM: mm: move obj_to_index to include/linux/slab_def.h
UPSTREAM: kasan: add bug reporting routines for tag-based mode
UPSTREAM: kasan: split out generic_report.c from report.c
UPSTREAM: kasan, mm: perform untagged pointers comparison in krealloc
BACKPORT: kasan, arm64: enable top byte ignore for the kernel
BACKPORT: kasan, arm64: fix up fault handling logic
UPSTREAM: kasan: preassign tags to objects with ctors or SLAB_TYPESAFE_BY_RCU
UPSTREAM: kasan, arm64: untag address in _virt_addr_is_linear
UPSTREAM: kasan: add tag related helper functions
UPSTREAM: arm64: move untagged_addr macro from uaccess.h to memory.h
BACKPORT: kasan: initialize shadow to 0xff for tag-based mode
BACKPORT: kasan: rename kasan_zero_page to kasan_early_shadow_page
UPSTREAM: kasan, arm64: adjust shadow size for tag-based mode
BACKPORT: kasan: add CONFIG_KASAN_GENERIC and CONFIG_KASAN_SW_TAGS
UPSTREAM: kasan: rename source files to reflect the new naming scheme
UPSTREAM: kasan: move common generic and tag-based code to common.c
UPSTREAM: kasan, slub: handle pointer tags in early_kmem_cache_node_alloc
UPSTREAM: kasan, mm: change hooks signatures
UPSTREAM: arm64: add EXPORT_SYMBOL_NOKASAN()
BACKPORT: compiler: remove __no_sanitize_address_or_inline again
UPSTREAM: mm/kasan/quarantine.c: make quarantine_lock a raw_spinlock_t
UPSTREAM: lib/test_kasan.c: add tests for several string/memory API functions
UPSTREAM: arm64: lib: use C string functions with KASAN enabled
UPSTREAM: compiler: introduce __no_sanitize_address_or_inline
UPSTREAM: arm64: Fix typo in a comment in arch/arm64/mm/kasan_init.c
ANDROID: enable CONFIG_ION_SYSTEM_HEAP for GKI
Update ABI definition after libabigail upgrade
ANDROID: update abi due to 4.19.75 changes
ANDROID: Remove CONFIG_USELIB from x86 gki config
ANDROID: net: enable wireless core features with GKI_LEGACY_WEXT_ALLCONFIG
ANDROID: arm64: bpf: implement arch_bpf_jit_check_func
ANDROID: bpf: validate bpf_func when BPF_JIT is enabled with CFI
UPSTREAM: kcm: use BPF_PROG_RUN
ANDROID: gki_defconfig: CONFIG_MMC_BLOCK=m
UPSTREAM: psi: get poll_work to run when calling poll syscall next time
UPSTREAM: sched/psi: Do not require setsched permission from the trigger creator
UPSTREAM: sched/psi: Reduce psimon FIFO priority
ANDROID: gki_defconfig: Enable HiSilicon SoCs
UPSTREAM: PCI: kirin: Fix section mismatch warning
ANDROID: gki_defconfig: Enable SERIAL_DEV_BUS
ANDROID: gki_defconfig: Add GKI_HACKS_to_FIX config
ANDROID: init: GKI: enable hidden configs for GPIO
ANDROID: init: GKI: enable hidden configs for SND_SOC
ANDROID: init: GKI: enable hidden configs for regmap
ANDROID: init: GKI: enable hidden configs for DRM
ANDROID: init: GKI: add GKI_HACKS_TO_FIX
ABI: Update ABI after fscrypto merge
ANDROID: gki_defconfig: enable CONFIG_UIO
UPSTREAM: ALSA: pcm: add support for 352.8KHz and 384KHz sample rate
ANDROID: Log which device failed to suspend in dpm_suspend_start()
UPSTREAM: arm64: Add support for relocating the kernel with RELR relocations
ANDROID: update ABI after CONFIG_MMC=m
CONFIG_MMC=m
ABI: Update ABI for LTS, 8250 changes
ANDROID: Removed extraneous serial 8250 configs
Adding SERIAL_OF_PLATFORM module to gki
fscrypt: document testing with xfstests
fscrypt: remove selection of CONFIG_CRYPTO_SHA256
fscrypt: remove unnecessary includes of ratelimit.h
fscrypt: don't set policy for a dead directory
fscrypt: decrypt only the needed blocks in __fscrypt_decrypt_bio()
fscrypt: support decrypting multiple filesystem blocks per page
fscrypt: introduce fscrypt_decrypt_block_inplace()
fscrypt: handle blocksize < PAGE_SIZE in fscrypt_zeroout_range()
fscrypt: support encrypting multiple filesystem blocks per page
fscrypt: introduce fscrypt_encrypt_block_inplace()
fscrypt: clean up some BUG_ON()s in block encryption/decryption
fscrypt: rename fscrypt_do_page_crypto() to fscrypt_crypt_block()
fscrypt: remove the "write" part of struct fscrypt_ctx
fscrypt: simplify bounce page handling
Conflicts:
arch/Kconfig
fs/crypto/bio.c
fs/ext4/page-io.c
fs/f2fs/data.c
fs/f2fs/f2fs.h
fs/f2fs/super.c
include/linux/fscrypt.h
sound/core/pcm_native.c
Change-Id: Ia94ba2ae85e04be9f69115e2da2d69d0dc76545f
Signed-off-by: Ivaylo Georgiev <irgeorgiev@codeaurora.org>
|
||
|
Ivaylo Georgiev
|
9e52135608 |
Merge android-4.19-q.94 (dabb11d) into msm-4.19
* refs/heads/tmp-dabb11d: Revert "dt-bindings: clock: renesas: rcar-usb2-clock-sel: Fix typo in example" Linux 4.19.94 perf/x86/intel/bts: Fix the use of page_private() xen/blkback: Avoid unmapping unmapped grant pages s390/smp: fix physical to logical CPU map for SMT ubifs: ubifs_tnc_start_commit: Fix OOB in layout_in_gaps net: add annotations on hh->hh_len lockless accesses xfs: periodically yield scrub threads to the scheduler ath9k_htc: Discard undersized packets ath9k_htc: Modify byte order for an error message net: core: limit nested device depth tcp: annotate tp->rcv_nxt lockless reads rxrpc: Fix possible NULL pointer access in ICMP handling KVM: PPC: Book3S HV: use smp_mb() when setting/clearing host_ipi flag selftests: rtnetlink: add addresses with fixed life time powerpc/pseries/hvconsole: Fix stack overread via udbg drm/mst: Fix MST sideband up-reply failure handling scsi: qedf: Do not retry ELS request if qedf_alloc_cmd fails bdev: Refresh bdev size for disks without partitioning bdev: Factor out bdev revalidation into a common helper fix compat handling of FICLONERANGE, FIDEDUPERANGE and FS_IOC_FIEMAP tty: serial: msm_serial: Fix lockup for sysrq and oops arm64: dts: meson: odroid-c2: Disable usb_otg bus to avoid power failed warning dt-bindings: clock: renesas: rcar-usb2-clock-sel: Fix typo in example media: usb: fix memory leak in af9005_identify_state regulator: ab8500: Remove AB8505 USB regulator media: flexcop-usb: ensure -EIO is returned on error condition Bluetooth: Fix memory leak in hci_connect_le_scan Bluetooth: delete a stray unlock Bluetooth: btusb: fix PM leak in error case of setup platform/x86: pmc_atom: Add Siemens CONNECT X300 to critclk_systems DMI table xfs: don't check for AG deadlock for realtime files in bunmapi ACPI: sysfs: Change ACPI_MASKABLE_GPE_MAX to 0x100 HID: i2c-hid: Reset ALPS touchpads on resume nfsd4: fix up replay_matches_cache() PM / devfreq: Check NULL governor in available_governors_show drm/msm: include linux/sched/task.h ftrace: Avoid potential division by zero in function profiler arm64: Revert support for execute-only user mappings exit: panic before exit_mm() on global init exit ALSA: firewire-motu: Correct a typo in the clock proc string ALSA: cs4236: fix error return comparison of an unsigned integer apparmor: fix aa_xattrs_match() may sleep while holding a RCU lock tracing: Fix endianness bug in histogram trigger tracing: Have the histogram compare functions convert to u64 first tracing: Avoid memory leak in process_system_preds() tracing: Fix lock inversion in trace_event_enable_tgid_record() rseq/selftests: Fix: Namespace gettid() for compatibility with glibc 2.30 riscv: ftrace: correct the condition logic in function graph tracer gpiolib: fix up emulated open drain outputs libata: Fix retrieving of active qcs ata: ahci_brcm: BCM7425 AHCI requires AHCI_HFLAG_DELAY_ENGINE ata: ahci_brcm: Add missing clock management during recovery ata: ahci_brcm: Allow optional reset controller to be used ata: ahci_brcm: Fix AHCI resources management ata: libahci_platform: Export again ahci_platform_<en/dis>able_phys() compat_ioctl: block: handle BLKREPORTZONE/BLKRESETZONE compat_ioctl: block: handle Persistent Reservations dmaengine: Fix access to uninitialized dma_slave_caps locks: print unsigned ino in /proc/locks pstore/ram: Write new dumps to start of recycled zones mm: move_pages: return valid node id in status if the page is already on the target node memcg: account security cred as well to kmemcg mm/zsmalloc.c: fix the migrated zspage statistics. media: cec: check 'transmit_in_progress', not 'transmitting' media: cec: avoid decrementing transmit_queue_sz if it is 0 media: cec: CEC 2.0-only bcast messages were ignored media: pulse8-cec: fix lost cec_transmit_attempt_done() call MIPS: Avoid VDSO ABI breakage due to global register variable drm/sun4i: hdmi: Remove duplicate cleanup calls ALSA: hda/realtek - Add headset Mic no shutup for ALC283 ALSA: usb-audio: set the interface format after resume on Dell WD19 ALSA: usb-audio: fix set_format altsetting sanity check ALSA: ice1724: Fix sleep-in-atomic in Infrasonic Quartet support code netfilter: nft_tproxy: Fix port selector on Big Endian drm: limit to INT_MAX in create_blob ioctl taskstats: fix data-race xfs: fix mount failure crash on invalid iclog memory access ALSA: hda - fixup for the bass speaker on Lenovo Carbon X1 7th gen ALSA: hda/realtek - Enable the bass speaker of ASUS UX431FLC ALSA: hda/realtek - Add Bass Speaker and fixed dac for bass speaker PM / hibernate: memory_bm_find_bit(): Tighten node optimisation xen/balloon: fix ballooned page accounting without hotplug enabled xen-blkback: prevent premature module unload IB/mlx5: Fix steering rule of drop and count IB/mlx4: Follow mirror sequence of device add during device removal s390/cpum_sf: Avoid SBD overflow condition in irq handler s390/cpum_sf: Adjust sampling interval to avoid hitting sample limits md: raid1: check rdev before reference in raid1_sync_request func afs: Fix creation calls in the dynamic root to fail with EOPNOTSUPP net: make socket read/write_iter() honor IOCB_NOWAIT usb: gadget: fix wrong endpoint desc drm/nouveau: Move the declaration of struct nouveau_conn_atom up a bit scsi: libsas: stop discovering if oob mode is disconnected scsi: iscsi: qla4xxx: fix double free in probe scsi: qla2xxx: Ignore PORT UPDATE after N2N PLOGI scsi: qla2xxx: Send Notify ACK after N2N PLOGI scsi: qla2xxx: Configure local loop for N2N target scsi: qla2xxx: Fix PLOGI payload and ELS IOCB dump length scsi: qla2xxx: Don't call qlt_async_event twice scsi: qla2xxx: Drop superfluous INIT_WORK of del_work scsi: lpfc: Fix memory leak on lpfc_bsg_write_ebuf_set func rxe: correctly calculate iCRC for unaligned payloads RDMA/cma: add missed unregister_pernet_subsys in init failure afs: Fix SELinux setting security label on /afs afs: Fix afs_find_server lookups for ipv4 peers PM / devfreq: Don't fail devfreq_dev_release if not in list PM / devfreq: Set scaling_max_freq to max on OPP notifier error PM / devfreq: Fix devfreq_notifier_call returning errno iio: adc: max9611: Fix too short conversion time delay drm/amd/display: Fixed kernel panic when booting with DP-to-HDMI dongle drm/amdgpu: add cache flush workaround to gfx8 emit_fence drm/amdgpu: add check before enabling/disabling broadcast mode nvme-fc: fix double-free scenarios on hw queues nvme_fc: add module to ops template to allow module references Conflicts: drivers/devfreq/devfreq.c drivers/gpu/drm/drm_dp_mst_topology.c drivers/gpu/drm/drm_property.c Change-Id: Iad80571bea0a2197ea36a70c425c61a66c0cf0bc Signed-off-by: Ivaylo Georgiev <irgeorgiev@codeaurora.org> |
||
|
Greg Kroah-Hartman
|
dabb11de5b |
Merge 4.19.94 into android-4.19-q
Changes in 4.19.94 nvme_fc: add module to ops template to allow module references nvme-fc: fix double-free scenarios on hw queues drm/amdgpu: add check before enabling/disabling broadcast mode drm/amdgpu: add cache flush workaround to gfx8 emit_fence drm/amd/display: Fixed kernel panic when booting with DP-to-HDMI dongle iio: adc: max9611: Fix too short conversion time delay PM / devfreq: Fix devfreq_notifier_call returning errno PM / devfreq: Set scaling_max_freq to max on OPP notifier error PM / devfreq: Don't fail devfreq_dev_release if not in list afs: Fix afs_find_server lookups for ipv4 peers afs: Fix SELinux setting security label on /afs RDMA/cma: add missed unregister_pernet_subsys in init failure rxe: correctly calculate iCRC for unaligned payloads scsi: lpfc: Fix memory leak on lpfc_bsg_write_ebuf_set func scsi: qla2xxx: Drop superfluous INIT_WORK of del_work scsi: qla2xxx: Don't call qlt_async_event twice scsi: qla2xxx: Fix PLOGI payload and ELS IOCB dump length scsi: qla2xxx: Configure local loop for N2N target scsi: qla2xxx: Send Notify ACK after N2N PLOGI scsi: qla2xxx: Ignore PORT UPDATE after N2N PLOGI scsi: iscsi: qla4xxx: fix double free in probe scsi: libsas: stop discovering if oob mode is disconnected drm/nouveau: Move the declaration of struct nouveau_conn_atom up a bit usb: gadget: fix wrong endpoint desc net: make socket read/write_iter() honor IOCB_NOWAIT afs: Fix creation calls in the dynamic root to fail with EOPNOTSUPP md: raid1: check rdev before reference in raid1_sync_request func s390/cpum_sf: Adjust sampling interval to avoid hitting sample limits s390/cpum_sf: Avoid SBD overflow condition in irq handler IB/mlx4: Follow mirror sequence of device add during device removal IB/mlx5: Fix steering rule of drop and count xen-blkback: prevent premature module unload xen/balloon: fix ballooned page accounting without hotplug enabled PM / hibernate: memory_bm_find_bit(): Tighten node optimisation ALSA: hda/realtek - Add Bass Speaker and fixed dac for bass speaker ALSA: hda/realtek - Enable the bass speaker of ASUS UX431FLC ALSA: hda - fixup for the bass speaker on Lenovo Carbon X1 7th gen xfs: fix mount failure crash on invalid iclog memory access taskstats: fix data-race drm: limit to INT_MAX in create_blob ioctl netfilter: nft_tproxy: Fix port selector on Big Endian ALSA: ice1724: Fix sleep-in-atomic in Infrasonic Quartet support code ALSA: usb-audio: fix set_format altsetting sanity check ALSA: usb-audio: set the interface format after resume on Dell WD19 ALSA: hda/realtek - Add headset Mic no shutup for ALC283 drm/sun4i: hdmi: Remove duplicate cleanup calls MIPS: Avoid VDSO ABI breakage due to global register variable media: pulse8-cec: fix lost cec_transmit_attempt_done() call media: cec: CEC 2.0-only bcast messages were ignored media: cec: avoid decrementing transmit_queue_sz if it is 0 media: cec: check 'transmit_in_progress', not 'transmitting' mm/zsmalloc.c: fix the migrated zspage statistics. memcg: account security cred as well to kmemcg mm: move_pages: return valid node id in status if the page is already on the target node pstore/ram: Write new dumps to start of recycled zones locks: print unsigned ino in /proc/locks dmaengine: Fix access to uninitialized dma_slave_caps compat_ioctl: block: handle Persistent Reservations compat_ioctl: block: handle BLKREPORTZONE/BLKRESETZONE ata: libahci_platform: Export again ahci_platform_<en/dis>able_phys() ata: ahci_brcm: Fix AHCI resources management ata: ahci_brcm: Allow optional reset controller to be used ata: ahci_brcm: Add missing clock management during recovery ata: ahci_brcm: BCM7425 AHCI requires AHCI_HFLAG_DELAY_ENGINE libata: Fix retrieving of active qcs gpiolib: fix up emulated open drain outputs riscv: ftrace: correct the condition logic in function graph tracer rseq/selftests: Fix: Namespace gettid() for compatibility with glibc 2.30 tracing: Fix lock inversion in trace_event_enable_tgid_record() tracing: Avoid memory leak in process_system_preds() tracing: Have the histogram compare functions convert to u64 first tracing: Fix endianness bug in histogram trigger apparmor: fix aa_xattrs_match() may sleep while holding a RCU lock ALSA: cs4236: fix error return comparison of an unsigned integer ALSA: firewire-motu: Correct a typo in the clock proc string exit: panic before exit_mm() on global init exit arm64: Revert support for execute-only user mappings ftrace: Avoid potential division by zero in function profiler drm/msm: include linux/sched/task.h PM / devfreq: Check NULL governor in available_governors_show nfsd4: fix up replay_matches_cache() HID: i2c-hid: Reset ALPS touchpads on resume ACPI: sysfs: Change ACPI_MASKABLE_GPE_MAX to 0x100 xfs: don't check for AG deadlock for realtime files in bunmapi platform/x86: pmc_atom: Add Siemens CONNECT X300 to critclk_systems DMI table Bluetooth: btusb: fix PM leak in error case of setup Bluetooth: delete a stray unlock Bluetooth: Fix memory leak in hci_connect_le_scan media: flexcop-usb: ensure -EIO is returned on error condition regulator: ab8500: Remove AB8505 USB regulator media: usb: fix memory leak in af9005_identify_state dt-bindings: clock: renesas: rcar-usb2-clock-sel: Fix typo in example arm64: dts: meson: odroid-c2: Disable usb_otg bus to avoid power failed warning tty: serial: msm_serial: Fix lockup for sysrq and oops fix compat handling of FICLONERANGE, FIDEDUPERANGE and FS_IOC_FIEMAP bdev: Factor out bdev revalidation into a common helper bdev: Refresh bdev size for disks without partitioning scsi: qedf: Do not retry ELS request if qedf_alloc_cmd fails drm/mst: Fix MST sideband up-reply failure handling powerpc/pseries/hvconsole: Fix stack overread via udbg selftests: rtnetlink: add addresses with fixed life time KVM: PPC: Book3S HV: use smp_mb() when setting/clearing host_ipi flag rxrpc: Fix possible NULL pointer access in ICMP handling tcp: annotate tp->rcv_nxt lockless reads net: core: limit nested device depth ath9k_htc: Modify byte order for an error message ath9k_htc: Discard undersized packets xfs: periodically yield scrub threads to the scheduler net: add annotations on hh->hh_len lockless accesses ubifs: ubifs_tnc_start_commit: Fix OOB in layout_in_gaps s390/smp: fix physical to logical CPU map for SMT xen/blkback: Avoid unmapping unmapped grant pages perf/x86/intel/bts: Fix the use of page_private() Linux 4.19.94 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: I0802486772485e255df74d660ab60313c2965762 |
||
|
Greg Kroah-Hartman
|
ff0e96e80f |
Merge 4.19.94 into android-4.19
Changes in 4.19.94 nvme_fc: add module to ops template to allow module references nvme-fc: fix double-free scenarios on hw queues drm/amdgpu: add check before enabling/disabling broadcast mode drm/amdgpu: add cache flush workaround to gfx8 emit_fence drm/amd/display: Fixed kernel panic when booting with DP-to-HDMI dongle iio: adc: max9611: Fix too short conversion time delay PM / devfreq: Fix devfreq_notifier_call returning errno PM / devfreq: Set scaling_max_freq to max on OPP notifier error PM / devfreq: Don't fail devfreq_dev_release if not in list afs: Fix afs_find_server lookups for ipv4 peers afs: Fix SELinux setting security label on /afs RDMA/cma: add missed unregister_pernet_subsys in init failure rxe: correctly calculate iCRC for unaligned payloads scsi: lpfc: Fix memory leak on lpfc_bsg_write_ebuf_set func scsi: qla2xxx: Drop superfluous INIT_WORK of del_work scsi: qla2xxx: Don't call qlt_async_event twice scsi: qla2xxx: Fix PLOGI payload and ELS IOCB dump length scsi: qla2xxx: Configure local loop for N2N target scsi: qla2xxx: Send Notify ACK after N2N PLOGI scsi: qla2xxx: Ignore PORT UPDATE after N2N PLOGI scsi: iscsi: qla4xxx: fix double free in probe scsi: libsas: stop discovering if oob mode is disconnected drm/nouveau: Move the declaration of struct nouveau_conn_atom up a bit usb: gadget: fix wrong endpoint desc net: make socket read/write_iter() honor IOCB_NOWAIT afs: Fix creation calls in the dynamic root to fail with EOPNOTSUPP md: raid1: check rdev before reference in raid1_sync_request func s390/cpum_sf: Adjust sampling interval to avoid hitting sample limits s390/cpum_sf: Avoid SBD overflow condition in irq handler IB/mlx4: Follow mirror sequence of device add during device removal IB/mlx5: Fix steering rule of drop and count xen-blkback: prevent premature module unload xen/balloon: fix ballooned page accounting without hotplug enabled PM / hibernate: memory_bm_find_bit(): Tighten node optimisation ALSA: hda/realtek - Add Bass Speaker and fixed dac for bass speaker ALSA: hda/realtek - Enable the bass speaker of ASUS UX431FLC ALSA: hda - fixup for the bass speaker on Lenovo Carbon X1 7th gen xfs: fix mount failure crash on invalid iclog memory access taskstats: fix data-race drm: limit to INT_MAX in create_blob ioctl netfilter: nft_tproxy: Fix port selector on Big Endian ALSA: ice1724: Fix sleep-in-atomic in Infrasonic Quartet support code ALSA: usb-audio: fix set_format altsetting sanity check ALSA: usb-audio: set the interface format after resume on Dell WD19 ALSA: hda/realtek - Add headset Mic no shutup for ALC283 drm/sun4i: hdmi: Remove duplicate cleanup calls MIPS: Avoid VDSO ABI breakage due to global register variable media: pulse8-cec: fix lost cec_transmit_attempt_done() call media: cec: CEC 2.0-only bcast messages were ignored media: cec: avoid decrementing transmit_queue_sz if it is 0 media: cec: check 'transmit_in_progress', not 'transmitting' mm/zsmalloc.c: fix the migrated zspage statistics. memcg: account security cred as well to kmemcg mm: move_pages: return valid node id in status if the page is already on the target node pstore/ram: Write new dumps to start of recycled zones locks: print unsigned ino in /proc/locks dmaengine: Fix access to uninitialized dma_slave_caps compat_ioctl: block: handle Persistent Reservations compat_ioctl: block: handle BLKREPORTZONE/BLKRESETZONE ata: libahci_platform: Export again ahci_platform_<en/dis>able_phys() ata: ahci_brcm: Fix AHCI resources management ata: ahci_brcm: Allow optional reset controller to be used ata: ahci_brcm: Add missing clock management during recovery ata: ahci_brcm: BCM7425 AHCI requires AHCI_HFLAG_DELAY_ENGINE libata: Fix retrieving of active qcs gpiolib: fix up emulated open drain outputs riscv: ftrace: correct the condition logic in function graph tracer rseq/selftests: Fix: Namespace gettid() for compatibility with glibc 2.30 tracing: Fix lock inversion in trace_event_enable_tgid_record() tracing: Avoid memory leak in process_system_preds() tracing: Have the histogram compare functions convert to u64 first tracing: Fix endianness bug in histogram trigger apparmor: fix aa_xattrs_match() may sleep while holding a RCU lock ALSA: cs4236: fix error return comparison of an unsigned integer ALSA: firewire-motu: Correct a typo in the clock proc string exit: panic before exit_mm() on global init exit arm64: Revert support for execute-only user mappings ftrace: Avoid potential division by zero in function profiler drm/msm: include linux/sched/task.h PM / devfreq: Check NULL governor in available_governors_show nfsd4: fix up replay_matches_cache() HID: i2c-hid: Reset ALPS touchpads on resume ACPI: sysfs: Change ACPI_MASKABLE_GPE_MAX to 0x100 xfs: don't check for AG deadlock for realtime files in bunmapi platform/x86: pmc_atom: Add Siemens CONNECT X300 to critclk_systems DMI table Bluetooth: btusb: fix PM leak in error case of setup Bluetooth: delete a stray unlock Bluetooth: Fix memory leak in hci_connect_le_scan media: flexcop-usb: ensure -EIO is returned on error condition regulator: ab8500: Remove AB8505 USB regulator media: usb: fix memory leak in af9005_identify_state dt-bindings: clock: renesas: rcar-usb2-clock-sel: Fix typo in example arm64: dts: meson: odroid-c2: Disable usb_otg bus to avoid power failed warning tty: serial: msm_serial: Fix lockup for sysrq and oops fix compat handling of FICLONERANGE, FIDEDUPERANGE and FS_IOC_FIEMAP bdev: Factor out bdev revalidation into a common helper bdev: Refresh bdev size for disks without partitioning scsi: qedf: Do not retry ELS request if qedf_alloc_cmd fails drm/mst: Fix MST sideband up-reply failure handling powerpc/pseries/hvconsole: Fix stack overread via udbg selftests: rtnetlink: add addresses with fixed life time KVM: PPC: Book3S HV: use smp_mb() when setting/clearing host_ipi flag rxrpc: Fix possible NULL pointer access in ICMP handling tcp: annotate tp->rcv_nxt lockless reads net: core: limit nested device depth ath9k_htc: Modify byte order for an error message ath9k_htc: Discard undersized packets xfs: periodically yield scrub threads to the scheduler net: add annotations on hh->hh_len lockless accesses ubifs: ubifs_tnc_start_commit: Fix OOB in layout_in_gaps s390/smp: fix physical to logical CPU map for SMT xen/blkback: Avoid unmapping unmapped grant pages perf/x86/intel/bts: Fix the use of page_private() Linux 4.19.94 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: Ic3d1a4e10565c38d0e82448f0fb7b6fd1822aab2 |
||
|
Andy Whitcroft
|
76548ddc1b |
PM / hibernate: memory_bm_find_bit(): Tighten node optimisation
[ Upstream commit da6043fe85eb5ec621e34a92540735dcebbea134 ] When looking for a bit by number we make use of the cached result from the preceding lookup to speed up operation. Firstly we check if the requested pfn is within the cached zone and if not lookup the new zone. We then check if the offset for that pfn falls within the existing cached node. This happens regardless of whether the node is within the zone we are now scanning. With certain memory layouts it is possible for this to false trigger creating a temporary alias for the pfn to a different bit. This leads the hibernation code to free memory which it was never allocated with the expected fallout. Ensure the zone we are scanning matches the cached zone before considering the cached node. Deep thanks go to Andrea for many, many, many hours of hacking and testing that went into cornering this bug. Reported-by: Andrea Righi <andrea.righi@canonical.com> Tested-by: Andrea Righi <andrea.righi@canonical.com> Signed-off-by: Andy Whitcroft <apw@canonical.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Signed-off-by: Sasha Levin <sashal@kernel.org> |
||
|
hsinyitseng
|
4cfc079761 |
power: Print wakeup reason and suspend timestamp
am:
|
||
|
hsinyitseng
|
e4191b898f |
power: Print wakeup reason and suspend timestamp
Print the kerel wakeup reason and the time of suspend and resume PM: suspend entry 2019-11-12 01:51:03.621354693 UTC Suspended for 7.479 seconds Resume caused by IRQ 28, pm8xxx_rtc_alarm PM: suspend exit 2019-11-12 01:51:13.487683073 UTC Bug: 144326354 Change-Id: Idfa9fb7caf205e97bf40a34f2b400a9d34f65ef4 Signed-off-by: hsinyitseng <hsinyitseng@google.com> |
||
|
Hridya Valsaraju
|
a0e78d841d |
pm: Enable modularizing driver for qcom,ddr-stats
Export symbol power_kobj. Bug: 142962940 Test: build, boot, all devices probing before still probe. Change-Id: I119fac8f7d15180fee16472593e94efa28e9da68 Signed-off-by: Hridya Valsaraju <hridya@google.com> |
||
|
Will McVicker
|
1a638475f3 |
kernel: power: qos: Add export symbol for pm_qos_update_request_timeout
Bug: 141876853 Change-Id: I601d67b3cf7030df92630403910100b06416ac17 Signed-off-by: Will McVicker <willmcvicker@google.com> |
||
|
Maulik Shah
|
defc96f9b9 |
power: qos: Fix accessing pm_qos_request struct
Constraints added using dev_pm_qos_add_request are not member of pm_qos_request struct. Only those constraints that are added using pm_qos_add_request are member of pm_qos_request struct and can be accessed as CPU DMA latency constraints while updating the cpumask for which latency has been updated. Add a check if constraint is of CPU DMA latency class before accessing. Change-Id: I809b8fc46379311902cd3eea4e55f753e9002c69 Signed-off-by: Maulik Shah <mkshah@codeaurora.org> |
||
|
Kalesh Singh
|
d112bff3b7 |
BACKPORT: PM/sleep: Expose suspend stats in sysfs
Userspace can get suspend stats from the suspend stats debugfs node. Since debugfs doesn't have stable ABI, expose suspend stats in sysfs under /sys/power/suspend_stats. Signed-off-by: Kalesh Singh <kaleshsingh@google.com> Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> (cherry picked from commit 2c8db5bef9fb442a5a0d2fee28aed20100362ce3) [ fixed conflicts in Documentation ] Bug: 129087298 Change-Id: Ia8f0d8551ae693cb5f3e1abc609fb9bbfeb695f5 Signed-off-by: Tri Vo <trong@google.com> |
||
|
Tri Vo
|
2c9f5fa9c3 |
UPSTREAM: PM / wakeup: Show wakeup sources stats in sysfs
Add an ID and a device pointer to 'struct wakeup_source'. Use them to to expose wakeup sources statistics in sysfs under /sys/class/wakeup/wakeup<ID>/*. Co-developed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Co-developed-by: Stephen Boyd <swboyd@chromium.org> Signed-off-by: Stephen Boyd <swboyd@chromium.org> Signed-off-by: Tri Vo <trong@android.com> Tested-by: Kalesh Singh <kaleshsingh@google.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> (cherry picked from commit c8377adfa78103be5380200eb9dab764d7ca890e) Bug: 129087298 Signed-off-by: Tri Vo <trong@google.com> Change-Id: Iecd3412423f9d499981f44d3b69507eaa62a2cd9 |
||
|
Tri Vo
|
5bc2bdfb22 |
UPSTREAM: PM / wakeup: Use wakeup_source_register() in wakelock.c
kernel/power/wakelock.c duplicates wakeup source creation and registration code from drivers/base/power/wakeup.c. Change struct wakelock's wakeup source to a pointer and use wakeup_source_register() function to create and register said wakeup source. Use wakeup_source_unregister() on cleanup path. Signed-off-by: Tri Vo <trong@android.com> Reviewed-by: Stephen Boyd <swboyd@chromium.org> Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> (cherry picked from commit 2434aea58e652a9fe114181ac90aa60e2f2e1b25) Bug: 129087298 Signed-off-by: Tri Vo <trong@google.com> Change-Id: I4e6b3c613c561fb382f17c3c31b6584aebabfb5d |
||
|
Hridya Valsaraju
|
39be6ea594 |
Export symbol s2idle_set_ops
Fixes error: ERROR: "s2idle_set_ops" [drivers/cpuidle/msm_pm.ko] undefined! Bug: 140652396 Test: build, boot, insmod msm_pm.ko and system_pm.ko Signed-off-by: Hridya Valsaraju <hridya@google.com> Change-Id: Ifad3d6cf5bac9ae484c279c3cf45649ab7455d87 |
||
|
Chenglu Lin
|
92c45e6dd1 |
power: suspend: avoid start_suspend_mon before enabling irqs
sleeping function is called in start_suspend_mon which should not in a irqs disabled state. Avoid start_suspend_mon before enabling irqs or it hits SCHED BUG with CONFIG_DEBUG_ATOMIC_SLEEP=y and CONFIG_PANIC_ON_SCHED_BUG=y error log: [ 266.035751] BUG: sleeping function called from invalid context at /buildbot/src/partner-android/r-dev-msm-pixel-4.19/private/msm-google/kernel/locking/mutex.c:920 [ 266.035767] in_atomic(): 0, irqs_disabled(): 128, pid: 4191, name: Binder:763_2 [ 266.035780] INFO: lockdep is turned off. ... [ 266.035881] ------------[ cut here ]------------ [ 266.035895] kernel BUG at /buildbot/src/partner-android/r-dev-msm-pixel-4.19/private/msm-google/kernel/sched/core.c:6727! [ 266.035910] Internal error: Oops - BUG: 0 [#1] PREEMPT SMP ... [ 266.036069] Process Binder:763_2 (pid: 4191, stack limit = 0xffffff8022c78000) [ 266.036082] CPU: 0 PID: 4191 Comm: Binder:763_2 Tainted: G S W O 4.19.66-g8401357243cf-ab5870952 #1 [ 266.036102] pstate: 60400085 (nZCv daIf +PAN -UAO) [ 266.036115] pc : ___might_sleep+0x1fc/0x200 [ 266.036125] lr : ___might_sleep+0x1bc/0x200 ... [ 266.037251] Call trace: [ 266.037261] ___might_sleep+0x1fc/0x200 [ 266.037271] __might_sleep+0x50/0x84 [ 266.037284] __mutex_lock_common+0x5c/0x1034 [ 266.037294] mutex_lock_nested+0x40/0x50 [ 266.037307] suspend_devices_and_enter+0x88c/0xed4 [ 266.037317] pm_suspend+0x9b8/0xb84 [ 266.037327] state_store+0x104/0x13c [ 266.037340] kobj_attr_store+0x14/0x24 [ 266.037352] sysfs_kf_write+0x80/0xb4 [ 266.037363] kernfs_fop_write+0x158/0x204 [ 266.037375] __vfs_write+0x54/0x15c [ 266.037385] vfs_write+0xcc/0x188 [ 266.037395] ksys_write+0x78/0xd8 [ 266.037406] __arm64_sys_write+0x20/0x2c [ 266.037418] el0_svc_common+0xac/0x188 [ 266.037428] el0_svc_handler+0x78/0x94 [ 266.037439] el0_svc+0x8/0xc Bug: 141287976 Change-Id: I2e4a16dd456d446763dcd0cd1885a17cf2b54c6c Signed-off-by: Chenglu Lin <chenglulin@google.com> |
||
|
zhuguangqing
|
81daa79b75 |
ANDROID: Log which device failed to suspend in dpm_suspend_start()
Problem background: In the process of suspend, maybe some device suspend callback failed in dpm_suspend_start()/dpm_prepare()/dpm_suspend(). Because it's after suspend_console(), so printf() is disabled now. Currently we can see "Some devices failed to suspend, or early wake event detected" by log_suspend_abort_reason() in bugreport. There are many devices but we don't know which exactly device failed. So we want to do a little change to record which device failed. Note: I checked upstream LTS kernel, then I found the patch can not be sent upstream, because it uses function log_suspend_abort_reason() in wakeup_reason.c, the initial patch(https://patchwork.kernel.org/patch/3827331/) for adding /kernel/power/wakeup_reason.c is not accepted by upstream which was merged in AOSP common kernels. So maybe the patch could only be sent to AOSP common kernels. Test: manual - Use modified version for daily use two days, from bugreport we can see which device failed. Bug: 120445600 Change-Id: I326c87ca1263496db79d08ec615f12fc22452d7a Signed-off-by: zhuguangqing <zhuguangqing@xiaomi.com> |
||
|
Wilson Sung
|
7e370e39fe |
Merge branch 'LA.UM.8.13.R1.08.00.00.571.015' via branch 'qcom-msm-4.19-7250' into android-msm-pixel-4.19
Conflicts: drivers/gpu/drm/msm/dsi-staging/dsi_panel.c drivers/media/platform/msm/camera/cam_utils/cam_soc_util.h drivers/scsi/ufs/ufshcd.h include/uapi/media/cam_sensor.h sound/soc/codecs/wm_adsp.c Bug: 140357864 Change-Id: Ifd622849654af8e58d7b8f821493de560b446b6f Signed-off-by: Alex Hong <rurumihong@google.com> Signed-off-by: Wilson Sung <wilsonsung@google.com> |
||
|
josephjang
|
d5451b57aa |
power: suspend: Add suspend timeout handler
Add suspend timeout handler to prevent device stuck during suspend/
resume process. Suspend timeout handler will dump disk sleep task
at first round timeout and trigger kernel panic at second round timeout.
The default timer for each round is 30 seconds.
Note: Can use following command to simulate suspend hang for testing.
adb shell echo 1 > /sys/power/pm_hang
adb shell echo mem > /sys/power/state
Bug: 132733612
Bug: 140009062
Change-Id: Ifc8aa4ee9145187d14511e29529ba50a4b19324e
Signed-off-by: josephjang <josephjang@google.com>
Signed-off-by: Chenglu Lin <chenglulin@google.com>
|
||
|
Ivaylo Georgiev
|
4bcfb79fa8 |
Merge android-4.19.50 (be7c1cb) into msm-4.19
* refs/heads/tmp-be7c1cb: Linux 4.19.50 ethtool: check the return value of get_regs_len ipv4: Define __ipv4_neigh_lookup_noref when CONFIG_INET is disabled TTY: serial_core, add ->install drm/i915/gvt: Initialize intel_gvt_gtt_entry in stack drm: don't block fb changes for async plane updates drm/i915: Maintain consistent documentation subsection ordering drm/i915/fbc: disable framebuffer compression on GeminiLake drm/i915: Fix I915_EXEC_RING_MASK drm/amdgpu: remove ATPX_DGPU_REQ_POWER_FOR_DISPLAYS check when hotplug-in drm/radeon: prefer lower reference dividers drm/amdgpu/psp: move psp version specific function pointers to early_init drm: add non-desktop quirks to Sensics and OSVR headsets. drm/nouveau: add kconfig option to turn off nouveau legacy contexts. (v3) drm: add non-desktop quirk for Valve HMDs drm/msm: fix fb references in async update drm/gma500/cdv: Check vbt config bits when detecting lvds panels test_firmware: Use correct snprintf() limit genwqe: Prevent an integer overflow in the ioctl Revert "MIPS: perf: ath79: Fix perfcount IRQ assignment" MIPS: pistachio: Build uImage.gz by default MIPS: Bounds check virt_addr_valid xen-blkfront: switch kcalloc to kvcalloc for large array allocation s390/mm: fix address space detection in exception handling i2c: xiic: Add max_read_len quirk x86/insn-eval: Fix use-after-free access to LDT entry x86/power: Fix 'nosmt' vs hibernation triple fault during resume pstore/ram: Run without kernel crash dump region pstore: Set tfm to NULL on free_buf_for_compression pstore: Convert buf_lock to semaphore pstore: Remove needless lock during console writes fuse: fallocate: fix return with locked inode NFSv4.1: Fix bug only first CB_NOTIFY_LOCK is handled NFSv4.1: Again fix a race where CB_NOTIFY_LOCK fails to wake a waiter parisc: Use implicit space register selection for loading the coherence index of I/O pdirs rcu: locking and unlocking need to always be at least barriers mtd: spinand: macronix: Fix ECC Status Read ipv6: fix EFAULT on sendto with icmpv6 and hdrincl ipv6: use READ_ONCE() for inet->hdrincl as in ipv4 Revert "fib_rules: return 0 directly if an exactly same rule exists when NLM_F_EXCL not supplied" pktgen: do not sleep with the thread lock held. packet: unconditionally free po->rollover net/tls: replace the sleeping lock around RX resync with a bit lock net: sfp: read eeprom in maximum 16 byte increments net: rds: fix memory leak in rds_ib_flush_mr_pool net: mvpp2: Use strscpy to handle stat strings net/mlx4_en: ethtool, Remove unsupported SFP EEPROM high pages query net: ethernet: ti: cpsw_ethtool: fix ethtool ring param set neighbor: Call __ipv4_neigh_lookup_noref in neigh_xmit ipv6: fix the check before getting the cookie in rt6_get_cookie ipv4: not do cache for local delivery if bc_forwarding is enabled Fix memory leak in sctp_process_init ethtool: fix potential userspace buffer overflow Change-Id: Ic49494d073fe049a92a42dd95a84315b64a13c3e Signed-off-by: Ivaylo Georgiev <irgeorgiev@codeaurora.org> |
||
|
Greg Kroah-Hartman
|
7b62f09ce0 |
Merge 4.19.50 into android-4.19-q
Changes in 4.19.50 ethtool: fix potential userspace buffer overflow Fix memory leak in sctp_process_init ipv4: not do cache for local delivery if bc_forwarding is enabled ipv6: fix the check before getting the cookie in rt6_get_cookie neighbor: Call __ipv4_neigh_lookup_noref in neigh_xmit net: ethernet: ti: cpsw_ethtool: fix ethtool ring param set net/mlx4_en: ethtool, Remove unsupported SFP EEPROM high pages query net: mvpp2: Use strscpy to handle stat strings net: rds: fix memory leak in rds_ib_flush_mr_pool net: sfp: read eeprom in maximum 16 byte increments net/tls: replace the sleeping lock around RX resync with a bit lock packet: unconditionally free po->rollover pktgen: do not sleep with the thread lock held. Revert "fib_rules: return 0 directly if an exactly same rule exists when NLM_F_EXCL not supplied" ipv6: use READ_ONCE() for inet->hdrincl as in ipv4 ipv6: fix EFAULT on sendto with icmpv6 and hdrincl mtd: spinand: macronix: Fix ECC Status Read rcu: locking and unlocking need to always be at least barriers parisc: Use implicit space register selection for loading the coherence index of I/O pdirs NFSv4.1: Again fix a race where CB_NOTIFY_LOCK fails to wake a waiter NFSv4.1: Fix bug only first CB_NOTIFY_LOCK is handled fuse: fallocate: fix return with locked inode pstore: Remove needless lock during console writes pstore: Convert buf_lock to semaphore pstore: Set tfm to NULL on free_buf_for_compression pstore/ram: Run without kernel crash dump region x86/power: Fix 'nosmt' vs hibernation triple fault during resume x86/insn-eval: Fix use-after-free access to LDT entry i2c: xiic: Add max_read_len quirk s390/mm: fix address space detection in exception handling xen-blkfront: switch kcalloc to kvcalloc for large array allocation MIPS: Bounds check virt_addr_valid MIPS: pistachio: Build uImage.gz by default Revert "MIPS: perf: ath79: Fix perfcount IRQ assignment" genwqe: Prevent an integer overflow in the ioctl test_firmware: Use correct snprintf() limit drm/gma500/cdv: Check vbt config bits when detecting lvds panels drm/msm: fix fb references in async update drm: add non-desktop quirk for Valve HMDs drm/nouveau: add kconfig option to turn off nouveau legacy contexts. (v3) drm: add non-desktop quirks to Sensics and OSVR headsets. drm/amdgpu/psp: move psp version specific function pointers to early_init drm/radeon: prefer lower reference dividers drm/amdgpu: remove ATPX_DGPU_REQ_POWER_FOR_DISPLAYS check when hotplug-in drm/i915: Fix I915_EXEC_RING_MASK drm/i915/fbc: disable framebuffer compression on GeminiLake drm/i915: Maintain consistent documentation subsection ordering drm: don't block fb changes for async plane updates drm/i915/gvt: Initialize intel_gvt_gtt_entry in stack TTY: serial_core, add ->install ipv4: Define __ipv4_neigh_lookup_noref when CONFIG_INET is disabled ethtool: check the return value of get_regs_len Linux 4.19.50 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> |
||
|
Greg Kroah-Hartman
|
be7c1cbd03 |
Merge 4.19.50 into android-4.19
Changes in 4.19.50 ethtool: fix potential userspace buffer overflow Fix memory leak in sctp_process_init ipv4: not do cache for local delivery if bc_forwarding is enabled ipv6: fix the check before getting the cookie in rt6_get_cookie neighbor: Call __ipv4_neigh_lookup_noref in neigh_xmit net: ethernet: ti: cpsw_ethtool: fix ethtool ring param set net/mlx4_en: ethtool, Remove unsupported SFP EEPROM high pages query net: mvpp2: Use strscpy to handle stat strings net: rds: fix memory leak in rds_ib_flush_mr_pool net: sfp: read eeprom in maximum 16 byte increments net/tls: replace the sleeping lock around RX resync with a bit lock packet: unconditionally free po->rollover pktgen: do not sleep with the thread lock held. Revert "fib_rules: return 0 directly if an exactly same rule exists when NLM_F_EXCL not supplied" ipv6: use READ_ONCE() for inet->hdrincl as in ipv4 ipv6: fix EFAULT on sendto with icmpv6 and hdrincl mtd: spinand: macronix: Fix ECC Status Read rcu: locking and unlocking need to always be at least barriers parisc: Use implicit space register selection for loading the coherence index of I/O pdirs NFSv4.1: Again fix a race where CB_NOTIFY_LOCK fails to wake a waiter NFSv4.1: Fix bug only first CB_NOTIFY_LOCK is handled fuse: fallocate: fix return with locked inode pstore: Remove needless lock during console writes pstore: Convert buf_lock to semaphore pstore: Set tfm to NULL on free_buf_for_compression pstore/ram: Run without kernel crash dump region x86/power: Fix 'nosmt' vs hibernation triple fault during resume x86/insn-eval: Fix use-after-free access to LDT entry i2c: xiic: Add max_read_len quirk s390/mm: fix address space detection in exception handling xen-blkfront: switch kcalloc to kvcalloc for large array allocation MIPS: Bounds check virt_addr_valid MIPS: pistachio: Build uImage.gz by default Revert "MIPS: perf: ath79: Fix perfcount IRQ assignment" genwqe: Prevent an integer overflow in the ioctl test_firmware: Use correct snprintf() limit drm/gma500/cdv: Check vbt config bits when detecting lvds panels drm/msm: fix fb references in async update drm: add non-desktop quirk for Valve HMDs drm/nouveau: add kconfig option to turn off nouveau legacy contexts. (v3) drm: add non-desktop quirks to Sensics and OSVR headsets. drm/amdgpu/psp: move psp version specific function pointers to early_init drm/radeon: prefer lower reference dividers drm/amdgpu: remove ATPX_DGPU_REQ_POWER_FOR_DISPLAYS check when hotplug-in drm/i915: Fix I915_EXEC_RING_MASK drm/i915/fbc: disable framebuffer compression on GeminiLake drm/i915: Maintain consistent documentation subsection ordering drm: don't block fb changes for async plane updates drm/i915/gvt: Initialize intel_gvt_gtt_entry in stack TTY: serial_core, add ->install ipv4: Define __ipv4_neigh_lookup_noref when CONFIG_INET is disabled ethtool: check the return value of get_regs_len Linux 4.19.50 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> |
||
|
Jiri Kosina
|
4d166206cf |
x86/power: Fix 'nosmt' vs hibernation triple fault during resume
commit ec527c318036a65a083ef68d8ba95789d2212246 upstream. As explained in |
||
|
Abhijeet Dharmapurikar
|
c208338efc |
power: em: correct increasing freq/power ratio
As freq increases freq/power should decrease, indicating nonlinearly higher power is required for running at higher frequencies. If freq/power increases, the cost associated with that freq will be lower than its previous one, causing the energy calculations to choose a cpu with that frequency over a cpu with the previous lesser freq. For some frequencies, if their voltage increment from the previous ones is very small (or is the same), we could end up with higher freq/power ratio. This is primarily because of_dev_pm_opp_get_cpu_power() returns power in mW and looses precision. But instead of addressing it, enforce the same cost as the previous frequency. The energy evaluation code prefers the previous cpu when the energy costs are same as other candidates. By keeping the energy costs same in these situations we are increasing the likely hood of selecting prev cpu even if it results in a slight freq bump. In general, selecting prev cpu is beneficial because it avoids warming up the caches at a different cpu. Change-Id: Ic66ab18ba65f2917b73d9fbe92a39b743b9839a0 Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org> |
||
|
Raghavendra Kakarla
|
e65162547a |
kernel: power: qos: remove check for core isolation while cluster LPMs
Since all cores in a cluster are in isolation, PMQoS latency constraint set by clock driver to switch PLL is ignored. So, Cluster enter to L2PC and SPM is trying to disable the PLL and at same time clock driver trying to switch the PLL from other cluster which leads to the synchronization issues. Fix is although all cores are in isolation, honor PMQoS request for cluster LPMs. Change-Id: I4296e16ef4e9046d1fbe3b7378e9f61a2f11c74d Signed-off-by: Raghavendra Kakarla <rkakarla@codeaurora.org> |
||
|
Olav Haugan
|
2d42471077 |
pmqos: Enable cpu isolation awareness
Set long latency requirement for isolated cores to ensure LPM logic will select a deep sleep state. Change-Id: I83e9fbb800df259616a145d311b50627dc42a5ff Signed-off-by: Olav Haugan <ohaugan@codeaurora.org> |
||
|
qctecmdr Service
|
b7d7f53954 | Merge "qos: Disable irq notifier when qos request is removed" | ||
|
Ivaylo Georgiev
|
5643b9b50e |
Merge android-4.19.19 (18ba00a) into msm-4.19
* refs/heads/tmp-18ba00a:
Revert "scsi: ufs: Use explicit access size in ufshcd_dump_regs"
Linux 4.19.19
Input: input_event - fix the CONFIG_SPARC64 mixup
ide: fix a typo in the settings proc file name
usb: dwc3: gadget: Clear req->needs_extra_trb flag on cleanup
Revert "mm, memory_hotplug: initialize struct pages for the full memory section"
nvmet-rdma: fix null dereference under heavy load
nvmet-rdma: Add unlikely for response allocated check
s390/smp: Fix calling smp_call_ipl_cpu() from ipl CPU
bpf: fix inner map masking to prevent oob under speculation
bpf: fix sanitation of alu op with pointer / scalar type from different paths
bpf: prevent out of bounds speculation on pointer arithmetic
bpf: fix check_map_access smin_value test when pointer contains offset
bpf: restrict unknown scalars of mixed signed bounds for unprivileged
bpf: restrict stack pointer arithmetic for unprivileged
bpf: restrict map value pointer arithmetic for unprivileged
bpf: enable access to ax register also from verifier rewrite
bpf: move tmp variable into ax register in interpreter
bpf: move {prev_,}insn_idx into verifier env
bpf: add per-insn complexity limit
bpf: improve verifier branch analysis
drm/meson: Fix atomic mode switching regression
vt: invoke notifier on screen size change
vt: always call notifier with the console lock held
vt: make vt_console_print() compatible with the unicode screen buffer
can: flexcan: fix NULL pointer exception during bringup
can: bcm: check timer values before ktime conversion
can: dev: __can_get_echo_skb(): fix bogous check for non-existing skb by removing it
irqchip/gic-v3-its: Align PCI Multi-MSI allocation on their size
net: sun: cassini: Cleanup license conflict
posix-cpu-timers: Unbreak timer rearming
x86/entry/64/compat: Fix stack switching for XEN PV
x86/kaslr: Fix incorrect i8254 outb() parameters
x86/selftests/pkeys: Fork() to check for state being preserved
x86/pkeys: Properly copy pkey state at fork()
KVM/nVMX: Do not validate that posted_intr_desc_addr is page aligned
kvm: x86/vmx: Use kzalloc for cached_vmcs12
KVM: x86: WARN_ONCE if sending a PV IPI returns a fatal error
KVM: x86: Fix PV IPIs for 32-bit KVM host
KVM: x86: Fix single-step debugging
drm/amdgpu: Add APTX quirk for Lenovo laptop
dm crypt: fix parsing of extended IV arguments
dm thin: fix passdown_double_checking_shared_status()
scsi: ufs: Use explicit access size in ufshcd_dump_regs
acpi/nfit: Fix command-supported detection
acpi/nfit: Block function zero DSMs
Input: uinput - fix undefined behavior in uinput_validate_absinfo()
Input: input_event - provide override for sparc64
Input: xpad - add support for SteelSeries Stratus Duo
smb3: add credits we receive from oplock/break PDUs
CIFS: Do not reconnect TCP session in add_credits()
CIFS: Fix credit calculation for encrypted reads with errors
CIFS: Fix credits calculations for reads with errors
CIFS: Fix possible hang during async MTU reads and writes
vgacon: unconfuse vc_origin when using soft scrollback
Drivers: hv: vmbus: Check for ring when getting debug info
hv_balloon: avoid touching uninitialized struct page during tail onlining
tty/n_hdlc: fix __might_sleep warning
uart: Fix crash in uart_write and uart_put_char
tty: Handle problem if line discipline does not have receive_buf
staging: rtl8188eu: Add device code for D-Link DWA-121 rev B1
mmc: meson-gx: Free irq in release() callback
mmc: dw_mmc-bluefield: : Fix the license information
char/mwave: fix potential Spectre v1 vulnerability
misc: ibmvsm: Fix potential NULL pointer dereference
s390/smp: fix CPU hotplug deadlock with CPU rescan
s390/early: improve machine detection
s390/mm: always force a load of the primary ASCE on context switch
ARC: perf: map generic branches to correct hardware condition
ARC: adjust memblock_reserve of kernel memory
ARCv2: lib: memeset: fix doing prefetchw outside of buffer
ALSA: hda - Add mute LED support for HP ProBook 470 G5
ALSA: hda/realtek - Fix typo for ALC225 model
inotify: Fix fd refcount leak in inotify_add_watch().
clk: socfpga: stratix10: fix naming convention for the fixed-clocks
clk: socfpga: stratix10: fix rate calculation for pll clocks
ASoC: tlv320aic32x4: Kernel OOPS while entering DAPM standby mode
ASoC: rt5514-spi: Fix potential NULL pointer dereference
ASoC: atom: fix a missing check of snd_pcm_lib_malloc_pages
ceph: clear inode pointer when snap realm gets dropped by its inode
USB: serial: pl2303: add new PID to support PL2303TB
USB: serial: simple: add Motorola Tetra TPG2200 device id
USB: leds: fix regression in usbport led trigger
mei: me: add denverton innovation engine device IDs
mei: me: mark LBG devices as having dma support
tcp: allow MSG_ZEROCOPY transmission also in CLOSE_WAIT state
ip6_gre: update version related info when changing link
net: phy: marvell: Fix deadlock from wrong locking
erspan: build the header with the right proto according to erspan_ver
ip6_gre: fix tunnel list corruption for x-netns
udp: with udp_segment release on error path
net/sched: cls_flower: allocate mask dynamically in fl_change()
mlxsw: pci: Ring CQ's doorbell before RDQ's
mlxsw: spectrum_fid: Update dummy FID index
net: ipv4: Fix memory leak in network namespace dismantle
mlxsw: pci: Increase PCI SW reset timeout
vhost: log dirty page correctly
openvswitch: Avoid OOB read when parsing flow nlattrs
net_sched: refetch skb protocol for each filter
net/sched: act_tunnel_key: fix memory leak in case of action replace
net: phy: mdio_bus: add missing device_del() in mdiobus_register() error handling
net: phy: marvell: Errata for mv88e6390 internal PHYs
net: Fix usage of pskb_trim_rcsum
net: bridge: Fix ethernet header pointer before check skb forwardable
amd-xgbe: Fix mdio access for non-zero ports and clause 45 PHYs
FROMGIT: PM / EM: Expose the Energy Model in debugfs
Change-Id: I2cd5399c3dedc227e2131f689b4905e9d454b190
Signed-off-by: Ivaylo Georgiev <irgeorgiev@codeaurora.org>
|
||
|
Ivaylo Georgiev
|
77906c0942 |
Merge android-4.19.14 (8735c21) into msm-4.19
* refs/heads/tmp-8735c21: ANDROID: thermal: cpu_cooling: Use related_cpus for energy model cpumask check Linux 4.19.14 MIPS: Only include mmzone.h when CONFIG_NEED_MULTIPLE_NODES=y spi: bcm2835: Unbreak the build of esoteric configs tpm: tpm_i2c_nuvoton: use correct command duration for TPM 2.x tpm: tpm_try_transmit() refactor error flow. arm64: compat: Avoid sending SIGILL for unallocated syscall numbers iommu/arm-smmu-v3: Fix big-endian CMD_SYNC writes KVM: arm/arm64: vgic: Fix off-by-one bug in vgic_get_irq() KVM: arm/arm64: vgic-v2: Set active_source to 0 when restoring state KVM: arm/arm64: vgic: Cap SPIs to the VM-defined maximum KVM: arm/arm64: vgic: Do not cond_resched_lock() with IRQs disabled rtc: m41t80: Correct alarm month range with RTC reads ARM: dts: exynos: Specify I2S assigned clocks in proper node arm/arm64: KVM: vgic: Force VM halt when changing the active state of GICv3 PPIs/SGIs arm64: KVM: Avoid setting the upper 32 bits of VTCR_EL2 to 1 smb3: fix large reads on encrypted connections CIFS: Fix error mapping for SMB2_LOCK command which caused OFD lock problem MIPS: Fix a R10000_LLSC_WAR logic in atomic.h MIPS: OCTEON: mark RGMII interface disabled on OCTEON III MIPS: Expand MIPS32 ASIDs to 64 bits MIPS: Align kernel load address to 64KB MIPS: Ensure pmd_present() returns false after pmd_mknotpresent() MIPS: c-r4k: Add r4k_blast_scache_node for Loongson-3 MIPS: math-emu: Write-protect delay slot emulation pages tools lib traceevent: Fix processing of dereferenced args in bprintk events media: v4l2-tpg: array index could become negative media: vb2: check memory model for VIDIOC_CREATE_BUFS media: vivid: free bitmap_cap when updating std/timings/etc. media: imx274: fix stack corruption in imx274_read_reg media: rc: cec devices do not have a lirc chardev media: cec-pin: fix broken tx_ignore_nack_until_eom error injection media: cec: keep track of outstanding transmits serial: uartps: Fix interrupt mask issue to handle the RX interrupts properly f2fs: sanity check of xattr entry size f2fs: fix validation of the block count in sanity_check_raw_super f2fs: read page index before freeing dax: Use non-exclusive wait in wait_entry_unlocked() dax: Don't access a freed inode powerpc/tm: Unset MSR[TS] if not recheckpointing brcmfmac: Fix out of bounds memory access during fw load brcmfmac: fix roamoff=1 modparam Btrfs: send, fix race with transaction commits that create snapshots btrfs: run delayed items before dropping the snapshot Btrfs: fix fsync of files with multiple hard links in new directories btrfs: skip file_extent generation check for free_space_inode in run_delalloc_nocow btrfs: dev-replace: go back to suspend state if another EXCL_OP is running btrfs: dev-replace: go back to suspended state if target device is missing cdc-acm: fix abnormal DATA RX issue for Mediatek Preloader. cgroup: fix CSS_TASK_ITER_PROCS crypto: cfb - fix decryption crypto: testmgr - add AES-CFB tests crypto: chcr - small packet Tx stalls the queue crypto: cavium/nitrox - fix a DMA pool free failure clk: sunxi-ng: Use u64 for calculation of NM rate clk: rockchip: fix typo in rk3188 spdif_frac parent spi: bcm2835: Avoid finishing transfer prematurely in IRQ mode spi: bcm2835: Fix book-keeping of DMA termination spi: bcm2835: Fix race on DMA termination ext4: check for shutdown and r/o file system in ext4_write_inode() ext4: force inode writes when nfsd calls commit_metadata() ext4: avoid declaring fs inconsistent due to invalid file handles ext4: include terminating u32 in size of xattr entries when expanding inodes ext4: fix EXT4_IOC_GROUP_ADD ioctl ext4: missing unlock/put_page() in ext4_try_to_write_inline_data() ext4: fix possible use after free in ext4_quota_enable ext4: add ext4_sb_bread() to disambiguate ENOMEM cases ocxl: Fix endiannes bug in read_afu_name() ocxl: Fix endiannes bug in ocxl_link_update_pe() perf env: Also consider env->arch == NULL as local operation perf pmu: Suppress potential format-truncation warning perf script: Use fallbacks for branch stacks perf tools: Use fallback for sample_addr_correlates_sym() cases perf thread: Add fallback functions for cases where cpumode is insufficient perf machine: Record if a arch has a single user/kernel address space clocksource/drivers/arc_timer: Utilize generic sched_clock DRM: UDL: get rid of useless vblank initialization drm/v3d: Skip debugfs dumping GCA on platforms without GCA. platform-msi: Free descriptors in platform_msi_domain_free() KVM: nVMX: Free the VMREAD/VMWRITE bitmaps if alloc_kvm_area() fails arm64: KVM: Make VHE Stage-2 TLB invalidation operations non-interruptible KVM: x86: Use jmp to invoke kvm_spurious_fault() from .fixup x86/mm: Drop usage of __flush_tlb_all() in kernel_physical_mapping_init() x86/speculation/l1tf: Drop the swap storage limit restriction when l1tf=off Input: elan_i2c - add ACPI ID for touchpad in ASUS Aspire F5-573G Input: atmel_mxt_ts - don't try to free unallocated kernel memory s390/pci: fix sleeping in atomic during hotplug ASoC: intel: cht_bsw_max98090_ti: Add pmc_plt_clk_0 quirk for Chromebook Gnawty ASoC: intel: cht_bsw_max98090_ti: Add pmc_plt_clk_0 quirk for Chromebook Clapper staging: wilc1000: fix missing read_write setting when reading data media: dvb-usb-v2: Fix incorrect use of transfer_flags URB_FREE_BUFFER usb: roles: Add a description for the class to Kconfig Revert "usb: dwc3: pci: Use devm functions to get the phy GPIOs" usb: dwc2: disable power_down on Amlogic devices usb: r8a66597: Fix a possible concurrency use-after-free bug in r8a66597_endpoint_disable() USB: serial: option: add Fibocom NL678 series USB: serial: pl2303: add ids for Hewlett-Packard HP POS pole displays usb: dwc2: host: use hrtimer for NAK retries ALSA: hda/tegra: clear pending irq handlers ALSA: hda/realtek: Enable the headset mic auto detection for ASUS laptops ALSA: firewire-lib: use the same print format for 'without_header' tracepoints ALSA: firewire-lib: fix wrong assignment for 'out_packet_without_header' tracepoint ALSA: firewire-lib: fix wrong handling payload_length as payload_quadlet ALSA: fireface: fix for state to fetch PCM frames ALSA: hda/realtek: Enable audio jacks of ASUS UX391UA with ALC294 ALSA: hda: add mute LED support for HP EliteBook 840 G4 mtd: rawnand: omap2: Pass the parent of pdev to dma_request_chan() mtd: rawnand: marvell: prevent timeouts on a loaded machine mtd: atmel-quadspi: disallow building on ebsa110 powerpc/fsl: Fix spectre_v2 mitigations reporting ALSA: emux: Fix potential Spectre v1 vulnerabilities ALSA: pcm: Fix potential Spectre v1 vulnerability ALSA: emu10k1: Fix potential Spectre v1 vulnerabilities ALSA: rme9652: Fix potential Spectre v1 vulnerability IB/hfi1: Incorrect sizing of sge for PIO will OOPs r8169: fix WoL device wakeup enable net: Use __kernel_clockid_t in uapi net_stamp.h net: mvneta: fix operation for 64K PAGE_SIZE net/mlx5e: RX, Fix wrong early return in receive queue poll net/mlx5e: Remove unused UDP GSO remaining counter mlxsw: core: Increase timeout during firmware flash process qed: Fix command number mismatch between driver and the mfw net: mvpp2: fix the phylink mode validation net/mlx5e: RX, Verify MPWQE stride size is in range net/mlx5e: Cancel DIM work on close SQ mscc: Configured MAC entries should be locked. ipv6: route: Fix return value of ip6_neigh_lookup() on neigh_create() error nfp: flower: ensure TCP flags can be placed in IPv6 frame net/ipv6: Fix a test against 'ipv6_find_idev()' return value ipv6: frags: Fix bogus skb->sk in reassembled packets net/mlx5e: Remove the false indication of software timestamping support tipc: check group dests after tipc_wait_for_cond() net/mlx5: Typo fix in del_sw_hw_rule xen/netfront: tolerate frags with no data VSOCK: Send reset control packet when socket is partially bound vhost: make sure used idx is seen before log in vhost_add_used_n() tipc: use lock_sock() in tipc_sk_reinit() tipc: fix a double kfree_skb() tipc: fix a double free in tipc_enable_bearer() tipc: compare remote and local protocols in tipc_udp_enable() tipc: check tsk->group in tipc_wait_for_cond() tcp: fix a race in inet_diag_dump_icsk() sock: Make sock->sk_stamp thread-safe sctp: initialize sin6_flowinfo for ipv6 addrs in sctp_inet6addr_event qmi_wwan: Add support for Fibocom NL678 series qmi_wwan: Added support for Telit LN940 series qmi_wwan: Added support for Fibocom NL668 series ptr_ring: wrap back ->producer in __ptr_ring_swap_queue() packet: validate address length if non-zero packet: validate address length net/wan: fix a double free in x25_asy_open_tty() net/tls: allocate tls context using GFP_ATOMIC net: stmmac: Fix an error code in probe() net/smc: fix TCP fallback socket release netrom: fix locking in nr_find_socket() net: phy: Fix the issue that netif always links up after resuming net: mvpp2: 10G modes aren't supported on all ports net: macb: restart tx after tx used bit read net: ipv4: do not handle duplicate fragments as overlapping net/hamradio/6pack: use mod_timer() to rearm timers net: clear skb->tstamp in forwarding paths isdn: fix kernel-infoleak in capi_unlocked_ioctl ip: validate header length on virtual device xmit ipv6: tunnels: fix two use-after-free ipv6: explicitly initialize udp6_addr in udp_sock_create6() ipv4: Fix potential Spectre v1 vulnerability ip6mr: Fix potential Spectre v1 vulnerability ieee802154: lowpan_header_create check must check daddr ibmveth: fix DMA unmap error in ibmveth_xmit_start error path gro_cell: add napi_disable in gro_cells_destroy ax25: fix a use-after-free in ax25_fillin_cb() Revert "FROMLIST: PM / EM: Expose the Energy Model in sysfs" Revert "FROMLIST: sched: Introduce a sysctl for Energy Aware Scheduling" ANDROID: sched: Align EAS with upstream ANDROID: cuttlefish_defconfig: Enable VIRTIO_INPUT Conflicts: include/linux/sched/sysctl.h kernel/sysctl.c Change-Id: I44212c239e9ca2b1ce68ed59e95d0f7913159a52 Signed-off-by: Ivaylo Georgiev <irgeorgiev@codeaurora.org> |
||
|
Srinivas Rao L
|
7fce29f6a3 |
qos: Disable irq notifier when qos request is removed
When a qos request is added with IRQ affinity, irq notifier for that irq is added and without disabling the irq notifier if the irq is free it throws a warning. So disable irq notifier when the qos request is removed. Change-Id: I50faa4ecbe1b632c0f0f203ca52faf18753c33d4 Signed-off-by: Srinivas Rao L <lsrao@codeaurora.org> Signed-off-by: Lina Iyer <ilina@codeaurora.org> [fix checkpatch issues] |
||
|
Quentin Perret
|
5f5a57750b |
FROMGIT: PM / EM: Expose the Energy Model in debugfs
The recently introduced Energy Model (EM) framework manages power cost
tables of CPUs. These tables are currently only visible from kernel
space. However, in order to debug the behaviour of subsystems that use
the EM (EAS for example), it is often required to know what the power
costs are from userspace.
For this reason, introduce under /sys/kernel/debug/energy_model a set of
directories representing the performance domains of the system. Each
performance domain contains a set of sub-directories representing the
different capacity states (cs) and their attributes, as well as a file
exposing the related CPUs.
The resulting hierarchy is as follows on Arm juno r0 for example:
/sys/kernel/debug/energy_model
├── pd0
│ ├── cpus
│ ├── cs:450000
│ │ ├── cost
│ │ ├── frequency
│ │ └── power
│ ├── cs:575000
│ │ ├── cost
│ │ ├── frequency
│ │ └── power
│ ├── cs:700000
│ │ ├── cost
│ │ ├── frequency
│ │ └── power
│ ├── cs:775000
│ │ ├── cost
│ │ ├── frequency
│ │ └── power
│ └── cs:850000
│ ├── cost
│ ├── frequency
│ └── power
└── pd1
├── cpus
├── cs:1100000
│ ├── cost
│ ├── frequency
│ └── power
├── cs:450000
│ ├── cost
│ ├── frequency
│ └── power
├── cs:625000
│ ├── cost
│ ├── frequency
│ └── power
├── cs:800000
│ ├── cost
│ ├── frequency
│ └── power
└── cs:950000
├── cost
├── frequency
└── power
Bug: 120440300
Change-Id: I4098c3d3e07fc4a14514751ac881422131b759e9
Signed-off-by: Quentin Perret <quentin.perret@arm.com>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
(cherry picked from commit 9cac42d0645ceb2ca8b815cee04810ec9b0d13b3
git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git bleeding-edge)
Signed-off-by: Quentin Perret <quentin.perret@arm.com>
|
||
|
Mahesh Sivasubramanian
|
1f4e123c21 |
qos: Pass the list of cpus with affected qos to notifer
Send the list of cpus whose qos has been affected along with the changed value. Driver listening in for notifier can use this to apply the qos value for the respective cpus. Wakeup cpus even if the aggregated qos value does not change but the cpumask changes. Change-Id: I8f3c2ea624784c806c55de41cc7c7fcf8ebf02da Signed-off-by: Mahesh Sivasubramanian <msivasub@codeaurora.org> Signed-off-by: Maulik Shah <mkshah@codeaurora.org> |
||
|
Quentin Perret
|
9f5e702922 |
Revert "FROMLIST: PM / EM: Expose the Energy Model in sysfs"
This reverts commit
|
||
|
Pavankumar Kondeti
|
3007ade07d |
power: qos: Use effective affinity mask
PM_QOS_REQ_AFFINE_IRQ request is supposed to apply the QoS vote for the CPU(s) on which the attached interrupt arrives. Currently the QoS vote is applied to all the CPUs present in the IRQ affinity mask i.e desc->irq_data.common->affinity. However some chips configure only a single CPU from this affinity mask to receive the IRQ. This information is present in effective affinity mask of an IRQ. Start using it so that a QoS vote is not applied to other CPUs on which the IRQ never comes but present in the affinity mask. Change-Id: If26aa23bebe4a7d07ffedb5ff833ccdb4f4fb6ea Signed-off-by: Pavankumar Kondeti <pkondeti@codeaurora.org> |
||
|
qctecmdr Service
|
28ca9870ed | Merge "Merge remote-tracking branch 'origin_4.19/tmp-0567d2f' into msm-4.19" | ||
|
Rishabh Bhatnagar
|
4ac13bd161 |
Merge remote-tracking branch 'origin_4.19/tmp-0567d2f' into msm-4.19
* origin_4.19/tmp-0567d2f:
Linux 4.19.9
HID: quirks: fix RetroUSB.com devices
mac80211: ignore NullFunc frames in the duplicate detection
mac80211: fix reordering of buffered broadcast packets
mac80211: ignore tx status for PS stations in ieee80211_tx_status_ext
mac80211: Clear beacon_int in ieee80211_do_stop
mac80211: fix GFP_KERNEL under tasklet context
mac80211_hwsim: Timer should be initialized before device registered
cfg80211: Fix busy loop regression in ieee80211_ie_split_ric()
libnvdimm, pfn: Pad pfn namespaces relative to other regions
kgdboc: fix KASAN global-out-of-bounds bug in param_set_kgdboc_var()
gnss: sirf: fix activation retry handling
tty: do not set TTY_IO_ERROR flag if console port
tty: serial: 8250_mtk: always resume the device in probe.
Drivers: hv: vmbus: Offload the handling of channels to two workqueues
x86/efi: Allocate e820 buffer before calling efi_exit_boot_service
kprobes/x86: Fix instruction patching corruption when copying more than one RIP-relative instruction
drm/i915: Downgrade Gen9 Plane WM latency error
drm/amdgpu/gmc8: always load MC firmware in the driver
drm/amdgpu/gmc8: update MC firmware for polaris
drm/msm: Move fence put to where failure occurs
drm/lease: Send a distinct uevent
drm/amdgpu: update mc firmware image for polaris12 variants
crypto: do not free algorithm before using
Revert commit
|
||
|
Anil Kumar Mamidala
|
5db62557cb |
qos: Register irq notify after adding the qos request
Before adding the irq affinity based qos request to the list, if the affinity of the interrupt changes it will trigger notify call. This notifier call will try to update the qos request. Accessing the qos request which is not yet added to the list leads to a NULL pointer exception. Avoid this race by registering the notifier after adding the qos request. Change-Id: I99869cc233573b5db10e4f3224d65c29511050ea Signed-off-by: Anil Kumar Mamidala <amami@codeaurora.org> |
||
|
Ruchi Kandoi
|
97f0960e55 |
ANDROID: power: wakeup_reason: add an API to log wakeup reasons
Add API log_wakeup_reason() and expose it to userspace via sysfs path /sys/kernel/wakeup_reasons/last_resume_reason Bug: 120445600 Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com> [AmitP: Folded following android-4.9 commit changes into this patch 1135122a192a ("ANDROID: POWER: fix compile warnings in log_wakeup_reason") b4e6247778b0 ("ANDROID: Power: Changes the permission to read only for sysfs file /sys/kernel/wakeup_reasons/last_resume_reason") e13dbc7c69cd ("ANDROID: power: wakeup_reason: rename irq_count to irqcount")] Signed-off-by: Amit Pundir <amit.pundir@linaro.org> [astrachan: Folded the following changes into this patch: 39d7c7fe91c0 ("ANDROID: power: wakeup_reason: Add guard condition for maximum wakeup reasons") 0730434bdf49 ("ANDROID: power: wakeup_reason: Avoids bogus error messages for the suspend aborts.") 4e42dceae54e ("ANDROID: power: wakeup_reason: Adds functionality to log the last suspend abort reason.") f21313b70ac7 ("ANDROID: power: wakeup_reason: Report suspend times from last_suspend_time") f97ec34442ac ("ANDROID: power: wakeup_reason: fix suspend time reporting") cd92df73e504 ("ANDROID: power: wakeup: Add last wake up source logging for suspend abort reason.") 546b6ae3c087 ("ANDROID: power: wakeup: Add the guard condition for len in pm_get_active_wakeup_sources") 1453d9ffcdbe ("ANDROID: power: wakeup_reason: make logging work in an interrupt context.")] Change-Id: I81addaf420f1338255c5d0638b0d244a99d777d1 Signed-off-by: Alistair Strachan <astrachan@google.com> |
||
|
Quentin Perret
|
b8c80a0f42 |
FROMLIST: PM / EM: Expose the Energy Model in sysfs
Expose the Energy Model (read-only) of all performance domains in sysfs
for convenience. To do so, add a kobject to the CPU subsystem under the
umbrella of which a kobject for each performance domain is attached.
The resulting hierarchy is as follows for a platform with two
performance domains for example:
/sys/devices/system/cpu/energy_model
├── pd0
│ ├── cost
│ ├── cpus
│ ├── frequency
│ └── power
└── pd4
├── cost
├── cpus
├── frequency
└── power
In this implementation, the kobject abstraction is only used as a
convenient way of exposing data to sysfs. However, it could also be
used in the future to allocate and release performance domains in a more
dynamic way using reference counting.
Change-Id: Ia98bcae21c3578e385be9c6b030c9adff8210909
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>
Signed-off-by: Quentin Perret <quentin.perret@arm.com>
Message-Id: <20181016101513.26919-5-quentin.perret@arm.com>
Signed-off-by: Quentin Perret <quentin.perret@arm.com>
|
||
|
Quentin Perret
|
9cbf2b68ca |
FROMLIST: PM: Introduce an Energy Model management framework
Several subsystems in the kernel (task scheduler and/or thermal at the
time of writing) can benefit from knowing about the energy consumed by
CPUs. Yet, this information can come from different sources (DT or
firmware for example), in different formats, hence making it hard to
exploit without a standard API.
As an attempt to address this, introduce a centralized Energy Model
(EM) management framework which aggregates the power values provided
by drivers into a table for each performance domain in the system. The
power cost tables are made available to interested clients (e.g. task
scheduler or thermal) via platform-agnostic APIs. The overall design
is represented by the diagram below (focused on Arm-related drivers as
an example, but applicable to any architecture):
+---------------+ +-----------------+ +-------------+
| Thermal (IPA) | | Scheduler (EAS) | | Other |
+---------------+ +-----------------+ +-------------+
| | em_pd_energy() |
| | em_cpu_get() |
+-----------+ | +--------+
| | |
v v v
+---------------------+
| |
| Energy Model |
| |
| Framework |
| |
+---------------------+
^ ^ ^
| | | em_register_perf_domain()
+----------+ | +---------+
| | |
+---------------+ +---------------+ +--------------+
| cpufreq-dt | | arm_scmi | | Other |
+---------------+ +---------------+ +--------------+
^ ^ ^
| | |
+--------------+ +---------------+ +--------------+
| Device Tree | | Firmware | | ? |
+--------------+ +---------------+ +--------------+
Drivers (typically, but not limited to, CPUFreq drivers) can register
data in the EM framework using the em_register_perf_domain() API. The
calling driver must provide a callback function with a standardized
signature that will be used by the EM framework to build the power
cost tables of the performance domain. This design should offer a lot of
flexibility to calling drivers which are free of reading information
from any location and to use any technique to compute power costs.
Moreover, the capacity states registered by drivers in the EM framework
are not required to match real performance states of the target. This
is particularly important on targets where the performance states are
not known by the OS.
The power cost coefficients managed by the EM framework are specified in
milli-watts. Although the two potential users of those coefficients (IPA
and EAS) only need relative correctness, IPA specifically needs to
compare the power of CPUs with the power of other components (GPUs, for
example), which are still expressed in absolute terms in their
respective subsystems. Hence, specifying the power of CPUs in
milli-watts should help transitioning IPA to using the EM framework
without introducing new problems by keeping units comparable across
sub-systems.
On the longer term, the EM of other devices than CPUs could also be
managed by the EM framework, which would enable to remove the absolute
unit. However, this is not absolutely required as a first step, so this
extension of the EM framework is left for later.
On the client side, the EM framework offers APIs to access the power
cost tables of a CPU (em_cpu_get()), and to estimate the energy
consumed by the CPUs of a performance domain (em_pd_energy()). Clients
such as the task scheduler can then use these APIs to access the shared
data structures holding the Energy Model of CPUs.
Change-Id: I384cb3d28f37fe82c2943d7208a4cf5dcca2b6bd
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>
Signed-off-by: Quentin Perret <quentin.perret@arm.com>
Message-Id: <20181016101513.26919-4-quentin.perret@arm.com>
Signed-off-by: Quentin Perret <quentin.perret@arm.com>
|
||
|
Rishabh Bhatnagar
|
b3953ede2a |
Merge remote-tracking branch 'origin/tmp-35a7f35' into msm-kona
* origin/tmp-35a7f35:
Linux 4.19-rc8
KVM: vmx: hyper-v: don't pass EPT configuration info to vmx_hv_remote_flush_tlb()
ubifs: Fix WARN_ON logic in exit path
fs/fat/fatent.c: add cond_resched() to fat_count_free_clusters()
mm/thp: fix call to mmu_notifier in set_pmd_migration_entry() v2
mm/mmap.c: don't clobber partially overlapping VMA with MAP_FIXED_NOREPLACE
ocfs2: fix a GCC warning
afs: Fix afs_server struct leak
MAINTAINERS: use the correct location for dt-bindings includes for mux
mux: adgs1408: use the correct MODULE_LICENSE
gfs2: Fix iomap buffered write support for journaled files (2)
arm64: perf: Reject stand-alone CHAIN events for PMUv3
arm64: Fix /proc/iomem for reserved but not memory regions
afs: Fix cell proc list
lib/bch: fix possible stack overrun
net: dsa: bcm_sf2: Call setup during switch resume
net: dsa: bcm_sf2: Fix unbind ordering
vmlinux.lds.h: Fix linker warnings about orphan .LPBX sections
vmlinux.lds.h: Fix incomplete .text.exit discards
i2c: Fix kerneldoc for renamed i2c dma put function
blk-wbt: wake up all when we scale up, not down
net: phy: sfp: remove sfp_mutex's definition
r8169: set RX_MULTI_EN bit in RxConfig for 8168F-family chips
net: socionext: clear rx irq correctly
net/mlx4_core: Fix warnings during boot on driverinit param set failures
tipc: eliminate possible recursive locking detected by LOCKDEP
selftests: udpgso_bench.sh explicitly requires bash
selftests: rtnetlink.sh explicitly requires bash.
qmi_wwan: Added support for Gemalto's Cinterion ALASxx WWAN interface
tipc: queue socket protocol error messages into socket receive buffer
tipc: set link tolerance correctly in broadcast link
net: ipv4: don't let PMTU updates increase route MTU
net: ipv4: update fnhe_pmtu when first hop's MTU changes
net/ipv6: stop leaking percpu memory in fib6 info
rds: RDS (tcp) hangs on sendto() to unresponding address
dm linear: fix linear_end_io conditional definition
IB/mlx5: Unmap DMA addr from HCA before IOMMU
net: make skb_partial_csum_set() more robust against overflows
devlink: Add helper function for safely copy string param
devlink: Fix param cmode driverinit for string type
devlink: Fix param set handling for string type
samples: disable CONFIG_SAMPLES for UML
dm linear: eliminate linear_end_io call if CONFIG_DM_ZONED disabled
pinctrl: mcp23s08: fix irq and irqchip setup order
gpio: Assign gpio_irq_chip::parents to non-stack pointer
libertas: call into generic suspend code before turning off power
of: unittest: Disable interrupt node tests for old world MAC systems
mfd: cros-ec: copy the whole event in get_next_event_xfer
mm: Preserve _PAGE_DEVMAP across mprotect() calls
dm: fix report zone remapping to account for partition offset
dm cache: destroy migration_cache if cache target registration failed
net: ena: fix auto casting to boolean
net: ena: fix NULL dereference due to untimely napi initialization
net: ena: fix rare bug when failed restart/resume is followed by driver removal
net: ena: fix warning in rmmod caused by double iounmap
KVM: x86: support CONFIG_KVM_AMD=y with CONFIG_CRYPTO_DEV_CCP_DD=m
gfs2: Fix iomap buffered write support for journaled files
ARM: KVM: Correctly order SGI register entries in the cp15 array
mmc: block: avoid multiblock reads for the last sector in SPI mode
x86/mm: Avoid VLA in pgd_alloc()
mm, sched/numa: Remove remaining traces of NUMA rate-limiting
x86/intel_rdt: Fix out-of-bounds memory access in CBM tests
rxrpc: Fix the packet reception routine
rxrpc: Fix the rxrpc_tx_packet trace line
rxrpc: Fix connection-level abort handling
rxrpc: Only take the rwind and mtu values from latest ACK
filesystem-dax: Fix dax_layout_busy_page() livelock
rxrpc: Carry call state out of locked section in rxrpc_rotate_tx_window()
rxrpc: Don't check RXRPC_CALL_TX_LAST after calling rxrpc_rotate_tx_window()
rxrpc: Don't need to take the RCU read lock in the packet receiver
rxrpc: Use the UDP encap_rcv hook
sparc64: fix fall-through annotation
sparc32: fix fall-through annotation
sparc: vdso: clean-up vdso Makefile
oradax: remove redundant null check before kfree
sparc64: viohs: Remove VLA usage
sbus: Use of_get_child_by_name helper
sparc: Convert to using %pOFn instead of device_node.name
mach64: detect the dot clock divider correctly on sparc
net/smc: retain old name for diag_mode field
net/smc: use __aligned_u64 for 64-bit smc_diag fields
net: sched: cls_u32: fix hnode refcounting
udp: Unbreak modules that rely on external __skb_recv_udp() availability
percpu: stop leaking bitmap metadata blocks
Linux 4.19-rc7
xfs: fix data corruption w/ unaligned reflink ranges
xfs: fix data corruption w/ unaligned dedupe ranges
treewide: Replace more open-coded allocation size multiplications
mm: madvise(MADV_DODUMP): allow hugetlbfs pages
ocfs2: fix locking for res->tracking and dlm->tracking_list
mm/vmscan.c: fix int overflow in callers of do_shrink_slab()
mm/vmstat.c: skip NR_TLB_REMOTE_FLUSH* properly
mm/vmstat.c: fix outdated vmstat_text
proc: restrict kernel stack dumps to root
mm/hugetlb: add mmap() encodings for 32MB and 512MB page sizes
mm/migrate.c: split only transparent huge pages when allocation fails
ipc/shm.c: use ERR_CAST() for shm_lock() error return
mm/gup_benchmark: fix unsigned comparison to zero in __gup_benchmark_ioctl
mm, thp: fix mlocking THP page with migration enabled
ocfs2: fix crash in ocfs2_duplicate_clusters_by_page()
hugetlb: take PMD sharing into account when flushing tlb/caches
mm: migration: fix migration of huge PMD shared pages
net: mvpp2: Extract the correct ethtype from the skb for tx csum offload
ipv6: take rcu lock in rawv6_send_hdrinc()
ARC: clone syscall to setp r25 as thread pointer
net: sched: Add policy validation for tc attributes
rtnetlink: fix rtnl_fdb_dump() for ndmsg header
yam: fix a missing-check bug
net: bpfilter: Fix type cast and pointer warnings
net: cxgb3_main: fix a missing-check bug
Input: uinput - add a schedule point in uinput_inject_events()
Input: evdev - add a schedule point in evdev_write()
bpf: 32-bit RSH verification must truncate input before the ALU op
MIPS: memset: Fix CPU_DADDI_WORKAROUNDS `small_fixup' regression
perf record: Use unmapped IP for inline callchain cursors
vsprintf: Fix off-by-one bug in bstr_printf() processing dereferenced pointers
perf python: Use -Wno-redundant-decls to build with PYTHON=python3
rxrpc: Fix the data_ready handler
rxrpc: Fix some missed refs to init_net
powerpc/numa: Skip onlining a offline node in kdump path
powerpc: Don't print kernel instructions in show_user_instructions()
i2c: designware: Call i2c_dw_clk_rate() only when calculating timings
xfs: update ctime and remove suid before cloning files
xfs: zero posteof blocks when cloning above eof
xfs: refactor clonerange preparation into a separate helper
iommu/amd: Clear memory encryption mask from physical address
net: phy: phylink: fix SFP interface autodetection
be2net: don't flip hw_features when VXLANs are added/deleted
drm/nouveau/drm/nouveau: Grab runtime PM ref in nv50_mstc_detect()
net/packet: fix packet drop as of virtio gso
net: dsa: b53: Keep CPU port as tagged in all VLANs
openvswitch: load NAT helper
bnxt_en: get the reduced max_irqs by the ones used by RDMA
bnxt_en: free hwrm resources, if driver probe fails.
bnxt_en: Fix enables field in HWRM_QUEUE_COS2BW_CFG request
bnxt_en: Fix VNIC reservations on the PF.
Input: mousedev - add a schedule point in mousedev_write()
team: Forbid enslaving team device to itself
net/usb: cancel pending work when unbinding smsc75xx
cgroup: Fix dom_cgrp propagation when enabling threaded mode
dm cache: fix resize crash if user doesn't reload cache table
dm cache metadata: ignore hints array being too small during resize
PM / core: Clear the direct_complete flag on errors
mlxsw: spectrum: Delete RIF when VLAN device is removed
mlxsw: pci: Derive event type from event queue number
drm/amdkfd: Fix incorrect use of process->mm
drm/amd/display: Signal hw_done() after waiting for flip_done()
kvm: nVMX: fix entry with pending interrupt if APICv is enabled
ovl: fix format of setxattr debug
ovl: fix access beyond unterminated strings
KVM: VMX: hide flexpriority from guest when disabled at the module level
KVM: VMX: check for existence of secondary exec controls before accessing
x86/vdso: Fix vDSO syscall fallback asm constraint regression
ALSA: hda/realtek - Cannot adjust speaker's volume on Dell XPS 27 7760
KVM: PPC: Book3S HV: Avoid crash from THP collapse during radix page fault
ixgbe: check return value of napi_complete_done()
sctp: fix fall-through annotation
drm/i915: Handle incomplete Z_FINISH for compressed error states
media: v4l: event: Prevent freeing event subscriptions while accessed
locking/ww_mutex: Fix runtime warning in the WW mutex selftest
x86/cpu/amd: Remove unnecessary parentheses
x86/vdso: Only enable vDSO retpolines when enabled and supported
r8169: always autoneg on resume
ipv4: fix use-after-free in ip_cmsg_recv_dstaddr()
net: qualcomm: rmnet: Fix incorrect allocation flag in receive path
net: qualcomm: rmnet: Fix incorrect allocation flag in transmit
net: qualcomm: rmnet: Skip processing loopback packets
net: systemport: Fix wake-up interrupt race during resume
smb3: fix lease break problem introduced by compounding
cifs: only wake the thread for the very last PDU in a compound
cifs: add a warning if we try to to dequeue a deleted mid
smb2: fix missing files in root share directory listing
rtnl: limit IFLA_NUM_TX_QUEUES and IFLA_NUM_RX_QUEUES to 4096
bonding: fix warning message
inet: make sure to grab rcu_read_lock before using ireq->ireq_opt
Revert "serial: sh-sci: Allow for compressed SCIF address"
Revert "serial: sh-sci: Remove SCIx_RZ_SCIFA_REGTYPE"
Revert "serial: 8250_dw: Fix runtime PM handling"
RISCV: Fix end PFN for low memory
x86/tsc: Fix UV TSC initialization
x86/platform/uv: Provide is_early_uv_system()
nfp: avoid soft lockups under control message storm
declance: Fix continuation with the adapter identification message
net: fec: fix rare tx timeout
thunderbolt: Initialize after IOMMUs
thunderbolt: Do not handle ICM events after domain is stopped
powerpc/lib: fix book3s/32 boot failure due to code patching
bpf: don't accept cgroup local storage with zero value size
drm/cma-helper: Fix crash in fbdev error path
sched/numa: Migrate pages to local nodes quicker early in the lifetime of a task
mm, sched/numa: Remove rate-limiting of automatic NUMA balancing migration
MAINTAINERS: Remove dead path from LOCKING PRIMITIVES entry
drm: fix use-after-free read in drm_mode_create_lease_ioctl()
s390/cio: Fix how vfio-ccw checks pinned pages
sched/numa: Avoid task migration for small NUMA improvement
mm/migrate: Use spin_trylock() while resetting rate limit
sched/numa: Limit the conditions where scan period is reset
sched/numa: Reset scan rate whenever task moves across nodes
sched/numa: Pass destination CPU as a parameter to migrate_task_rq
sched/numa: Stop multiple tasks from moving to the CPU at the same time
perf/x86/amd/uncore: Set ThreadMask and SliceMask for L3 Cache perf events
perf/x86/intel/uncore: Fix PCI BDF address of M3UPI on SKX
perf/ring_buffer: Prevent concurent ring buffer access
perf/x86/intel/uncore: Use boot_cpu_data.phys_proc_id instead of hardcorded physical package ID 0
perf/core: Fix perf_pmu_unregister() locking
selftests/x86: Add clock_gettime() tests to test_vdso
r8169: fix network stalls due to missing bit TXCFG_AUTO_FIFO
x86/vdso: Fix asm constraints on vDSO syscall fallbacks
tun: napi flags belong to tfile
tun: initialize napi_mutex unconditionally
tun: remove unused parameters
bond: take rcu lock in netpoll_send_skb_on_dev
rtnetlink: Fail dump if target netnsid is invalid
Revert "openvswitch: Fix template leak in error cases."
tipc: ignore STATE_MSG on wrong link session
net: sched: act_ipt: check for underflow in __tcf_ipt_init()
usb: xhci-mtk: resume USB3 roothub first
xhci: Add missing CAS workaround for Intel Sunrise Point xHCI
usb: cdc_acm: Do not leak URB buffers
Input: i8042 - enable keyboard wakeups by default when s2idle is used
Input: xpad - add support for Xbox1 PDP Camo series gamepad
soc: fsl: qman_portals: defer probe after qman's probe
lib/xz: Put CRC32_POLY_LE in xz_private.h
tcp/dccp: fix lockdep issue when SYN is backlogged
PCI: mvebu: Fix PCI I/O mapping creation sequence
net/mlx5e: Set vlan masks for all offloaded TC rules
net/mlx5: E-Switch, Fix out of bound access when setting vport rate
net/mlx5e: Avoid unbounded peer devices when unpairing TC hairpin rules
drm/i915: Avoid compiler warning for maybe unused gu_misc_iir
drm/i915: Do not redefine the has_csr parameter.
MAINTAINERS: MIPS/LOONGSON2 ARCHITECTURE - Use the normal wildcard style
KVM: x86: fix L1TF's MMIO GFN calculation
tools/kvm_stat: cut down decimal places in update interval dialog
KVM: nVMX: Fix emulation of VM_ENTRY_LOAD_BNDCFGS
KVM: x86: Do not use kvm_x86_ops->mpx_supported() directly
KVM: nVMX: Do not expose MPX VMX controls when guest MPX disabled
arm64: KVM: Sanitize PSTATE.M when being set from userspace
arm64: KVM: Tighten guest core register access from userspace
cfg80211: fix use-after-free in reg_process_hint()
mac80211: fix setting IEEE80211_KEY_FLAG_RX_MGMT for AP mode keys
cfg80211: fix wext-compat memory leak
drm/exynos: Use selected dma_dev default iommu domain instead of a fake one
i2c: i2c-scmi: fix for i2c_smbus_write_block_data
xfs: fix error handling in xfs_bmap_extents_to_btree
pstore/ram: Fix failure-path memory leak in ramoops_init
firmware: Always initialize the fw_priv list object
docs: fpga: document fpga manager flags
fpga: bridge: fix obvious function documentation error
tools: hv: fcopy: set 'error' in case an unknown operation was requested
fpga: do not access region struct after fpga_region_unregister
Drivers: hv: vmbus: Use get/put_cpu() in vmbus_connect()
netlink: fix typo in nla_parse_nested() comment
r8169: Disable clk during suspend / resume
qlcnic: fix Tx descriptor corruption on 82xx devices
tipc: fix failover problem
smsc95xx: Check for Wake-on-LAN modes
smsc75xx: Check for Wake-on-LAN modes
r8152: Check for supported Wake-on-LAN Modes
sr9800: Check for supported Wake-on-LAN modes
lan78xx: Check for supported Wake-on-LAN modes
ax88179_178a: Check for supported Wake-on-LAN modes
asix: Check for supported Wake-on-LAN modes
iomap: set page dirty after partial delalloc on mkwrite
xfs: remove invalid log recovery first/last cycle check
xfs: validate inode di_forkoff
xfs: skip delalloc COW blocks in xfs_reflink_end_cow
xfs: don't treat unknown di_flags2 as corruption in scrub
xfs: remove duplicated include from alloc.c
xfs: don't bring in extents in xfs_bmap_punch_delalloc_range
xfs: fix transaction leak in xfs_reflink_allocate_cow()
xfs: avoid lockdep false positives in xfs_trans_alloc
xfs: refactor xfs_buf_log_item reference count handling
xfs: clean up xfs_trans_brelse()
xfs: don't unlock invalidated buf on aborted tx commit
xfs: remove last of unnecessary xfs_defer_cancel() callers
xfs: don't crash the vfs on a garbage inline symlink
MAINTAINERS: Remove obsolete drivers/pci pattern from ACPI section
MIPS: Fix CONFIG_CMDLINE handling
MIPS: VDSO: Always map near top of user memory
ibmvnic: remove ndo_poll_controller
sfc-falcon: remove ndo_poll_controller
sfc: remove ndo_poll_controller
net: ena: remove ndo_poll_controller
qlogic: netxen: remove ndo_poll_controller
qlcnic: remove ndo_poll_controller
virtio_net: remove ndo_poll_controller
net: hns: remove ndo_poll_controller
ehea: remove ndo_poll_controller
hinic: remove ndo_poll_controller
netpoll: do not test NAPI_STATE_SCHED in poll_one_napi()
qed: Fix shmem structure inconsistency between driver and the mfw.
Update maintainers for bnx2/bnx2x/qlge/qlcnic drivers.
MAINTAINERS: change bridge maintainers
s390: qeth: Fix potential array overrun in cmd/rc lookup
s390: qeth_core_mpc: Use ARRAY_SIZE instead of reimplementing its function
mmc: slot-gpio: Fix debounce time to use miliseconds again
bpf: harden flags check in cgroup_storage_update_elem()
netfilter: xt_socket: check sk before checking for netns.
netfilter: avoid erronous array bounds warning
netfilter: nft_set_rbtree: add missing rb_erase() in GC routine
rxrpc: Fix error distribution
rxrpc: Fix transport sockopts to get IPv4 errors on an IPv6 socket
rxrpc: Make service call handling more robust
rxrpc: Improve up-front incoming packet checking
rxrpc: Emit BUSY packets when supposed to rather than ABORTs
rxrpc: Fix RTT gathering
rxrpc: Fix checks as to whether we should set up a new call
scsi: qedi: Initialize the stats mutex lock
crypto: qat - Fix KASAN stack-out-of-bounds bug in adf_probe()
crypto: mxs-dcp - Fix wait logic on chan threads
crypto: chelsio - Fix memory corruption in DMA Mapped buffers.
PCI: Reprogram bridge prefetch registers on resume
soc: fsl: qbman: add APIs to retrieve the probing status
perf report: Don't try to map ip to invalid map
rseq/selftests: fix parametrized test with -fpie
iwlwifi: 1000: set the TFD queue size
ieee802154: mcr20a: Replace magic number with constants
s390/cio: Refactor alloc of ccw_io_region
s390/cio: Convert ccw_io_region to pointer
rxrpc: Remove dup code from rxrpc_find_connection_rcu()
ieee802154: ca8210: remove redundant condition check before debugfs_remove
nl80211: Fix possible Spectre-v1 for CQM RSSI thresholds
net-tcp: /proc/sys/net/ipv4/tcp_probe_interval is a u32 not int
bnxt_en: Fix TX timeout during netpoll.
vxlan: fill ttl inherit info
net: phy: sfp: Fix unregistering of HWMON SFP device
qed: Avoid implicit enum conversion in qed_iwarp_parse_rx_pkt
qed: Avoid constant logical operation warning in qed_vf_pf_acquire
bonding: avoid possible dead-lock
bonding: pass link-local packets to bonding master also.
qed: Avoid implicit enum conversion in qed_roce_mode_to_flavor
qed: Fix mask parameter in qed_vf_prep_tunn_req_tlv
qed: Avoid implicit enum conversion in qed_set_tunn_cls_info
wimax/i2400m: fix spelling mistake "not unitialized" -> "uninitialized"
qed: fix spelling mistake "toogle" -> "toggle"
net: phy: fix WoL handling when suspending the PHY
net: core: add member wol_enabled to struct net_device
Revert "net: phy: fix WoL handling when suspending the PHY"
net: phy: fix WoL handling when suspending the PHY
net/ipv6: Remove extra call to ip6_convert_metrics for multipath case
mmc: core: Fix debounce time to use microseconds
video/fbdev/stifb: Fix spelling mistake in fall-through annotation
uvesafb: Fix URLs in the documentation
efifb: BGRT: Add nobgrt option
fbdev/omapfb: fix omapfb_memory_read infoleak
pxa168fb: prepare the clock
Bluetooth: SMP: fix crash in unpairing
mac80211_hwsim: do not omit multicast announce of first added radio
mac80211_hwsim: fix race in radio destruction from netlink notifier
mac80211_hwsim: fix locking when iterating radios during ns exit
nl80211: Fix possible Spectre-v1 for NL80211_TXRATE_HT
cfg80211: fix reg_query_regdb_wmm kernel-doc
mac80211: allocate TXQs for active monitor interfaces
tipc: lock wakeup & inputq at tipc_link_reset()
tipc: reset bearer if device carrier not ok
ARM: dts: stm32: update SPI6 dmas property on stm32mp157c
soc: fsl: qe: Fix copy/paste bug in ucc_get_tdm_sync_shift()
soc: fsl: qbman: qman: avoid allocating from non existing gen_pool
ovl: make symbol 'ovl_aops' static
tipc: fix flow control accounting for implicit connect
net: hns: fix for unmapping problem when SMMU is on
xen-netback: handle page straddling in xenvif_set_hash_mapping()
xen-netback: validate queue numbers in xenvif_set_hash_mapping()
xen-netback: fix input validation in xenvif_set_hash_mapping()
net: macb: Clean 64b dma addresses if they are not detected
perf script python: Fix export-to-sqlite.py sample columns
perf script python: Fix export-to-postgresql.py occasional failure
i2c: i2c-isch: fix spelling mistake "unitialized" -> "uninitialized"
i2c: i2c-qcom-geni: Properly handle DMA safe buffers
ARM: dts: BCM63xx: Fix incorrect interrupt specifiers
arm64: hugetlb: Avoid unnecessary clearing in huge_ptep_set_access_flags
arm64: hugetlb: Fix handling of young ptes
KVM: x86: never trap MSR_KERNEL_GS_BASE
USB: serial: simple: add Motorola Tetra MTP6550 id
HID: intel-ish-hid: Enable Ice Lake mobile
HID: i2c-hid: Remove RESEND_REPORT_DESCR quirk and its handling
vfs: swap names of {do,vfs}_clone_file_range()
ovl: fix freeze protection bypass in ovl_clone_file_range()
ovl: fix freeze protection bypass in ovl_write_iter()
ovl: fix memory leak on unlink of indexed file
MAINTAINERS: update the Annapurna Labs maintainer email
ieee802154: remove unecessary condition check before debugfs_remove_recursive
ieee802154: Use kmemdup instead of duplicating it in ca8210_test_int_driver_write
crypto: caam/jr - fix ablkcipher_edesc pointer arithmetic
netfilter: conntrack: get rid of double sizeof
netfilter: nft_osf: use enum nft_data_types for nft_validate_register_store
netfilter: bridge: Don't sabotage nf_hook calls from an l3mdev
drm/i2c: tda9950: set MAX_RETRIES for errors only
drm/i2c: tda9950: fix timeout counter check
b43: fix DMA error related regression with proprietary firmware
s390/hibernate: fix error handling when suspend cpu != resume cpu
ALSA: hda: Fix the audio-component completion timeout
xfrm: validate template mode
ARM: dts: sun8i: drop A64 HDMI PHY fallback compatible from R40 DT
kbuild: allow to use GCC toolchain not in Clang search path
ftrace: Build with CPPFLAGS to get -Qunused-arguments
ARM: 8799/1: mm: fix pci_ioremap_io() offset check
ARM: 8787/1: wire up io_pgetevents syscall
gpiolib: Free the last requested descriptor
ARC: build: Don't set CROSS_COMPILE in arch's Makefile
sysfs: Do not return POSIX ACL xattrs via listxattr
dm raid: remove bogus const from decipher_sync_action() return type
dm mpath: fix attached_handler_name leak and dangling hw_handler_name pointer
mmc: sdhi: sys_dmac: check for all Gen3 types when whitelisting
dm thin metadata: fix __udivdi3 undefined on 32-bit
mt76x0: fix remove_interface
ARC: fix spelling mistake "entires" -> "entries"
USB: serial: option: add two-endpoints device-id flag
USB: serial: option: improve Quectel EP06 detection
HID: i2c-hid: disable runtime PM operations on hantick touchpad
ARC: build: Get rid of toolchain check
ARM: dts: at91: sama5d2_ptc_ek: fix nand pinctrl
ARM: dts: imx53-qsb: disable 1.2GHz OPP
xfrm: Fix NULL pointer dereference when skb_dst_force clears the dst_entry.
ARCv2: build: use mcpu=hs38 iso generic mcpu=archs
mac80211: fix TX status reporting for ieee80211s
mac80211: TDLS: fix skb queue/priority assignment
cfg80211: Address some corner cases in scan result channel updating
mac80211: fix pending queue hang due to TX_DROP
cfg80211: reg: Init wiphy_idx in regulatory_hint_core()
mac80211: Don't wake up from PS for offchannel TX
mac80211: Always report TX status
xfrm: reset crypto_done when iterating over multiple input xfrms
xfrm: reset transport header back to network header after all input transforms ahave been applied
xfrm6: call kfree_skb when skb is toobig
xfrm: Validate address prefix lengths in the xfrm selector.
[rishabhb@codeaurora.org: resolved some minor conflicts]
Signed-off-by: Rishabh Bhatnagar <rishabhb@codeaurora.org>
Change-Id: Ic3fb7f2c090b32694426ab160416f6a59cca8126
|
||
|
Greg Kroah-Hartman
|
eb81bfb224 |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Dmitry writes:
"Input updates for v4.19-rc7
- we added a few scheduling points into various input interfaces to
ensure that large writes will not cause RCU stalls
- fixed configuring PS/2 keyboards as wakeup devices on newer
platforms
- added a new Xbox gamepad ID."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: uinput - add a schedule point in uinput_inject_events()
Input: evdev - add a schedule point in evdev_write()
Input: mousedev - add a schedule point in mousedev_write()
Input: i8042 - enable keyboard wakeups by default when s2idle is used
Input: xpad - add support for Xbox1 PDP Camo series gamepad
|