Commit graph

595161 commits

Author SHA1 Message Date
Linux Build Service Account
56f4249dfb Merge "spi: core: Add support for registering SPI slave controllers" 2017-11-08 12:55:14 -08:00
Linux Build Service Account
b9d7765e73 Merge "regulator: qpnp: fix voltage min/max constraints check" 2017-11-08 12:55:13 -08:00
Linux Build Service Account
9d1c28996f Merge "dwc3: Do not perform core reinitialisation for host only mode" 2017-11-08 12:55:13 -08:00
Vivek Iyer
26f229089b ARM: dts: msm: Add support for irs1645 eeprom on msm8998
Add device tree entry needed to support eeprom on the
irs1645 sensor.

Change-Id: I88ad09c7da813e3b74d465392e8e40839d9c88a9
Signed-off-by: Vivek Iyer <viyer@codeaurora.org>
2017-11-08 11:49:52 -08:00
Dedy Lansky
7d7d37295b 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>
2017-11-08 14:57:41 +02:00
Dedy Lansky
dea78e0c9f 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>
2017-11-08 14:57:30 +02:00
Lynus Vaz
a00b5d0583 msm: kgsl: Update the dispatcher timer properly
The dispatcher timer should be updated if preemption is not in
progress. This schedules the dispatcher work in case the command
does not make progress.

Change-Id: I9ef55b12d7a4f07a3c5bba650e37453bd8f86ce3
Signed-off-by: Lynus Vaz <lvaz@codeaurora.org>
2017-11-08 03:30:03 -08:00
Neeraj Soni
a3b28d68a2 security: pfe: Return proper error code
ICE clock funciton masks the error code from
scm call. This might introduce unwanted issues
in device. Ensure to return proper error code
to storage frameworks.

Change-Id: Ibd7358c3b19d23d5995cf267f56ef3bacf166569
Signed-off-by: Neeraj Soni <neersoni@codeaurora.org>
2017-11-08 16:49:51 +05:30
Linux Build Service Account
8fe7c2f3d9 Merge "ARM: dts: msm: enable adv7533 bridge chip power rails on msm8996" 2017-11-08 02:31:29 -08:00
Linux Build Service Account
8cf2adc53d Merge "msm: camera: Check step position table for NULL pointer" 2017-11-08 02:31:27 -08:00
Linux Build Service Account
fa213fd7e7 Merge "ARM: dts: msm: Add sdhc_2 on msm8996 virtual platform" 2017-11-08 02:31:26 -08:00
Linux Build Service Account
dc774bc378 Merge "USB: configfs: Don't send DISCONNECT uevent during unbind" 2017-11-08 02:31:24 -08:00
Linux Build Service Account
637b5248c1 Merge "defconfig: arm64: msm: Enable MMC on msm8996 virtual plaform" 2017-11-08 02:31:23 -08:00
Linux Build Service Account
997088afbf Merge "soc: qcom: scm: Remap scm busy error codes to -EBUSY" 2017-11-08 02:31:22 -08:00
Yuan Zhao
a634cb0591 msm: mdss: do not do phy reset when HDMI power off
Do not need to do HDMI PHY reset here, because will do
that when HDMI cable connected again in HDMI mode setting
function.

Change-Id: Ifae7c35f72a9008980c207e0806ab7aaa57dfe07
Signed-off-by: Yuan Zhao <yzhao@codeaurora.org>
2017-11-08 15:51:18 +08:00
Gaurav Singhal
e635410e40 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>
2017-11-08 12:11:34 +05:30
Ajay Agarwal
76cde531db 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>
2017-11-08 11:27:35 +05:30
Geert Uytterhoeven
7e351fc4ea 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>
2017-11-08 11:26:36 +05:30
Odelu Kukatla
16d78cda70 soc: qcom: msm_bus: Add debug logging for max bandwidth votes
Max bandwidth vote on each bus device is required to be
printed when the device panics, so add a panic notifier
to print the max BW votes on each bus device.

Change-Id: I2256407638fe5085cb4b0f4d5a594dd00f4f3bce
Signed-off-by: Odelu Kukatla <okukatla@codeaurora.org>
2017-11-08 10:58:19 +05:30
Rahul Sharma
431bac2520 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>
2017-11-07 19:02:35 -08:00
Linux Build Service Account
b1281c202f Merge "mmc: core: Return error if fallback to lower speed mode fails" 2017-11-07 15:40:02 -08:00
Linux Build Service Account
5662b995d5 Merge "ARM: dts: msm: Change QDSS pipe index to 3 for SDM660" 2017-11-07 15:40:01 -08:00
Yue Ma
23e028334a cnss2: Refactor callbacks for SSR framework
SSR framework is specific for MSM kernels. Refactor the callbacks
for SSR framework so that the same powerup/shutdown APIs can be
also used for non-MSM kernels where SSR framework does not exist.

Change-Id: Ic7bcafadc4f7ad3bd2fab0a4b672b2f5676fe401
Signed-off-by: Yue Ma <yuem@codeaurora.org>
2017-11-07 10:25:44 -08:00
Liangliang Lu
a17c88a808 usb: gadget: ffs: Defer freeing memory on free_inst if in use
In the case of ffs_free_inst() called, whole ffs_dev structure is
freed. Userspace related API do not check if ffs_dev is freed or
not.

If ffs endpoint is opened by userspace, ffs_free_inst() is executed,
mark inst_exist to false but do not free instance structures until
ffs_data is freed.

Besides, ffs_data is allocated in ffs_fs_mount() while opts->dev
is allocated when ffs instance created. And opts->dev will
be freed when ffs instance freed.

If ffs instance is freed and created once, opts->dev is allocated
to new memory, but since ffs_fs_mount() won't be called in this
case, new opts->dev miss the ffs_data address and
ffs_data->private_data still point to old opts->dev address which
is already freed.

So new allocated opts->dev need to initialize opts->dev->ffs_data,
and ffs_private_data also need to update new allocated opts->dev
address.

Change-Id: Idea56f86c62da700926e8ce3a724d5be6295a4fd
Signed-off-by: Liangliang Lu <luliang@codeaurora.org>
2017-11-07 18:53:08 +08:00
Wanhyeong Ryu
63d7fc8afd 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>
2017-11-07 15:39:33 +05:30
Linux Build Service Account
c64b5ccbba Merge "msm: isp: Soft reset ISP before second pass" 2017-11-07 01:41:17 -08:00
Linux Build Service Account
f2a461d291 Merge "ARM: dts: msm: Remove the virtual plane implementation on msm8996" 2017-11-07 01:41:17 -08:00
Zhiming Weng
df46a12ca7 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>
2017-11-07 16:43:01 +08:00
Surajit Podder
7dae4c54df msm: vidc: Fix sequence change event properly
Ensure that session continue is not sent to firmware
in cases where resources sufficient event is converted
to insufficient.

Change-Id: I3500a63d49dcd799ad76491a207c68bfef854dd3
Signed-off-by: Surajit Podder <spodder@codeaurora.org>
2017-11-06 22:37:50 -08:00
Vivek Veenam
c2646efc65 msm: camera: Enable (2+1) lane csiphy combo mode
Changes to enable csiphy in combo mode for (2+1) lane
sensors.

CRs-Fixed: 1068576
Change-Id: Iaf03c1a6b13a19e8591ab3dbb462154130b41e5e
Signed-off-by: Vivek Veenam <vveenam@codeaurora.org>
2017-11-06 22:25:59 -08:00
Vijayavardhan Vennapusa
5a70436579 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>
2017-11-06 21:58:44 -08:00
Zhiqiang Tu
eb883038ce 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>
2017-11-07 13:56:18 +08:00
Vijay kumar Tumati
02f4c7a910 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>
2017-11-07 10:55:14 +05:30
Zhiqiang Tu
aaee453657 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>
2017-11-06 19:23:06 -08:00
Blagovest Kolenichev
985aecee1d 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>
2017-11-06 15:58:47 -08:00
Blagovest Kolenichev
22b1828145 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>
2017-11-06 15:39:25 -08:00
Linux Build Service Account
91da619c3a Merge "ARM: dts: msm: Remove GPIO pins that are unused on Mojave" 2017-11-06 11:49:30 -08:00
Linux Build Service Account
69b148a089 Merge "soc: qcom: pil: Fix error handling during PIL driver probe" 2017-11-06 11:49:30 -08:00
Linux Build Service Account
14371aded9 Merge "net🛜cnss2: Fix driver loading failure" 2017-11-06 11:49:29 -08:00
Rahul Sharma
cc3e07b2c3 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>
2017-11-06 06:59:01 -08:00
Camus Wong
4bf823c3a8 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>
2017-11-06 16:34:13 +05:30
Linux Build Service Account
59e7cfaf52 Merge "soc: qcom: Add support for QDSS bridge driver" 2017-11-05 22:33:09 -08:00
Linux Build Service Account
22cfc3487c Merge "defconfig: sdm660: Enable sdcardfs" 2017-11-05 22:33:08 -08:00
Linux Build Service Account
a1b1b96ce3 Merge "soc: qcom: glink_smem_native_xport: Add readback to write index" 2017-11-05 22:33:06 -08:00
Linux Build Service Account
513fd626d6 Merge "msm: kgsl: Add property to determine commands timeout" 2017-11-05 22:33:05 -08:00
Linux Build Service Account
551738a812 Merge "soc: qcom: glink_ssr: Use do_cleanup_data from pkt_priv" 2017-11-05 22:33:04 -08:00
Linux Build Service Account
59703730f6 Merge "cnss2: Add device pointer to all external APIs" 2017-11-05 22:33:03 -08:00
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