Commit graph

589702 commits

Author SHA1 Message Date
Prakash Gupta
026cbd8d2a ion: revert downstream fix for debugfs synchronization
revert msm specific changes conflicting with commit I3373dc1dbb5
("ion:synchronize debugfs callback and ion_client_destroy")

- revert commit I7bc7562400d ("ion: destroy ion handles under
  client->lock")
- revert commit Ic4c2f9dff90 ("ion: validate ion client in
  ion_debug_client_show() and extract data")
- revert dev->lock usage in ion_debug_heap_show.

Change-Id: Iba5f527b57f39d628b8cd833f627481cc56f6617
Signed-off-by: Prakash Gupta <guptap@codeaurora.org>
2017-05-04 14:45:01 +05:30
Sachin Bhayare
c25dba2a0b msm: mdss: add support for mdss throttle clock handling
Update mdss throttle clock status based on status of display.

Change-Id: Ife21df0c570240c075f039b8d49514bb323021da
Signed-off-by: Sachin Bhayare <sachin.bhayare@codeaurora.org>
2017-05-04 02:07:22 -07:00
Sachin Bhayare
e0fa41a434 ARM: dts: msm: add mdss throttle clock for SDM660 and SDM630
Add mmss_throttle_mdss_axi clock in MDSS clock list
for SDM660 and SDM630.

Change-Id: Iadc58ab163101bce81c255646742f27d3e848cda
Signed-off-by: Sachin Bhayare <sachin.bhayare@codeaurora.org>
2017-05-04 02:06:36 -07:00
Kiran Gunda
8f48ec6a5a regulator: onsemi-ncp6335d: Add is_enabled API support
Without is_enabled function support, regualtor framework treats
it as an always on regulator and does not invoke the regulator enable
function call. Hence, add support for it.

Also, define a parent supply ("vin") for the regulator. This parent
can be used to pin-control the regulator. While at it, change the initcall
level to subsys_init. so that the driver registers after the parent supply
("vin" - provided by fixed-regualtor).

Change-Id: I93e870d2e4b89f7874c3e17be91bc417dadf1777
Signed-off-by: Kiran Gunda <kgunda@codeaurora.org>
2017-05-04 14:33:41 +05:30
Xiaojun Sang
87cac622d8 ASoC: msm: enhance ADSP Stream Callback
Implement FIFO queue for multiple callback events. Events are
cleaned at stream close.

Change-Id: Id738326a20613d2f939e45204b2d46448a5b4759
Signed-off-by: Xiaojun Sang <xsang@codeaurora.org>
2017-05-04 15:21:27 +08:00
Abhishek Kondaveeti
07869d3af8 msm: isp: Fix pdaf buffer drop
Use common data accessible to both ISPs to
store pdaf buffer index

Change-Id: I27d33eaa8bc517250503bdb0e9267e94180a99f0
Signed-off-by: Abhishek Kondaveeti <akondave@codeaurora.org>
2017-05-03 23:32:30 -07:00
Linux Build Service Account
2db428de0b Merge "drm/msm: Add preemption records to QTI GPU snapshot" 2017-05-03 23:32:11 -07:00
Linux Build Service Account
48a0c93e1d Merge "msm: camera: ispif: extend interface with line width" 2017-05-03 23:32:10 -07:00
Linux Build Service Account
6669dae7d1 Merge "msm: camera: Allow driver file to be opend only once." 2017-05-03 23:32:08 -07:00
Linux Build Service Account
a1e1d01429 Merge "msm: camera2: cpp: Fix out-of-bounds frame or command buffer access" 2017-05-03 23:32:06 -07:00
Linux Build Service Account
9d0c2b4690 Merge "iommu/iommu-debug: Add validation support for per-buffer coherent mappings" 2017-05-03 23:32:05 -07:00
Linux Build Service Account
2f04bcd6dc Merge "Revert "smb138x: introduce support for smb1355"" 2017-05-03 23:31:51 -07:00
Linux Build Service Account
7e299cee46 Merge "Revert "smb138x: use chg src bit to disable parallel charger"" 2017-05-03 23:31:50 -07:00
Linux Build Service Account
7d2dbd9538 Merge "Merge branch 'android-4.4@e4528dd' into branch 'msm-4.4'" 2017-05-03 23:31:48 -07:00
Linux Build Service Account
bf5ab4a6aa Merge "defconfigs: Sync up defconfigs" 2017-05-03 23:31:47 -07:00
Linux Build Service Account
de0bc8ca46 Merge "soc: qcom: minidump: move elf global variables to structure" 2017-05-03 23:31:45 -07:00
Linux Build Service Account
5020492d4f Merge "soc: qcom: minidump: update error message log level" 2017-05-03 23:31:44 -07:00
Linux Build Service Account
3015e7db67 Merge "icnss: Initialize the structure member properly" 2017-05-03 23:31:13 -07:00
Linux Build Service Account
2496676424 Merge "regulator: onsemi-ncp6335d: Fix compilation issues" 2017-05-03 23:31:08 -07:00
Linux Build Service Account
495301846e Merge "profiler: Reorder the bandwidth counter structure" 2017-05-03 23:31:06 -07:00
Abir Ghosh
13ccb392c3 qbt1000: Initialize drvdata structure before usage
Fix uninitialized local variable error which might have lead to
crash.

CRs-Fixed: 2030137
Change-Id: I3fd95cb343c3175e4190c8ebfe209399db0602a6
Signed-off-by: Abir Ghosh <abirg@codeaurora.org>
2017-05-03 23:21:25 -07:00
Abir Ghosh
07f699a324 qbt1000: Terminate fingerprint TA name with null
Terminate the string, coming from userspace and containing the name
of fingerprint trusted app, with null character, to make sure kernel
memory does not leak into logs

Change-Id: I1668a64fcb6747ce3ef3b1ee6321fa5fa4a1798a
CRs-Fixed: 2029409
Signed-off-by: Abir Ghosh <abirg@codeaurora.org>
2017-05-03 23:21:12 -07:00
Abir Ghosh
9f6e16f245 qbt1000: Validate FP app name before qseecom_start_app
Validate the name of the client app before passing it to
qseecom_start_app.

CRs-Fixed: 2006695
Change-Id: I9c6b16050d4f6fc94827021c7b0f2ab292452f60
Signed-off-by: Abir Ghosh <abirg@codeaurora.org>
2017-05-03 23:20:55 -07:00
Sahitya Tummala
d07d314e7d fs/mbcache: fix use after free issue in mb_cache_shrink_scan()
Fix the below potential race between these two contexts -
mb_cache_entry_get() and mb_cache_shrink_scan(), which results
into use after free issue.

			     task a:
			     mb_cache_shrink_scan()
			       |--if(!list_empty(&mb_cache_lru_list))
				      |--get the ce entry
				      |--list_del_init(&ce->e_lru_list);
				      |--check ce->e_used, ce->e_queued,
					 ce->e_refcnt and continue
				      -> gets prempted here
task b:
ext4_xattr_release_block()
 |--mb_cache_entry_get()
    |--get ce from hlist_bl_for_each_entry()
      |--increment ce->e_used and
         list_del_init(&ce->e_lru_list)
 |--mb_cache_entry_free()
				      |--hlist_bl_lock(ce->e_block_hash_p);
				      -> results into use after free

Also, fix similar potential race between mb_cache_entry_alloc() and
mb_cache_entry_get() in case if cache->c_max_entries is reached.

Change-Id: I01049bae5d914cfb8494ab299ec2e068745d1110
Signed-off-by: Sahitya Tummala <stummala@codeaurora.org>
2017-05-04 09:41:48 +05:30
Yingwei Zhao
fe26f221ff ARM: dts: msm: Add batt_therm coefficients for QRD SDM660/630
Configure battery thermal coefficients for QRD660/630 to make sure the
device could read the correct battery temperatures.

CRs-Fixed: 2038922
Change-Id: I21d0eedfec0a0529d8864d11b703659f4ba43b6a
Signed-off-by: Yingwei Zhao <cyizhao@codeaurora.org>
2017-05-03 20:23:21 -07:00
Can Guo
d70b0a18f6 scsi: ufs: add command logging infrastructure
Add the necessary infrastructure to keep timestamp history
of commands, events and other useful info for debugging
complex issues. This helps in diagnosing events leading
upto failure.

Change-Id: I34f78b0c875262fa06c16d476be6255f7ae4d92f
Signed-off-by: Subhash Jadavani <subhashj@codeaurora.org>
Signed-off-by: Sayali Lokhande <sayalil@codeaurora.org>
Signed-off-by: Can Guo <cang@codeaurora.org>
2017-05-04 09:12:11 +08:00
Harsh Sahu
ad8e758d30 msm: mdss: fix memcpy source and dest memory buffer size mismatch
Currently memcpy is copying from a bigger memory size to a smaller
memory size. This change corrects this issue by performing the
memcopy restricted to the smaller of the src or dest memory buffer.

CRs-fixed: 2028228
Change-Id: Ibbe5665083799a4262d3cfbb06f94f3e35e03748
Signed-off-by: Harsh Sahu <hsahu@codeaurora.org>
2017-05-03 13:58:09 -07:00
Abhijeet Dharmapurikar
b65544bd63 Revert "smb138x: introduce support for smb1355"
This reverts commit 566b44214c (smb138x:
introduce support for smb1355).

This is not required since smb1355 support is moved to its own driver.

Change-Id: Ibad8595c09a865e273adb6f30d6a75f931220131
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
2017-05-03 13:51:53 -07:00
Abhijeet Dharmapurikar
df7b29506b Revert "smb138x: use chg src bit to disable parallel charger"
This reverts commit 0f0e36134d ("smb138x:
use chg src bit to disable parallel charger)

This is not required, since smb1355 support is moved to its own driver.

Change-Id: I1bd454030d29195f03be132d167ec8294169b9d5
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
2017-05-03 13:51:53 -07:00
Abhijeet Dharmapurikar
9d0fdc3738 qpnp-smb2: Support faking input current limited state
Support faking input current limited state. This is very helpful
in testing/debugging the software based vbus changing algorithms.

Change-Id: I7cf548c94397ee680c9d65343c49ec7b16873e88
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
2017-05-03 13:51:52 -07:00
Fenglin Wu
15a68a61bd power: qcom: smb2: Add REAL_TYPE property for usb power_supply
Add POWER_SUPPLY_PROP_REAL_TYPE property for usb_psy to present its real
charger type. POWER_SUPPLY_PROP_TYPE in usb_psy is always set to
POWER_SUPPLY_TYPE_USB_PD for healthd to recognize it as an AC charger.
Also add usb_port_psy with POWER_SUPPLY_TYPE_USB type is added for healthd
to recognize it as an USB host. Their ONLINE properties will be updated
according to the VBUS status, type-c mode and real charger type.
With this type being set statically, update the usb phy and pd policy
engine code to look at real type.

Change-Id: I90aa69325cc82b09dfb513c0eeecbc61e092a57f
Signed-off-by: Fenglin Wu <fenglinw@codeaurora.org>
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
2017-05-03 13:48:19 -07:00
Konrad Leszczynski
4f87851849 ANDROID: usb: gadget: f_audio_source: disable the CPU C-states upon playback
Due to the issue with the isoc transfers being interrupted
by the CPU going into the idle state, the C-states will be
disabled for the playback time.

Change-Id: If4e52673606923d7e33a1d1dbe0192b8ad24f78c
Signed-off-by: Konrad Leszczynski <konrad.leszczynski@intel.com>
Signed-off-by: Russ Weight <russell.h.weight@intel.com>
2017-05-03 18:06:18 +00:00
Witold Sciuk
69a14c17de ANDROID: usb: gadget: f_mtp: Set 0xFFFFFFFF in mtp header ContainerLength field
Value 0xFFFFFFFF should be set according specification
of MTP for large files when fileSize + mtpHeader is greater
than 0xFFFFFFFF.
MTP Specification, Appendix H - USB Optimizations

Patchset: mtp

Change-Id: I6213de052914350be2f87b73f8135f9c0cd05d7c
Signed-off-by: Witold Sciuk <witold.sciuk@intel.com>
Signed-off-by: Konrad Leszczynski <konrad.leszczynski@intel.com>
Signed-off-by: Russ Weight <russell.h.weight@intel.com>
2017-05-03 17:59:57 +00:00
Lingutla Chandrasekhar
198c5bc334 soc: qcom: minidump: move elf global variables to structure
Current driver implementation uses global variables to create
minidump elf header.

Move all elf global variables into a structure, and also replace
'msm_minidump_enabled' API with 'minidump_enabled' global variable.
And also add minidump_table address in elf, which would be useful
for parsers to get memory dump table addresses without vmlinux symbols.

Change-Id: I8829d88ce234179f429ae9537a3582df794c2cdf
Signed-off-by: Lingutla Chandrasekhar <clingutla@codeaurora.org>
2017-05-03 23:04:19 +05:30
Lingutla Chandrasekhar
6437df9e5d soc: qcom: minidump: fix logic checks in elf traversals
Fix logical checks in minidump elf traversal functions.

Change-Id: I649fc9ae66d616982a61f71f66f2abe378212660
Signed-off-by: Lingutla Chandrasekhar <clingutla@codeaurora.org>
2017-05-03 23:02:11 +05:30
Lingutla Chandrasekhar
e1e90feb55 soc: qcom: minidump: update error message log level
Current implementation uses pr_info to print error messages.

Update driver prints log level with pr_err instead of
pr_info, and also update with proper error number for
minidump table update failure return.

Change-Id: I27667715c71b361b9ee0f7856c94242d3ca21014
Signed-off-by: Lingutla Chandrasekhar <clingutla@codeaurora.org>
2017-05-03 22:58:25 +05:30
Greg Kroah-Hartman
24ac44dc5c This is the 4.4.66 stable release
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAlkJWpMACgkQONu9yGCS
 aT7guA/+JdSobjlRUshtcbUGVEwMjSuNFkZEpeTUWxxkrnNVPnIefP4jcCXEctvL
 OxY4TxtvCQO/m+4Yx0ImVkcPBajd55OWiV90fZ0khVwu+4abLPgizj9lUhrXmmGV
 LZjRyurtYFAwoGCvNsPE8NHxf923SFB8j1og0dEmoFGrH4tI+K5A9KPYKaYASU9Q
 uT5rQMU0YrZBvJYzTc9DNKWHD4ekLzn7o/ORodFwQVC7pdQdGpOCq3Ap+LZbtYnn
 146ziEfycRBSt3x9kYf7gztdGLv4tLZJJv7McI6qfX8+Vrt+Wgy4ObSblmTl57RH
 4WAxed2gZ8NW+fnSJZFR8iomRBu1dsyyTESSt1lCEC6i29ardQip5y4/yGLaBtiJ
 nbcUp1Ld+twQYm0p1UMJVo0DUE6xcrwnCoNyhkGzz1XfdQQwvFCaq30PlsjKxI6E
 X/1rRfuICH2dmIn1ziiCb8qBBjHvKbZY5Mg7W8s6E12yIGKuY08m3KaimSMdWt1D
 jKUKMGD9AunC2l4OAGggObMoTG5SaGSSDr8yPG9QxVvD0AvpnpSEFJ8PIi5O7JiB
 jcFNZawAljzIf0VYGrbGAzbrijiaan/WHm3va7U7K1JzIdFzbOlUANpJLhBR70Mb
 Gc3GEcdMflqJUJ6lapEaaFyC8qPjNI5Ks0/7ER0pgTICBoFVSyg=
 =eMmm
 -----END PGP SIGNATURE-----

Merge 4.4.66 into android-4.4

Changes in 4.4.66:
	f2fs: do more integrity verification for superblock
	xc2028: unlock on error in xc2028_set_config()
	ARM: OMAP2+: timer: add probe for clocksources
	clk: sunxi: Add apb0 gates for H3
	crypto: testmgr - fix out of bound read in __test_aead()
	drm/amdgpu: fix array out of bounds
	ext4: check if in-inode xattr is corrupted in ext4_expand_extra_isize_ea()
	md:raid1: fix a dead loop when read from a WriteMostly disk
	MIPS: Fix crash registers on non-crashing CPUs
	net: cavium: liquidio: Avoid dma_unmap_single on uninitialized ndata
	net_sched: close another race condition in tcf_mirred_release()
	RDS: Fix the atomicity for congestion map update
	regulator: core: Clear the supply pointer if enabling fails
	usb: gadget: f_midi: Fixed a bug when buflen was smaller than wMaxPacketSize
	xen/x86: don't lose event interrupts
	sparc64: kern_addr_valid regression
	sparc64: Fix kernel panic due to erroneous #ifdef surrounding pmd_write()
	net: neigh: guard against NULL solicit() method
	net: phy: handle state correctly in phy_stop_machine
	l2tp: purge socket queues in the .destruct() callback
	net/packet: fix overflow in check for tp_frame_nr
	net/packet: fix overflow in check for tp_reserve
	l2tp: take reference on sessions being dumped
	l2tp: fix PPP pseudo-wire auto-loading
	net: ipv4: fix multipath RTM_GETROUTE behavior when iif is given
	sctp: listen on the sock only when it's state is listening or closed
	tcp: clear saved_syn in tcp_disconnect()
	dp83640: don't recieve time stamps twice
	net: ipv6: RTF_PCPU should not be settable from userspace
	netpoll: Check for skb->queue_mapping
	ip6mr: fix notification device destruction
	macvlan: Fix device ref leak when purging bc_queue
	ipv6: check skb->protocol before lookup for nexthop
	ipv6: check raw payload size correctly in ioctl
	ALSA: firewire-lib: fix inappropriate assignment between signed/unsigned type
	ALSA: seq: Don't break snd_use_lock_sync() loop by timeout
	MIPS: KGDB: Use kernel context for sleeping threads
	MIPS: Avoid BUG warning in arch_check_elf
	p9_client_readdir() fix
	Input: i8042 - add Clevo P650RS to the i8042 reset list
	nfsd: check for oversized NFSv2/v3 arguments
	ARCv2: save r30 on kernel entry as gcc uses it for code-gen
	ftrace/x86: Fix triple fault with graph tracing and suspend-to-ram
	Linux 4.4.66

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2017-05-03 08:50:11 -07:00
Stephen Boyd
e18d923a3b defconfigs: Sync up defconfigs
We recently renamed CONFIG_UID_CPUTIME, but didn't update all the
defconfigs.

Change-Id: Ic52f904d6ada3d0e32a8278ec95f7b34b29f96b9
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
2017-05-03 08:42:43 -07:00
Laxminath Kasam
a0e55defe1 ASoC: msm: qdsp6v2: Add routing controls for fm over mi2s
When routing FM over MI2S, add support for required
port mixer controls.

CRs-Fixed: 2034932
Change-Id: I04e08ae8f876fe08390b3dae96d4522c2546fb32
Signed-off-by: Laxminath Kasam <lkasam@codeaurora.org>
2017-05-03 06:29:58 -07:00
Laxminath Kasam
f150591684 ASoC: sdm660_cdc: Avoid unclocked register access to digital codec
In particular SSR scenario, digital codec access happens without
clock enabled. While SSR down event notification in progress,
APR driver blocks request to DSP to enable clock since APR already
received down event. regmap access to digital codec register results in
AHB timeout error. If DSP clock enable request fails, set the regmap
access cache only mode to avoid any register access.

CRs-Fixed: 2034468
Change-Id: Id1141339d2673920167ed7ac74b13b6fee05173f
Signed-off-by: Laxminath Kasam <lkasam@codeaurora.org>
2017-05-03 06:28:06 -07:00
Lior David
ebfdd0e131 wil6210: add option to ignore OTA regulatory hints
On some platforms, the regulatory domain (country) is set
using mechanisms external to WIFI, such as cellular modem
and GPS. In these scenarios the regulatory hints that
are received over the air (in beacons and similar) can
conflict and even cause an incorrect country to be set.
Add an option to ignore the OTA regulatory hints to better
support such scenarios.

Change-Id: Ia46fe2699f4cc9859713947c0153107462fdec06
Signed-off-by: Lior David <liord@codeaurora.org>
2017-05-03 15:11:10 +03:00
Linux Build Service Account
5d78c03af8 Merge "net: wireless: Update regdb for 60G band" 2017-05-03 03:42:42 -07:00
Linux Build Service Account
e8c139bc05 Merge "mmc: core: Use mmc_reset instead of power_restore" 2017-05-03 03:42:41 -07:00
Linux Build Service Account
ae001c2e2e Merge "mmc: core: Do regular power cycle when lacking eMMC HW reset support" 2017-05-03 03:42:40 -07:00
Linux Build Service Account
1b83a4b457 Merge "ASoC: sdm660_cdc: Update volatile register set for cache bypass" 2017-05-03 03:42:39 -07:00
Linux Build Service Account
7407b90c6d Merge "ASoC: msm: qdspv2: add result check when audio process fail" 2017-05-03 03:42:38 -07:00
Linux Build Service Account
1a410c53c6 Merge "defconfig: msm8998: Enable MHI related drivers" 2017-05-03 03:42:37 -07:00
Linux Build Service Account
107513ced3 Merge "tty: serial: msm: Move request_irq to the end of startup" 2017-05-03 03:42:36 -07:00
Kiran Gunda
08e56dd325 regulator: onsemi-ncp6335d: Fix compilation issues
Fix the compilation issue seen due to the regulator framework
changes from 3.10 to 4.4 kernel. Also remove the redundant error
messages during the memory allocation failures.

Change-Id: I4887c2d3acaff562fb41e6c2eaeb2c1ef2c1bde5
Signed-off-by: Kiran Gunda <kgunda@codeaurora.org>
2017-05-03 15:06:51 +05:30
Lingutla Chandrasekhar
d2e8712af2 defconfig: msm: perf: disable cache dumps support
During Mini dump collection, cache dump needs extra memory
and time hence disable it in perf builds.

Change-Id: I68aae6edf676c27b8443fdcc88ece05fa3a26748
Signed-off-by: Lingutla Chandrasekhar <clingutla@codeaurora.org>
2017-05-03 14:41:14 +05:30