Commit graph

586702 commits

Author SHA1 Message Date
Linux Build Service Account
13c1e33923 Merge "sde: rotator: add support to configure bus scale vectors" 2017-03-31 21:24:31 -07:00
Linux Build Service Account
67a1d56b69 Merge "msm: mdss: Update write gather register value for MDSS" 2017-03-31 21:24:30 -07:00
Linux Build Service Account
d6edc53a8f Merge "ARM: dts: msm: update vote on ldo11 for amoled panel on sdm630" 2017-03-31 21:24:29 -07:00
Linux Build Service Account
93159d1297 Merge "msm: mdss: make hpd call asynchronous for HDMI in certain cases" 2017-03-31 21:24:28 -07:00
Linux Build Service Account
dff944c7b6 Merge "msm: mdss: dp: set failsafe link params when DPCD read fails" 2017-03-31 21:24:27 -07:00
Linux Build Service Account
a3f4c6146c Merge "trace: ipc_logging: Avoid buffer overflow in ipc_log_string()" 2017-03-31 21:24:26 -07:00
Linux Build Service Account
a9654d0f73 Merge "msm: pcie: log PCIe LTSSM state during link training" 2017-03-31 21:24:25 -07:00
Linux Build Service Account
eed551694d Merge "power: smb-lib: Rerun APSD regardless of charger-type" 2017-03-31 21:24:24 -07:00
Linux Build Service Account
b2e759993b Merge "usb: gadget: f_mass_storage: Perform async runtime resume upon set_alt" 2017-03-31 21:24:24 -07:00
Linux Build Service Account
8a493b9bee Merge "qcom: smb-lib: Disable HW trigger when forcing sink-only mode" 2017-03-31 21:24:23 -07:00
Linux Build Service Account
84d6e9ea9f Merge "ARM: dts: msm: Update GFX PM-QoS values for SDM630" 2017-03-31 21:24:22 -07:00
Linux Build Service Account
e99cdf40ba Merge "net: ipv6: Add early demux handler for UDP unicast" 2017-03-31 21:24:21 -07:00
Linux Build Service Account
f0ee86f82a Merge "drm/msm: Add performance counter tracking" 2017-03-31 21:24:20 -07:00
Linux Build Service Account
438703a38e Merge "icnss: Separate debug and verbose log" 2017-03-31 21:24:19 -07:00
Linux Build Service Account
793709645b Merge "msm: qpnp-haptic: Enable HW auto-resonance for PM660" 2017-03-31 21:24:19 -07:00
Linux Build Service Account
ad4fb9e0fe Merge "msm_11ad: 11AD SMMU changes to allow enabling of SMMU stage1" 2017-03-31 21:24:18 -07:00
Linux Build Service Account
feb15f20cb Merge "msm: media: Allocate extra memory after alignment" 2017-03-31 21:24:17 -07:00
Linux Build Service Account
6b41d84c53 Merge "soc: qcom: spcom: lock ion buf, decrement ref count if no free entry" 2017-03-31 21:24:16 -07:00
Linux Build Service Account
29a8408816 Merge "diag: Add support for header untagging" 2017-03-31 21:24:15 -07:00
Linux Build Service Account
6210291d06 Merge "ASoC: codecs: Correct stream name, add dapm sync" 2017-03-31 21:24:15 -07:00
Linux Build Service Account
68a715abd5 Merge "drivers: soc: Add mutex lock in audio_notifier_late_init" 2017-03-31 21:24:14 -07:00
Deepak Kumar
e94796fdb3 ARM: dts: msm: Update GFX PM-QoS values for SDM630
Update GFX PM-QoS entries according to the measured
LPM latencies for SDM630 to prevent l2-pc.

Change-Id: I3a59a26bf19d79393c4b45c8a3b243897f3f6eb2
Signed-off-by: Deepak Kumar <dkumar@codeaurora.org>
2017-03-30 20:08:58 -07:00
Anirudh Ghayal
e8662c7b5d power: smb-lib: Rerun APSD regardless of charger-type
It is observed that the USB_PHY may interfere with APSD
when the charger is inserted at PON. This may lead to
incorrect charger type detection.

Fix this by doing a APSD re-run during driver initialization
if USB is present and regardless of the charger type.

CRs-Fixed: 2011764
Change-Id: Icc9ee7bacf0eecdb311ca52979758514abca154e
Signed-off-by: Anirudh Ghayal <aghayal@codeaurora.org>
2017-03-30 18:03:50 -07:00
Mayank Rana
265b668a10 usb: gadget: f_mass_storage: Perform async runtime resume upon set_alt
commit 82f2935616 ("usb: gadget: f_mass_storage: Allow USB LPM
upon ep disable") just increments power usage count by 1 for dwc3 device
in thread handler. Since child count for dwc3 parent remains 0, there is
possibility of dwc3 parent going into suspend even if dwc3 power usage
count is set to 1. This causes unclocked register access as mdwc gets
runtime suspended and mass storage thread handler disables the endpoint.
Fix this issue by calling usb_gadget_autopm_get_async() in set_alt which
increments dwc3 power usage count and carry out resume asynchronously.

Change-Id: Iccce928590d8e67e234f0aa371f78eb1e6a326b7
Signed-off-by: Mayank Rana <mrana@codeaurora.org>
2017-03-30 17:56:21 -07:00
Jack Pham
775e281fb6 trace: ipc_logging: Avoid buffer overflow in ipc_log_string()
In ipc_log_string() the return value from vsnprintf(), data_size,
is used to increment ectxt.offset. However, this length could
actually be much larger than that of ectxt.buff itself. This is a
typical mistake of [v]snprintf() usage [1], in that it returns
not the number of characters written but how many characters
*would* have been written regardless of whether it was truncated.
The result is that even though ectxt.buff itself is not overrun,
the incorrect size in ectxt.offset will be later used as the length
parameter when memcpy()'ing to the ipc_log_page's data, overflowing
that memory and beyond. The write_page's write_offset would also
indicate an out-of-bounds (greater than PAGE_SIZE) length.

The fix is simple: use vscnprintf() instead of vsnprintf().

[1] https://lwn.net/Articles/69419/

Change-Id: I2e9d44e74f5f30a009732e31a554d82e31946999
Signed-off-by: Jack Pham <jackp@codeaurora.org>
2017-03-30 17:34:50 -07:00
Linux Build Service Account
92124c76a2 Merge "drm/msm: Remove ringbuffer restriction from idle" 2017-03-30 15:31:40 -07:00
Linux Build Service Account
2146eb6702 Merge "drm/msm: Update registers for performance counters" 2017-03-30 15:31:39 -07:00
Linux Build Service Account
e7e5fdf600 Merge "ARM: dts: msm: Update QoS priority for pimem bus master for sdm660" 2017-03-30 15:31:38 -07:00
Linux Build Service Account
8bbbda45fb Merge "msm_serial_hs: Change GPIO config sequence during runtime resume/suspend" 2017-03-30 15:31:37 -07:00
Linux Build Service Account
afe9a529cb Merge "msm: sde: Protect concurrent access to resources in SDE rotator" 2017-03-30 15:31:35 -07:00
Linux Build Service Account
45a51fbf92 Merge "msm-4.4: driver to create cld80211 nl family at bootup time" 2017-03-30 15:31:34 -07:00
Linux Build Service Account
32aa03c0c5 Merge "wil6210: do not start regular scan on stopped p2p device" 2017-03-30 15:31:33 -07:00
Linux Build Service Account
e19e1d6ed8 Merge "msm: ipa: Fix to reset the sticky_rear flag" 2017-03-30 15:31:30 -07:00
Linux Build Service Account
3e41080faa Merge "usb: gadget: mtp: reset string descriptor's index with unbind" 2017-03-30 15:31:29 -07:00
Linux Build Service Account
a9a7492ba1 Merge "esoc: Fix user space corruption due to wrong data type" 2017-03-30 15:31:28 -07:00
Linux Build Service Account
2959ac0a18 Merge "qseecom: fix macro QSEECOM_ALIGN definition issue" 2017-03-30 15:31:26 -07:00
Linux Build Service Account
2645a39019 Merge "qcom: qnovo: Disable ok_to_qnovo right after charging stops" 2017-03-30 15:31:25 -07:00
Linux Build Service Account
2b504b9bae Merge "qcom: smb138x-charger: support two usb input properties" 2017-03-30 15:31:23 -07:00
Linux Build Service Account
c93957ac9a Merge "qcom: smblib: supsend USB input during boost" 2017-03-30 15:31:22 -07:00
Linux Build Service Account
8208716117 Merge "ARM: dts: msm: Specify smb138x vbus regulator for USBIN-USBIN" 2017-03-30 15:31:22 -07:00
Linux Build Service Account
0afbd651a7 Merge "msm: hdmi: edid: fix parsing of 4K resolution from DTD" 2017-03-30 15:31:21 -07:00
Linux Build Service Account
09dd8a3ae5 Merge "ARM: dts: msm: Correct primary camera mount angle on SDM660" 2017-03-30 15:31:14 -07:00
Jack Pham
9ef3d654f2 qcom: smb-lib: Disable HW trigger when forcing sink-only mode
Due to an existing HW workaround, the UFP_EN_CMD bit may end up
getting cleared even after having been set. The result of this
is the Type-C state machine returns to DRP behavior despite SW
intention to force sink mode, such as PR Swap or Try.SNK.

Temporarily disable this particular HW trigger whenever the
typec_power_role property is getting set to sink-only mode, and
restore it when leaving sink mode.

Change-Id: I21e840bfeee3ad88b0562645378b1fea200e3803
Signed-off-by: Jack Pham <jackp@codeaurora.org>
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
2017-03-30 15:13:17 -07:00
Linux Build Service Account
928cd38621 Merge "soc: qcom: fix to avoid multiple memory allocations" 2017-03-30 07:20:57 -07:00
Linux Build Service Account
c63da8bee6 Merge "input: touchpanel: Add ST Touchscreen version 4.1.0 driver" 2017-03-30 07:20:52 -07:00
Linux Build Service Account
5609e231ef Merge "mmc: host: sdhci-msm: Skip reading GENERICS register in check_pwr_status" 2017-03-30 07:20:49 -07:00
Linux Build Service Account
512f631e40 Merge "wil6210: fix memory access violation in wil_memcpy_from/toio_32" 2017-03-30 07:20:46 -07:00
Linux Build Service Account
ef3cab22d8 Merge "fs: fat: ratelimit the IO errors" 2017-03-30 07:20:43 -07:00
Linux Build Service Account
225393f7b3 Merge "power: qpnp-fg-gen3: Whitelist the values in profile integrity word" 2017-03-30 07:20:37 -07:00
Linux Build Service Account
1743983a43 Merge "diag: Fix race condition while accessing mdlog session info" 2017-03-30 07:20:34 -07:00