Commit graph

575912 commits

Author SHA1 Message Date
Linux Build Service Account
f9e72fc169 Merge "iommu: msm: add barrier call on coherent lazy map" 2016-10-11 01:16:57 -07:00
Linux Build Service Account
39de1de421 Merge "iommu/io-pgtable-arm: Make cacheable mappings outer-shareable" 2016-10-11 01:16:56 -07:00
Linux Build Service Account
ec859f16f6 Merge "iommu: Remove obsolete domain attribute" 2016-10-11 01:16:56 -07:00
Linux Build Service Account
772e0827b3 Merge "iommu/arm-smmu: Remove DOMAIN_ATTR_COHERENT_HTW_DISABLE" 2016-10-11 01:16:55 -07:00
Linux Build Service Account
95e0723486 Merge "icnss: Remove obsolete IOMMU domain attribute" 2016-10-11 01:16:55 -07:00
Linux Build Service Account
5b9a8f932e Merge "msm: ADSPRPC: Remove obsolete IOMMU domain attribute" 2016-10-11 01:16:54 -07:00
Linux Build Service Account
3fe3b20c5e Merge "msm: kgsl: Remove obsolete IOMMU domain attribute" 2016-10-11 01:16:53 -07:00
Linux Build Service Account
90201c4964 Merge "msm: mdss: Remove obsolete IOMMU domain attribute" 2016-10-11 01:16:51 -07:00
Linux Build Service Account
2e928295ca Merge "tcp: make challenge acks less predictable" 2016-10-10 18:28:37 -07:00
Linux Build Service Account
6a9cd0c699 Merge "msm: kgsl: Modify dispatcher to accept generic objects" 2016-10-10 18:28:35 -07:00
Linux Build Service Account
664fd91a17 Merge "input: misc: pat9125: code clean-up in pat9125 driver" 2016-10-10 18:28:34 -07:00
Linux Build Service Account
7aa0f78d97 Merge "ARM: dts: msm: Add revid phandle to read FAB ID" 2016-10-10 18:28:32 -07:00
Linux Build Service Account
140302afbd Merge "iio: rradc: Add temperature compensation for die temperature" 2016-10-10 18:28:32 -07:00
Linux Build Service Account
9ed826722e Merge "ARM: dts: msm: add VDD_APC0/1 CPR aging configurations for msmcobalt" 2016-10-10 18:28:30 -07:00
Linux Build Service Account
3e53c4d76c Merge "qcom-charger: software fix for OTG soft-start" 2016-10-10 18:28:29 -07:00
Linux Build Service Account
4fc0b5ac1b Merge "msm: gsi: driver upgrade for gsi version 1.2 and 1.3" 2016-10-10 18:28:28 -07:00
Linux Build Service Account
fe9dc22a37 Merge "KEYS: Fix ASN.1 indefinite length object parsing" 2016-10-10 18:28:28 -07:00
Linux Build Service Account
9ab222a34e Merge "msm: cpp: Add support pagefault handler in CPP driver" 2016-10-10 18:28:26 -07:00
Linux Build Service Account
d22b9628a4 Merge "sched: Add cgroup attach functionality to the tune controller" 2016-10-10 18:28:25 -07:00
Linux Build Service Account
d396fc7c69 Merge "sched: Update the number of tune groups to 5" 2016-10-10 18:28:25 -07:00
Linux Build Service Account
7f3caa710f Merge "sched/tune: add initial support for CGroups based boosting" 2016-10-10 18:28:24 -07:00
Linux Build Service Account
db5b016bf7 Merge "qpnp-fg-gen3: add support to restart fuel gauge" 2016-10-10 18:28:21 -07:00
Linux Build Service Account
d610af9453 Merge "qpnp-fg-gen3: Add support to configure force battery profile loading" 2016-10-10 18:28:20 -07:00
Linux Build Service Account
6ce9b4fee4 Merge "msm: kgsl: Remove GPU BCL and LMH support" 2016-10-10 18:28:19 -07:00
Linux Build Service Account
8eea4dac61 Merge "mdss: DisplayPort: add support for multiple resolutions" 2016-10-10 18:28:16 -07:00
Linux Build Service Account
4d5d3bb023 Merge "msm: mdss: edid: limit resolutions support based on interface" 2016-10-10 18:28:16 -07:00
Linux Build Service Account
31e788f9f2 Merge "mdss: DisplayPort: update link-training settings and do DP reset" 2016-10-10 18:28:15 -07:00
Linux Build Service Account
5cdf898e80 Merge "ARM: dts: enable broadcast in nt35597 dual-dsi panels for msmcobalt" 2016-10-10 18:28:13 -07:00
Linux Build Service Account
587e8c28dd Merge "ARM: dts: reduce reset delays for nt35597 panels" 2016-10-10 18:28:12 -07:00
Linux Build Service Account
d0a8d1d591 Merge "msm: mdss: add mdp guard window property" 2016-10-10 18:28:11 -07:00
Linux Build Service Account
de4737612c Merge "msm: mdss: Fix concurrent writeback failures in end-to-end use cases" 2016-10-10 18:28:10 -07:00
Linux Build Service Account
cc67ae8322 Merge "usb: gadget: ncm: Add super speed descriptors for NCM function" 2016-10-10 18:28:09 -07:00
Linux Build Service Account
e552609350 Merge "fs: ext4: disable support for fallocate FALLOC_FL_PUNCH_HOLE" 2016-10-10 18:28:08 -07:00
Linux Build Service Account
b80f563674 Merge "msm: ipa: fix static analysis sign issue" 2016-10-10 18:28:07 -07:00
Linux Build Service Account
741ef4957e Merge "ARM: dts: msm: Add RFCLK2 for msmcobalt MTP/CDP" 2016-10-10 18:28:06 -07:00
Eric Dumazet
eede2b614d tcp: make challenge acks less predictable
Yue Cao claims that current host rate limiting of challenge ACKS
(RFC 5961) could leak enough information to allow a patient attacker
to hijack TCP sessions. He will soon provide details in an academic
paper.

This patch increases the default limit from 100 to 1000, and adds
some randomization so that the attacker can no longer hijack
sessions without spending a considerable amount of probes.

Based on initial analysis and patch from Linus.

Note that we also have per socket rate limiting, so it is tempting
to remove the host limit in the future.

v2: randomize the count of challenge acks per second, not the period.

Fixes: 282f23c6ee ("tcp: implement RFC 5961 3.2")
Reported-by: Yue Cao <ycao009@ucr.edu>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Suggested-by: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Yuchung Cheng <ycheng@google.com>
Cc: Neal Cardwell <ncardwell@google.com>
Acked-by: Neal Cardwell <ncardwell@google.com>
Acked-by: Yuchung Cheng <ycheng@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Change-Id: I1bf93d033e788c37899837f0c9e930bc4e20aa4c
Git-repo: http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git
Git-commit: 75ff39ccc1bd5d3c455b6822ab09e533c551f758
[d-cagle@codeaurora.org: Resolve trivial merge conflict]
Signed-off-by: Dennis Cagle <d-cagle@codeaurora.org>
2016-10-10 13:47:41 -07:00
David Howells
ba22ea5266 KEYS: Fix ASN.1 indefinite length object parsing
This fixes CVE-2016-0758.

In the ASN.1 decoder, when the length field of an ASN.1 value is extracted,
it isn't validated against the remaining amount of data before being added
to the cursor.  With a sufficiently large size indicated, the check:

	datalen - dp < 2

may then fail due to integer overflow.

Fix this by checking the length indicated against the amount of remaining
data in both places a definite length is determined.

Whilst we're at it, make the following changes:

 (1) Check the maximum size of extended length does not exceed the capacity
     of the variable it's being stored in (len) rather than the type that
     variable is assumed to be (size_t).

 (2) Compare the EOC tag to the symbolic constant ASN1_EOC rather than the
     integer 0.

 (3) To reduce confusion, move the initialisation of len outside of:

	for (len = 0; n > 0; n--) {

     since it doesn't have anything to do with the loop counter n.

Change-Id: I13b15885df9dc0c17a3e1670ae9606bf3ce4ba05
Signed-off-by: David Howells <dhowells@redhat.com>
Reviewed-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
Acked-by: David Woodhouse <David.Woodhouse@intel.com>
Acked-by: Peter Jones <pjones@redhat.com>
Git-repo: http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git
Git-commit: 23c8a812dc3c621009e4f0e5342aa4e2ede1ceaa
Signed-off-by: Dennis Cagle <d-cagle@codeaurora.org>
2016-10-10 13:33:13 -07:00
Linux Build Service Account
67598d8428 Merge "cpuidle: lpm-levels: Consider cluster history for LPM selection" 2016-10-10 11:51:07 -07:00
Linux Build Service Account
fde72cf8cb Merge "defconfig: Enable CONFIG_ICNSS_DEBUG for msmfalcon" 2016-10-10 11:51:06 -07:00
Syed Rameez Mustafa
2640728359 sched: Add cgroup attach functionality to the tune controller
This is required to allow tasks to freely move between cgroups associated
with the tune controller.

Change-Id: I1f39b957462034586edc2fdc0a35488b314e9c8c
Signed-off-by: Syed Rameez Mustafa <rameezmustafa@codeaurora.org>
2016-10-10 11:10:42 -07:00
Syed Rameez Mustafa
14b52227eb sched: Update the number of tune groups to 5
The schedtune controller will mimic the cpusets controller configuration
for now. For that we need to make 4 groups in addition to the root
group present by default.

Change-Id: I082f1e4e4ebf863e623cf66ee127eac70a3e2716
Signed-off-by: Syed Rameez Mustafa <rameezmustafa@codeaurora.org>
2016-10-10 11:10:41 -07:00
Patrick Bellasi
e89595cd93 sched/tune: add initial support for CGroups based boosting
To support task performance boosting, the usage of a single knob has the
advantage to be a simple solution, both from the implementation and the
usability standpoint.  However, on a real system it can be difficult to
identify a single value for the knob which fits the needs of multiple
different tasks. For example, some kernel threads and/or user-space
background services should be better managed the "standard" way while we
still want to be able to boost the performance of specific workloads.

In order to improve the flexibility of the task boosting mechanism this
patch is the first of a small series which extends the previous
implementation to introduce a "per task group" support.
This first patch introduces just the basic CGroups support, a new
"schedtune" CGroups controller is added which allows to configure
different boost value for different groups of tasks.
To keep the implementation simple but still effective for a boosting
strategy, the new controller:
  1. allows only a two layer hierarchy
  2. supports only a limited number of boost groups

A two layer hierarchy allows to place each task either:
  a) in the root control group
     thus being subject to a system-wide boosting value
  b) in a child of the root group
     thus being subject to the specific boost value defined by that
     "boost group"

The limited number of "boost groups" supported is mainly motivated by
the observation that in a real system it could be useful to have only
few classes of tasks which deserve different treatment.
For example, background vs foreground or interactive vs low-priority.
As an additional benefit, a limited number of boost groups allows also
to have a simpler implementation especially for the code required to
compute the boost value for CPUs which have runnable tasks belonging to
different boost groups.

Change-Id: I1304e33a8440bfdad9c8bcf8129ff390216f2e32
cc: Tejun Heo <tj@kernel.org>
cc: Li Zefan <lizefan@huawei.com>
cc: Johannes Weiner <hannes@cmpxchg.org>
cc: Ingo Molnar <mingo@redhat.com>
cc: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: Patrick Bellasi <patrick.bellasi@arm.com>
Git-commit: 13001f47c9
Git-repo: https://android.googlesource.com/kernel/common
Signed-off-by: Vikram Mulukutla <markivx@codeaurora.org>
2016-10-10 11:09:53 -07:00
Subbaraman Narayanamurthy
0edd25653c qpnp-fg-gen3: add support to restart fuel gauge
Add a module parameter "fg_restart" to restart the fuel gauge
without loading the battery profile. This will be useful in
geting a fresh SOC estimate whenever required.

Change-Id: I0c054ad523a0eab72f777d010807bb3a55f63f7e
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
2016-10-10 09:44:05 -07:00
Subbaraman Narayanamurthy
bd811f3afd qpnp-fg-gen3: Add support to configure force battery profile loading
Currently, FG_GEN3 driver loads the battery profile if it finds
out the profile loaded earlier doesn't match with the available
profile. This will be done when the profile integrity bit is
set already. Make this force profile loading as a configurable
parameter through a device tree property.

While at it, add a module parameter to dump the profile contents
conditionally. This will be helpful in debugging.

Change-Id: Ibaff55aa5434ee283e6d597485d193e9e52bb74e
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
2016-10-10 09:44:04 -07:00
Nicholas Troast
9435c04228 qpnp-fg-gen3: disable msoc-full and bsoc-delta IRQs as wakeup sources
msoc-full is not used to determine when the battery is full. The charger
will wakeup the device when it has terminated charging indicating that
the battery is full. Disable the msoc-full IRQ as a wakeup source.

The msoc-delta IRQ is used to wakeup the device when the SOC changes
therefore having the bsoc-delta IRQ as a wakeup source is unnecessary.
Disable the bsoc-delta IRQ as a wakeup source.

Change-Id: Iab7087ce3d6727abc852d3a84590cfa570ec584d
Signed-off-by: Nicholas Troast <ntroast@codeaurora.org>
2016-10-10 09:44:03 -07:00
Subbaraman Narayanamurthy
5b6c4f8f1b qpnp-fg-gen3: change the encoding for delta soc threshold
Currently, delta SOC threshold is written as a 8 bit value but
the encoding is in 11 bits. This will cause the delta SOC
threshold programmed to a lower value causing interrupts to fire
quickly. Change the numerator of delta SOC SRAM parameter so that
the delta SOC threshold will be set correctly. Maximum possible
threshold will be 12.45% (1/2048 * 255).

Change-Id: Ia908c917d71939b9d72b16ddca3400a692540bf3
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
2016-10-10 09:44:02 -07:00
Subbaraman Narayanamurthy
16b979380c ARM: dts: msm: add CC_CV threshold to itech/ascent FG_GEN3 battery profiles
Configure CC_CV threshold voltage to 4.34V for both itech and
ascent battery profiles that will be used by GEN3 fuel gauge
on pmicobalt.

CRs-Fixed: 1068593
Change-Id: I7df3d343afa62ffdbf6f5db8c7fc7d94e2f0e3a0
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
2016-10-10 09:44:02 -07:00
Subbaraman Narayanamurthy
5870397614 power: qpnp-fg-gen3: add support to configure VBtGTFltTh and VBtFull
Based on the battery profile parameters, Vbatt greater than float
voltage and full voltage thresholds needs to be configured. Add
support for the same. Since this needs the battery profile
parameters to be read in advance before the hardware is
initialized, shuffle the code to get battery profile early.

CRs-Fixed: 1068593
Change-Id: If5df62d933cc653a276967b3d16c080c6d4ecb2e
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
2016-10-10 09:43:33 -07:00
Hardik Kantilal Patel
a421f9710c defconfig: Enable CONFIG_ICNSS_DEBUG for msmfalcon
Enable CONFIG_ICNSS_DEBUG to enable driver debugging.

CRs-fixed: 1076049
Change-Id: I0d97a9aca9525da4aee6a9ddbf97849cd9c11a55
Signed-off-by: Hardik Kantilal Patel <hkpatel@codeaurora.org>
2016-10-10 06:14:51 -07:00
Linux Build Service Account
1fac7f53bd Merge "input: misc: pat9125: fix issues found in static analysis" 2016-10-10 05:57:59 -07:00