Commit Graph

6029 Commits

Author SHA1 Message Date
4563e7948b Merge "input: touchscreen: st: enable FW auto-upgrade" 2019-05-24 00:18:32 -07:00
5fc3d012c1 input: touchscreen: st: power down when suspend
Shut down power supply regulators when device suspend.

Change-Id: Ibda696bd643ba8fa285c57c45160e3a554174fd6
Signed-off-by: Xin Hua Lu <luxinhua@codeaurora.org>
2019-05-20 23:42:04 -07:00
69ebba8a18 input: touchscreen: st: enable FW auto-upgrade
If the FW file is existing, upgrade to the latest.

Change-Id: Id072b12b9b0700570415753957a1b148ee25d2d1
Signed-off-by: Xin Hua Lu <luxinhua@codeaurora.org>
2019-05-20 23:41:40 -07:00
6353398785 Merge "input: qti-haptics: Clear PLAY bit after all pattern is played" 2019-05-14 15:07:54 -07:00
2b73670c18 input: qti-haptics: Clear PLAY bit after all pattern is played
Clear the PLAY bit only after all pattern bytes are queued to make sure
the whole pattern can be played successfully.

Change-Id: I891e5e46168420c6e4963d67bc77c0f79b2a4a8c
Signed-off-by: Fenglin Wu <fenglinw@codeaurora.org>
2019-05-06 12:33:08 +08:00
1e525b68fe Merge "Merge android-4.19.31 (bb418a1) into msm-4.19" 2019-05-01 10:57:19 -07:00
33175e8d9e input: touchscreen: fts: Call touch event callback on every event
Call the touch event callback on every event received.  The previous
design call the callback after processing the entire FIFO.  However,
there are chances where multiple events with the same FID exist in
the FIFO.  This will cause the previous event to over-written
causing lost event.

Change-Id: I650edbb3a56243e091da6b5c6a9d47330ce37d65
Signed-off-by: Rick Huang <rhuang@codeaurora.org>
2019-04-17 14:13:29 -07:00
cb4493d8b8 input: touchscreen: st: add touch notification when suspend
When tap or swipe in a dedicated region, tp driver will notify
the subsystem/driver who has registered.
And this feature is not enabled by default; write the sysfs node
to enable it by demand.

Change-Id: Ie6312e8a0680b0abb9fed9a647bc9cee36985286
Signed-off-by: Rick Huang <rhuang@codeaurora.org>
Signed-off-by: Fei Mao <feim1@codeaurora.org>
2019-04-08 09:09:06 +08:00
6f910c4e90 Merge android-4.19.31 (bb418a1) into msm-4.19
* refs/heads/tmp-bb418a1:
  Linux 4.19.31
  s390/setup: fix boot crash for machine without EDAT-1
  bcache: use (REQ_META|REQ_PRIO) to indicate bio for metadata
  KVM: nVMX: Ignore limit checks on VMX instructions using flat segments
  KVM: nVMX: Apply addr size mask to effective address for VMX instructions
  KVM: nVMX: Sign extend displacements of VMX instr's mem operands
  KVM: x86/mmu: Do not cache MMIO accesses while memslots are in flux
  KVM: x86/mmu: Detect MMIO generation wrap in any address space
  KVM: Call kvm_arch_memslots_updated() before updating memslots
  drm/amd/display: don't call dm_pp_ function from an fpu block
  drm/amd/powerplay: correct power reading on fiji
  drm/radeon/evergreen_cs: fix missing break in switch statement
  drm/fb-helper: generic: Fix drm_fbdev_client_restore()
  media: imx: csi: Stop upstream before disabling IDMA channel
  media: imx: csi: Disable CSI immediately after last EOF
  media: vimc: Add vimc-streamer for stream control
  media: uvcvideo: Avoid NULL pointer dereference at the end of streaming
  media: lgdt330x: fix lock status reporting
  media: imx: prpencvf: Stop upstream before disabling IDMA channel
  rcu: Do RCU GP kthread self-wakeup from softirq and interrupt
  tpm: Unify the send callback behaviour
  tpm/tpm_crb: Avoid unaligned reads in crb_recv()
  md: Fix failed allocation of md_register_thread
  perf intel-pt: Fix divide by zero when TSC is not available
  perf/x86/intel/uncore: Fix client IMC events return huge result
  perf intel-pt: Fix overlap calculation for padding
  perf auxtrace: Define auxtrace record alignment
  perf tools: Fix split_kallsyms_for_kcore() for trampoline symbols
  perf intel-pt: Fix CYC timestamp calculation after OVF
  x86/unwind/orc: Fix ORC unwind table alignment
  vt: perform safe console erase in the right order
  stable-kernel-rules.rst: add link to networking patch queue
  bcache: never writeback a discard operation
  PM / wakeup: Rework wakeup source timer cancellation
  svcrpc: fix UDP on servers with lots of threads
  NFSv4.1: Reinitialise sequence results before retransmitting a request
  nfsd: fix wrong check in write_v4_end_grace()
  nfsd: fix memory corruption caused by readdir
  nfsd: fix performance-limiting session calculation
  NFS: Don't recoalesce on error in nfs_pageio_complete_mirror()
  NFS: Fix an I/O request leakage in nfs_do_recoalesce
  NFS: Fix I/O request leakages
  cpcap-charger: generate events for userspace
  mfd: sm501: Fix potential NULL pointer dereference
  dm integrity: limit the rate of error messages
  dm: fix to_sector() for 32bit
  ipmi_si: fix use-after-free of resource->name
  arm64: KVM: Fix architecturally invalid reset value for FPEXC32_EL2
  arm64: debug: Ensure debug handlers check triggering exception level
  arm64: Fix HCR.TGE status for NMI contexts
  ARM: s3c24xx: Fix boolean expressions in osiris_dvs_notify
  powerpc/traps: Fix the message printed when stack overflows
  powerpc/traps: fix recoverability of machine check handling on book3s/32
  powerpc/hugetlb: Don't do runtime allocation of 16G pages in LPAR configuration
  powerpc/ptrace: Simplify vr_get/set() to avoid GCC warning
  powerpc: Fix 32-bit KVM-PR lockup and host crash with MacOS guest
  powerpc/powernv: Don't reprogram SLW image on every KVM guest entry/exit
  powerpc/83xx: Also save/restore SPRG4-7 during suspend
  powerpc/powernv: Make opal log only readable by root
  powerpc/wii: properly disable use of BATs when requested.
  powerpc/32: Clear on-stack exception marker upon exception return
  security/selinux: fix SECURITY_LSM_NATIVE_LABELS on reused superblock
  selinux: add the missing walk_size + len check in selinux_sctp_bind_connect
  jbd2: fix compile warning when using JBUFFER_TRACE
  jbd2: clear dirty flag when revoking a buffer from an older transaction
  serial: 8250_pci: Have ACCES cards that use the four port Pericom PI7C9X7954 chip use the pci_pericom_setup()
  serial: 8250_pci: Fix number of ports for ACCES serial cards
  serial: 8250_of: assume reg-shift of 2 for mrvl,mmp-uart
  serial: uartps: Fix stuck ISR if RX disabled with non-empty FIFO
  bpf: only test gso type on gso packets
  drm/i915: Relax mmap VMA check
  can: flexcan: FLEXCAN_IFLAG_MB: add () around macro argument
  gpio: pca953x: Fix dereference of irq data in shutdown
  media: i2c: ov5640: Fix post-reset delay
  i2c: tegra: fix maximum transfer size
  parport_pc: fix find_superio io compare code, should use equal test.
  intel_th: Don't reference unassigned outputs
  device property: Fix the length used in PROPERTY_ENTRY_STRING()
  kernel/sysctl.c: add missing range check in do_proc_dointvec_minmax_conv
  mm/memory.c: do_fault: avoid usage of stale vm_area_struct
  mm/vmalloc: fix size check for remap_vmalloc_range_partial()
  mm: hwpoison: fix thp split handing in soft_offline_in_use_page()
  dmaengine: usb-dmac: Make DMAC system sleep callbacks explicit
  usb: typec: tps6598x: handle block writes separately with plain-I2C adapters
  usb: chipidea: tegra: Fix missed ci_hdrc_remove_device()
  clk: ingenic: Fix doc of ingenic_cgu_div_info
  clk: ingenic: Fix round_rate misbehaving with non-integer dividers
  clk: samsung: exynos5: Fix kfree() of const memory on setting driver_override
  clk: samsung: exynos5: Fix possible NULL pointer exception on platform_device_alloc() failure
  clk: clk-twl6040: Fix imprecise external abort for pdmclk
  clk: uniphier: Fix update register for CPU-gear
  ext2: Fix underflow in ext2_max_size()
  cxl: Wrap iterations over afu slices inside 'afu_list_lock'
  IB/hfi1: Close race condition on user context disable and close
  PCI: dwc: skip MSI init if MSIs have been explicitly disabled
  PCI/DPC: Fix print AER status in DPC event handling
  PCI/ASPM: Use LTR if already enabled by platform
  ext4: fix crash during online resizing
  ext4: add mask of ext4 flags to swap
  ext4: update quota information while swapping boot loader inode
  ext4: cleanup pagecache before swap i_data
  ext4: fix check of inode in swap_inode_boot_loader
  cpufreq: pxa2xx: remove incorrect __init annotation
  cpufreq: tegra124: add missing of_node_put()
  cpufreq: kryo: Release OPP tables on module removal
  x86/kprobes: Prohibit probing on optprobe template code
  irqchip/brcmstb-l2: Use _irqsave locking variants in non-interrupt code
  irqchip/gic-v3-its: Avoid parsing _indirect_ twice for Device table
  libertas_tf: don't set URB_ZERO_PACKET on IN USB transfer
  soc: qcom: rpmh: Avoid accessing freed memory from batch API
  Btrfs: fix corruption reading shared and compressed extents after hole punching
  btrfs: ensure that a DUP or RAID1 block group has exactly two stripes
  Btrfs: setup a nofs context for memory allocation at __btrfs_set_acl
  Btrfs: setup a nofs context for memory allocation at btrfs_create_tree()
  m68k: Add -ffreestanding to CFLAGS
  ovl: Do not lose security.capability xattr over metadata file copy-up
  ovl: During copy up, first copy up data and then xattrs
  splice: don't merge into linked buffers
  fs/devpts: always delete dcache dentry-s in dput()
  scsi: qla2xxx: Fix LUN discovery if loop id is not assigned yet by firmware
  scsi: target/iscsi: Avoid iscsit_release_commands_from_conn() deadlock
  scsi: sd: Optimal I/O size should be a multiple of physical block size
  scsi: aacraid: Fix performance issue on logical drives
  scsi: virtio_scsi: don't send sc payload with tmfs
  s390/virtio: handle find on invalid queue gracefully
  s390/setup: fix early warning messages
  clocksource/drivers/arch_timer: Workaround for Allwinner A64 timer instability
  clocksource/drivers/exynos_mct: Clear timer interrupt when shutdown
  clocksource/drivers/exynos_mct: Move one-shot check from tick clear to ISR
  regulator: s2mpa01: Fix step values for some LDOs
  regulator: max77620: Initialize values for DT properties
  regulator: s2mps11: Fix steps for buck7, buck8 and LDO35
  spi: pxa2xx: Setup maximum supported DMA transfer length
  spi: ti-qspi: Fix mmap read when more than one CS in use
  netfilter: ipt_CLUSTERIP: fix warning unused variable cn
  mmc:fix a bug when max_discard is 0
  mmc: sdhci-esdhc-imx: fix HS400 timing issue
  ACPI / device_sysfs: Avoid OF modalias creation for removed device
  xen: fix dom0 boot on huge systems
  tracing/perf: Use strndup_user() instead of buggy open-coded version
  tracing: Do not free iter->trace in fail path of tracing_open_pipe()
  tracing: Use strncpy instead of memcpy for string keys in hist triggers
  CIFS: Fix read after write for files with read caching
  CIFS: Do not skip SMB2 message IDs on send failures
  CIFS: Do not reset lease state to NONE on lease break
  crypto: arm64/aes-ccm - fix bugs in non-NEON fallback routine
  crypto: arm64/aes-ccm - fix logical bug in AAD MAC handling
  crypto: x86/morus - fix handling chunked inputs and MAY_SLEEP
  crypto: x86/aesni-gcm - fix crash on empty plaintext
  crypto: x86/aegis - fix handling chunked inputs and MAY_SLEEP
  crypto: testmgr - skip crc32c context test for ahash algorithms
  crypto: skcipher - set CRYPTO_TFM_NEED_KEY if ->setkey() fails
  crypto: pcbc - remove bogus memcpy()s with src == dest
  crypto: morus - fix handling chunked inputs
  crypto: hash - set CRYPTO_TFM_NEED_KEY if ->setkey() fails
  crypto: arm64/crct10dif - revert to C code for short inputs
  crypto: arm64/aes-neonbs - fix returning final keystream block
  crypto: arm/crct10dif - revert to C code for short inputs
  crypto: aegis - fix handling chunked inputs
  crypto: aead - set CRYPTO_TFM_NEED_KEY if ->setkey() fails
  fix cgroup_do_mount() handling of failure exits
  libnvdimm: Fix altmap reservation size calculation
  libnvdimm/pmem: Honor force_raw for legacy pmem regions
  libnvdimm, pfn: Fix over-trim in trim_pfn_device()
  libnvdimm/label: Clear 'updating' flag after label-set update
  nfit/ars: Attempt short-ARS even in the no_init_ars case
  nfit/ars: Attempt a short-ARS whenever the ARS state is idle at boot
  acpi/nfit: Fix bus command validation
  nfit: acpi_nfit_ctl(): Check out_obj->type in the right place
  stm class: Prevent division by zero
  tmpfs: fix uninitialized return value in shmem_link
  selftests: fib_tests: sleep after changing carrier. again.
  net: set static variable an initial value in atl2_probe()
  bnxt_en: Wait longer for the firmware message response to complete.
  bnxt_en: Fix typo in firmware message timeout logic.
  nfp: bpf: fix ALU32 high bits clearance bug
  nfp: bpf: fix code-gen bug on BPF_ALU | BPF_XOR | BPF_K
  net: thunderx: add nicvf_send_msg_to_pf result check for set_rx_mode_task
  net: thunderx: make CFG_DONE message to run through generic send-ack sequence
  bpf, lpm: fix lookup bug in map_delete_elem
  mac80211_hwsim: propagate genlmsg_reply return code
  phonet: fix building with clang
  ARCv2: don't assume core 0x54 has dual issue
  ARCv2: support manual regfile save on interrupts
  ARC: uacces: remove lp_start, lp_end from clobber list
  ARCv2: lib: memcpy: fix doing prefetchw outside of buffer
  ixgbe: fix older devices that do not support IXGBE_MRQC_L3L4TXSWEN
  tmpfs: fix link accounting when a tmpfile is linked in
  mm: handle lru_add_drain_all for UP properly
  net: marvell: mvneta: fix DMA debug warning
  ARM: tegra: Restore DT ABI on Tegra124 Chromebooks
  arm64: Relax GIC version check during early boot
  ARM: dts: armada-xp: fix Armada XP boards NAND description
  qed: Fix iWARP syn packet mac address validation.
  qed: Fix iWARP buffer size provided for syn packet processing.
  ASoC: topology: free created components in tplg load error
  mailbox: bcm-flexrm-mailbox: Fix FlexRM ring flush timeout issue
  xfrm: Fix inbound traffic via XFRM interfaces across network namespaces
  net: mv643xx_eth: disable clk on error path in mv643xx_eth_shared_probe()
  qmi_wwan: apply SET_DTR quirk to Sierra WP7607
  pinctrl: meson: meson8b: fix the sdxc_a data 1..3 pins
  net: dsa: bcm_sf2: Do not assume DSA master supports WoL
  net: systemport: Fix reception of BPDUs
  scsi: libiscsi: Fix race between iscsi_xmit_task and iscsi_complete_task
  keys: Fix dependency loop between construction record and auth key
  assoc_array: Fix shortcut creation
  ARM: 8835/1: dma-mapping: Clear DMA ops on teardown
  af_key: unconditionally clone on broadcast
  bpf: fix lockdep false positive in stackmap
  bpf: only adjust gso_size on bytestream protocols
  ARM: 8824/1: fix a migrating irq bug when hotplug cpu
  esp: Skip TX bytes accounting when sending from a request socket
  clk: sunxi: A31: Fix wrong AHB gate number
  kallsyms: Handle too long symbols in kallsyms.c
  clk: sunxi-ng: v3s: Fix TCON reset de-assert bit
  Input: st-keyscan - fix potential zalloc NULL dereference
  auxdisplay: ht16k33: fix potential user-after-free on module unload
  i2c: bcm2835: Clear current buffer pointers and counts after a transfer
  i2c: cadence: Fix the hold bit setting
  net: hns: Fix object reference leaks in hns_dsaf_roce_reset()
  mm: page_alloc: fix ref bias in page_frag_alloc() for 1-byte allocs
  x86/CPU: Add Icelake model number
  net: dsa: bcm_sf2: potential array overflow in bcm_sf2_sw_suspend()
  scsi: qla2xxx: Fix panic from use after free in qla2x00_async_tm_cmd
  Revert "mm: use early_pfn_to_nid in page_ext_init"
  mm/gup: fix gup_pmd_range() for dax
  NFS: Don't use page_file_mapping after removing the page
  xprtrdma: Make sure Send CQ is allocated on an existing compvec
  floppy: check_events callback should not return a negative number
  ipvs: fix dependency on nf_defrag_ipv6
  blk-mq: insert rq with DONTPREP to hctx dispatch list when requeue
  netfilter: compat: initialize all fields in xt_init
  mac80211: Fix Tx aggregation session tear down with ITXQs
  mac80211: call drv_ibss_join() on restart
  Input: matrix_keypad - use flush_delayed_work()
  Input: ps2-gpio - flush TX work when closing port
  Input: cap11xx - switch to using set_brightness_blocking()
  ARM: OMAP2+: fix lack of timer interrupts on CPU1 after hotplug
  ASoC: samsung: Prevent clk_get_rate() calls in atomic context
  KVM: arm64: Forbid kprobing of the VHE world-switch code
  KVM: arm/arm64: vgic: Always initialize the group of private IRQs
  arm/arm64: KVM: Don't panic on failure to properly reset system registers
  arm/arm64: KVM: Allow a VCPU to fully reset itself
  KVM: arm/arm64: Reset the VCPU without preemption and vcpu state loaded
  ASoC: rsnd: fixup rsnd_ssi_master_clk_start() user count check
  ASoC: dapm: fix out-of-bounds accesses to DAPM lookup tables
  ARM: OMAP2+: Variable "reg" in function omap4_dsi_mux_pads() could be uninitialized
  ARM: dts: Configure clock parent for pwm vibra
  Input: pwm-vibra - stop regulator after disabling pwm, not before
  Input: pwm-vibra - prevent unbalanced regulator
  s390/dasd: fix using offset into zero size array error
  arm64: dts: rockchip: fix graph_port warning on rk3399 bob kevin and excavator
  KVM: arm/arm64: vgic: Make vgic_dist->lpi_list_lock a raw_spinlock
  clocksource: timer-ti-dm: Fix pwm dmtimer usage of fck reparenting
  ASoC: rt5682: Correct the setting while select ASRC clk for AD/DA filter
  gpu: ipu-v3: Fix CSI offsets for imx53
  drm/imx: imx-ldb: add missing of_node_puts
  gpu: ipu-v3: Fix i.MX51 CSI control registers offset
  drm/imx: ignore plane updates on disabled crtcs
  crypto: rockchip - update new iv to device in multiple operations
  crypto: rockchip - fix scatterlist nents error
  crypto: ahash - fix another early termination in hash walk
  crypto: cfb - remove bogus memcpy() with src == dest
  crypto: cfb - add missing 'chunksize' property
  crypto: ccree - don't copy zero size ciphertext
  crypto: ccree - unmap buffer before copying IV
  crypto: ccree - fix free of unallocated mlli buffer
  crypto: caam - fix DMA mapping of stack memory
  crypto: caam - fixed handling of sg list
  crypto: ccree - fix missing break in switch statement
  crypto: caam - fix hash context DMA unmap size
  stm class: Fix an endless loop in channel allocation
  mei: bus: move hw module get/put to probe/release
  mei: hbm: clean the feature flags on link reset
  iio: adc: exynos-adc: Fix NULL pointer exception on unbind
  ASoC: codecs: pcm186x: Fix energysense SLEEP bit
  ASoC: codecs: pcm186x: fix wrong usage of DECLARE_TLV_DB_SCALE()
  ASoC: fsl_esai: fix register setting issue in RIGHT_J mode
  9p/net: fix memory leak in p9_client_create
  9p: use inode->i_lock to protect i_size_write() under 32-bit
  media: videobuf2-v4l2: drop WARN_ON in vb2_warn_zero_bytesused()
  ANDROID: cuttlefish_defconfig: Enable CONFIG_INPUT_MOUSEDEV
  FROMLIST: psi: introduce psi monitor
  FROMLIST: refactor header includes to allow kthread.h inclusion in psi_types.h
  FROMLIST: psi: track changed states
  FROMLIST: psi: split update_stats into parts
  FROMLIST: psi: rename psi fields in preparation for psi trigger addition
  FROMLIST: psi: make psi_enable static
  FROMLIST: psi: introduce state_mask to represent stalled psi states
  ANDROID: cuttlefish_defconfig: Enable CONFIG_PSI
  UPSTREAM: kernel: cgroup: add poll file operation
  UPSTREAM: fs: kernfs: add poll file operation
  UPSTREAM: psi: avoid divide-by-zero crash inside virtual machines
  UPSTREAM: psi: clarify the Kconfig text for the default-disable option
  UPSTREAM: psi: fix aggregation idle shut-off
  UPSTREAM: psi: fix reference to kernel commandline enable
  UPSTREAM: psi: make disabling/enabling easier for vendor kernels
  UPSTREAM: kernel/sched/psi.c: simplify cgroup_move_task()
  UPSTREAM: psi: cgroup support
  UPSTREAM: psi: pressure stall information for CPU, memory, and IO
  UPSTREAM: sched: introduce this_rq_lock_irq()
  UPSTREAM: sched: sched.h: make rq locking and clock functions available in stats.h
  UPSTREAM: sched: loadavg: make calc_load_n() public
  BACKPORT: sched: loadavg: consolidate LOAD_INT, LOAD_FRAC, CALC_LOAD
  UPSTREAM: delayacct: track delays from thrashing cache pages
  UPSTREAM: mm: workingset: tell cache transitions from workingset thrashing

Conflicts:
	arch/arm/kernel/irq.c
	drivers/scsi/sd.c
	include/linux/sched.h
	init/Kconfig
	kernel/sched/Makefile
	kernel/sched/sched.h
	kernel/workqueue.c
	sound/soc/soc-dapm.c

Change-Id: Ia2dcc01c712134c57037ca6788d51172f66bcd93
Signed-off-by: Ivaylo Georgiev <irgeorgiev@codeaurora.org>
2019-04-05 01:06:22 -07:00
5050f03ff0 Input: st-keyscan - fix potential zalloc NULL dereference
[ Upstream commit 2439d37e1bf8a34d437573c086572abe0f3f1b15 ]

This patch fixes the following static checker warning:

drivers/input/keyboard/st-keyscan.c:156 keyscan_probe()
error: potential zalloc NULL dereference: 'keypad_data->input_dev'

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Gabriel Fernandez <gabriel.fernandez@st.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
2019-03-23 20:09:47 +01:00
134891e124 Input: matrix_keypad - use flush_delayed_work()
[ Upstream commit a342083abe576db43594a32d458a61fa81f7cb32 ]

We should be using flush_delayed_work() instead of flush_work() in
matrix_keypad_stop() to ensure that we are not missing work that is
scheduled but not yet put in the workqueue (i.e. its delay timer has not
expired yet).

Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
2019-03-23 20:09:44 +01:00
e91dc2092f Input: ps2-gpio - flush TX work when closing port
[ Upstream commit 33a841ce5cef4ca6c18ad333248b6d273f54c839 ]

To ensure that TX work is not running after serio port has been torn down,
let's flush it when closing the port.

Reported-by: Sven Van Asbroeck <thesven73@gmail.com>
Acked-by: Danilo Krummrich <danilokrummrich@dk-develop.de>
Reviewed-by: Sven Van Asbroeck <TheSven73@gmail.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
2019-03-23 20:09:44 +01:00
4fe714b750 Input: cap11xx - switch to using set_brightness_blocking()
[ Upstream commit 628442880af8c201d307a45f3862a7a17df8a189 ]

Updating LED state requires access to regmap and therefore we may sleep,
so we could not do that directly form set_brightness() method.
Historically we used private work to adjust the brightness, but with the
introduction of set_brightness_blocking() we no longer need it.

As a bonus, not having our own work item means we do not have
use-after-free issue as we neglected to cancel outstanding work on
driver unbind.

Reported-by: Sven Van Asbroeck <thesven73@gmail.com>
Reviewed-by: Sven Van Asbroeck <TheSven73@googlemail.com>
Acked-by: Jacek Anaszewski <jacek.anaszewski@gmail.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
2019-03-23 20:09:44 +01:00
bac70a8941 Input: pwm-vibra - stop regulator after disabling pwm, not before
[ Upstream commit 94803aef3533676194c772383472636c453e3147 ]

This patch fixes order of disable calls in pwm_vibrator_stop.
Currently when starting device, we first enable vcc regulator and then
setup and enable pwm. When stopping, we should do this in oposite order,
so first disable pwm and then disable regulator.
Previously order was the same as in start.

Signed-off-by: Paweł Chmiel <pawel.mikolaj.chmiel@gmail.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
2019-03-23 20:09:42 +01:00
0ed72d3f6f Input: pwm-vibra - prevent unbalanced regulator
[ Upstream commit 3ca232df9921f083c3b37ba5fbc76f4d9046268b ]

pwm_vibrator_stop disables the regulator, but it can be called from
multiple places, even when the regulator is already disabled. Fix this
by using regulator_is_enabled check when starting and stopping device.

Signed-off-by: Jonathan Bakker <xc-racer2@live.ca>
Signed-off-by: Paweł Chmiel <pawel.mikolaj.chmiel@gmail.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
2019-03-23 20:09:42 +01:00
fb80045f8b Merge android-4.19.29 (2e568c9) into msm-4.19
* refs/heads/tmp-2e568c9:
  Linux 4.19.29
  perf/x86/intel: Implement support for TSX Force Abort
  x86: Add TSX Force Abort CPUID/MSR
  perf/x86/intel: Generalize dynamic constraint creation
  perf/x86/intel: Make cpuc allocations consistent
  driver core: Postpone DMA tear-down until after devres release
  ath9k: Avoid OF no-EEPROM quirks without qca,no-eeprom
  cifs: allow calling SMB2_xxx_free(NULL)
  staging: erofs: keep corrupted fs from crashing kernel in erofs_namei()
  staging: erofs: fix race of initializing xattrs of a inode at the same time
  staging: erofs: fix memleak of inode's shared xattr array
  staging: erofs: fix fast symlink w/o xattr when fs xattr is on
  staging: erofs: add error handling for xattr submodule
  gfs2: Fix missed wakeups in find_insert_glock
  netfilter: xt_TEE: add missing code to get interface index in checkentry.
  netfilter: xt_TEE: fix wrong interface selection
  drm: disable uncached DMA optimization for ARM and arm64
  ARM: dts: exynos: Fix max voltage for buck8 regulator on Odroid XU3/XU4
  ARM: dts: exynos: Add minimal clkout parameters to Exynos3250 PMU
  ARM: dts: exynos: Fix pinctrl definition for eMMC RTSN line on Odroid X2/U3
  arm64: dts: hikey: Revert "Enable HS200 mode on eMMC"
  arm64: dts: hikey: Give wifi some time after power-on
  arm64: dts: zcu100-revC: Give wifi some time after power-on
  x86/PCI: Fixup RTIT_BAR of Intel Denverton Trace Hub
  scsi: aacraid: Fix missing break in switch statement
  iscsi_ibft: Fix missing break in switch statement
  Input: elan_i2c - add id for touchpad found in Lenovo s21e-20
  Input: wacom_serial4 - add support for Wacom ArtPad II tablet
  nvme-pci: add missing unlock for reset error
  blk-iolatency: fix IO hang due to negative inflight counter
  qede: Fix system crash on configuring channels.
  qed: Consider TX tcs while deriving the max num_queues for PF.
  qed: Fix EQ full firmware assert.
  fs: ratelimit __find_get_block_slow() failure message.
  nvme-pci: fix rapid add remove sequence
  nvme: lock NS list changes while handling command effects
  drm/amdgpu: use spin_lock_irqsave to protect vm_manager.pasid_idr
  i2c: omap: Use noirq system sleep pm ops to idle device for suspend
  Revert "scsi: libfc: Add WARN_ON() when deleting rports"
  MIPS: Remove function size check in get_frame_info()
  perf trace: Support multiple "vfs_getname" probes
  perf symbols: Filter out hidden symbols from labels
  s390/qeth: cancel close_dev work before removing a card
  s390/qeth: fix use-after-free in error path
  s390/qeth: release cmd buffer in error paths
  netfilter: nf_nat: skip nat clash resolution for same-origin entries
  selftests: netfilter: add simple masq/redirect test cases
  selftests: netfilter: fix config fragment CONFIG_NF_TABLES_INET
  dmaengine: dmatest: Abort test in case of mapping error
  vsock/virtio: reset connected sockets on device removal
  vsock/virtio: fix kernel panic after device hot-unplug
  dmaengine: at_xdmac: Fix wrongfull report of a channel as in use
  drm/sun4i: tcon: Prepare and enable TCON channel 0 clock at init
  bpf: Fix syscall's stackmap lookup potential deadlock
  bpf: fix potential deadlock in bpf_prog_register
  bpf: fix lockdep false positive in percpu_freelist
  bpf, selftests: fix handling of sparse CPU allocations
  relay: check return of create_buf_file() properly
  irqchip/gic-v3-its: Fix ITT_entry_size accessor
  net: stmmac: Disable EEE mode earlier in XMIT callback
  net: stmmac: Send TSO packets always from Queue 0
  net: stmmac: Fallback to Platform Data clock in Watchdog conversion
  drm/amdgpu: Transfer fences to dmabuf importer
  drm/radeon: check if device is root before getting pci speed caps
  drm/amdgpu: Add missing power attribute to APU check
  irqchip/mmp: Only touch the PJ4 IRQ & FIQ bits on enable/disable
  irqchip/gic-v3-its: Gracefully fail on LPI exhaustion
  irqchip/gic-v4: Fix occasional VLPI drop
  usb: phy: fix link errors
  DTS: CI20: Fix bugs in ci20's device tree.
  batman-adv: release station info tidstats
  arm64: dts: add msm8996 compatible to gicv3
  ARM: pxa: ssp: unneeded to free devm_ allocated data
  bpf: sock recvbuff must be limited by rmem_max in bpf_setsockopt()
  bpftool: fix percpu maps updating
  bpftool: Fix prog dump by tag
  wlcore: sdio: Fixup power on/off sequence
  pinctrl: mcp23s08: spi: Fix regmap allocation for mcp23s18
  soc: fsl: qbman: avoid race in clearing QMan interrupt
  arm64: dts: renesas: r8a77965: Enable DMA for SCIF2
  arm64: dts: renesas: r8a7796: Enable DMA for SCIF2
  ARM: dts: imx6sx: correct backward compatible of gpt
  ARM: dts: meson8m2: mxiii-plus: mark the SD card detection GPIO active-low
  ARM: dts: meson8b: odroidc1: mark the SD card detection GPIO active-low
  arm: dts: meson: Fix IRQ trigger type for macirq
  ARM: dts: sun8i: h3: Add ethernet0 alias to Beelink X2
  ARM: dts: omap4-droid4: Fix typo in cpcap IRQ flags
  ARM: OMAP: dts: N950/N9: fix onenand timings
  mm, memory_hotplug: fix off-by-one in is_pageblock_removable
  autofs: fix error return in autofs_fill_super()
  autofs: drop dentry reference only when it is never used
  fs/drop_caches.c: avoid softlockups in drop_pagecache_sb()
  lib/test_kmod.c: potential double free in error handling
  mm, memory_hotplug: test_pages_in_a_zone do not pass the end of zone
  mm, memory_hotplug: is_mem_section_removable do not pass the end of a zone
  x86_64: increase stack size for KASAN_EXTRA
  proc: fix /proc/net/* after setns(2)
  x86/kexec: Don't setup EFI info if EFI runtime is not enabled
  apparmor: Fix aa_label_build() error handling for failed merges
  arm64: kprobe: Always blacklist the KVM world-switch code
  x86/microcode/amd: Don't falsely trick the late loading mechanism
  cifs: fix computation for MAX_SMB2_HDR_SIZE
  x86/boot/compressed/64: Set EFER.LME=1 in 32-bit trampoline before returning to long mode
  net: macb: Apply RXUBR workaround only to versions with errata
  platform/x86: Fix unmet dependency warning for SAMSUNG_Q10
  platform/x86: Fix unmet dependency warning for ACPI_CMPC
  scsi: 53c700: pass correct "dev" to dma_alloc_attrs()
  scsi: bnx2fc: Fix error handling in probe()
  scsi: scsi_debug: fix write_same with virtual_gb problem
  scsi: libfc: free skb when receiving invalid flogi resp
  qed: Fix stack out of bounds bug
  qed: Fix system crash in ll2 xmit
  qed: Fix VF probe failure while FLR
  qed: Fix LACP pdu drops for VFs
  qed: Fix bug in tx promiscuous mode settings
  nfs: Fix NULL pointer dereference of dev_name
  selftests: timers: use LDLIBS instead of LDFLAGS
  selftests: net: use LDLIBS instead of LDFLAGS
  gpio: vf610: Mask all GPIO interrupts
  netfilter: ebtables: compat: un-break 32bit setsockopt when no rules are present
  net: stmmac: dwmac-rk: fix error handling in rk_gmac_powerup()
  net: hns: Fix wrong read accesses via Clause 45 MDIO protocol
  net: hns: Restart autoneg need return failed when autoneg off
  net: hns: Fix for missing of_node_put() after of_parse_phandle()
  net: altera_tse: fix msgdma_tx_completion on non-zero fill_level case
  xtensa: SMP: limit number of possible CPUs by NR_CPUS
  iomap: fix a use after free in iomap_dio_rw
  iomap: get/put the page in iomap_page_create/release()
  xtensa: SMP: mark each possible CPU as present
  xtensa: smp_lx200_defconfig: fix vectors clash
  xtensa: SMP: fix secondary CPU initialization
  selftests: cpu-hotplug: fix case where CPUs offline > CPUs present
  IB/ipoib: Fix for use-after-free in ipoib_cm_tx_start
  riscv: Adjust mmap base address at a third of task size
  xtensa: SMP: fix ccount_timer_shutdown
  clk: qcom: gcc: Use active only source for CPUSS clocks
  clk: ti: Fix error handling in ti_clk_parse_divider_data()
  iommu/amd: Fix IOMMU page flush when detach device from a domain
  ipvs: Fix signed integer overflow when setsockopt timeout
  riscv: fixup max_low_pfn with PFN_DOWN.
  iommu/amd: Unmap all mapped pages in error path of map_sg
  iommu/amd: Call free_iova_fast with pfn in map_sg
  IB/{hfi1, qib}: Fix WC.byte_len calculation for UD_SEND_WITH_IMM
  perf script: Fix crash when processing recorded stat data
  perf tools: Handle TOPOLOGY headers with no CPU
  perf core: Fix perf_proc_update_handler() bug
  perf script: Fix crash with printing mixed trace point and other events
  vti4: Fix a ipip packet processing bug in 'IPCOMP' virtual tunnel
  media: uvcvideo: Fix 'type' check leading to overflow

Change-Id: Ib64a9f33a6ce9aff2b62e1ea9be34f1d8793980a
Signed-off-by: Ivaylo Georgiev <irgeorgiev@codeaurora.org>
2019-03-21 01:48:16 -07:00
fe34541ab9 Input: elan_i2c - add id for touchpad found in Lenovo s21e-20
commit e154ab69321ce2c54f19863d75c77b4e2dc9d365 upstream.

Lenovo s21e-20 uses ELAN0601 in its ACPI tables for the Elan touchpad.

Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>
Cc: stable@vger.kernel.org
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2019-03-13 14:02:39 -07:00
b3b29dc531 Input: wacom_serial4 - add support for Wacom ArtPad II tablet
commit 44fc95e218a09d7966a9d448941fdb003f6bb69f upstream.

Tablet initially begins communicating at 9600 baud, so this command
should be used to connect to the device:

    $ inputattach --daemon --baud 9600 --wacom_iv /dev/ttyS0

https://github.com/linuxwacom/xf86-input-wacom/issues/40

Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
Cc: stable@vger.kernel.org
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2019-03-13 14:02:38 -07:00
64895402bf Merge android-4.19.24 (cca7d2d) into msm-4.19
* refs/heads/tmp-cca7d2d:
  Linux 4.19.24
  mm: proc: smaps_rollup: fix pss_locked calculation
  drm/i915: Prevent a race during I915_GEM_MMAP ioctl with WC set
  drm/i915: Block fbdev HPD processing during suspend
  drm/vkms: Fix license inconsistent
  drm: Use array_size() when creating lease
  dm thin: fix bug where bio that overwrites thin block ignores FUA
  dm crypt: don't overallocate the integrity tag space
  x86/a.out: Clear the dump structure initially
  md/raid1: don't clear bitmap bits on interrupted recovery.
  signal: Restore the stop PTRACE_EVENT_EXIT
  scsi: sd: fix entropy gathering for most rotational disks
  x86/platform/UV: Use efi_runtime_lock to serialise BIOS calls
  tracing/uprobes: Fix output for multiple string arguments
  s390/zcrypt: fix specification exception on z196 during ap probe
  alpha: Fix Eiger NR_IRQS to 128
  alpha: fix page fault handling for r16-r18 targets
  Revert "mm: slowly shrink slabs with a relatively small number of objects"
  Revert "mm: don't reclaim inodes with many attached pages"
  Revert "nfsd4: return default lease period"
  Input: elantech - enable 3rd button support on Fujitsu CELSIUS H780
  Input: bma150 - register input device after setting private data
  mmc: block: handle complete_work on separate workqueue
  mmc: sunxi: Filter out unsupported modes declared in the device tree
  kvm: vmx: Fix entry number check for add_atomic_switch_msr()
  x86/kvm/nVMX: read from MSR_IA32_VMX_PROCBASED_CTLS2 only when it is available
  riscv: Add pte bit to distinguish swap from invalid
  tools uapi: fix Alpha support
  ASoC: hdmi-codec: fix oops on re-probe
  ALSA: usb-audio: Fix implicit fb endpoint setup by quirk
  ALSA: hda - Add quirk for HP EliteBook 840 G5
  perf/x86: Add check_period PMU callback
  perf/core: Fix impossible ring-buffer sizes warning
  ARM: OMAP5+: Fix inverted nirq pin interrupts with irq_set_type
  Input: elan_i2c - add ACPI ID for touchpad in Lenovo V330-15ISK
  Revert "Input: elan_i2c - add ACPI ID for touchpad in ASUS Aspire F5-573G"
  gpio: mxc: move gpio noirq suspend/resume to syscore phase
  CIFS: Do not assume one credit for async responses
  kvm: sev: Fail KVM_SEV_INIT if already initialized
  cifs: Limit memory used by lock request calls to a page
  drm/nouveau/falcon: avoid touching registers if engine is off
  drm/nouveau: Don't disable polling in fallback mode
  gpio: pl061: handle failed allocations
  ARM: dts: kirkwood: Fix polarity of GPIO fan lines
  ARM: dts: da850-lcdk: Correct the sound card name
  ARM: dts: da850-lcdk: Correct the audio codec regulators
  ARM: dts: da850-evm: Correct the sound card name
  ARM: dts: da850-evm: Correct the audio codec regulators
  drm/amdgpu: set WRITE_BURST_LENGTH to 64B to workaround SDMA1 hang
  nvme: pad fake subsys NQN vid and ssvid with zeros
  nvme-multipath: zero out ANA log buffer
  nvme-pci: fix out of bounds access in nvme_cqe_pending
  nvme-pci: use the same attributes when freeing host_mem_desc_bufs.
  drm/bridge: tc358767: fix output H/V syncs
  drm/bridge: tc358767: reject modes which require too much BW
  drm/bridge: tc358767: fix initial DP0/1_SRCCTRL value
  drm/bridge: tc358767: fix single lane configuration
  drm/bridge: tc358767: add defines for DP1_SRCCTRL & PHY_2LANE
  drm/bridge: tc358767: add bus flags
  cpufreq: check if policy is inactive early in __cpufreq_get()
  riscv: fix trace_sys_exit hook
  tools uapi: fix RISC-V 64-bit support
  perf test shell: Use a fallback to get the pathname in vfs_getname
  perf report: Fix wrong iteration count in --branch-history
  ACPI: NUMA: Use correct type for printing addresses on i386-PAE
  drm/amdgpu/sriov:Correct pfvf exchange logic
  ARM: fix the cockup in the previous patch
  ARM: ensure that processor vtables is not lost after boot
  ARM: spectre-v2: per-CPU vtables to work around big.Little systems
  ARM: add PROC_VTABLE and PROC_TABLE macros
  ARM: clean up per-processor check_bugs method call
  ARM: split out processor lookup
  ARM: make lookup_processor_type() non-__init
  ARM: 8810/1: vfp: Fix wrong assignement to ufp_exc
  ARM: 8797/1: spectre-v1.1: harden __copy_to_user
  ARM: 8796/1: spectre-v1,v1.1: provide helpers for address sanitization
  ARM: 8795/1: spectre-v1.1: use put_user() for __put_user()
  ARM: 8794/1: uaccess: Prevent speculative use of the current addr_limit
  ARM: 8793/1: signal: replace __put_user_error with __put_user
  ARM: 8792/1: oabi-compat: copy oabi events using __copy_to_user()
  ARM: 8791/1: vfp: use __copy_to_user() when saving VFP state
  ARM: 8790/1: signal: always use __copy_to_user to save iwmmxt context
  ARM: 8789/1: signal: copy registers using __copy_to_user()
  blk-mq: fix a hung issue when fsync
  eeprom: at24: add support for 24c2048
  dt-bindings: eeprom: at24: add "atmel,24c2048" compatible string

Conflicts:
	drivers/mmc/core/block.c
	include/linux/mmc/card.h

Change-Id: I829d46ab020fcefca26c7d12e03c64c0ca7c3528
Signed-off-by: Ivaylo Georgiev <irgeorgiev@codeaurora.org>
2019-03-13 10:41:12 -07:00
6ca7f25437 Merge "input: qti-haptics: Disable AUTO_RES for ERM" 2019-03-08 01:04:09 -08:00
e8cff389e2 Merge "input: misc: qti-haptics: Add audio/PWM mode as per effect settings" 2019-03-07 18:47:32 -08:00
c61f3c7ecb Merge "Merge android-4.19.20 (c28f73f) into msm-4.19" 2019-03-06 02:45:19 -08:00
cbb537635d input: misc: qti-haptics: Add audio/PWM mode as per effect settings
The haptics module supports to play with audio or PWM waveform coming
from LINE-IN pin. Add audio and PWM waveform sources as per effect
settings so that effect configurations can select these play options.

Change-Id: I7f8a2b415a7ad0156e5bb61418554b5ffe2b7729
Signed-off-by: Fenglin Wu <fenglinw@codeaurora.org>
2019-03-06 08:14:44 +08:00
de3f2b7fe7 Merge "Merge android-4.19.14 (8735c21) into msm-4.19" 2019-03-05 05:41:54 -08:00
b8fa261424 input: qti-haptics: Disable AUTO_RES for ERM
Currently, auto resonance is enabled per effect only for LRA
which is correct. However, if ERM type actuator is used and
auto resonance is left enabled, it can cause adverse effect
on the actuator. Hence keep it disabled if ERM is used.

Change-Id: I048c43aacea2520cf642e5d0982c61e926b9b4c4
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
2019-02-27 19:06:14 -08:00
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>
2019-02-27 02:23:28 -08:00
ffb1bfc29b Merge android-4.19.15 (caf5433) into msm-4.19
* refs/heads/tmp-caf5433:
  Linux 4.19.15
  bnx2x: Fix NULL pointer dereference in bnx2x_del_all_vlans() on some hw
  drm/amd/display: Fix unintialized max_bpc state values
  drm/rockchip: psr: do not dereference encoder before it is null checked.
  drm/vc4: Set ->is_yuv to false when num_planes == 1
  drm/nouveau/drm/nouveau: Check rc from drm_dp_mst_topology_mgr_resume()
  lib: fix build failure in CONFIG_DEBUG_VIRTUAL test
  of: __of_detach_node() - remove node from phandle cache
  of: of_node_get()/of_node_put() nodes held in phandle cache
  power: supply: olpc_battery: correct the temperature units
  intel_th: msu: Fix an off-by-one in attribute store
  genwqe: Fix size check
  drivers/perf: hisi: Fixup one DDRC PMU register offset
  video: fbdev: pxafb: Fix "WARNING: invalid free of devm_ allocated data"
  ceph: don't update importing cap's mseq when handing cap export
  sched/fair: Fix infinite loop in update_blocked_averages() by reverting a9e7f6544b
  iommu/vt-d: Handle domain agaw being less than iommu agaw
  RDMA/srpt: Fix a use-after-free in the channel release code
  rxe: fix error completion wr_id and qp_num
  9p/net: put a lower bound on msize
  iio: dac: ad5686: fix bit shift read register
  powerpc/tm: Set MSR[TS] just prior to recheckpoint
  Revert "powerpc/tm: Unset MSR[TS] if not recheckpointing"
  leds: pwm: silently error out on EPROBE_DEFER
  arm64: relocatable: fix inconsistencies in linker script and options
  arm64: drop linker script hack to hide __efistub_ symbols
  nfsd4: zero-length WRITE should succeed
  lockd: Show pid of lockd for remote locks
  PCI / PM: Allow runtime PM without callback functions
  selinux: policydb - fix byte order and alignment issues
  b43: Fix error in cordic routine
  gfs2: Fix loop in gfs2_rbm_find
  gfs2: Get rid of potential double-freeing in gfs2_create_inode
  dlm: memory leaks on error path in dlm_user_request()
  dlm: lost put_lkb on error path in receive_convert() and receive_unlock()
  dlm: possible memory leak on error path in create_lkb()
  dlm: fixed memory leaks after failed ls_remove_names allocation
  block: mq-deadline: Fix write completion handling
  block: deactivate blk_stat timer in wbt_disable_default()
  Fix failure path in alloc_pid()
  driver core: Add missing dev->bus->need_parent_lock checks
  srcu: Lock srcu_data structure in srcu_gp_start()
  ALSA: usb-audio: Always check descriptor sizes in parser code
  ALSA: usb-audio: Fix an out-of-bound read in create_composite_quirks
  ALSA: usb-audio: Check mixer unit descriptors more strictly
  ALSA: usb-audio: Avoid access before bLength check in build_audio_procunit()
  ALSA: cs46xx: Potential NULL dereference in probe
  media: cx23885: only reset DMA on problematic CPUs
  mt76x0: init hw capabilities
  dma-direct: do not include SME mask in the DMA supported check
  raid6/ppc: Fix build for clang
  powerpc/boot: Set target when cross-compiling for clang
  Makefile: Export clang toolchain variables
  kbuild: consolidate Clang compiler flags
  kbuild: add -no-integrated-as Clang option unconditionally
  powerpc: Disable -Wbuiltin-requires-header when setjmp is used
  powerpc: avoid -mno-sched-epilog on GCC 4.9 and newer
  powerpc: consolidate -mno-sched-epilog into FTRACE flags
  powerpc: remove old GCC version checks
  sunrpc: use SVC_NET() in svcauth_gss_* functions
  sunrpc: fix cache_head leak due to queued request
  memcg, oom: notify on oom killer invocation from the charge path
  mm, swap: fix swapoff with KSM pages
  mm, hmm: mark hmm_devmem_{add, add_resource} EXPORT_SYMBOL_GPL
  mm, hmm: use devm semantics for hmm_devmem_{add, remove}
  mm, devm_memremap_pages: add MEMORY_DEVICE_PRIVATE support
  mm, devm_memremap_pages: fix shutdown handling
  mm, devm_memremap_pages: kill mapping "System RAM" support
  mm, devm_memremap_pages: mark devm_memremap_pages() EXPORT_SYMBOL_GPL
  hwpoison, memory_hotplug: allow hwpoisoned pages to be offlined
  zram: fix double free backing device
  fork: record start_time late
  scsi: lpfc: do not set queue->page_count to 0 if pc_sli4_params.wqpcnt is invalid
  scsi: zfcp: fix posting too many status read buffers leading to adapter shutdown
  auxdisplay: charlcd: fix x/y command parsing
  serial/sunsu: fix refcount leak
  qmi_wwan: Fix qmap header retrieval in qmimux_rx_fixup
  net: netxen: fix a missing check and an uninitialized use
  Input: synaptics - enable SMBus for HP EliteBook 840 G4
  gpio: mvebu: only fail on missing clk if pwm is actually to be used
  lan743x: Remove MAC Reset from initialization
  virtio: fix test build after uio.h change
  m68k: Fix memblock-related crashes
  kbuild: fix false positive warning/error about missing libelf
  mac80211: free skb fraglist before freeing the skb
  nl80211: fix memory leak if validate_pae_over_nl80211() fails
  vxge: ensure data0 is initialized in when fetching firmware version information
  lan78xx: Resolve issue with changing MAC address
  lan743x: Expand phy search for LAN7431
  net: macb: add missing barriers when reading descriptors
  net: macb: fix dropped RX frames due to a race
  net: macb: fix random memory corruption on RX with 64-bit DMA
  qed: Fix an error code qed_ll2_start_xmit()
  SUNRPC: Fix a race with XPRT_CONNECTING
  mac80211: fix a kernel panic when TXing after TXQ teardown
  net: hns: Fix ping failed when use net bridge and send multicast
  net: hns: Add mac pcs config when enable|disable mac
  net: hns: Fix ntuple-filters status error.
  net: hns: Avoid net reset caused by pause frames storm
  net: hns: Free irq when exit from abnormal branch
  net: hns: Clean rx fbd when ae stopped.
  net: hns: Fixed bug that netdev was opened twice
  net: hns: Some registers use wrong address according to the datasheet.
  net: hns: All ports can not work when insmod hns ko after rmmod.
  net: hns: Incorrect offset address used for some registers.
  w90p910_ether: remove incorrect __init annotation
  net/tls: Init routines in create_ctx
  drivers: net: xgene: Remove unnecessary forward declarations
  x86, hyperv: remove PCI dependency
  mt76: fix potential NULL pointer dereference in mt76_stop_tx_queues
  scsi: target: iscsi: cxgbit: add missing spin_lock_init()
  scsi: target: iscsi: cxgbit: fix csk leak
  bnx2x: Send update-svid ramrod with retry/poll flags enabled
  bnx2x: Remove configured vlans as part of unload sequence.
  bnx2x: Clear fip MAC when fcoe offload support is disabled
  netfilter: nf_conncount: use rb_link_node_rcu() instead of rb_link_node()
  netfilter: nat: can't use dst_hold on noref dst
  netfilter: ipset: do not call ipset_nest_end after nla_nest_cancel
  ixgbe: Fix race when the VF driver does a reset
  i40e: fix mac filter delete when setting mac address
  x86/dump_pagetables: Fix LDT remap address marker
  x86/mm: Fix guard hole handling
  ieee802154: ca8210: fix possible u8 overflow in ca8210_rx_done
  ibmvnic: Fix non-atomic memory allocation in IRQ context
  ibmvnic: Convert reset work item mutex to spin lock
  Input: synaptics - enable RMI on ThinkPad T560
  Input: omap-keypad - fix idle configuration to not block SoC idle states
  scsi: bnx2fc: Fix NULL dereference in error handling
  Revert "scsi: qla2xxx: Fix NVMe Target discovery"
  netfilter: seqadj: re-load tcp header pointer after possible head reallocation
  netfilter: nf_tables: fix suspicious RCU usage in nft_chain_stats_replace()
  ieee802154: hwsim: fix off-by-one in parse nested
  xfrm: Fix NULL pointer dereference in xfrm_input when skb_dst_force clears the dst_entry.
  xfrm: Fix bucket count reported to userspace
  xfrm: Fix error return code in xfrm_output_one()
  checkstack.pl: fix for aarch64
  IB/core: Fix oops in netdev_next_upper_dev_rcu()
  drm/amdgpu: Fix DEBUG_LOCKS_WARN_ON(depth <= 0) in amdgpu_ctx.lock
  powerpc/mm: Fallback to RAM if the altmap is unusable
  Input: restore EV_ABS ABS_RESERVED
  IB/mlx5: Block DEVX umem from the non applicable cases
  ARM: dts: imx7d-nitrogen7: Fix the description of the Wifi clock
  ARM: imx: update the cpu power up timing setting on i.mx6sx
  ARM: dts: imx7d-pico: Describe the Wifi clock
  HID: ite: Add USB id match for another ITE based keyboard rfkill key quirk
  powerpc/mm: Fix linux page tables build with some configs
  powerpc: Fix COFF zImage booting on old powermacs
  arm64: dts: mt7622: fix no more console output on rfb1
  pinctrl: meson: fix pull enable register calculation
  ARM: dts: sun8i: a83t: bananapi-m3: increase vcc-pd voltage to 3.3V
  f2fs: don't access node/meta inode mapping after iput
  f2fs: wait on atomic writes to count F2FS_CP_WB_DATA
  f2fs: sanity check of xattr entry size
  f2fs: fix use-after-free issue when accessing sbi->stat_info
  f2fs: check PageWriteback flag for ordered case
  f2fs: fix validation of the block count in sanity_check_raw_super
  f2fs: fix missing unlock(sbi->gc_mutex)
  f2fs: fix to dirty inode synchronously
  f2fs: clean up structure extent_node
  f2fs: fix block address for __check_sit_bitmap
  f2fs: fix sbi->extent_list corruption issue
  f2fs: clean up checkpoint flow
  f2fs: flush stale issued discard candidates
  f2fs: correct wrong spelling, issing_*
  f2fs: use kvmalloc, if kmalloc is failed
  f2fs: remove redundant comment of unused wio_mutex
  f2fs: fix to reorder set_page_dirty and wait_on_page_writeback
  f2fs: clear PG_writeback if IPU failed
  f2fs: add an ioctl() to explicitly trigger fsck later
  f2fs: avoid frequent costly fsck triggers
  f2fs: fix m_may_create to make OPU DIO write correctly
  f2fs: fix to update new block address correctly for OPU
  f2fs: adjust trace print in f2fs_get_victim() to cover all paths
  f2fs: fix to allow node segment for GC by ioctl path
  f2fs: make "f2fs_fault_name[]" const char *
  f2fs: read page index before freeing
  f2fs: fix wrong return value of f2fs_acl_create
  f2fs: avoid build warn of fall_through
  f2fs: fix race between write_checkpoint and write_begin
  f2fs: check memory boundary by insane namelen
  f2fs: only flush the single temp bio cache which owns the target page
  f2fs: fix out-place-update DIO write
  f2fs: fix to be aware discard/preflush/dio command in is_idle()
  f2fs: add to account direct IO
  f2fs: move dir data flush to write checkpoint process
  f2fs: Change to use DEFINE_SHOW_ATTRIBUTE macro
  f2fs: change segment to section in f2fs_ioc_gc_range
  f2fs: export migration_granularity sysfs entry
  f2fs: support subsectional garbage collection
  f2fs: introduce __is_large_section() for cleanup
  f2fs: clean up f2fs_sb_has_##feature_name
  f2fs: remove codes of unused wio_mutex
  f2fs: fix count of seg_freed to make sec_freed correct
  f2fs: fix to account preflush command for noflush_merge mode
  f2fs: avoid GC causing encrypted file corrupted

Conflicts:
	mm/memory_hotplug.c

Change-Id: I26d2fbdddfa882fe9aae568a84a9269725ffb5ea
Signed-off-by: Ivaylo Georgiev <irgeorgiev@codeaurora.org>
2019-02-27 02:23:14 -08:00
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>
2019-02-27 00:17:41 -08:00
8581a62c98 msm: input: touchscreen: fix i2c error when suspend
When device suspend, disable the gpio irq to avoid i2c read errors.
For irq efficiency, change the "request_irq" to be "request_threaded_irq".

Change-Id: I46c403e962a2dbcec967707c444a14368a16a4f8
Signed-off-by: Fei Mao <feim1@codeaurora.org>
2019-02-25 14:35:39 +08:00
17f4ddaa71 Input: elantech - enable 3rd button support on Fujitsu CELSIUS H780
commit e8b22d0a329f0fb5c7ef95406872d268f01ee3b1 upstream.

Like Fujitsu CELSIUS H760, the H780 also has a three-button Elantech
touchpad, but the driver needs to be told so to enable the middle touchpad
button.

The elantech_dmi_force_crc_enabled quirk was not necessary with the H780.

Also document the fw_version and caps values detected for both H760 and
H780 models.

Signed-off-by: Matti Kurkela <Matti.Kurkela@iki.fi>
Cc: stable@vger.kernel.org
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2019-02-20 10:25:47 +01:00
3bd120956d Input: bma150 - register input device after setting private data
commit 90cc55f067f6ca0e64e5e52883ece47d8af7b67b upstream.

Otherwise we introduce a race condition where userspace can request input
before we're ready leading to null pointer dereference such as

input: bma150 as /devices/platform/i2c-gpio-2/i2c-5/5-0038/input/input3
Unable to handle kernel NULL pointer dereference at virtual address 00000018
pgd = (ptrval)
[00000018] *pgd=55dac831, *pte=00000000, *ppte=00000000
Internal error: Oops: 17 [#1] PREEMPT ARM
Modules linked in: bma150 input_polldev [last unloaded: bma150]
CPU: 0 PID: 2870 Comm: accelerometer Not tainted 5.0.0-rc3-dirty #46
Hardware name: Samsung S5PC110/S5PV210-based board
PC is at input_event+0x8/0x60
LR is at bma150_report_xyz+0x9c/0xe0 [bma150]
pc : [<80450f70>]    lr : [<7f0a614c>]    psr: 800d0013
sp : a4c1fd78  ip : 00000081  fp : 00020000
r10: 00000000  r9 : a5e2944c  r8 : a7455000
r7 : 00000016  r6 : 00000101  r5 : a7617940  r4 : 80909048
r3 : fffffff2  r2 : 00000000  r1 : 00000003  r0 : 00000000
Flags: Nzcv  IRQs on  FIQs on  Mode SVC_32  ISA ARM  Segment none
Control: 10c5387d  Table: 54e34019  DAC: 00000051
Process accelerometer (pid: 2870, stack limit = 0x(ptrval))
Stackck: (0xa4c1fd78 to 0xa4c20000)
fd60:                                                       fffffff3 fc813f6c
fd80: 40410581 d7530ce3 a5e2817c a7617f00 a5e29404 a5e2817c 00000000 7f008324
fda0: a5e28000 8044f59c a5fdd9d0 a5e2945c a46a4a00 a5e29668 a7455000 80454f10
fdc0: 80909048 a5e29668 a5fdd9d0 a46a4a00 806316d0 00000000 a46a4a00 801df5f0
fde0: 00000000 d7530ce3 a4c1fec0 a46a4a00 00000000 a5fdd9d0 a46a4a08 801df53c
fe00: 00000000 801d74bc a4c1fec0 00000000 a4c1ff70 00000000 a7038da8 00000000
fe20: a46a4a00 801e91fc a411bbe0 801f2e88 00000004 00000000 80909048 00000041
fe40: 00000000 00020000 00000000 dead4ead a6a88da0 00000000 ffffe000 806fcae8
fe60: a4c1fec8 00000000 80909048 00000002 a5fdd9d0 a7660110 a411bab0 00000001
fe80: dead4ead ffffffff ffffffff a4c1fe8c a4c1fe8c d7530ce3 20000013 80909048
fea0: 80909048 a4c1ff70 00000001 fffff000 a4c1e000 00000005 00026038 801eabd8
fec0: a7660110 a411bab0 b9394901 00000006 a696201b 76fb3000 00000000 a7039720
fee0: a5fdd9d0 00000101 00000002 00000096 00000000 00000000 00000000 a4c1ff00
ff00: a6b310f4 805cb174 a6b310f4 00000010 00000fe0 00000010 a4c1e000 d7530ce3
ff20: 00000003 a5f41400 a5f41424 00000000 a6962000 00000000 00000003 00000002
ff40: ffffff9c 000a0000 80909048 d7530ce3 a6962000 00000003 80909048 ffffff9c
ff60: a6962000 801d890c 00000000 00000000 00020000 a7590000 00000004 00000100
ff80: 00000001 d7530ce3 000288b8 00026320 000288b8 00000005 80101204 a4c1e000
ffa0: 00000005 80101000 000288b8 00026320 000288b8 000a0000 00000000 00000000
ffc0: 000288b8 00026320 000288b8 00000005 7eef3bac 000264e8 00028ad8 00026038
ffe0: 00000005 7eef3300 76f76e91 76f78546 800d0030 000288b8 00000000 00000000
[<80450f70>] (input_event) from [<a5e2817c>] (0xa5e2817c)
Code: e1a08148 eaffffa8 e351001f 812fff1e (e590c018)
---[ end trace 1c691ee85f2ff243 ]---

Signed-off-by: Jonathan Bakker <xc-racer2@live.ca>
Signed-off-by: Paweł Chmiel <pawel.mikolaj.chmiel@gmail.com>
Cc: stable@vger.kernel.org
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2019-02-20 10:25:46 +01:00
d9a974fdaa Input: elan_i2c - add ACPI ID for touchpad in Lenovo V330-15ISK
commit 7ad222b3aed350adfc27ee7eec4587ffe55dfdce upstream.

This adds ELAN0617 to the ACPI table to support Elan touchpad found in
Lenovo V330-15ISK.

Signed-off-by: Mauro Ciancio <mauro@acadeu.com>
Cc: stable@vger.kernel.org
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2019-02-20 10:25:44 +01:00
2abf1ce44e Revert "Input: elan_i2c - add ACPI ID for touchpad in ASUS Aspire F5-573G"
commit f420c54e4b12c1361c6ed313002ee7bd7ac58362 upstream.

This reverts commit 7db54c89f0b30a101584e09d3729144e6170059d as it
breaks Acer Aspire V-371 and other devices. According to Elan:

"Acer Aspire F5-573G is MS Precision touchpad which should use hid
 multitouch driver. ELAN0501 should not be added in elan_i2c."

Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=202503
Cc: stable@vger.kernel.org
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2019-02-20 10:25:44 +01:00
a5582031bf msm: input: touchscreen: Rebase the STM FTS driver
This commit is a squash of below fixes from the branch msm-4.14.
And fix warnings for code style check.

b32c2b2 input: touchscreen: st: Disable PRESSURE event report
ebff065 input: touchscreen: st: update firmware without userhelper
66b2a79 input: touchscreen: st: turn off regulator during suspend
12ccf96 input: touchscreen: st: add pinctrl config during suspend/resume
7f345b8 Merge "input: touchscreen: Assign the TP from UEFI or DTSI"
138c7b3 input: touchscreen: st: add fix in driver to support VMAP_STACK
22c3dd53 input: touchscreen: st: release Int/Reset resource
52a3b68 input: touchscreen: st: add XY axis flip property support
1a13eaf input: touchscreen: st: fix code sytle error
3da45a3 Merge "input: touchscreen: st: enable touch firmware upgrade"
b5d1634 input: touchscreen: st: enable touch firmware upgrade
3dbed1b input: touchscreen: st: remove useless firmware file
b8f5440 Merge "input: touchscreen: multi-touch for ST touch"
b625338 input: touchscreen: multi-touch for ST touch
26348a7 input: touchscreen: clean kernel log for ST touch
b133ccf input: touchscreen: Disable fts_fw_update_auto
f5872e1 input: touchscreen: Update ST touch driver
41ab128 input: touchpanel: fix wastes of time when resume and probe...
4426865 input: touchscreen: fix issues related to variable initialization
e8a48fd input: touchpanel: Add ST Touchscreen version 4.1.0 driver

The above gerrits are in the complete list for this driver IC.

Change-Id: I1e50d2d5bcad94c5bf38de4921314166c73ebb8c
Signed-off-by: Fei Mao <feim1@codeaurora.org>
2019-02-18 17:57:38 -08:00
bd0e1dd170 Merge android-4.19.13 (a872d2d) into msm-4.19
* refs/heads/tmp-a872d2d:
  Linux 4.19.13
  drm/ioctl: Fix Spectre v1 vulnerabilities
  proc/sysctl: don't return ENOMEM on lookup when a table is unregistering
  Input: elantech - disable elan-i2c for P52 and P72
  mm: don't miss the last page because of round-off error
  mm, page_alloc: fix has_unmovable_pages for HugePages
  mm: thp: fix flags for pmd migration when split
  mm, memory_hotplug: initialize struct pages for the full memory section
  media: ov5640: Fix set format regression
  iwlwifi: add new cards for 9560, 9462, 9461 and killer series
  Revert "mwifiex: restructure rx_reorder_tbl_lock usage"
  iwlwifi: mvm: don't send GEO_TX_POWER_LIMIT to old firmwares
  rtlwifi: Fix leak of skb when processing C2H_BT_INFO
  xfrm_user: fix freeing of xfrm states on acquire
  mm: introduce mm_[p4d|pud|pmd]_folded
  mm: make the __PAGETABLE_PxD_FOLDED defines non-empty
  mm: add mm_pxd_folded checks to pgtable_bytes accounting functions
  panic: avoid deadlocks in re-entrant console drivers
  x86/intel_rdt: Ensure a CPU remains online for the region's pseudo-locking sequence
  x86/vdso: Pass --eh-frame-hdr to the linker
  x86/mm: Fix decoy address handling vs 32-bit builds
  x86/mtrr: Don't copy uninitialized gentry fields back to userspace
  futex: Cure exit race
  Drivers: hv: vmbus: Return -EINVAL for the sys files for unopened channels
  KVM: Fix UAF in nested posted interrupt processing
  kvm: x86: Add AMD's EX_CFG to the list of ignored MSRs
  KVM: X86: Fix NULL deref in vcpu_scan_ioapic
  posix-timers: Fix division by zero bug
  gpiolib-acpi: Only defer request_irq for GpioInt ACPI event handlers
  gpio: max7301: fix driver for use with CONFIG_VMAP_STACK
  mmc: omap_hsmmc: fix DMA API warning
  mmc: core: Use a minimum 1600ms timeout when enabling CACHE ctrl
  mmc: core: Allow BKOPS and CACHE ctrl even if no HPI support
  mmc: core: Reset HPI enabled state during re-init and in case of errors
  scsi: sd: use mempool for discard special page
  scsi: t10-pi: Return correct ref tag when queue has no integrity profile
  ubifs: Handle re-linking of inodes correctly while recovery
  USB: serial: option: add Telit LN940 series
  USB: serial: option: add Fibocom NL668 series
  USB: serial: option: add Simcom SIM7500/SIM7600 (MBIM mode)
  USB: serial: option: add HP lt4132
  USB: serial: option: add GosunCn ZTE WeLink ME3630
  USB: xhci: fix 'broken_suspend' placement in struct xchi_hcd
  xhci: Don't prevent USB2 bus suspend in state check intended for USB3 only
  USB: hso: Fix OOB memory access in hso_probe/hso_get_config_data
  Revert "vfs: Allow userns root to call mknod on owned filesystems."
  iomap: Revert "fs/iomap.c: get/put the page in iomap_page_create/release()"

Conflicts:
	drivers/mmc/core/mmc.c

Change-Id: I92648e314b976d17abcc734c61142bcb6519518b
Signed-off-by: Ivaylo Georgiev <irgeorgiev@codeaurora.org>
2019-02-18 03:27:10 -08:00
d6d3bfb561 Merge "Merge android-4.19.12 (16c056d) into msm-4.19" 2019-02-16 03:30:22 -08:00
5f372174b7 input: misc: Fix misleading indentation warning for qt-haptics.c
drivers/input/misc/qti-haptics.c:285:3: warning:
   this 'else' clause does not guard... [-Wmisleading-indentation]

Change-Id: Ic0dedbadc11d97ac56bdf39c28e2323161458a3c
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
2019-02-01 16:21:57 -07:00
92fbac528f Input: uinput - fix undefined behavior in uinput_validate_absinfo()
commit d77651a227f8920dd7ec179b84e400cce844eeb3 upstream.

An integer overflow may arise in uinput_validate_absinfo() if "max - min"
can't be represented by an "int". We should check for overflow before
trying to use the result.

Reported-by: Kyungtae Kim <kt0755@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Cc: stable@vger.kernel.org
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2019-01-31 08:14:37 +01:00
865a07956d Input: xpad - add support for SteelSeries Stratus Duo
commit fe2bfd0d40c935763812973ce15f5764f1c12833 upstream.

Add support for the SteelSeries Stratus Duo, a wireless Xbox 360
controller. The Stratus Duo ships with a USB dongle to enable wireless
connectivity, but it can also function as a wired controller by connecting
it directly to a PC via USB, hence the need for two USD PIDs. 0x1430 is the
dongle, and 0x1431 is the controller.

Signed-off-by: Tom Panfil <tom@steelseries.com>
Cc: stable@vger.kernel.org
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2019-01-31 08:14:37 +01:00
1628d582b3 Merge android-4.19.12 (16c056d) into msm-4.19
* refs/heads/tmp-16c056d:
  Linux 4.19.12
  Btrfs: fix missing delayed iputs on unmount
  nvmet-rdma: fix response use after free
  nvme: validate controller state before rescheduling keep alive
  i2c: uniphier-f: fix violation of tLOW requirement for Fast-mode
  i2c: uniphier: fix violation of tLOW requirement for Fast-mode
  i2c: scmi: Fix probe error on devices with an empty SMB0001 ACPI device node
  i2c: axxia: properly handle master timeout
  mlxsw: spectrum_switchdev: Fix VLAN device deletion via ioctl
  vhost/vsock: fix reset orphans race with close timeout
  cifs: In Kconfig CONFIG_CIFS_POSIX needs depends on legacy (insecure cifs)
  drm/ast: Fix connector leak during driver unload
  acpi/nfit: Fix user-initiated ARS to be "ARS-long" rather than "ARS-short"
  tools/testing/nvdimm: Align test resources to 128M
  drm/amdgpu/vcn: Update vcn.cur_state during suspend
  net: mvpp2: fix phylink handling of invalid PHY modes
  net: mvpp2: fix detection of 10G SFP modules
  thermal: armada: fix legacy validity test sense
  ethernet: fman: fix wrong of_node_put() in probe function
  ARM: 8816/1: dma-mapping: fix potential uninitialized return
  ARM: 8815/1: V7M: align v7m_dma_inv_range() with v7 counterpart
  ARM: 8814/1: mm: improve/fix ARM v7_dma_inv_range() unaligned address handling
  bpf: check pending signals while verifying programs
  net/mlx4_en: Fix build break when CONFIG_INET is off
  mv88e6060: disable hardware level MAC learning
  macvlan: return correct error value
  libata: whitelist all SAMSUNG MZ7KM* solid-state disks
  Input: omap-keypad - fix keyboard debounce configuration
  Input: synaptics - enable SMBus for HP 15-ay000
  clk: mmp: Off by one in mmp_clk_add()
  clk: mvebu: Off by one bugs in cp110_of_clk_get()
  drm/amd/powerplay: issue pre-display settings for display change event
  drm/msm: Fix error return checking
  drm/msm: dpu: Fix "WARNING: invalid free of devm_ allocated data"
  drm/msm: dpu: Don't set legacy plane->crtc pointer
  drm/msm/hdmi: Enable HPD after HDMI IRQ is set up
  ide: pmac: add of_node_put()
  drivers/tty: add missing of_node_put()
  drivers/sbus/char: add of_node_put()
  sbus: char: add of_node_put()
  SUNRPC: Fix a potential race in xprt_connect()
  nfs: don't dirty kernel pages read by direct-io
  liquidio: read sc->iq_no before release sc
  bpf: Fix verifier log string check for bad alignment.
  bonding: fix 802.3ad state sent to partner when unbinding slave
  net: aquantia: fix rx checksum offload bits
  net: stmmac: Move debugfs init/exit to ->probe()/->remove()
  ARC: io.h: Implement reads{x}()/writes{x}()
  drm/amdgpu: wait for IB test on first device open
  drm/ttm: fix LRU handling in ttm_buffer_object_transfer
  drm/msm: Grab a vblank reference when waiting for commit_done
  drm/msm/dsi: configure VCO rate for 10nm PLL driver
  drm/msm: fix handling of cmdstream offset
  drm/msm/gpu: Fix a couple memory leaks in debugfs
  drm/msm: Fix task dump in gpu recovery
  x86/earlyprintk/efi: Fix infinite loop on some screen widths
  drm/amd/display: Fix 6x4K displays light-up on Vega20 (v2)
  net: ethernet: ave: Replace NET_IP_ALIGN with AVE_FRAME_HEADROOM
  tools/bpf: add addition type tests to test_btf
  tools/bpf: fix two test_btf unit test cases
  scsi: vmw_pscsi: Rearrange code to avoid multiple calls to free_irq during unload
  scsi: libiscsi: Fix NULL pointer dereference in iscsi_eh_session_reset
  i2c: rcar: check bus state before reinitializing
  Input: hyper-v - fix wakeup from suspend-to-idle
  mac80211_hwsim: fix module init error paths for netlink
  IB/hfi1: Remove race conditions in user_sdma send path
  locking/qspinlock, x86: Provide liveness guarantee
  locking/qspinlock: Re-order code
  ANDROID: PM / OPP: Document power estimation helper
  ANDROID: PM / OPP: Add missing of_node_put() to power estimation helper
  UPSTREAM: mm/memfd: make F_SEAL_FUTURE_WRITE seal more robust
  UPSTREAM: mm: Add an F_SEAL_FUTURE_WRITE seal to memfd

Change-Id: I02ded14673b9aba3b3b555745d835b5c4cd252fe
Signed-off-by: Ivaylo Georgiev <irgeorgiev@codeaurora.org>
2019-01-29 01:06:40 -08:00
47598dd0e8 input: misc: qpnp-power-on: add support to power off a modem chip
Add support to power off an attached modem chip via its primary
PMIC.

Change-Id: I74ef989f15cb8821c1543da76cc92526b1a4ec99
Signed-off-by: David Collins <collinsd@codeaurora.org>
2019-01-18 12:04:53 -08:00
0743490a05 input: misc: qti-haptics: check NULL pointer before using it
There might be a rare case that previous play has been terminated and
the next play is generating in VMAX mode so that the play effect pointer
would be set to NULL before the play IRQ being served. So check the
effect pointer before using it in the play IRQ handler.

Change-Id: I2d9ace5d09ffde885b4267e1e78771a169c57bec
Signed-off-by: Fenglin Wu <fenglinw@codeaurora.org>
2019-01-17 09:28:33 +08:00
f6f08a9050 input: misc: qti-haptics: remove "qcom,ilim-ma" property
Remove "qcom,ilim-ma" property as it is not a setting related with
hardware configuration. Set it to 1A by default to allow higher drive
strength.

Change-Id: I35cfa91c33661c0b17c12c1956999d8dc0db876b
Signed-off-by: Fenglin Wu <fenglinw@codeaurora.org>
2019-01-17 09:21:03 +08:00
8bb68ed82f Input: synaptics - enable SMBus for HP EliteBook 840 G4
[ Upstream commit 7a71712293ba303aad928f580b89addb0be2892e ]

dmesg reports that "Your touchpad (PNP: SYN3052 SYN0100 SYN0002 PNP0f13)
says it can support a different bus."

I've tested the offered psmouse.synaptics_intertouch=1 with 4.18.x and
4.19.x and it seems to work well. No problems seen with suspend/resume.

Also, it appears that RMI/SMBus mode is actually required for 3-4 finger
multitouch gestures to work -- otherwise they are not reported at all.

Information from dmesg in both modes:

  psmouse serio3: synaptics: Touchpad model: 1, fw: 8.2, id: 0x1e2b1,
      caps: 0xf00123/0x840300/0x2e800/0x0, board id: 3139, fw id: 2000742

  psmouse serio3: synaptics: Trying to set up SMBus access
  rmi4_smbus 6-002c: registering SMbus-connected sensor
  rmi4_f01 rmi4-00.fn01: found RMI device,
      manufacturer: Synaptics, product: TM3139-001, fw id: 2000742

Signed-off-by: Mantas Mikulėnas <grawity@gmail.com>
Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
2019-01-13 09:51:03 +01:00
b7e2af3fdf Input: synaptics - enable RMI on ThinkPad T560
[ Upstream commit ca5047286c9c93a01e1f471d00a6019536992954 ]

Before commit 7fd6d98b89 ("i2c: i801: Allow ACPI AML access I/O
ports not reserved for SMBus"), enabling RMI on the T560 would cause
the touchpad to stop working after resuming from suspend. Now that
this issue is fixed, RMI can be enabled safely and works fine.

Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: Yussuf Khalil <dev@pp3345.net>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
2019-01-13 09:50:58 +01:00
c5dabddc2c Input: omap-keypad - fix idle configuration to not block SoC idle states
[ Upstream commit e2ca26ec4f01486661b55b03597c13e2b9c18b73 ]

With PM enabled, I noticed that pressing a key on the droid4 keyboard will
block deeper idle states for the SoC. Let's fix this by using IRQF_ONESHOT
and stop constantly toggling the device OMAP4_KBD_IRQENABLE register as
suggested by Dmitry Torokhov <dmitry.torokhov@gmail.com>.

From the hardware point of view, looks like we need to manage the registers
for OMAP4_KBD_IRQENABLE and OMAP4_KBD_WAKEUPENABLE together to avoid
blocking deeper SoC idle states. And with toggling of OMAP4_KBD_IRQENABLE
register now gone with IRQF_ONESHOT, also the SoC idle state problem is
gone during runtime. We still also need to clear OMAP4_KBD_WAKEUPENABLE in
omap4_keypad_close() though to pair it with omap4_keypad_open() to prevent
blocking deeper SoC idle states after rmmod omap4-keypad.

Reported-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
2019-01-13 09:50:58 +01:00
9a702c565e Use 'GPL-2.0-only' as the SPDX-License-Identifier tag
s/SPDX-License-Identifier: GPL-2.0/SPDX-License-Identifier: GPL-2.0-only/

Change-Id: I0558c468c25d8229af2c8caade25c458875913f4
Signed-off-by: Bryan Huntsman <bryanh@codeaurora.org>
2019-01-11 16:55:33 -08:00
aeb5e53416 Input: elan_i2c - add ACPI ID for touchpad in ASUS Aspire F5-573G
commit 7db54c89f0b30a101584e09d3729144e6170059d upstream.

This adds ELAN0501 to the ACPI table to support Elan touchpad found in ASUS
Aspire F5-573G.

Signed-off-by: Patrick Dreyer <Patrick.Dreyer@gmail.com>
Cc: stable@vger.kernel.org
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2019-01-09 17:38:41 +01:00
f168056530 Input: atmel_mxt_ts - don't try to free unallocated kernel memory
commit 1e3c336ad8f40f88a8961c434640920fe35cc08b upstream.

If the user attempts to update Atmel device with an invalid configuration
cfg file, error handling code is trying to free cfg file memory which is
not allocated yet hence results into kernel crash.

This patch fixes the order of memory free operations.

Signed-off-by: Sanjeev Chugh <sanjeev_chugh@mentor.com>
Fixes: a4891f1058 ("Input: atmel_mxt_ts - zero terminate config firmware file")
Cc: stable@vger.kernel.org
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2019-01-09 17:38:41 +01:00
488f2c66dd Input: elantech - disable elan-i2c for P52 and P72
commit d21ff5d7f8c397261e095393a1a8e199934720bc upstream.

The current implementation of elan_i2c is known to not support those
2 laptops.

A proper fix is to tweak both elantech and elan_i2c to transmit the
correct information from PS/2, which would make a bad candidate for
stable.

So to give us some time for fixing the root of the problem, disable
elan_i2c for the devices we know are not behaving properly.

Link: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1803600
Link: https://bugs.archlinux.org/task/59714
Fixes: df077237cf Input: elantech - detect new ICs and setup Host Notify for them

Cc: stable@vger.kernel.org  # v4.18+
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2018-12-29 13:37:59 +01:00