Commit graph

573176 commits

Author SHA1 Message Date
Linux Build Service Account
fff9f1b6a1 Merge "ARM: dts: msm: Add glink_pkt devices for MSMFALCON" 2016-07-27 06:32:30 -07:00
Linux Build Service Account
61c62cd0e1 Merge "ARM: dts: msm: add pinctrl settings for DP GPIOs for msmcobalt" 2016-07-27 06:32:27 -07:00
Linux Build Service Account
03572cfd65 Merge "net: Revert upstream changes which break routing in tunnel scenarios" 2016-07-27 06:32:23 -07:00
Linux Build Service Account
57f8a1b6ce Merge "iommu/iommu-debug: Make debug driver 32 bit compatible" 2016-07-27 06:32:22 -07:00
Linux Build Service Account
8f41dee21d Merge "usb: pd: Don't notify EXTCON_USB unless type is SDP or CDP" 2016-07-27 06:32:21 -07:00
Linux Build Service Account
4c7861ccd6 Merge "defconfig: arm64: msm: Enable ESP transformation" 2016-07-27 06:32:20 -07:00
Surendar karka
eb70f96d7e ASoC: msm: qdsp6v2: Add support to set volume in ASM loopback
Allow to set volume in ASM for the loopback driver. Without the
get() function the corresponding volume mixer control is
failing to set volume.

CRs-Fixed: 1034862
Change-Id: I621dd9de3a8d4a0f4102227989e1dd17638c20ea
Signed-off-by: Surendar karka <sukark@codeaurora.org>
2016-07-27 18:34:34 +05:30
Alexandra Chin
7112993181 input: touchscreen: synaptics v1.1
- Add fwu_go_nogo function in synaptics_fw_update.c
- Add BTN_TOUCH support in synaptics_i2c_rmi4.c
- Add List check in synaptics_i2c_rmi4.c

Change-Id: I8cb776d5b3d20bdee5036cfe0dbcb9bbaa8bf6bd
[amaloche@codeaurora.org: Subject modified from "v1.1"
 - Removed reg_access & fw_updater files due to improper license
 - Modified commit text to reflect file changes]
Signed-off-by: Amy Maloche <amaloche@codeaurora.org>
Signed-off-by: Shantanu Jain <shjain@codeaurora.org>
(cherry picked from commit 6ec6c2cb2b8fce021f48dbfaf326cdd99c9fd9d5)
Signed-off-by: Abinaya P <abinayap@codeaurora.org>
2016-07-27 15:45:49 +05:30
Srinivas Ramana
3e79e51d69 crypto: msm: enable hw crypto driver for msmfalcon
Update Kconfig to enable qcom hw crypto driver for msmfalcon.

Change-Id: I0a4ea56d48d5133083975365228b3ea2dcc2f539
Signed-off-by: Srinivas Ramana <sramana@codeaurora.org>
2016-07-27 14:56:19 +05:30
Srinivas Ramana
bb8aea098d soc: qcom: build kryo perf events only for MSM8996
kryo perf events are specific to MSM8996 soc. So build
this file only when MSM8996 is enabled.

Change-Id: I95aacab201d51ffb4eb8e94d2e400578cab37fc8
Signed-off-by: Srinivas Ramana <sramana@codeaurora.org>
2016-07-27 14:56:00 +05:30
Linux Build Service Account
8c5c49fdb2 Merge "ASoC: open ASM session with 24 bit for 24 bit playback" 2016-07-26 23:34:43 -07:00
Linux Build Service Account
7613d2de29 Merge "scsi: ufs: Crash the system on unrecoverable state" 2016-07-26 23:34:42 -07:00
Linux Build Service Account
13679785f5 Merge "msm: cpp: Query buffer from buffer manager based on index" 2016-07-26 23:34:41 -07:00
Linux Build Service Account
3fd60d9501 Merge "usb: pd: Add vendor defined message handling" 2016-07-26 23:34:40 -07:00
Linux Build Service Account
742a59ec23 Merge "ARM: dts: msm: add default trace sink for MSMCOBALT" 2016-07-26 23:34:38 -07:00
Linux Build Service Account
fd5564ed7f Merge "input: touchpanel: Add GT9xx touchpanel driver for skuf" 2016-07-26 23:34:38 -07:00
Linux Build Service Account
2142082d3b Merge "input: touchscreen: Add synaptics v1 driver" 2016-07-26 23:34:37 -07:00
Linux Build Service Account
c5d039f875 Merge "soc: qcom: build kryo-l2-accessors only for msm8996" 2016-07-26 23:34:36 -07:00
Linux Build Service Account
fcbd9169dd Merge "clk: msm8996: compile 8996 clock files only for ARCH_MSM8996" 2016-07-26 23:34:35 -07:00
Linux Build Service Account
4e32af1514 Merge "input: touchpanel: Add Mstar msg21xx touchpanel driver" 2016-07-26 23:34:34 -07:00
Linux Build Service Account
1b816439d5 Merge "usb: xhci-plat: Add XHCI_STATE_REMOVING flag on removal of usb device" 2016-07-26 23:34:33 -07:00
Linux Build Service Account
6870e5d936 Merge "xhci: fix 10 second timeout on removal of PCI hotpluggable xhci controllers" 2016-07-26 23:34:33 -07:00
Linux Build Service Account
92a41a2846 Merge "ASoc: msm: fix out of bounds array access" 2016-07-26 23:34:32 -07:00
Linux Build Service Account
57fdba1a12 Merge "ASoC: msm: qdsp6v2: DAP: Update check to validate data length" 2016-07-26 23:34:31 -07:00
Linux Build Service Account
cb50168ee3 Merge "qcom-charger: smb2: configure input from wipower" 2016-07-26 23:34:30 -07:00
Linux Build Service Account
e698c6eeea Merge "msm: Camera buffer overflow fix" 2016-07-26 23:34:30 -07:00
Linux Build Service Account
667469218d Merge "iommu/arm-smmu: Print device name in context fault handler" 2016-07-26 23:34:29 -07:00
Linux Build Service Account
0de8ef1f3e Merge "sound: usb: Update USB audio QMI data structure" 2016-07-26 23:34:28 -07:00
Sudheer Papothi
493cf47b47 ASoC: wcd_cpe: Add support for two CPE sessions
Existing CPE(Codec Processing Engine) driver supports single session.
Add support for two sessions with different sampling rates.

CRs-fixed: 1022917
Change-Id: Ifbcb1bf8c418a4b3c787f68392aa141207dddde5
Signed-off-by: Sudheer Papothi <spapothi@codeaurora.org>
Signed-off-by: Vidyakumar Athota <vathota@codeaurora.org>
2016-07-26 23:00:02 -07:00
Sudheer Papothi
5cd6f10e21 ARM: msm: dts: Changes to add second CPE session for 8996
Add additional platform dai for CPE(Codec Processing Engine)
to handle two CPE sessions simultaneously. Change adds another
instance of platform driver.

CRs-fixed: 1022917
Change-Id: If06c3e3ac1cb5fc04367507c8d55787214cf252f
Signed-off-by: Sudheer Papothi <spapothi@codeaurora.org>
Signed-off-by: Vidyakumar Athota <vathota@codeaurora.org>
2016-07-26 22:58:27 -07:00
Fenglin Wu
55df9f3e2c ARM: dts: msm: Add battery data for QRD SKUK device
New battery module is used on QRD msmcobalt SKUK device, add the battery
data for it.

Change-Id: I4a1888fb2302572720260ffea200e5fe6d79a7ba
Signed-off-by: Fenglin Wu <fenglinw@codeaurora.org>
2016-07-27 10:29:46 +08:00
Praneeth Paladugu
bfd0b8ce6e msm: vidc: Handle FW errors as Fatal
Currently video driver handles all FW errors such as
SYS_ERROR, SESSION_ERROR and timeouts as non-fatal.
This suppresses FW issues and makes it difficult to
root cause. Hence treat FW errors as Fatal based on
dtsi entry.

When FATAL error occurred, print FW messages by default.

CRs-Fixed: 1037031
Change-Id: Ifffceb30e9abcaced977438526ceeef4e7f9324e
Signed-off-by: Praneeth Paladugu <ppaladug@codeaurora.org>
2016-07-26 19:28:20 -07:00
Deepak Katragadda
b20d7ec122 clk: msm: clock: Remove support for the USB cfg_ahb2phy clock from HLOS
The gcc_usb_phy_cfg_ahb2phy_clk clock will be managed by RPM.
There is no need to model it in the linux clock driver or to
control it from the USB driver.

Change-Id: I05641c2d532ada36623da1e1cc687c90bc4ee906
Signed-off-by: Deepak Katragadda <dkatraga@codeaurora.org>
2016-07-26 18:53:32 -07:00
Hemant Kumar
45c86c2e14 usb: phy: Make cfg_ahb_clk optional
USB qusb2 and ssusb qmp phy drivers are not required to
manage gcc_usb_phy_cfg_ahb2phy_clk clock. It will stay
always ON except when in XO-shutdown. RPM will manage
this clock.

Change-Id: I92647d8ba53bb498b1048ea920a25c04441f6e10
Signed-off-by: Hemant Kumar <hemantk@codeaurora.org>
2016-07-26 18:52:54 -07:00
Hemant Kumar
89e2052bd5 usb: dwc3: Make cfg_ahb_clk optional
dwc3 USB driver is not required to not manage gcc_usb_phy_cfg_ahb2phy_clk
clock. It will stay always ON except when in XO-shutdown. RPM will
manage this clock.

Change-Id: Icc33e63a52b3c5ce83ef2fc56d68eae20278cac0
Signed-off-by: Hemant Kumar <hemantk@codeaurora.org>
2016-07-26 18:49:06 -07:00
Krishnankutty Kolathappilly
ddff1a93ba msm: cpp: Query buffer from buffer manager based on index
Query buffer from buffer manager based on buf index.
This allows modules to provide a buffer associated
with a particular request and avoids a wrong buffer
from being returned.

CRs-Fixed: 1018651
Change-Id: I206f3fa334d96e9f57fcbd985922a436ed701ff3
Signed-off-by: Krishnankutty Kolathappilly <kkolatha@codeaurora.org>
Signed-off-by: Hariram Purushothaman <hariramp@codeaurora.org>
2016-07-26 18:44:16 -07:00
Osvaldo Banuelos
bb02457c09 clk: osm: msm: add support for DxFSM workaround
Support a new OSM sequence which optimizes the number of
instructions required to program MEM-ACC settings and
the APM configuration of the CPUSS. This frees up sufficent
space to implement the DxFSM workaround.

CRs-Fixed: 1043040
Change-Id: I9499497cb558efcf3c73e7145ce65d3f129be696
Signed-off-by: Osvaldo Banuelos <osvaldob@codeaurora.org>
2016-07-26 18:43:06 -07:00
Osvaldo Banuelos
770bcca37a clk: msm: osm: add workaround for C2D/C3 + D2D collapse issue
Program architectural register 6 with the address of the SPM
core count hysteresis register and architectural register 7
with the up and down core-count SPM hysteresis values. The
sequencer uses this information to ensure stable operation
when CPU retention or power-collapse and cluster collapse
LPMs are enabled.

CRs-Fixed: 1045435
Change-Id: I5e41ce376c694736128ceb051db86f93467fdaea
Signed-off-by: Osvaldo Banuelos <osvaldob@codeaurora.org>
2016-07-26 18:42:06 -07:00
Osvaldo Banuelos
b924164a05 ARM: dts: msm: update frequency to ACC level mappings for msmcobalt
Since LowSVS and SVS frequencies share the same ACC settings,
map any frequency in the LowSVS to SVS range to the same ACC
level. By doing so, the OSM device need only support 3 levels
instead of 4 thus saving sequencer instruction space. Also,
update the ACC setting to ensure bit 31 of the last ACC register
in each cluster is set when running at LowSVS/SVS frequencies.

CRs-Fixed: 1021659
Change-Id: I322b9b57ec89f5cdc75336d83010ff89a6bb5726
Signed-off-by: Osvaldo Banuelos <osvaldob@codeaurora.org>
2016-07-26 18:40:57 -07:00
Osvaldo Banuelos
cb2a4195c3 ARM: dts: msm: specify APM threshold voltage in OSM for msmcobalt
Define the APM threshold voltage to be used by the OSM device
to determine the correct APM supply selection for different
DCVS setpoints.

CRs-Fixed: 1021656 1030444
Change-Id: Iebeb45eaa2503bd5be19f00938d0dbec1163c5a5
Signed-off-by: Osvaldo Banuelos <osvaldob@codeaurora.org>
2016-07-26 18:39:33 -07:00
Osvaldo Banuelos
3c7530a2d8 clk: msm: osm: add support for APM crossover corner
Add support to determine the APM threshold corner via open-loop
voltages in the VDD regulator OPP table. The threshold corner
is used by OSM to determine the APM supply for each DCVS setpoint.
The crossover corner is used by OSM to request a specific voltage
during the APM switch transition.

CRs-Fixed: 1021656 1030444
Change-Id: Iac04f6db8e85b3651a33b6c9bff667365cae891d
Signed-off-by: Osvaldo Banuelos <osvaldob@codeaurora.org>
2016-07-26 18:38:28 -07:00
Osvaldo Banuelos
9992623763 regulator: cprh-kbss-regulator: add support for APM crossover corner
Add support for a corner whose open-loop voltage corresponds to the
VDD supply voltage required during an APM switch transition. This
corner is requested by OSM hardware to the CPRh controller when
the VDD supply must be set to a specific voltage to ensure a stable
APM switch procedure. Define a crossover corner of 880 mV for both
VDD_APC CPR devices.

CRs-Fixed: 1021656
Change-Id: Icf4b640ec2c330b0d9721d3494297e2d8445c9b6
Signed-off-by: Osvaldo Banuelos <osvaldob@codeaurora.org>
2016-07-26 18:35:52 -07:00
Siddartha Mohanadoss
b1b5d0af46 thermal: qpnp-adc-tm: Update reverse threshold and notification
Add support to scale reverse thresholds on VADC_TM refresh
peripheral for voltage measurements such as vbatt, vph_pwr,
thermistor channels, PMIC die temperature.

VADC_TM refresh uses one interrupt for high and low threshold
notification. Update the sequence to check the respective
sensors status for high/low threshold crossing for the VADC_TM
refresh and notify the clients on a threshold crossing.

Change-Id: I070b537e14b505bc247f2f5e6a0e125f1d0fbb81
Signed-off-by: Siddartha Mohanadoss <smohanad@codeaurora.org>
2016-07-26 18:18:07 -07:00
Amit Shekhar
ce8006a221 msm: vidc: Fix limit for LTR mode control
Currently, maximum value for VIDC_VIDEO_LTRMODE contrl is set to
LTR_MODE_PERIODIC which is not supported. By limiting it to
LTR_MODE_MANUAL, the control value will stay with in supported range.

CRs-Fixed: 1046755
Change-Id: I85b8ac6dc847343d42cb2f6466137bf43fc1b7c1
Signed-off-by: Amit Shekhar <ashekhar@codeaurora.org>
2016-07-26 17:37:54 -07:00
Skylar Chang
072a88c698 msm: ipa3: add support for SMMU to USB
Add support to IPA USB when IPA SMMU is enabled.
IPA USB will create a mapping for USB registers and
USB data structures for GSI.

CRs-Fixed: 1046497
Change-Id: Ib177606acdfa9b3826c929578d1c8094242f90cd
Acked-by: Ady Abraham <adya@qti.qualcomm.com>
Signed-off-by: Skylar Chang <chiaweic@codeaurora.org>
2016-07-26 17:30:32 -07:00
Devdutt Patnaik
8b42db2259 usb: f_gsi: Update connection parameters for GSI channels
Stage 1 SMMU enablement on IPA requires that the USB
driver pass physical and virtual addresses to IPA for
addresses that GSI hardware will write to. Update the
connection params for GSI channels to pass this info
to IPA driver.

Change-Id: Ibeedeef900b069b3a113b2daabf461797f28287b
Signed-off-by: Devdutt Patnaik <dpatnaik@codeaurora.org>
2016-07-26 17:27:43 -07:00
Skylar Chang
a5dd060414 msm: ipa3: changes to IPA USB APIs to support SMMU
Add support to IPA USB APIs for SMMU.

CRs-Fixed: 1046497
Change-Id: Ifca675f308b59913743baf2e59dc3ed515a5b974
Acked-by: Ady Abraham <adya@qti.qualcomm.com>
Signed-off-by: Skylar Chang <chiaweic@codeaurora.org>
2016-07-26 17:17:22 -07:00
Andrew Bresticker
821e02f204 CHROMIUM: android: binder: Fix potential scheduling-while-atomic
Commit f1e7f0a724f6 ("android: binder: Disable preemption while holding
the global binder lock.") re-enabled preemption around most of the sites
where calls to potentially sleeping functions were made, but missed
__alloc_fd(), which can sleep if the fdtable needs to be resized.
Re-enable preemption around __alloc_fd() as well as __fd_install() which
can now sleep in upstream kernels as of commit 8a81252b77 ("fs/file.c:
don't acquire files->file_lock in fd_install()").

BUG=chrome-os-partner:44012
TEST=Build and boot on Smaug.

Change-Id: I9819c4b95876f697e75b1b84810b6c520d9c33ec
Signed-off-by: Andrew Bresticker <abrestic@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/308582
Reviewed-by: Stephen Barber <smbarber@chromium.org>
Reviewed-by: Riley Andrews <riandrews@google.com>
Git-repo: https://source.codeaurora.org/quic/la/kernel/msm-4.4
Git-commit: c267ff1d548ed1bdad6a08f1c70776c5e60d569e
Signed-off-by: Vikram Mulukutla <markivx@codeaurora.org>
2016-07-26 16:39:51 -07:00
Riley Andrews
e4045d607a android: binder: Disable preemption while holding the global binder lock.
Change-Id: I90fe02cdedb8a5677b900a68528fb443b9204322
Signed-off-by: Riley Andrews <riandrews@google.com>
Git-repo: https://source.codeaurora.org/quic/la/kernel/msm-4.4
Git-commit: 5c9ce54ca3a66a57e4ebfe3ae71c5733b6bcc579
Signed-off-by: Vikram Mulukutla <markivx@codeaurora.org>
2016-07-26 16:35:40 -07:00
Vikram Mulukutla
cbe08a7835 sched,preempt: Fix preempt_count manipulations
Vikram reported that his ARM64 compiler managed to 'optimize' away the
preempt_count manipulations in code like:

        preempt_enable_no_resched();
        put_user();
        preempt_disable();

Irrespective of that fact that that is horrible code that should be
fixed for many reasons, it does highlight a deficiency in the generic
preempt_count manipulators. As it is never right to combine/elide
preempt_count manipulations like this.

Therefore sprinkle some volatile in the two generic accessors to
ensure the compiler is aware of the fact that the preempt_count is
observed outside of the regular program-order view and thus cannot be
optimized away like this.

x86; the only arch not using the generic code is not affected as we
do all this in asm in order to use the segment base per-cpu stuff.

Change-Id: I781dc34fdf52823fd34f4bb93872f85847076c66
Cc: stable@vger.kernel.org
Cc: Thomas Gleixner <tglx@linutronix.de>
Fixes: a787870924 ("sched, arch: Create asm/preempt.h")
Reported-by: Vikram Mulukutla <markivx@codeaurora.org>
Tested-by: Vikram Mulukutla <markivx@codeaurora.org>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Git-commit: 2e636d5e66c35dfcbaf617aa8fa963f6847478fe
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
Link: https://lkml.org/lkml/2016/5/16/190
[vmulukut@codeaurora.org: merge conflict fixups]
Signed-off-by: Vikram Mulukutla <markivx@codeaurora.org>
2016-07-26 16:34:38 -07:00