Commit graph

592477 commits

Author SHA1 Message Date
Linux Build Service Account
6f1a42cbc9 Merge "qcom: qpnp-haptic: Disable haptics when enable time specified is zero" 2017-08-08 09:02:09 -07:00
Linux Build Service Account
a42bc74491 Merge "drm/msm: reset TMDS clock ratio bit when disabling scrambler" 2017-08-08 09:02:08 -07:00
Linux Build Service Account
6d76f20002 Merge "ARM: dts: msm: Set FDE key size to 256bit for sdm630" 2017-08-08 09:02:07 -07:00
Linux Build Service Account
c75201c442 Merge "ARM: dts: msm: Config sleep state for wlan bootstrap pin for msm8996" 2017-08-08 09:02:05 -07:00
Linux Build Service Account
e9249c8420 Merge "msm: ipa3: fix compatibility with ipa kernel tests" 2017-08-08 09:02:04 -07:00
Anirudh Ghayal
7eb49b3251 qcom: qpnp-haptic: Disable haptics when enable time specified is zero
The vibrator HAL expects vibration to be disabled when the 'enable'
time specified is 0. Fix this.

CRs-Fixed: 2083994
Change-Id: I12843233da5429ed2fd53f33617952b1dd0ddcd5
Signed-off-by: Anirudh Ghayal <aghayal@codeaurora.org>
2017-08-08 06:02:48 +05:30
Abhinav Kumar
ee79d2fe34 drm/msm: reset TMDS clock ratio bit when disabling scrambler
Currently, when scrambler is disabled the TMDS clock ratio bit
is left untouched. Ideally the sink should reset this bit during
hot plug OR no-signal cases. However, the HDMI spec requires this
bit to be explicitly reset by the source.

Add support to reset this bit during scrambler disable.

Change-Id: I092f6cae84653940e2bdb9100df5e384084cf938
Signed-off-by: Abhinav Kumar <abhinavk@codeaurora.org>
2017-08-07 15:54:50 -07:00
Linux Build Service Account
0c4cf52730 Merge "soc: qcom: scm: fix boot issue when compiled with clang" 2017-08-07 15:48:18 -07:00
Satya Durga Srinivasu Prabhala
1b81606bf7 soc: qcom: scm: fix boot issue when compiled with clang
As per SMC Calling Convention, X4/W4, X5/W5 & X6/W6 registers
return state is unpredictable. But, inline assembly in scm
driver did not correctly specify output markers, which is
causing compiler to move instructions around when clang is
used to compile, which inturn causing deadlock and boot issue
during firmware loading. Add X4/W4, X5/W5 & X6/W6 registers
to output operand list to fix the deadlock during firmware
loading.

Change-Id: I1e4d51a58cd34c31fc63bcd21a20bfd15498bdc3
Signed-off-by: Satya Durga Srinivasu Prabhala <satyap@codeaurora.org>
2017-08-07 11:31:12 -07:00
Linux Build Service Account
58274ed8f1 Merge "msm: wlan: Update regulatory database" 2017-08-07 04:11:20 -07:00
Linux Build Service Account
d982ce36ca Merge "msm: wlan: Update regulatory database" 2017-08-07 04:11:19 -07:00
Linux Build Service Account
d304dfa6f9 Merge "ath10k: Disconnect QMI client in case of load failure" 2017-08-07 04:11:18 -07:00
Linux Build Service Account
7ac4b34c4b Merge "leds: qpnp-flash-v2: Calculate the IRES current dynamically" 2017-08-07 04:11:17 -07:00
Linux Build Service Account
515486b0bf Merge "msm: usb_bam: replace %p with %pK" 2017-08-07 04:11:15 -07:00
Linux Build Service Account
61dac4648d Merge "drm/edid: add colorimetry block parsing support" 2017-08-07 04:11:14 -07:00
Linux Build Service Account
de64b55406 Merge "drm/edid: add support for parsing quantization select field" 2017-08-07 04:11:13 -07:00
Linux Build Service Account
3f5958b23f Merge "msm: mdss: Add VIG double buffered CSC capability" 2017-08-07 04:11:12 -07:00
Linux Build Service Account
32504b6a41 Merge "msm: wlan: Update regulatory database" 2017-08-07 04:11:11 -07:00
Linux Build Service Account
865caab613 Merge "msm: kgsl: Disable VPC all flat shading optimization for A5XX" 2017-08-07 04:11:10 -07:00
Linux Build Service Account
ee6cbb5f25 Merge "msm: kgsl: Protect the event->handle with spinlock" 2017-08-07 04:11:09 -07:00
Linux Build Service Account
d64a04c285 Merge "msm: ais: Bound check for num_of_stream" 2017-08-07 04:11:08 -07:00
Neeraj Soni
cab4692597 ARM: dts: msm: Set FDE key size to 256bit for sdm630
Set FDE encryption key size to 256bit for sdm630
target.

Change-Id: I4314c1408fb6cadcdb8d81a02a4dccb55f3f9065
Signed-off-by: Neeraj Soni <neersoni@codeaurora.org>
2017-08-07 13:29:14 +05:30
Kiran Gunda
04a9881aa7 leds: qpnp-flash-v2: Calculate the IRES current dynamically
Fix the out of bound ITARGET register programming by calculating the
LED_IRESOLUTION current dynamically based on the flash current requested
by the client.

CRs-Fixed: 2066263
Change-Id: Ifba232ab4af5493feef53e331bccdc55c6109246
Signed-off-by: Kiran Gunda <kgunda@codeaurora.org>
2017-08-06 22:35:57 -07:00
Linux Build Service Account
d843c02a78 Merge "power: qpnp-fg-gen3: improve cycle counter algorithm" 2017-08-06 20:32:57 -07:00
Linux Build Service Account
977b2f7055 Merge "msm: kgsl: Fix integer overflow in _load_gpmu_firmware" 2017-08-06 07:43:00 -07:00
Amir Levy
86555dde84 msm: ipa3: fix compatibility with ipa kernel tests
Add several defines and structs to allow IPA kernel tests running.

Change-Id: I9c8f114b28aa617bdf1bfe56b44b73852a178ece
Acked-by: Dmitry Kogan <dmitryk@qti.qualcomm.com>
Signed-off-by: Amir Levy <alevy@codeaurora.org>
2017-08-06 01:10:29 -07:00
Linux Build Service Account
ca652b3d74 Merge "power: qcom-step-chg: Add temperature based step-charging" 2017-08-05 05:27:02 -07:00
Sarada Prasanna Garnayak
45bdc1b602 ARM: dts: msm: Config sleep state for wlan bootstrap pin for msm8996
Configure the sleep state for the wlan bootstrap pin for
msm8996. This configuration helps in power saving during
device sleep state.

CRs-Fixed: 1040537
Change-Id: Ia35f8bba901826b55722cb140c953f32b18610de
Signed-off-by: Sarada Prasanna Garnayak <sgarna@codeaurora.org>
2017-08-04 11:28:10 -07:00
Sarada Prasanna Garnayak
b094306e99 ARM: dts: msm: add fixed regulator support for wlan_en for msm8996
The QCA wlan chipset uses tlmm, msm and pmic gpio for the WLAN_EN
signal pin. The tlmm or msm gpio uses pinctrl or gpio library for
configuring the sleep/active state runtime.

The pmic gpio runtime configuration is not feasible using gpio
library or pinctrl framework. Convert the pmic gpio to fixed
regulator to runtime control(enable/disable) via regulator framework.

CRs-Fixed: 1040537
Change-Id: I4963c2753b463d5852a847a20fe280107abca337
Signed-off-by: Sarada Prasanna Garnayak <sgarna@codeaurora.org>
2017-08-04 11:28:03 -07:00
Sarada Prasanna Garnayak
2329e5a6ad net: cnss: add fixed regulator support for wlan enable pin
The QCA wlan chipset uses tlmm, msm and pmic gpio for the WLAN_EN
signal pin. The tlmm or msm gpio uses pinctrl or gpio library for
configuring the sleep/active state runtime.

The pmic gpio runtime configuration is not feasible using gpio
library or pinctrl framework. Convert the pmic gpio to fixed
regulator to runtime control(enable/disable) via regulator framework.

CRs-Fixed: 1040537
Change-Id: Ie74a659f309f248d335e03ca7a0a00244e9715b4
Signed-off-by: Sarada Prasanna Garnayak <sgarna@codeaurora.org>
2017-08-04 11:27:37 -07:00
Subbaraman Narayanamurthy
183bc63f12 power: qpnp-fg-gen3: improve cycle counter algorithm
Currently, when the charging status transitions to a state other
than charging, cycle counter algorithm stores the cycle count for
all the buckets for which the counting had started. This is fine
with respect to the algorithm.

However with qnovo enabled charging, this can cause issues when
charging status can go to not charging intermittently causing the
cycle count to be stored multiple times for a bucket. Modify the
logic to check for the charge termination or the presence of
input to go through all the buckets for storing the count. Also,
increment and store the counter only if battery SOC had increased
more than 2 LSBs for that SOC bucket.

While at it, run cycle_counter algorithm as a function instead
of a work. Also, keep the usage of cycle counter feature enable
flag inside the cycle counter APIs.

Change-Id: I62a92964ccbc6b965af09696deddc6fa8366a841
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
2017-08-04 11:17:04 -07:00
Nicholas Troast
96168e19d4 power: qpnp-fg-gen3: make TTF monotonic by limiting slope
Currently if there is a spike in system load or a thermal event which
causes the battery current to change dramatically then the TTF can jump.

While a battery is charging the TTF should be monotonically decreasing.

Track the TTF starting with the first estimate and set hard bounds of -2
and -0.1 on the slope. The negative slope ensures the TTF is
monotonically decreasing and the hard bounds on the slope smooth out
significant changes in the TTF.

Change-Id: I68a934599ff25bc5a9eb67b372b28a723532a540
Signed-off-by: Nicholas Troast <ntroast@codeaurora.org>
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
2017-08-04 11:17:03 -07:00
Nicholas Troast
811a8bd2ef power: qpnp-fg-gen3: optimize TTF for QNOVO
QNOVO provides a table of expected charge current settings across the
charge cycle. Use this table to calculate the time it will take to
charge in each step. The sum of these steps is the total time it will
take to fully charge a battery.

Change-Id: I0ed48a2a63886531e761e7ce1d175a600060eaf8
Signed-off-by: Nicholas Troast <ntroast@codeaurora.org>
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
2017-08-04 11:17:02 -07:00
Nicholas Troast
e55198f9ef power: qpnp-fg-gen3: prepare for QNOVO TTF
Micro resolution and 64-bit division is unnecessary; use milli
resolution instead. Measuring the IBATT and VBATT periodically during
sleep is necessary for accuracy. Don't clear the IBATT and VBATT buffers
on suspend to account for the higher charge current during suspend.
Prime the IBATT and VBATT buffers with 10 samples to get a more accurate
first estimate. Introduce a ttf mode to separate the differences in the
QNOVO version of TTF.

Change-Id: Ibc591dd5d38d4bbb712d8906755040d59181f008
Signed-off-by: Nicholas Troast <ntroast@codeaurora.org>
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
2017-08-04 11:16:53 -07:00
Linux Build Service Account
8b13ff9487 Merge "mmc: card: Fix NULL pointer dereference in mmc_blk_ioctl_rpmb_cmd()" 2017-08-04 09:12:20 -07:00
Linux Build Service Account
0588796708 Merge "msm: mhi: initialize variables to default values" 2017-08-04 09:12:19 -07:00
Rajeev Kumar Sirasanagandla
0a155e2560 msm: wlan: Update regulatory database
Update tx power of lower 5GHz band of US country according
to master sheet.

CRs-Fixed: 2084867
Change-Id: I18c500d5d125ef73b47c6cda120541df98881537
Signed-off-by: Rajeev Kumar Sirasanagandla <rsirasan@codeaurora.org>
2017-08-04 20:30:09 +05:30
Govind Singh
fc27fc9bcd ath10k: Disconnect QMI client in case of load failure
QMI client is not disconnected if driver is failed to load
due to mode response timeout.

Disconnect QMI client if driver is failed to load after
starting QMI services.

Change-Id: I36b059fbe3254990ad6daa13533122497805e649
Signed-off-by: Govind Singh <govinds@codeaurora.org>
2017-08-04 17:06:10 +05:30
Abhilash Kumar
fde778c14a msm: kgsl: Fix integer overflow in _load_gpmu_firmware
There is a possibility of integer overflow in the arithmetic
calculation for cmd_size. Fix this by adding checks for such
arithmetic.

Change-Id: I2298a32f8ba3411decb29f55bb7b55e2214de35a
Signed-off-by: Abhilash Kumar <krabhi@codeaurora.org>
2017-08-04 04:33:52 -07:00
Liangliang Lu
8482c665ba msm: usb_bam: replace %p with %pK
Format specifier %p can leak kernel addresses while not valuing the
kptr_restrict system settings. When kptr_restrict is set to (1), kernel
pointers printed using the %pK format specifier will be replaced with
0's.

Debugging Note : &pK prints only Zeros as address. If you need actual
address information, write 0 to kptr_restrict.
echo 0 > /proc/sys/kernel/kptr_restrict

Change-Id: If3e3a7d5c737b8b7e2c2f78e2814747db4a770cd
Signed-off-by: Liangliang Lu <luliang@codeaurora.org>
2017-08-04 17:51:38 +08:00
Linux Build Service Account
d4a6462641 Merge "msm: kgsl: Add a trace event for the GPU clock" 2017-08-03 20:51:29 -07:00
Linux Build Service Account
17273e1577 Merge "drm/msm: Fix race condition in the submit path" 2017-08-03 20:51:28 -07:00
Linux Build Service Account
a0a59b7732 Merge "ion: Set the page private bit for secure CMA buffers" 2017-08-03 20:51:28 -07:00
Linux Build Service Account
48223b4b23 Merge "cnss: Correct boot sequence for WLAN hardware" 2017-08-03 20:51:27 -07:00
Linux Build Service Account
e5d965417f Merge "msm: kgsl: Set the abnormal power perf counter value to zero" 2017-08-03 20:51:26 -07:00
Linux Build Service Account
77be18d0c9 Merge "msm: mdss: setup infoframe for all HDMI modes" 2017-08-03 20:51:24 -07:00
Linux Build Service Account
647fc98bc8 Merge "msm: mdss: Fix the DSI lane swap programming logic" 2017-08-03 20:51:23 -07:00
Linux Build Service Account
d56f94c6dc Merge "ARM: dts: msm: Add physical width and height for sharp 4k panel" 2017-08-03 20:51:22 -07:00
Linux Build Service Account
1a607a6536 Merge "msm: ADSPRPC: Queue receive intent for adsprpc glink channel" 2017-08-03 20:51:14 -07:00
Linux Build Service Account
11623fddcd Merge "perf/core: Fix crash in perf_event_read()" 2017-08-03 20:51:14 -07:00