Commit graph

595399 commits

Author SHA1 Message Date
Linux Build Service Account
b2fc2d0863 Merge "drm/mm: Fix NULL pointer dereference in allocator" 2017-12-18 15:25:02 -08:00
Linux Build Service Account
17d650383a Merge "drm/msm: Set proper GEM address space range for drm mm allocator" 2017-12-18 15:25:01 -08:00
Linux Build Service Account
c2e3a1a7e7 Merge "ARM: dts: msm: memory rework for gvm on msm8996" 2017-12-18 01:19:12 -08:00
Linux Build Service Account
b598eeb6bc Merge "serial: msm_serial_hs: Allow system suspend when no client is active" 2017-12-17 08:28:54 -08:00
Linux Build Service Account
02a73d4553 Merge "qseecom: support listener request from smcinvoke without reentrancy" 2017-12-16 00:56:46 -08:00
Linux Build Service Account
dd2fb75a0c Merge "qseecom: fix an issue when requested listener svc id does not exist" 2017-12-16 00:56:44 -08:00
Zhen Kong
f20c33ce06 qseecom: support listener request from smcinvoke without reentrancy
Add support to process listener request from smcinvoke when
reentrancy is disabled.

Change-Id: I2ce030cf6d5104ca2dec1402634a05d425e6d474
Signed-off-by: Zhen Kong <zkong@codeaurora.org>
2017-12-15 15:26:57 -08:00
Linux Build Service Account
0181952bf7 Merge "adv7481: Remove conditional compilation for PM functions" 2017-12-15 14:14:38 -08:00
Linux Build Service Account
89db7216b2 Merge "drm/msm: Correctly retrieve gpu's active power level" 2017-12-15 14:14:37 -08:00
Linux Build Service Account
62d6ead3ee Merge "ARM: dts: msm: blsp and sdhci switch to virtual clock on msm8996 vplatform" 2017-12-15 14:14:36 -08:00
Linux Build Service Account
5074886944 Merge "clk: msm: virtual clock adds support for usb, lpass and modem" 2017-12-15 14:14:35 -08:00
Linux Build Service Account
cfeef3fc55 Merge "msm: ipa: Fix to validate routing table index for filter exception" 2017-12-15 14:14:34 -08:00
Linux Build Service Account
f582d69d42 Merge "msm: mdss: Trigger idle fallback when no update due to touch" 2017-12-15 14:14:33 -08:00
Linux Build Service Account
6897701011 Merge "drivers: net: can: Add suspend/resume routine for CAN driver" 2017-12-15 14:14:32 -08:00
Linux Build Service Account
75bce4cd0b Merge "spi: spi_qsd: Poll for valid state after software Reset" 2017-12-15 14:14:31 -08:00
Zhen Kong
6348962fc5 qseecom: fix an issue when requested listener svc id does not exist
When listener svc id does not exist, the listener svc entry pointer
is actualy invalid, and should be set to NULL to avoid invalid pointer
deference on cache operation when sending listener resp to TZ.

Change-Id: I6af0c7405c9dc5dfe481396979023968a8324dd0
Signed-off-by: Zhen Kong <zkong@codeaurora.org>
2017-12-15 13:48:24 -08:00
Rahul Sharma
626fb980b0 adv7481: Remove conditional compilation for PM functions
Remove conditional compilation for power management functions,
so that suspend and resume are called always.

Change-Id: I6309df0d12db16c90a10127293bb2715cde15a29
Signed-off-by: Rahul Sharma <sharah@codeaurora.org>
2017-12-15 09:23:49 -08:00
Mohammed Javid
040963c813 msm: ipa: Fix to validate routing table index for filter exception
Fix to validate routing table index for filter action
IPA_PASS_TO_EXCEPTION case to avoid ipa assert
during commit filter rule.

Change-Id: I957f7ffc415ea1a042f6b3a948e94410d41b2262
Acked-by: Ashok Vuyyuru <avuyyuru@qti.qualcomm.com>
Signed-off-by: Mohammed Javid <mjavid@codeaurora.org>
2017-12-15 16:00:38 +05:30
Krishna Manikandan
4dab8ddb3c msm: mdss: Trigger idle fallback when no update due to touch
Trigger an idle fallback with a reasonable timeout value when
there is no update despite of a touch event and idle_time is 0.
This will reset the refresh rate to minimum fps.

CRs-Fixed: 2003247
Change-Id: I4a2964038f23984bf1ea39c63bf679d80ad12cba
Signed-off-by: Krishna Manikandan <mkrishn@codeaurora.org>
2017-12-15 14:49:50 +05:30
Mukesh Kumar Savaliya
85113f453f serial: msm_serial_hs: Allow system suspend when no client is active
In some cases, attempt to system resume imbalances the PM usage_count
which completely disables runtime PM callbacks of the device and suspend
doesn't happen.

Allow device to enter suspend through system PM when such condition met
and in addition do not suspend manually if runtime PM is disabled, let
auto suspend takes care of it.

Change-Id: I73df5804d47f551bfee97f43dbe772ee3774b399
Signed-off-by: Mukesh Kumar Savaliya <msavaliy@codeaurora.org>
2017-12-15 14:15:45 +05:30
Linux Build Service Account
df0c65ec10 Merge "Merge android-4.4.96 (aed4c54) into msm-4.4" 2017-12-14 23:58:53 -08:00
Yimin Peng
70830b4ce9 ARM: dts: msm: memory rework for gvm on msm8996
Split memory configuration for different projects.

Change-Id: I2928adb05dfe174a2d8413172ed10f4240f3f42d
Signed-off-by: Yimin Peng <yiminp@codeaurora.org>
2017-12-15 10:06:34 +08:00
Linux Build Service Account
db87e2310e Merge "ARM: dts: msm: Override vendor node entires in fstab for MSM8996ProAU" 2017-12-14 13:44:23 -08:00
Abinaya P
ec7744ab8c drivers: net: can: Add suspend/resume routine for CAN driver
Make the CAN interrupt as a wakeup capable interrupt and also add
suspend/resume routine to handle the suspend/resume states of
the device

Change-Id: I0e972f3c4b005b52fb8d2e03f83995ecd3c47538
Signed-off-by: Abinaya P <abinayap@codeaurora.org>
2017-12-14 10:57:33 -08:00
Dilip Kota
7dd15c2403 spi: spi_qsd: Poll for valid state after software Reset
For SPI slave, software reset performs long pulse
reset. Software should wait for QUP to be in valid
state before doing operations on QUP.

Change-Id: Ifbed295df87a6c5c383cedb431b368b3dffca676
Signed-off-by: Dilip Kota <dkota@codeaurora.org>
2017-12-14 20:41:51 +05:30
Linux Build Service Account
e16178f1c0 Merge "drivers: power: reset: Do cold reset when doing oem reboot" 2017-12-14 00:14:44 -08:00
Linux Build Service Account
55abb340e4 Merge "ARM: dts: msm: enable drm msm-hyp driver for msm8996" 2017-12-14 00:14:42 -08:00
Linux Build Service Account
0a4d142cf3 Merge "scsi: ufs: Trigger runtime-idle in a separate work" 2017-12-14 00:14:41 -08:00
Linux Build Service Account
19c73e7a34 Merge "dwc3-msm: Notify proper current values in case of floating charger" 2017-12-14 00:14:39 -08:00
Linux Build Service Account
517f7db9b0 Merge "net: cnss2: restore pci config space before enable device" 2017-12-14 00:14:38 -08:00
Linux Build Service Account
bd5f048ed1 Merge "power: smb-lib: fix OTG enable error handling" 2017-12-14 00:14:37 -08:00
Linux Build Service Account
4f3110700c Merge "ion: ensure CMO target is valid" 2017-12-14 00:14:35 -08:00
Venkateswara Rao Tadikonda
cd2f67b4b3 drm/mm: Fix NULL pointer dereference in allocator
While searching for first hole (get_first_hole) and next free hole
(get_next_hole) from rbtree, rb_first() and rb_next() functions may
return NULL pointer. A NULL pointer check can avoid the NULL pointer
dereference.

Change-Id: I21c918fff3ae995a9d8b2201030401d80ed1fd9e
Signed-off-by: Venkateswara Rao Tadikonda <vtadik@codeaurora.org>
2017-12-14 11:47:46 +05:30
Camus Wong
cb1d7b1c76 ARM: dts: msm: enable drm msm-hyp driver for msm8996
Enable virtual kernel drm driver for hypervisor environment for msm8996.

Change-Id: I6305e088e4b844d3f7dfe1620bd6d68cdaf6432f
Signed-off-by: Camus Wong <camusw@codeaurora.org>
2017-12-13 12:45:14 -05:00
Camus Wong
822f9b4e0b drm/msm-hyp: new virtual msm driver
This driver is enabled on hypervisor builds for the purpose of
creating a DRM device that DRM Master can open and listen on for
VBlank and Page Flip events.

Change-Id: Ib9b2df5ae0e2c33145663b3f515595e8f433a850
Signed-off-by: Camus Wong <camusw@codeaurora.org>
2017-12-13 12:37:20 -05:00
Asutosh Das
09460e0138 scsi: ufs: Trigger runtime-idle in a separate work
In case of an exception, there could be a deadlock:

-000|__switch_to()
-001|context_switch(inline)
-001|__schedule()
-002|schedule()
-003|schedule_timeout()
-004|do_wait_for_common(inline)
-004|__wait_for_common(inline)
-004|wait_for_common()
-005|wait_for_completion()
-006|destroy_work_on_stack(inline)
-006|flush_work()
-007|ufshcd_suspend()
-008|ufshcd_runtime_suspend()
-009|ufshcd_pltfrm_runtime_suspend()
-010|pm_generic_runtime_suspend()
-011|__rpm_callback(inline)
-011|rpm_callback()
-012|rpm_suspend()
-013|rpm_idle()
-014|__pm_runtime_idle()
-015|ufshcd_exception_event_handler()
-016|__read_once_size(inline)
-016|static_key_count(inline)
-016|static_key_false(inline)
-016|trace_workqueue_execute_end(inline)
-016|process_one_work()
-017|__read_once_size(inline)
-017|list_empty(inline)
-017|worker_thread()
-018|kthread()
-019|ret_from_fork(asm)

This is caused because in exception handler
pm_runtime_put_sync is invoked which calls ufshcd_suspend.
And ufshcd_suspend flushes the exception handler work
& deadlocks.
Hence, schedule the suspend work in a different context.

Change-Id: I02524cee5ab2b64e0ad5de873d5318aef7b6ac95
Signed-off-by: Asutosh Das <asutoshd@codeaurora.org>
Signed-off-by: Sayali Lokhande <sayalil@codeaurora.org>
2017-12-13 05:54:21 -08:00
Binoy Jayan
0bb9cafcb6 ARM: dts: msm: Override vendor node entires in fstab for MSM8996ProAU
Override the property fsmgr_flags by adding the options verify and
slotselect for the vendor node in the fstab so that A/B is enabled and the
partition is verified by the device mapper target dm-verity. Also delete
the system node from the fstab as it is already mounted by the kernel.

Change-Id: Ib65f1d261c95b995f3999ba24517a69488346ca9
Signed-off-by: Binoy Jayan <bjayan@codeaurora.org>
2017-12-13 19:17:23 +05:30
Venkateswara Rao Tadikonda
e90990f5b1 drm/msm: Set proper GEM address space range for drm mm allocator
GEM address space range provided to drm mm allocator is not correct.
Start address and size of the address space should be passed to drm mm
initializer. Instead of size, end address of address space range is
passed to drm mm initializer.
msm_gem_get_iova() returns 0, even if memory mapping to virtual
address space is failed. Return proper error value to user space
driver incase of error.

Change-Id: I356a63b873094cb465909437dcdab9513e27b7ff
Signed-off-by: Venkateswara Rao Tadikonda <vtadik@codeaurora.org>
2017-12-13 15:23:34 +05:30
Zhiqiang Tu
8ad90a90e5 clk: msm: virtual clock adds support for usb, lpass and modem
Support usb, lpass and modem clocks in msm8996 virtual clock
frontend driver.

Change-Id: I5ee4f2d951f133a8403442707e633563efdc5c65
Signed-off-by: Zhiqiang Tu <ztu@codeaurora.org>
2017-12-13 17:26:22 +08:00
Zhiqiang Tu
3b6fb95da8 ARM: dts: msm: blsp and sdhci switch to virtual clock on msm8996 vplatform
Enable virtual clock for uart, spi, i2c and sdhci.

Change-Id: Id0dd32c520eeb956390fb1e0e1a4f762c6ae47f9
Signed-off-by: Zhiqiang Tu <ztu@codeaurora.org>
2017-12-13 17:12:55 +08:00
Sai Krishna Juturi
ff9900827c dwc3-msm: Notify proper current values in case of floating charger
Currently our driver is notifying ETIMEDOUT to PMIC
incase of floating charger. Consider if we are inserting
an SDP charger slowly that time also we will detect
it as floating charger then also we are notifying
ETIMEDOUT irrespective of current that is notified from
gadget driver. Hence notify charging current properly
if enumeration happens even in case of
floating charger so that PMIC can update real charger
type to SDP

Signed-off-by: Sai Krishna Juturi <jsaikrishna@codeaurora.org>
Change-Id: Ibeeeafac0834c9df7099a3f0bad274ddb393de47
2017-12-13 00:54:13 -08:00
Linux Build Service Account
2e1be1a230 Merge "smb1351: add MODEL_NAME property in parallel power_supply" 2017-12-12 19:00:52 -08:00
Linux Build Service Account
627a89f9ea Merge "ARM: dts: msm: Change rh850 interrupt to gpio_122 on auto cdp boards" 2017-12-12 19:00:50 -08:00
Linux Build Service Account
71de11b9ad Merge "soc: qcom: pil: NULL check before pil_memset_io" 2017-12-12 19:00:49 -08:00
Linux Build Service Account
1ad856e85a Merge "drivers: lmh_dcvsh: Defer cluster cooling register until core comes online" 2017-12-12 19:00:48 -08:00
Linux Build Service Account
8063b54c23 Merge "usb: pd: qpnp-pdphy: move RX handling to hard IRQ" 2017-12-12 19:00:46 -08:00
Linux Build Service Account
d8a4ce0406 Merge "usb: pd: qpnp-pdphy: Remove rx_busy flag" 2017-12-12 19:00:45 -08:00
Linux Build Service Account
74a7a32d3e Merge "defconfig: msm: Enable CONFIG_INET_LRO" 2017-12-12 19:00:44 -08:00
Blagovest Kolenichev
3bda2b55b4 Merge android-4.4.96 (aed4c54) into msm-4.4
* refs/heads/tmp-aed4c54
  Linux 4.4.96
  Revert "drm: bridge: add DT bindings for TI ths8135"
  ecryptfs: fix dereference of NULL user_key_payload
  x86/microcode/intel: Disable late loading on model 79
  regulator: fan53555: fix I2C device ids
  can: kvaser_usb: Ignore CMD_FLUSH_QUEUE_REPLY messages
  can: kvaser_usb: Correct return value in printout
  can: sun4i: fix loopback mode
  scsi: sg: Re-fix off by one in sg_fill_request_table()
  scsi: zfcp: fix erp_action use-before-initialize in REC action trace
  assoc_array: Fix a buggy node-splitting case
  Input: gtco - fix potential out-of-bound access
  Input: elan_i2c - add ELAN0611 to the ACPI table
  xen/gntdev: avoid out of bounds access in case of partial gntdev_mmap()
  fuse: fix READDIRPLUS skipping an entry
  spi: uapi: spidev: add missing ioctl header
  usb: xhci: Handle error condition in xhci_stop_device()
  ceph: unlock dangling spinlock in try_flush_caps()
  ALSA: hda - fix headset mic problem for Dell machines with alc236
  ALSA: hda/realtek - Add support for ALC236/ALC3204
  workqueue: replace pool->manager_arb mutex with a flag
  sched: EAS: upmigrate misfit current task
  sched: avoid pushing tasks to an offline CPU
  sched: Extend active balance to accept 'push_task' argument
  Revert "sched/core: Warn if ENERGY_AWARE is enabled but data is missing"
  Revert "sched/core: fix have_sched_energy_data build warning"
  FROMLIST: kbuild: clang: fix build failures with sparse check
  Revert "Revert "UPSTREAM: efi/libstub/arm64: Set -fpie when building the EFI stub""
  BACKPORT: efi/libstub: Unify command line param parsing

Conflicts:
	drivers/usb/host/xhci-hub.c
	kernel/sched/core.c
	kernel/sched/fair.c

Change-Id: Ie36ce5de516f02b2d553043009d9afee64e7ff24
Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>
2017-12-12 14:25:27 -08:00
Linux Build Service Account
d3c7ac7bed Merge "ARM: dts: msm: Set values for MDM shutdown and reset on msm8996 CV2X" 2017-12-11 22:33:57 -08:00