Commit graph

602921 commits

Author SHA1 Message Date
Linux Build Service Account
bbaf766c22 Merge "Merge android-4.4.159 (624c095) into msm-4.4" 2018-10-12 05:30:16 -07:00
Linux Build Service Account
51abefff9f Merge "soc: hab: recycle mmid from qcpe to video" 2018-10-11 07:01:22 -07:00
Linux Build Service Account
d5c9ceb9a0 Merge "ARM: dts: msm: Enable wlan ramdump for msm8996_gvmq" 2018-10-11 07:01:20 -07:00
Linux Build Service Account
5d2bfb579f Merge "ARM: dts: msm: update the DSI bit clock for DSI panel on SDM660" 2018-10-11 07:01:20 -07:00
Linux Build Service Account
fad2fb7e75 Merge "cnss2: Add QMI updates for Genoa PCIe" 2018-10-11 07:01:19 -07:00
Linux Build Service Account
25ad3d9b15 Merge "i2c-msm-v2: Handle Null pointer de-reference" 2018-10-11 07:01:18 -07:00
Shiju Mathew
23beddbfdf soc: hab: recycle mmid from qcpe to video
Add new mmid for video and other minor logging
and efficiency fixes.

Change-Id: I0ebbfadff76e7efb7f9afff9896dadf1bd8df9a1
Signed-off-by: Shiju Mathew <shijum@codeaurora.org>
2018-10-10 16:45:39 -04:00
Nijun Gong
0b42c16cdd ARM: dts: msm: Enable wlan ramdump for msm8996_gvmq
Add dts node to let wlan ramdump work for msm8996_gvmq.

Change-Id: Ie47b83c2dc12849d4831f1c053db4f3d997449ff
Signed-off-by: Nijun Gong <ngong@codeaurora.org>
2018-10-10 08:02:46 -07:00
Jayachandran Sreekumaran
b00eda857b cnss2: Add QMI updates for Genoa PCIe
Add qmi updates to pass the msi config for copy engine and
host memory information for CE to update the read index.

Change-Id: I8861659e54cfb25ae64a23a3f02f1e0fce6d372d
Signed-off-by: Jayachandran Sreekumaran <jsreekum@codeaurora.org>
2018-10-09 22:01:12 -07:00
Linux Build Service Account
2592658a93 Merge "sdcardfs: Fix the format prints in sdcardfs" 2018-10-09 16:32:19 -07:00
Linux Build Service Account
6e84230941 Merge "wcnss: fix integer underflow in wcnss_wlan" 2018-10-09 16:32:18 -07:00
Linux Build Service Account
2690915ff3 Merge "cnss2: Add force wake support" 2018-10-09 16:32:17 -07:00
Linux Build Service Account
a5a34b69d4 Merge "soc: msm: add sensor dsp dynamic calibration support for anc" 2018-10-09 09:43:44 -07:00
Linux Build Service Account
b617919621 Merge "msm: mdss: dsi: fix slab-out-of-bounds issue" 2018-10-09 09:43:43 -07:00
Linux Build Service Account
00e3bb0693 Merge "ARM: dts: msm: enable dynamic bit clock for SDM660 MTP panel" 2018-10-09 09:43:40 -07:00
Linux Build Service Account
9091fe19e0 Merge "soc: qcom: subsystem_notif_virt: Add a NULL check and fix a data type" 2018-10-09 09:43:40 -07:00
Linux Build Service Account
543676bc40 Merge "msm: kgsl: Add a property to find if secure context is supported" 2018-10-09 09:43:37 -07:00
Linux Build Service Account
ca8c70a4b9 Merge "usb: misc: Add USB_QCOM_IPC_BRIDGE config" 2018-10-09 09:43:36 -07:00
Linux Build Service Account
2bb68d00c4 Merge "ARM: dts: msm: remove HOME gpio key for qrd devices" 2018-10-09 09:43:34 -07:00
Linux Build Service Account
d09b562cce Merge "soc: hab: refine codes to support multi import" 2018-10-09 09:43:31 -07:00
Sandeep Singh
5bad01206d wcnss: fix integer underflow in wcnss_wlan
Fix integer underflow which may eventually results in an buffer
overread in wcnss_nvbin_dnld when the firmware file size is less
than 4 Byte. Add a check on file size before performing 
arithmetic operation which avoids buffer underflow.

CRs-Fixed: 2279226
Change-Id: Ia7fdb859e8c999f8a2e81c957c7cab35ef312844
Signed-off-by: Sandeep Singh <sandsing@codeaurora.org>
2018-10-09 11:32:50 +05:30
Anant Goel
0563833084 soc: qcom: subsystem_notif_virt: Add a NULL check and fix a data type
A NULL pointer check is added to prevent a NULL pointer
exception. A data type is fixed to prevent a type conversion
before an error check.

Change-Id: If4f6f70c8770ad48432e466e1b6a7e9bf4b62258
Signed-off-by: Anant Goel <anantg@codeaurora.org>
2018-10-08 22:37:11 -07:00
Ritesh Harjani
3cf057d71c sdcardfs: Fix the format prints in sdcardfs
Fix the %p format prints with %pK.

Change-Id: I5fbe70350d7b4d986a2b070c9a2602d9d7680dc9
Signed-off-by: Ritesh Harjani <riteshh@codeaurora.org>
2018-10-08 22:25:49 -07:00
Yue Ma
abbfad73a8 cnss2: Add force wake support
As part of PCIe power management for new WLAN devices, it requires
asserting WAKE register before accessing any MMIO registers outside
first 4K range. Add the support in CNSS driver and expose the APIs
for WLAN host driver.

Change-Id: I69688c229121c12575dde4938961d60bc067751f
Signed-off-by: Yue Ma <yuem@codeaurora.org>
2018-10-08 12:40:07 -07:00
Sunil Khatri
4d6804439e msm: kgsl: Add a property to find if secure context is supported
Add a property to determine if a target support secure context
for use cases like CPZ.

This property can be used by userspace application to create
a secure context if its supported on the target.

Change-Id: I1ccc824378fb8fbd2cfbc7b811c6c3fdcd17803e
Signed-off-by: Sunil Khatri <sunilkh@codeaurora.org>
2018-10-08 06:31:31 -07:00
Sunil Khatri
3d69d2b949 msm: kgsl: Add a property to find alignment of secure buffers
Add a property to determine the hardware alignment
constraint on secure buffers. XPUv2 and below
have a minimum requirement of 1 MBytes alignment
and hence driver should allocate memory with minimum
alignment on size.

Change-Id: Ie3ca5da489bc94ae57ddc6695e402463fd7a88c2
Signed-off-by: Sunil Khatri <sunilkh@codeaurora.org>
2018-10-08 18:58:59 +05:30
Padmanabhan Komanduru
7b0a208f2b ARM: dts: msm: update the DSI bit clock for DSI panel on SDM660
Update the DSI bit clock frequencies supported for the NT35597
video mode panel on SDM660 for dynamic bit clock feature.

Change-Id: I597bb43bf8f93aa6d98afff5d5b8973689460b41
Signed-off-by: Padmanabhan Komanduru <pkomandu@codeaurora.org>
2018-10-08 18:37:56 +05:30
Vipin Deep Kaur
5d1bbf389c i2c-msm-v2: Handle Null pointer de-reference
Zero message may be passed causing null pointer de-reference.
Adding check on the number of messages passed to handle the issue.

Change-Id: I7cef6dd2070c5eaaa748698c45540f8aa1d96116
Signed-off-by: Vipin Deep Kaur <vkaur@codeaurora.org>
2018-10-08 17:22:47 +05:30
Fei Mao
4b3aa96191 ARM: dts: msm: remove HOME gpio key for qrd devices
For qrd devices, remove HOME gpio key to fix driver probe issue.

Change-Id: I46ba4ef05c795fced67f2db59a3f5ce183bdeba8
Signed-off-by: Fei Mao <feim1@codeaurora.org>
2018-10-08 18:09:28 +08:00
Srinivasarao P
1065e41df3 Merge android-4.4.159 (624c095) into msm-4.4
* refs/heads/tmp-624c095
  Linux 4.4.159
  iw_cxgb4: only allow 1 flush on user qps
  HID: sony: Support DS4 dongle
  HID: sony: Update device ids
  arm64: Add trace_hardirqs_off annotation in ret_to_user
  ext4: don't mark mmp buffer head dirty
  ext4: fix online resizing for bigalloc file systems with a 1k block size
  ext4: fix online resize's handling of a too-small final block group
  ext4: recalucate superblock checksum after updating free blocks/inodes
  ext4: avoid divide by zero fault when deleting corrupted inline directories
  tty: vt_ioctl: fix potential Spectre v1
  drm/nouveau/drm/nouveau: Use pm_runtime_get_noresume() in connector_detect()
  ocfs2: fix ocfs2 read block panic
  scsi: target: iscsi: Use hex2bin instead of a re-implementation
  neighbour: confirm neigh entries when ARP packet is received
  net: hp100: fix always-true check for link up state
  net/appletalk: fix minor pointer leak to userspace in SIOCFINDIPDDPRT
  ipv6: fix possible use-after-free in ip6_xmit()
  gso_segment: Reset skb->mac_len after modifying network header
  mm: shmem.c: Correctly annotate new inodes for lockdep
  ring-buffer: Allow for rescheduling when removing pages
  xen/x86/vpmu: Zero struct pt_regs before calling into sample handling code
  xen/netfront: don't bug in case of too many frags
  platform/x86: alienware-wmi: Correct a memory leak
  ALSA: emu10k1: fix possible info leak to userspace on SNDRV_EMU10K1_IOCTL_INFO
  ALSA: bebob: use address returned by kmalloc() instead of kernel stack for streaming DMA mapping
  ASoC: cs4265: fix MMTLR Data switch control
  NFC: Fix the number of pipes
  NFC: Fix possible memory corruption when handling SHDLC I-Frame commands
  ANDROID: restrict store of prefer_idle as boolean
  f2fs: readahead encrypted block during GC
  f2fs: avoid fi->i_gc_rwsem[WRITE] lock in f2fs_gc
  f2fs: fix performance issue observed with multi-thread sequential read
  f2fs: fix to skip verifying block address for non-regular inode
  f2fs: rework fault injection handling to avoid a warning
  f2fs: support fault_type mount option
  f2fs: fix to return success when trimming meta area
  f2fs: fix use-after-free of dicard command entry
  f2fs: support discard submission error injection
  f2fs: split discard command in prior to block layer
  f2fs: wake up gc thread immediately when gc_urgent is set
  f2fs: fix incorrect range->len in f2fs_trim_fs()
  f2fs: refresh recent accessed nat entry in lru list
  f2fs: fix avoid race between truncate and background GC
  f2fs: avoid race between zero_range and background GC
  f2fs: fix to do sanity check with block address in main area v2
  f2fs: fix to do sanity check with inline flags
  f2fs: fix to reset i_gc_failures correctly
  f2fs: fix invalid memory access
  f2fs: fix to avoid broken of dnode block list
  f2fs: use true and false for boolean values
  f2fs: fix to do sanity check with cp_pack_start_sum
  f2fs: avoid f2fs_bug_on() in cp_error case
  f2fs: fix to clear PG_checked flag in set_page_dirty()
  f2fs: fix to active page in lru list for read path
  f2fs: don't keep meta pages used for block migration
  f2fs: fix to restrict mount condition when without CONFIG_QUOTA
  f2fs: quota: do not mount as RDWR without QUOTA if quota feature enabled
  f2fs: quota: fix incorrect comments
  f2fs: add proc entry to show victim_secmap bitmap
  f2fs: let checkpoint flush dnode page of regular
  f2fs: issue discard align to section in LFS mode
  f2fs: don't allow any writes on aborted atomic writes
  f2fs: restrict setting up inode.i_advise
  f2fs: fix wrong kernel message when recover fsync data on ro fs
  f2fs: clean up ioctl interface naming
  f2fs: clean up with f2fs_is_{atomic,volatile}_file()
  f2fs: clean up with f2fs_encrypted_inode()
  f2fs: clean up with get_current_nat_page
  f2fs: kill EXT_TREE_VEC_SIZE
  f2fs: avoid duplicated permission check for "trusted." xattrs
  f2fs: fix to propagate error from __get_meta_page()
  f2fs: fix to do sanity check with i_extra_isize
  f2fs: blk_finish_plug of submit_bio in lfs mode
  f2fs: do not set free of current section
  f2fs: Keep alloc_valid_block_count in sync
  f2fs: issue small discard by LBA order
  f2fs: stop issuing discard immediately if there is queued IO
  f2fs: clean up with IS_INODE()
  f2fs: detect bug_on in f2fs_wait_discard_bios
  f2fs: fix defined but not used build warnings
  f2fs: enable real-time discard by default
  f2fs: fix to detect looped node chain correctly
  f2fs: fix to do sanity check with block address in main area
  f2fs: fix to skip GC if type in SSA and SIT is inconsistent
  f2fs: try grabbing node page lock aggressively in sync scenario
  f2fs: show the fsync_mode=nobarrier mount option
  f2fs: check the right return value of memory alloc function
  f2fs: Replace strncpy with memcpy
  f2fs: avoid the global name 'fault_name'
  f2fs: fix to do sanity check with reserved blkaddr of inline inode
  f2fs: fix to do sanity check with node footer and iblocks
  f2fs: Allocate and stat mem used by free nid bitmap more accurately
  f2fs: fix to do sanity check with user_block_count
  f2fs: fix to do sanity check with extra_attr feature
  f2fs: fix to correct return value of f2fs_trim_fs
  f2fs: fix to do sanity check with {sit,nat}_ver_bitmap_bytesize
  f2fs: fix to do sanity check with secs_per_zone
  f2fs: disable f2fs_check_rb_tree_consistence
  f2fs: introduce and spread verify_blkaddr
  f2fs: use timespec64 for inode timestamps
  f2fs: fix to wait on page writeback before updating page
  f2fs: assign REQ_RAHEAD to bio for ->readpages
  f2fs: fix a hungtask problem caused by congestion_wait
  f2fs: Fix uninitialized return in f2fs_ioc_shutdown()
  f2fs: don't issue discard commands in online discard is on
  f2fs: fix to propagate return value of scan_nat_page()
  f2fs: support in-memory inode checksum when checking consistency
  f2fs: fix error path of fill_super
  f2fs: relocate readdir_ra configure initialization
  f2fs: move s_res{u,g}id initialization to default_options()
  f2fs: don't acquire orphan ino during recovery
  f2fs: avoid potential deadlock in f2fs_sbi_store
  f2fs: indicate shutdown f2fs to allow unmount successfully
  f2fs: keep meta pages in cp_error state
  f2fs: do checkpoint in kill_sb
  f2fs: allow wrong configured dio to buffered write
  f2fs: flush journal nat entries for nat_bits during unmount

Conflicts:
	drivers/hid/hid-core.c

Change-Id: Idc486f778059ca65307ab08678f3b1e23c4ec15f
Signed-off-by: Srinivasarao P <spathi@codeaurora.org>
2018-10-08 10:55:01 +05:30
Yajun Li
4d4b4c61ab soc: hab: refine codes to support multi import
Make HAB clients have chance to import the
same export id to fd and uva before unimport
happens.

Change-Id: I59fdc701dcdc086e58865fa216b10f9fe6a45e29
Signed-off-by: Yajun Li <yajunl@codeaurora.org>
2018-10-07 19:26:30 -07:00
Yao Jiang
5fef3cdf5a soc: qcom: hab: fix the leak risk in hab_vchan_get
When getting a vchan after receiving a message, it has probability that
this vchan is closed concurrently. So when refcount is increased by
kref_get_unless_zero, but flag vchan->otherend_closed or vchan->closed
is true at this time, it will return vchan as NULL, and the hab_vchan_put
will not be called in hab_msg_rev. So adjust the timing here can avoid the
leak risk.

Change-Id: If78c1c41bc4fd05b3288c0324bb9e0aed8493c5f
Signed-off-by: Yao Jiang <yaojia@codeaurora.org>
2018-10-07 18:34:52 -07:00
Yao Jiang
3acc958e8d soc: qcom: hab: replace kref_get with kref_get_unless_zero
If refcount was 0 before increment, it maybe has a race condition that
this kref is freeing by some other thread right now. In this case we should
not increments refcount, so replace with kref_get_unless_zero.

Change-Id: Ic15eaefc111770a966094d05b19eca2a04d52fc2
Signed-off-by: Yao Jiang <yaojia@codeaurora.org>
2018-10-07 18:33:31 -07:00
Linux Build Service Account
3b8fc0b7a3 Merge "Merge android-4.4.158 (f9e4134) into msm-4.4" 2018-10-06 03:46:08 -07:00
Linux Build Service Account
8f037f0b36 Merge "ARM: dts: Add new memlat freq map for sdm455" 2018-10-06 03:46:06 -07:00
Linux Build Service Account
1bd8a3a192 Merge "clk: qcom: mdss: avoid release of the dynamic fps PLL code memory" 2018-10-06 03:46:03 -07:00
Linux Build Service Account
5f805950d9 Merge "msm: ipa: Protect ipa default routing table" 2018-10-05 11:28:18 -07:00
Linux Build Service Account
e75118f5d9 Merge "dwc3: Preserve TxFIFO of IN/INT EP for UDC without tx-fifo-resize" 2018-10-05 11:28:15 -07:00
Ajay Agarwal
a1064a4cd8 usb: misc: Add USB_QCOM_IPC_BRIDGE config
Add USB_QCOM_IPC_BRIDGE config which is required to enable
MSM_IPC_ROUTER_HSIC_XPRT config.

Change-Id: I78f4aeea5f392f76f80410aaff0d5f72760e2494
Signed-off-by: Ajay Agarwal <ajaya@codeaurora.org>
2018-10-05 18:08:59 +05:30
Padmanabhan Komanduru
1d28c685e6 clk: qcom: mdss: avoid release of the dynamic fps PLL code memory
Avoid the release of memory for dynamic fps PLL codes. The memory
is part of the continuous splash memory region and will be freed
eventually as part of the splash screen memory cleanup routine.

Change-Id: I67afb46057770298668ae5790637e8b4b08fd030
Signed-off-by: Padmanabhan Komanduru <pkomandu@codeaurora.org>
2018-10-05 16:31:24 +05:30
Santosh Mardi
2e744ca1c9 ARM: dts: Add new memlat freq map for sdm455
Add new freq map for memlat node for sdm455.

Change-Id: I536b7f3e41610ca78d5cfae08ecbfc1e82b8fe5b
Signed-off-by: Biao long <blong@codeaurora.org>
Signed-off-by: Santosh Mardi <gsantosh@codeaurora.org>
2018-10-05 16:10:02 +05:30
Narender Ankam
f2d058d45f msm: mdss: dsi: fix slab-out-of-bounds issue
While handling dsi_gen_read_status, status buffer
was xlogging without checking for its max size.
Add proper conditional check to xlog status buffer.

Change-Id: Ia5a1fe18de123d2911c31ae79492b96f67e1273d
Signed-off-by: Narender Ankam <nankam@codeaurora.org>
2018-10-05 01:46:54 -07:00
Linux Build Service Account
e772a5206c Merge "mdss: mdp: Fix access after null check" 2018-10-05 01:30:08 -07:00
Linux Build Service Account
8ce3cab712 Merge "drm: msm: update cpu1 hotplug by using cpu_device node" 2018-10-05 01:30:06 -07:00
Linux Build Service Account
6ff7453f91 Merge "mdss: mdp: Add error check for split ctl" 2018-10-05 01:30:05 -07:00
Linux Build Service Account
d750db225f Merge "ion: Ensure non-HLOS memory cannot be mapped by CPU" 2018-10-04 14:58:31 -07:00
Linux Build Service Account
9f31d42b06 Merge "fbdev/msm: sanitize debugfs inputs when reading mdp memory" 2018-10-04 14:58:28 -07:00
Linux Build Service Account
5be60e5316 Merge "drm/msm: add checksum for HDR infoframe" 2018-10-04 14:58:24 -07:00
Mohammed Javid
2ab53a3bf9 msm: ipa: Protect ipa default routing table
Protect ipa default routing table from
addition, deletion and modification once after
default rule added by ipa-driver.

Change-Id: I045d9c29fed23edf796d826e440b81124e1f666a
Signed-off-by: Mohammed Javid <mjavid@codeaurora.org>
2018-10-04 15:53:50 +05:30
Linux Build Service Account
6202b64fd2 Merge "cnss2: Add support for genoa pcie" 2018-10-03 19:21:10 -07:00