Commit graph

589886 commits

Author SHA1 Message Date
Linux Build Service Account
b133f848d1 Merge "mmc: block: Disable clock scaling during shutdown" 2017-05-25 15:51:51 -07:00
Linux Build Service Account
8a4a2650e0 Merge "drm/sde: only set split registers for DSI interfaces" 2017-05-25 15:51:50 -07:00
Linux Build Service Account
0c3a4a97b1 Merge "SDM660: ADSPRPC: Fix for NULL pointer dereference" 2017-05-25 15:51:49 -07:00
Linux Build Service Account
599b4011d6 Merge "drm/msm: wait fence complete before flip" 2017-05-25 15:51:48 -07:00
Linux Build Service Account
768b5c4389 Merge "soc: qcom: Fix failure prints in rpm stats and log" 2017-05-25 15:51:47 -07:00
Linux Build Service Account
207cc877c1 Merge "policy_engine: Don't allow MODE change if no active connection" 2017-05-25 15:51:46 -07:00
Linux Build Service Account
136473547f Merge "power: qpnp-smb2: remove workaround for USBIN supplied VCONN" 2017-05-25 15:51:45 -07:00
Linux Build Service Account
8d140659e0 Merge "msm: ais: Security fixes for ispif and cpp" 2017-05-25 15:51:44 -07:00
Linux Build Service Account
3b0f0430c6 Merge "ARM: dts: msm: Add USB2 device node for SDM660" 2017-05-25 15:51:41 -07:00
Linux Build Service Account
c1a961ce2f Merge "coresight-remote-etm: Adds missing lock to avoid race condition" 2017-05-25 15:51:40 -07:00
Linux Build Service Account
3964778c1a Merge "Merge remote-tracking branch 'origin/tmp-285c137' into msm-4.4" 2017-05-25 15:51:39 -07:00
Linux Build Service Account
e1cafe626d Merge "USB: composite: Advertise USB version as 0x200 if max speed is HS" 2017-05-25 15:51:38 -07:00
Linux Build Service Account
bb0e94e12d Merge "ARM: dts: msm: Update ref-clk node for sdm660" 2017-05-25 15:51:37 -07:00
Linux Build Service Account
e40889b85d Merge "usb: phy-msm-qusb-v2: Add support for reference counting of regulators" 2017-05-25 15:51:35 -07:00
Linux Build Service Account
23dec079ae Merge "ASoC: msm-cpe: Fix range checking in function fw_name_store" 2017-05-25 15:51:34 -07:00
Linux Build Service Account
61bb06dc05 Merge "input: synaptics_dsx: fix mutex init" 2017-05-25 15:51:33 -07:00
Linux Build Service Account
03144dd756 Merge "soc: qcom: msm_perf: Initialize Array elements" 2017-05-25 15:51:32 -07:00
Linux Build Service Account
4b9efedb4a Merge "ARM: dts: msm: Add flash handle to camera1 device on SDM660" 2017-05-25 15:51:32 -07:00
Linux Build Service Account
c63ad80553 Merge "drm/msm: deal with arbitrary # of cmd buffers" 2017-05-25 15:51:31 -07:00
Linux Build Service Account
8d009ce8ad Merge "msm: camera: isp : Fix race condition in close sequence" 2017-05-25 15:51:30 -07:00
Linux Build Service Account
09db61a0c0 Merge "ARM: dts: msm: Add entry for video throttle clock on sdm660 and sdm630" 2017-05-25 15:51:29 -07:00
Linux Build Service Account
89e9361ac2 Merge "firmware_class: Avoid pending list corruption" 2017-05-25 15:51:28 -07:00
Linux Build Service Account
12d9944bfa Merge "ASoC: msm: qdsp6v2: Fix voice call and record SSR test" 2017-05-25 15:51:27 -07:00
Linux Build Service Account
8a0aed96a2 Merge "usb: policy_engine: Close pd phy after exceeding SINK hard reset count" 2017-05-25 15:51:26 -07:00
Terence Ho
f40088eb36 msm: ais: Security fixes for ispif and cpp
Check the user parameters in ispif to prevent buffer overflow.
Fix out-of-bounds frame or command buffer access in cpp.

CRs-fixed: 1097390 2002207
Change-Id: Ifdaf223d1b1c418596c2fb43d970dad728abd4a3
Signed-off-by: Terence Ho <terenceh@codeaurora.org>
Signed-off-by: Andy Sun <bins@codeaurora.org>
2017-05-22 11:29:54 +08:00
Linux Build Service Account
60be71604a Merge "qpnp-smb2: fix FV and FCC reporting" 2017-05-20 01:37:19 -07:00
Linux Build Service Account
474a2a48ad Merge "msm: vidc: Cancel userptr validation during secure decode" 2017-05-20 01:37:18 -07:00
Linux Build Service Account
9ec1caea12 Merge "ASoC: msm: qdspv2: Rename HDMI drift mixer controls" 2017-05-20 01:37:17 -07:00
Linux Build Service Account
2bb69ccc76 Merge "ion: fix logical-not comparison warning" 2017-05-20 01:37:16 -07:00
Linux Build Service Account
bb49ae3282 Merge "coresight-tmc: Adds lock to avoid race condition" 2017-05-20 01:37:15 -07:00
Linux Build Service Account
df39bd34da Merge "msm: wlan: Update regulatory database" 2017-05-20 01:37:14 -07:00
Linux Build Service Account
d4f03a30ac Merge "msm_11ad: clear affinity hint upon low bus request" 2017-05-20 01:37:13 -07:00
Linux Build Service Account
49ccf3da5b Merge "ARM: dts: msm: Add support for multiple neutrino on msm8996" 2017-05-20 01:37:12 -07:00
Linux Build Service Account
bd4d7e0de5 Merge "drm/msm: Don't allow zero sized buffer objects" 2017-05-20 01:37:11 -07:00
Linux Build Service Account
e650018e4a Merge "msm: camera: sensor: Validate sensor related name length" 2017-05-20 01:37:10 -07:00
Linux Build Service Account
63a4b33cb4 Merge "msm: camera: sensor: Validate sensor name during probe" 2017-05-20 01:37:09 -07:00
Abhijeet Dharmapurikar
db1755be6c 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>
2017-05-19 14:11:30 -07:00
Abhijeet Dharmapurikar
b186b398d9 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>
2017-05-19 14:11:08 -07:00
Vijay Viswanath
7b46835e9f mmc: block: Disable clock scaling during shutdown
During shutdown of sdhc drivers, power off notification (PON) is sent
to eMMC device. But it doesn't prevent the clock scaling framework
from kicking in and sending commands to card after PON is sent. So
exit clock scaling framework of sdhc before PON is sent.

Change-Id: Ibfe097732042458965db529f235a7fd28cfabaab
Signed-off-by: Vijay Viswanath <vviswana@codeaurora.org>
2017-05-19 16:31:49 +05:30
Vijay Viswanath
688129aafb mmc: core: Avoid returning error when clok scaling devfreq is removed
When resume clock scaling is not possible because there is no devfreq
framework, it is not an error. So avoid printing an error and return
success. This is necessary in certain scenarios like during shutdown
where we unregister the clock scaling devfreq.

Change-Id: Ib37eabdcdbbb58a336ee87220e5758bb559625af
Signed-off-by: Vijay Viswanath <vviswana@codeaurora.org>
2017-05-19 16:31:28 +05:30
Vijayavardhan Vennapusa
5980a4dca5 ARM: dts: msm: Add USB2 device node for SDM660
Add USB2 device node for SDM660 for using secondary USB2 port
in host only mode.

Change-Id: I8ff06411902bcafbb5b3f429634760d4c44a7b20
Signed-off-by: Vijayavardhan Vennapusa <vvreddy@codeaurora.org>
2017-05-19 12:55:14 +05:30
Maulik Shah
d4d2b1a9c3 soc: qcom: Fix failure prints in rpm stats and log
Correct failure prints in rpm stats and rpm log drivers.

Change-Id: I4a2d4a8cf4df4c9c1d750a65beb7454041fc06c2
Signed-off-by: Maulik Shah <mkshah@codeaurora.org>
2017-05-19 09:31:30 +05:30
Prabhakar Reddy Krishnappa
c3f5cca88f 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>
2017-05-18 17:43:17 -07:00
Vijayavardhan Vennapusa
c20c74d49c ARM: dts: msm: Remove TCSR_QUSB2_PHY_CLAMP_DIG_N_1P8 for SDM660
Remove TCSR_QUSB2_PHY_CLAMP_DIG_N_1P8 resource entry for SDM660
which is not required to set now during disconnect as writing to this
register causes USB3.0 port and USB2.0 ports working independently.

Change-Id: Ifb91c4e493ca1ecd31ef649c9e85acd809b9eec6
Signed-off-by: Vijayavardhan Vennapusa <vvreddy@codeaurora.org>
2017-05-18 18:34:47 +05:30
Vijayavardhan Vennapusa
3962558023 usb-phy-qusb: powerdown PHY during disconnect to avoid leakage
Currently PHY driver is using TCSR_QUSB2PHY_CLAMP_DIG_N_1P8 register
to avoid leakage issue seen during disconnect. But this could fail
USB ports working independently if this register is used as that
could clamp both inputs going to two QUSB2 PHY on platforms having
USB2 port. To fix this, it is recommended to powerdown QUSB2 PHY
by setting powerdown bit in  QUSB2PHY_PORT_POWER_DOWN register
during disconnect and removing writing 0x0 to TCSR register. Removed
updating TCSR register from dts file as separate change.

Change-Id: I6b0915faa346e5d88310106eeddb3c7a1bfb1d08
Signed-off-by: Vijayavardhan Vennapusa <vvreddy@codeaurora.org>
2017-05-18 18:33:56 +05:30
Vijayavardhan Vennapusa
74fd4e30fc USB:dwc3-msm: Don't schedule work if pm_qos_latency is zero
Currently driver is scheduling pm_qos_work again even though
pm_qos_latency is not passed from dts file. Add a check for
pm_qos_latency and don't schedule work if pm_qos_latency value
is zero. Also remove use of static variable for last_irq_count and
add the variable for the same in dwc3 structure for the case where
multi DWC3 usages are used.

Change-Id: I55e1e3a7d48fbea0a421802aae176ac57a48869f
Signed-off-by: Vijayavardhan Vennapusa <vvreddy@codeaurora.org>
2017-05-18 18:31:53 +05:30
Mukesh Ojha
81f3b9aab8 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>
2017-05-18 17:52:26 +05:30
Tharun Kumar Merugu
6e853a66c3 SDM660: ADSPRPC: Fix for NULL pointer dereference
Fixing NULL pointer dereference in fastrpc_device_ioctl

Change-Id: I240e6eae69f9ab4831352a8bf160d5f0e8a98b1b
Acked-by: Chenna Kesava Raju <chennak@qti.qualcomm.com>
Signed-off-by: Tharun Kumar Merugu <mtharu@codeaurora.org>
2017-05-18 04:33:32 -07:00
Vijayavardhan Vennapusa
0355a024aa policy_engine: Don't allow MODE change if no active connection
Currently driver is allowing MODE change even if there is no active
cable connection and is waiting for to complete.  For this MODE
change to complete,  driver first sets power role to none to do
type C disconnect and then switch to new mode.  Here disconnect won't
come as there is no active cable connection. Fix this issue by returning
error in case there is no active connection.

Change-Id: Ie423bd8b61ab7b2624f98c84e8d8e75b6c853b00
Signed-off-by: Vijayavardhan Vennapusa <vvreddy@codeaurora.org>
2017-05-18 02:25:22 -07:00
Sudarshan Rajagopalan
11926cbd03 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>
2017-05-17 05:48:18 -07:00