Commit graph

593049 commits

Author SHA1 Message Date
Linux Build Service Account
ea1901ceaf Merge "ASoC: msm: qdspv2: Fix missing mutex unlock in LSM client driver" 2017-08-09 03:18:20 -07:00
Abhilash Kumar
a9d6b142e1 msm: kgsl: Correctly update fence_name for larger timestamp
Since 'timestamp' is of unsigned int type, for larger timestamp
the format specifier %d can show negative values. Fix this by
using %u format specifier for timestamp.

Change-Id: I621dfd4843099cb27436006500fe3342d1d5ddf4
Signed-off-by: Abhilash Kumar <krabhi@codeaurora.org>
2017-08-09 02:17:09 -07:00
aranja
d55fd79eb9 Revert "input: misc: hbtp_input: fix memory corruption in list"
This reverts commit e6b2b08383f6 ("input: misc: hbtp_input: fix
memory corruption in list_del_entry"). This change introduces
kernel crash during adb reboot.

Change-Id: Ia6f53e2d62344b9f08eb056d901ae39e884e3a96
Signed-off-by: Vevek Venkatesan <vevekv@codeaurora.org>
2017-08-08 23:53:51 -07:00
Abhijeet Dharmapurikar
713a3c923a qpnp-smb2: enable/disable sw jeita using a property
Provide support to enable/disable sw jeita using a power supply
property.

Change-Id: Id1c2a4bcd8caece5ed7591dc5ab5bf3ac2207cba
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
2017-08-09 09:55:38 +05:30
Ashay Jaiswal
04e88147af power: power_supply: add property for sw based JEITA
Add power_supply property to enable/disable software based
JEITA charging.

Change-Id: I9fca73c1de524e78c3df83b02a9f5a64488eaae0
Signed-off-by: Ashay Jaiswal <ashayj@codeaurora.org>
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
2017-08-09 09:47:17 +05:30
Yue Ma
b958ebeb2a cnss2: Disable BDF bypass by default
Disable sending dummy BDF(board data file). Enforce to use real BDF
by default.

Change-Id: Ib0cf267af8ddea8a702f8ac6774063466094f52e
CRs-fixed: 2059087
Signed-off-by: Yue Ma <yuem@codeaurora.org>
2017-08-08 19:46:17 -07:00
Linux Build Service Account
603df3f744 Merge "power: qpnp-fg-gen3: add support for skew in capacity learning algorithm" 2017-08-08 16:24:56 -07:00
Linux Build Service Account
38c099f001 Merge "usb: dwc3: initialize ep0_usb_req.request.dma to avoid crash" 2017-08-08 16:24:55 -07:00
Linux Build Service Account
ee4d827cf0 Merge "ASoC: msm: qdsp6v2: Modify name for Tertiary mi2s RX and TX" 2017-08-08 16:24:54 -07:00
Linux Build Service Account
fbf1286c9c Merge "drm/msm: free the IRQ during GPU cleanup" 2017-08-08 16:24:53 -07:00
Linux Build Service Account
488414b696 Merge "ion: Correct argument of Set/ClearPagePrivate of secure CMA" 2017-08-08 16:24:53 -07:00
Linux Build Service Account
0975f1e0b7 Merge "defconfig: msm: Enable PAN emulation" 2017-08-08 16:24:51 -07:00
Linux Build Service Account
01dc1a95a2 Merge "cnss2: Suspend PCIe link and power off device after PCIe probe" 2017-08-08 16:24:50 -07:00
Linux Build Service Account
1b6a7f7ebb Merge "defconfig: msm: enable fstack-protector-strong" 2017-08-08 09:02:18 -07:00
Linux Build Service Account
cb10479cfa Merge "Merge android-4.4@59ff2e1 (v4.4.78) into msm-4.4" 2017-08-08 09:02:16 -07:00
Linux Build Service Account
0257f99a4d Merge "defconfig: msm: Disable DEVPORT config for msm8998" 2017-08-08 09:02:15 -07:00
Linux Build Service Account
f43cc12df0 Merge "msm: sensor: ois: add conditional check for ioctl" 2017-08-08 09:02:14 -07:00
Linux Build Service Account
7dbbe1224f Merge "msm: ipa3: Fix IPA aggregation force close call" 2017-08-08 09:02:12 -07:00
Linux Build Service Account
7195c28d78 Merge "USB: f_ccid: Unblock ccid_ctrl_read() during disconnect" 2017-08-08 09:02:11 -07:00
Linux Build Service Account
6757ffb0b5 Merge "icnss: Delay Shutdown/reinit sequence for all cases" 2017-08-08 09:02:10 -07:00
Linux Build Service Account
6f1a42cbc9 Merge "qcom: qpnp-haptic: Disable haptics when enable time specified is zero" 2017-08-08 09:02:09 -07:00
Linux Build Service Account
a42bc74491 Merge "drm/msm: reset TMDS clock ratio bit when disabling scrambler" 2017-08-08 09:02:08 -07:00
Linux Build Service Account
6d76f20002 Merge "ARM: dts: msm: Set FDE key size to 256bit for sdm630" 2017-08-08 09:02:07 -07:00
Linux Build Service Account
c75201c442 Merge "ARM: dts: msm: Config sleep state for wlan bootstrap pin for msm8996" 2017-08-08 09:02:05 -07:00
Linux Build Service Account
e9249c8420 Merge "msm: ipa3: fix compatibility with ipa kernel tests" 2017-08-08 09:02:04 -07:00
Hareesh Gundu
8d2505b7de msm: kgsl: Add disable-wake-on-touch devicetree property
Add a devicetree "disable-wake-on-touch" property support
to disable GPU wake up on touch input events. This will
help save power in case of unintended taps and swipes,
for example, when the screen is wet.

Change-Id: I35768dc78c473272472aaf9c0e09e66d75817b2c
Signed-off-by: Hareesh Gundu <hareeshg@codeaurora.org>
2017-08-08 18:57:26 +05:30
Rashi Bindra
0594e5acbb ARM: dts: msm: Remove sync-wait-broadcast for NT35597 DDIC
When sync-wait-broadcast is enabled, panel status is read on both the
controllers. But for NT35597 DDIC, correct response is sent only on the
master controller. Thus, disabling sync-wait-broadcast to avoid reading on
slave controller for this DDIC for msm8998 and sdm660.

Change-Id: Idd4f82d20b416c871e8124b45a996df6746e6c4f
Signed-off-by: Rashi Bindra <rbindra@codeaurora.org>
2017-08-08 05:06:15 -07:00
Guchun Chen
b2278c42ae msm: sde: fix page freeing error when handing off early display
Sometimes, after user space is up and starts the handoff for early
animation/display, page freeing error happens like below.
The error happens in a very small possibility, but will lead to
device rebooting.

Call trace:
dump_backtrace+0x0/0x1b8
show_stack+0x14/0x1c
dump_stack+0xa8/0xe0
bad_page+0xf0/0x118
free_pages_prepare+0x100/0x2cc
free_hot_cold_page+0x38/0x1a0
__free_pages+0x34/0x48
_sde_splash_free_bootup_memory_to_system+0x78/0x9c
sde_splash_clean_up_free_resource+0xbc/0x1f0
sde_crtc_complete_commit+0x114/0x14c
sde_kms_complete_commit+0x50/0x98
complete_commit+0x684/0x6b0
_msm_drm_commit_work_cb+0x30/0x38
kthread_worker_fn+0xcc/0x170
kthread+0xf8/0x100
ret_from_fork+0x10/0x20

The issue is caused by race competition.
In async commit mode, the first is, mutex lock should be involved to
ensure the member of splash_info structure can be protected to
read/write in multiple threads. And the second is, 2 DSI connectors
are available in kernel, and the coming sequent commits may happen on
one DSI or on two DSI respectively. Because DSI interfaces shares the same
resource in LK, if the consecutive commits are for one DSI, DSI resources
could not be released, as another DSI is still visiting and using these
resources. So till confirming the commits for different DSIs have been
done, it's safe to release DSI resource.

Change-Id: Ie6386e3e58d5320cd4e2caab9a07b4e659eb8780
Signed-off-by: Guchun Chen <guchunc@codeaurora.org>
Signed-off-by: Yujun Zhang <yujunzhang@codeaurora.org>
2017-08-08 16:31:37 +08:00
Tanya Dixit
2fff7d7ae6 ASoC: msm: qdspv2: Fix missing mutex unlock in LSM client driver
Fix missing mutex unlock in LSM client driver.

CRs-fixed: 2059497
Change-Id: If5da5ab2eeb424b86c0e6476b69aa6ed36e7ea72
Signed-off-by: Tanya Dixit <tdixit@codeaurora.org>
2017-08-08 13:20:40 +05:30
Yuan Zhao
25816b726a msm: mdss: do not set sink max TMDS clock for DVI device
DVI device does not have CEA extension blocks, we could
not get max TMDS clock from EDID.

Change-Id: I9adcb3006066c2abe6cd79c79865a4f954c1450c
Signed-off-by: Yuan Zhao <yzhao@codeaurora.org>
2017-08-08 15:45:03 +08:00
Hareesh Gundu
3171bf3ddf ion: Correct argument of Set/ClearPagePrivate of secure CMA
On each sg of secure CMA buffer to set/clear page private bit,
we should use the sg_page(sg) rather than sg_page(sgt->sgl).

Change-Id: I05300d9d3a0931d2a0c113f945b45136e0dea01e
Signed-off-by: Hareesh Gundu <hareeshg@codeaurora.org>
2017-08-08 12:57:53 +05:30
Ghanim Fodi
4858b46db0 msm: ipa3: Fix IPA aggregation force close call
Core IPA driver passes wrong end-point index to HAL
when generating aggregation force close parameters
values. Fixed the call to pass the correct index.

CRs-Fixed: 2082839
Change-Id: Icc0fd2ce8a23bf0e3334f54b27b850ebf92b58a1
Signed-off-by: Ghanim Fodi <gfodi@codeaurora.org>
2017-08-07 23:00:37 -07:00
Vidyakumar Athota
3ec77b8214 ASoC: msm: qdsp6v2: assign decoder memory to ADSP
Get the physical address of memory from ion FD and
assign it to ADSP for secure playback scenario.

Change-Id: I51019f5da6fb5fedefc81504b192f985b851ab12
Signed-off-by: Vidyakumar Athota <vathota@codeaurora.org>
2017-08-07 22:44:23 -07:00
annamraj
47cda96d50 msm: camera: Avoid deadlock for vb2 operations using separate lock
Use mutex lock for all VB2 operations, and use separatelock other
than used for stop streaming operation to avoid dead lock.

Change-Id: Idba956e5e3bce48ee57eaa5984786ded218e32d5
Signed-off-by: annamraj <annamraj@codeaurora.org>
2017-08-08 11:05:31 +05:30
Vidyakumar Athota
92c993fd6d soc: qcom: qdsp6v2: use hyp_assign() API for secure memory
Add a new API to call hyp_assign_phys() function to assign the
memory permissions to different subsystem like ADSP for secure
playback applications.

Change-Id: I1d13bd0cd3b5cdcbe37488800c7dad44a20f4996
Signed-off-by: Vidyakumar Athota <vathota@codeaurora.org>
2017-08-07 22:30:01 -07:00
Yue Ma
0c23ebd17e cnss2: Suspend PCIe link and power off device after PCIe probe
After finishing initialization during PCIe probe, there is no need to
keep PCIe link up. Hence suspend PCIe link and power off device after
PCIe probe for QCA6290 chipset.

Change-Id: I1b07d7c9ef4c3a15ba1eb409a4c64f905e83dae4
Signed-off-by: Yue Ma <yuem@codeaurora.org>
2017-08-07 20:43:10 -07:00
Anirudh Ghayal
7eb49b3251 qcom: qpnp-haptic: Disable haptics when enable time specified is zero
The vibrator HAL expects vibration to be disabled when the 'enable'
time specified is 0. Fix this.

CRs-Fixed: 2083994
Change-Id: I12843233da5429ed2fd53f33617952b1dd0ddcd5
Signed-off-by: Anirudh Ghayal <aghayal@codeaurora.org>
2017-08-08 06:02:48 +05:30
Subbaraman Narayanamurthy
65cbdb062d power: qpnp-fg-gen3: adjust recharge voltage during soft JEITA charge done
When there is an early charge termination because of soft JEITA
(warm and cool) conditions, float voltage would have been reduced
by the charger based on the compensation configuration (e.g. by
105 mV). This can be close to the recharge voltage threshold
(e.g. 4.25 V) when the recharge is configured to be based off
Vbatt. Adjust the recharge voltage threshold dynamically by
lowering it by 200 mV during soft JEITA and charge termination.
Reset it back to the original value when the condition clears
i.e. either it is out of soft JEITA or the charger is removed.

Change-Id: If4d293c10e84e414c81204784f2e7062140264b1
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
2017-08-07 16:27:13 -07:00
Abhinav Kumar
ee79d2fe34 drm/msm: reset TMDS clock ratio bit when disabling scrambler
Currently, when scrambler is disabled the TMDS clock ratio bit
is left untouched. Ideally the sink should reset this bit during
hot plug OR no-signal cases. However, the HDMI spec requires this
bit to be explicitly reset by the source.

Add support to reset this bit during scrambler disable.

Change-Id: I092f6cae84653940e2bdb9100df5e384084cf938
Signed-off-by: Abhinav Kumar <abhinavk@codeaurora.org>
2017-08-07 15:54:50 -07:00
Linux Build Service Account
0c4cf52730 Merge "soc: qcom: scm: fix boot issue when compiled with clang" 2017-08-07 15:48:18 -07:00
Greg Kroah-Hartman
9f764bbe06 This is the 4.4.80 stable release
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAlmHzogACgkQONu9yGCS
 aT72Kg/9Ea02hrf7SCaEmReH0CNBsZiWBp0u/4b6QtXt3TrPDXK0oteIB4SUIVi/
 zOzjU5SkssMLL9RoRQob81DLFJlL0b9ME5nLXxAACe2P74DaRSxA3DDmrYILgerH
 Gnv4k9xjbVMXMjdk6qAZ/SahCFfYPfnPCRO/zPeb3+6EZk8UQpaaB/GNxVCsGFTZ
 AfThsAHYzfFOg2fYdK0T09eDtAFqAokwGY6O8uaigkJt3u5mbMXcgxSp4o322OcG
 V3jxCUPzSk/78QtoSqQErXDCj/30451oLVByMBuRpBJAilsDf6VaURuz1dVfKFW8
 PdkLiy397sir696HwPU0HwHz++kRnZK2u2z//TRDE5wmgsC9VSq9fkggZdmNBol5
 N4ekCWjhYyyJzxf9hTxK/fA4t4KRFtOcdRiEkJj9RDIhT9jxsxPMr3TGJ25LJaUH
 8Qae+nNlYVe7lmaojckGa+AjIMm5HRB7LZnf4VQr1E8kvWpWpwA/0YtnduzPsXhH
 6xqT0rL/1/Z1Jz63/zPAtZ9OSL/ne0hJs+xOuUhKHGwH3oWBKrgmxAH8CAxYq0x9
 Y6ALkDweS3e+vVt+4BcHpUz8JTNTlspMcebt4VvjqvmERpKwmVsl7tEY242Uw4LQ
 wMF50vA9Cc0bVkVS7w2Ns/dn6XEWYpqS4a/MninjaBOMbtMia78=
 =l+tE
 -----END PGP SIGNATURE-----

Merge 4.4.80 into android-4.4

Changes in 4.4.80
	af_key: Add lock to key dump
	pstore: Make spinlock per zone instead of global
	net: reduce skb_warn_bad_offload() noise
	powerpc/pseries: Fix of_node_put() underflow during reconfig remove
	crypto: authencesn - Fix digest_null crash
	md/raid5: add thread_group worker async_tx_issue_pending_all
	drm/vmwgfx: Fix gcc-7.1.1 warning
	drm/nouveau/bar/gf100: fix access to upper half of BAR2
	KVM: PPC: Book3S HV: Context-switch EBB registers properly
	KVM: PPC: Book3S HV: Restore critical SPRs to host values on guest exit
	KVM: PPC: Book3S HV: Reload HTM registers explicitly
	KVM: PPC: Book3S HV: Save/restore host values of debug registers
	Revert "powerpc/numa: Fix percpu allocations to be NUMA aware"
	Staging: comedi: comedi_fops: Avoid orphaned proc entry
	drm/rcar: Nuke preclose hook
	drm: rcar-du: Perform initialization/cleanup at probe/remove time
	drm: rcar-du: Simplify and fix probe error handling
	perf intel-pt: Fix ip compression
	perf intel-pt: Fix last_ip usage
	perf intel-pt: Use FUP always when scanning for an IP
	perf intel-pt: Ensure never to set 'last_ip' when packet 'count' is zero
	xfs: don't BUG() on mixed direct and mapped I/O
	nfc: fdp: fix NULL pointer dereference
	net: phy: Do not perform software reset for Generic PHY
	isdn: Fix a sleep-in-atomic bug
	isdn/i4l: fix buffer overflow
	ath10k: fix null deref on wmi-tlv when trying spectral scan
	wil6210: fix deadlock when using fw_no_recovery option
	mailbox: always wait in mbox_send_message for blocking Tx mode
	mailbox: skip complete wait event if timer expired
	mailbox: handle empty message in tx_tick
	mpt3sas: Don't overreach ioc->reply_post[] during initialization
	kaweth: fix firmware download
	kaweth: fix oops upon failed memory allocation
	sched/cgroup: Move sched_online_group() back into css_online() to fix crash
	PM / Domains: defer dev_pm_domain_set() until genpd->attach_dev succeeds if present
	RDMA/uverbs: Fix the check for port number
	libnvdimm, btt: fix btt_rw_page not returning errors
	ipmi/watchdog: fix watchdog timeout set on reboot
	dentry name snapshots
	v4l: s5c73m3: fix negation operator
	Make file credentials available to the seqfile interfaces
	/proc/iomem: only expose physical resource addresses to privileged users
	vlan: Propagate MAC address to VLANs
	pstore: Allow prz to control need for locking
	pstore: Correctly initialize spinlock and flags
	pstore: Use dynamic spinlock initializer
	net: skb_needs_check() accepts CHECKSUM_NONE for tx
	sched/cputime: Fix prev steal time accouting during CPU hotplug
	xen/blkback: don't free be structure too early
	xen/blkback: don't use xen_blkif_get() in xen-blkback kthread
	tpm: fix a kernel memory leak in tpm-sysfs.c
	tpm: Replace device number bitmap with IDR
	x86/mce/AMD: Make the init code more robust
	r8169: add support for RTL8168 series add-on card.
	ARM: dts: n900: Mark eMMC slot with no-sdio and no-sd flags
	ipv6: Should use consistent conditional judgement for ip6 fragment between __ip6_append_data and ip6_finish_output
	net/mlx4: Remove BUG_ON from ICM allocation routine
	drm/msm: Ensure that the hardware write pointer is valid
	drm/msm: Verify that MSM_SUBMIT_BO_FLAGS are set
	vfio-pci: use 32-bit comparisons for register address for gcc-4.5
	irqchip/keystone: Fix "scheduling while atomic" on rt
	ASoC: tlv320aic3x: Mark the RESET register as volatile
	spi: dw: Make debugfs name unique between instances
	ASoC: nau8825: fix invalid configuration in Pre-Scalar of FLL
	irqchip/mxs: Enable SKIP_SET_WAKE and MASK_ON_SUSPEND
	openrisc: Add _text symbol to fix ksym build error
	dmaengine: ioatdma: Add Skylake PCI Dev ID
	dmaengine: ioatdma: workaround SKX ioatdma version
	dmaengine: ti-dma-crossbar: Add some 'of_node_put()' in error path.
	ARM64: zynqmp: Fix W=1 dtc 1.4 warnings
	ARM64: zynqmp: Fix i2c node's compatible string
	ARM: s3c2410_defconfig: Fix invalid values for NF_CT_PROTO_*
	ACPI / scan: Prefer devices without _HID/_CID for _ADR matching
	usb: gadget: Fix copy/pasted error message
	Btrfs: adjust outstanding_extents counter properly when dio write is split
	tools lib traceevent: Fix prev/next_prio for deadline tasks
	xfrm: Don't use sk_family for socket policy lookups
	perf tools: Install tools/lib/traceevent plugins with install-bin
	perf symbols: Robustify reading of build-id from sysfs
	video: fbdev: cobalt_lcdfb: Handle return NULL error from devm_ioremap
	vfio-pci: Handle error from pci_iomap
	arm64: mm: fix show_pte KERN_CONT fallout
	nvmem: imx-ocotp: Fix wrong register size
	sh_eth: enable RX descriptor word 0 shift on SH7734
	ALSA: usb-audio: test EP_FLAG_RUNNING at urb completion
	HID: ignore Petzl USB headlamp
	scsi: fnic: Avoid sending reset to firmware when another reset is in progress
	scsi: snic: Return error code on memory allocation failure
	ASoC: dpcm: Avoid putting stream state to STOP when FE stream is paused
	Linux 4.4.80

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2017-08-07 14:29:16 -07:00
Satya Durga Srinivasu Prabhala
1b81606bf7 soc: qcom: scm: fix boot issue when compiled with clang
As per SMC Calling Convention, X4/W4, X5/W5 & X6/W6 registers
return state is unpredictable. But, inline assembly in scm
driver did not correctly specify output markers, which is
causing compiler to move instructions around when clang is
used to compile, which inturn causing deadlock and boot issue
during firmware loading. Add X4/W4, X5/W5 & X6/W6 registers
to output operand list to fix the deadlock during firmware
loading.

Change-Id: I1e4d51a58cd34c31fc63bcd21a20bfd15498bdc3
Signed-off-by: Satya Durga Srinivasu Prabhala <satyap@codeaurora.org>
2017-08-07 11:31:12 -07:00
Anurag Chouhan
21d31ab5eb icnss: Delay Shutdown/reinit sequence for all cases
PD down notifications reaches APPS only after WLAN HW is
reset. Because of this, there is a small window of time
in which APPS may try to access WLAN HW Copy Engine
registers and get into exception. To avoid this, FW has
implemented 2 stage reset sequence in which first HW is
halted rather than reset and then when FW PD is started
again, reset sequence is executed. Because of the 2
stage reset sequence, WLAN shutdown call back also needs
to be delayed as there may be some buffers submitted to
hardware and if they are freed then again HW exception
may be seen. Delay the shutdown call back till FW ready
happens at this time HW should be reset and clean state.

CRs-fixed: 2056443
Change-Id: Ie587f98d574f7c0a49a8480449fed44c1f4ab816
Signed-off-by: Anurag Chouhan <achouhan@codeaurora.org>
2017-08-07 04:27:56 -07:00
Linux Build Service Account
58274ed8f1 Merge "msm: wlan: Update regulatory database" 2017-08-07 04:11:20 -07:00
Linux Build Service Account
d982ce36ca Merge "msm: wlan: Update regulatory database" 2017-08-07 04:11:19 -07:00
Linux Build Service Account
d304dfa6f9 Merge "ath10k: Disconnect QMI client in case of load failure" 2017-08-07 04:11:18 -07:00
Linux Build Service Account
7ac4b34c4b Merge "leds: qpnp-flash-v2: Calculate the IRES current dynamically" 2017-08-07 04:11:17 -07:00
Linux Build Service Account
515486b0bf Merge "msm: usb_bam: replace %p with %pK" 2017-08-07 04:11:15 -07:00
Linux Build Service Account
61dac4648d Merge "drm/edid: add colorimetry block parsing support" 2017-08-07 04:11:14 -07:00
Linux Build Service Account
de64b55406 Merge "drm/edid: add support for parsing quantization select field" 2017-08-07 04:11:13 -07:00