OSDN Git Service
Guchun Chen [Thu, 8 Jun 2017 03:00:30 +0000 (20:00 -0700)]
Revert "msm: smmu: add re-route calling for specified iova."
This reverts commit
ae94b477afd5d71221964250395d8f109ddb5b06.
This change brings side effect of smmu fault in apq8098 project. It blocks their regression test.
Change-Id: Ia479188eca74ec988026f7d42207435da2f79bfc
Signed-off-by: Guchun Chen <guchunc@codeaurora.org>
Guchun Chen [Sat, 27 May 2017 09:38:27 +0000 (17:38 +0800)]
msm: smmu: add re-route calling for specified iova.
When calling smmu mapping, if iova is specified directly by user, not
allocated dynamically in dma-mapping.c, smmu driver needs to provide
support for this. This is needed in early display case. In this scenario,
LK has set physical memory to display hardware for fetching, so if iova
is not explicitly specified in kernel, but instead dynamically produced
by "alloc_iova" in dma-mapping.c, display hardware has no chance to know
this new iova, then smmu fault will happen if enabling the iommu stage-1
translation.
To fix this smmu fault problem, add re-routing to the right path when
iova specified by user is not 0 in smmu map/unmap function.
Change-Id: I062b04d7eec65af1c106a5caa09ec787b5d26d0d
Signed-off-by: Guchun Chen <guchunc@codeaurora.org>
Linux Build Service Account [Sat, 20 May 2017 08:37:19 +0000 (01:37 -0700)]
Merge "qpnp-smb2: fix FV and FCC reporting"
Linux Build Service Account [Sat, 20 May 2017 08:37:18 +0000 (01:37 -0700)]
Merge "msm: vidc: Cancel userptr validation during secure decode"
Linux Build Service Account [Sat, 20 May 2017 08:37:17 +0000 (01:37 -0700)]
Merge "ASoC: msm: qdspv2: Rename HDMI drift mixer controls"
Linux Build Service Account [Sat, 20 May 2017 08:37:17 +0000 (01:37 -0700)]
Merge "ion: fix logical-not comparison warning"
Linux Build Service Account [Sat, 20 May 2017 08:37:16 +0000 (01:37 -0700)]
Merge "coresight-tmc: Adds lock to avoid race condition"
Linux Build Service Account [Sat, 20 May 2017 08:37:15 +0000 (01:37 -0700)]
Merge "msm: wlan: Update regulatory database"
Linux Build Service Account [Sat, 20 May 2017 08:37:13 +0000 (01:37 -0700)]
Merge "msm_11ad: clear affinity hint upon low bus request"
Linux Build Service Account [Sat, 20 May 2017 08:37:13 +0000 (01:37 -0700)]
Merge "ARM: dts: msm: Add support for multiple neutrino on msm8996"
Linux Build Service Account [Sat, 20 May 2017 08:37:12 +0000 (01:37 -0700)]
Merge "drm/msm: Don't allow zero sized buffer objects"
Linux Build Service Account [Sat, 20 May 2017 08:37:11 +0000 (01:37 -0700)]
Merge "msm: camera: sensor: Validate sensor related name length"
Linux Build Service Account [Sat, 20 May 2017 08:37:10 +0000 (01:37 -0700)]
Merge "msm: camera: sensor: Validate sensor name during probe"
Abhijeet Dharmapurikar [Mon, 15 May 2017 20:38:53 +0000 (13:38 -0700)]
qpnp-smb2: fix FV and FCC reporting
Currently the read of battery's voltage_max property (FV) and battery's
current_max property (FCC) returns the value of DEFAULT_VOTER voter.
But such a voter doesn't exist on battery's voltage_max property. Fix it
by returning the value voted by BATT_PROFILE_VOTER.
Change-Id: I2dac98f2ce9a423d5045788dbe120591f10c5a9e
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
Abhijeet Dharmapurikar [Thu, 18 May 2017 22:37:56 +0000 (15:37 -0700)]
smb-lib: do not disable parallel based only on main's settled current
Currently main charger ends up voting to disable parallel(USBIN_I_VOTER)
if the settled current is less than 1.4Amps. It could be that the
parallel path is drawing some current and the draw is higher than
1.4Amps.
Move this disabling to battery, where the parallel charger's input current
is taken in to consideration.
Also while voting to disable, make sure that the main's input is limited.
If there is more room for ICL to increase that means more power could be
drawn from the charger and so we must keep the parallel charging enabled.
If the ICL ceiling itself if 1.4Amps then disable parallel charging,
because even if ICL has room to increase it wont cross 1.4Amps.
The main's input limited state is set while AICL steps up - this
ensures that we keep parallel disabled while AICL is running and settled
is less than 1.4Amps.
When the charger is removed, the main's input limited status is unset,
however we want to keep the parallel charger disabled. In such situations
the main's settled current is 0mA - use this to vote for disabling
parallel charging.
For any ICL change vote request:
Disable parallel using USBIN_I_VOTER if requested current is less than
1.4Amps and to un-vote (i.e. when ICL vote is higher than 1.4Amps) rely
on event from AICL done or status_change delayed work.
Note that USBIN_I_VOTER is effective only for non-QC chargers. For QC
chargers USBIN_V_VOTER continues to keep charging enabled since parallel
need not be disabled is a lower current is requested with a QC charger.
Change-Id: I61d7cd161a87de2904470b2d870058a0fe199116
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
Prabhakar Reddy Krishnappa [Fri, 19 May 2017 00:43:17 +0000 (17:43 -0700)]
msm: vidc: Cancel userptr validation during secure decode
Secure decode doesn't need userptr and uses ion fd instead. We were
conducting userptr validation regardless of the decode mode (secure/
unsecure). This forced user to populate userptr with a dummy value
during QBUF in secure mode decode on both output and capture ports
to avoid a userptr validation fail.
CRs-Fixed:
2049213
Change-Id: I0060efb52792201a2634072f648a537ebb02d17c
Signed-off-by: Prabhakar Reddy Krishnappa <prkrishn@codeaurora.org>
Mukesh Ojha [Fri, 5 May 2017 08:44:56 +0000 (14:14 +0530)]
coresight-tmc: Adds lock to avoid race condition
There can be a case of race in the call to tmc_etr_bam_disable(). The call
from usb_notifier() to tmc_etr_bam_disable() is within a lock
'drvdata->mem_lock' but the call from tmc_disable is not under any lock
which can lead to race.
This patch adds the missing lock.
CRs-Fixed:
2047196
Change-Id: I3986b498ae8e2b2ddfe8f5b3315fdefab197d11c
Signed-off-by: Mukesh Ojha <mojha@codeaurora.org>
Sudarshan Rajagopalan [Mon, 1 May 2017 22:52:29 +0000 (15:52 -0700)]
ion: fix logical-not comparison warning
Fixes compiler warning when a logical-not on a variable
is applied while comparing it with value zero.
Change-Id: I92aa16bd0d57a0d59ecd26eef1ac92220332998d
Signed-off-by: Sudarshan Rajagopalan <sudaraja@codeaurora.org>
Dedy Lansky [Tue, 16 May 2017 12:18:02 +0000 (15:18 +0300)]
msm_11ad: clear affinity hint upon low bus request
When driver calls ops_bus_request with high bandwidth requirement,
affinity of wil6210 interrupt is set to first big core. However this
setting is not cleared when driver lowers bandwidth requirement.
This causes WARN_ON_ONCE(desc->affinity_hint) upon wil6210 rmmod.
Fix this by clearing affinity hint upon low bandwidth request.
Change-Id: I87b6b7ec9b369b84a9d3724d92a821a1302d1f83
Signed-off-by: Dedy Lansky <dlansky@codeaurora.org>
Manish Dewangan [Wed, 17 May 2017 01:30:05 +0000 (07:00 +0530)]
ASoC: msm: qdspv2: Rename HDMI drift mixer controls
Update HDMI drift mixer controls name to be aligned with
drift mixer controls for other devices(speaker, BT).
CRs-Fixed:
2036899
Change-Id: If7aa29ea9511b65de71ff12143a1c34d977de2b8
Signed-off-by: Manish Dewangan <manish@codeaurora.org>
Linux Build Service Account [Tue, 16 May 2017 23:08:16 +0000 (16:08 -0700)]
Merge "msm: ADSPRPC: Copy process name buffer to kernel space"
Linux Build Service Account [Tue, 16 May 2017 23:08:15 +0000 (16:08 -0700)]
Merge "usb: gadget: f_cdev: Fix NULL pointer dereference in cser_free_inst"
Linux Build Service Account [Tue, 16 May 2017 23:08:14 +0000 (16:08 -0700)]
Merge "msm: mink: Avoid handling output params if TZ op returns an err"
Linux Build Service Account [Tue, 16 May 2017 23:08:13 +0000 (16:08 -0700)]
Merge "defconfig: msm: Remove CONFIG_TIMER_STATS"
Linux Build Service Account [Tue, 16 May 2017 23:08:12 +0000 (16:08 -0700)]
Merge "usb: phy: qusb: Support specifying vdda33 levels from device tree"
Linux Build Service Account [Tue, 16 May 2017 23:08:11 +0000 (16:08 -0700)]
Merge "ARM: dts: msm: Enable support for guest virtual platform"
Linux Build Service Account [Tue, 16 May 2017 23:08:08 +0000 (16:08 -0700)]
Merge "ARM: dts: msm: always enable mdss_mdp node for msm8998 based MOB3 platform"
Linux Build Service Account [Tue, 16 May 2017 23:08:07 +0000 (16:08 -0700)]
Merge "msm: msm_bus: Add mutex to protect node_list"
Linux Build Service Account [Tue, 16 May 2017 23:08:06 +0000 (16:08 -0700)]
Merge "msm_11ad: add support to PCIe D3hot in system suspend"
Olav Haugan [Sun, 7 May 2017 04:30:47 +0000 (21:30 -0700)]
defconfig: msm: Remove CONFIG_TIMER_STATS
CONFIG_TIMER_STATS is no longer needed and the kconfig option
will be removed in subsequent commits.
Change-Id: I380f9f925332c594c9d500312a06713170e48505
Signed-off-by: Olav Haugan <ohaugan@codeaurora.org>
Jack Pham [Fri, 21 Apr 2017 01:52:28 +0000 (18:52 -0700)]
usb: phy: qusb: Support specifying vdda33 levels from device tree
The specific voltage levels for the vdda33 regulator may vary
depending on the target. Add an optional device tree property to
allow specifying a 3-tuple of voltages for minimum, operating
and maximum voltage levels. The minimum level is used when simply
powering on, whereas the operating level is used when initializing
the PHY.
Change-Id: Ia5d301efdb6964434a01264e7aa19421a41e98ca
Signed-off-by: Jack Pham <jackp@codeaurora.org>
Atul Raut [Sat, 21 Jan 2017 01:59:57 +0000 (17:59 -0800)]
ARM: dts: msm: Enable support for guest virtual platform
Add device tree to support guest virtual machine on
msm kernel.
CRs-Fixed:
2000645
Change-Id: I4ca06c28c349dd533057b24fe6794a7c11a84cc6
Signed-off-by: Atul Raut <araut@codeaurora.org>
Linux Build Service Account [Tue, 16 May 2017 13:49:50 +0000 (06:49 -0700)]
Merge "drm/msm: remove mdp node entry"
Linux Build Service Account [Tue, 16 May 2017 13:49:49 +0000 (06:49 -0700)]
Merge "ath10k: Define structure for copy engine interrupt map for SNOC"
Linux Build Service Account [Tue, 16 May 2017 13:49:48 +0000 (06:49 -0700)]
Merge "ARM: dts: msm: Update high-speed PHY parameters for QRD SDM660"
Linux Build Service Account [Tue, 16 May 2017 13:49:47 +0000 (06:49 -0700)]
Merge "ARM: dts: msm: Update high-speed PHY parameters for QRD SDM630"
Linux Build Service Account [Tue, 16 May 2017 13:49:46 +0000 (06:49 -0700)]
Merge "soc: qcom: Fix checks for QMI response values"
Linux Build Service Account [Tue, 16 May 2017 13:49:45 +0000 (06:49 -0700)]
Merge "soc: qcom: fix to avoid memory allocation failures"
Linux Build Service Account [Tue, 16 May 2017 13:49:44 +0000 (06:49 -0700)]
Merge "ASoC: msm: add support for new ADSP event APIs"
Linux Build Service Account [Tue, 16 May 2017 13:49:42 +0000 (06:49 -0700)]
Merge "defconfig: arm64: Enable UFSHCD_CMD_LOGGING flag"
Linux Build Service Account [Tue, 16 May 2017 13:49:41 +0000 (06:49 -0700)]
Merge "ASoC: msm: remove unused msm-compr-q6-v2"
Linux Build Service Account [Tue, 16 May 2017 13:49:40 +0000 (06:49 -0700)]
Merge "ARM64: Make KERNEL_TEXT_RDONLY depend on !DEBUG_RODATA"
Linux Build Service Account [Tue, 16 May 2017 13:49:37 +0000 (06:49 -0700)]
Merge "scsi: ufs-qcom: remove broken hci version quirk"
Linux Build Service Account [Tue, 16 May 2017 13:49:36 +0000 (06:49 -0700)]
Merge "msm: mdss: fix display port crash caused by hpd_irq attention event"
Linux Build Service Account [Tue, 16 May 2017 13:49:35 +0000 (06:49 -0700)]
Merge "drm/msm: drop return from gpu->submit()"
Linux Build Service Account [Tue, 16 May 2017 13:49:33 +0000 (06:49 -0700)]
Merge "tracing: do not leak kernel addresses"
Linux Build Service Account [Tue, 16 May 2017 13:49:32 +0000 (06:49 -0700)]
Merge "Prevent heap overflow in uvc driver"
Linux Build Service Account [Tue, 16 May 2017 13:49:30 +0000 (06:49 -0700)]
Merge "msm: kgsl: Offload mementry destroy work to separate thread"
Linux Build Service Account [Tue, 16 May 2017 13:49:29 +0000 (06:49 -0700)]
Merge "spcom: avoid user commands via /dev/spcom"
Linux Build Service Account [Tue, 16 May 2017 13:49:28 +0000 (06:49 -0700)]
Merge "timer: Clear deferrable_pending while handling timer softirq"
Linux Build Service Account [Tue, 16 May 2017 13:49:27 +0000 (06:49 -0700)]
Merge "soc: qcom: rpm_master_stat: Fix buffer overflow"
Linux Build Service Account [Tue, 16 May 2017 13:49:26 +0000 (06:49 -0700)]
Merge "diag: Add proper synchronization checks to msg mask table"
Linux Build Service Account [Tue, 16 May 2017 13:49:25 +0000 (06:49 -0700)]
Merge "msm: ADSPRPC: verify and initialize some variables"
Linux Build Service Account [Tue, 16 May 2017 13:49:24 +0000 (06:49 -0700)]
Merge "ASoC: wcd: Depend on right config option"
Linux Build Service Account [Tue, 16 May 2017 13:49:24 +0000 (06:49 -0700)]
Merge "memshare: Update the free memory count after allocation"
Linux Build Service Account [Tue, 16 May 2017 13:49:22 +0000 (06:49 -0700)]
Merge "PM/devfreq: bw_hwmon: add mutex lock in polling interval case"
Linux Build Service Account [Tue, 16 May 2017 13:49:21 +0000 (06:49 -0700)]
Merge "qseecom: add bus scaling support for GP operations"
Linux Build Service Account [Tue, 16 May 2017 13:49:19 +0000 (06:49 -0700)]
Merge "ARM: dts: msm: move tdm common prop to parent node"
Linux Build Service Account [Tue, 16 May 2017 13:49:18 +0000 (06:49 -0700)]
Merge "ASoC: msm: qdsp6v2: Add TDM master slave select setting"
Tharun Kumar Merugu [Tue, 4 Apr 2017 06:24:54 +0000 (11:54 +0530)]
msm: ADSPRPC: Copy process name buffer to kernel space
Copy user space process name buffer to kernel space using
copy_from_user.
Change-Id: I5272a42651ac50ddeda3f0f7a4cbd32dbaf495ec
Acked-by: Himateja Reddy <hmreddy@qti.qualcomm.com>
Signed-off-by: Tharun Kumar Merugu <mtharu@codeaurora.org>
Narender Ankam [Mon, 1 May 2017 12:37:57 +0000 (18:07 +0530)]
ARM: dts: msm: always enable mdss_mdp node for msm8998 based MOB3 platform
Duplicate probing of mdss_mdp device node is now handled
within SDE driver.
Change-Id: I3e4bb5c73c8d43e6fe07ff791ea3815636e50a55
Signed-off-by: Narender Ankam <nankam@codeaurora.org>
David Dai [Wed, 26 Apr 2017 21:52:24 +0000 (14:52 -0700)]
msm: msm_bus: Add mutex to protect node_list
Static variable node_list list need to be protected with a mutex
to prevent race conditions and use after free cases.
Change-Id: I4790b06712b8a8b401f43418cfcc53b415fb0019
Signed-off-by: David Dai <daidavid1@codeaurora.org>
Signed-off-by: Odelu Kukatla <okukatla@codeaurora.org>
Ziqi Chen [Mon, 27 Mar 2017 02:55:00 +0000 (10:55 +0800)]
ARM: dts: msm: Update high-speed PHY parameters for QRD SDM660
QRD SDM660 failed on high-speed eye diagram test. Updated
these parameters based on tuning result to pass compliance test.
Change-Id: Ice00698872be4c39c2184dbd5bc2d99af7641b02
Signed-off-by: Ziqi Chen <ziqic@codeaurora.org>
Ziqi Chen [Mon, 27 Mar 2017 04:36:59 +0000 (12:36 +0800)]
ARM: dts: msm: Update high-speed PHY parameters for QRD SDM630
QRD SDM630 failed on high-speed eye diagram test. Update these
parameters based on tuning result to pass compliance test.
Change-Id: I34bb4d7808448ba687bdd9495e1573cb9eac6098
Signed-off-by: Ziqi Chen <ziqic@codeaurora.org>
Sarada Prasanna Garnayak [Thu, 11 May 2017 15:19:52 +0000 (20:49 +0530)]
ath10k: Define structure for copy engine interrupt map for SNOC
The WLAN driver request and free the copy engine interrupt
according to the WLAN host target communication and protocol
in different WLAN context and subsystem state. The ath10k snoc
free/request all copy engine interrupt line during wlan subsystem
recovery due to firmware crash or hardware interface down etc.
To avoid the kernel warning and fault due to redundant copy engine
interrupt request/free in different wlan state. Define structure
for copy engine to maintain the stat of copy engine interrupt list
request/free.
Change-Id: I5cf3de4feecfb3a93a930c4939dc0a80bfc14e55
Signed-off-by: Sarada Prasanna Garnayak <sgarna@codeaurora.org>
Xiaojun Sang [Thu, 27 Apr 2017 06:44:25 +0000 (14:44 +0800)]
ASoC: msm: remove unused msm-compr-q6-v2
msm-compr-q6-v2.c and msm-compr-q6-v2.h are no longer used.
CRs-Fixed:
2022953
Change-Id: I856d90a212a3e123a2c8b80092aff003f7c608c7
Signed-off-by: Xiaojun Sang <xsang@codeaurora.org>
Can Guo [Mon, 1 May 2017 05:38:30 +0000 (13:38 +0800)]
defconfig: arm64: Enable UFSHCD_CMD_LOGGING flag
Enabling SCSI_UFSHCD_CMD_LOGGING flag in defconfig
file. With this feature eanbled, ufs commands send
through ufshcd shall be logged.
Change-Id: Ibc4d1f39221fbcdc926e030d1df08a9fea31d24c
Signed-off-by: Can Guo <cang@codeaurora.org>
Puja Gupta [Mon, 15 May 2017 18:15:07 +0000 (11:15 -0700)]
soc: qcom: Fix checks for QMI response values
The return values from QMI could be compared directly and was
incorrectly interpreted in service locator and notifier.
Also initialize structure in service locator so as to not have garbage
values in them.
Change-Id: I7f8f27857706e9508b64289d9263c79494c17a8d
Signed-off-by: Puja Gupta <pujag@codeaurora.org>
Hemant Kumar [Mon, 15 May 2017 19:01:02 +0000 (12:01 -0700)]
usb: gadget: f_cdev: Fix NULL pointer dereference in cser_free_inst
If f_cdev_alloc() fails it frees the port context and set_inst_name()
call back returns with error. As a result free_func_inst() call back
is called which is dereferencing port context from f_cdev_opts context
which results into NULL ptr dereference. Fix the issue by adding NULL
check for port context pointer in f_cdev_opts context.
Change-Id: I69828761be0a9f7df714eec34894c13f762dcc43
Signed-off-by: Hemant Kumar <hemantk@codeaurora.org>
Nick Desaulniers [Fri, 3 Mar 2017 23:40:12 +0000 (15:40 -0800)]
tracing: do not leak kernel addresses
This likely breaks tracing tools like trace-cmd. It logs in the same
format but now addresses are all 0x0.
Bug:
34277115
Change-Id: Ifb0d4d2a184bf0d95726de05b1acee0287a375d9
Git-repo: https://android.googlesource.com/kernel/msm
Git-commit:
9ad8f2cc1bb73a3e2255dff4ee9c45c909869225
Signed-off-by: Dennis Cagle <d-cagle@codeaurora.org>
Robb Glasser [Tue, 14 Feb 2017 21:25:46 +0000 (13:25 -0800)]
Prevent heap overflow in uvc driver
The size of uvc_control_mapping is user controlled leading to a
potential heap overflow in the uvc driver. This adds a check to verify
the user provided size fits within the bounds of the defined buffer
size.
Bug:
33300353
Change-Id: If29c1b396633b6137966a12e38f6fd1841b045bd
Signed-off-by: Robb Glasser <rglasser@google.com>
Git-repo: https://android.googlesource.com/kernel/msm
Git-commit:
8bc3ec72a02052187397d0de1a7b8bbe7340451c
Signed-off-by: Dennis Cagle <d-cagle@codeaurora.org>
Maya Erez [Sun, 14 May 2017 13:40:19 +0000 (16:40 +0300)]
msm_11ad: add support to PCIe D3hot in system suspend
Transition to D3 hot in system suspend allows the wil6210
device to preserve the active connections in system suspend.
Change-Id: I4c24551f91ee7e59d4bfee02b0911c31ae0a05b1
Signed-off-by: Maya Erez <merez@codeaurora.org>
Maya Erez [Mon, 15 May 2017 13:57:46 +0000 (16:57 +0300)]
wil6210: add support for PCIe D3hot in system suspend
In order to preserve the connection in suspend/resume flow,
wil6210 host allows going to PCIe D3hot state in suspend,
instead of performing a full wil6210 device reset. This
requires the platform ability to initiate wakeup in case of
RX data. To check that, a new platform API is added.
In addition, add cfg80211 suspend/resume callbacks
implementation.
Change-Id: I3846eaaa8d6e9ecbe5adbb0c04c7574865d5af5e
Signed-off-by: Maya Erez <merez@codeaurora.org>
Linux Build Service Account [Mon, 15 May 2017 10:51:25 +0000 (03:51 -0700)]
Merge "ARM: dts: msm: Update charging ESR timer value to 96 for PM660 FG"
Linux Build Service Account [Mon, 15 May 2017 10:51:25 +0000 (03:51 -0700)]
Merge "scsi: ufs: Initialize cmd_id and check lrbp->cmd NULL"
Linux Build Service Account [Mon, 15 May 2017 10:51:23 +0000 (03:51 -0700)]
Merge "mmc: mmc: Fix mmc_partial_init for HS400 mode"
Linux Build Service Account [Mon, 15 May 2017 10:51:23 +0000 (03:51 -0700)]
Merge "defconfig: msm: remove dcc config for perf on sdm660"
Linux Build Service Account [Mon, 15 May 2017 10:51:22 +0000 (03:51 -0700)]
Merge "sound: usb: Add default branches for BADD 3.0 devices"
Linux Build Service Account [Mon, 15 May 2017 10:51:21 +0000 (03:51 -0700)]
Merge "media: dvb-core: Fix coding errors in broadcast drivers"
Linux Build Service Account [Mon, 15 May 2017 10:51:20 +0000 (03:51 -0700)]
Merge "defconfig: msmcortex: Cleanup"
Linux Build Service Account [Mon, 15 May 2017 10:51:19 +0000 (03:51 -0700)]
Merge "qpnp-smb2: Add software based glitch filter for OTG detection"
Linux Build Service Account [Mon, 15 May 2017 10:51:18 +0000 (03:51 -0700)]
Merge "dma-mapping: Always remap on dma buffer free"
Linux Build Service Account [Mon, 15 May 2017 10:51:18 +0000 (03:51 -0700)]
Merge "ARM: dts: msm: Update the virtual corner for SDM630"
Linux Build Service Account [Mon, 15 May 2017 10:51:17 +0000 (03:51 -0700)]
Merge "clk: Move vdd voting before set rate and parent"
Linux Build Service Account [Mon, 15 May 2017 10:51:16 +0000 (03:51 -0700)]
Merge "usb: gadget: f_cdev: Increase number of driver instances to 3"
Linux Build Service Account [Mon, 15 May 2017 10:51:15 +0000 (03:51 -0700)]
Merge "msm: camera: isp: Fix excessive logging in w+t"
Depeng Shao [Fri, 12 May 2017 06:27:30 +0000 (14:27 +0800)]
msm: camera: sensor: Validate sensor related name length
Variable "slave_info->sensor_name", "slave_info->eeprom_name",
"slave_info->actuator_name" and "slave_info->ois_name" are
from user input, which may be not NULL terminated.
OOB will be possible when accessing these variable.
Add a validation for these name length.
Change-Id: I9a570372707b7f8365a625d6b0662e87d1b4926e
Signed-off-by: Depeng Shao <dshao@codeaurora.org>
Amir Samuelov [Mon, 15 May 2017 07:52:11 +0000 (10:52 +0300)]
spcom: avoid user commands via /dev/spcom
The pseudo-file char-device-nodes /dev/spcom and /dev/sp_ssr are not
associated with a logical channel for data transfer with the Secure
Processor (SP).
Avoid sending user command by file write() over those device nodes.
The command "create channel" should be done over /dev/sp_kernel rather
than over /dev/spcom.
Verify that glink pass valid channel pointer to spcom callbacks.
Use size_t for channel "actual_rx_size" parameter that is provided by
glink to spcom callback.
Remove "fake SSR" command, since real SSR is supported by SP.
Change-Id: Id9113389d94ab4aed01d3ac1e370c4e8f3c8965b
Signed-off-by: Amir Samuelov <amirs@codeaurora.org>
Neeraj Upadhyay [Wed, 3 May 2017 10:35:48 +0000 (16:05 +0530)]
timer: Clear deferrable_pending while handling timer softirq
Clear deferrable_pending everytime timer softirq is run.
This handles a potential race condition, where one CPU
handles all deferrable timers, before the other CPU gets
a change to run timer softirq. Due to the deferrable_pending
not getting cleared, subsequently, CPUs do not raise
the softirq for handling expired deferrable timers,
in nohz idle enter path.
Change-Id: Ie5fd78f9b27e7553ba43101b86ad939c289827e0
Signed-off-by: Neeraj Upadhyay <neeraju@codeaurora.org>
Maulik Shah [Mon, 15 May 2017 05:22:14 +0000 (10:52 +0530)]
soc: qcom: rpm_master_stat: Fix buffer overflow
Buffer overflow can happen when finding next set bit
due to type casting of uint32_t to unsigned long.
Fix this to correctly print number of active cores in
rpm_master_stat.
Change-Id: Ibeacc5ac66535e373965d8f8e4919829367cc257
Signed-off-by: Maulik Shah <mkshah@codeaurora.org>
Depeng Shao [Thu, 11 May 2017 07:50:11 +0000 (15:50 +0800)]
msm: camera: sensor: Validate sensor name during probe
Some cameras have same sensor id in one device,
but camera sensor driver just validate sensor
id now which may result in wrong probe when camera
daemon is killed and camera re-probe sensor again.
Also validate the sensor name if sensor has probed.
Change-Id: I641bf8c346bada9e6cc619389077e25e666c743f
Signed-off-by: Depeng Shao <dshao@codeaurora.org>
Anirudh Ghayal [Mon, 15 May 2017 02:52:32 +0000 (08:22 +0530)]
ARM: dts: msm: Update charging ESR timer value to 96 for PM660 FG
Use the same FG ESR timer value (96) for charging and
discharging. This is to avoid the frequent periodic spur
seen in the RF performance with charger connected.
CRs-Fixed:
2046553
Change-Id: I9d1ad61f75f553bf527906715699817236f44b01
Signed-off-by: Anirudh Ghayal <aghayal@codeaurora.org>
Rob Clark [Tue, 3 May 2016 13:46:49 +0000 (09:46 -0400)]
drm/msm: drop return from gpu->submit()
At this point, there is nothing left to fail. And submit already has a
fence assigned and is added to the submit_list. Any problems from here
on out are asynchronous (ie. hangcheck/recovery).
Change-Id: Ib6b6bf00099137972649c97cc6cd8c4fe25ce7c3
Signed-off-by: Rob Clark <robdclark@gmail.com>
Git-commit:
1193c3bcb581807d58dd7df90528ec744af387a9
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
[smasetty@codeaurora.org: fixed merge conflict issues; made corresponding
changes to A5XX submit function.]
Signed-off-by: Sharat Masetty <smasetty@codeaurora.org>
Udaya Bhaskara Reddy Mallavarapu [Sat, 6 May 2017 13:47:16 +0000 (19:17 +0530)]
media: dvb-core: Fix coding errors in broadcast drivers
Added Check to verify TSPP channel input source is valid.
Initialize return variables to return correct values in fail conditions.
Move deferencing of input pointer arguments after NULL checking.
CR's-Fixed:
2043689
Change-Id: I7febdb0e0f499846cfcf8836ea35c8547a5074fb
Signed-off-by: Udaya Bhaskara Reddy Mallavarapu <udaym@codeaurora.org>
Linux Build Service Account [Sat, 13 May 2017 23:25:55 +0000 (16:25 -0700)]
Merge "drm/msm: make msm_drm.h uapi header safe for C++"
Stephen Boyd [Fri, 12 May 2017 15:47:47 +0000 (08:47 -0700)]
ARM64: Make KERNEL_TEXT_RDONLY depend on !DEBUG_RODATA
KERNEL_TEXT_RDONLY is similar to DEBUG_RODATA, but it relies on
4k pages to be made, whereas DEBUG_RODATA can work with or
without 4k pages. Let's move the depends on statement from
FORCE_PAGES to KERNEL_TEXT_RDONLY to accurately reflect the real
dependency here. This fixes a warning where we have FORCE_PAGES
enabled but DEBUG_RODATA is also enabled at the same time because
the latter is "default y" now and the depends on for FORCE_PAGES
can't be satisfied. In fact, it's OK for FORCE_PAGES to be
enabled at the same time as DEBUG_RODATA, it's really there to
prevent KERNEL_TEXT_RDONLY being enabled at the same time as
DEBUG_RODATA. Move the depends on to make things clearer.
Change-Id: Ie73b768ed4540cdb4d752a9b5f1a049bf644bc7e
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Olav Haugan [Wed, 10 May 2017 23:26:38 +0000 (16:26 -0700)]
defconfig: msmcortex: Cleanup
Sync defconfig with make menuconfig output.
Change-Id: Ieefef23fe14676007580c524268ef2a228d38059
Signed-off-by: Olav Haugan <ohaugan@codeaurora.org>
Stephen Boyd [Thu, 11 May 2017 21:44:43 +0000 (14:44 -0700)]
ASoC: wcd: Depend on right config option
Kconfig doesn't have the CONFIG_ part of the option, so don't use
it here. This fixes a kconfig warning about missing a dependency
for "CONFIG_SPI" which doesn't exist because it's supposed to be
"SPI".
Change-Id: Ie449ff250dd87b0a445d34ee079082c6e91f147c
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Ashay Jaiswal [Wed, 3 May 2017 09:40:25 +0000 (15:10 +0530)]
qpnp-smb2: Add software based glitch filter for OTG detection
When the USB_ID line is pulled low for a very short time there is a
possibility that the SW misses rising edge(removal) event. This may
lead to the state where charger is stuck in the boost-mode forever.
Fix this my adding a SW based glitch logic which checks for the
USB_ID after a SW debounce time and then notifies its presence/removal to
the USB driver.
CRs-Fixed:
2044958
Change-Id: I31974f7d68b435bbef329278cedbd726ada02e3f
Signed-off-by: Ashay Jaiswal <ashayj@codeaurora.org>
Saranya Chidura [Fri, 12 May 2017 09:55:10 +0000 (15:25 +0530)]
defconfig: msm: remove dcc config for perf on sdm660
remove the DCC_CONFIG option in perf defconfig for SDM660
target.
Change-Id: Id1b019a5eb1c6a71d4b5e6e854e642411714a900
Signed-off-by: Saranya Chidura <schidura@codeaurora.org>