Commit graph

581237 commits

Author SHA1 Message Date
Linux Build Service Account
dd7b46d3f4 Merge "usb: pd: Re-enable SuperSpeed host by default" 2017-01-18 23:48:46 -08:00
Linux Build Service Account
e12c25b9a5 Merge "regulator: cpr3-regulator: correct sdelta table indexing" 2017-01-18 23:48:45 -08:00
Linux Build Service Account
1515754ed3 Merge "defconfig: sdm660: Enable G-Link SPI Transport driver in 32 bit" 2017-01-18 23:48:44 -08:00
Linux Build Service Account
53d9fa23b7 Merge "ASoC: audio-ext-clk: add parent to div and lnbb clks" 2017-01-18 23:48:43 -08:00
Linux Build Service Account
08478123a6 Merge "ARM: dts: msm: Audio bringup fixes for SDM660" 2017-01-18 23:48:42 -08:00
Linux Build Service Account
69427c91f4 Merge "spmi: pmic-arb: Return an error code if sanity check fails" 2017-01-18 23:48:40 -08:00
Linux Build Service Account
e7d95aa295 Merge "spmi: pmic-arb: replace symbolic permissions with constants" 2017-01-18 23:48:40 -08:00
Linux Build Service Account
b2c6447f46 Merge "usb: pd: pdphy: Enable IRQs for wakeup" 2017-01-18 23:48:39 -08:00
Linux Build Service Account
fbbaeb656a Merge "sched: hmp: Remove the global sysctl_sched_enable_colocation tunable" 2017-01-18 23:48:38 -08:00
Linux Build Service Account
3d4b6ca818 Merge "ARM: dts: msm: Enable wifi offload for SDM660 and SDM630" 2017-01-18 23:48:37 -08:00
Linux Build Service Account
b7193a89d1 Merge "tracing: Use SOFTIRQ_OFFSET for softirq dectection for more accurate results" 2017-01-18 23:48:36 -08:00
Linux Build Service Account
f116be368e Merge "msm: camera: fix Information leak" 2017-01-18 23:48:35 -08:00
Dhoat Harpal
dbdcdb2153 defconfig: sdm660: Enable G-Link SPI Transport driver in 32 bit
Enable G-Link SPI Transport driver to enable off-chip communication
over SPI bus in 32 bit architecture.

CRs-Fixed: 1106989
Change-Id: I8826b1383811a03d91547414a5f6766aafa091d6
Signed-off-by: Dhoat Harpal <hdhoat@codeaurora.org>
2017-01-18 20:15:24 -08:00
Linux Build Service Account
3145cd4109 Merge "perf: Fix NULL pointer ref in exclude_idle update" 2017-01-18 14:23:23 -08:00
Linux Build Service Account
c1a330fbcf Merge "ARM: dts: msm: Set correct voltage for QRD8998HB touch panel" 2017-01-18 14:23:22 -08:00
Linux Build Service Account
3b6e6476d7 Merge "ARM: dts: msm: modify dcc ram size for sdm660" 2017-01-18 14:23:21 -08:00
Linux Build Service Account
e64abf0e80 Merge "mac80211: allow passing transmitter station on RX" 2017-01-18 14:23:20 -08:00
Linux Build Service Account
582a811220 Merge "clk: qcom: Add support for 19.2Mhz for USB30 utmi clock" 2017-01-18 14:23:19 -08:00
Linux Build Service Account
3d99714332 Merge "defconfig: msm: Enable MSM_TIMER_LEAP for sdm660" 2017-01-18 14:23:18 -08:00
Linux Build Service Account
3c00037742 Merge "msm: ipa: Prevent multiple header deletion from user space" 2017-01-18 14:23:17 -08:00
Linux Build Service Account
89b611d0f0 Merge "qcom-charger: smb2: suspend USB path for fake battery or debug board" 2017-01-18 14:23:17 -08:00
Linux Build Service Account
ed5ce44f85 Merge "clk: qcom: Move prepare_enable of XO clock before spinlock" 2017-01-18 14:23:16 -08:00
Linux Build Service Account
42c03251c6 Merge "clk: qcom: Remove few graphics clock for sdm660" 2017-01-18 14:23:15 -08:00
Yeleswarapu Nagaradhesh
1a43bb07cb ASoC: audio-ext-clk: add parent to div and lnbb clks
Add parents to div_clk1 and ln_bbclk. And register
both the clocks independently.

Change-Id: Ic0435ebad533879e3e0648775956c91cc680644d
Signed-off-by: Yeleswarapu Nagaradhesh <nagaradh@codeaurora.org>
2017-01-19 00:52:56 +05:30
Laxminath Kasam
71fb9c8efa ARM: dts: msm: Audio bringup fixes for SDM660
Update gpio settings as per HW VI audio
values. Also move common settings of external
and internal codecs to new files.

Change-Id: I0d3e0878972038a7876a063648156126b2a7cee4
Signed-off-by: Laxminath Kasam <lkasam@codeaurora.org>
2017-01-19 00:48:11 +05:30
Jack Pham
77629c3ba6 usb: pd: pdphy: Enable IRQs for wakeup
Enable the signal and message RX IRQs for wakeup. This allows
the system to be woken from suspend when the PD PHY receives
an incoming hard reset or SOP* message from a connected peer.

Change-Id: Ib6f4507ef363954c91271029874337497659da84
Signed-off-by: Jack Pham <jackp@codeaurora.org>
2017-01-18 10:26:38 -08:00
Vikram Mulukutla
e7dd50fa46 sched: hmp: Remove the global sysctl_sched_enable_colocation tunable
Colocation in HMP includes a tunable that turns on or off the feature
globally across all colocation groups. Supporting this tunable correctly
would result in complexity that would outweigh any foreseeable benefits.
For example, disabling the feature globally would involve deleting all
colocation groups one by one while ensuring no placement decisions are
made during the process.

Remove the tunable. Adding or removing a task from a colocation group is
still possible and so we're not losing functionality.

Change-Id: I4cb8bcdbee98d3bdd168baacbac345eca9ea8879
Signed-off-by: Vikram Mulukutla <markivx@codeaurora.org>
2017-01-18 09:45:44 -08:00
Vikram Mulukutla
2768f0352b sched: hmp: Ensure that best_cluster() never returns NULL
There are certain conditions under which group_will_fit() may return 0 for
all clusters in the system, especially under changing thermal conditions.
This may result in crashes such as this one:

        CPU 0                    |               CPU 1
====================================================================
select_best_cpu()                |
 -> env.rtg = rtgA               |
    rtgA.pref_cluster=C_big      |
                                 |   set_pref_cluster() for rtgA
                                 |     -> best_cluster()
                                 |        C_little doesn't fit
                                 |
                                 |   IRQ: thermal mitigation
                                 |   C_big capacity now less
                                 |   than C_little capacity
                                 |
                                 |     -> best_cluster() continues
                                 |        C_big doesn't fit
                                 |   set_pref_cluster() sets
                                 |   rtgA.pref_cluster = NULL
                                 |
select_least_power_cluster()     |
  -> cluster_first_cpu()         |
     -> BUG()                    |

To add lock protection around accesses to the group's preferred cluster
would be expensive and defeat the point of the usage of RCU to protect
access to the related_thread_group structure. Therefore, ensure that
best_cluster() can never return NULL. In the worst case, we'll select the
wrong cluster for a related_thread_group's demand, but this should be
fixed in the next tick or wakeup etc. Locking would have still led to the
momentary wrong decision with the additional expense!

Also, don't set preferred cluster to NULL when colocation is disabled.

Change-Id: Id3f514b149add9b3ed33d104fa6a9bd57bec27e2
Signed-off-by: Vikram Mulukutla <markivx@codeaurora.org>
2017-01-18 09:45:40 -08:00
Utkarsh Saxena
43184bf1fe ARM: dts: msm: Enable wifi offload for SDM660 and SDM630
SDM660 and SDM630 support wifi offload. So, enable it.

Change-Id: I82a509b8f8b07b0537f050a62c4b605ac6806837
Acked-by: Mohammed Javid <mjavid@qti.qualcomm.com>
Signed-off-by: Utkarsh Saxena <usaxena@codeaurora.org>
2017-01-18 20:23:27 +05:30
Dhoat Harpal
1618176475 soc: qcom: glink_spi_xprt: Fix compilation error for 32 bit
Conversion of a 64 bit int variable to void pointer is illegal
operation when compiling for 32 bit architecture.

Added explicit conversion to uintprt_t, so that 32 bit conversion
can be done.

CRs-Fixed: 1107920
Change-Id: I3854fcb460308c9a77a17198dcb604dd4da135ac
Signed-off-by: Dhoat Harpal <hdhoat@codeaurora.org>
2017-01-18 19:42:20 +05:30
Venkatesh Yadav Abbarapu
59e30f3f02 defconfig: msm: Enable MSM_TIMER_LEAP for sdm660
Enable MSM_TIMER_LEAP config flag in both sdm660_defconfig
and sdm660-perf_defconfig files. This option enables check
for architecture timer leaps, when all least significant 32bits
of CNTVCT or CNTPCT counter is set and rereads counters.

Change-Id: I643fad053b560e689c9ffd00e1f02790435a9e8c
Signed-off-by: Venkatesh Yadav Abbarapu <vabbar@codeaurora.org>
2017-01-18 19:09:28 +05:30
Linux Build Service Account
ebc5196e3e Merge "clk: qcom: Add support for GPLL0 active clock for CPU" 2017-01-18 05:31:24 -08:00
Linux Build Service Account
585e9f4457 Merge "clk: qcom: Add support for multiple PLL software instances" 2017-01-18 05:31:23 -08:00
Linux Build Service Account
e0e7879548 Merge "qpnp-fg-gen3: remove support for configuring external sense" 2017-01-18 05:31:22 -08:00
Linux Build Service Account
14bfad67bb Merge "power_supply: add power supply property to support debug battery" 2017-01-18 05:31:21 -08:00
Linux Build Service Account
3c52c85809 Merge "USB: gadget: mbim: Avoid copying uninitialized data to userspace" 2017-01-18 05:31:20 -08:00
Linux Build Service Account
baf9ce1b35 Merge "diag: Change CDSP socket instance id" 2017-01-18 05:31:19 -08:00
Linux Build Service Account
25c1171bd1 Merge "arm64: Disable ARMv8.1, ARMv8.2 architectural features" 2017-01-18 05:31:18 -08:00
Linux Build Service Account
733bc86afc Merge "ARM: dts: msm: Update memory map for msm8998" 2017-01-18 05:31:17 -08:00
Amey Telawane
e852c533c6 ARM: dts: msm: modify dcc ram size for sdm660
Modify DCC RAM size for sdm660. DCC RAM is used to
store captured information locally in DCC.

CRs-fixed: 1112955
Change-Id: I6c1a48e11c97be31c575aa9ec4cf024dc4a33fa8
Signed-off-by: Amey Telawane <ameyt@codeaurora.org>
2017-01-18 16:09:34 +05:30
Johannes Berg
434781b501 mac80211: allow passing transmitter station on RX
Sometimes drivers already looked up, or know out-of-band
from their device, which station transmitted a given RX
frame. Allow them to pass the station pointer to mac80211
to save the extra lookup.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git
Git-commit: d63b548fffdbd239a5e65bb89424be19229048ba
CRs-Fixed: 1112914
[rsirasan@codeaurora.org: pulled changes only in kernel header
file and mac80211 subsystem]
Change-Id: Ie35906d1e9df1ebe7f72e7a6df3293117abdec57
Signed-off-by: Rajeev Kumar Sirasanagandla <rsirasan@codeaurora.org>
2017-01-18 15:30:45 +05:30
Ghanim Fodi
7452cc75cb msm: ipa: Prevent multiple header deletion from user space
An IPA header or processing context can be added once
and later deleted once from user space.
Multiple deletion may cause invalid state of the headers
software cache.

Change-Id: Ic0b8472b7fd8a76233a007d90c832af726184574
CRs-fixed: 1097714
Signed-off-by: Ghanim Fodi <gfodi@codeaurora.org>
2017-01-18 01:20:42 -08:00
Taniya Das
2656f5ca08 clk: qcom: Add support for 19.2Mhz for USB30 utmi clock
USB client needs 19.2MHz frequency support for utmi clock, so that it could
be requested for. Add support for the same.

Change-Id: Icdbf9c5155bdd0ec02d357182d6e020c06a70648
Signed-off-by: Taniya Das <tdas@codeaurora.org>
2017-01-18 14:01:51 +05:30
Jack Pham
d1a0cb9fa5 usb: pd: Re-enable SuperSpeed host by default
This reverts commit 85cc38fca2 ("usb: pd: Add support to set the
maximum speed via extcon") which unnecessarily restricted starting
USB host mode to high-speed only. Relax this so that USB host can
start in SuperSpeed when DFP mode is entered.

However, the only exception is if DisplayPort mode is discovered,
we need to drop down to high-speed only due to current hardware
limitations. This is handled during the VDM discovery stage.

Also use this opportunity to refactor all extcon_set_state_() calls
to helper functions that start/stop USB host/peripheral modes.

Change-Id: I2f32f70c57a8a6e2c34c8daf59dea931b445422f
Signed-off-by: Jack Pham <jackp@codeaurora.org>
2017-01-17 23:08:20 -08:00
Jin Fu
68b4a64618 ARM: dts: msm: Set correct voltage for QRD8998HB touch panel
Configure QRD8998HB analog and digital voltage to correct value.

CRs-Fixed: 1112314
Change-Id: I15d26582a87c9613c2ada010912b53e15e383b18
Signed-off-by: Jin Fu <jinf@codeaurora.org>
2017-01-18 13:33:34 +08:00
Ashay Jaiswal
b4fe7907b0 qcom-charger: smb2: suspend USB path for fake battery or debug board
Add support to identify fake battery/debug board and suspend the USB
input path when this is detected.

CRs-Fixed: 1107245
Change-Id: Icaa936e4e5b3c9381bc92b6664b32547a820b9c3
Signed-off-by: Ashay Jaiswal <ashayj@codeaurora.org>
2017-01-17 20:40:38 -08:00
Ashay Jaiswal
bafe291f17 power_supply: add power supply property to support debug battery
Add power supply property to report debug/fake battery status.

CRs-Fixed: 1107245
Change-Id: I5590a772604986de8eed1c8417411dac62668440
Signed-off-by: Ashay Jaiswal <ashayj@codeaurora.org>
2017-01-17 20:29:29 -08:00
Taniya Das
60fd13b746 clk: qcom: Remove few graphics clock for sdm660
The gcc_gpu_bimc_gfx_src_clk and gcc_gpu_snoc_dvm_gfx_clk need
to left at their default state of ON. Remove controlling them
from the linux clock driver to avoid disabling them during
late_init.

Change-Id: Iefc033998bf87fcc98dfaa1b7321d9cc33dedd5e
Signed-off-by: Taniya Das <tdas@codeaurora.org>
2017-01-18 08:59:33 +05:30
Taniya Das
95c4b7facf clk: qcom: Move prepare_enable of XO clock before spinlock
clk_prepare would hold a mutex and as clk_debug_mux_measure_rate has
already acquired a spinlock it would result in a BUG from sleeping context.
Avoid this by moving the prepare_enable before acquiring spinlock.

Change-Id: Ia405c884663ef80e87ae066df09f1c30134faf2e
Signed-off-by: Taniya Das <tdas@codeaurora.org>
2017-01-18 08:49:36 +05:30
Pavankumar Kondeti
f4f127a9ba tracing: Use SOFTIRQ_OFFSET for softirq dectection for more accurate results
The 's' flag is supposed to indicate that a softirq is running. This
can be detected by testing the preempt_count with SOFTIRQ_OFFSET.

The current code tests the preempt_count with SOFTIRQ_MASK, which
would be true even when softirqs are disabled but not serving a
softirq.

Link: http://lkml.kernel.org/r/1481300417-3564-1-git-send-email-pkondeti@codeaurora.org

Change-Id: I084531ce806e0f7d42a38be0a7ad45977c43d158
Signed-off-by: Pavankumar Kondeti <pkondeti@codeaurora.org>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Git-commit: c59f29cb144a6a0dfac16ede9dc8eafc02dc56ca
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
2017-01-18 07:05:59 +05:30