Commit graph

595078 commits

Author SHA1 Message Date
Vijayavardhan Vennapusa
5a70436579 ARM: dts: msm: Change QDSS pipe index to 3 for SDM660
Currently same pipe index is used for both QDSS and DPL pipes for SDM660.
This causes QDSS not working in composition 90DB having both QDSS and DPL
interfaces. Hence fix it by changing QDSS pipe index to 3 so that both
QDSS and DPL works fine with 90DB composition on SDM660.

Change-Id: I7c799716cff7321985fcb88a8073737343a932f5
Signed-off-by: Vijayavardhan Vennapusa <vvreddy@codeaurora.org>
2017-11-06 21:58:44 -08:00
Zhiqiang Tu
eb883038ce ARM: dts: msm: Add sdhc_2 on msm8996 virtual platform
Add sdhc_2 on msm8996 virtual platform for SDIO WLAN.

Change-Id: Ic021ca67507af88a2c98eac4d5b4c10c3300f1a9
Signed-off-by: Zhiqiang Tu <ztu@codeaurora.org>
2017-11-07 13:56:18 +08:00
Vijay kumar Tumati
02f4c7a910 msm: camera: Check step position table for NULL pointer
Before accessing step position table we need to make sure
its valid.

Change-Id: I914a51861e982d556039e5ba8510a67cab69fb82
Signed-off-by: Vijay kumar Tumati <vtumati@codeaurora.org>
2017-11-07 10:55:14 +05:30
Zhiqiang Tu
aaee453657 defconfig: arm64: msm: Enable MMC on msm8996 virtual plaform
Enable MMC to support SDIO pass-through on virtual platform.

Change-Id: I808510d6d30ea780f3936c4eba98bb6e3e637050
Signed-off-by: Zhiqiang Tu <ztu@codeaurora.org>
2017-11-06 19:23:06 -08:00
Blagovest Kolenichev
985aecee1d Merge android-4.4@ceee5bd (v4.4.95) into msm-4.4
* refs/heads/tmp-ceee5bd
  BACKPORT: arm64: relocatable: suppress R_AARCH64_ABS64 relocations in vmlinux
  sched/core: fix have_sched_energy_data build warning
  sched/core: Warn if ENERGY_AWARE is enabled but data is missing
  sched: walt: Correct WALT window size initialization
  FROMLIST: sched/fair: Use wake_q length as a hint for wake_wide
  sched: WALT: account cumulative window demand
  sched/fair: remove useless variable in find_best_target
  sched/tune: access schedtune_initialized under CGROUP_SCHEDTUNE
  sched/fair: consider task utilization in group_max_util()
  sched/fair: consider task utilization in group_norm_util()
  sched/fair: enforce EAS mode
  sched/fair: ignore backup CPU when not valid
  sched/fair: trace energy_diff for non boosted tasks
  UPSTREAM: sched/fair: Sync task util before slow-path wakeup
  UPSTREAM: sched/fair: Fix usage of find_idlest_group() when the local group is idlest
  UPSTREAM: sched/fair: Fix usage of find_idlest_group() when no groups are allowed
  BACKPORT: sched/fair: Fix find_idlest_group when local group is not allowed
  UPSTREAM: sched/fair: Remove unnecessary comparison with -1
  BACKPORT: sched/fair: Move select_task_rq_fair slow-path into its own function
  UPSTREAM: sched/fair: Force balancing on nohz balance if local group has capacity
  UPSTREAM: sched/core: Add missing update_rq_clock() call in set_user_nice()
  UPSTREAM: sched/core: Add missing update_rq_clock() call for task_hot()
  UPSTREAM: sched/core: Add missing update_rq_clock() in detach_task_cfs_rq()
  UPSTREAM: sched/core: Add missing update_rq_clock() in post_init_entity_util_avg()
  UPSTREAM: sched/core: Fix find_idlest_group() for fork
  BACKPORT: sched/fair: Fix PELT integrity for new tasks
  BACKPORT: sched/cgroup: Fix cpu_cgroup_fork() handling
  UPSTREAM: sched/fair: Fix and optimize the fork() path
  BACKPORT: sched/fair: Make it possible to account fair load avg consistently
  cpufreq/sched: Consider max cpu capacity when choosing frequencies
  Linux 4.4.95
  FS-Cache: fix dereference of NULL user_key_payload
  fscrypto: require write access to mount to set encryption policy
  KEYS: Fix race between updating and finding a negative key
  fscrypt: fix dereference of NULL user_key_payload
  f2fs crypto: add missing locking for keyring_key access
  f2fs crypto: replace some BUG_ON()'s with error checks
  sched/autogroup: Fix autogroup_move_group() to never skip sched_move_task()
  parisc: Fix double-word compare and exchange in LWS code on 32-bit kernels
  parisc: Avoid trashing sr2 and sr3 in LWS code
  pkcs7: Prevent NULL pointer dereference, since sinfo is not always set.
  KEYS: don't let add_key() update an uninstantiated key
  lib/digsig: fix dereference of NULL user_key_payload
  KEYS: encrypted: fix dereference of NULL user_key_payload
  rtlwifi: rtl8821ae: Fix connection lost problem
  clockevents/drivers/cs5535: Improve resilience to spurious interrupts
  bus: mbus: fix window size calculation for 4GB windows
  brcmsmac: make some local variables 'static const' to reduce stack size
  i2c: ismt: Separate I2C block read from SMBus block read
  ALSA: hda: Remove superfluous '-' added by printk conversion
  ALSA: seq: Enable 'use' locking in all configurations
  drm/nouveau/mmu: flush tlbs before deleting page tables
  drm/nouveau/bsp/g92: disable by default
  can: esd_usb2: Fix can_dlc value for received RTR, frames
  usb: musb: Check for host-mode using is_host_active() on reset interrupt
  usb: musb: sunxi: Explicitly release USB PHY on exit
  can: gs_usb: fix busy loop if no more TX context is available
  ALSA: usb-audio: Add native DSD support for Pro-Ject Pre Box S2 Digital
  usb: hub: Allow reset retry for USB2 devices on connect bounce
  usb: quirks: add quirk for WORLDE MINI MIDI keyboard
  usb: cdc_acm: Add quirk for Elatec TWN3
  USB: serial: metro-usb: add MS7820 device id
  USB: core: fix out-of-bounds access bug in usb_get_bos_descriptor()
  USB: devio: Revert "USB: devio: Don't corrupt user memory"
  ANDROID: binder: show high watermark of alloc->pages.
  ANDROID: binder: Add thread->process_todo flag.
  UPSTREAM: arm64: compat: Remove leftover variable declaration
  ANDROID: sched/fair: Select correct capacity state for energy_diff
  Revert "UPSTREAM: efi/libstub/arm64: Set -fpie when building the EFI stub"
  cpufreq: schedutil: clamp util to CPU maximum capacity
  FROMLIST: android: binder: Fix null ptr dereference in debug msg
  FROMLIST: android: binder: Change binder_shrinker to static
  cpufreq/sched: Use cpu max freq rather than policy max

Conflicts:
	include/linux/sched.h
	kernel/sched/core.c
	kernel/sched/fair.c

Change-Id: I2751f851df741f00e797deaf2119872b3dced655
Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>
2017-11-06 15:58:47 -08:00
Blagovest Kolenichev
22b1828145 sched: restore discarded ifdef CONFIG_SCHED_WALT code
Code closed in ifdef CONFIG_SCHED_WALT blocks is not used in
msm-4.4 builds, hence in order to be as much as closer to
upstream and subsequently to have less merge conflicts in the
future, let's restore this code.

Restore below CONFIG_SCHED_WALT changes in file [1]:

  be832f6 sched: walt: Leverage existing
  ^^^^^^^ Discarded in dbad9b8.

  efb86bd sched: Introduce Window Assisted Load Tracking (WALT)
  ^^^^^^^ Restore only the block, which is modified by be832f6.
          Discarded in efbe378.

dbad9b8 Merge android-4.4@89074de (v4.4.94) into msm-4.4
efbe378 Merge branch 'v4.4-16.09-android-tmp' into lsk-v4.4-16.09-android

[1] kernel/sched/sched.h

Change-Id: Ifd7e230b3b47dde61abf2472f092ff78d80b7427
Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>
2017-11-06 15:39:25 -08:00
Linux Build Service Account
91da619c3a Merge "ARM: dts: msm: Remove GPIO pins that are unused on Mojave" 2017-11-06 11:49:30 -08:00
Linux Build Service Account
69b148a089 Merge "soc: qcom: pil: Fix error handling during PIL driver probe" 2017-11-06 11:49:30 -08:00
Linux Build Service Account
14371aded9 Merge "net🛜cnss2: Fix driver loading failure" 2017-11-06 11:49:29 -08:00
Rahul Sharma
cc3e07b2c3 ARM: dts: msm: Remove GPIO pins that are unused on Mojave
cam_snapshot and cam_focus GPIO pins are unused on Mojave,
thus remove them from DT. Those pins are used for ADV7481
on Mojave.

Change-Id: I8c0026a215fdc2cf1aa94eb763f82258229435c8
Suggested-by: Resmi Rajendran <resmir@qti.qualcomm.com>
Signed-off-by: Rahul Sharma <sharah@codeaurora.org>
2017-11-06 06:59:01 -08:00
Camus Wong
4bf823c3a8 ARM: dts: msm: Remove the virtual plane implementation on msm8996
Virtual plane limited the usage of plane on assigned display only.
It is against the implementation in strategy manager in SDM, which
assume any plane can be used by any display.

Change-Id: Iddcb94d888dfa1ec7685f2964116b4296a0e9a7f
Signed-off-by: Camus Wong <camusw@codeaurora.org>
Signed-off-by: Rahul Sharma <sharah@codeaurora.org>
2017-11-06 16:34:13 +05:30
Linux Build Service Account
59e7cfaf52 Merge "soc: qcom: Add support for QDSS bridge driver" 2017-11-05 22:33:09 -08:00
Linux Build Service Account
22cfc3487c Merge "defconfig: sdm660: Enable sdcardfs" 2017-11-05 22:33:08 -08:00
Linux Build Service Account
a1b1b96ce3 Merge "soc: qcom: glink_smem_native_xport: Add readback to write index" 2017-11-05 22:33:06 -08:00
Linux Build Service Account
513fd626d6 Merge "msm: kgsl: Add property to determine commands timeout" 2017-11-05 22:33:05 -08:00
Linux Build Service Account
551738a812 Merge "soc: qcom: glink_ssr: Use do_cleanup_data from pkt_priv" 2017-11-05 22:33:04 -08:00
Linux Build Service Account
59703730f6 Merge "cnss2: Add device pointer to all external APIs" 2017-11-05 22:33:03 -08:00
Linux Build Service Account
f1091db4f4 Merge "wil6210: missing length check in wil_cfg80211_mgmt_tx" 2017-11-05 22:32:59 -08:00
Linux Build Service Account
3c8af478e3 Merge "ARM: dts: msm: Add GPU maximum frequency 430Mhz support for SDM636" 2017-11-05 22:32:59 -08:00
Linux Build Service Account
982c01bee6 Merge "defconfig: msmcortex: Enable sdcardfs" 2017-11-05 22:32:58 -08:00
Linux Build Service Account
0d6ccec7eb Merge "spi: core: Extract of_spi_parse_dt()" 2017-11-05 22:32:57 -08:00
Linux Build Service Account
da82750992 Merge "ARM: dts: msm: Add base register property for lpass and turing for sdm660" 2017-11-05 22:32:55 -08:00
Linux Build Service Account
e6754b0406 Merge "msm: kgsl: Print Vulkan memory types as well" 2017-11-05 22:32:54 -08:00
Linux Build Service Account
b147b4588b Merge "defconfig: msm: enable DRM driver for msm8996" 2017-11-05 22:32:53 -08:00
Linux Build Service Account
328319f28a Merge "icnss: Check for FW_READY state before sending uevent in PD notifier" 2017-11-05 22:32:52 -08:00
Linux Build Service Account
2dedf76547 Merge "ath: Disable non-20 mhz 2G world regulatory channels" 2017-11-05 22:32:51 -08:00
Linux Build Service Account
99b30615eb Merge "diag: Handle data ready notification properly" 2017-11-05 22:32:50 -08:00
Linux Build Service Account
b6f12218b5 Merge "power: qpnp-fg-gen3: Fine tune the monotonic SOC calculation" 2017-11-05 22:32:49 -08:00
Linux Build Service Account
697888e330 Merge "defconfig: Enable DFS support for ath10k" 2017-11-05 22:32:48 -08:00
Linux Build Service Account
aa00b1c16d Merge "clk: qcom: Add support for 430MHz for gpu clock on sdm660" 2017-11-05 22:32:47 -08:00
Linux Build Service Account
efa374d7b2 Merge "SoC: msm: Support SEC_MI2S_RX" 2017-11-05 22:32:45 -08:00
Linux Build Service Account
0a9e5f9137 Merge "leds: qpnp-wled: Fix configuration for AMOLED mode" 2017-11-05 22:32:43 -08:00
Linux Build Service Account
67dcc348d7 Merge "leds: qpnp-wled: Disable module permanently when OVP fault persists" 2017-11-05 22:32:43 -08:00
Linux Build Service Account
c6846de733 Merge "leds: qpnp-wled: Configure WLED1_CTRL_SWITCHING_FREQUENCY selectively" 2017-11-05 22:32:42 -08:00
Ritesh Harjani
4f633c283f defconfig: sdm660: Enable sdcardfs
This enables sdcardfs for sdm660.

Change-Id: I5621743809caf9a3bbe1deda38681b9c9bcccb99
Signed-off-by: Ritesh Harjani <riteshh@codeaurora.org>
2017-11-05 19:24:46 -08:00
Linux Build Service Account
7777cc93db Merge "power: qpnp-fg-gen3: Skip the status_change work if suspended" 2017-11-03 21:45:05 -07:00
Linux Build Service Account
96bbdb7e76 Merge "memblock: Fix memblock_overlaps_memory()" 2017-11-03 21:45:03 -07:00
Yue Ma
c10f99af82 cnss2: Add device pointer to all external APIs
Add device pointer to all external APIs so that platform driver is
able to support multiple devices/instances at the same time.

Change-Id: I09dfb146da30d3fd6514dc79dc31cd239a03afa8
Signed-off-by: Yue Ma <yuem@codeaurora.org>
2017-11-03 10:28:20 -07:00
Yue Ma
f76f50c672 cnss2: Remove deprecated API
cnss_set_driver_status() is no longer needed by WLAN host driver.
Hence remove it from platform driver.

Change-Id: I31a3174bdded924a9279a40ece05a835277e4626
Signed-off-by: Yue Ma <yuem@codeaurora.org>
2017-11-03 10:27:53 -07:00
Dhoat Harpal
091090e84f soc: qcom: glink_smem_native_xport: Add readback to write index
Writing data to DDR is not ensured to be completed even with addition
of data memory barrier. It is possible that CPU receive that write
instruction is completed but in reality data can be stuck in intermediate
buffer.

Readback of write index is added to ensure that remote side is sent
interrupt only after data is written on DDR.

CRs-Fixed: 2136645
Change-Id: I32c4967daf71991621b57421167e0ac8d38ce065
Signed-off-by: Dhoat Harpal <hdhoat@codeaurora.org>
2017-11-03 21:48:35 +05:30
Lior David
3d38ac71cc wil6210: missing length check in wil_cfg80211_mgmt_tx
Add a length check in wil_cfg80211_mgmt_tx to detect unsigned integer
overflow.

Change-Id: I37f988481433a2e1238831980715aef32aa89a85
Signed-off-by: Lior David <liord@codeaurora.org>
2017-11-03 09:08:23 -07:00
Lior David
6e5a9b3250 wil6210: missing length check in wmi_set_ie
Add a length check in wmi_set_ie to detect unsigned integer
overflow.

Change-Id: Id1ec6a6218f3fe6e00cc3f9a8e674f8f843273f2
Signed-off-by: Lior David <liord@codeaurora.org>
2017-11-03 09:06:54 -07:00
Lior David
5c9c0841e5 wil6210: add block size checks during FW load
When loading FW from file add block size checks to ensure a
corrupted FW file will not cause the driver to write outside
the device memory.

Change-Id: I6d7342cd33b2c47b701bcca4ee3cd84febbc56a2
Signed-off-by: Lior David <liord@codeaurora.org>
2017-11-03 09:05:20 -07:00
Lior David
59bd12d370 wil6210: fix length check in __wmi_send
The current length check:
sizeof(cmd) + len > r->entry_size
will allow very large values of len (> U16_MAX - sizeof(cmd))
and can cause a buffer overflow. Fix the check to cover this case.
In addition, ensure the mailbox entry_size is not too small,
since this can also bypass the above check.

Change-Id: Iecb4f53ef05da0e015bc954b57b0e40debb7c8b7
Signed-off-by: Lior David <liord@codeaurora.org>
2017-11-03 09:02:13 -07:00
Linux Build Service Account
fc86e52281 Merge "Merge android-4.4@89074de (v4.4.94) into msm-4.4" 2017-11-03 07:04:47 -07:00
Linux Build Service Account
3c586a777b Merge "serial: msm_serial_hs: Do not accept Rx Data till the Rx pipe connect" 2017-11-03 07:04:46 -07:00
Hareesh Gundu
ad76dbd362 ARM: dts: msm: Add GPU maximum frequency 430Mhz support for SDM636
SDM636 inherits all SDM660 GPU properties, but it will support
GPU max frequency 430Mhz and DDR max frequency 1353Mhz.

Change-Id: I7f88e5d187df2880757ceb6676e75f3cfe5d9218
Signed-off-by: Hareesh Gundu <hareeshg@codeaurora.org>
2017-11-03 06:36:14 -07:00
Dhoat Harpal
e237404021 soc: qcom: glink_ssr: Use do_cleanup_data from pkt_priv
do_cleanup_data pointer is created for every SSR notification and
stored in cb_data. It is possible that the stored pointer can be
overwritten if two peripherals SSR happens at the same time.

Use do_cleanup_data pointer directly in pkt_priv, instead of
dereferencing from cb_data.

CRs-Fixed: 2121529
Change-Id: Ife68cdc460c0628623dea6827632b8acd8d1d955
Signed-off-by: Dhoat Harpal <hdhoat@codeaurora.org>
2017-11-03 16:46:18 +05:30
Ritesh Harjani
ea65e36e9d defconfig: msmcortex: Enable sdcardfs
This patch enables sdcardfs for msmcortex.

Change-Id: Icf3105c0080a35c2ead663decf4340647ac64b67
Signed-off-by: Ritesh Harjani <riteshh@codeaurora.org>
2017-11-03 04:11:26 -07:00
Praveen Chavan
3b7705d676 msm: vidc: Fix instance formats initialization issue
Currently, in instance init, CAPTURE and OUTPUT formats are copied
from fixed indices. When formats struct enhanced with new formats,
it is possible to assign CAPTURE format on OUTPUT port. Hence derive
the formats with fourcc.

CRs-Fixed: 2048564
Change-Id: I6c31b1c68797dec9c7fbe58afc10be1221a20a6d
Signed-off-by: Praneeth Paladugu <ppaladug@codeaurora.org>
Signed-off-by: Santhosh Behara <santhoshbehara@codeaurora.org>
Signed-off-by: Praveen Chavan <pchavan@codeaurora.org>
2017-11-03 02:45:38 -07:00