Commit graph

81382 commits

Author SHA1 Message Date
Linux Build Service Account
0d3136dec2 Merge "clk: Add vdd_class support for handoff and use_max_uV" 2016-12-06 21:03:08 -08:00
Linux Build Service Account
528cc477ec Merge "msm: camera: sensor: Validate eeprom_name string length" 2016-12-06 14:33:40 -08:00
Linux Build Service Account
f5ab89af4e Merge "soc: qcom: Add support to restart user PD" 2016-12-06 14:33:29 -08:00
Linux Build Service Account
dfa7baf83a Merge "msm: camera: isp: Dual camera sync feature" 2016-12-06 14:33:03 -08:00
Taniya Das
8c348bebe1 clk: Add vdd_class support for handoff and use_max_uV
Some dedicated power rails do not require a max voltage vote during bootup.
Allow clock drivers to skip handoff for the corresponding VDD classes.

Multiple vdd_class structures might share same set of regulators. If the
FMAXes for these different vdd_class structures do not have the same level
vote, there could be a conflict when setting voltage on the regulator.
Add a flag use_max_uV to vote for INT_MAX as max_uV when calling
regulator_set_voltage(). Constraints in the regulator driver make sure that
the final voltage meets the requirement of that regulator's operational
range.

Change-Id: I15c9dc3ecf907723a136cbe90597ccafeba91af0
Signed-off-by: Taniya Das <tdas@codeaurora.org>
2016-12-06 10:32:05 +05:30
Linux Build Service Account
25f0ed75e0 Merge "icnss: Add support of setting MAC address from platform driver" 2016-12-03 02:17:52 -08:00
Linux Build Service Account
4595a01ac7 Merge "misc: qcom: qdsp6v2: register ioctl calls for g711mlaw driver" 2016-12-02 09:02:16 -08:00
Linux Build Service Account
1042c91dfb Merge "ASoC: audio-ext-clk: add new audio ext clock" 2016-12-02 09:02:15 -08:00
Linux Build Service Account
b08731c07c Merge "ARM: dts: msm: Remove clocks associated with GDSC for MSMfalcon/Trition" 2016-12-02 09:02:10 -08:00
Shubhraprakash Das
2527a06cae msm: camera: isp: Dual camera sync feature
Add ioctl to swicth dual camera mode from sync to
unsync mode and vise versa. Also, change the logic
of frame id sync to support unsync mode.

CRs-Fixed: 1070296
Change-Id: I58e27c9ea66f1788d640bf523e7c6569cde162f7
Signed-off-by: Shubhraprakash Das <sadas@codeaurora.org>
Signed-off-by: Junzhe Zou <jnzhezou@codeaurora.org>
2016-12-01 23:52:31 -08:00
Linux Build Service Account
866aa12eb4 Merge "uapi/media: add additional ubwc compressed formats" 2016-12-01 23:47:39 -08:00
Taniya Das
355e6dba7d clk: msm: Remove overrides from clock header files for common clock
For clients using msm-clk-provider.h and msm-clk.h
header files, no override is expected for COMMON_CLK
framework so fixing the same by conditionally compiling
the clock header files.

Change-Id: I5f7393f3f486a884bfa881a93c01623c3cd2664d
Signed-off-by: Taniya Das <tdas@codeaurora.org>
2016-12-02 09:24:34 +05:30
Linux Build Service Account
b832093be4 Merge "sched: pre-allocate colocation groups" 2016-12-01 16:39:40 -08:00
Linux Build Service Account
74e95335c0 Merge "ASoc: msm: qdsp6v2: Add TX app type support in compress driver" 2016-12-01 16:39:37 -08:00
abeykun
d8595e1f56 uapi/media: add additional ubwc compressed formats
Patch adds RGB565, RGBA 10-bit and P010 10-bit ubwc
compressed formats support to media API planes calculation.
Also fix in align macro when alignment is not a power of 2.

CRs-Fixed: 1096408
Change-Id: I4afcf7d5b22395eeda2e77131bd45592abaeb561
Signed-off-by: abeykun <abeykun@codeaurora.org>
Signed-off-by: Umesh Pandey <umeshp@codeaurora.org>
2016-12-01 16:25:17 -08:00
Joonwoo Park
7437cd7c4b sched: pre-allocate colocation groups
At present, sched_set_group_id() dynamically allocates structure for
colocation group to assign the given task to the group.  However
this can cause deadlock as memory allocator can wakeup a task which
also tries to acquire related_thread_group_lock.

Avoid such deadlock by pre-allocating colocation structures.  This
limits maximum colocation groups to static number but it's fine as it's
never expected to be a lot.

Change-Id: Ifc32ab4ead63c382ae390358ed86f7cc5b6eb2dc
Signed-off-by: Joonwoo Park <joonwoop@codeaurora.org>
2016-12-01 11:28:01 -08:00
Yuanyuan Liu
d9a8fa86c0 icnss: Add support of setting MAC address from platform driver
Add support of setting WLAN MAC address from platform driver.
The MAC address will be passed to WLAN driver when WLAN is
turned on.

CRs-Fixed: 1096286
Change-Id: I249222b419dd130241cbc84f4d41709b408941e0
Signed-off-by: Yuanyuan Liu <yuanliu@codeaurora.org>
2016-12-01 10:56:24 -08:00
Satish Babu Patakokila
160813b82f ASoc: msm: qdsp6v2: Add timestamp support for compress capture
Add timestamp support for compress driver.
Modify ASM driver to read the buffer from predefined offset.

CRs-fixed: 1072067
Change-Id: I1c46befc223285495b3c0650e6c3eaae81f58771
Signed-off-by: Satish Babu Patakokila <sbpata@codeaurora.org>
2016-12-01 22:58:18 +05:30
Puja Gupta
ffa980caab soc: qcom: Add support to restart user PD
Introduce api service_notif_pd_restart() using which clients can request
to restart user PD.

CRs-Fixed: 1092791
Change-Id: Ic21de510cde4bfa9f2e4f7f3d4518b464be88db2
Signed-off-by: Puja Gupta <pujag@codeaurora.org>
2016-11-30 14:46:59 -08:00
Linux Build Service Account
d43553d47d Merge "msm: isp: Add support to multipass offline ISP" 2016-11-29 16:18:49 -08:00
Linux Build Service Account
925ce43342 Merge "clk: Provide OF helper to mark clocks as CRITICAL" 2016-11-29 07:44:04 -08:00
Linux Build Service Account
2be8fc81c3 Merge "net: add SOCK_RCU_FREE socket flag" 2016-11-28 23:58:04 -08:00
Linux Build Service Account
52ce5dee28 Merge "clk: WARN_ON about to disable a critical clock" 2016-11-28 23:57:53 -08:00
Linux Build Service Account
a471456332 Merge "msm: mdss: hdmi: fix potential null deference errors" 2016-11-28 23:56:42 -08:00
Eric Dumazet
68610ce9d9 net: add SOCK_RCU_FREE socket flag
We want a generic way to insert an RCU grace period before socket
freeing for cases where RCU_SLAB_DESTROY_BY_RCU is adding too
much overhead.

SLAB_DESTROY_BY_RCU strict rules force us to take a reference
on the socket sk_refcnt, and it is a performance problem for UDP
encapsulation, or TCP synflood behavior, as many CPUs might
attempt the atomic operations on a shared sk_refcnt

UDP sockets and TCP listeners can set SOCK_RCU_FREE so that their
lookup can use traditional RCU rules, without refcount changes.
They can set the flag only once hashed and visible by other cpus.

CRs-Fixed: 1094434
Change-Id: Ib4967b801cc5b48c8ac4793b7a03fbfafba2234a
Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Tom Herbert <tom@herbertland.com>
Tested-by: Tom Herbert <tom@herbertland.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Git-commit: a4298e4522d687a79af8f8fbb7eca68399ab2d81
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>
2016-11-28 14:42:09 -07:00
Lee Jones
077d50e6f6 clk: Provide OF helper to mark clocks as CRITICAL
This call matches clocks which have been marked as critical in DT
and sets the appropriate flag.  These flags can then be used to
mark the clock core flags appropriately prior to registration.

Legacy bindings requiring this feature must add the clock-critical
property to their binding descriptions, as it is not a part of
common-clock binding.

Cc: devicetree@vger.kernel.org
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Reviewed-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Michael Turquette <mturquette@baylibre.com>
Link: lkml.kernel.org/r/1455225554-13267-4-git-send-email-mturquette@baylibre.com
(cherry picked from commit d56f8994b6fb928f59481fabc25bcd1c2f9bd06d)
[tdas@codeaurora.org: resolve trivial conflict]
Git-commit: d56f8994b6fb928f59481fabc25bcd1c2f9bd06d
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

Change-Id: I2bf824bd2446ca87baabd31c166119d6c5c90643
Signed-off-by: Taniya Das <tdas@codeaurora.org>
2016-11-28 10:17:41 +05:30
Lee Jones
2cb4fc7a17 clk: Allow clocks to be marked as CRITICAL
Critical clocks are those which must not be gated, else undefined
or catastrophic failure would occur.  Here we have chosen to
ensure the prepare/enable counts are correctly incremented, so as
not to confuse users with enabled clocks with no visible users.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Michael Turquette <mturquette@baylibre.com>
Link: lkml.kernel.org/r/1455225554-13267-2-git-send-email-mturquette@baylibre.com
(cherry picked from commit 32b9b10961860860268961d9aad0c56a73018c37)
[tdas@codeaurora.org: resolve trivial merge conflict]
Git-commit: 32b9b10961860860268961d9aad0c56a73018c37
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

Change-Id: I003abf22da8600dd90ef397d293544b4bc9e0160
Signed-off-by: Taniya Das <tdas@codeaurora.org>
2016-11-28 10:17:40 +05:30
Ray Zhang
a400e381d0 msm: mdss: add support to change HDMI PLL PPM
Add sysfs and ioctl to adjust HDMI clock rate by certain PPM.
This function is required by clock recovery in broadcast in
which HDMI PLL should be adjusted in order to reduce the clock
drift in broadcast.

CRs-Fixed: 1086894
Change-Id: I1df15dd6aec44ae3e78bd4f80dc70d0d04760687
Signed-off-by: Ray Zhang <rayz@codeaurora.org>
2016-11-27 19:16:13 -08:00
Linux Build Service Account
308d5348fe Merge "include: clock: Add audio external clock of_index extries" 2016-11-25 17:47:01 -08:00
Meng Wang
cd2519b7dc ASoC: audio-ext-clk: add new audio ext clock
In common clock framework, API for registering clk
provider for a node is changed to of_clk_add_provider.
Add new audio ext clock file to use new API to register
audio clk provider.

Crs-Fixed: 1090500
Change-Id: I1d7ecc6a3d4c48d0de9645043d5e5bfdfa1d1f5f
Signed-off-by: Meng Wang <mwang@codeaurora.org>
2016-11-25 09:20:12 +08:00
Arun Kumar Dasari
a4e64cc296 msm: Add msm_audio_g711_dec header file to Kbuild
This change adds the msm_audio_g711_dec.h file to the Kbuild.
With this change header appear properly in userspace builds.

CRs-Fixed: 1094107
Change-Id: Iab3a45c43b38b4e004c9c297fb84dfe9e6f3e2be
Signed-off-by: Yamit Mehta <ymehta@codeaurora.org>
Signed-off-by: Surendar karka <sukark@codeaurora.org>
2016-11-24 21:07:50 +05:30
Arun Kumar Dasari
b23b342e6c ASoC: msm: qdsp6v2: support decode of g711 clips
Add support in audio stream manager to configure decode
of g711 related clips.

CRs-Fixed: 1094107
Change-Id: Ie90fd68e24e7e793aaac64290e3c1e41682d6d5a
Signed-off-by: Yamit Mehta <ymehta@codeaurora.org>
Signed-off-by: Surendar karka <sukark@codeaurora.org>
2016-11-24 21:07:42 +05:30
Surendar karka
c42df21480 msm: Add msm_audio_g711 header file to Kbuild
This change adds the msm_audio_g711.h file to the Kbuild.
With this change header appear properly in userspace builds.

CRs-Fixed: 1094107
Change-Id: I40a0e5b7635e8585b9fc4cb01cfdb213418619c5
Signed-off-by: Surendar karka <sukark@codeaurora.org>
2016-11-24 21:07:23 +05:30
Surendar karka
49af56584b ASoC: msm: qdsp6v2: support encode of g711 format
Add support in audio stream manager to configure encode
of g711 format

CRs-Fixed: 1094107
Change-Id: I496a975e427f68d7bb5cc2789bfc9bb949658233
Signed-off-by: Surendar karka <sukark@codeaurora.org>
2016-11-24 21:05:34 +05:30
Linux Build Service Account
57f5019a62 Merge "clk: qcom: Add support for MMCC clock for MSMFalcon" 2016-11-24 06:13:26 -08:00
Linux Build Service Account
065421c6fa Merge "tcp: fix use after free in tcp_xmit_retransmit_queue()" 2016-11-24 06:13:22 -08:00
Linux Build Service Account
aff86d3b4f Merge "cfg80211: validate beacon int as part of iface combinations" 2016-11-24 06:13:18 -08:00
Linux Build Service Account
7193fef2dc Merge "cfg80211: identically validate beacon interval for AP/MESH/IBSS" 2016-11-24 06:13:17 -08:00
Runmin Wang
1289f98375 msm: 8998: Replace cobalt with 8998
Update the code name from msmcobalt to msm8998. As a result, update
the filename containing "cobalt" and files content containing "cobalt".

CRs-Fixed: 1070840
Change-Id: I2c7b95e3e2a2fec7730724da9eeb86a39a77faf1
Signed-off-by: Runmin Wang <runminw@codeaurora.org>
Signed-off-by: Kyle Yan <kyan@codeaurora.org>
Signed-off-by: Jeevan Shriram <jshriram@codeaurora.org>
2016-11-22 13:07:05 -08:00
Rajesh Bondugula
42e0f618e9 msm: camera: sensor: Validate eeprom_name string length
Validate eeprom_name string length before copying into
the userspace buffer.
If more data than required is copied, userspace has the access to
some of kernel data which is not intended.

This change will fix the issue.

CRs-Fixed: 1090007
Signed-off-by: Rajesh Bondugula <rajeshb@codeaurora.org>
Change-Id: Id40a287e0b1a93cc15d9b02c757fe9f347e285f2
2016-11-22 08:52:48 -08:00
Taniya Das
48638ac98d clk: qcom: Add support for MMCC clock for MSMFalcon
Add support for the multimedia clock controller found on MSMFalcon
based devices. This should allow most clocks for multimedia peripherals
which includes display, video, camera etc.

Change-Id: If8aa0b094af5ff82fe66c95e3ef2f13632950d2e
Signed-off-by: Taniya Das <tdas@codeaurora.org>
2016-11-21 12:42:02 +05:30
Linux Build Service Account
f6087edb1c Merge "msm: ipa3: header file change for wdi-stats" 2016-11-18 20:31:57 -08:00
Eric Dumazet
29c1418082 tcp: fix use after free in tcp_xmit_retransmit_queue()
When tcp_sendmsg() allocates a fresh and empty skb, it puts it at the
tail of the write queue using tcp_add_write_queue_tail()

Then it attempts to copy user data into this fresh skb.

If the copy fails, we undo the work and remove the fresh skb.

Unfortunately, this undo lacks the change done to tp->highest_sack and
we can leave a dangling pointer (to a freed skb)

Later, tcp_xmit_retransmit_queue() can dereference this pointer and
access freed memory. For regular kernels where memory is not unmapped,
this might cause SACK bugs because tcp_highest_sack_seq() is buggy,
returning garbage instead of tp->snd_nxt, but with various debug
features like CONFIG_DEBUG_PAGEALLOC, this can crash the kernel.

This bug was found by Marco Grassi thanks to syzkaller.

Change-Id: Iba5975e360eb2b2729b6f958b7cb00bfc469e51b
Fixes: 6859d49475 ("[TCP]: Abstract tp->highest_sack accessing & point to next skb")
Reported-by: Marco Grassi <marco.gra@gmail.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Cc: Yuchung Cheng <ycheng@google.com>
Cc: Neal Cardwell <ncardwell@google.com>
Acked-by: Neal Cardwell <ncardwell@google.com>
Reviewed-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Git-repo: https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git
Git-commit: bb1fceca22492109be12640d49f5ea5a544c6bb4
Signed-off-by: Dennis Cagle <d-cagle@codeaurora.org>
2016-11-18 16:41:19 -08:00
Johannes Berg
3b64a0127c cfg80211: validate beacon int as part of iface combinations
Remove the pointless checking against interface combinations in
the initial basic beacon interval validation, that currently isn't
taking into account radar detection or channels properly. Instead,
just validate the basic range there, and then delay real checking
to the interface combination validation that drivers must do.

This means that drivers wanting to use the beacon_int_min_gcd will
now have to pass the new_beacon_int when validating the AP/mesh
start.

CRs-Fixed: 1087922
Change-Id: Iec536bcdf4ed95e3d796324fd8bf5df259b340b0
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
Git-commit: 4c8dea638c16141adb046fd2e0cab51dfe43650c
[liord@codeaurora.org: Fix conflicts]
Signed-off-by: Lior David <liord@codeaurora.org>
2016-11-18 14:16:44 +02:00
Linux Build Service Account
b140cb0936 Merge "msm: sde: remove secure camera ctrl_id definition" 2016-11-18 01:54:57 -08:00
Linux Build Service Account
54e5bae2ed Merge "sched/hmp: Enhance co-location and scheduler boost features" 2016-11-18 01:54:54 -08:00
Linux Build Service Account
d1a64e4014 Merge "USB: Allow skipping device resume during system resume" 2016-11-18 01:54:53 -08:00
Linux Build Service Account
5d4d0ab7a7 Merge "clk: Add support to allow client to print all enabled clocks" 2016-11-18 01:54:42 -08:00
Johannes Berg
ed8559eaeb cfg80211: make wdev_list accessible to drivers
There's no harm in having drivers read the list, since they can
use RCU protection or RTNL locking; allow this to not require
each and every driver to also implement its own bookkeeping.

CRs-Fixed: 1087922
Change-Id: I2f38b8ba1ddbe6041a4189f5d9b72c982f0fb367
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
Git-commit: 53873f134d285191ef6435882d55837093a36c53
[liord@codeaurora.org: fix conflicts]
Signed-off-by: Lior David <liord@codeaurora.org>
2016-11-18 01:20:15 +02:00
Abhishek Kondaveeti
90c3f2dedc msm: isp: Add support to multipass offline ISP
Process the input image in multiple passes using
single ISP.

Change-Id: I2b004c149b90ad03acf41d73e825976507a9a274
Signed-off-by: Abhishek Kondaveeti <akondave@codeaurora.org>
2016-11-17 03:09:12 -08:00