Commit graph

578906 commits

Author SHA1 Message Date
Linux Build Service Account
21d0a269e6 Merge "defconfig: msmfalcon: enable the USB video class support" 2016-12-09 19:59:30 -08:00
Linux Build Service Account
4a2acf1a09 Merge "scsi: ufs: fix shutdown race condition" 2016-12-09 19:59:29 -08:00
Linux Build Service Account
b7941c1f70 Merge "ARM: dts: msm: add touch node for QTC800H in msm8998 QRD SKUK" 2016-12-09 19:59:28 -08:00
Linux Build Service Account
55f7c3c5f2 Merge "power_supply: Add BOOST_CURRENT property" 2016-12-09 19:59:28 -08:00
Linux Build Service Account
9ad5708a9e Merge "msm: ipa3: check the rx_door_bell value on disable" 2016-12-09 19:59:27 -08:00
Linux Build Service Account
4bd4e0dac9 Merge "qpnp-fg-gen3: Add support for PMFALCON in Fuel Gauge" 2016-12-09 19:59:26 -08:00
Linux Build Service Account
61c5326381 Merge "ASoC: wcd934x-dsp-cntl: fix the reset sequence" 2016-12-09 19:59:25 -08:00
Linux Build Service Account
2b10339b96 Merge "include: clock: remove ifdef from header file" 2016-12-09 19:59:24 -08:00
Linux Build Service Account
14665e2c1d Merge "ASoC: qdsp6v2: prevent null pointer dereference for _vol_cmds" 2016-12-09 19:59:24 -08:00
Linux Build Service Account
5641db9743 Merge "msm: thermal: Notify LMH DCVSh driver after freq mitigation request" 2016-12-09 19:59:22 -08:00
Linux Build Service Account
fcc7ba5c40 Merge "ARM: dts: msm: Specify coresight trace ID for msm8998" 2016-12-09 19:59:21 -08:00
Linux Build Service Account
cfd61208ea Merge "ARM: dts: msm: Add GPU coresight properties for msm8998" 2016-12-09 19:59:21 -08:00
Linux Build Service Account
6a1ef577f4 Merge "ARM: dts: msm: update wcn3990 node for msm8998 interposer" 2016-12-09 19:59:20 -08:00
Linux Build Service Account
6a3a75cda3 Merge "ARM: dts: msm: Attach device memory to lpass iommu on msmfalcon" 2016-12-09 19:59:19 -08:00
Linux Build Service Account
9c459577c7 Merge "msm: msm_bus: Reverse QoS Clocks Disabling Order" 2016-12-09 19:59:14 -08:00
Linux Build Service Account
4f1cebc120 Merge "soc: qcom: pil: Use NULL check of resource pointer for restart register" 2016-12-09 19:59:13 -08:00
Linux Build Service Account
018082dd1b Merge "ARM: dts: msm: Add pinctrl configuration for PMFALCOM L6/9/19" 2016-12-09 19:59:12 -08:00
Linux Build Service Account
de5d70ba03 Merge "ARM: dts: msm: Add missing properties for USB node for msmfalcon" 2016-12-09 19:59:11 -08:00
Linux Build Service Account
7483dccc26 Merge "defconfig: Add missing features for HW Encryption support" 2016-12-09 19:59:10 -08:00
Linux Build Service Account
d18f96a5e1 Merge "defconfig: msm: msm8998: enable LCDB driver" 2016-12-09 19:59:09 -08:00
Linux Build Service Account
54a480de41 Merge "media: dvb-core: Add feed state check before stop dvbdemux feed" 2016-12-09 19:59:09 -08:00
Linux Build Service Account
5fd499075e Merge "ARM: dts: msm: Add VOL_UP node for MSMFALCON and interposer" 2016-12-09 19:59:08 -08:00
Linux Build Service Account
9743dc9288 Merge "ARM: dts: msm: Enable core hang detect feature on msmfalcon" 2016-12-09 19:59:07 -08:00
Linux Build Service Account
e9b171cb47 Merge "phy: qcom-ufs: Modify the vdd-phy min-max range" 2016-12-09 19:59:06 -08:00
Linux Build Service Account
a541a81870 Merge "ARM: dts: msm: Specify the WLED interrupts properly for pmi8998/pm2falcon" 2016-12-09 19:59:05 -08:00
Linux Build Service Account
250b1c4028 Merge "ARM: dts: msm: Add PM support for msmfalcon" 2016-12-09 19:59:04 -08:00
Linux Build Service Account
06a6328b57 Merge "ARM: dts: msm: Update clock mmss node for MSMfalcon/Triton" 2016-12-09 19:59:03 -08:00
Linux Build Service Account
98a2f941e2 Merge "msm-core: use get_user() API to read userspace data/settings" 2016-12-09 19:59:02 -08:00
Linux Build Service Account
301af28cab Merge "ARM: dts: msm: Modify QRD interposer dts file for msm8998" 2016-12-09 19:59:02 -08:00
Linux Build Service Account
3160351d53 Merge "ASoc: msm: Add changes to support multiple meta key value pairs" 2016-12-09 19:59:01 -08:00
Linux Build Service Account
65c54e155a Merge "iommu: io-pgtable-arm: Use correct bitmask for pgd entry" 2016-12-09 19:59:00 -08:00
Linux Build Service Account
fc284a8972 Merge "iommu: iommu-debug: Allow full dma_addr_t sized address for atos" 2016-12-09 19:58:59 -08:00
Hemant Kumar
bf2d967e5d ARM: dts: msm: Configure MPM for qusb2phy_dpse_hv for msm8998
In host mode upon XO shutdown high speed and full speed device
connection is not getting detected because mpm is not configured
to monitor for Dp line state change.

Change-Id: I34e3f586b99b6ff1af1d2323d4f272ee3cca7fa2
Signed-off-by: Hemant Kumar <hemantk@codeaurora.org>
2016-12-09 18:57:31 -08:00
Linus Torvalds
b40f046740 mm: remove gup_flags FOLL_WRITE games from __get_user_pages()
This is an ancient bug that was actually attempted to be fixed once
(badly) by me eleven years ago in commit 4ceb5db975 ("Fix
get_user_pages() race for write access") but that was then undone due to
problems on s390 by commit f33ea7f404 ("fix get_user_pages bug").

In the meantime, the s390 situation has long been fixed, and we can now
fix it by checking the pte_dirty() bit properly (and do it better).  The
s390 dirty bit was implemented in abf09bed3c ("s390/mm: implement
software dirty bits") which made it into v3.9.  Earlier kernels will
have to look at the page state itself.

Also, the VM has become more scalable, and what used a purely
theoretical race back then has become easier to trigger.

To fix it, we introduce a new internal FOLL_COW flag to mark the "yes,
we already did a COW" rather than play racy games with FOLL_WRITE that
is very fundamental, and then use the pte dirty flag to validate that
the FOLL_COW flag is still valid.

Change-Id: I42e448ecacad4781b460c4c989026307169ba1b5
Reported-and-tested-by: Phil "not Paul" Oester <kernel@linuxace.com>
Acked-by: Hugh Dickins <hughd@google.com>
Reviewed-by: Michal Hocko <mhocko@suse.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Kees Cook <keescook@chromium.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Willy Tarreau <w@1wt.eu>
Cc: Nick Piggin <npiggin@gmail.com>
Cc: Greg Thelen <gthelen@google.com>
Cc: stable@vger.kernel.org
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Git-repo: https://chromium.googlesource.com/chromiumos/third_party/kernel.git
Git-commit: 19be0eaffa3ac7d8eb6784ad9bdbc7d67ed8e619
Signed-off-by: Dennis Cagle <d-cagle@codeaurora.org>
2016-12-09 17:43:44 -08:00
David Collins
e25600294b ARM: dts: msm: disable VDD_APC0/1 CPR aging adjustments on MSM8998v2
Disable VDD_APC0 and VDD_APC1 CPR aging measurement and
adjustments for all local CPR fusing revisions.  It is unknown
which future revision will have the initial aging sensor
difference fuse blown.  Software must not attempt to perform an
aging measurement unless this fuse is blown.  Therefore, disable
aging measurements on all future revisions.

Modify the open-loop and closed-loop voltage adjustments
accordingly so that the maximum 15 mV aging margin is present
for all CPR revisions.

Change-Id: I4546a7994fc0442bf82d36ca0a404a57be8c7dd3
CRs-Fixed: 1097587
Signed-off-by: David Collins <collinsd@codeaurora.org>
2016-12-09 15:58:42 -08:00
Subbaraman Narayanamurthy
7b232891df qpnp-fg-gen3: Use the correct property name to get fastcharge current
Currently GEN3 FG driver reads "qcom,nom-batt-capacity-mah"
property from the battery profile device node to use that for
notifying fastcharge current to the charger driver. Change that
to use "qcom,fastchg-current-ma" property which seems to be more
appropriate. Update all the battery profiles that are used with
GEN3 FG to follow that.

Change-Id: I119e6af297b37a06a227475f712f938367fb65bc
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
2016-12-09 15:33:59 -08:00
Subbaraman Narayanamurthy
688a4e14e1 ARM: dts: msm: rename battery profile used for msm8998 QRD
To match with other battery profiles used for GEN3 fuel gauge,
rename the battery profile used for msm8998 QRD platform.

Change-Id: I9a12ac11b6bd303eb32b4e03e116281bca664d06
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
2016-12-09 15:33:52 -08:00
Syed Rameez Mustafa
6e24ba90a2 sched: Ensure proper task migration when a CPU is isolated
migrate_tasks() migrates all tasks of a CPU by using pick_next_task().
This works in the hotplug case as we force migrate every single task
allowing pick_next_task() to return a new task on every loop iteration.
In the case of isolation, however, task migration is not guaranteed
which causes pick_next_task() to keep returning the same task over and
over again until we terminate the loop without having migrated all the
tasks that were supposed to migrated.

Fix the above problem by temporarily dequeuing tasks that are pinned
and marking them with TASK_ON_RQ_MIGRATING. This not only allows
pick_next_task() to properly walk the runqueue but also prevents any
migrations or changes in affinity for the dequeued tasks. Once we are
done with migrating all possible tasks, we re-enqueue all the dequeued
tasks.

While at it, ensure consistent ordering between task de-activation and
setting the TASK_ON_RQ_MIGRATING flag across all scheduling classes.

Change-Id: Id06151a8e34edab49ac76b4bffd50c132f0b792f
Signed-off-by: Syed Rameez Mustafa <rameezmustafa@codeaurora.org>
2016-12-09 14:30:41 -08:00
Olav Haugan
8cf404403a sched/core: Fix race condition in clearing hmp request
There is a race condition between clearing an HMP request for active
migration and the actual active migration. Active migration can he
half-way through doing the migration when the HMP request can be cleared
by another core. Move clearing of HMP request to the stopper thread to
avoid this.

Change-Id: I6d73b8f246ae3754ab60984af198333fd284ae16
Signed-off-by: Olav Haugan <ohaugan@codeaurora.org>
2016-12-09 13:45:42 -08:00
Olav Haugan
584d38f189 sched/core: Prevent (user) space tasks from affining to isolated cpus
We don't want user space tasks to run on isolated cpus. If the affinity
mask that the user space task is trying to set only includes online
cpus that are isolated return error.

Also ensure that tasks do not get stuck on isolated cores. We are not
properly updating the mask that we check against the current CPU so we
might end up thinking we can run on the current CPU. Fix this.

Change-Id: I078d01e63860d1fc60fc96eb0c739c0f680ae983
Signed-off-by: Olav Haugan <ohaugan@codeaurora.org>
2016-12-09 13:45:42 -08:00
Jack Pham
a3e98f0134 usb: phy: qmp: Select usb3 phy mode before initializing PHY
Make sure the USB3/DP PHY mode selection is switched back to
USB3 mode before proceeding with PHY initialization. This fixes
a bug when DisplayPort previously uses the PHY and does not
switch it back which causes the POWER_DOWN_CONTROL register write
to not take effect and results in USB3 PHY initialization failure.

Change-Id: Idad0f80eda6192ccae9e824f1f76c7071806ffec
Signed-off-by: Jack Pham <jackp@codeaurora.org>
2016-12-09 11:24:01 -08:00
Manaf Meethalavalappu Pallikunhi
c2ec16b9e1 power: bcl: Add frequency mitigation as an optional property for BCL
For targets with LMH DCVSh hardware and OSM, BCL software frequency
mitigation is not required. Since hardware is doing the frequency
mitigation, there is no need for the HLOS BCL frequency mitigation.
So make the properties "qcom,mitigation-freq-khz" and
"qcom,thermal-handle" as optional properties.

Change-Id: I0062f3b39f00ff2f0e74affcffbcf1afd89d3b2f
Signed-off-by: Manaf Meethalavalappu Pallikunhi <manafm@codeaurora.org>
2016-12-09 19:48:33 +05:30
Manaf Meethalavalappu Pallikunhi
54fb4f8396 ARM: dts: msm: Add BCL peripheral configs for pmfalcon
Add pmfalcon BCL peripheral related configs to enable the BCL
peripheral driver. Add configs like vbat interrupt, ibat interrupt,
vbat polling delay, ibat polling delay, etc.

Change-Id: I9d7cc82c50c1b09610f5a4eac86af4617389f23f
Signed-off-by: Manaf Meethalavalappu Pallikunhi <manafm@codeaurora.org>
2016-12-09 19:45:56 +05:30
Ashwanth Goli
d9db5fe079 defconfig: Enable config INET_DIAG_DESTROY
Enable config INET_DIAG_DESTROY for msm_falcon 32-bit

Change-Id: I39c5ac30070ff8555ed712a99796b9405717b072
Signed-off-by: Ashwanth Goli <ashwanth@codeaurora.org>
2016-12-09 18:06:01 +05:30
Amey Telawane
eae5dd568b ARM: dts: msm: add qdss node support for msmtriton
Add support to enable qdss components on
msmtriton. Reuse msmfalcon coresight nodes
for msmtriton.

CRs-fixed: 1094175
Change-Id: I34a3ad2da7f8e267f0d570c0329ac9b73a43309e
Signed-off-by: Amey Telawane <ameyt@codeaurora.org>
2016-12-09 17:48:03 +05:30
Gaurav Singhal
41b99b48c5 NFC: Inform CLF whenever eSE is powered off
When the eSE is powered off, the “system” needs to give
8ms to the capacitor connected on the SVDD line to discharge.

We should inform the FW we just powered off the eSE.

Change-Id: I864fd8f75ded6ab8c42ea36bcdadcdbe924e927d
Signed-off-by: Gaurav Singhal <gsinghal@codeaurora.org>
2016-12-09 15:43:21 +05:30
Taniya Das
151d532101 clk: qcom: Add support for debugfs measure clock
Introduce clk_debug_mux which would support clocks to be allowed to measure
clock frequency from debugfs.

Change-Id: I81c32a876b33f5a7773485a76897ff9cbed45a76
Signed-off-by: Taniya Das <tdas@codeaurora.org>
2016-12-09 15:04:41 +05:30
Vijayavardhan Vennapusa
61f63921e5 ARM: dts: msm: Add qcom,msm-imem-diag-dload node on msmfalcon/msmtriton
The diag dload memory region is part of IMEM. USB Diag driver
queries this device node for the memory address to access and update
USB PID and serial number. Hence add qcom,msm-imem-diag-dload node
on msmfalcon and msmtriton.

Change-Id: Ib283941037469833786b793c1e31e69e1c95d45d
Signed-off-by: Vijayavardhan Vennapusa <vvreddy@codeaurora.org>
2016-12-08 21:19:52 -08:00
Hemant Kumar
47b27b4d0f usb: qusb2: De-assert TCSR_QUSB2PHY_CLAMP_DIG_N_1P8 upon boot up
This prevents leakage on 1p8 power rail upon boot up when usb cable
is not connect.

Change-Id: I28a4f495293863361843eb30b2d20f1f57889f95
Signed-off-by: Hemant Kumar <hemantk@codeaurora.org>
2016-12-08 20:30:52 -08:00
Puja Gupta
02871aa947 ARM: dts: msm: Move boot_rom_ahb_clk to proxy voted for msm8998
Proxy vote for gcc_boot_rom_ahb_clk for modem pil on msm8998 instead
of keeping the vote until the modem was shutdown.

Change-Id: Ib32d40351179a687eca38228c4503e4a9a88c28d
Signed-off-by: Puja Gupta <pujag@codeaurora.org>
2016-12-08 17:03:10 -08:00