Commit graph

586747 commits

Author SHA1 Message Date
Linux Build Service Account
9af69213de Merge "block: Move bdi_unregister() to del_gendisk()" 2017-04-03 06:24:50 -07:00
Linux Build Service Account
bb6316a190 Merge "icnss: Send FW CRASHED uevent only if driver is probed" 2017-04-03 06:24:48 -07:00
Linux Build Service Account
3e6592af2d Merge "msm_11ad: copy FW crash dump before starting SSR flow" 2017-04-03 06:24:47 -07:00
Linux Build Service Account
3b63b7a021 Merge "scsi: ufs: Abort gating if clock on request is pending" 2017-04-03 06:24:46 -07:00
Linux Build Service Account
46b41403c3 Merge "regulator: qpnp-lcdb: Add a WA to toggle SC before module_enable" 2017-04-03 06:24:45 -07:00
Linux Build Service Account
f87be11d38 Merge "Revert "input: synaptics_dsx: remove array declaration in write function"" 2017-04-03 06:24:44 -07:00
Linux Build Service Account
787f4b3b7d Merge "ARM: dts: msm: Update KTM boot mitigation config for msm8996pro" 2017-04-03 06:24:43 -07:00
Linux Build Service Account
606c597c2b Merge "msm: mdss: fix validation checks for qseed3 params" 2017-04-03 06:24:42 -07:00
Linux Build Service Account
8e837415f8 Merge "msm: mdss: configure gpio to enable backlight" 2017-04-03 06:24:42 -07:00
Linux Build Service Account
7cb9e91f79 Merge "msm: mdss: Add support to read BL level for userspace" 2017-04-03 06:24:41 -07:00
Linux Build Service Account
c13fd2afea Merge "input: touchscreen: remove synaptics v2.6 touch driver" 2017-04-03 06:24:40 -07:00
Linux Build Service Account
73379d1786 Merge "icnss: pre-alloc memory leak check on probe failure and remove" 2017-04-03 06:24:39 -07:00
Linux Build Service Account
bfd4560254 Merge "msm: camera: isp: Use single tasklet for dual vfe" 2017-04-03 06:24:38 -07:00
Linux Build Service Account
eeae91e332 Merge "msm: camera: isp: Set the clock rate for camss vfe clock" 2017-04-03 06:24:37 -07:00
Linux Build Service Account
58889c53f5 Merge "msm: isp: fix bug in cfg_camif" 2017-04-03 06:24:36 -07:00
Jan Kara
5d9a2c9e5e block: Move bdi_unregister() to del_gendisk()
Commit 6cd18e711d "block: destroy bdi before blockdev is
unregistered." moved bdi unregistration (at that time through
bdi_destroy()) from blk_release_queue() to blk_cleanup_queue() because
it needs to happen before blk_unregister_region() call in del_gendisk()
for MD. SCSI though will free up the device number from sd_remove()
called through a maze of callbacks from device_del() in
__scsi_remove_device() before blk_cleanup_queue() and thus similar races
as described in 6cd18e711d can happen for SCSI as well as reported by
Omar [1].

Moving bdi_unregister() to del_gendisk() works for MD and fixes the
problem for SCSI since del_gendisk() gets called from sd_remove() before
freeing the device number.

This also makes device_add_disk() (calling bdi_register_owner()) more
symmetric with del_gendisk().

[1] http://marc.info/?l=linux-block&m=148554717109098&w=2

Tested-by: Lekshmi Pillai <lekshmicpillai@in.ibm.com>
Acked-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Jan Kara <jack@suse.cz>
Tested-by: Omar Sandoval <osandov@fb.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
Git-commit: 165a5e22fafb127ecb5914e12e8c32a1f0d3f820
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git
Change-Id: I006db1a645adffb79d6b2f46f5ccc94fa21dfd0a
Signed-off-by: Ritesh Harjani <riteshh@codeaurora.org>
2017-04-03 14:47:02 +05:30
Anurag Chouhan
e79dfec9b2 icnss: Send FW CRASHED uevent only if driver is probed
If host driver fails to probed for the first time, and SSR/PDR
get triggered, as part of PD down uevent is sent to host driver
which inturn set recovery in progress which never gets reset
and the next time on FW Ready host driver is not able
to probe successfully
To fix this add a check if driver is probed or not
before sending the uevent.

Change-Id: Idceab059821c0b0e2a8806ad9fee5b6c75aec8c7
CRs-fixed: 2027920
Signed-off-by: Anurag Chouhan <achouhan@codeaurora.org>
2017-04-03 13:17:39 +05:30
Anurag Chouhan
c1f5dcc5e8 icnss: Send FW Down indication to WLAN host driver
If FW is down irrespective of crash, a uevent
is sent to wlan host driver to indicate FW is down.

Change-Id: I9fe2a2a11178f72ea27150d74d93a1e411eac030
CRs-fixed: 2027902
Signed-off-by: Hardik Kantilal Patel <hkpatel@codeaurora.org>
Signed-off-by: Anurag Chouhan <achouhan@codeaurora.org>
2017-04-03 12:18:37 +05:30
Shantanu Jain
2edf1e036b Revert "input: synaptics_dsx: remove array declaration in write function"
This reverts commit bcde95e2e6 ("input: synaptics_dsx: remove array
declaration in write function").

Change-Id: I49d05213a473d35bd6ab7fb4149f69ec56f18a8b
Signed-off-by: Shantanu Jain <shjain@codeaurora.org>
2017-04-03 11:14:12 +05:30
Linux Build Service Account
f9aee28de6 Merge "drivers: cpuidle: Minimize round off errors in wake up time" 2017-04-02 22:02:29 -07:00
Asutosh Das
319152bac1 scsi: ufs: Abort gating if clock on request is pending
This change attempts to abort gating of clocks if a
request to turn-on clocks is pending.
This would in turn avoid turning OFF and back ON the
clocks.

CRs-fixed: 2002742
Change-Id: I3d80ed503d4ddb29ac613b11e5e93f84c8362978
Signed-off-by: Asutosh Das <asutoshd@codeaurora.org>
2017-04-03 10:19:59 +05:30
Linux Build Service Account
44f5f07cfc Merge "ANDROID: ion: check for kref overflow" 2017-03-31 21:24:37 -07:00
Linux Build Service Account
bf8798bbf1 Merge "qcom: qnovo: Fix PCURx reporting error" 2017-03-31 21:24:36 -07:00
Linux Build Service Account
c57c1bf5d9 Merge "drivers: net: rmnet: Initial implementation" 2017-03-31 21:24:35 -07:00
Linux Build Service Account
3ca9595f26 Merge "msm: mdss: re-configure DP mainlink clocks during link training" 2017-03-31 21:24:34 -07:00
Linux Build Service Account
b786416467 Merge "ARM: dts: msm: add sde rotator reg bus scale properties" 2017-03-31 21:24:32 -07:00
Linux Build Service Account
13c1e33923 Merge "sde: rotator: add support to configure bus scale vectors" 2017-03-31 21:24:31 -07:00
Linux Build Service Account
67a1d56b69 Merge "msm: mdss: Update write gather register value for MDSS" 2017-03-31 21:24:30 -07:00
Linux Build Service Account
d6edc53a8f Merge "ARM: dts: msm: update vote on ldo11 for amoled panel on sdm630" 2017-03-31 21:24:29 -07:00
Linux Build Service Account
93159d1297 Merge "msm: mdss: make hpd call asynchronous for HDMI in certain cases" 2017-03-31 21:24:28 -07:00
Linux Build Service Account
dff944c7b6 Merge "msm: mdss: dp: set failsafe link params when DPCD read fails" 2017-03-31 21:24:27 -07:00
Linux Build Service Account
a3f4c6146c Merge "trace: ipc_logging: Avoid buffer overflow in ipc_log_string()" 2017-03-31 21:24:26 -07:00
Linux Build Service Account
a9654d0f73 Merge "msm: pcie: log PCIe LTSSM state during link training" 2017-03-31 21:24:25 -07:00
Linux Build Service Account
eed551694d Merge "power: smb-lib: Rerun APSD regardless of charger-type" 2017-03-31 21:24:24 -07:00
Linux Build Service Account
b2e759993b Merge "usb: gadget: f_mass_storage: Perform async runtime resume upon set_alt" 2017-03-31 21:24:24 -07:00
Linux Build Service Account
8a493b9bee Merge "qcom: smb-lib: Disable HW trigger when forcing sink-only mode" 2017-03-31 21:24:23 -07:00
Linux Build Service Account
84d6e9ea9f Merge "ARM: dts: msm: Update GFX PM-QoS values for SDM630" 2017-03-31 21:24:22 -07:00
Linux Build Service Account
e99cdf40ba Merge "net: ipv6: Add early demux handler for UDP unicast" 2017-03-31 21:24:21 -07:00
Linux Build Service Account
f0ee86f82a Merge "drm/msm: Add performance counter tracking" 2017-03-31 21:24:20 -07:00
Linux Build Service Account
438703a38e Merge "icnss: Separate debug and verbose log" 2017-03-31 21:24:19 -07:00
Linux Build Service Account
793709645b Merge "msm: qpnp-haptic: Enable HW auto-resonance for PM660" 2017-03-31 21:24:19 -07:00
Linux Build Service Account
ad4fb9e0fe Merge "msm_11ad: 11AD SMMU changes to allow enabling of SMMU stage1" 2017-03-31 21:24:18 -07:00
Linux Build Service Account
feb15f20cb Merge "msm: media: Allocate extra memory after alignment" 2017-03-31 21:24:17 -07:00
Linux Build Service Account
6b41d84c53 Merge "soc: qcom: spcom: lock ion buf, decrement ref count if no free entry" 2017-03-31 21:24:16 -07:00
Linux Build Service Account
29a8408816 Merge "diag: Add support for header untagging" 2017-03-31 21:24:15 -07:00
Linux Build Service Account
6210291d06 Merge "ASoC: codecs: Correct stream name, add dapm sync" 2017-03-31 21:24:15 -07:00
Linux Build Service Account
68a715abd5 Merge "drivers: soc: Add mutex lock in audio_notifier_late_init" 2017-03-31 21:24:14 -07:00
Anirudh Ghayal
1054280e99 regulator: qpnp-lcdb: Add a WA to toggle SC before module_enable
There is a possibility of the NCP failing to turn on due
to an invalid (short circuit) SC event before the LCDB module
is enabled.

Force a SC re-enable to recover from this condition. Enable this
for PM660L V1.1.

Also, disable the SC handling logic for PM660L to avoid
permanently disabling the module due to the above mentioned
issue.

CRs-Fixed: 2025449
Change-Id: I191d11c35c3d96727874818b8b57fa1c254879bf
Signed-off-by: Anirudh Ghayal <aghayal@codeaurora.org>
2017-04-01 06:47:53 +05:30
Anirudh Ghayal
5549356bec include: qpnp-revid: Add PM660L version info
Add PM660L v1.1 version macros.

Change-Id: I14c3f2110efc474686df488748b0a671f34ced90
Signed-off-by: Anirudh Ghayal <aghayal@codeaurora.org>
2017-04-01 06:39:53 +05:30
Daniel Rosenberg
f6c025297e ANDROID: ion: check for kref overflow
Userspace can cause the kref to handles to increment
arbitrarily high. Ensure it does not overflow.

Signed-off-by: Daniel Rosenberg <drosen@google.com>

Bug: 31992382
Test: See bug for poc
Change-Id: I6bff1df385742b1d836d43180dc87fadcea80782
Git-repo: https://android.googlesource.com/kernel/msm
Git-commit: 0c702db4d90de88df11057bcf0d8fb2dfe741605
Signed-off-by: Dennis Cagle <d-cagle@codeaurora.org>
2017-03-31 16:37:58 -07:00