Commit graph

592453 commits

Author SHA1 Message Date
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
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
Linux Build Service Account
ca652b3d74 Merge "power: qcom-step-chg: Add temperature based step-charging" 2017-08-05 05:27:02 -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
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
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
Linux Build Service Account
607bbf6f9b Merge "input: touchpanel: fix wastes of time when resume and probe for ST's TP" 2017-08-03 20:51:13 -07:00
Linux Build Service Account
c430aad6dc Merge "msm: ipa3: Fix Q6 resourse manager de-init" 2017-08-03 20:51:10 -07:00
Linux Build Service Account
8bb4bde4b2 Merge "msm: ipa: Fix invalid source pipe index" 2017-08-03 20:51:09 -07:00
Linux Build Service Account
7c1c4a6ddb Merge "wcnss: remove the wcn external gpio configuration support" 2017-08-03 20:51:07 -07:00
Linux Build Service Account
bb954f3696 Merge "wcnss: Update the wcnss wlan module power up sequence" 2017-08-03 20:51:05 -07:00
Linux Build Service Account
9d32ab94d7 Merge "usb: f_qc_rndis: Fix rndis message parsing of erroneous requests" 2017-08-03 20:51:04 -07:00
Linux Build Service Account
aca4631c48 Merge "msm: ipa: Fix wrong usage and cleanup code" 2017-08-03 20:51:03 -07:00
Linux Build Service Account
ab774aaad3 Merge "usb: f_rndis: Fix rndis message parsing of erroneous requests" 2017-08-03 20:51:03 -07:00
Linux Build Service Account
66bb3e3558 Merge "msm: ipa: Add support for per client statistics and UL firewall" 2017-08-03 20:51:01 -07:00
Linux Build Service Account
1625604b6e Merge "sched: avoid RT tasks contention during sched boost" 2017-08-03 20:51:00 -07:00
Linux Build Service Account
73c7c075c8 Merge "Revert "perf: stop deadlock if attempt to bring cpu up fails"" 2017-08-03 20:50:59 -07:00
Linux Build Service Account
c19a0c49cb Merge "crypto: msm: Fix several race condition issues in crypto drivers" 2017-08-03 20:50:58 -07:00
Yue Ma
4a2171cd80 cnss: Correct boot sequence for WLAN hardware
Vote 1.8V IO and XTAL regulators before 3.3V VREG for WLAN hardware
to strictly follow the hardware requirement. Make sure 3.3V VREG is
voted at least 100us after 1.8V IO.

Change-Id: Ifc52c2062349a9913e6c998573b62d111faa5886
CRs-fixed: 1009287
Signed-off-by: Yue Ma <yuem@codeaurora.org>
2017-08-03 14:16:07 -07:00
Abhilash Kumar
696ce310cf msm: kgsl: Set the abnormal power perf counter value to zero
During preemption microcode does save restore for all perf
counters. If we read the power counters at preemption boundary
we might get abnormal value from the perf counter. This will
result in showing incorrect GPU busy percentage. Fix this by
setting the abnormal power perf counter value with zero.

Change-Id: I96ba367ceeeb92d6adb507d0d917113297b4b58d
Signed-off-by: Abhilash Kumar <krabhi@codeaurora.org>
2017-08-03 11:22:12 -07:00
Linux Build Service Account
4ba44196e6 Merge "cfg80211: Validate frequencies nested in NL80211_ATTR_SCAN_FREQUENCIES" 2017-08-03 10:08:03 -07:00
Linux Build Service Account
0e4e7eab42 Merge "power: fg-util: add median filter for circular buffer" 2017-08-03 10:07:58 -07:00
Linux Build Service Account
f473715d77 Merge "msm: ais: Make use of mutex lock to avoid race condition" 2017-08-03 10:07:57 -07:00
Linux Build Service Account
cf1869044b Merge "SoC: msm: audio-effects: return directly to avoid integer overflow" 2017-08-03 10:07:56 -07:00
Linux Build Service Account
071e7f4168 Merge "mmc: card: blk: Add support for deferred SD bus resume" 2017-08-03 10:07:55 -07:00
Linux Build Service Account
b26562a8d3 Merge "msm: kgsl: Disallow L2PC during wake up from SLUMBER" 2017-08-03 10:07:54 -07:00
Linux Build Service Account
a9009e8dd5 Merge "qcom: scm: update function return value and input parameter type" 2017-08-03 10:07:53 -07:00
Srinivas Dasari
486f03c640 cfg80211: Validate frequencies nested in NL80211_ATTR_SCAN_FREQUENCIES
validate_scan_freqs() retrieves frequencies from attributes
nested in the attribute NL80211_ATTR_SCAN_FREQUENCIES with
nla_get_u32(), which reads 4 bytes from each attribute
without validating the size of data received. Attributes
nested in NL80211_ATTR_SCAN_FREQUENCIES don't have an nla policy.

Validate size of each attribute before parsing to avoid potential buffer
overread.

Fixes: 2a51931192 ("cfg80211/nl80211: scanning (and mac80211 update to use it)")
Cc: stable@vger.kernel.org
Signed-off-by: Srinivas Dasari <dasaris@qti.qualcomm.com>
Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git
Git-commit: d7f13f7450369281a5d0ea463cc69890a15923ae
Change-Id: I34198e599a950c30495ec3445799972db7f9f42e
CRs-Fixed: 2069828
Signed-off-by: Srinivas Dasari <dasaris@codeaurora.org>
2017-08-03 08:26:09 -07:00
Rajeev Kumar Sirasanagandla
d4c4cc1284 msm: wlan: Update regulatory database
Add GI country to regulatory database

CRs-Fixed: 2084871
Change-Id: If8726ae6ee414b49e1efae65825601214a800092
Signed-off-by: Rajeev Kumar Sirasanagandla <rsirasan@codeaurora.org>
2017-08-03 20:14:39 +05:30