Commit graph

594866 commits

Author SHA1 Message Date
Linux Build Service Account
f1091db4f4 Merge "wil6210: missing length check in wil_cfg80211_mgmt_tx" 2017-11-05 22:32:59 -08:00
Linux Build Service Account
3c8af478e3 Merge "ARM: dts: msm: Add GPU maximum frequency 430Mhz support for SDM636" 2017-11-05 22:32:59 -08:00
Linux Build Service Account
982c01bee6 Merge "defconfig: msmcortex: Enable sdcardfs" 2017-11-05 22:32:58 -08:00
Linux Build Service Account
0d6ccec7eb Merge "spi: core: Extract of_spi_parse_dt()" 2017-11-05 22:32:57 -08:00
Linux Build Service Account
da82750992 Merge "ARM: dts: msm: Add base register property for lpass and turing for sdm660" 2017-11-05 22:32:55 -08:00
Linux Build Service Account
e6754b0406 Merge "msm: kgsl: Print Vulkan memory types as well" 2017-11-05 22:32:54 -08:00
Linux Build Service Account
b147b4588b Merge "defconfig: msm: enable DRM driver for msm8996" 2017-11-05 22:32:53 -08:00
Linux Build Service Account
328319f28a Merge "icnss: Check for FW_READY state before sending uevent in PD notifier" 2017-11-05 22:32:52 -08:00
Linux Build Service Account
2dedf76547 Merge "ath: Disable non-20 mhz 2G world regulatory channels" 2017-11-05 22:32:51 -08:00
Linux Build Service Account
99b30615eb Merge "diag: Handle data ready notification properly" 2017-11-05 22:32:50 -08:00
Linux Build Service Account
b6f12218b5 Merge "power: qpnp-fg-gen3: Fine tune the monotonic SOC calculation" 2017-11-05 22:32:49 -08:00
Linux Build Service Account
697888e330 Merge "defconfig: Enable DFS support for ath10k" 2017-11-05 22:32:48 -08:00
Linux Build Service Account
aa00b1c16d Merge "clk: qcom: Add support for 430MHz for gpu clock on sdm660" 2017-11-05 22:32:47 -08:00
Linux Build Service Account
efa374d7b2 Merge "SoC: msm: Support SEC_MI2S_RX" 2017-11-05 22:32:45 -08:00
Linux Build Service Account
0a9e5f9137 Merge "leds: qpnp-wled: Fix configuration for AMOLED mode" 2017-11-05 22:32:43 -08:00
Linux Build Service Account
67dcc348d7 Merge "leds: qpnp-wled: Disable module permanently when OVP fault persists" 2017-11-05 22:32:43 -08:00
Linux Build Service Account
c6846de733 Merge "leds: qpnp-wled: Configure WLED1_CTRL_SWITCHING_FREQUENCY selectively" 2017-11-05 22:32:42 -08:00
Linux Build Service Account
7777cc93db Merge "power: qpnp-fg-gen3: Skip the status_change work if suspended" 2017-11-03 21:45:05 -07:00
Linux Build Service Account
96bbdb7e76 Merge "memblock: Fix memblock_overlaps_memory()" 2017-11-03 21:45:03 -07:00
Lior David
3d38ac71cc wil6210: missing length check in wil_cfg80211_mgmt_tx
Add a length check in wil_cfg80211_mgmt_tx to detect unsigned integer
overflow.

Change-Id: I37f988481433a2e1238831980715aef32aa89a85
Signed-off-by: Lior David <liord@codeaurora.org>
2017-11-03 09:08:23 -07:00
Lior David
6e5a9b3250 wil6210: missing length check in wmi_set_ie
Add a length check in wmi_set_ie to detect unsigned integer
overflow.

Change-Id: Id1ec6a6218f3fe6e00cc3f9a8e674f8f843273f2
Signed-off-by: Lior David <liord@codeaurora.org>
2017-11-03 09:06:54 -07:00
Lior David
5c9c0841e5 wil6210: add block size checks during FW load
When loading FW from file add block size checks to ensure a
corrupted FW file will not cause the driver to write outside
the device memory.

Change-Id: I6d7342cd33b2c47b701bcca4ee3cd84febbc56a2
Signed-off-by: Lior David <liord@codeaurora.org>
2017-11-03 09:05:20 -07:00
Lior David
59bd12d370 wil6210: fix length check in __wmi_send
The current length check:
sizeof(cmd) + len > r->entry_size
will allow very large values of len (> U16_MAX - sizeof(cmd))
and can cause a buffer overflow. Fix the check to cover this case.
In addition, ensure the mailbox entry_size is not too small,
since this can also bypass the above check.

Change-Id: Iecb4f53ef05da0e015bc954b57b0e40debb7c8b7
Signed-off-by: Lior David <liord@codeaurora.org>
2017-11-03 09:02:13 -07:00
Linux Build Service Account
fc86e52281 Merge "Merge android-4.4@89074de (v4.4.94) into msm-4.4" 2017-11-03 07:04:47 -07:00
Linux Build Service Account
3c586a777b Merge "serial: msm_serial_hs: Do not accept Rx Data till the Rx pipe connect" 2017-11-03 07:04:46 -07:00
Hareesh Gundu
ad76dbd362 ARM: dts: msm: Add GPU maximum frequency 430Mhz support for SDM636
SDM636 inherits all SDM660 GPU properties, but it will support
GPU max frequency 430Mhz and DDR max frequency 1353Mhz.

Change-Id: I7f88e5d187df2880757ceb6676e75f3cfe5d9218
Signed-off-by: Hareesh Gundu <hareeshg@codeaurora.org>
2017-11-03 06:36:14 -07:00
Ritesh Harjani
ea65e36e9d defconfig: msmcortex: Enable sdcardfs
This patch enables sdcardfs for msmcortex.

Change-Id: Icf3105c0080a35c2ead663decf4340647ac64b67
Signed-off-by: Ritesh Harjani <riteshh@codeaurora.org>
2017-11-03 04:11:26 -07:00
Anirudh Ghayal
fa88f5e4cb power: qpnp-fg-gen3: Skip the status_change work if suspended
There is a scenario where the status change work can hold
a mutex lock for ~1.5 seconds which can race with the FG resume
callback. Avoid this condition by adding a state variable
to track the suspend/resume state and skip executing the
status change work while suspended.

CRs-Fixed: 2101514
Change-Id: Ib5300a5dfce30c4c6bcc8d8428b664c184a83fb4
Signed-off-by: Anirudh Ghayal <aghayal@codeaurora.org>
2017-11-03 08:28:01 +05:30
Rahul Sharma
960078448f defconfig: msm: enable DRM driver for msm8996
This change disables FB driver and enable DRM display driver
on msm8996 auto defconfig.

Change-Id: Ic214b70dd47379464220e4f801c2ab38753c9a10
Signed-off-by: Rahul Sharma <sharah@codeaurora.org>
2017-11-02 14:11:13 +05:30
Anurag Chouhan
fd554860f0 icnss: Check for FW_READY state before sending uevent in PD notifier
The existing state check will create a corner case that when FW
crashed during driver probe, platform driver won't send early
uevent notification to host driver, which create a small window where
host can communicate with FW when FW is crashed. This case can be
covered by checking FW_READY state instead.

CRs-Fixed: 2122702
Change-Id: I0bde9cb5a526ccd9fe81cd38bd4c27cf2e95042b
Signed-off-by: Yuanyuan Liu <yuanliu@codeaurora.org>
Signed-off-by: Anurag Chouhan <achouhan@codeaurora.org>
2017-11-01 23:50:26 -07:00
Avaneesh Kumar Dwivedi
48d5f82d0e ARM: dts: msm: Add base register property for lpass and turing for sdm660
Add base register property in respective pil nodes to iomap them
during probe of the subsystem pil driver.

Change-Id: I961ab80f1caf84ab63d649c3a1545b89fed56c0b
Signed-off-by: Avaneesh Kumar Dwivedi <akdwived@codeaurora.org>
2017-11-02 11:40:33 +05:30
Avaneesh Kumar Dwivedi
d438970a05 soc: qcom: pil: Log the TZ NMI caused subsystem crash on err fatal
Check NMI STATUS register and dump the log if the err fatal caused
on subsystem is due to TZ NMI.

Change-Id: I8ac4190aca60aeedcd41fd06e2f7dd053edd0f30
Signed-off-by: Avaneesh Kumar Dwivedi <akdwived@codeaurora.org>
2017-11-02 11:39:55 +05:30
Linux Build Service Account
11734d0451 Merge "drm/msm/sde: add mutex to the sde resource manager" 2017-11-01 20:34:04 -07:00
Linux Build Service Account
e8c140a99b Merge "ARM: dts: msm: enable one adv7533 instance on apq8096 lite board" 2017-11-01 20:34:03 -07:00
Young Hwan Kwak
70e0fba783 msm: kgsl: Print Vulkan memory types as well
Vulkan memory types are added into UMD.
Print Vulkan memory type as an int value.

CRs-Fixed: 2119633
Change-Id: Idf5d58a6a02dbef6ef8cf6663e7819d221bf3e11
Signed-off-by: Young Hwan Kwak <ykwak@codeaurora.org>
2017-11-02 09:44:10 +08:00
Rajeev Kumar Sirasanagandla
b85f32555a ath: Disable non-20 mhz 2G world regulatory channels
The minimum bandwidth supported is 5 MHZ. Kernel API
wiphy_apply_custom_regulatory can enable channels 12/13
with BW 5/10 even for reg rule 2402-2472. Circumvent the issue
by doing a check in the driver.

CRs-Fixed: 2136273
Change-Id: I296e45d142c38a83c90deb743e992eb1a7743feb
Signed-off-by: Rajeev Kumar Sirasanagandla <rsirasan@codeaurora.org>
2017-11-01 16:24:42 +05:30
Linux Build Service Account
aedf62a2ba Merge "block: Fix oops in locked_inode_to_wb_and_lock_list()" 2017-10-31 16:54:18 -07:00
Linux Build Service Account
5954c32915 Merge "block: Fix bdi assignment to bdev inode when racing with disk delete" 2017-10-31 16:54:18 -07:00
Linux Build Service Account
d4cc718065 Merge "diag: Remove AXI prefetch related padding" 2017-10-31 16:54:17 -07:00
Linux Build Service Account
df3eaf90e3 Merge "ARM: 8701/1: fix sparse flags for build on 64bit machines" 2017-10-31 16:54:16 -07:00
Linux Build Service Account
5327b0ab71 Merge "msm: mdss: add support for dma scheduling for dsi v2.1" 2017-10-31 16:54:14 -07:00
Ashish Garg
0d030ecce2 msm: mdss: add support for dma scheduling for dsi v2.1
Dsi controller v2.1 and above supports scheduling of dma
commands. Schedule dsi cmds at the starting of blanking
region to avoid sending of commands in active region
resulting in dsi overflow errors.

Change-Id: I658b7d7008eb9071148820c0ea949ae9ba593ed9
Signed-off-by: Ashish Garg <ashigarg@codeaurora.org>
2017-10-31 10:32:59 -07:00
Sameer Thalappil
9fccd743a2 icnss: Do not assert if reboot requested during PDR
When icnss driver sees a PD down, and if the recovery is already in
progress, it forces an assert in debug builds. That is to detect any
Modem failures during PDR or to catch any instance of recursive PDRs.
When system goes thru a reboot or shutdown, and if the recovery is in
progress then avoid calling this assert.

CRs-Fixed: 2135071
Change-Id: I28f5c79a4cd8b83f60a62111535b11c2fba6000b
Signed-off-by: Sameer Thalappil <sameert@codeaurora.org>
2017-10-31 10:19:55 -07:00
Luc Van Oostenryck II
38aaac21e6 ARM: 8701/1: fix sparse flags for build on 64bit machines
By default sparse uses the characteristics of the build
machine to infer things like the wordsize.
This is fine when doing native builds but for ARM it's,
I suspect, very rarely the case and if the build are done
on a 64bit machine we get a bunch of warnings like:
  'cast truncates bits from constant value (... becomes ...)'

Fix this by adding the -m32 flags for sparse.

Change-Id: I9045e5b77578d03e328a4a6af297e84356c02cf8
Reported-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Luc Van Oostenryck <luc.vanoostenryck@gmail.com>
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
Git-commit: 6042b8c7c08cad7a8bdc0456c619ae941962b40a
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
2017-10-30 16:11:46 -07:00
Linux Build Service Account
9c23726ad4 Merge "leds: qpnp-flash: Fix Use-after-free(UAF) for debugfs" 2017-10-30 15:13:50 -07:00
Linux Build Service Account
bb3bb010ec Merge "ASoC: wcd9xxx: restrict debugfs permission" 2017-10-30 05:26:21 -07:00
Linux Build Service Account
4dd3043f35 Merge "ASoC: sdm660_cdc: Fix pop noise issue at DMIC" 2017-10-30 05:26:20 -07:00
Lloyd Atkinson
0852d989e4 drm/msm/sde: add mutex to the sde resource manager
Fix serialization of access to the SDE resource manager by
adding mutex protection to its external APIs.

Change-Id: I469a1c7b37d4a2f115443bdc308d0236d786fc68
Signed-off-by: Lloyd Atkinson <latkinso@codeaurora.org>
Signed-off-by: Lihui Wen <lwen@codeaurora.org>
2017-10-30 05:23:16 -07:00
Surabhi Vishnoi
f465647dfb defconfig: Enable DFS support for ath10k
DFS support is disabled for ath10k driver.

Enable the DFS support for ath10k in the defconfig and perf defconfig.

CRs-Fixed: 2124757
Change-Id: Iccecd2226fd13034b12a8978b68f9535178ed430
Signed-off-by: Surabhi Vishnoi <svishnoi@codeaurora.org>
2017-10-30 13:46:10 +05:30
Odelu Kukatla
08d84b18b1 clk: qcom: Add support for 430MHz for gpu clock on sdm660
GPU clock requires to support 430MHz, so add the support
for the same on sdm660.

Change-Id: Ief238fbe521a10f8096ac44844f5abe013649f81
Signed-off-by: Odelu Kukatla <okukatla@codeaurora.org>
2017-10-30 11:06:37 +05:30