Commit graph

591569 commits

Author SHA1 Message Date
Linux Build Service Account
1014096cda Merge "mm: avoid taking zone lock in pagetypeinfo_showmixed()" 2017-06-28 20:09:01 -07:00
Linux Build Service Account
04fdd6f571 Merge "icnss: Fix incorrect clean-up of stats" 2017-06-28 20:09:00 -07:00
Linux Build Service Account
e80ffe4ec7 Merge "icnss: Add specific statistics for PDR" 2017-06-28 20:08:59 -07:00
Linux Build Service Account
823d04d683 Merge "input: synaptics_dsx: validate bounds of intr_reg_num" 2017-06-28 11:59:58 -07:00
Linux Build Service Account
2a24534bf6 Merge "soc: qcom: glink_smem_native_xport: Allocate smem item in non cache region" 2017-06-28 11:59:58 -07:00
Linux Build Service Account
821524723a Merge "power: reset: msm: add support to select both dumps" 2017-06-28 11:59:57 -07:00
Linux Build Service Account
5901738d81 Merge "ARM: dts: msm: Update USB PHY0 parameters for SDA660/630 HDK platform" 2017-06-28 11:59:56 -07:00
Linux Build Service Account
c7773e1eca Merge "drm/msm: program hdr information to HDMI registers" 2017-06-28 11:59:55 -07:00
Linux Build Service Account
c6fd1ba1ad Merge "drm/msm/sde: add sde_connector kickoff callbacks" 2017-06-28 11:59:54 -07:00
Linux Build Service Account
62cf4dab17 Merge "soc: qcom: ipc_router: Improve IPC attribution" 2017-06-28 11:59:53 -07:00
Linux Build Service Account
9435c0d514 Merge "msm: camera: Fix a deadlock in power-up sequence of the I2C-TZ relay" 2017-06-28 11:59:52 -07:00
Linux Build Service Account
3a2719b7df Merge "msm: camera: isp: Set the sync mode to async" 2017-06-28 11:59:51 -07:00
Blagovest Kolenichev
0fc26d9423 Merge branch 'android-4.4@77ddb50' (v4.4.74) into 'msm-4.4'
* refs/heads/tmp-77ddb50:
  UPSTREAM: usb: gadget: f_fs: avoid out of bounds access on comp_desc
  Linux 4.4.74
  mm: fix new crash in unmapped_area_topdown()
  Allow stack to grow up to address space limit
  mm: larger stack guard gap, between vmas
  alarmtimer: Rate limit periodic intervals
  MIPS: Fix bnezc/jialc return address calculation
  usb: dwc3: exynos fix axius clock error path to do cleanup
  alarmtimer: Prevent overflow of relative timers
  genirq: Release resources in __setup_irq() error path
  swap: cond_resched in swap_cgroup_prepare()
  mm/memory-failure.c: use compound_head() flags for huge pages
  USB: gadgetfs, dummy-hcd, net2280: fix locking for callbacks
  usb: xhci: ASMedia ASM1042A chipset need shorts TX quirk
  drivers/misc/c2port/c2port-duramar2150.c: checking for NULL instead of IS_ERR()
  usb: r8a66597-hcd: decrease timeout
  usb: r8a66597-hcd: select a different endpoint on timeout
  USB: gadget: dummy_hcd: fix hub-descriptor removable fields
  pvrusb2: reduce stack usage pvr2_eeprom_analyze()
  usb: core: fix potential memory leak in error path during hcd creation
  USB: hub: fix SS max number of ports
  iio: proximity: as3935: recalibrate RCO after resume
  staging: rtl8188eu: prevent an underflow in rtw_check_beacon_data()
  mfd: omap-usb-tll: Fix inverted bit use for USB TLL mode
  x86/mm/32: Set the '__vmalloc_start_set' flag in initmem_init()
  serial: efm32: Fix parity management in 'efm32_uart_console_get_options()'
  mac80211: fix IBSS presp allocation size
  mac80211: fix CSA in IBSS mode
  mac80211/wpa: use constant time memory comparison for MACs
  mac80211: don't look at the PM bit of BAR frames
  vb2: Fix an off by one error in 'vb2_plane_vaddr'
  cpufreq: conservative: Allow down_threshold to take values from 1 to 10
  can: gs_usb: fix memory leak in gs_cmd_reset()
  configfs: Fix race between create_link and configfs_rmdir
  UPSTREAM: bpf: don't let ldimm64 leak map addresses on unprivileged
  BACKPORT: ext4: fix data exposure after a crash
  ANDROID: sdcardfs: remove dead function open_flags_to_access_mode()
  ANDROID: android-base.cfg: split out arm64-specific configs
  Linux 4.4.73
  sparc64: make string buffers large enough
  s390/kvm: do not rely on the ILC on kvm host protection fauls
  xtensa: don't use linux IRQ #0
  tipc: ignore requests when the connection state is not CONNECTED
  proc: add a schedule point in proc_pid_readdir()
  romfs: use different way to generate fsid for BLOCK or MTD
  sctp: sctp_addr_id2transport should verify the addr before looking up assoc
  r8152: avoid start_xmit to schedule napi when napi is disabled
  r8152: fix rtl8152_post_reset function
  r8152: re-schedule napi for tx
  nfs: Fix "Don't increment lock sequence ID after NFS4ERR_MOVED"
  ravb: unmap descriptors when freeing rings
  drm/ast: Fixed system hanged if disable P2A
  drm/nouveau: Don't enabling polling twice on runtime resume
  parisc, parport_gsc: Fixes for printk continuation lines
  net: adaptec: starfire: add checks for dma mapping errors
  pinctrl: berlin-bg4ct: fix the value for "sd1a" of pin SCRD0_CRD_PRES
  gianfar: synchronize DMA API usage by free_skb_rx_queue w/ gfar_new_page
  net/mlx4_core: Avoid command timeouts during VF driver device shutdown
  drm/nouveau/fence/g84-: protect against concurrent access to semaphore buffers
  drm/nouveau: prevent userspace from deleting client object
  ipv6: fix flow labels when the traffic class is non-0
  FS-Cache: Initialise stores_lock in netfs cookie
  fscache: Clear outstanding writes when disabling a cookie
  fscache: Fix dead object requeue
  ethtool: do not vzalloc(0) on registers dump
  log2: make order_base_2() behave correctly on const input value zero
  kasan: respect /proc/sys/kernel/traceoff_on_warning
  jump label: pass kbuild_cflags when checking for asm goto support
  PM / runtime: Avoid false-positive warnings from might_sleep_if()
  ipv6: Fix IPv6 packet loss in scenarios involving roaming + snooping switches
  i2c: piix4: Fix request_region size
  sierra_net: Add support for IPv6 and Dual-Stack Link Sense Indications
  sierra_net: Skip validating irrelevant fields for IDLE LSIs
  net: hns: Fix the device being used for dma mapping during TX
  NET: mkiss: Fix panic
  NET: Fix /proc/net/arp for AX.25
  ipv6: Inhibit IPv4-mapped src address on the wire.
  ipv6: Handle IPv4-mapped src to in6addr_any dst.
  net: xilinx_emaclite: fix receive buffer overflow
  net: xilinx_emaclite: fix freezes due to unordered I/O
  Call echo service immediately after socket reconnect
  staging: rtl8192e: rtl92e_fill_tx_desc fix write to mapped out memory.
  ARM: dts: imx6dl: Fix the VDD_ARM_CAP voltage for 396MHz operation
  partitions/msdos: FreeBSD UFS2 file systems are not recognized
  s390/vmem: fix identity mapping
  usb: gadget: f_fs: Fix possibe deadlock

Conflicts:
	drivers/usb/gadget/function/f_fs.c

Change-Id: I23106e9fc2c4f2d0b06acce59b781f6c36487fcc
Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>
2017-06-28 10:03:23 -07:00
tharun kumar
b213d8a28b ARM: dts: msm: Add remote debugger device configuration for sdm660
Adding remote debugger device configuration. The Remote Debugger driver
allows a debugger running on a host PC to communicate with a remote
stub running on peripheral subsystems.

Change-Id: I89e686c7e049a9fc8e1b6173ce009333df5b4ca1
Acked-by: Chenna Kesava Raju <chennak@qti.qualcomm.com>
Signed-off-by: Tharun Kumar Merugu <mtharu@codeaurora.org>
2017-06-28 04:50:04 -07:00
Dhoat Harpal
1cc3948d8b soc: qcom: glink_smem_native_xport: Allocate smem item in non cache region
rx fifo is allocated in cached region of smem, this leads to
inconsistency when reading at remote side.

rx fifo is allocated in non cached region of smem.

CRs-Fixed: 2056955
Change-Id: I0c7d5bf55222920cffdcd2c7f48968a4f49ee790
Signed-off-by: Dhoat Harpal <hdhoat@codeaurora.org>
2017-06-28 17:13:36 +05:30
Linux Build Service Account
84c69cb5aa Merge "ARM: dts: msm: Disable adv7481 on Mojave lite platform" 2017-06-28 04:35:58 -07:00
Linux Build Service Account
49472a4970 Merge "ARM: dts: msm: Enable ACD functionality for SDM660 silver cluster" 2017-06-28 04:35:57 -07:00
Linux Build Service Account
c6704cbfaf Merge "perf: stop deadlock if attempt to bring cpu up fails" 2017-06-28 04:35:56 -07:00
Linux Build Service Account
272ee3f114 Merge "soc: qcom: avoid calling sleeping functions in interrupt context" 2017-06-28 04:35:55 -07:00
Linux Build Service Account
4b5f18dc54 Merge "ARM: dts: msm: Change headset jack configuration for apq8098 mediabox" 2017-06-28 04:35:54 -07:00
Linux Build Service Account
00be8b5375 Merge "msm: rmnet_ipa3: fix QMAP command xfer" 2017-06-28 04:35:53 -07:00
Linux Build Service Account
1b7d2301c4 Merge "msm: sensor: Fix for variable being de-referenced without proper check" 2017-06-28 04:35:52 -07:00
Sahitya Tummala
2ccfe717e4 ARM: dts: msm: update rmtfs shared memory address for SDM660/630
Use reserved memory as shared memory between apps and modem for
writing modem data using rmt_storage service on apps.

Change-Id: I0e5bc8b1e3dbe2f8d49686894667b4a6ee1a3529
Signed-off-by: Sahitya Tummala <stummala@codeaurora.org>
2017-06-28 16:44:22 +05:30
tharun kumar
d565f916a8 defconfig: msm: enable remote debugger driver
Adding remote debugger device configuration. The Remote Debugger driver
allows a debugger running on a host PC to communicate with a remote
stub running on peripheral subsystems.

Change-Id: I14b3ef92e96819d119af335691e8902eb3b0178c
Acked-by: Chenna Kesava Raju <chennak@qti.qualcomm.com>
Signed-off-by: tharun kumar <mtharu@codeaurora.org>
2017-06-28 04:11:37 -07:00
Lingutla Chandrasekhar
f4beb49226 power: reset: msm: add support to select both dumps
With Minidump support enabled, user may need to request
to dump both fulldump as well as minidump for debug purpose.

Add support on dload_mode sysfs entry to select both dumps.
Enable both dumps with command:
	echo both > /sys/kernel/dload/dload_mode

Change-Id: I2f7c4c6e26dc236c75ab89490990c87b7139880b
Signed-off-by: Lingutla Chandrasekhar <clingutla@codeaurora.org>
2017-06-28 14:42:39 +05:30
Vinayak Menon
7128b46468 mm: avoid taking zone lock in pagetypeinfo_showmixed()
pagetypeinfo_showmixedcount_print is found to take a lot of time to
complete and it does this holding the zone lock and disabling interrupts.
In some cases it is found to take more than a second (On a 2.4GHz,8Gb
RAM,arm64 cpu).  Avoid taking the zone lock similar to what is done by
read_page_owner, which means possibility of inaccurate results.

Change-Id: I11ec4a3a445d602e47fcc18a3e40480b74ad98af
Link: http://lkml.kernel.org/r/1498045643-12257-1-git-send-email-vinmenon@codeaurora.org
Acked-by: Vlastimil Babka <vbabka@suse.cz>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: zhongjiang <zhongjiang@huawei.com>
Cc: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
Cc: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Mel Gorman <mgorman@techsingularity.net>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Cc: David Rientjes <rientjes@google.com>
Cc: Minchan Kim <minchan@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Git-commit: a94b5fd913ac55a32fe05dfba21eb6af0e539781
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
[vinmenon@codeaurora.org: fix trivial merge conflicts]
Signed-off-by: Vinayak Menon <vinmenon@codeaurora.org>
2017-06-28 10:44:10 +05:30
Linux Build Service Account
f2485229cd Merge " base: firmware: add /lib64/firmware to firmware loading path" 2017-06-27 22:10:51 -07:00
Animesh Kishore
69c24a9096 msm: sde: Cache capture fence descriptor
Generate and cache fence file descriptor. Multiple
ioctl calls return cached value.

Change-Id: I60d1b46b04007899c9ed983aafc5d0dd3e13312a
Depends-On: Ic83d93fd3c7f404774007065df02b402adbf80af
Signed-off-by: Animesh Kishore <animeshk@codeaurora.org>
2017-06-28 10:28:47 +05:30
Neil Leeder
5f71e693df perf: stop deadlock if attempt to bring cpu up fails
When an attempt is made to free an event on a CPU which is
no longer online, perf tries to bring the CPU online. This
can fail, resulting in an UP_CANCELLED notifier, which
eventually tries to acquire the ctx->mutex which is already
being held by the code, which brings up the CPU.

Removing the attempt to bring the cpu up will remove this
deadlock, but also requires temporarily removing support of
counting events across hotplug. This will be restored in a
later patch.

Conflicts:
	kernel/events/core.c
	kernel/events/hw_breakpoint.c

Change-Id: Iaafa3c6688d26508857472fd5bb32139a137880e
Signed-off-by: Neil Leeder <nleeder@codeaurora.org>
2017-06-28 10:09:20 +05:30
Shiju Mathew
8fcb6249ad ARM: dts: msm: Disable adv7481 on Mojave lite platform
On Mojave lite, adv7481 hardware is not available hence
disable adv7481 and bridge abstraction driver.

CRs-Fixed: 1097877
Change-Id: I1969fc45e50f5ddff25fd70780458d23a9abeed8
Signed-off-by: Shiju Mathew <shijum@codeaurora.org>
2017-06-27 21:19:16 -07:00
Tirupathi Reddy
791e28b55c ARM: dts: msm: Enable ACD functionality for SDM660 silver cluster
The adaptive clock distribution (ACD) mitigates the impact of
high-frequency supply voltage (VDD) droops on microprocessor
performance.

Program ACD functional configuration for silver cluster of sdm660.

Also add the voltage margin savings with ACD to the existing
APC0 CPR closed-loop voltage margins.

Also set CPR_RAMP_EN and VCTL_RAMP_EN bits to 1 in AVS control
register of silver cluster.

Change-Id: Iaff7769cd1e71bbeb773658d0649092bff6e8916
Signed-off-by: Tirupathi Reddy <tirupath@codeaurora.org>
2017-06-28 08:25:26 +05:30
Linux Build Service Account
be58516a4e Merge "drm/msm: pass the HDR metadata sent from userspace to sink" 2017-06-27 17:07:45 -07:00
Abhinav Kumar
dc0487cb90 drm/msm: program hdr information to HDMI registers
HDR metadata information is passed down from userspace
based on the HDR frame.

Program these properties to relevant HDMI registers
using the pre_kickoff callback registered for the
DRM HDMI connector.

This ensures that HDR information is updated on a
per-frame basis to the sink.

Change-Id: I20c4018316329b1b35a11b8ab4b96e923b3abb3a
Signed-off-by: Abhinav Kumar <abhinavk@codeaurora.org>
2017-06-27 15:54:20 -07:00
Abhinav Kumar
53e6241467 drm/msm/sde: add sde_connector kickoff callbacks
Add a callback into the connector framework to allow sending
per-frame parameters at kickoff time.

This is needed to support the HDR feature where the HDR
metadata shall be sent to the sink on a per-frame basis.

Change-Id: I48a3616509e2226ea9bf0f490f0f47873ca74781
Signed-off-by: Abhinav Kumar <abhinavk@codeaurora.org>
2017-06-27 15:53:17 -07:00
Skylar Chang
eda316b410 msm: rmnet_ipa3: fix QMAP command xfer
Fix QMAP command packets TX to modem.
These packets needs to be sent to Q6_WAN_CONS pipe.

Change-Id: Ib718ad7308004ba7727e30e64f4b50bf4e521da3
CRs-Fixed: 2068048
Acked-by: Ady Abraham <adya@qti.qualcomm.com>
Signed-off-by: Skylar Chang <chiaweic@codeaurora.org>
2017-06-27 15:17:41 -07:00
Abhinav Kumar
79d9dc2c13 drm/msm: pass the HDR metadata sent from userspace to sink
Use metadata information sent from userspace to configure sink.

This info shall be used later on to program the HDMI specific
infoframe registers.

Change-Id: I26634452d8c3ab7ab49a65e89ad52a3961c64855
Signed-off-by: Abhinav Kumar <abhinavk@codeaurora.org>
2017-06-27 12:42:49 -07:00
Narendra Muppalla
7b9a88971a drm/msm/sde: add kernel traces to measure enable/disable/kickoff times
Add kernel debug traces in drm to measure the performance of
the driver during enable/disable/commit/kickoff.

Change-Id: I7122e81b2c320f05bb42091971827908b7c6436f
Signed-off-by: Narendra Muppalla <NarendraM@codeaurora.org>
2017-06-27 09:55:13 -07:00
Linux Build Service Account
35589846a0 Merge "ARM: dts: msm: Defer regulator disable for msm8998 GPU SMMU" 2017-06-27 09:42:11 -07:00
Linux Build Service Account
ab8be1a139 Merge "soc: qcom: glink_pkt: fix number of intent queued" 2017-06-27 09:42:10 -07:00
Linux Build Service Account
d4651ed76d Merge "cnss_pci: fix the race condition in firmware file setup" 2017-06-27 09:42:09 -07:00
Linux Build Service Account
d57c4325fe Merge "drm/msm/sde: fix color component order in sde" 2017-06-27 09:42:08 -07:00
Ramprasad Katkam
2e12256018 ARM: dts: msm: Change headset jack configuration for apq8098 mediabox
apq8098-mediabox form factor does not support headset detection, and
detection pin is floating. Hence change headset jack type to normally
open to avoid fake mbhc interrupts.

Change-Id: I0798ec425ee97f75a243462273fe84de8ed63ee3
Signed-off-by: Ramprasad Katkam <katkam@codeaurora.org>
2017-06-27 06:45:43 -07:00
Linux Build Service Account
fbb8507e77 Merge "lpm-levels: Remove IPI check on hot plugged cores" 2017-06-27 04:28:25 -07:00
Linux Build Service Account
89279350de Merge "fs/mbcache: fix mb_cache_lru_list corruption" 2017-06-27 04:28:24 -07:00
Linux Build Service Account
47d50db7ee Merge "power: qpnp-smb2: Unset ONLINE for UNKNOWN USB charger type" 2017-06-27 04:28:23 -07:00
Linux Build Service Account
ca79f2d777 Merge "btfm: Enable multichannel bit for SCO Rx" 2017-06-27 04:28:23 -07:00
Linux Build Service Account
5728dc4956 Merge "drm/msm/sde: expose 10 bit pixel format capabilities" 2017-06-27 04:28:19 -07:00
Linux Build Service Account
0563256535 Merge "drm/msm: add sink capabilities for HDR support" 2017-06-27 04:28:18 -07:00
Linux Build Service Account
b878a7b799 Merge "msm: camera: Fix Use after free bug in msm_vb2.c" 2017-06-27 04:28:17 -07:00
Linux Build Service Account
e6c4852492 Merge "ARM: dts: msm: add non-removable ufs/emmc property for msm8996" 2017-06-27 04:28:16 -07:00