Commit graph

602775 commits

Author SHA1 Message Date
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
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
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
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
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
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
Linux Build Service Account
e406a6cc5e Merge "soc: qcom: hab: fix the soft lockup in vchan free schedule" 2018-10-03 19:21:09 -07:00
Linux Build Service Account
62866132b1 Merge "soc: hab: change lifecycle of exp_id from vchan to ctx" 2018-10-03 19:21:09 -07:00
Linux Build Service Account
ca7c7c4784 Merge "soc: hab: fix mmap failure issue when hab import" 2018-10-03 19:21:08 -07:00
Linux Build Service Account
c40d5678db Merge "ARM: dts: msm: Add pin control settings for UFS reset on SDM660" 2018-10-03 19:21:07 -07:00
Linux Build Service Account
aca8b08869 Merge "pinctrl: qcom: Add UFS_RESET pin data for sdm660" 2018-10-03 19:21:06 -07:00
Linux Build Service Account
5feaf32da4 Merge "dwc3: resize txfifo of IN/INT endpoint before enabling it" 2018-10-03 19:21:05 -07:00
Linux Build Service Account
376782b887 Merge "Merge android-4.4.157 (c139ea66) into msm-4.4" 2018-10-03 19:21:04 -07:00
Linux Build Service Account
a8c750891d Merge "Merge android-4.4.156 (7eb7037) into msm-4.4" 2018-10-03 19:21:03 -07:00
Linux Build Service Account
8e85f5958f Merge "drm/msm: add additional HDR state transition" 2018-10-03 19:21:02 -07:00
Linux Build Service Account
648b5d20c5 Merge "ARM: dts: msm: Enable Native SSR for WLAN on GVMQ" 2018-10-03 19:21:01 -07:00
Linux Build Service Account
5a3edef29f Merge "clk: qcom: mdss: add support for dynamic refresh on DSI 14nm PLL" 2018-10-03 19:21:01 -07:00
Linux Build Service Account
9ac236b00c Merge "page-flags: define PG_locked behavior on compound pages" 2018-10-03 19:20:58 -07:00
Linux Build Service Account
da407434d0 Merge "drm/msm: clear colorimetry block info for HDMI" 2018-10-03 19:20:57 -07:00
Linux Build Service Account
84c6d5be73 Merge "msm: vidc: copy the crop info during dequeue buf" 2018-10-03 19:20:56 -07:00
Linux Build Service Account
9935796eb4 Merge "usb: dwc3-msm: Release PM wakelock in host mode only for auto targets" 2018-10-03 19:20:55 -07:00
Abhinav Kumar
de9c641ccf drm/msm: add checksum for HDR infoframe
Checksum for the HDR infoframe is set to zero by default
as this is not a mandatory field as per the HDMI spec.

However certain HDMI sinks still expect a non-zero
checksum. Otherwise they disregard the infoframe
and the sink does not enter HDR mode despite other fields
of the infoframe being valid.

Add a valid checksum to the HDR infoframe to improve
interoperability of our HDR solution for HDMI.

Change-Id: Ie826e5e637fc1f053203bdcf6a829d0246a9ed67
Signed-off-by: Abhinav Kumar <abhinavk@codeaurora.org>
2018-10-03 19:01:20 -07:00
Yao Jiang
4873e89e68 soc: qcom: hab: fix the soft lockup in vchan free schedule
With a certain probability soft lockup when do hab vchan free schedule.
one vchan do the local hab close while another vchan in the same context
through softirq also try to acquire write lock in the free schedule at the
same time, it will cause watchdog bite. Disable local softirq could avoid
race condition handling between tasklet and process context.

Change-Id: I4ee9b980dab7ecb1986af1d61f70157fc30d1048
Signed-off-by: Yao Jiang <yaojia@codeaurora.org>
2018-10-03 07:29:16 -07:00
Jayachandran Sreekumaran
5d33cdfa53 cnss2: Add support for genoa pcie
Add genoa pcie specific qmi and power up/down handling.

Change-Id: I08e640f775de5436071b457225a8b61f13574d01
CRs-fixed: 2272303
Signed-off-by: Jayachandran Sreekumaran <jsreekum@codeaurora.org>
2018-10-03 06:40:57 -07:00
Abhinav Kumar
c920eda6d8 drm/msm: add additional HDR state transition
Add an additional HDR state transition to cover the HDR
teardown sequence case.

This will avoid the HDR infoframe to be programmed repeatedly
if there is no change in its contents.

Change-Id: Ic2f077f0c2ff01e19db5a59b218c4d824e039773
Signed-off-by: Abhinav Kumar <abhinavk@codeaurora.org>
Signed-off-by: Navid Bahrani <nbahrani@codeaurora.org>
2018-10-02 17:56:22 -07:00
Liam Mark
f4746d714f ion: Ensure non-HLOS memory cannot be mapped by CPU
Currently it is possible for an ION client to allocate non-HLOS memory
(ie memory which isn't assigned to the HLOS vmid), map this memory, and
then attempt to access this memory from the CPU.
Attempting to access non-HLOS memory from the CPU will cause a
stage-2 fault.

Fix ION so that non-HLOS memory cannot be mapped by the CPU.

Change-Id: Ifb51de2eabc076cddc744c13f01ef97b4a7c6874
Signed-off-by: Liam Mark <lmark@codeaurora.org>
2018-10-02 09:42:51 -07:00
Srinivasarao P
cd58da6df0 pinctrl: qcom: Add UFS_RESET pin data for sdm660
UFS_RESET is a single purpose output only pin which can be used to
send reset to connected UFS device. This change adds UFS_RESET
pin data.

Change-Id: I539ae2bef003bccf8aa9c23fb5dde0b263844629
Signed-off-by: Srinivasarao P <spathi@codeaurora.org>
2018-10-01 05:26:08 -07:00
Kirill A. Shutemov
20e044155f page-flags: define PG_locked behavior on compound pages
lock_page() must operate on the whole compound page.  It doesn't make
much sense to lock part of compound page.  Change code to use head
page's PG_locked, if tail page is passed.

This patch also gets rid of custom helper functions --
__set_page_locked() and __clear_page_locked().  They are replaced with
helpers generated by __SETPAGEFLAG/__CLEARPAGEFLAG.  Tail pages to these
helper would trigger VM_BUG_ON().

SLUB uses PG_locked as a bit spin locked.  IIUC, tail pages should never
appear there.  VM_BUG_ON() is added to make sure that this assumption is
correct.

[akpm@linux-foundation.org: fix fs/cifs/file.c]
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Dave Hansen <dave.hansen@intel.com>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Rik van Riel <riel@redhat.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Christoph Lameter <cl@linux.com>
Cc: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
Cc: Steve Capper <steve.capper@linaro.org>
Cc: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Michal Hocko <mhocko@suse.cz>
Cc: Jerome Marchand <jmarchan@redhat.com>
Cc: Jérôme Glisse <jglisse@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Change-Id: Ifeeb98c789880ff34b286383568db60e08672205
Git-Commit: 48c935ad88f5be20eb5445a77c171351b1eb5111
Git-Repo: git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
Signed-off-by: Vinayak Menon <vinmenon@codeaurora.org>
2018-10-01 14:31:29 +05:30