Commit graph

592002 commits

Author SHA1 Message Date
Linux Build Service Account
5d33d4985a Merge "msm: sde: Set minimum traffic shaping in sde rotator" 2017-07-14 17:59:54 -07:00
Linux Build Service Account
d70bfa127b Merge "msm: mdss: Avoid direct dereference user input in pp cache config" 2017-07-14 17:59:53 -07:00
Linux Build Service Account
c25fd79e76 Merge "msm: sensor: Fix for variable being de-referenced without proper check" 2017-07-14 17:59:52 -07:00
Linux Build Service Account
6c18a826c7 Merge "serial: msm_serial_hs: Optimize the total tty port support" 2017-07-14 17:59:51 -07:00
Linux Build Service Account
b4bb5c107d Merge "diag: Protect mask updates for memory device session" 2017-07-14 17:59:50 -07:00
Linux Build Service Account
4bf2e9f455 Merge "msm:ipa: Fix to incorrect structure access" 2017-07-14 04:01:33 -07:00
Linux Build Service Account
ed591f0f78 Merge "ASoC: msm8998: Add MM front end DAI links for interactive streams" 2017-07-14 04:01:30 -07:00
Linux Build Service Account
09e0532f9d Merge "ASoC: msm: Support mixer controls for Pan/scale & downmix" 2017-07-14 04:01:29 -07:00
Linux Build Service Account
b90525b5f0 Merge "ASoC: q6dspv2: Support for pan-scale and downmix set param" 2017-07-14 04:01:29 -07:00
Linux Build Service Account
eaea16f0b2 Merge "fbdev: msm: Add check for fence count" 2017-07-14 04:01:28 -07:00
Linux Build Service Account
a189faf365 Merge "msm: mdss: apply bus throughput factor for high downscale cases" 2017-07-14 04:01:27 -07:00
Linux Build Service Account
de4967ee70 Merge "ARM: dts: msm: rename mdss_mdp to sde_kms for msm8996" 2017-07-14 04:01:26 -07:00
Linux Build Service Account
20f79f9e8f Merge "msm_11ad: Compile as module instead of built-in" 2017-07-14 04:01:22 -07:00
Linux Build Service Account
bcad6b5748 Merge "msm-core: Align the trace log temp in same scale factor" 2017-07-14 04:01:21 -07:00
Linux Build Service Account
2f3a5aede8 Merge "usb: pd: Add delay before sending Source Capabilities" 2017-07-14 04:01:20 -07:00
Linux Build Service Account
52da1d7a4f Merge "ARM: dts: msm: Enable pmic gpio13 so neutrino driver can toggle it in probe" 2017-07-14 04:01:17 -07:00
Linux Build Service Account
b971eaa3a0 Merge "net: ipv6: reset daddr and dport in socket if connect() fails" 2017-07-14 04:01:14 -07:00
Linux Build Service Account
bd63fad4d1 Merge "ARM: dts: msm: Use wlan carveout region for sdm660/sdm630" 2017-07-14 04:01:11 -07:00
Linux Build Service Account
5c64544466 Merge "smb-lib: fix usbin_icl_change interrupt storm" 2017-07-14 04:00:26 -07:00
Linux Build Service Account
6cc3f85f8c Merge "msm: ADSPRPC: define separate signals for port and link states" 2017-07-14 04:00:25 -07:00
Linux Build Service Account
a4e0503bd2 Merge "diag: Update stream for active PD mdlog session" 2017-07-14 04:00:24 -07:00
Linux Build Service Account
12b782766d Merge "ARM: dts: msm: Add IPA dtsi entries for MSM8996 Auto" 2017-07-14 04:00:23 -07:00
Linux Build Service Account
2869ecde31 Merge "coresight: tmc: Fix use after free issue with tmc read" 2017-07-14 04:00:21 -07:00
Varun Balaraj
f829f46128 ASoC: msm8998: Add MM front end DAI links for interactive streams
Add MM front end DAI links to support concurrent interactive
streams

Change-Id: I9cd95d855f2ddc3345453807e4be235c430b9ef3
Signed-off-by: Varun Balaraj <varunb@codeaurora.org>
2017-07-13 01:59:24 -07:00
Varun Balaraj
a48f734c3b ASoC: msm: Support mixer controls for Pan/scale & downmix
Add changes to register and receive parameters for pan/scale
and downmix operations.

Change-Id: If0e747304595f9ed3bd19b25e3f4eab2db382a67
Signed-off-by: Varun Balaraj <varunb@codeaurora.org>
2017-07-13 01:47:39 -07:00
Varun Balaraj
701ac49eb7 ASoC: q6dspv2: Support for pan-scale and downmix set param
Add support for set params on ASM/ADM for MFC and
Volume modules. Make PSPD mitrix set param api generic.

Change-Id: I75a5b9e3fd2316b75be41439848f89190944bc36
Signed-off-by: Varun Balaraj <varunb@codeaurora.org>
2017-07-13 01:47:22 -07:00
Mukesh Kumar Savaliya
a86501a108 serial: msm_serial_hs: Optimize the total tty port support
No need of having high number of tty port for HSUART which just wastes
resources. Make this optimal based on the use cases.

Change-Id: If82fc1a3457fae7503d7557817ca776f19027da7
Signed-off-by: Mukesh Kumar Savaliya <msavaliy@codeaurora.org>
2017-07-13 13:01:09 +05:30
Maria Yu
3551dc315a msm-core: Align the trace log temp in same scale factor
Temp in trace_temp_notification is not divided with
scaling factor while cpu_node->temp is. Use temp after
scale for better log understanding.

Change-Id: Iadf4a1c39211651fee67cc18f68a65785f28fa58
Signed-off-by: Maria Yu <aiquny@codeaurora.org>
2017-07-13 10:09:41 +08:00
Philippe Gravel
0ad9633b9e ARM: dts: msm: Enable pmic gpio13 so neutrino driver can toggle it in probe
Enables pmic gpio13 on msm8996 so that the neutrino driver can toggle it
during probe to bring the hardware out of reset. This is required for
suspend/resume when neutrino resx is disconnected from pcie_reset.

Change-Id: I21a8e556903756ed39abdde5a17e8b6d353c0504
Signed-off-by: Philippe Gravel <pgravel@codeaurora.org>
2017-07-12 16:27:14 -07:00
Wei Wang
a0271af208 net: ipv6: reset daddr and dport in socket if connect() fails
In __ip6_datagram_connect(), reset socket->socket_v6_daddr and inet->dport if
error occurs.
In udp_v6_early_demux(), check for socket_state to make sure it is in
TCP_ESTABLISHED state.
Together, it makes sure unconnected UDP socket won't be considered as a
valid candidate for early demux.

v3: add TCP_ESTABLISHED state check in udp_v6_early_demux()
v2: fix compilation error

CRs-Fixed: 2057820
Change-Id: Ifa9c2ddfaa5b51d4082b7b1dd8a5d03b3c290705
Fixes: 5425077d73e0 ("net: ipv6: Add early demux handler for UDP unicast")
Signed-off-by: Wei Wang <weiwan@google.com>
Acked-by: Maciej Żenczykowski <maze@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Git-commit: 85cb73ff9b74785a7fc752875d7f0fe17ca3ea7c
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
[subashab@codeaurora.org: resolve trivial merge conflicts]
Signed-off-by: Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>
2017-07-12 15:09:29 -06:00
Subash Abhinov Kasiviswanathan
c4a6990537 net: ipv6: Fix UDP early demux lookup with udp_l3mdev_accept=0"
David Ahern reported that "net: ipv6: Add early demux
handler for UDP unicast" breaks udp_l3mdev_accept=0 since early
demux for IPv6 UDP was doing a generic socket lookup which does not
require an exact match. Fix this by making UDPv6 early demux match
connected sockets only.

v1->v2: Take reference to socket after match as suggested by Eric
v2->v3: Add comment before break

CRs-Fixed: 2057820
Change-Id: Ief9fd4a51561b7a49efa3780ebe8dc3632bdfa1c
Fixes: 5425077d73e0c ("net: ipv6: Add early demux handler for UDP unicast")
Reported-by: David Ahern <dsa@cumulusnetworks.com>
Signed-off-by: Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>
Cc: Eric Dumazet <edumazet@google.com>
Acked-by: David Ahern <dsa@cumulusnetworks.com>
Tested-by: David Ahern <dsa@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Git-commit: 0bd84065b19bca12f07f288c8ea470e2c1b2de7a
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
[subashab@codeaurora.org: resolve trivial merge conflicts]
2017-07-12 15:02:18 -06:00
Linux Build Service Account
d9fbe4b921 Merge "ARM: dts: msm: Remove WLED short circuit properties for PM660" 2017-07-12 12:47:39 -07:00
Linux Build Service Account
1e6e80aa0e Merge "ARM: dts: msm: Add phy related properties for ethernet on msm8996" 2017-07-12 12:47:38 -07:00
Linux Build Service Account
56c8e3ec0d Merge "defconfig: Disable CGROUP_DEBUG config for msm8998 in perf" 2017-07-12 12:47:37 -07:00
Linux Build Service Account
27ee915218 Merge "msm: kgsl: Use vma_area_struct with proper locks" 2017-07-12 12:47:36 -07:00
Benjamin Chan
d7ead4950a msm: sde: Set minimum traffic shaping in sde rotator
SDE rotator cannot accept 0 value for traffic shaping. This fix is to
limit the minimum traffic shaping value to be 1.

CRs-Fixed: 2074997
Change-Id: I5c96d600d77a5bfe09fe2667b914cb498371391e
Signed-off-by: Benjamin Chan <bkchan@codeaurora.org>
2017-07-12 10:24:22 -04:00
Hardik Kantilal Patel
d8e33bd351 ARM: dts: msm: Use wlan carveout region for sdm660/sdm630
Add DT entry to use wlan carveout region for WLAN MSA0.

CRs-Fixed: 2075205
Change-Id: I86d90247155884488e639bd8d487157524b977e9
Signed-off-by: Hardik Kantilal Patel <hkpatel@codeaurora.org>
2017-07-12 16:23:38 +05:30
Linux Build Service Account
92ccb29455 Merge "cnss2: Set PCIe to D3hot state before suspending PCIe link" 2017-07-12 03:29:34 -07:00
Linux Build Service Account
7438a89b3c Merge "Merge android-4.4@64a73ff (v4.4.76) into msm-4.4" 2017-07-12 03:29:33 -07:00
Linux Build Service Account
d03efe4d51 Merge "ASoC: wsa881x: Assign device number in reset" 2017-07-12 03:29:32 -07:00
Manoj Prabhu B
ecf448c50b diag: Update stream for active PD mdlog session
The patch sets the stream for user PD based on
its active mdlog session. The patch updates proper
peripheral information required for hdlc encoding.

CRs-Fixed: 2063972
Change-Id: Iedfad5161b1145245883282b29811a82343e79ba
Signed-off-by: Manoj Prabhu B <bmanoj@codeaurora.org>
2017-07-12 15:29:29 +05:30
Hamad Kadmany
306055a7a6 msm_11ad: Compile as module instead of built-in
Remove compilation of the module as built-in
by default.

Change-Id: Iadb70814c02df68b75ae4efae66637beaf520b9e
Signed-off-by: Hamad Kadmany <hkadmany@codeaurora.org>
2017-07-12 11:29:52 +03:00
Zou Shunxiang
40e39c6095 ARM: dts: msm: Add phy related properties for ethernet on msm8996
Add mdio_bus_id and phy_addr to access phy device
instead of scanning mdio bus. It will reduce time
cost during ethernet driver loading.

Change-Id: Ifb1574d4a68944a087dcafb12bc79098bc3156e4
Signed-off-by: Zou Shunxiang <shunxian@codeaurora.org>
2017-07-11 22:26:24 -07:00
Mohit Aggarwal
ccab495a2f diag: Protect mask updates for memory device session
Currently, there is a possibility of using already freed
memory device session members during mask updates. The
patch fixes the issue by adding proper protection.

CRs-Fixed: 2074264
Change-Id: Iff2009a498506ffe574655badfe0a0f9f0dece9a
Signed-off-by: Mohit Aggarwal <maggarwa@codeaurora.org>
2017-07-12 10:12:55 +05:30
Mohammed Khajapasha
b03fe4c43b defconfig: Disable CGROUP_DEBUG config for msm8998 in perf
Disable CGROUP_DEBUG config for msm8998 in perf defconfig.

Change-Id: Ib321201ea0761548fb26db42d59cad07a08eca85
Signed-off-by: Mohammed Khajapasha <mkhaja@codeaurora.org>
2017-07-12 10:06:15 +05:30
Kiran Gunda
0fd1ce1807 ARM: dts: msm: Remove WLED short circuit properties for PM660
WLED module does not have the SC protection feature on PM660l.
Hence remove the SC properties from the WLED device tree node.

CRs-Fixed: 2071302
Change-Id: I45ea0b7581780988b51ab3665c08d8a67a3ce4d3
Signed-off-by: Kiran Gunda <kgunda@codeaurora.org>
2017-07-12 10:05:23 +05:30
Linux Build Service Account
3629cb733f Merge "drm/msm/sde: Expose the HDR support capability of the chipset" 2017-07-11 17:57:53 -07:00
Linux Build Service Account
d68ac604a3 Merge "net: Kconfig: Add config entry for WLAN QCA6290 chipset" 2017-07-11 17:57:52 -07:00
Linux Build Service Account
69cc51bcab Merge "msm: isp: fix the issue during overflow recovery" 2017-07-11 17:57:51 -07:00
Linux Build Service Account
9a74724cda Merge "USB: phy-msm-qusb-v2: Enable autoresume only when device is connected" 2017-07-11 17:57:51 -07:00