OSDN Git Service

sagit-ice-cold/kernel_xiaomi_msm8998.git
7 years agoMerge "power: qpnp-fg-gen3: Qualify aborting capacity learning"
Linux Build Service Account [Tue, 13 Jun 2017 04:43:18 +0000 (21:43 -0700)]
Merge "power: qpnp-fg-gen3: Qualify aborting capacity learning"

7 years agoMerge "drm/msm: Fix kernel address issue of profile buffer"
Linux Build Service Account [Tue, 13 Jun 2017 04:43:17 +0000 (21:43 -0700)]
Merge "drm/msm: Fix kernel address issue of profile buffer"

7 years agoMerge "qseecom: Fix accessing userspace memory in kernel space"
Linux Build Service Account [Tue, 13 Jun 2017 04:43:17 +0000 (21:43 -0700)]
Merge "qseecom: Fix accessing userspace memory in kernel space"

7 years agoMerge "msm: kgsl: Log clk set, enable and prepare failure"
Linux Build Service Account [Tue, 13 Jun 2017 04:43:16 +0000 (21:43 -0700)]
Merge "msm: kgsl: Log clk set, enable and prepare failure"

7 years agoMerge "soc: qcom: update return value for minidump add region"
Linux Build Service Account [Tue, 13 Jun 2017 04:43:14 +0000 (21:43 -0700)]
Merge "soc: qcom: update return value for minidump add region"

7 years agoMerge "clk: qcom: Add regmap mux-div clocks support"
Linux Build Service Account [Tue, 13 Jun 2017 04:43:13 +0000 (21:43 -0700)]
Merge "clk: qcom: Add regmap mux-div clocks support"

7 years agopower: qpnp-fg-gen3: Qualify aborting capacity learning
Subbaraman Narayanamurthy [Mon, 5 Jun 2017 18:59:15 +0000 (11:59 -0700)]
power: qpnp-fg-gen3: Qualify aborting capacity learning

Currently, capacity learning algorithm is aborted when the
charging status goes to not charging. This can happen with qnovo
enabled charging where stopping the pulsing can lead to charging
status change. Qualify aborting capacity learning based on the
qnovo enable status and input presence.

While at it, abort the capacity learning when the charging status
goes to discharging and charger is removed.

Change-Id: I4546e8880be0658748157cb13f048610eee932a3
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
7 years agopower: qpnp-fg-gen3: fix an unbalanced irq disable for delta_bsoc irq
Subbaraman Narayanamurthy [Thu, 8 Jun 2017 00:51:30 +0000 (17:51 -0700)]
power: qpnp-fg-gen3: fix an unbalanced irq disable for delta_bsoc irq

Currently, rerun_election() is called on delta_bsoc_irq_en
votable to disable delta_bsoc interrupt during probe. However, it
doesn't set the internal variable for votable to not allow a
similar vote again. When a vote is made later to disable the
interrupt again, it can end up in invoking the callback again.

This leads to an unbalanced interrupt disable warning. Fix it.

CRs-Fixed: 2058754
Change-Id: I30c35be5275b5b310cf9b17ea4660a3e2e89c59a
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
7 years agoMerge "Policy_engine: Add module parameter to disable PD"
Linux Build Service Account [Mon, 12 Jun 2017 17:41:38 +0000 (10:41 -0700)]
Merge "Policy_engine: Add module parameter to disable PD"

7 years agoMerge "diag: Remove BOM in file"
Linux Build Service Account [Mon, 12 Jun 2017 17:41:37 +0000 (10:41 -0700)]
Merge "diag: Remove BOM in file"

7 years agoMerge "usb: gadget: Bind android devices for all UDC gadgets"
Linux Build Service Account [Mon, 12 Jun 2017 17:41:36 +0000 (10:41 -0700)]
Merge "usb: gadget: Bind android devices for all UDC gadgets"

7 years agoMerge "ARM: dts: msm: specify a PWM mode threshold for BoB on SDM660"
Linux Build Service Account [Mon, 12 Jun 2017 17:41:35 +0000 (10:41 -0700)]
Merge "ARM: dts: msm: specify a PWM mode threshold for BoB on SDM660"

7 years agoMerge "SDM660: ADSPRPC: Handle NULL pointer dereference"
Linux Build Service Account [Mon, 12 Jun 2017 17:41:34 +0000 (10:41 -0700)]
Merge "SDM660: ADSPRPC: Handle NULL pointer dereference"

7 years agoMerge "defconfig: arch: arm64: Disable CONFIG_CC_OPTIMIZE_FOR_SIZE defconfig"
Linux Build Service Account [Mon, 12 Jun 2017 17:41:34 +0000 (10:41 -0700)]
Merge "defconfig: arch: arm64: Disable CONFIG_CC_OPTIMIZE_FOR_SIZE defconfig"

7 years agoMerge "ASoC: sdm660_cdc: Update micbias regulator to power saving on use basis"
Linux Build Service Account [Mon, 12 Jun 2017 17:41:33 +0000 (10:41 -0700)]
Merge "ASoC: sdm660_cdc: Update micbias regulator to power saving on use basis"

7 years agoqseecom: Fix accessing userspace memory in kernel space
Brahmaji K [Thu, 1 Jun 2017 11:50:10 +0000 (17:20 +0530)]
qseecom: Fix accessing userspace memory in kernel space

Use put_user API to write the data from kernel space to
userspace to avoid accessing userspace memory directly
in kernel space.

Change-Id: I649fe2597e80ccad50cf16b355e220734810e94c
Signed-off-by: Brahmaji K <bkomma@codeaurora.org>
7 years agosoc: qcom: update return value for minidump add region
Lingutla Chandrasekhar [Mon, 12 Jun 2017 09:06:03 +0000 (14:36 +0530)]
soc: qcom: update return value for minidump add region

If minidump is not enabled, minidump add region api returns
error number, clients can log the error to log buffer, which
flood the log buffer unnecessarily.

So return quietly if minidump support is not enabled.

Change-Id: I9c6428015ca40c5233f80471896bacecd0872bf7
Signed-off-by: Lingutla Chandrasekhar <clingutla@codeaurora.org>
7 years agoclk: qcom: Add regmap mux-div clocks support
Georgi Djakov [Wed, 18 Mar 2015 15:23:29 +0000 (17:23 +0200)]
clk: qcom: Add regmap mux-div clocks support

Add support for hardware that can switch both parent clocks and divider
at the same time. This avoids generating intermediate frequencies from
either the old parent clock and new divider or new parent clock and
old divider combinations.

Change-Id: I1b3f7e9422f5c27eeb391d309374167dc139e8ca
Signed-off-by: Georgi Djakov <georgi.djakov@linaro.org>
Git-commit: 549f1a4028350851f73837ad8cce3ac5fd2abd11
Git-repo: https://git.quicinc.com/?p=kernel/msm-4.4.git
[anischal@codeaurora.org: Fix compilation issue with
mux_div_get_safe_parent]
Signed-off-by: Amit Nischal <anischal@codeaurora.org>
7 years agodiag: Remove BOM in file
Mohit Aggarwal [Wed, 17 May 2017 00:09:31 +0000 (17:09 -0700)]
diag: Remove BOM in file

This file seems to have a BOM sequence to indicate the file is
UTF-8. There aren't any UTF sequences in the file though, and
this trips up sparse when running on files that include this
header. Remove the BOM so sparse is happy.

Change-Id: Ie25ce60077d1f2b4eb51bf0792635f02d1b33ae7
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Mohit Aggarwal <maggarwa@codeaurora.org>
7 years agoMerge "fbdev: msm: Allocate fd with O_CLOEXEC flag"
Linux Build Service Account [Sat, 10 Jun 2017 09:20:47 +0000 (02:20 -0700)]
Merge "fbdev: msm: Allocate fd with O_CLOEXEC flag"

7 years agoMerge "msm: mdss: Buffer overflow while processing gamut table data"
Linux Build Service Account [Sat, 10 Jun 2017 09:20:46 +0000 (02:20 -0700)]
Merge "msm: mdss: Buffer overflow while processing gamut table data"

7 years agoMerge "fb: msm_dba: add post-on-sleep support for adv7533 vreg"
Linux Build Service Account [Sat, 10 Jun 2017 09:20:45 +0000 (02:20 -0700)]
Merge "fb: msm_dba: add post-on-sleep support for adv7533 vreg"

7 years agoMerge "ARM: dts: msm: update nt35597 panel properties for msm8998"
Linux Build Service Account [Sat, 10 Jun 2017 09:20:43 +0000 (02:20 -0700)]
Merge "ARM: dts: msm: update nt35597 panel properties for msm8998"

7 years agoMerge "msm: mdss: Do not attempt to request TE irq again if already requested"
Linux Build Service Account [Sat, 10 Jun 2017 09:20:42 +0000 (02:20 -0700)]
Merge "msm: mdss: Do not attempt to request TE irq again if already requested"

7 years agoMerge "ARM: dts: msm: Enable secondary USB port for HDK660"
Linux Build Service Account [Sat, 10 Jun 2017 09:20:42 +0000 (02:20 -0700)]
Merge "ARM: dts: msm: Enable secondary USB port for HDK660"

7 years agodrm/msm: Fix kernel address issue of profile buffer
Kasin Li [Sun, 4 Jun 2017 08:34:16 +0000 (16:34 +0800)]
drm/msm: Fix kernel address issue of profile buffer

Current DRM adds offset when making IOVA but failed to add it when
making kernel address. This makes DRM write queue_s and submit_s to
wrong place if the profile buffer is not at the head of
a chunk of buffer.

Change-Id: I5af9c3050f4c6c5e0a54ed495bf79053f08f0bab
Signed-off-by: Kasin Li <donglil@codeaurora.org>
7 years agoMerge "icnss: Add APIs to store driver load count"
Linux Build Service Account [Sat, 10 Jun 2017 01:47:16 +0000 (18:47 -0700)]
Merge "icnss: Add APIs to store driver load count"

7 years agoMerge "ARM: dts: msm: Disable MHI node for msm8996"
Linux Build Service Account [Sat, 10 Jun 2017 01:47:15 +0000 (18:47 -0700)]
Merge "ARM: dts: msm: Disable MHI node for msm8996"

7 years agoMerge "ARM: dts: msm: add secure smmu cb node for msm8998"
Linux Build Service Account [Sat, 10 Jun 2017 01:47:14 +0000 (18:47 -0700)]
Merge "ARM: dts: msm: add secure smmu cb node for msm8998"

7 years agoPolicy_engine: Add module parameter to disable PD
Vijayavardhan Vennapusa [Mon, 5 Jun 2017 09:17:56 +0000 (14:47 +0530)]
Policy_engine: Add module parameter to disable PD

Currently power Delivery (PD) is enabled by default which sends
PD Hard reset in SINK mode to negogiate PD contract with host machine
after connect, if no capabilities message is received from other device.
This impacts with compliance for example: PMI ignores type-c disconnects
during PD Hard Reset. Add module parameter to disable PD so that it
doesn't enable PD communication during USB3.1 compliance testing.

Change-Id: Ia3e39cee1e65895402c18b380b650f0a34fb0cec
Signed-off-by: Vijayavardhan Vennapusa <vvreddy@codeaurora.org>
7 years agoicnss: Add APIs to store driver load count
Amar Singhal [Wed, 7 Jun 2017 23:53:06 +0000 (16:53 -0700)]
icnss: Add APIs to store driver load count

Host wlan driver needs to know if the drive has been
reloaded and wiphy re-registered with the kernel.
Therefore add APIs to retrieve this information.

CRs-Fixed: 2058292
Change-Id: Ia323e31e9b6779e2f5279f42b6e1860a9259a189
Signed-off-by: Amar Singhal <asinghal@codeaurora.org>
7 years agoMerge "ARM: dts: msm: move tdm common prop to parent node for msm8996 auto"
Linux Build Service Account [Fri, 9 Jun 2017 18:23:10 +0000 (11:23 -0700)]
Merge "ARM: dts: msm: move tdm common prop to parent node for msm8996 auto"

7 years agoMerge "ASoc: msm: add support for mixing data from different COPPs"
Linux Build Service Account [Fri, 9 Jun 2017 18:23:09 +0000 (11:23 -0700)]
Merge "ASoc: msm: add support for mixing data from different COPPs"

7 years agoMerge "defconfig: add cfg80211 internal regdb suuport"
Linux Build Service Account [Fri, 9 Jun 2017 18:23:08 +0000 (11:23 -0700)]
Merge "defconfig: add cfg80211 internal regdb suuport"

7 years agoMerge "msm: pcie: do not set irq chip data when using QGIC MSI"
Linux Build Service Account [Fri, 9 Jun 2017 18:23:06 +0000 (11:23 -0700)]
Merge "msm: pcie: do not set irq chip data when using QGIC MSI"

7 years agoMerge "msm: pcie: Fix for MDM enumeration issue"
Linux Build Service Account [Fri, 9 Jun 2017 18:23:05 +0000 (11:23 -0700)]
Merge "msm: pcie: Fix for MDM enumeration issue"

7 years agoARM: dts: msm: add secure smmu cb node for msm8998
Abhijit Kulkarni [Mon, 1 May 2017 17:51:02 +0000 (10:51 -0700)]
ARM: dts: msm: add secure smmu cb node for msm8998

This change adds the secure context bank child node in mdss
driver, this is required for having both the secure and non-secure
smmu context bank support in the driver. This change also renames
the child nodes to avoid compilation issues on the builds where
fb driver mdss device file is also present. As a part of this
change the smmu driver registration is called as a part of
msm driver probe.

CRs-Fixed: 2053654
Change-Id: I90cd31fd792b0fd9772689dc6561bb0b429e1e3a
Signed-off-by: Abhijit Kulkarni <kabhijit@codeaurora.org>
7 years agoMerge "sched: Fix the bug in select_best_cpu() that returns -1 as target_cpu"
Linux Build Service Account [Fri, 9 Jun 2017 09:45:20 +0000 (02:45 -0700)]
Merge "sched: Fix the bug in select_best_cpu() that returns -1 as target_cpu"

7 years agoMerge "icnss: Re-phrase debug message and rename state"
Linux Build Service Account [Fri, 9 Jun 2017 09:45:19 +0000 (02:45 -0700)]
Merge "icnss: Re-phrase debug message and rename state"

7 years agoMerge "icnss: Enable platform device to be a wakeup source"
Linux Build Service Account [Fri, 9 Jun 2017 09:45:18 +0000 (02:45 -0700)]
Merge "icnss: Enable platform device to be a wakeup source"

7 years agoMerge "PD: policy_engine: Add timeout for mode change through sysfs"
Linux Build Service Account [Fri, 9 Jun 2017 09:45:17 +0000 (02:45 -0700)]
Merge "PD: policy_engine: Add timeout for mode change through sysfs"

7 years agoMerge "drm/sde: add 4k hdmi support"
Linux Build Service Account [Fri, 9 Jun 2017 09:45:16 +0000 (02:45 -0700)]
Merge "drm/sde: add 4k hdmi support"

7 years agoMerge "scsi: ufs: fix unclocked register access"
Linux Build Service Account [Fri, 9 Jun 2017 09:45:15 +0000 (02:45 -0700)]
Merge "scsi: ufs: fix unclocked register access"

7 years agodefconfig: add cfg80211 internal regdb suuport
Zhaoyang Liu [Mon, 8 May 2017 08:08:25 +0000 (16:08 +0800)]
defconfig: add cfg80211 internal regdb suuport

Enable CFG80211_INTERNAL_REGDB to support WiFi 5G channels.

Change-Id: I7d53d2a09c30173d121368ec2e3584217ddc5093
Signed-off-by: Zhaoyang Liu <zhaoyang@codeaurora.org>
7 years agomsm: pcie: do not set irq chip data when using QGIC MSI
Tony Truong [Fri, 2 Jun 2017 20:37:36 +0000 (13:37 -0700)]
msm: pcie: do not set irq chip data when using QGIC MSI

When using QGIC MSI, the MSI controller is GIC not PCIe host
driver. Only set irq chip data if PCIe host is the MSI
controller.

Change-Id: I0ba9e78127424ab3da4b1f46b3ed3fa5d65d05f6
Signed-off-by: Tony Truong <truong@codeaurora.org>
7 years agomsm: kgsl: Log clk set, enable and prepare failure
Hareesh Gundu [Thu, 18 May 2017 11:36:33 +0000 (17:06 +0530)]
msm: kgsl: Log clk set, enable and prepare failure

Handle the clk API return value so that it’s easy
to catch un clocked GPU register access.

Change-Id: I5a1a9a6cbd673394f126bb17b849393268a22b1b
Signed-off-by: Hareesh Gundu <hareeshg@codeaurora.org>
7 years agoARM: dts: msm: Enable secondary USB port for HDK660
Liangliang Lu [Fri, 9 Jun 2017 07:35:41 +0000 (15:35 +0800)]
ARM: dts: msm: Enable secondary USB port for HDK660

Enable secondary USB port for HDK660 platform which use
host only mode.

Remove TCSR_QUSB2_PHY_CLAMP_DIG_N_1P8 resource entry for SDM660
which is not required to set now during disconnect as writing to this
register causes USB3.0 port and USB2.0 ports working independently.

Change-Id: I936a4012c30e0cd84144b12e34fb780cada541ae
Signed-off-by: Liangliang Lu <luliang@codeaurora.org>
7 years agoARM: dts: msm: Disable MHI node for msm8996
Rama Krishna Phani A [Fri, 9 Jun 2017 06:57:02 +0000 (12:27 +0530)]
ARM: dts: msm: Disable MHI node for msm8996

Mhi node needs additional information for driver
probe to get success. This generic node is not
required and hence disable unwanted dtsi node for
msm8996.

Change-Id: I4dffd3d668ac065fc800e5e7d3b52fdf2733e03f
Signed-off-by: Rama Krishna Phani A <rphani@codeaurora.org>
7 years agomsm: pcie: Fix for MDM enumeration issue
Rama Krishna Phani A [Fri, 9 Jun 2017 06:46:14 +0000 (12:16 +0530)]
msm: pcie: Fix for MDM enumeration issue

Add 500ms before MDM enumeration, this delay is needed for
link establishment between switch and MDM.

Change-Id: I32c4a4f9ef68b7672465ced0401fbf6dc0db0002
Signed-off-by: Rama Krishna Phani A <rphani@codeaurora.org>
7 years agousb: gadget: Bind android devices for all UDC gadgets
Ajay Agarwal [Tue, 30 May 2017 04:57:23 +0000 (10:27 +0530)]
usb: gadget: Bind android devices for all UDC gadgets

For targets with multiple UDCs having DRD feature, two UDCs
may be in peripheral mode. In that case, create and bind
android device corresponding to each gadget as and when
mkdir gadget is run. Keep global structure android_device as
android0 (or g1's device) for ease of use by f_midi and
f_audio_source.

Change-Id: Idae6f6d0d8811f27e836f5f6399395a15fbf3c2f
Signed-off-by: Ajay Agarwal <ajaya@codeaurora.org>
7 years agoARM: dts: msm: specify a PWM mode threshold for BoB on SDM660
Anirudh Ghayal [Mon, 15 May 2017 08:58:20 +0000 (14:28 +0530)]
ARM: dts: msm: specify a PWM mode threshold for BoB on SDM660

Specify a 2 A PWM vs AUTO mode load current threshold for the
BoB regulator.  Also specify the initial mode as AUTO.
Consumer that require the BoB to be in PWM mode should request
2000000 uA or more.

CRs-Fixed: 2054771
Change-Id: I2d2687a9b2204f677818b639fb6650084cffd84a
Signed-off-by: Anirudh Ghayal <aghayal@codeaurora.org>
7 years agoMerge "drm/msm/sde: add secure use case properties"
Linux Build Service Account [Fri, 9 Jun 2017 02:03:21 +0000 (19:03 -0700)]
Merge "drm/msm/sde: add secure use case properties"

7 years agoMerge "Revert "msm: smmu: add re-route calling for specified iova.""
Linux Build Service Account [Fri, 9 Jun 2017 02:03:20 +0000 (19:03 -0700)]
Merge "Revert "msm: smmu: add re-route calling for specified iova.""

7 years agoMerge "Merge branch 'android-4.4@9bc4622' into branch 'msm-4.4'"
Linux Build Service Account [Fri, 9 Jun 2017 02:03:19 +0000 (19:03 -0700)]
Merge "Merge branch 'android-4.4@9bc4622' into branch 'msm-4.4'"

7 years agosched: Fix the bug in select_best_cpu() that returns -1 as target_cpu
Pavankumar Kondeti [Thu, 8 Jun 2017 09:49:48 +0000 (15:19 +0530)]
sched: Fix the bug in select_best_cpu() that returns -1 as target_cpu

select_best_cpu() has previous CPU's cluster bias which overrides
the best_cpu with best_sibling_cpu when the power cost is same.
When the power table is configured incorrectly or static_cpu_pwr_cost/
static_cluster_pwr_cost tunables are set to a large value, the
power_cost() for all candidate CPUs can return INT_MAX. So the
stats.min_cost is never changed from it's initial value i.e INT_MAX.

In the above scenario, we find stats.best_cpu >= 0 &&  stats.min_cost =
stats.best_sibling_cpu_cost = INT_MAX && stats.best_sibling_cpu_cost = -1
and replace best_cpu with best_sibling_cpu i.e -1.

Change-Id: I09829e278e41daaaff959428ff50927aba29104c
Signed-off-by: Pavankumar Kondeti <pkondeti@codeaurora.org>
7 years agoicnss: Re-phrase debug message and rename state
Yuanyuan Liu [Wed, 7 Jun 2017 18:19:22 +0000 (11:19 -0700)]
icnss: Re-phrase debug message and rename state

Re-phrase PD notification registration debug message and
change state name of SSR/PDR to avoid confusion.

CRs-Fixed: 2057789
Change-Id: I5b800982c0d8c4d5ba627e28f3c9fa8eab7ca074
Signed-off-by: Yuanyuan Liu <yuanliu@codeaurora.org>
7 years agoicnss: Enable platform device to be a wakeup source
Yuanyuan Liu [Thu, 8 Jun 2017 00:39:54 +0000 (17:39 -0700)]
icnss: Enable platform device to be a wakeup source

Currently platform device is not enabled as a wakeup source, so
notifying the PM core for a wakeup event action will be no-op.
Hence enable it during driver probe.

CRs-Fixed: 2058010
Change-Id: Iefe5bcd4b498a9f02fca001ebcf8ad484f443217
Signed-off-by: Yuanyuan Liu <yuanliu@codeaurora.org>
7 years agoMerge "ARM: dts: msm: Add new property to DSPS IPC router node for MSM8998"
Linux Build Service Account [Thu, 8 Jun 2017 12:13:57 +0000 (05:13 -0700)]
Merge "ARM: dts: msm: Add new property to DSPS IPC router node for MSM8998"

7 years agoMerge "Revert "ARM: dts: msm: Remove TCSR_QUSB2_PHY_CLAMP_DIG_N_1P8 for SDM660""
Linux Build Service Account [Thu, 8 Jun 2017 12:13:56 +0000 (05:13 -0700)]
Merge "Revert "ARM: dts: msm: Remove TCSR_QUSB2_PHY_CLAMP_DIG_N_1P8 for SDM660""

7 years agoMerge "scsi: ufs: Avoid dead lock during error recovery"
Linux Build Service Account [Thu, 8 Jun 2017 12:13:55 +0000 (05:13 -0700)]
Merge "scsi: ufs: Avoid dead lock during error recovery"

7 years agoMerge "netfilter:Notify user space on creating sysfs file"
Linux Build Service Account [Thu, 8 Jun 2017 12:13:54 +0000 (05:13 -0700)]
Merge "netfilter:Notify user space on creating sysfs file"

7 years agoMerge "dm: md: Replace scheduling of request with direct call"
Linux Build Service Account [Thu, 8 Jun 2017 12:13:53 +0000 (05:13 -0700)]
Merge "dm: md: Replace scheduling of request with direct call"

7 years agoMerge "mmc: core: Fix the issue with clock scaling in resume-scaling"
Linux Build Service Account [Thu, 8 Jun 2017 12:13:51 +0000 (05:13 -0700)]
Merge "mmc: core: Fix the issue with clock scaling in resume-scaling"

7 years agoMerge "mmc: core: Initialize the devfreq table with default frequencies"
Linux Build Service Account [Thu, 8 Jun 2017 12:13:51 +0000 (05:13 -0700)]
Merge "mmc: core: Initialize the devfreq table with default frequencies"

7 years agoMerge "diag: Enable masks for user pd memory device session"
Linux Build Service Account [Thu, 8 Jun 2017 12:13:50 +0000 (05:13 -0700)]
Merge "diag: Enable masks for user pd memory device session"

7 years agoMerge "regulator: spm: check min/max voltages against HW configuration"
Linux Build Service Account [Thu, 8 Jun 2017 12:13:49 +0000 (05:13 -0700)]
Merge "regulator: spm: check min/max voltages against HW configuration"

7 years agoMerge "drm/msm: Fix drm_mm bottom_up search"
Linux Build Service Account [Thu, 8 Jun 2017 12:13:44 +0000 (05:13 -0700)]
Merge "drm/msm: Fix drm_mm bottom_up search"

7 years agoMerge "drm/msm: Use mmu notifiers to track SVM range invalidations"
Linux Build Service Account [Thu, 8 Jun 2017 12:13:44 +0000 (05:13 -0700)]
Merge "drm/msm: Use mmu notifiers to track SVM range invalidations"

7 years agoMerge "adv7481: Update adv7481 because of v4l2 changes"
Linux Build Service Account [Thu, 8 Jun 2017 12:13:37 +0000 (05:13 -0700)]
Merge "adv7481: Update adv7481 because of v4l2 changes"

7 years agoMerge "soc: qcom: glink_smem_native_xprt: recovery from SSR in tasklet only"
Linux Build Service Account [Thu, 8 Jun 2017 12:13:36 +0000 (05:13 -0700)]
Merge "soc: qcom: glink_smem_native_xprt: recovery from SSR in tasklet only"

7 years agomsm: mdss: Do not attempt to request TE irq again if already requested
Rashi Bindra [Mon, 5 Jun 2017 07:32:59 +0000 (13:02 +0530)]
msm: mdss: Do not attempt to request TE irq again if already requested

If the TE irq is alredy requested and registred with a GPIO, then
setting it to true and not continuing with further requesting of
the same.

Change-Id: Iacd1677127c2663d88826e58f1b72704b58db939
Signed-off-by: Rashi Bindra <rbindra@codeaurora.org>
7 years agoPD: policy_engine: Add timeout for mode change through sysfs
Vijayavardhan Vennapusa [Tue, 30 May 2017 10:41:04 +0000 (16:11 +0530)]
PD: policy_engine: Add timeout for mode change through sysfs

Currently USB driver tries to set power role as none and waits for
disconnect notification to set new mode. But there is a chance that it
might fail and stuck in infinite loop if other device is not dual-role
capable. Fix it by having timeout and bail out in case timeout happens.

Change-Id: I569356ee445c53950ed8fdd3f9994d4ae0e86131
Signed-off-by: Vijayavardhan Vennapusa <vvreddy@codeaurora.org>
7 years agoMerge "drm/msm : fix hdmi controller register programming"
Linux Build Service Account [Thu, 8 Jun 2017 03:58:00 +0000 (20:58 -0700)]
Merge "drm/msm : fix hdmi controller register programming"

7 years agoMerge "net: ipc_router: Add dynamic enable/disable wakeup source feature"
Linux Build Service Account [Thu, 8 Jun 2017 03:57:59 +0000 (20:57 -0700)]
Merge "net: ipc_router: Add dynamic enable/disable wakeup source feature"

7 years agoMerge "usb: pd: Increment MessageID only on successful TX"
Linux Build Service Account [Thu, 8 Jun 2017 03:57:55 +0000 (20:57 -0700)]
Merge "usb: pd: Increment MessageID only on successful TX"

7 years agoMerge "mhi: core: Add support for host triggered device ram dump"
Linux Build Service Account [Thu, 8 Jun 2017 03:57:53 +0000 (20:57 -0700)]
Merge "mhi: core: Add support for host triggered device ram dump"

7 years agoMerge "usb: xhci: Free leaked command in case xhci_queue_stop_endpoint fails"
Linux Build Service Account [Thu, 8 Jun 2017 03:57:52 +0000 (20:57 -0700)]
Merge "usb: xhci: Free leaked command in case xhci_queue_stop_endpoint fails"

7 years agoMerge "msm: mdss: Update msm8998 HDMI PHY sequence for bridge chip"
Linux Build Service Account [Thu, 8 Jun 2017 03:57:51 +0000 (20:57 -0700)]
Merge "msm: mdss: Update msm8998 HDMI PHY sequence for bridge chip"

7 years agoMerge "msm: mdss: update polarity based on HDMI resolution"
Linux Build Service Account [Thu, 8 Jun 2017 03:57:50 +0000 (20:57 -0700)]
Merge "msm: mdss: update polarity based on HDMI resolution"

7 years agoMerge "power: qpnp-fg-gen3: Fix possible integer overflow"
Linux Build Service Account [Thu, 8 Jun 2017 03:57:48 +0000 (20:57 -0700)]
Merge "power: qpnp-fg-gen3: Fix possible integer overflow"

7 years agoMerge "soc: qcom: subsys-pil-tz: Initialize subsys_dev pointer"
Linux Build Service Account [Thu, 8 Jun 2017 03:57:46 +0000 (20:57 -0700)]
Merge "soc: qcom: subsys-pil-tz: Initialize subsys_dev pointer"

7 years agoMerge "policy_engine: Add module parameter to start USB stack"
Linux Build Service Account [Thu, 8 Jun 2017 03:57:45 +0000 (20:57 -0700)]
Merge "policy_engine: Add module parameter to start USB stack"

7 years agoRevert "msm: smmu: add re-route calling for specified iova."
Guchun Chen [Thu, 8 Jun 2017 03:00:30 +0000 (20:00 -0700)]
Revert "msm: smmu: add re-route calling for specified iova."

This reverts commit ae94b477afd5d71221964250395d8f109ddb5b06.

This change brings side effect of smmu fault in apq8098 project. It blocks their regression test.

Change-Id: Ia479188eca74ec988026f7d42207435da2f79bfc
Signed-off-by: Guchun Chen <guchunc@codeaurora.org>
7 years agousb: pd: Increment MessageID only on successful TX
Jack Pham [Wed, 7 Jun 2017 22:35:57 +0000 (15:35 -0700)]
usb: pd: Increment MessageID only on successful TX

According to the PD 2.0 Spec, Section 6.2.1.3, the MessageID
field shall only be incremented upon successful transmission
(meaning GoodCRC was received). Thus, increment the counter
only when pd_phy_write() succeeds.

Change-Id: I73dce5736c473a1f79db9be868442c7941d13c44
Signed-off-by: Jack Pham <jackp@codeaurora.org>
7 years agoMerge "msm: mdss: do not print error in case sync_trigger is enabled"
Linux Build Service Account [Wed, 7 Jun 2017 20:13:42 +0000 (13:13 -0700)]
Merge "msm: mdss: do not print error in case sync_trigger is enabled"

7 years agoMerge "ARM: dts: msm: Enable dynamic fps for msm8998"
Linux Build Service Account [Wed, 7 Jun 2017 20:13:41 +0000 (13:13 -0700)]
Merge "ARM: dts: msm: Enable dynamic fps for msm8998"

7 years agoMerge "msm: mdss: disable AVR for msm8998"
Linux Build Service Account [Wed, 7 Jun 2017 20:13:39 +0000 (13:13 -0700)]
Merge "msm: mdss: disable AVR for msm8998"

7 years agoMerge "msm: mdss: Check if secure display is enabled during non-secure validate"
Linux Build Service Account [Wed, 7 Jun 2017 20:13:38 +0000 (13:13 -0700)]
Merge "msm: mdss: Check if secure display is enabled during non-secure validate"

7 years agoMerge "msm: mdss: Avoid NULL mixer during partial update ROI setup"
Linux Build Service Account [Wed, 7 Jun 2017 20:13:37 +0000 (13:13 -0700)]
Merge "msm: mdss: Avoid NULL mixer during partial update ROI setup"

7 years agoMerge "ARM: dts: msm: enable null packet on msm8998"
Linux Build Service Account [Wed, 7 Jun 2017 20:13:36 +0000 (13:13 -0700)]
Merge "ARM: dts: msm: enable null packet on msm8998"

7 years agoMerge "msm: mdss: Fix QSEED3 MDP clock calculation for cmd mode panel"
Linux Build Service Account [Wed, 7 Jun 2017 20:13:35 +0000 (13:13 -0700)]
Merge "msm: mdss: Fix QSEED3 MDP clock calculation for cmd mode panel"

7 years agoMerge "ARM: dts: msm: specify a PWM mode threshold for PMI8998 BoB on MSM8998"
Linux Build Service Account [Wed, 7 Jun 2017 20:13:34 +0000 (13:13 -0700)]
Merge "ARM: dts: msm: specify a PWM mode threshold for PMI8998 BoB on MSM8998"

7 years agoMerge "regulator: rpm-smd-regulator: add support for load based mode control"
Linux Build Service Account [Wed, 7 Jun 2017 20:13:33 +0000 (13:13 -0700)]
Merge "regulator: rpm-smd-regulator: add support for load based mode control"

7 years agoMerge "drivers: Warning fixes to disable CC_OPTIMIZE_FOR_SIZE"
Linux Build Service Account [Wed, 7 Jun 2017 20:13:32 +0000 (13:13 -0700)]
Merge "drivers:  Warning fixes to disable CC_OPTIMIZE_FOR_SIZE"

7 years agoMerge "ARM: dts: msm: control avdd enable gpio for msm8998 QVR/SKUK HDK"
Linux Build Service Account [Wed, 7 Jun 2017 20:13:30 +0000 (13:13 -0700)]
Merge "ARM: dts: msm: control avdd enable gpio for msm8998 QVR/SKUK HDK"

7 years agoMerge "msm: mdss: control avdd enable gpio when doing panel reset"
Linux Build Service Account [Wed, 7 Jun 2017 20:13:29 +0000 (13:13 -0700)]
Merge "msm: mdss: control avdd enable gpio when doing panel reset"

7 years agoscsi: ufs: fix unclocked register access
Subhash Jadavani [Tue, 16 May 2017 01:17:57 +0000 (18:17 -0700)]
scsi: ufs: fix unclocked register access

When we try to update UFS driver's sysfs attribute hibern8_on_idle_delay_ms
(echo <val> > /sys/bus/platform/devices/*.ufshc/hibern8_on_idle_delay_ms)
and if auto-hibern8 is enabled, we try to update the new timeout value into
auto-hibern8 timer register without making sure the controller clocks are
enabled, this may cause the unclocked register access. So we are now
making sure that clocks are enabled and we are also making sure that
there are no transfers active on controller when we modify the auto
hibern8 timeout.

Change-Id: I603b3f405d3a69c594edd45037a2ca4535ebd1ca
Signed-off-by: Subhash Jadavani <subhashj@codeaurora.org>
7 years agoMerge branch 'android-4.4@9bc4622' into branch 'msm-4.4'
Blagovest Kolenichev [Wed, 31 May 2017 23:59:54 +0000 (16:59 -0700)]
Merge branch 'android-4.4@9bc4622' into branch 'msm-4.4'

* refs/heads/tmp-9bc4622:
  Linux 4.4.70
  drivers: char: mem: Check for address space wraparound with mmap()
  nfsd: encoders mustn't use unitialized values in error cases
  drm/edid: Add 10 bpc quirk for LGD 764 panel in HP zBook 17 G2
  PCI: Freeze PME scan before suspending devices
  PCI: Fix pci_mmap_fits() for HAVE_PCI_RESOURCE_TO_USER platforms
  tracing/kprobes: Enforce kprobes teardown after testing
  osf_wait4(): fix infoleak
  genirq: Fix chained interrupt data ordering
  uwb: fix device quirk on big-endian hosts
  metag/uaccess: Check access_ok in strncpy_from_user
  metag/uaccess: Fix access_ok()
  iommu/vt-d: Flush the IOTLB to get rid of the initial kdump mappings
  staging: rtl8192e: rtl92e_get_eeprom_size Fix read size of EPROM_CMD.
  staging: rtl8192e: fix 2 byte alignment of register BSSIDR.
  mm/huge_memory.c: respect FOLL_FORCE/FOLL_COW for thp
  xc2028: Fix use-after-free bug properly
  arm64: documentation: document tagged pointer stack constraints
  arm64: uaccess: ensure extension of access_ok() addr
  arm64: xchg: hazard against entire exchange variable
  ARM: dts: at91: sama5d3_xplained: not all ADC channels are available
  ARM: dts: at91: sama5d3_xplained: fix ADC vref
  powerpc/64e: Fix hang when debugging programs with relocated kernel
  powerpc/pseries: Fix of_node_put() underflow during DLPAR remove
  powerpc/book3s/mce: Move add_taint() later in virtual mode
  cx231xx-cards: fix NULL-deref at probe
  cx231xx-audio: fix NULL-deref at probe
  cx231xx-audio: fix init error path
  dvb-frontends/cxd2841er: define symbol_rate_min/max in T/C fe-ops
  zr364xx: enforce minimum size when reading header
  dib0700: fix NULL-deref at probe
  s5p-mfc: Fix unbalanced call to clock management
  gspca: konica: add missing endpoint sanity check
  ceph: fix recursion between ceph_set_acl() and __ceph_setattr()
  iio: proximity: as3935: fix as3935_write
  ipx: call ipxitf_put() in ioctl error path
  USB: hub: fix non-SS hub-descriptor handling
  USB: hub: fix SS hub-descriptor handling
  USB: serial: io_ti: fix div-by-zero in set_termios
  USB: serial: mct_u232: fix big-endian baud-rate handling
  USB: serial: qcserial: add more Lenovo EM74xx device IDs
  usb: serial: option: add Telit ME910 support
  USB: iowarrior: fix info ioctl on big-endian hosts
  usb: musb: tusb6010_omap: Do not reset the other direction's packet size
  ttusb2: limit messages to buffer size
  mceusb: fix NULL-deref at probe
  usbvision: fix NULL-deref at probe
  net: irda: irda-usb: fix firmware name on big-endian hosts
  usb: host: xhci-mem: allocate zeroed Scratchpad Buffer
  xhci: apply PME_STUCK_QUIRK and MISSING_CAS quirk for Denverton
  usb: host: xhci-plat: propagate return value of platform_get_irq()
  sched/fair: Initialize throttle_count for new task-groups lazily
  sched/fair: Do not announce throttled next buddy in dequeue_task_fair()
  fscrypt: avoid collisions when presenting long encrypted filenames
  f2fs: check entire encrypted bigname when finding a dentry
  fscrypt: fix context consistency check when key(s) unavailable
  net: qmi_wwan: Add SIMCom 7230E
  ext4 crypto: fix some error handling
  ext4 crypto: don't let data integrity writebacks fail with ENOMEM
  USB: serial: ftdi_sio: add Olimex ARM-USB-TINY(H) PIDs
  USB: serial: ftdi_sio: fix setting latency for unprivileged users
  pid_ns: Fix race between setns'ed fork() and zap_pid_ns_processes()
  pid_ns: Sleep in TASK_INTERRUPTIBLE in zap_pid_ns_processes
  iio: dac: ad7303: fix channel description
  of: fix sparse warning in of_pci_range_parser_one
  proc: Fix unbalanced hard link numbers
  cdc-acm: fix possible invalid access when processing notification
  drm/nouveau/tmr: handle races with hw when updating the next alarm time
  drm/nouveau/tmr: avoid processing completed alarms when adding a new one
  drm/nouveau/tmr: fix corruption of the pending list when rescheduling an alarm
  drm/nouveau/tmr: ack interrupt before processing alarms
  drm/nouveau/therm: remove ineffective workarounds for alarm bugs
  drm/amdgpu: Make display watermark calculations more accurate
  drm/amdgpu: Avoid overflows/divide-by-zero in latency_watermark calculations.
  ath9k_htc: fix NULL-deref at probe
  ath9k_htc: Add support of AirTies 1eda:2315 AR9271 device
  s390/cputime: fix incorrect system time
  s390/kdump: Add final note
  regulator: tps65023: Fix inverted core enable logic.
  KVM: X86: Fix read out-of-bounds vulnerability in kvm pio emulation
  KVM: x86: Fix load damaged SSEx MXCSR register
  ima: accept previously set IMA_NEW_FILE
  mwifiex: pcie: fix cmd_buf use-after-free in remove/reset
  rtlwifi: rtl8821ae: setup 8812ae RFE according to device type
  md: update slab_cache before releasing new stripes when stripes resizing
  dm space map disk: fix some book keeping in the disk space map
  dm thin metadata: call precommit before saving the roots
  dm bufio: make the parameter "retain_bytes" unsigned long
  dm cache metadata: fail operations if fail_io mode has been established
  dm bufio: check new buffer allocation watermark every 30 seconds
  dm bufio: avoid a possible ABBA deadlock
  dm raid: select the Kconfig option CONFIG_MD_RAID0
  dm btree: fix for dm_btree_find_lowest_key()
  infiniband: call ipv6 route lookup via the stub interface
  tpm_crb: check for bad response size
  ARM: tegra: paz00: Mark panel regulator as enabled on boot
  USB: core: replace %p with %pK
  char: lp: fix possible integer overflow in lp_setup()
  watchdog: pcwd_usb: fix NULL-deref at probe
  USB: ene_usb6250: fix DMA to the stack
  usb: misc: legousbtower: Fix memory leak
  usb: misc: legousbtower: Fix buffers on stack
  ANDROID: uid_sys_stats: defer io stats calulation for dead tasks
  ANDROID: AVB: Fix linter errors.
  ANDROID: AVB: Fix invalidate_vbmeta_submit().
  ANDROID: sdcardfs: Check for NULL in revalidate
  Linux 4.4.69
  ipmi: Fix kernel panic at ipmi_ssif_thread()
  wlcore: Add RX_BA_WIN_SIZE_CHANGE_EVENT event
  wlcore: Pass win_size taken from ieee80211_sta to FW
  mac80211: RX BA support for sta max_rx_aggregation_subframes
  mac80211: pass block ack session timeout to to driver
  mac80211: pass RX aggregation window size to driver
  Bluetooth: hci_intel: add missing tty-device sanity check
  Bluetooth: hci_bcm: add missing tty-device sanity check
  Bluetooth: Fix user channel for 32bit userspace on 64bit kernel
  tty: pty: Fix ldisc flush after userspace become aware of the data already
  serial: omap: suspend device on probe errors
  serial: omap: fix runtime-pm handling on unbind
  serial: samsung: Use right device for DMA-mapping calls
  arm64: KVM: Fix decoding of Rt/Rt2 when trapping AArch32 CP accesses
  padata: free correct variable
  CIFS: add misssing SFM mapping for doublequote
  cifs: fix CIFS_IOC_GET_MNT_INFO oops
  CIFS: fix mapping of SFM_SPACE and SFM_PERIOD
  SMB3: Work around mount failure when using SMB3 dialect to Macs
  Set unicode flag on cifs echo request to avoid Mac error
  fs/block_dev: always invalidate cleancache in invalidate_bdev()
  ceph: fix memory leak in __ceph_setxattr()
  fs/xattr.c: zero out memory copied to userspace in getxattr
  ext4: evict inline data when writing to memory map
  IB/mlx4: Reduce SRIOV multicast cleanup warning message to debug level
  IB/mlx4: Fix ib device initialization error flow
  IB/IPoIB: ibX: failed to create mcg debug file
  IB/core: Fix sysfs registration error flow
  vfio/type1: Remove locked page accounting workqueue
  dm era: save spacemap metadata root after the pre-commit
  crypto: algif_aead - Require setkey before accept(2)
  block: fix blk_integrity_register to use template's interval_exp if not 0
  KVM: arm/arm64: fix races in kvm_psci_vcpu_on
  KVM: x86: fix user triggerable warning in kvm_apic_accept_events()
  um: Fix PTRACE_POKEUSER on x86_64
  x86, pmem: Fix cache flushing for iovec write < 8 bytes
  selftests/x86/ldt_gdt_32: Work around a glibc sigaction() bug
  x86/boot: Fix BSS corruption/overwrite bug in early x86 kernel startup
  usb: hub: Do not attempt to autosuspend disconnected devices
  usb: hub: Fix error loop seen after hub communication errors
  usb: Make sure usb/phy/of gets built-in
  usb: misc: add missing continue in switch
  staging: comedi: jr3_pci: cope with jiffies wraparound
  staging: comedi: jr3_pci: fix possible null pointer dereference
  staging: gdm724x: gdm_mux: fix use-after-free on module unload
  staging: vt6656: use off stack for out buffer USB transfers.
  staging: vt6656: use off stack for in buffer USB transfers.
  USB: Proper handling of Race Condition when two USB class drivers try to call init_usb_class simultaneously
  USB: serial: ftdi_sio: add device ID for Microsemi/Arrow SF2PLUS Dev Kit
  usb: host: xhci: print correct command ring address
  iscsi-target: Set session_fall_back_to_erl0 when forcing reinstatement
  target: Convert ACL change queue_depth se_session reference usage
  target/fileio: Fix zero-length READ and WRITE handling
  target: Fix compare_and_write_callback handling for non GOOD status
  xen: adjust early dom0 p2m handling to xen hypervisor behavior
  ANDROID: AVB: Only invalidate vbmeta when told to do so.
  ANDROID: sdcardfs: Move top to its own struct
  ANDROID: lowmemorykiller: account for unevictable pages
  ANDROID: usb: gadget: fix NULL pointer issue in mtp_read()
  ANDROID: usb: f_mtp: return error code if transfer error in receive_file_work function

Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>
Conflicts:
drivers/usb/gadget/function/f_mtp.c
fs/ext4/page-io.c
net/mac80211/agg-rx.c

Change-Id: Id65e75bf3bcee4114eb5d00730a9ef2444ad58eb
Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>
7 years agodrm/msm : fix hdmi controller register programming
Abhinav Kumar [Wed, 7 Jun 2017 09:19:43 +0000 (02:19 -0700)]
drm/msm : fix hdmi controller register programming

Currently, there is an incorrect programming of the
hdmi controller register where default value of the
datapath mode bit is being toggled along with the
scrambler enable/disable.

This bit should be untouched as per the hardware
programming sequence and kept at the default state.

Fix the register programming to avoid toggling this
bit.

Change-Id: I2e8f74c0abaddd27b5d8a2136afc4e1b82f96e7d
Signed-off-by: Abhinav Kumar <abhinavk@codeaurora.org>
7 years agoRevert "ARM: dts: msm: Remove TCSR_QUSB2_PHY_CLAMP_DIG_N_1P8 for SDM660"
Vijayavardhan Vennapusa [Wed, 7 Jun 2017 08:39:58 +0000 (14:09 +0530)]
Revert "ARM: dts: msm: Remove TCSR_QUSB2_PHY_CLAMP_DIG_N_1P8 for SDM660"

Commit c20c74d49cd7 ("ARM: dts: msm: Remove TCSR_QUSB2_PHY_CLAMP_DIG_N_1P8
for SDM660") is added to remove enabling/disabling clamp during
disconnect/connect. But it is required to enable clamp input to QUSB2PHY,
whenever 0.9V LDO is collapsed. Hence revert the change to add dtsi
property for enable/disable clamp.

Change-Id: I12009bd56d214499a73f7ea3e73d1c979c107ac9
Signed-off-by: Vijayavardhan Vennapusa <vvreddy@codeaurora.org>