OSDN Git Service
Linux Build Service Account [Thu, 9 Nov 2017 09:36:49 +0000 (01:36 -0800)]
Merge "Merge android-4.4@
ceee5bd (v4.4.95) into msm-4.4"
Linux Build Service Account [Thu, 9 Nov 2017 09:36:48 +0000 (01:36 -0800)]
Merge "sched: restore discarded ifdef CONFIG_SCHED_WALT code"
Linux Build Service Account [Thu, 9 Nov 2017 09:36:46 +0000 (01:36 -0800)]
Merge "wil6210: drop RX probe reponses with low SNR"
Linux Build Service Account [Thu, 9 Nov 2017 09:36:45 +0000 (01:36 -0800)]
Merge "msm: cec: simplify TX message processing"
Linux Build Service Account [Thu, 9 Nov 2017 09:36:44 +0000 (01:36 -0800)]
Merge "cec: Fix runtime BUG when (CONFIG_RC_CORE && !CEC_CAP_RC)"
Linux Build Service Account [Thu, 9 Nov 2017 09:36:43 +0000 (01:36 -0800)]
Merge "msm: ipa: Fix to use GFP_DMA flag"
Linux Build Service Account [Wed, 8 Nov 2017 20:55:16 +0000 (12:55 -0800)]
Merge "NFC: Fix for core init cmd send failure"
Linux Build Service Account [Wed, 8 Nov 2017 20:55:15 +0000 (12:55 -0800)]
Merge "spi: core: Add support for registering SPI slave controllers"
Linux Build Service Account [Wed, 8 Nov 2017 20:55:14 +0000 (12:55 -0800)]
Merge "regulator: qpnp: fix voltage min/max constraints check"
Linux Build Service Account [Wed, 8 Nov 2017 20:55:13 +0000 (12:55 -0800)]
Merge "dwc3: Do not perform core reinitialisation for host only mode"
Dedy Lansky [Wed, 8 Nov 2017 10:43:53 +0000 (12:43 +0200)]
wil6210: drop RX probe reponses with low SNR
FW now reports SNR for RX management frames.
Drop probe responses with SNR lower than the configured threshold.
Change-Id: Ife1863b07aebe5cb6097420290c0c10b590c2da1
Signed-off-by: Dedy Lansky <dlansky@codeaurora.org>
Dedy Lansky [Wed, 8 Nov 2017 12:57:30 +0000 (14:57 +0200)]
wil6210: add sysfs for setting connect SNR threshold
snr_thresh sysfs can be used to set omni and direct SNR threshold for
connection.
Change-Id: I091a6b61a1a4cb98e0e8c0f70b2fff4d22486e61
Signed-off-by: Dedy Lansky <dlansky@codeaurora.org>
Linux Build Service Account [Wed, 8 Nov 2017 10:31:29 +0000 (02:31 -0800)]
Merge "ARM: dts: msm: enable adv7533 bridge chip power rails on msm8996"
Linux Build Service Account [Wed, 8 Nov 2017 10:31:28 +0000 (02:31 -0800)]
Merge "msm: camera: Check step position table for NULL pointer"
Linux Build Service Account [Wed, 8 Nov 2017 10:31:27 +0000 (02:31 -0800)]
Merge "ARM: dts: msm: Add sdhc_2 on msm8996 virtual platform"
Linux Build Service Account [Wed, 8 Nov 2017 10:31:25 +0000 (02:31 -0800)]
Merge "USB: configfs: Don't send DISCONNECT uevent during unbind"
Linux Build Service Account [Wed, 8 Nov 2017 10:31:24 +0000 (02:31 -0800)]
Merge "defconfig: arm64: msm: Enable MMC on msm8996 virtual plaform"
Linux Build Service Account [Wed, 8 Nov 2017 10:31:23 +0000 (02:31 -0800)]
Merge "soc: qcom: scm: Remap scm busy error codes to -EBUSY"
Gaurav Singhal [Fri, 13 Oct 2017 11:47:58 +0000 (17:17 +0530)]
NFC: Fix for core init cmd send failure
Due to delay of ~3 sec between core reset response
and core init cmd, i2c send fails as NFC controller
goes to deep sleep state if its idle for ~1sec.
Delay caused due to logs in driver probe sequence.
Delay is added after every gpio state change to
ensure, modified value is taken into consideration
and unnecessary delays are removed.
Change-Id: I4c6e8f867f641d6648139206244d67bb556e0099
Signed-off-by: Gaurav Singhal <gsinghal@codeaurora.org>
Ajay Agarwal [Fri, 28 Jul 2017 05:26:24 +0000 (10:56 +0530)]
dwc3: Do not perform core reinitialisation for host only mode
Cuurently as a part of start host, after the block reset we
are performing core init and gadget restart of the dwc3
controller. This causes crash for host only controller where
ep0 and ep1 have not been initialised but are being
dereferenced. Also, HW reinitialisation is not required for
start or restart host routine.
Change-Id: Ie2b781ecb03a1d0a02c5f4305d518adc18dc6ade
Signed-off-by: Ajay Agarwal <ajaya@codeaurora.org>
Geert Uytterhoeven [Mon, 22 May 2017 13:11:41 +0000 (15:11 +0200)]
spi: core: Add support for registering SPI slave controllers
Add support for registering SPI slave controllers using the existing SPI
master framework:
- SPI slave controllers must use spi_alloc_slave() instead of
spi_alloc_master(), and should provide an additional callback
"slave_abort" to abort an ongoing SPI transfer request,
- SPI slave controllers are added to a new "spi_slave" device class,
- SPI slave handlers can be bound to the SPI slave device represented
by an SPI slave controller using a DT child node named "slave",
- Alternatively, (un)binding an SPI slave handler to the SPI slave
device represented by an SPI slave controller can be done by
(un)registering the slave device through a sysfs virtual file named
"slave".
From the point of view of an SPI slave protocol handler, an SPI slave
controller looks almost like an ordinary SPI master controller. The only
exception is that a transfer request will block on the remote SPI
master, and may be cancelled using spi_slave_abort().
Change-Id: I251c5b7247ee7088285e42dd3b3cdce9c56cb9f7
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Mark Brown <broonie@kernel.org>
Git-commit:
6c364062bfed3c34490e85bea52ff6e2d4f0f281
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
Signed-off-by: Alok Chauhan <alokc@codeaurora.org>
Rahul Sharma [Tue, 7 Nov 2017 09:53:07 +0000 (15:23 +0530)]
ARM: dts: msm: enable adv7533 bridge chip power rails on msm8996
msm8996 auto CDP platform missing vddio power supply to power up
adv7533 bridge chip for DSI interfaces, which converts DSI to HDMI
signal. This change adds power rails to adv7533.
Change-Id: Ieaea589803bbac1d42478fff16e8a4a833cf7426
Signed-off-by: Rahul Sharma <sharah@codeaurora.org>
Linux Build Service Account [Tue, 7 Nov 2017 23:40:02 +0000 (15:40 -0800)]
Merge "mmc: core: Return error if fallback to lower speed mode fails"
Linux Build Service Account [Tue, 7 Nov 2017 23:40:01 +0000 (15:40 -0800)]
Merge "ARM: dts: msm: Change QDSS pipe index to 3 for SDM660"
Wanhyeong Ryu [Wed, 1 Nov 2017 07:51:40 +0000 (15:51 +0800)]
mmc: core: Return error if fallback to lower speed mode fails
If there are continuous data-CRC errors in higher speed modes (SDR104
mode), then driver fallbacks to lower speed mode. But if at all it
fails to fallback to lower speed mode, then that error should be
propagated to the caller so that caller will handle it appropriately.
Without this change, sometime while processing card removal event,
driver fails to detect card removal and treats card as present
eventhough its removed.
Change-Id: I89544d41c5b014eb9227ba33ef9ec1917b6793dc
Signed-off-by: Veerabhadrarao Badiganti <vbadigan@codeaurora.org>
Linux Build Service Account [Tue, 7 Nov 2017 09:41:18 +0000 (01:41 -0800)]
Merge "msm: isp: Soft reset ISP before second pass"
Linux Build Service Account [Tue, 7 Nov 2017 09:41:17 +0000 (01:41 -0800)]
Merge "ARM: dts: msm: Remove the virtual plane implementation on msm8996"
Zhiming Weng [Fri, 20 Oct 2017 07:58:25 +0000 (15:58 +0800)]
msm: cec: simplify TX message processing
Simplify the message processing of CEC adapter driver's transmit
function. Don't need to decompose CEC message's header block and
data block 0 before programming to the registers.
Change-Id: Icf2b2f123bda560ef4e3c8c4c6a2eaf828b7ce9a
CRs-Fixed:
2117559
Signed-off-by: Zhiming Weng <czweng@codeaurora.org>
Vijayavardhan Vennapusa [Tue, 7 Nov 2017 05:40:13 +0000 (11:10 +0530)]
ARM: dts: msm: Change QDSS pipe index to 3 for SDM660
Currently same pipe index is used for both QDSS and DPL pipes for SDM660.
This causes QDSS not working in composition 90DB having both QDSS and DPL
interfaces. Hence fix it by changing QDSS pipe index to 3 so that both
QDSS and DPL works fine with 90DB composition on SDM660.
Change-Id: I7c799716cff7321985fcb88a8073737343a932f5
Signed-off-by: Vijayavardhan Vennapusa <vvreddy@codeaurora.org>
Zhiqiang Tu [Fri, 20 Oct 2017 07:44:17 +0000 (15:44 +0800)]
ARM: dts: msm: Add sdhc_2 on msm8996 virtual platform
Add sdhc_2 on msm8996 virtual platform for SDIO WLAN.
Change-Id: Ic021ca67507af88a2c98eac4d5b4c10c3300f1a9
Signed-off-by: Zhiqiang Tu <ztu@codeaurora.org>
Vijay kumar Tumati [Tue, 31 Oct 2017 09:44:59 +0000 (15:14 +0530)]
msm: camera: Check step position table for NULL pointer
Before accessing step position table we need to make sure
its valid.
Change-Id: I914a51861e982d556039e5ba8510a67cab69fb82
Signed-off-by: Vijay kumar Tumati <vtumati@codeaurora.org>
Zhiqiang Tu [Fri, 3 Nov 2017 08:57:13 +0000 (16:57 +0800)]
defconfig: arm64: msm: Enable MMC on msm8996 virtual plaform
Enable MMC to support SDIO pass-through on virtual platform.
Change-Id: I808510d6d30ea780f3936c4eba98bb6e3e637050
Signed-off-by: Zhiqiang Tu <ztu@codeaurora.org>
Blagovest Kolenichev [Mon, 6 Nov 2017 15:02:23 +0000 (07:02 -0800)]
Merge android-4.4@
ceee5bd (v4.4.95) into msm-4.4
* refs/heads/tmp-
ceee5bd
BACKPORT: arm64: relocatable: suppress R_AARCH64_ABS64 relocations in vmlinux
sched/core: fix have_sched_energy_data build warning
sched/core: Warn if ENERGY_AWARE is enabled but data is missing
sched: walt: Correct WALT window size initialization
FROMLIST: sched/fair: Use wake_q length as a hint for wake_wide
sched: WALT: account cumulative window demand
sched/fair: remove useless variable in find_best_target
sched/tune: access schedtune_initialized under CGROUP_SCHEDTUNE
sched/fair: consider task utilization in group_max_util()
sched/fair: consider task utilization in group_norm_util()
sched/fair: enforce EAS mode
sched/fair: ignore backup CPU when not valid
sched/fair: trace energy_diff for non boosted tasks
UPSTREAM: sched/fair: Sync task util before slow-path wakeup
UPSTREAM: sched/fair: Fix usage of find_idlest_group() when the local group is idlest
UPSTREAM: sched/fair: Fix usage of find_idlest_group() when no groups are allowed
BACKPORT: sched/fair: Fix find_idlest_group when local group is not allowed
UPSTREAM: sched/fair: Remove unnecessary comparison with -1
BACKPORT: sched/fair: Move select_task_rq_fair slow-path into its own function
UPSTREAM: sched/fair: Force balancing on nohz balance if local group has capacity
UPSTREAM: sched/core: Add missing update_rq_clock() call in set_user_nice()
UPSTREAM: sched/core: Add missing update_rq_clock() call for task_hot()
UPSTREAM: sched/core: Add missing update_rq_clock() in detach_task_cfs_rq()
UPSTREAM: sched/core: Add missing update_rq_clock() in post_init_entity_util_avg()
UPSTREAM: sched/core: Fix find_idlest_group() for fork
BACKPORT: sched/fair: Fix PELT integrity for new tasks
BACKPORT: sched/cgroup: Fix cpu_cgroup_fork() handling
UPSTREAM: sched/fair: Fix and optimize the fork() path
BACKPORT: sched/fair: Make it possible to account fair load avg consistently
cpufreq/sched: Consider max cpu capacity when choosing frequencies
Linux 4.4.95
FS-Cache: fix dereference of NULL user_key_payload
fscrypto: require write access to mount to set encryption policy
KEYS: Fix race between updating and finding a negative key
fscrypt: fix dereference of NULL user_key_payload
f2fs crypto: add missing locking for keyring_key access
f2fs crypto: replace some BUG_ON()'s with error checks
sched/autogroup: Fix autogroup_move_group() to never skip sched_move_task()
parisc: Fix double-word compare and exchange in LWS code on 32-bit kernels
parisc: Avoid trashing sr2 and sr3 in LWS code
pkcs7: Prevent NULL pointer dereference, since sinfo is not always set.
KEYS: don't let add_key() update an uninstantiated key
lib/digsig: fix dereference of NULL user_key_payload
KEYS: encrypted: fix dereference of NULL user_key_payload
rtlwifi: rtl8821ae: Fix connection lost problem
clockevents/drivers/cs5535: Improve resilience to spurious interrupts
bus: mbus: fix window size calculation for 4GB windows
brcmsmac: make some local variables 'static const' to reduce stack size
i2c: ismt: Separate I2C block read from SMBus block read
ALSA: hda: Remove superfluous '-' added by printk conversion
ALSA: seq: Enable 'use' locking in all configurations
drm/nouveau/mmu: flush tlbs before deleting page tables
drm/nouveau/bsp/g92: disable by default
can: esd_usb2: Fix can_dlc value for received RTR, frames
usb: musb: Check for host-mode using is_host_active() on reset interrupt
usb: musb: sunxi: Explicitly release USB PHY on exit
can: gs_usb: fix busy loop if no more TX context is available
ALSA: usb-audio: Add native DSD support for Pro-Ject Pre Box S2 Digital
usb: hub: Allow reset retry for USB2 devices on connect bounce
usb: quirks: add quirk for WORLDE MINI MIDI keyboard
usb: cdc_acm: Add quirk for Elatec TWN3
USB: serial: metro-usb: add MS7820 device id
USB: core: fix out-of-bounds access bug in usb_get_bos_descriptor()
USB: devio: Revert "USB: devio: Don't corrupt user memory"
ANDROID: binder: show high watermark of alloc->pages.
ANDROID: binder: Add thread->process_todo flag.
UPSTREAM: arm64: compat: Remove leftover variable declaration
ANDROID: sched/fair: Select correct capacity state for energy_diff
Revert "UPSTREAM: efi/libstub/arm64: Set -fpie when building the EFI stub"
cpufreq: schedutil: clamp util to CPU maximum capacity
FROMLIST: android: binder: Fix null ptr dereference in debug msg
FROMLIST: android: binder: Change binder_shrinker to static
cpufreq/sched: Use cpu max freq rather than policy max
Conflicts:
include/linux/sched.h
kernel/sched/core.c
kernel/sched/fair.c
Change-Id: I2751f851df741f00e797deaf2119872b3dced655
Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>
Blagovest Kolenichev [Mon, 6 Nov 2017 23:07:22 +0000 (15:07 -0800)]
sched: restore discarded ifdef CONFIG_SCHED_WALT code
Code closed in ifdef CONFIG_SCHED_WALT blocks is not used in
msm-4.4 builds, hence in order to be as much as closer to
upstream and subsequently to have less merge conflicts in the
future, let's restore this code.
Restore below CONFIG_SCHED_WALT changes in file [1]:
be832f6 sched: walt: Leverage existing
^^^^^^^ Discarded in
dbad9b8.
efb86bd sched: Introduce Window Assisted Load Tracking (WALT)
^^^^^^^ Restore only the block, which is modified by
be832f6.
Discarded in
efbe378.
dbad9b8 Merge android-4.4@
89074de (v4.4.94) into msm-4.4
efbe378 Merge branch 'v4.4-16.09-android-tmp' into lsk-v4.4-16.09-android
[1] kernel/sched/sched.h
Change-Id: Ifd7e230b3b47dde61abf2472f092ff78d80b7427
Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>
Linux Build Service Account [Mon, 6 Nov 2017 19:49:31 +0000 (11:49 -0800)]
Merge "ARM: dts: msm: Remove GPIO pins that are unused on Mojave"
Linux Build Service Account [Mon, 6 Nov 2017 19:49:30 +0000 (11:49 -0800)]
Merge "soc: qcom: pil: Fix error handling during PIL driver probe"
Linux Build Service Account [Mon, 6 Nov 2017 19:49:29 +0000 (11:49 -0800)]
Merge "net:wireless:cnss2: Fix driver loading failure"
Rahul Sharma [Wed, 18 Oct 2017 10:13:13 +0000 (15:43 +0530)]
ARM: dts: msm: Remove GPIO pins that are unused on Mojave
cam_snapshot and cam_focus GPIO pins are unused on Mojave,
thus remove them from DT. Those pins are used for ADV7481
on Mojave.
Change-Id: I8c0026a215fdc2cf1aa94eb763f82258229435c8
Suggested-by: Resmi Rajendran <resmir@qti.qualcomm.com>
Signed-off-by: Rahul Sharma <sharah@codeaurora.org>
Camus Wong [Wed, 1 Nov 2017 16:32:04 +0000 (12:32 -0400)]
ARM: dts: msm: Remove the virtual plane implementation on msm8996
Virtual plane limited the usage of plane on assigned display only.
It is against the implementation in strategy manager in SDM, which
assume any plane can be used by any display.
Change-Id: Iddcb94d888dfa1ec7685f2964116b4296a0e9a7f
Signed-off-by: Camus Wong <camusw@codeaurora.org>
Signed-off-by: Rahul Sharma <sharah@codeaurora.org>
Linux Build Service Account [Mon, 6 Nov 2017 06:33:10 +0000 (22:33 -0800)]
Merge "soc: qcom: Add support for QDSS bridge driver"
Linux Build Service Account [Mon, 6 Nov 2017 06:33:08 +0000 (22:33 -0800)]
Merge "defconfig: sdm660: Enable sdcardfs"
Linux Build Service Account [Mon, 6 Nov 2017 06:33:07 +0000 (22:33 -0800)]
Merge "soc: qcom: glink_smem_native_xport: Add readback to write index"
Linux Build Service Account [Mon, 6 Nov 2017 06:33:06 +0000 (22:33 -0800)]
Merge "msm: kgsl: Add property to determine commands timeout"
Linux Build Service Account [Mon, 6 Nov 2017 06:33:05 +0000 (22:33 -0800)]
Merge "soc: qcom: glink_ssr: Use do_cleanup_data from pkt_priv"
Linux Build Service Account [Mon, 6 Nov 2017 06:33:03 +0000 (22:33 -0800)]
Merge "cnss2: Add device pointer to all external APIs"
Linux Build Service Account [Mon, 6 Nov 2017 06:33:00 +0000 (22:33 -0800)]
Merge "wil6210: missing length check in wil_cfg80211_mgmt_tx"
Linux Build Service Account [Mon, 6 Nov 2017 06:32:59 +0000 (22:32 -0800)]
Merge "ARM: dts: msm: Add GPU maximum frequency 430Mhz support for SDM636"
Linux Build Service Account [Mon, 6 Nov 2017 06:32:58 +0000 (22:32 -0800)]
Merge "defconfig: msmcortex: Enable sdcardfs"
Linux Build Service Account [Mon, 6 Nov 2017 06:32:57 +0000 (22:32 -0800)]
Merge "spi: core: Extract of_spi_parse_dt()"
Linux Build Service Account [Mon, 6 Nov 2017 06:32:55 +0000 (22:32 -0800)]
Merge "ARM: dts: msm: Add base register property for lpass and turing for sdm660"
Linux Build Service Account [Mon, 6 Nov 2017 06:32:54 +0000 (22:32 -0800)]
Merge "msm: kgsl: Print Vulkan memory types as well"
Linux Build Service Account [Mon, 6 Nov 2017 06:32:53 +0000 (22:32 -0800)]
Merge "defconfig: msm: enable DRM driver for msm8996"
Linux Build Service Account [Mon, 6 Nov 2017 06:32:52 +0000 (22:32 -0800)]
Merge "icnss: Check for FW_READY state before sending uevent in PD notifier"
Linux Build Service Account [Mon, 6 Nov 2017 06:32:51 +0000 (22:32 -0800)]
Merge "ath: Disable non-20 mhz 2G world regulatory channels"
Linux Build Service Account [Mon, 6 Nov 2017 06:32:50 +0000 (22:32 -0800)]
Merge "diag: Handle data ready notification properly"
Linux Build Service Account [Mon, 6 Nov 2017 06:32:49 +0000 (22:32 -0800)]
Merge "power: qpnp-fg-gen3: Fine tune the monotonic SOC calculation"
Linux Build Service Account [Mon, 6 Nov 2017 06:32:48 +0000 (22:32 -0800)]
Merge "defconfig: Enable DFS support for ath10k"
Linux Build Service Account [Mon, 6 Nov 2017 06:32:47 +0000 (22:32 -0800)]
Merge "clk: qcom: Add support for 430MHz for gpu clock on sdm660"
Linux Build Service Account [Mon, 6 Nov 2017 06:32:45 +0000 (22:32 -0800)]
Merge "SoC: msm: Support SEC_MI2S_RX"
Linux Build Service Account [Mon, 6 Nov 2017 06:32:44 +0000 (22:32 -0800)]
Merge "leds: qpnp-wled: Fix configuration for AMOLED mode"
Linux Build Service Account [Mon, 6 Nov 2017 06:32:43 +0000 (22:32 -0800)]
Merge "leds: qpnp-wled: Disable module permanently when OVP fault persists"
Linux Build Service Account [Mon, 6 Nov 2017 06:32:42 +0000 (22:32 -0800)]
Merge "leds: qpnp-wled: Configure WLED1_CTRL_SWITCHING_FREQUENCY selectively"
Ritesh Harjani [Wed, 18 Oct 2017 08:35:58 +0000 (14:05 +0530)]
defconfig: sdm660: Enable sdcardfs
This enables sdcardfs for sdm660.
Change-Id: I5621743809caf9a3bbe1deda38681b9c9bcccb99
Signed-off-by: Ritesh Harjani <riteshh@codeaurora.org>
Linux Build Service Account [Sat, 4 Nov 2017 04:45:05 +0000 (21:45 -0700)]
Merge "power: qpnp-fg-gen3: Skip the status_change work if suspended"
Linux Build Service Account [Sat, 4 Nov 2017 04:45:04 +0000 (21:45 -0700)]
Merge "memblock: Fix memblock_overlaps_memory()"
Yue Ma [Mon, 30 Oct 2017 18:31:08 +0000 (11:31 -0700)]
cnss2: Add device pointer to all external APIs
Add device pointer to all external APIs so that platform driver is
able to support multiple devices/instances at the same time.
Change-Id: I09dfb146da30d3fd6514dc79dc31cd239a03afa8
Signed-off-by: Yue Ma <yuem@codeaurora.org>
Yue Ma [Mon, 30 Oct 2017 18:30:11 +0000 (11:30 -0700)]
cnss2: Remove deprecated API
cnss_set_driver_status() is no longer needed by WLAN host driver.
Hence remove it from platform driver.
Change-Id: I31a3174bdded924a9279a40ece05a835277e4626
Signed-off-by: Yue Ma <yuem@codeaurora.org>
Dhoat Harpal [Thu, 21 Sep 2017 16:42:14 +0000 (22:12 +0530)]
soc: qcom: glink_smem_native_xport: Add readback to write index
Writing data to DDR is not ensured to be completed even with addition
of data memory barrier. It is possible that CPU receive that write
instruction is completed but in reality data can be stuck in intermediate
buffer.
Readback of write index is added to ensure that remote side is sent
interrupt only after data is written on DDR.
CRs-Fixed:
2136645
Change-Id: I32c4967daf71991621b57421167e0ac8d38ce065
Signed-off-by: Dhoat Harpal <hdhoat@codeaurora.org>
Lior David [Tue, 17 Oct 2017 12:44:26 +0000 (15:44 +0300)]
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>
Lior David [Tue, 17 Oct 2017 11:18:17 +0000 (14:18 +0300)]
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>
Lior David [Tue, 17 Oct 2017 08:13:36 +0000 (11:13 +0300)]
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>
Lior David [Mon, 16 Oct 2017 17:39:31 +0000 (20:39 +0300)]
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>
Linux Build Service Account [Fri, 3 Nov 2017 14:04:48 +0000 (07:04 -0700)]
Merge "Merge android-4.4@
89074de (v4.4.94) into msm-4.4"
Linux Build Service Account [Fri, 3 Nov 2017 14:04:47 +0000 (07:04 -0700)]
Merge "serial: msm_serial_hs: Do not accept Rx Data till the Rx pipe connect"
Hareesh Gundu [Mon, 30 Oct 2017 05:35:13 +0000 (11:05 +0530)]
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>
Dhoat Harpal [Mon, 30 Oct 2017 16:21:01 +0000 (21:51 +0530)]
soc: qcom: glink_ssr: Use do_cleanup_data from pkt_priv
do_cleanup_data pointer is created for every SSR notification and
stored in cb_data. It is possible that the stored pointer can be
overwritten if two peripherals SSR happens at the same time.
Use do_cleanup_data pointer directly in pkt_priv, instead of
dereferencing from cb_data.
CRs-Fixed:
2121529
Change-Id: Ife68cdc460c0628623dea6827632b8acd8d1d955
Signed-off-by: Dhoat Harpal <hdhoat@codeaurora.org>
Ritesh Harjani [Wed, 18 Oct 2017 08:24:53 +0000 (13:54 +0530)]
defconfig: msmcortex: Enable sdcardfs
This patch enables sdcardfs for msmcortex.
Change-Id: Icf3105c0080a35c2ead663decf4340647ac64b67
Signed-off-by: Ritesh Harjani <riteshh@codeaurora.org>
Liangwei Dong [Thu, 26 Oct 2017 10:47:52 +0000 (06:47 -0400)]
net:wireless:cnss2: Fix driver loading failure
When driver loading and registering to cnss,
the interruptible wait in cnss_driver_event_post
could be woken up by signal. In this driver
register failure case, the __hdd_module_init
will release all the driver resource.
But the cnss_driver_event_work is still probing
the driver normally in the same time. The driver
state mismatch will cause crash.
Fixed by using non interruptible wait for driver
register
Change-Id: I6e99e83f1f3312e0b7d74e432ce90ff23631bc19
Signed-off-by: Liangwei Dong <liangwei@codeaurora.org>
CRs-Fixed:
2134631
Anirudh Ghayal [Wed, 18 Oct 2017 06:06:22 +0000 (11:36 +0530)]
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>
Satyajit Desai [Fri, 18 Aug 2017 18:44:59 +0000 (11:44 -0700)]
soc: qcom: Add support for QDSS bridge driver
Add support to route QDSS data received from MDM via MHI
to USB. The driver will help route diag traffic over the
QDSS sub-system to USB on APPS side. It acts as a bridge
between PCIE MHI and USB interface.
Change-Id: I98bea976638ce3f80785d8f40e2a936fc62397eb
Signed-off-by: Satyajit Desai <sadesai@codeaurora.org>
Mohammed Javid [Thu, 2 Nov 2017 13:40:22 +0000 (19:10 +0530)]
msm: ipa: Fix to use GFP_DMA flag
IPAv2 hardware works with 32 bit addressing,
so allocate a kernel memory using GFP_DMA flag
which is processed by IPA hardware.
Change-Id: I6f35e7f2179dc48f718221f6a3d228aca67c4154
Acked-by: Ashok Vuyyuru <avuyyuru@qti.qualcomm.com>
Signed-off-by: Mohammed Javid <mjavid@codeaurora.org>
Rahul Sharma [Thu, 2 Nov 2017 08:37:07 +0000 (14:07 +0530)]
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>
Anurag Chouhan [Fri, 27 Oct 2017 11:01:38 +0000 (16:31 +0530)]
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>
Avaneesh Kumar Dwivedi [Thu, 5 Oct 2017 13:12:17 +0000 (18:42 +0530)]
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>
Avaneesh Kumar Dwivedi [Thu, 5 Oct 2017 12:28:38 +0000 (17:58 +0530)]
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>
Vijayavardhan Vennapusa [Mon, 30 Oct 2017 09:03:51 +0000 (14:33 +0530)]
USB: configfs: Don't send DISCONNECT uevent during unbind
Windows XP host takes upto 6 seconds to enumerate RNDIS composition when
RNDIS (tethering) is enabled while in MTP/PTP composition. This results in
Userpsace Tethering enable timeout (1 second) causing RNDIS enumeration
failure and falls back to default composition. Workaround the issue by not
sending disconnect event to userspace on composition switch (MTP/PTP to
RNDIS). Send the disconnect event from USB bus reset so that userspace
enable timer starts from bus reset.
Change-Id: I2d1fcaa0704e369204fbba4eceb8ba9b1c525b41
Signed-off-by: Vijayavardhan Vennapusa <vvreddy@codeaurora.org>
Tirupathi Reddy [Thu, 26 Oct 2017 13:58:17 +0000 (19:28 +0530)]
regulator: qpnp: fix voltage min/max constraints check
Fix voltage range selection logic used for voltage min/max
constraints check.
CRs-Fixed:
2136747
Change-Id: I80ab9ca583fda625ae2d9bd9e0c176a4b8c343db
Signed-off-by: Tirupathi Reddy <tirupath@codeaurora.org>
Linux Build Service Account [Thu, 2 Nov 2017 03:34:05 +0000 (20:34 -0700)]
Merge "drm/msm/sde: add mutex to the sde resource manager"
Linux Build Service Account [Thu, 2 Nov 2017 03:34:04 +0000 (20:34 -0700)]
Merge "ARM: dts: msm: enable one adv7533 instance on apq8096 lite board"
Young Hwan Kwak [Thu, 7 Sep 2017 08:29:27 +0000 (16:29 +0800)]
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>
Rajeev Kumar Sirasanagandla [Tue, 31 Oct 2017 17:47:34 +0000 (23:17 +0530)]
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>
Linux Build Service Account [Tue, 31 Oct 2017 23:54:19 +0000 (16:54 -0700)]
Merge "block: Fix oops in locked_inode_to_wb_and_lock_list()"
Linux Build Service Account [Tue, 31 Oct 2017 23:54:18 +0000 (16:54 -0700)]
Merge "block: Fix bdi assignment to bdev inode when racing with disk delete"
Linux Build Service Account [Tue, 31 Oct 2017 23:54:17 +0000 (16:54 -0700)]
Merge "diag: Remove AXI prefetch related padding"
Linux Build Service Account [Tue, 31 Oct 2017 23:54:16 +0000 (16:54 -0700)]
Merge "ARM: 8701/1: fix sparse flags for build on 64bit machines"
Linux Build Service Account [Tue, 31 Oct 2017 23:54:15 +0000 (16:54 -0700)]
Merge "msm: mdss: add support for dma scheduling for dsi v2.1"
Ashish Garg [Mon, 16 Oct 2017 10:48:26 +0000 (16:18 +0530)]
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>
Sameer Thalappil [Mon, 30 Oct 2017 18:17:01 +0000 (11:17 -0700)]
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>
Luc Van Oostenryck II [Mon, 2 Oct 2017 19:33:35 +0000 (20:33 +0100)]
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>
Linux Build Service Account [Mon, 30 Oct 2017 22:13:51 +0000 (15:13 -0700)]
Merge "leds: qpnp-flash: Fix Use-after-free(UAF) for debugfs"