Commit graph

596750 commits

Author SHA1 Message Date
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
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
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
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
Wei Wang
4e4b700a62 ipv6: release rt6->rt6i_idev properly during ifdown
When a dst is created by addrconf_dst_alloc() for a host route or an
anycast route, dst->dev points to loopback dev while rt6->rt6i_idev
points to a real device.
When the real device goes down, the current cleanup code only checks for
dst->dev and assumes rt6->rt6i_idev->dev is the same. This causes the
refcount leak on the real device in the above situation.
This patch makes sure to always release the refcount taken on
rt6->rt6i_idev during dst_dev_put().

Change-Id: Id3d07aebb85432298179c6846986540e2f8b13a9
Fixes: 587fea741134 ("ipv6: mark DST_NOGC and remove the operation of
dst_free()")
Reported-by: John Stultz <john.stultz@linaro.org>
Tested-by: John Stultz <john.stultz@linaro.org>
Tested-by: Martin KaFai Lau <kafai@fb.com>
Signed-off-by: Wei Wang <weiwan@google.com>
Signed-off-by: Martin KaFai Lau <kafai@fb.com>
Acked-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Git-commit: e5645f51ba99738b0e5d708edf9c6454f33b9310
Git-repo: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
Signed-off-by: Tejaswi Tanikella <tejaswit@codeaurora.org>
2018-01-22 22:13:55 -08:00
Linux Build Service Account
f56ee1db81 Merge "drm/edid: CEA mode 64 1080p100 vsync pulse width incorrect" 2018-01-22 22:12:34 -08:00
Linux Build Service Account
1e6d2618a7 Merge "drm/edid: complete CEA modedb(VIC 1-107)" 2018-01-22 22:12:33 -08:00
Linux Build Service Account
add2282e7d Merge "clocksource: arch_timer: Disable user access to the physical counter" 2018-01-22 22:12:32 -08:00
Linux Build Service Account
60ab2b9541 Merge "msm: vidc: set multistream mode for worst case scratch buffer requirement" 2018-01-22 22:12:31 -08:00
Linux Build Service Account
63f67fc2d5 Merge "dwc3: debugfs: Add check for length before copy data from userspace" 2018-01-22 22:12:30 -08:00
Shihuan Liu
05ec87e351 msm: ipa: add new IPA filtering bitmap
Add new IPA filtering bitmap to match inner IP type
and inner IPv4 address in L2TP use case.

Change-Id: I30afbfba6fb0150ab90826eb2543540699ab895b
Acked-by: Shihuan Liu <shihuanl@qti.qualcomm.com>
Signed-off-by: Skylar Chang <chiaweic@codeaurora.org>
2018-01-22 10:28:50 -08:00
Andy Sun
ea9d0315e3 ais: support field info report to user space
1. send real SOF event to user space per SOF irq;
   original SOF event per:
     CAMIF port: epoch irq
     RDI port: reg_update irq
2. provide interface for user space to query field type;
3. provide frame id from stream_info not src_info for user;

Change-Id: Ied446b81a84d95c7273d1aa3918a474ac739971f
Signed-off-by: Andy Sun <bins@codeaurora.org>
2018-01-22 16:03:01 +08:00
Will Huang
81d7e2934d net: cnss2: Enable CONFIG_CNSS_UTILS for msm8996AU
Enable CONFIG_CNSS_UTILS in order to support WLAN LTE coex and other
CNSS UTILS functions.

Change-Id: I1f496ca3b32bf9f7e87b8eb03b4f0aec413be336
CRs-Fixed: 2172124
Signed-off-by: Will Huang <wilhuang@codeaurora.org>
2018-01-22 15:18:40 +08:00
Zhiqiang Tu
45b84a4fb5 clk: msm: Add usb2s support for msm8996 virtual clock
Add the usb2s relevant clocks in msm8996 virtual clock driver.

Change-Id: Id72e1a69f39ee2dd0c871828e9faed8dbedefd5b
Signed-off-by: Zhiqiang Tu <ztu@codeaurora.org>
2018-01-21 22:48:08 -08:00
Yimin Peng
1cce581249 ARM: dts: msm: add usb2s and usb3 devices on msm8996 vplatform
Add usb passthrough devices for msm8996 vplatform.

Change-Id: I7a49470ed722a2028c73e99554e3d4fe98b0f38d
Signed-off-by: Yimin Peng <yiminp@codeaurora.org>
2018-01-22 13:56:58 +08:00
Chao Bi
a90314995d ARM: dts: msm: Add msm android vm device node on msm8996 vplatform
This patch is to add a new device tree file specific for ivi-android gvm.

Change-Id: I558c300a6698f818a3621d287fb8dd398c4d0e83
Signed-off-by: Chao Bi <chaobi@codeaurora.org>
2018-01-22 10:01:05 +08:00
Skylar Chang
ad5f103c51 msm: ipa: return the wifi stats when reset is set
After Andorid-O, every time after framework queries
the WIFI-stats, it will reset the stats because
framework would like to know only the difference of
data usage, not accumulated stats.

Change-Id: I66bbf779f872c54311dcc8e3ba635949126e94ac
Acked-by: Pooja Kumari <kumarip@qti.qualcomm.com>
Signed-off-by: Mohammed Javid <mjavid@codeaurora.org>
Signed-off-by: Skylar Chang <chiaweic@codeaurora.org>
2018-01-21 01:04:28 -08:00
Linux Build Service Account
a5cabe9334 Merge "msm: ipa: Return error -ENODEV for set data quota failure" 2018-01-20 06:06:04 -08:00
Mohammed Javid
8a0980acf1 msm: ipa: Return error -ENODEV for set data quota failure
If set data quota fails due to invalid interface
name, return -ENODEV error.

Change-Id: I45f4082cb8026d3757bd4df237e34df14750ea29
Acked-by: Pooja Kumari <kumarip@qti.qualcomm.com>
Signed-off-by: Mohammed Javid <mjavid@codeaurora.org>
2018-01-19 23:39:56 -08:00
Linux Build Service Account
be48c04efd Merge "power: qpnp-fg-gen3: add support for configuring cutoff current" 2018-01-19 20:10:35 -08:00
Linux Build Service Account
5cbcd25aea Merge "leds: qpnp-flash-v2: Update IRES for active LEDs" 2018-01-19 20:10:34 -08:00
Linux Build Service Account
a407c5262d Merge "soc: qcom: hab: add compat_ioctl support" 2018-01-19 09:30:33 -08:00
Linux Build Service Account
d23b921b46 Merge "soc: qcom: hab: add dts parsing into hab driver" 2018-01-19 09:30:32 -08:00
Linux Build Service Account
54b0b96ecd Merge "Merge android-4.4.110 (5cc8c2e) into msm-4.4" 2018-01-19 09:30:27 -08:00
Linux Build Service Account
188c08e1bf Merge "power: smb1351-charger: Disable parallel charging in shutdown path" 2018-01-19 09:30:26 -08:00
Guchun Chen
16ac82899e ARM: dts: msm: remove no-map for lk_pool on msm8996 auto boards
no-map is set for carve out memory, which means it will never be
brought back to system. While in kernel, such memory should be recycled
if no one uses it.

CRs-Fixed: 2168593
Change-Id: I06471db012927e82faee12149d14c79d7097cc1c
Signed-off-by: Guchun Chen <guchunc@codeaurora.org>
2018-01-19 15:20:59 +08:00
Subbaraman Narayanamurthy
2e21ea63b3 leds: qpnp-flash-v2: Update IRES for active LEDs
Currently, whenever the switch LED device is triggered, IRES is
updated based on the LEDs belonging to that switch LED device.
However, this can overwrite IRES configuration if flash and torch
LED devices have different IRES since they share the same id.

Fix this by checking the active LED status which will be updated
based on the brightness level set so that IRES will be updated
for the correct LED (flash/torch) device.

CRs-Fixed: 2173127
Change-Id: Ic3b5db2f56758ccd68fd80139aeb22f31723130e
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
2018-01-18 18:34:02 -08:00
Linux Build Service Account
6b202df713 Merge "mmc: sdhci: Remove some redundant stack information" 2018-01-18 09:36:24 -08:00
Linux Build Service Account
f5e3d60a29 Merge "dwc3-msm: Introduce sysfs param to indicate usb compliance mode" 2018-01-18 09:36:23 -08:00
Linux Build Service Account
ba930bb521 Merge "defconfig: msm: sdm660: disable memory cgroups" 2018-01-18 09:36:22 -08:00
Linux Build Service Account
f3dcbfee1c Merge "usb: pd: avoid out-of-bounds access when reading PDOs" 2018-01-18 09:36:20 -08:00
Linux Build Service Account
10d5a831db Merge "usb: pd: ensure source hard reset is handled timely" 2018-01-18 09:36:19 -08:00
Linux Build Service Account
13c7e628e7 Merge "msm: ipa: Fix to unsigned integer underflow" 2018-01-18 09:36:17 -08:00