Commit graph

592282 commits

Author SHA1 Message Date
Linux Build Service Account
d68ac604a3 Merge "net: Kconfig: Add config entry for WLAN QCA6290 chipset" 2017-07-11 17:57:52 -07:00
Linux Build Service Account
69cc51bcab Merge "msm: isp: fix the issue during overflow recovery" 2017-07-11 17:57:51 -07:00
Linux Build Service Account
9a74724cda Merge "USB: phy-msm-qusb-v2: Enable autoresume only when device is connected" 2017-07-11 17:57:51 -07:00
Linux Build Service Account
b0e2239e53 Merge "ARM: dts: msm: Enable ACD functionality for sdm630 CPU rails" 2017-07-11 17:57:50 -07:00
Linux Build Service Account
9165ab4e7a Merge "ASoC: msm_sdw: Move the delay logic inside bulk write loop" 2017-07-11 17:57:49 -07:00
Linux Build Service Account
38c7257a21 Merge "soc: qcom: SCM front-end over QCPE" 2017-07-11 17:57:48 -07:00
Abhijeet Dharmapurikar
fed0617ff2 smb-lib: fix usbin_icl_change interrupt storm
We observed an interrupt storm on that interrupt
even after the usb path is suspended.

So keep this interrupt disabled as long as the usb
path is suspended.

Note that since the current limit votes can come in
prior to interrupt registration, rerun the election
on the votable after interrupts are registered.

Change-Id: Ib43b071b7b0decf8e50d27d585bea04b727f9475
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
2017-07-11 16:14:32 -07:00
Yue Ma
aace9713d6 cnss2: Set PCIe to D3hot state before suspending PCIe link
As per PCIe spec, PCIe link needs to be set to D3hot state before
entering D3cold state.

Change-Id: I68defc4cf29fe88262e92fe8fb934948ad13aef4
CRs-fixed: 2059087
Signed-off-by: Yue Ma <yuem@codeaurora.org>
2017-07-11 14:37:24 -07:00
Nicholas Troast
faee17bff3 power: smb138x-charger: set buck freq to 700kHz in slave mode
Currently the buck frequency is set to 700kHz only when the smb138x is
in master mode. The buck frequency needs to be 700kHz in both master and
slave mode to prevent ADC errors. Do it.

Change-Id: Ib2cea9b38b6b23f9f229ee85c2bde5a5fd6220fd
Signed-off-by: Nicholas Troast <ntroast@codeaurora.org>
2017-07-11 12:33:37 -07:00
Yue Ma
022e1f5a20 net: Kconfig: Add config entry for WLAN QCA6290 chipset
WLAN QCA6290 chipset specific changes are featurized under
this config entry.

Change-Id: I9283ea5dcac702018b2483cdcd4aea254e96c51a
CRs-fixed: 2071634
Signed-off-by: Yue Ma <yuem@codeaurora.org>
2017-07-11 10:36:28 -07:00
Linux Build Service Account
d8ff341d38 Merge "ARM: dts: msm: add wlan carveout region for sdm660/sdm630" 2017-07-11 09:17:36 -07:00
Linux Build Service Account
cd7893663a Merge "staging: android: sync: fix list corruption in fence struct" 2017-07-11 09:17:35 -07:00
Linux Build Service Account
04102f12e1 Merge "soc: qcom: Notify to app pd clients in ind_ack thread" 2017-07-11 09:17:34 -07:00
Linux Build Service Account
9baa4699bd Merge "fs/dcache.c: fix spin lockup issue on nlru->lock" 2017-07-11 09:17:33 -07:00
Linux Build Service Account
940ac391bb Merge "mm/list_lru.c: fix list_lru_count_node() to be race free" 2017-07-11 09:17:32 -07:00
Linux Build Service Account
38b75a6b9f Merge "msm: ipa: fix wrong usage and cleanup dead code" 2017-07-11 09:17:32 -07:00
Linux Build Service Account
cf381e026e Merge "msm: ipa3: Verify IPA client id before using it" 2017-07-11 09:17:30 -07:00
Surajit Podder
f9b8fd3627 msm: vidc: Fix issue in cache operation range
Start offset is not considered in cache operation logic,
due to which bytes at the end of payload might be stale.

Add logic to add offset to cache operation length
from start of buffer, to ensure correct cache operation.

Change-Id: I5fed2fe78f803d3d4d3283ab293ad86238dbc620
Signed-off-by: Surajit Podder <spodder@codeaurora.org>
2017-07-11 08:01:16 -07:00
Laxminath Kasam
ddb173d8ad ASoC: msm_sdw: Move the delay logic inside bulk write loop
On consecutive writes in bulk write API, ensure delay
is provided for atleast 100us between each soundwire
master write for WR_DONE status update and reflect
current register value. Also ensure delay in soundwire
master read is present after register address update
and before register value read.

CRs-Fixed: 2035787
Change-Id: I8399c5ca32328abdd4e90b46d6f8d6a6c0225905
Signed-off-by: Laxminath Kasam <lkasam@codeaurora.org>
2017-07-11 03:47:57 -07:00
Samyukta Mogily
6467925a1c msm: sensor: Fix for variable being de-referenced without proper check
Pointer from userspace is de-referenced before the command is checked.
This might cause a crash if the command being sent is not a valid command.
Hence changing the de-reference such that the pointer is accessed after
checking if a valid command is sent from the userspace.

Change-Id: I8db9382dd184f1564176ab45355954dcde8a3ab3
Signed-off-by: Samyukta Mogily <smogily@codeaurora.org>
2017-07-11 14:23:28 +05:30
Linux Build Service Account
e5a68ffaa3 Merge "Merge android-4.4@8c91412 (v4.4.75) into msm-4.4" 2017-07-11 00:40:22 -07:00
Linux Build Service Account
0f0e37eeac Merge "mmc: core: Select HS mode in device first and then in the host" 2017-07-11 00:40:21 -07:00
Linux Build Service Account
d6b4382bc7 Merge "mm/page_alloc: introduce post allocation processing on page allocator" 2017-07-11 00:40:15 -07:00
Linux Build Service Account
329e421aab Merge "mm/page_owner: use stackdepot to store stacktrace" 2017-07-11 00:40:13 -07:00
Linux Build Service Account
11470983e5 Merge "mm/page_owner: introduce split_page_owner and replace manual handling" 2017-07-11 00:40:12 -07:00
Linux Build Service Account
09437acc78 Merge "lib/stackdepot: avoid to return 0 handle" 2017-07-11 00:40:12 -07:00
Linux Build Service Account
dee9c65c16 Merge "lib/stackdepot.c: allow the stack trace hash to be zero" 2017-07-11 00:40:11 -07:00
Linux Build Service Account
79f2b434d4 Merge "mm, kasan: stackdepot implementation. Enable stackdepot for SLAB" 2017-07-11 00:40:11 -07:00
Linux Build Service Account
381c897543 Merge "mm/page_owner: copy last_migrate_reason in copy_page_owner()" 2017-07-11 00:40:10 -07:00
Linux Build Service Account
17ead552c0 Merge "mm/page_owner: add zone range overlapping check" 2017-07-11 00:40:10 -07:00
Linux Build Service Account
038a9502b1 Merge "mm, page_owner: dump page owner info from dump_page()" 2017-07-11 00:40:09 -07:00
Linux Build Service Account
e8b8b04e8e Merge "mm, page_owner: track and print last migrate reason" 2017-07-11 00:40:09 -07:00
Linux Build Service Account
4eaf0330f9 Merge "mm, page_owner: copy page owner info during migration" 2017-07-11 00:40:08 -07:00
Linux Build Service Account
5fd1a48477 Merge "mm, page_owner: convert page_owner_inited to static key" 2017-07-11 00:40:08 -07:00
Linux Build Service Account
b7d16a2978 Merge "mm, page_owner: print migratetype of page and pageblock, symbolic flags" 2017-07-11 00:40:07 -07:00
Linux Build Service Account
ccc6c3b3c8 Merge "ARM: dts: msm: configure GPIO19 on msm8998 for 11ad refclk3" 2017-07-11 00:40:06 -07:00
Linux Build Service Account
1f575ad700 Merge "power: reset: msm: Restore disabling SDI during reset" 2017-07-11 00:40:05 -07:00
Linux Build Service Account
15e4cb50b3 Merge "net: rps: reset backlog state when IPI fails." 2017-07-11 00:40:05 -07:00
Jayant Shekhar
7d6f012ed1 msm: sde: rotator: Enable traffic shaper for 4k@60fps layer
Set OT values to default and enable traffic shaper for 4k
60fps layer.

Change-Id: I34ed7e94c8a323d19cdaeb65b87d853cce8957c9
Signed-off-by: Jayant Shekhar <jshekhar@codeaurora.org>
2017-07-11 11:50:53 +05:30
Avaneesh Kumar Dwivedi
2427e1bd7d soc: qcom: Notify to app pd clients in ind_ack thread
We have observed race condition between inquiring the remote pd state and
indication call back execution. They run asynchronously so we have no
control on their concurrent execution. So to achieve mutual exclusion,
moving the portion of code which result in race condition to indication
acknowledgment routine. Indication acknowledgment is send in separate
thread context which will avoid race condition.

Change-Id: Ib94f7ef4efd5de63fc8bededcf5cb6ae4ca2c3d8
Signed-off-by: Avaneesh Kumar Dwivedi <akdwived@codeaurora.org>
2017-07-10 23:12:25 -07:00
Srikanth Uyyala
da41b1aff9 msm: isp: fix the issue during overflow recovery
When HAL3 is used undelivered requests are stored in request_queue
these requests need to be cleared during overflow recovery.

Change-Id: I733ba127abba8bfb70b3c727c7196adba2cb1973
Signed-off-by: Srikanth Uyyala <suyyala@codeaurora.org>
2017-07-11 10:27:04 +05:30
Tirupathi Reddy
a4ca7944f4 ARM: dts: msm: Enable ACD functionality for sdm630 CPU rails
The adaptive clock distribution (ACD) mitigates the impact of
high-frequency supply voltage (VDD) droops on microprocessor
performance. Program ACD functional configuration for both
Silver and Gold clusters of sdm630.

Also set VCTL_RAMP_EN & VCTL_RAMP_EN to 1 in SAW4_AVS_CTL.

CRs-Fixed: 2074210
Change-Id: I1f8021b8b436602b22a87d2036aebbfcf6840f58
Signed-off-by: Tirupathi Reddy <tirupath@codeaurora.org>
2017-07-11 09:54:14 +05:30
Sahitya Tummala
c6b2e7c51e fs/dcache.c: fix spin lockup issue on nlru->lock
__list_lru_walk_one() acquires nlru spin lock (nlru->lock) for longer
duration if there are more number of items in the lru list.  As per the
current code, it can hold the spin lock for upto maximum UINT_MAX entries
at a time.  So if there are more number of items in the lru list, then
"BUG: spinlock lockup suspected" is observed in the below path -

[<ffffff8eca0fb0bc>] spin_bug+0x90
[<ffffff8eca0fb220>] do_raw_spin_lock+0xfc
[<ffffff8ecafb7798>] _raw_spin_lock+0x28
[<ffffff8eca1ae884>] list_lru_add+0x28
[<ffffff8eca1f5dac>] dput+0x1c8
[<ffffff8eca1eb46c>] path_put+0x20
[<ffffff8eca1eb73c>] terminate_walk+0x3c
[<ffffff8eca1eee58>] path_lookupat+0x100
[<ffffff8eca1f00fc>] filename_lookup+0x6c
[<ffffff8eca1f0264>] user_path_at_empty+0x54
[<ffffff8eca1e066c>] SyS_faccessat+0xd0
[<ffffff8eca084e30>] el0_svc_naked+0x24

This nlru->lock is acquired by another CPU in this path -

[<ffffff8eca1f5fd0>] d_lru_shrink_move+0x34
[<ffffff8eca1f6180>] dentry_lru_isolate_shrink+0x48
[<ffffff8eca1aeafc>] __list_lru_walk_one.isra.10+0x94
[<ffffff8eca1aec34>] list_lru_walk_node+0x40
[<ffffff8eca1f6620>] shrink_dcache_sb+0x60
[<ffffff8eca1e56a8>] do_remount_sb+0xbc
[<ffffff8eca1e583c>] do_emergency_remount+0xb0
[<ffffff8eca0ba510>] process_one_work+0x228
[<ffffff8eca0bb158>] worker_thread+0x2e0
[<ffffff8eca0c040c>] kthread+0xf4
[<ffffff8eca084dd0>] ret_from_fork+0x10

Fix this lockup by reducing the number of entries to be shrinked from the
lru list to 1024 at once.  Also, add cond_resched() before processing the
lru list again.

Change-Id: I6df8d74cbc4c5ceac294f2d0784702cf096e84be
Link: http://marc.info/?t=149722864900001&r=1&w=2
Link: http://lkml.kernel.org/r/1498707575-2472-1-git-send-email-stummala@codeaurora.org
Signed-off-by: Sahitya Tummala <stummala@codeaurora.org>
Suggested-by: Jan Kara <jack@suse.cz>
Suggested-by: Vladimir Davydov <vdavydov.dev@gmail.com>
Cc: Alexander Polakov <apolyakov@beget.ru>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: <stable@vger.kernel.org>
Patch-mainline: linux-mm @ 29/06/17, 09:09:35
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
2017-07-11 09:30:59 +05:30
Sahitya Tummala
d5d9fdf4ca mm/list_lru.c: fix list_lru_count_node() to be race free
list_lru_count_node() iterates over all memcgs to get the total number of
entries on the node but it can race with memcg_drain_all_list_lrus(),
which migrates the entries from a dead cgroup to another.  This can return
incorrect number of entries from list_lru_count_node().

Fix this by keeping track of entries per node and simply return it in
list_lru_count_node().

Change-Id: I19e3b527804e95be75f48ee363c8207c0e7ee2ff
Link: http://lkml.kernel.org/r/1498707555-30525-1-git-send-email-stummala@codeaurora.org
Signed-off-by: Sahitya Tummala <stummala@codeaurora.org>
Cc: Jan Kara <jack@suse.cz>
Cc: Vladimir Davydov <vdavydov.dev@gmail.com>
Cc: Alexander Polakov <apolyakov@beget.ru>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Patch-mainline: linux-mm @ 29/06/17, 09:09:15
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
2017-07-11 09:30:58 +05:30
Linux Build Service Account
0d2bf7e895 Merge "cnss2: Bypass SMMU stage-1 by default" 2017-07-10 14:09:14 -07:00
Srikanth Rajagopalan
fb87ca54f6 drm/msm/sde: Expose the HDR support capability of the chipset
Expose HDR capability using a property to the userspace.

This will help userspace to decide whether to invoke the HDR library
and pass the relevant parameters to be sent to the sink.

Change-Id: I3c4bf4d6c4e0f0babdf49b3c99baab42dcb2b5c0
Signed-off-by: Srikanth Rajagopalan <rasrik@codeaurora.org>
2017-07-10 12:48:26 -07:00
Amit Blay
232738f76f soc: qcom: SCM front-end over QCPE
This is an implementation of para-virtualized SCM driver.
This driver is the FE. The BE is QCPE running in an hypervisor.
The FE driver forwards SCM calls over HAB to the BE.

Change-Id: I88c269e856b0a6cc20b9ab8bf10110842d90a382
Signed-off-by: Amit Blay <ablay@codeaurora.org>
2017-07-10 08:34:29 -07:00
Charan Teja Reddy
3183420178 ARM: dts: msm: add wlan carveout region for sdm660/sdm630
Add WLAN carveout region of size 1MB. But additional guard of 1MB is
also added due to system limitations.

Change-Id: I1cd38f1ced820132209e31acc55a1321c879a09c
Signed-off-by: Charan Teja Reddy <charante@codeaurora.org>
2017-07-10 18:34:20 +05:30
Revathi Uddaraju
aea1705077 ASoC: msm: qdsp6v2: Set path type to LIVE_REC in LISTEN passthrough case
ADSP SVA needs LIVE_REC path type for LISTEN pass through mode
for successful loading of SVA App.
Hence set path type to LIVE_REC in LISTEN pass through case.

Change-Id: I4404f2a64f0add62782beab3a5d8d63615d8ac01
Signed-off-by: Revathi Uddaraju <revathiu@codeaurora.org>
2017-07-10 04:03:50 -07:00
Blagovest Kolenichev
4c8daae4af Merge android-4.4@64a73ff (v4.4.76) into msm-4.4
* refs/heads/tmp-64a73ff:
  Linux 4.4.76
  KVM: nVMX: Fix exception injection
  KVM: x86: zero base3 of unusable segments
  KVM: x86/vPMU: fix undefined shift in intel_pmu_refresh()
  KVM: x86: fix emulation of RSM and IRET instructions
  cpufreq: s3c2416: double free on driver init error path
  iommu/amd: Fix incorrect error handling in amd_iommu_bind_pasid()
  iommu: Handle default domain attach failure
  iommu/vt-d: Don't over-free page table directories
  ocfs2: o2hb: revert hb threshold to keep compatible
  x86/mm: Fix flush_tlb_page() on Xen
  x86/mpx: Correctly report do_mpx_bt_fault() failures to user-space
  ARM: 8685/1: ensure memblock-limit is pmd-aligned
  ARM64/ACPI: Fix BAD_MADT_GICC_ENTRY() macro implementation
  sched/loadavg: Avoid loadavg spikes caused by delayed NO_HZ accounting
  watchdog: bcm281xx: Fix use of uninitialized spinlock.
  xfrm: Oops on error in pfkey_msg2xfrm_state()
  xfrm: NULL dereference on allocation failure
  xfrm: fix stack access out of bounds with CONFIG_XFRM_SUB_POLICY
  jump label: fix passing kbuild_cflags when checking for asm goto support
  ravb: Fix use-after-free on `ifconfig eth0 down`
  sctp: check af before verify address in sctp_addr_id2transport
  net/mlx4_core: Eliminate warning messages for SRQ_LIMIT under SRIOV
  perf probe: Fix to show correct locations for events on modules
  be2net: fix status check in be_cmd_pmac_add()
  s390/ctl_reg: make __ctl_load a full memory barrier
  swiotlb: ensure that page-sized mappings are page-aligned
  coredump: Ensure proper size of sparse core files
  x86/mpx: Use compatible types in comparison to fix sparse error
  mac80211: initialize SMPS field in HT capabilities
  spi: davinci: use dma_mapping_error()
  scsi: lpfc: avoid double free of resource identifiers
  HID: i2c-hid: Add sleep between POWER ON and RESET
  kernel/panic.c: add missing \n
  ibmveth: Add a proper check for the availability of the checksum features
  vxlan: do not age static remote mac entries
  virtio_net: fix PAGE_SIZE > 64k
  vfio/spapr: fail tce_iommu_attach_group() when iommu_data is null
  drm/amdgpu: check ring being ready before using
  net: dsa: Check return value of phy_connect_direct()
  amd-xgbe: Check xgbe_init() return code
  platform/x86: ideapad-laptop: handle ACPI event 1
  scsi: virtio_scsi: Reject commands when virtqueue is broken
  xen-netfront: Fix Rx stall during network stress and OOM
  swiotlb-xen: update dev_addr after swapping pages
  virtio_console: fix a crash in config_work_handler
  Btrfs: fix truncate down when no_holes feature is enabled
  gianfar: Do not reuse pages from emergency reserve
  powerpc/eeh: Enable IO path on permanent error
  net: bgmac: Remove superflous netif_carrier_on()
  net: bgmac: Start transmit queue in bgmac_open
  net: bgmac: Fix SOF bit checking
  bgmac: Fix reversed test of build_skb() return value.
  mtd: bcm47xxpart: don't fail because of bit-flips
  bgmac: fix a missing check for build_skb
  mtd: bcm47xxpart: limit scanned flash area on BCM47XX (MIPS) only
  MIPS: ralink: fix MT7628 wled_an pinmux gpio
  MIPS: ralink: fix MT7628 pinmux typos
  MIPS: ralink: Fix invalid assignment of SoC type
  MIPS: ralink: fix USB frequency scaling
  MIPS: ralink: MT7688 pinmux fixes
  net: korina: Fix NAPI versus resources freeing
  MIPS: ath79: fix regression in PCI window initialization
  net: mvneta: Fix for_each_present_cpu usage
  ARM: dts: BCM5301X: Correct GIC_PPI interrupt flags
  qla2xxx: Fix erroneous invalid handle message
  scsi: lpfc: Set elsiocb contexts to NULL after freeing it
  scsi: sd: Fix wrong DPOFUA disable in sd_read_cache_type
  KVM: x86: fix fixing of hypercalls
  mm: numa: avoid waiting on freed migrated pages
  block: fix module reference leak on put_disk() call for cgroups throttle
  sysctl: enable strict writes
  usb: gadget: f_fs: Fix possibe deadlock
  drm/vmwgfx: Free hash table allocated by cmdbuf managed res mgr
  ALSA: hda - set input_path bitmap to zero after moving it to new place
  ALSA: hda - Fix endless loop of codec configure
  MIPS: Fix IRQ tracing & lockdep when rescheduling
  MIPS: pm-cps: Drop manual cache-line alignment of ready_count
  MIPS: Avoid accidental raw backtrace
  mm, swap_cgroup: reschedule when neeed in swap_cgroup_swapoff()
  drm/ast: Handle configuration without P2A bridge
  NFSv4: fix a reference leak caused WARNING messages
  netfilter: synproxy: fix conntrackd interaction
  netfilter: xt_TCPMSS: add more sanity tests on tcph->doff
  rtnetlink: add IFLA_GROUP to ifla_policy
  ipv6: Do not leak throw route references
  sfc: provide dummy definitions of vswitch functions
  net: 8021q: Fix one possible panic caused by BUG_ON in free_netdev
  decnet: always not take dst->__refcnt when inserting dst into hash table
  net/mlx5: Wait for FW readiness before initializing command interface
  ipv6: fix calling in6_ifa_hold incorrectly for dad work
  igmp: add a missing spin_lock_init()
  igmp: acquire pmc lock for ip_mc_clear_src()
  net: caif: Fix a sleep-in-atomic bug in cfpkt_create_pfx
  Fix an intermittent pr_emerg warning about lo becoming free.
  af_unix: Add sockaddr length checks before accessing sa_family in bind and connect handlers
  net: Zero ifla_vf_info in rtnl_fill_vfinfo()
  decnet: dn_rtmsg: Improve input length sanitization in dnrmg_receive_user_skb
  net: don't call strlen on non-terminated string in dev_set_alias()
  ipv6: release dst on error in ip6_dst_lookup_tail
  UPSTREAM: selinux: enable genfscon labeling for tracefs

Change-Id: I05ae1d6271769a99ea3817e5066f5ab6511f3254
Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>
2017-07-10 03:00:34 -07:00