Commit graph

597100 commits

Author SHA1 Message Date
Ke Wang
962d1f3fe2 ANDROID: sched: EAS: check energy_aware() before calling select_energy_cpu_brute() in up-migrate path
In up-migrate path, select_energy_cpu_brute() was called directly
without checking energy_aware(). This will make select_energy_cpu_brute()
always worked even disabling energy_aware() on the asymmetric cpu
capacity system.

Signed-off-by: Ke Wang <ke.wang@spreadtrum.com>
2018-01-29 15:33:09 +00:00
Surabhi Vishnoi
9f2420dd35 ath10k: Add host capability indication flag in wmi ready cmd
Add the host capability indication flags in the wmi ready command,
for firmware to know the features supported by host driver.

Change-Id: I0c07fb371e474995cb00f51bfe0eea4f46ab4223
Signed-off-by: Surabhi Vishnoi <svishnoi@codeaurora.org>
2018-01-29 20:48:44 +05:30
Yimin Peng
c4384a1054 ARM: dts: msm: switch to virtual clock for usb3 on msm8996 vplatform
Virtual clock driver is ready and gvm needs to manage clocks of usb3
which is a typical pass through device.

Change-Id: Ie8edfce2602f090d0f6b59d0af2e4b39282dfd6d
Signed-off-by: Yimin Peng <yiminp@codeaurora.org>
2018-01-29 20:59:02 +08:00
Andy Sun
36874e5bf8 ais: adjust frame id values to match user space of all platforms
1. resume frame done id solution: 2, 4, 6 ...
2. set field SOF id value to starts from 1: 1, 2, 3 ...

Change-Id: Ic7aea3cf99cd6d9b6ca62edb4dd17bce065717bd
Signed-off-by: Andy Sun <bins@codeaurora.org>
2018-01-29 18:35:21 +08:00
Yong Ding
b3970f4eab ARM: dts: msm: add a device tree for LV in multi-GVMs
The new device tree file is used to support the LV GVM
which will run in multiple Guest VMs environment, like
together with a LA GVM.

Change-Id: I086488012169531027699c0970221bb58056ec24
Signed-off-by: Yong Ding <yongding@codeaurora.org>
2018-01-29 16:18:47 +08:00
Linux Build Service Account
74b6b84c4a Merge "ASoC: msm: Loopback Driver Reg Stream in Prepare Stage" 2018-01-28 23:35:14 -08:00
Manoj Prabhu B
c8ba7feb00 ARM: dts: msm: Make allocation for diag as guaranteed on msm8998
Currently, memshare allocates 5MB memory to diag client on
receiving requests from modem. With the patch diag client
will be considered guaranteed on msm8998 to avoid memory
allocation failure on modem SSRs. Marking diag guaranteed
client allocated memory will never be freed.

Change-Id: I93fa8ae34d2268f6a18c7311b6833ed7e33ab30b
Signed-off-by: Manoj Prabhu B <bmanoj@codeaurora.org>
2018-01-28 22:35:18 -08:00
Greg KH
202e079275 UPSTREAM: eventpoll.h: add missing epoll event masks
[resend due to me forgetting to cc: linux-api the first time around I
posted these back on Feb 23]

From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

For some reason these values are not in the uapi header file, so any
libc has to define it themselves.  To prevent them from needing to do
this, just have the kernel provide the correct values.

Reported-by: Elliott Hughes <enh@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 7e040726850a106587485c21bdacc0bfc8a0cbed)

Change-Id: I7b1370668faeeb7597288b29dde5bc6d63c95be6
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2018-01-26 16:48:24 -08:00
Linux Build Service Account
0b1ba172bb Merge "ARM: dts: msm: Add cnss for WLAN in ivi vplatform" 2018-01-26 16:10:32 -08:00
Linux Build Service Account
3cc2b1b5c9 Merge "ARM: dts: msm: Switch to virtual clock and reset for usb2 on vplatform" 2018-01-26 16:10:31 -08:00
Linux Build Service Account
64a4e2672f Merge "ARM: dts: msm: Change haptic vmax and play-rate setting for QRD660" 2018-01-26 16:10:30 -08:00
Linux Build Service Account
d52f1917e6 Merge "ARM: dts: msm: usb3 switches to virtual reset on msm8996 vplatfrom" 2018-01-26 05:40:05 -08:00
Linux Build Service Account
02b5dd0bd5 Merge "ARM: dts: msm: Add a baseline device tree for msm8996 vplatform" 2018-01-26 05:40:04 -08:00
Linux Build Service Account
db3f5f103e Merge "qcom: qpnp-haptics: extend stop timer for a longer request" 2018-01-26 05:40:02 -08:00
Ferry Zhou
0924d38da4 ARM: dts: msm: Add cnss for WLAN in ivi vplatform
Add qcom,cnss for WLAN over PCIe in msm8996 ivi vplatform.

Change-Id: Ic1480ca4c75145e1cc97f92602772a76d69837a5
Signed-off-by: Ferry Zhou <tianguiz@codeaurora.org>
2018-01-26 01:50:26 -08:00
Linux Build Service Account
f75d803a01 Merge "ais: move axi_irq process before sof_irq" 2018-01-25 11:37:38 -08:00
Linux Build Service Account
d09447b958 Merge "soc: qcom: pil: Increase MBA encryption timeout to 5secs" 2018-01-25 11:37:37 -08:00
Linux Build Service Account
80418e1d7c Merge "icnss: Avoid qmi exchange when fw is down" 2018-01-25 11:37:35 -08:00
Linux Build Service Account
b0fcba45b8 Merge "ASoC: msm: qdsp6v2: correct return value check" 2018-01-25 11:37:34 -08:00
Linux Build Service Account
5df641b2f7 Merge "ASoc: wcd_cpe_core: Add mutex lock for CPE session" 2018-01-25 11:37:32 -08:00
Linux Build Service Account
c3d005b001 Merge "ASoC: wcd_cpe_core: add size check for WDSP ELF files" 2018-01-25 11:37:31 -08:00
Mayank Rana
c2e482aa78 usb: dwc3: Suspend USB SS PHY in host mode with device connect case
Currently driver is not suspending USB Super Speed PHY (here USB QMP
PHY) with below usecases.
a. USB super speed HUB is connected and going into bus suspend
b. USB super speed HUB is connected and having USB super speed device
connected on HUB's downstream port

This results into no USB super speed device connect or removal being
detected as autonomous mode is not being enabled with USB QMP PHY.
Fix these issues by suspending USB SS PHY in host mode with device
connect (i.e. HUB or HUB with USB SS device connected) case.

Change-Id: I469b02f0845228f55d9253e7683ea3c133fd9542
Signed-off-by: Mayank Rana <mrana@codeaurora.org>
2018-01-25 15:41:25 +05:30
Andy Sun
1ceec25182 ais: move axi_irq process before sof_irq
Under high cpu loading condition, next field sof will come with previous
frame done together, need to process for previous one firstly.

Change-Id: I9438e5adc034a20a39b0bc072e97df05f8863e9d
Signed-off-by: Andy Sun <bins@codeaurora.org>
2018-01-25 15:32:05 +08:00
Zhiqiang Tu
f959f7b9ab ARM: dts: msm: Add a baseline device tree for msm8996 vplatform
The baseline device tree is for firmware update on msm8996 virtual
platform. It does not need any peripheral.

Change-Id: I080038a03b7dc484f6149f8c832374ee6def031b
Signed-off-by: Zhiqiang Tu <ztu@codeaurora.org>
2018-01-25 14:44:51 +08:00
Jitendra Sharma
e8daf3a464 soc: qcom: pil: Increase MBA encryption timeout to 5secs
Increase PIL timeout to give MBA more time for encryption
for modem segments as now wlan segments are also being
dumped in addition to modem and we see that encryption
for WLAN is taking extra time.

Change-Id: Ic1b43c63bcd4f0d46fbd73695a95de5917fddd9e
Signed-off-by: Jitendra Sharma <shajit@codeaurora.org>
2018-01-25 11:43:30 +05:30
Anurag Chouhan
0c89a0b5b2 icnss: Avoid qmi exchange when fw is down
Currently wlan Host driver call exported API's which
invoke qmi exchanges irrespective of the firmware status
which leads to QMI timeouts.
To address this issue avoid sending qmi request to
firmware when firmware is down.

CRs-Fixed: 2175302
Change-Id: Ie5e340cebf7ee7f6143472e7dca0dfd9600d1b7d
Signed-off-by: Anurag Chouhan <achouhan@codeaurora.org>
2018-01-24 21:30:57 -08:00
Linux Build Service Account
717bb7a529 Merge "msm: ipa: add new IPA filtering bitmap" 2018-01-24 20:36:49 -08:00
Linux Build Service Account
1eae0d6eed Merge "soc: qcom: pil: Add PDR minidump support" 2018-01-24 20:36:47 -08:00
Linux Build Service Account
41a986188b Merge "Merge android-4.4.112 (5f6325b) into msm-4.4" 2018-01-24 20:36:44 -08:00
Linux Build Service Account
963910a5ef Merge "msm: camera: Fix csiphy issue on sdm660" 2018-01-24 20:36:43 -08:00
Linux Build Service Account
ee1718cd54 Merge "defconfig: msm: Modify tv tuner config in MSM8996" 2018-01-24 20:36:42 -08:00
Fenglin Wu
e3a9cb2782 ARM: dts: msm: Change haptic vmax and play-rate setting for QRD660
QRD660 device is using a LRA with 235Hz frequency and 1.8V max input
voltage, change the haptic setting to match with the vibrator spec.

CRs-Fixed: 2176673
Change-Id: I219522060d45ce51c0a01e20cb343046968218c5
Signed-off-by: Fenglin Wu <fenglinw@codeaurora.org>
2018-01-25 08:51:46 +08:00
Daniel Rosenberg
e70c132b2d ANDROID: xattr: Pass EOPNOTSUPP to permission2
The permission call for xattr operations happens regardless of
whether or not the xattr functions are implemented.

The xattr functions currently don't have support for permission2.
Passing EOPNOTSUPP as the mount point in xattr_permission allows
us to return EOPNOTSUPP early in permission2, if the filesystem
supports it.

Change-Id: I9d07e4cd633cf40af60450ffbff7ac5c1b4e8c2c
Signed-off-by: Daniel Rosenberg <drosen@google.com>
Bug: 35848445
2018-01-24 13:14:17 -08:00
Linux Build Service Account
3f7d1f35f5 Merge "msm: ipa: return the wifi stats when reset is set" 2018-01-24 09:12:48 -08:00
Linux Build Service Account
96248533a6 Merge "ipv6: release rt6->rt6i_idev properly during ifdown" 2018-01-24 09:12:47 -08:00
Linux Build Service Account
78337e6bbb Merge "mmc: core: Reset on error during deferred resume" 2018-01-24 09:12:45 -08:00
Linux Build Service Account
9a9a759c82 Merge "ais: support field info report to user space" 2018-01-24 09:12:44 -08:00
Linux Build Service Account
d7f27ed709 Merge "clk: msm: Add usb2s support for msm8996 virtual clock" 2018-01-24 09:12:42 -08:00
Linux Build Service Account
a52088bfdc Merge "ARM: dts: msm: Add msm android vm device node on msm8996 vplatform" 2018-01-24 09:12:41 -08:00
Linux Build Service Account
7cd851e9ff Merge "ARM: dts: msm: remove no-map for lk_pool on msm8996 auto boards" 2018-01-24 09:12:39 -08:00
Linux Build Service Account
449601033e Merge "ARM: dts: msm: add usb2s and usb3 devices on msm8996 vplatform" 2018-01-24 09:12:38 -08:00
Linux Build Service Account
5018953af2 Merge "net: cnss2: Enable CONFIG_CNSS_UTILS for msm8996AU" 2018-01-24 09:12:37 -08:00
Linux Build Service Account
42a2bc1af8 Merge "dev_freq: devfreq_spdm: add null terminator to prevent OOB access" 2018-01-24 09:12:35 -08:00
Srinivasarao P
c43902eef7 Merge android-4.4.113 (ef588ef) into msm-4.4
* refs/heads/tmp-ef588ef
  Linux 4.4.113
  MIPS: AR7: ensure the port type's FCR value is used
  x86/retpoline: Optimize inline assembler for vmexit_fill_RSB
  x86/pti: Document fix wrong index
  kprobes/x86: Disable optimizing on the function jumps to indirect thunk
  kprobes/x86: Blacklist indirect thunk functions for kprobes
  retpoline: Introduce start/end markers of indirect thunk
  x86/mce: Make machine check speculation protected
  kbuild: modversions for EXPORT_SYMBOL() for asm
  x86/cpu, x86/pti: Do not enable PTI on AMD processors
  arm64: KVM: Fix SMCCC handling of unimplemented SMC/HVC calls
  dm thin metadata: THIN_MAX_CONCURRENT_LOCKS should be 6
  dm btree: fix serious bug in btree_split_beneath()
  libata: apply MAX_SEC_1024 to all LITEON EP1 series devices
  can: peak: fix potential bug in packet fragmentation
  ARM: dts: kirkwood: fix pin-muxing of MPP7 on OpenBlocks A7
  phy: work around 'phys' references to usb-nop-xceiv devices
  tracing: Fix converting enum's from the map in trace_event_eval_update()
  Input: twl4030-vibra - fix sibling-node lookup
  Input: twl6040-vibra - fix child-node lookup
  Input: twl6040-vibra - fix DT node memory management
  Input: 88pm860x-ts - fix child-node lookup
  x86/apic/vector: Fix off by one in error path
  pipe: avoid round_pipe_size() nr_pages overflow on 32-bit
  module: Add retpoline tag to VERMAGIC
  x86/retpoline: Add LFENCE to the retpoline/RSB filling RSB macros
  sched/deadline: Zero out positive runtime after throttling constrained tasks
  scsi: hpsa: fix volume offline state
  af_key: fix buffer overread in parse_exthdrs()
  af_key: fix buffer overread in verify_address_len()
  ALSA: hda - Apply the existing quirk to iMac 14,1
  ALSA: hda - Apply headphone noise quirk for another Dell XPS 13 variant
  ALSA: pcm: Remove yet superfluous WARN_ON()
  futex: Prevent overflow by strengthen input validation
  scsi: sg: disable SET_FORCE_LOW_DMA
  x86/retpoline: Remove compile time warning
  x86/retpoline: Fill return stack buffer on vmexit
  x86/retpoline/irq32: Convert assembler indirect jumps
  x86/retpoline/checksum32: Convert assembler indirect jumps
  x86/retpoline/xen: Convert Xen hypercall indirect jumps
  x86/retpoline/hyperv: Convert assembler indirect jumps
  x86/retpoline/ftrace: Convert ftrace assembler indirect jumps
  x86/retpoline/entry: Convert entry assembler indirect jumps
  x86/retpoline/crypto: Convert crypto assembler indirect jumps
  x86/spectre: Add boot time option to select Spectre v2 mitigation
  x86/retpoline: Add initial retpoline support
  kconfig.h: use __is_defined() to check if MODULE is defined
  EXPORT_SYMBOL() for asm
  x86/asm: Make asm/alternative.h safe from assembly
  x86/kbuild: enable modversions for symbols exported from asm
  x86/asm: Use register variable to get stack pointer value
  x86/mm/32: Move setup_clear_cpu_cap(X86_FEATURE_PCID) earlier
  x86/cpu/AMD: Use LFENCE_RDTSC in preference to MFENCE_RDTSC
  x86/cpu/AMD: Make LFENCE a serializing instruction
  gcov: disable for COMPILE_TEST
  ANDROID: sdcardfs: Move default_normal to superblock
  blkdev: Refactoring block io latency histogram codes
  FROMLIST: arm64: kpti: Fix the interaction between ASID switching and software PAN
  FROMLIST: arm64: Move post_ttbr_update_workaround to C code
  FROMLIST: arm64: mm: Rename post_ttbr0_update_workaround
  sched: EAS: Initialize push_task as NULL to avoid direct reference on out_unlock path

Conflicts:
	arch/arm64/include/asm/efi.h
	arch/arm64/include/asm/mmu_context.h
	drivers/scsi/sg.c
	drivers/scsi/ufs/ufshcd.h

Change-Id: Ibfa06af8ef308077aad6995874d4b7b0a73e95f3
Signed-off-by: Srinivasarao P <spathi@codeaurora.org>
2018-01-24 18:27:37 +05:30
Vijay kumar Tumati
0d598505ca msm: camera: Fix csiphy issue on sdm660
Align with HPG for impedance value. This
effects cphy mode of operation.

Change-Id: I742ac285aacc36843698fc3ee746dc88a099f78d
Signed-off-by: Vijay kumar Tumati <vtumati@codeaurora.org>
2018-01-24 15:01:41 +05:30
Rahul Sharma
9fd1b000d5 defconfig: msm: Modify tv tuner config in MSM8996
Make TV tuner driver as a built-in module in MSM8996 auto defconfig
and MSM8996 perf defconfig.

Change-Id: I910d6f5d72c304591bd87245f03fa4cb140b03cd
Suggested-by: Suprith Shankaregowda <c_suprit@qti.qualcomm.com>
Signed-off-by: Rahul Sharma <sharah@codeaurora.org>
2018-01-24 00:38:18 -08:00
Jitendra Sharma
abe5dd4032 soc: qcom: pil: Add PDR minidump support
This change add support to collect PD dump along
with minidump on subsystem ssr event.

Change-Id: Icb3c20ee2f37ecc8bdbc91d9ba1ee7f383fa075a
Signed-off-by: Jitendra Sharma <shajit@codeaurora.org>
2018-01-24 13:05:12 +05:30
Srinivasarao P
8c8abdeafc Merge android-4.4.112 (5f6325b) into msm-4.4
* refs/heads/tmp-5f6325b
  Linux 4.4.112
  selftests/x86: Add test_vsyscall
  x86/alternatives: Add missing '\n' at end of ALTERNATIVE inline asm
  x86/alternatives: Fix optimize_nops() checking
  sysfs/cpu: Fix typos in vulnerability documentation
  x86/cpu: Implement CPU vulnerabilites sysfs functions
  sysfs/cpu: Add vulnerability folder
  x86/cpu: Merge bugs.c and bugs_64.c
  x86/cpufeatures: Add X86_BUG_SPECTRE_V[12]
  x86/pti: Rename BUG_CPU_INSECURE to BUG_CPU_MELTDOWN
  x86/cpufeatures: Add X86_BUG_CPU_INSECURE
  x86/cpufeatures: Make CPU bugs sticky
  x86/cpu: Factor out application of forced CPU caps
  x86/Documentation: Add PTI description
  e1000e: Fix e1000_check_for_copper_link_ich8lan return value.
  uas: ignore UAS for Norelsys NS1068(X) chips
  Bluetooth: Prevent stack info leak from the EFS element.
  staging: android: ashmem: fix a race condition in ASHMEM_SET_SIZE ioctl
  usbip: remove kernel addresses from usb device and urb debug msgs
  USB: fix usbmon BUG trigger
  usb: misc: usb3503: make sure reset is low for at least 100us
  USB: serial: cp210x: add new device ID ELV ALC 8xxx
  USB: serial: cp210x: add IDs for LifeScan OneTouch Verio IQ
  target: Avoid early CMD_T_PRE_EXECUTE failures during ABORT_TASK
  iscsi-target: Make TASK_REASSIGN use proper se_cmd->cmd_kref
  bpf, array: fix overflow in max_entries and undefined behavior in index_mask
  bpf: prevent out-of-bounds speculation
  bpf: adjust insn_aux_data when patching insns
  bpf: refactor fixup_bpf_calls()
  bpf: move fixup_bpf_calls() function
  bpf: don't (ab)use instructions to store state
  bpf: add bpf_patch_insn_single helper
  kaiser: Set _PAGE_NX only if supported
  drm/vmwgfx: Potential off by one in vmw_view_add()
  KVM: x86: Add memory barrier on vmcs field lookup
  x86/microcode/intel: Extend BDW late-loading with a revision check
  rbd: set max_segments to USHRT_MAX
  crypto: algapi - fix NULL dereference in crypto_remove_spawns()
  ipv6: fix possible mem leaks in ipv6_make_skb()
  net: stmmac: enable EEE in MII, GMII or RGMII only
  sh_eth: fix SH7757 GEther initialization
  sh_eth: fix TSU resource handling
  RDS: null pointer dereference in rds_atomic_free_op
  RDS: Heap OOB write in rds_message_alloc_sgs()
  net: core: fix module type in sock_diag_bind
  ip6_tunnel: disable dst caching if tunnel is dual-stack
  8021q: fix a memory leak for VLAN 0 device
  x86/pti/efi: broken conversion from efi to kernel page table
  Revert "userfaultfd: selftest: vm: allow to build in vm/ directory"
  xhci: Fix ring leak in failure path of xhci_alloc_virt_device()
  sysrq: Fix warning in sysrq generated crash.
  hwrng: core - sleep interruptible in read
  x86/mm/pat, /dev/mem: Remove superfluous error message
  cx82310_eth: use skb_cow_head() to deal with cloned skbs
  smsc75xx: use skb_cow_head() to deal with cloned skbs
  sr9700: use skb_cow_head() to deal with cloned skbs
  lan78xx: use skb_cow_head() to deal with cloned skbs
  r8152: adjust ALDPS function
  r8152: use test_and_clear_bit
  r8152: fix the wake event
  usb: musb: ux500: Fix NULL pointer dereference at system PM
  usbvision fix overflow of interfaces array
  locking/mutex: Allow next waiter lockless wakeup
  futex: Replace barrier() in unqueue_me() with READ_ONCE()
  locks: don't check for race with close when setting OFD lock
  zswap: don't param_set_charp while holding spinlock
  mm/zswap: use workqueue to destroy pool
  mm/page-writeback: fix dirty_ratelimit calculation
  mm/compaction: pass only pageblock aligned range to pageblock_pfn_to_page
  mm/compaction: fix invalid free_pfn and compact_cached_free_pfn
  x86/acpi: Reduce code duplication in mp_override_legacy_irq()
  ALSA: aloop: Fix racy hw constraints adjustment
  ALSA: aloop: Fix inconsistent format due to incomplete rule
  ALSA: aloop: Release cable upon open error path
  ALSA: pcm: Allow aborting mutex lock at OSS read/write loops
  ALSA: pcm: Abort properly at pending signal in OSS read/write loops
  ALSA: pcm: Add missing error checks in OSS emulation plugin builder
  ALSA: pcm: Remove incorrect snd_BUG_ON() usages
  iommu/arm-smmu-v3: Don't free page table ops twice
  x86/acpi: Handle SCI interrupts above legacy space gracefully
  x86/vsdo: Fix build on PARAVIRT_CLOCK=y, KVM_GUEST=n
  kvm: vmx: Scrub hardware GPRs at VM-exit
  net/mac80211/debugfs.c: prevent build failure with CONFIG_UBSAN=y
  MIPS: Disallow outsized PTRACE_SETREGSET NT_PRFPREG regset accesses
  MIPS: Also verify sizeof `elf_fpreg_t' with PTRACE_SETREGSET
  MIPS: Fix an FCSR access API regression with NT_PRFPREG and MSA
  MIPS: Consistently handle buffer counter with PTRACE_SETREGSET
  MIPS: Guard against any partial write attempt with PTRACE_SETREGSET
  MIPS: Factor out NT_PRFPREG regset access helpers
  MIPS: Validate PR_SET_FP_MODE prctl(2) requests against the ABI of the task
  IB/srpt: Disable RDMA access by the initiator
  can: gs_usb: fix return value of the "set_bittiming" callback
  KVM: Fix stack-out-of-bounds read in write_mmio
  dm bufio: fix shrinker scans when (nr_to_scan < retain_target)
  fscrypt: updates on 4.15-rc4
  ANDROID: uid_sys_stats: fix the comment
  BACKPORT: optee: fix invalid of_node_put() in optee_driver_init()
  BACKPORT: tee: optee: sync with new naming of interrupts
  BACKPORT: tee: indicate privileged dev in gen_caps
  BACKPORT: tee: optee: interruptible RPC sleep
  BACKPORT: tee: optee: add const to tee_driver_ops and tee_desc structures
  BACKPORT: tee: tee_shm: Constify dma_buf_ops structures.
  BACKPORT: tee: add forward declaration for struct device
  BACKPORT: tee: optee: fix uninitialized symbol 'parg'
  BACKPORT: tee.txt: standardize document format
  BACKPORT: tee: add ARM_SMCCC dependency
  BACKPORT: selinux: nlmsgtab: add SOCK_DESTROY to the netlink mapping tables

Conflicts:
	security/selinux/nlmsgtab.c

Change-Id: I5770a565f39c321f2305f8228e41f822e3cd0625
Signed-off-by: Srinivasarao P <spathi@codeaurora.org>
2018-01-24 12:35:11 +05:30
Srinivasarao P
1f4bd7c8ff Merge android-4.4.111 (f851888) into msm-4.4
* refs/heads/tmp-f851888
  Linux 4.4.111
  Fix build error in vma.c
  Map the vsyscall page with _PAGE_USER
  proc: much faster /proc/vmstat
  module: Issue warnings when tainting kernel
  module: keep percpu symbols in module's symtab
  genksyms: Handle string literals with spaces in reference files
  x86/tlb: Drop the _GPL from the cpu_tlbstate export
  parisc: Fix alignment of pa_tlb_lock in assembly on 32-bit SMP kernel
  x86/microcode/AMD: Add support for fam17h microcode loading
  Input: elantech - add new icbody type 15
  ARC: uaccess: dont use "l" gcc inline asm constraint modifier
  kernel/signal.c: remove the no longer needed SIGNAL_UNKILLABLE check in complete_signal()
  kernel/signal.c: protect the SIGNAL_UNKILLABLE tasks from !sig_kernel_only() signals
  kernel/signal.c: protect the traced SIGNAL_UNKILLABLE tasks from SIGKILL
  kernel: make groups_sort calling a responsibility group_info allocators
  fscache: Fix the default for fscache_maybe_release_page()
  sunxi-rsb: Include OF based modalias in device uevent
  crypto: pcrypt - fix freeing pcrypt instances
  crypto: chacha20poly1305 - validate the digest size
  crypto: n2 - cure use after free
  kernel/acct.c: fix the acct->needcheck check in check_free_space()
  x86/kasan: Write protect kasan zero shadow
  clocksource: arch_timer: make virtual counter access configurable
  arm64: issue isb when trapping CNTVCT_EL0 access
  BACKPORT: arm64: Add CNTFRQ_EL0 trap handler
  BACKPORT: arm64: Add CNTVCT_EL0 trap handler
  ANDROID: sdcardfs: Fix missing break on default_normal
  ANDROID: usb: f_fs: Prevent gadget unbind if it is already unbound
  arm64: Kconfig: Reword UNMAP_KERNEL_AT_EL0 kconfig entry
  arm64: use RET instruction for exiting the trampoline
  FROMLIST: arm64: kaslr: Put kernel vectors address in separate data page
  FROMLIST: arm64: mm: Introduce TTBR_ASID_MASK for getting at the ASID in the TTBR
  FROMLIST: arm64: Kconfig: Add CONFIG_UNMAP_KERNEL_AT_EL0
  FROMLIST: arm64: entry: Add fake CPU feature for unmapping the kernel at EL0
  FROMLIST: arm64: tls: Avoid unconditional zeroing of tpidrro_el0 for native tasks
  FROMLIST: arm64: erratum: Work around Falkor erratum #E1003 in trampoline code
  FROMLIST: arm64: entry: Hook up entry trampoline to exception vectors
  FROMLIST: arm64: entry: Explicitly pass exception level to kernel_ventry macro
  FROMLIST: arm64: mm: Map entry trampoline into trampoline and kernel page tables
  FROMLIST: arm64: entry: Add exception trampoline page for exceptions from EL0
  FROMLIST: arm64: mm: Invalidate both kernel and user ASIDs when performing TLBI
  FROMLIST: arm64: mm: Add arm64_kernel_unmapped_at_el0 helper
  FROMLIST: arm64: mm: Allocate ASIDs in pairs
  FROMLIST: arm64: mm: Fix and re-enable ARM64_SW_TTBR0_PAN
  FROMLIST: arm64: mm: Move ASID from TTBR0 to TTBR1
  FROMLIST: arm64: mm: Temporarily disable ARM64_SW_TTBR0_PAN
  FROMLIST: arm64: mm: Use non-global mappings for kernel space
  UPSTREAM: arm64: factor out entry stack manipulation
  UPSTREAM: arm64: tlbflush.h: add __tlbi() macro

Conflicts:
	arch/arm64/include/asm/cpufeature.h
	arch/arm64/kernel/asm-offsets.c
	arch/arm64/kernel/cpufeature.c
	arch/arm64/kernel/entry.S
	arch/arm64/kernel/vmlinux.lds.S
	drivers/clocksource/Kconfig
	drivers/clocksource/arm_arch_timer.c
	drivers/usb/gadget/function/f_fs.c

Change-Id: I41e84762e30c9a7b1e283850c3f780f3dbe86f44
Signed-off-by: Srinivasarao P <spathi@codeaurora.org>
2018-01-24 12:20:03 +05:30
Fenglin Wu
453824b9ab qcom: qpnp-haptics: extend stop timer for a longer request
Haptics works as a timed output device and it doesn't expect another
enable request while current one is still in progress. If a new
enabling request comes in and its duration is longer than current
pattern's expiry then extend the stop timer.

CRs-Fixed: 2171601
Change-Id: I1f1f4e9a58140114a41d2af54b06cd798332eae4
Signed-off-by: Fenglin Wu <fenglinw@codeaurora.org>
2018-01-24 14:19:25 +08:00