Commit graph

587836 commits

Author SHA1 Message Date
Linux Build Service Account
0fe2dba74c Merge "spmi: pmic-arb: Reserve a channel for debug port" 2017-04-18 06:29:42 -07:00
Linux Build Service Account
3327a91410 Merge "defconfig: msmcortex: Enable 8021Q config for APQ8098" 2017-04-18 06:29:41 -07:00
Linux Build Service Account
706c26b417 Merge "msm: isp: initialize pd stats buffer index" 2017-04-18 06:29:40 -07:00
Linux Build Service Account
c5c36cb00b Merge "msm: mdss: wait for one commit transfer for command mode after resume" 2017-04-18 06:29:39 -07:00
Linux Build Service Account
3c15507fd1 Merge "msm: camera: isp: Detect dual camera out of sync using time" 2017-04-18 06:29:31 -07:00
Luo Jie
ab0aad15d5 defconfig: msmcortex: Enable 8021Q config for APQ8098
8021Q enables kernel to handle VLAN packets, which is necessary
for the VLAN feature of alx.

Change-Id: I57c4bf7a40c5ad06b3c7414ae51691f006841ab9
Signed-off-by: Luo Jie <luoj@codeaurora.org>
2017-04-18 00:30:26 -07:00
Kiran Gunda
37e5cdce64 spmi: pmic-arb: Reserve a channel for debug port
Do not keep the channel reserved for debug port in the
ppid to apid mapping table. This is to avoid accessing
that particular channel during the read/write/irq operations.

Change-Id: I8f49d1d87978a5b68ea711d3e30606d72fd09f73
Signed-off-by: Kiran Gunda <kgunda@codeaurora.org>
2017-04-18 12:20:18 +05:30
Srikanth Uyyala
2f4908dc45 msm: isp: initialize pd stats buffer index
intialization of pd_stats buffer index during open node,
and after stats buf_divert.

Change-Id: I499371ddb4eddd74b759720d553164006c223f8a
Signed-off-by: Srikanth Uyyala <suyyala@codeaurora.org>
2017-04-17 22:41:54 -07:00
Linux Build Service Account
7f0d77b390 Merge "leds: qpnp-flash-v2: Change minimum current configuration" 2017-04-17 13:19:30 -07:00
Linux Build Service Account
d5311c5d43 Merge "ARM: dts: msm: Configure pin state for SMB1381 interrupt" 2017-04-17 06:01:41 -07:00
Linux Build Service Account
df2eb6a8bf Merge "soc:qcom: Synchronize service notifier task's" 2017-04-17 06:01:41 -07:00
Linux Build Service Account
38a8dd1dc3 Merge "core_ctl: Harden the adjustment_possible() check for unisolation" 2017-04-17 06:01:38 -07:00
Linux Build Service Account
8aa78dc580 Merge "usb: gadget: ffs: Fix runtime PM usage count for multiple set_alt" 2017-04-17 06:01:37 -07:00
Linux Build Service Account
0d6721c1e4 Merge "drivers: qcom: ultrasound: check concurrent device open operations" 2017-04-17 06:01:36 -07:00
Linux Build Service Account
fdb1d4a10f Merge "ARM: dts: msm: Enable register read based esd on sdm660 and sdm630" 2017-04-17 06:01:35 -07:00
Linux Build Service Account
e2b0c810d4 Merge "cpu-hotplug: Fix false error message in cpu_up()" 2017-04-17 06:01:34 -07:00
Linux Build Service Account
436a3b821c Merge "defconfig: msm: enable page poisoning by default" 2017-04-17 06:01:32 -07:00
Linux Build Service Account
0ce9249dee Merge "mm: allow page poisoning to be enabled by default." 2017-04-17 06:01:31 -07:00
Avaneesh Kumar Dwivedi
7961850500 soc:qcom: Synchronize service notifier task's
Queue the msg receive task in service notifier queue
so that it does not run concurrently with other notifier task. 
This avoid an issue where adsp ssr is stuck due to deadlock 
between msg receive and service arrive task.

Change-Id: I6ef9b765ae74eeb32021c2848ffc06d70df19c1b
Signed-off-by: Avaneesh Kumar Dwivedi <akdwived@codeaurora.org>
2017-04-16 23:29:28 -07:00
Divya Ojha
c57fa14c6a drivers: qcom: ultrasound: check concurrent device open operations
Make opened device count atomic variable to avoid probable race
condition. Race condition leads to memory leak and list corruption.

Change-Id: I4da98f27d36f616bc8fa7b1a848c20cc7eea04e5
Signed-off-by: Divya Ojha <dojha@codeaurora.org>
2017-04-16 23:12:58 -07:00
Linux Build Service Account
0293b8a7d0 Merge "qcom: smb-lib: rerun APSD on insertion for micro USB mode" 2017-04-16 21:49:18 -07:00
Prashanth Bhatta
a16fc7b970 cnss_prealloc: Remove WARN_ON
WARN_ON is unnecessary if pre-alloc table doesn't have any free
memory. Remove the WARN_ON as error log is enough to find out
missing entry.

Change-Id: I5a46e1f259e88d1a19f05195f5d7bb0745d072c3
CRs-fixed: 2030272
Signed-off-by: Prashanth Bhatta <bhattap@codeaurora.org>
2017-04-16 20:09:40 -07:00
Yingwei Zhao
b18d9ef97a ARM: dts: msm: Configure pin state for SMB1381 interrupt
GPIO21 is connected to SMB1381 STAT pin for interrupt detection,
configure it to pull up for sensing SMB1381's interrupt.

CRs-Fixed: 2033882
Change-Id: Ib88aac4acb3b1094adb13839cccf1aa27903b9c7
Signed-off-by: Yingwei Zhao <cyizhao@codeaurora.org>
2017-04-16 19:42:43 -07:00
Ashay Jaiswal
dabce32c24 qcom: smb-lib: rerun APSD on insertion for micro USB mode
In case of very slow insertion of SDP/DCP there is a possibility
that D+/D- makes contact while APSD is in progress. This will
result in an incorrect type detection.
Fix this by doing a APSD rerun after charger-type detection is
complete.

CRs-Fixed: 2032590
Change-Id: I0037b90f29dbe65a2cdb2771d5caceff77862f03
Signed-off-by: Ashay Jaiswal <ashayj@codeaurora.org>
2017-04-16 21:30:29 +05:30
Linux Build Service Account
9b3e8a81dc Merge "qcom: smb2: ensure QC adapter is at 5V at shutdown" 2017-04-15 23:11:11 -07:00
Pavankumar Kondeti
706e1daf94 core_ctl: Harden the adjustment_possible() check for unisolation
When the need for CPUs is more than the active CPUs and there are some
isolated CPUs, we wakeup the core_ctl thread to unisolate some CPUs.
The core_ctl task can't unisolate any CPU if all of them are isolated
by other clients. Track the number of isolated CPUs by core_ctl and
wakeup the core_ctl task when adjustment is really possible.

Change-Id: I11ef10860532df25cbde572aabd4b925320db8fe
Signed-off-by: Pavankumar Kondeti <pkondeti@codeaurora.org>
2017-04-15 17:48:48 +05:30
Pavankumar Kondeti
e0f82761c2 core_ctl: Update cluster->active_cpus in eval_need()
The cluster->active_cpus is not updated in eval_need(). The new need
for CPUs is compared against the previous cluster->active_cpus. If
another client isolates a CPU, cluster->active_cpus becomes stale and
we fail to detect the change in need for CPUs.

Change-Id: Ib58b8f0bd03dd2b4a174de2ac54eb0c60c59f9f7
Signed-off-by: Pavankumar Kondeti <pkondeti@codeaurora.org>
2017-04-15 17:48:48 +05:30
Pavankumar Kondeti
d0b971c53d core_ctl: Handle only CPU_ONLINE and CPU_DEAD notifications
We are interested in only CPU_ONLINE and CPU_DEAD notifications. Don't
do anything when other notifications arrive.

Change-Id: Iea2e0e1c93e67ef278ee7c5a9813fbab6cea5c74
Signed-off-by: Pavankumar Kondeti <pkondeti@codeaurora.org>
2017-04-15 17:48:22 +05:30
Linux Build Service Account
af5e331c32 Merge "ANDROID: binder: add hwbinder,vndbinder to BINDER_DEVICES." 2017-04-14 22:59:22 -07:00
Linux Build Service Account
8c5d1ccf42 Merge "android: binder: move global binder state into context struct." 2017-04-14 22:59:21 -07:00
Linux Build Service Account
d7ac7905d9 Merge "power: qpnp-smb2: Specify the min/max charger switching frequency" 2017-04-14 15:19:41 -07:00
Linux Build Service Account
2a46b11757 Merge "soc: qcom: remove debugfs interface from ssr, service locator & notifier" 2017-04-14 15:19:40 -07:00
Linux Build Service Account
1a4b9a766f Merge "defconfig: msm: Enable HWBinder for SDM660" 2017-04-14 15:19:39 -07:00
Linux Build Service Account
043ca1f5fc Merge "ARM: dts: msm: Add usb master clock rate in high speed mode for sdm660" 2017-04-14 15:19:38 -07:00
Linux Build Service Account
6f0447450c Merge "input: misc: hbtp_input: Support for Region of Interest/sensors" 2017-04-14 15:19:37 -07:00
Linux Build Service Account
25127f043c Merge "ARM: dts: msm: Disable U1U2 low power modes for SDM660" 2017-04-14 15:19:35 -07:00
Vinayak Menon
8769a23ac3 defconfig: msm: enable page poisoning by default
Enable page poisoning by default on MSM8998
and SDM660.

Change-Id: If0b873888f21fd7e7057df43cf223e3c50372bed
Signed-off-by: Vinayak Menon <vinmenon@codeaurora.org>
2017-04-14 23:43:05 +05:30
Vinayak Menon
6f4a4c2a6c mm: allow page poisoning to be enabled by default.
Add a config option to enable page poisoning by
default. The kernel command line option "page_poison"
can be used to change the behaviour during boot.

Change-Id: Ie70763841191a722b1c6125dfad119a29ed0f605
Signed-off-by: Vinayak Menon <vinmenon@codeaurora.org>
2017-04-14 23:43:05 +05:30
Vinayak Menon
49118fe6a3 mm: enable page poisoning early at boot
On SPARSEMEM systems page poisoning is enabled after buddy is up, because
of the dependency on page extension init.  This causes the pages released
by free_all_bootmem not to be poisoned.  This either delays or misses the
identification of some issues because the pages have to undergo another
cycle of alloc-free-alloc for any corruption to be detected.

Enable page poisoning early by getting rid of the PAGE_EXT_DEBUG_POISON
flag.  Since all the free pages will now be poisoned, the flag need not be
verified before checking the poison during an alloc.

Link: http://lkml.kernel.org/r/1490358246-11001-1-git-send-email-vinmenon@codeaurora.org
Acked-by: Laura Abbott <labbott@redhat.com>
Tested-by: Laura Abbott <labbott@redhat.com>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Akinobu Mita <akinobu.mita@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
[vinmenon@codeaurora.org: resolve trivial merge conflicts.
 Remove the redundant free pages RO feature from the
 page_poison.c file which is the reason for conflicts +
 squash the addendum commit 40961ef8d65f51093bc94de110b97b590b6b9275
 ('mm-enable-page-poisoning-early-at-boot-v2')]
Git-commit: c5b7cd344fd6341e6db79e55c0f1f4d1d9c67a7e
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
Change-Id: I1bb1f99d3a2e1135131911905e0916c837ba9d8a
Signed-off-by: Vinayak Menon <vinmenon@codeaurora.org>
2017-04-14 23:43:05 +05:30
Laura Abbott
2c00b603db mm/page_poisoning.c: allow for zero poisoning
By default, page poisoning uses a poison value (0xaa) on free.  If this
is changed to 0, the page is not only sanitized but zeroing on alloc
with __GFP_ZERO can be skipped as well.  The tradeoff is that detecting
corruption from the poisoning is harder to detect.  This feature also
cannot be used with hibernation since pages are not guaranteed to be
zeroed after hibernation.

Credit to Grsecurity/PaX team for inspiring this work

Change-Id: If7116e6bff246abbafc38bdfeb3601d3ea063ad2
Signed-off-by: Laura Abbott <labbott@fedoraproject.org>
Acked-by: Rafael J. Wysocki <rjw@rjwysocki.net>
Cc: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Mathias Krause <minipli@googlemail.com>
Cc: Dave Hansen <dave.hansen@intel.com>
Cc: Jianyu Zhan <nasa4836@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Git-commit: 1414c7f4f7d72d138fff35f00151d15749b5beda
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
Signed-off-by: Vinayak Menon <vinmenon@codeaurora.org>
2017-04-14 23:43:04 +05:30
Laura Abbott
5c69adad61 mm/page_poison.c: enable PAGE_POISONING as a separate option
Page poisoning is currently set up as a feature if architectures don't
have architecture debug page_alloc to allow unmapping of pages.  It has
uses apart from that though.  Clearing of the pages on free provides an
increase in security as it helps to limit the risk of information leaks.
Allow page poisoning to be enabled as a separate option independent of
kernel_map pages since the two features do separate work.  Because of
how hiberanation is implemented, the checks on alloc cannot occur if
hibernation is enabled.  The runtime alloc checks can also be enabled
with an option when !HIBERNATION.

Credit to Grsecurity/PaX team for inspiring this work

Change-Id: I77a36f844ddae54695089c98a97bf0a6e226a025
Signed-off-by: Laura Abbott <labbott@fedoraproject.org>
Cc: Rafael J. Wysocki <rjw@rjwysocki.net>
Cc: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Mathias Krause <minipli@googlemail.com>
Cc: Dave Hansen <dave.hansen@intel.com>
Cc: Jianyu Zhan <nasa4836@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Git-commit: 8823b1dbc05fab1a8bec275eeae4709257c2661d
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
Signed-off-by: Vinayak Menon <vinmenon@codeaurora.org>
2017-04-14 23:43:04 +05:30
Linux Build Service Account
4e6f40f24c Merge "ASoC: wcd9335: Initialize variables before use" 2017-04-14 07:30:09 -07:00
Linux Build Service Account
396203de3f Merge "ASoC: wcd_cpe_core: Initialize variables before use" 2017-04-14 07:30:08 -07:00
Linux Build Service Account
8ab454448f Merge "ASoC: msm: qdsp6v2: Initialize variables before use" 2017-04-14 07:30:06 -07:00
Linux Build Service Account
6e1631fbaa Merge "ASoC: wcd-spi: Initialize variables before use" 2017-04-14 07:30:05 -07:00
Linux Build Service Account
21f62e1d1e Merge "Revert "ASoC: msm: decrement slim channel ref to set the property"" 2017-04-14 07:30:04 -07:00
Linux Build Service Account
ff13dc2a6c Merge "ASoC: wcd934x: use analog mics in micbias mode for MAD" 2017-04-14 07:30:02 -07:00
Linux Build Service Account
9a97d47340 Merge "drivers: mfd: wcd934x: Set CDC_TOP_TOP_CFG1 register as non-volatile" 2017-04-14 07:30:01 -07:00
Linux Build Service Account
891c4ddf05 Merge "ASoC: msm: Update proper clock frequency for slave mode" 2017-04-14 07:30:00 -07:00
Linux Build Service Account
dc013b9093 Merge "ASoC: msm: Update proper clock frequency for slave mode" 2017-04-14 07:29:59 -07:00