Commit graph

602558 commits

Author SHA1 Message Date
Srinivasarao P
0280dd7aee Merge android-4.4.156 (7eb7037) into msm-4.4
* refs/heads/tmp-7eb7037
  Linux 4.4.156
  btrfs: use correct compare function of dirty_metadata_bytes
  ASoC: wm8994: Fix missing break in switch
  s390/lib: use expoline for all bcr instructions
  mei: me: allow runtime pm for platform with D0i3
  sch_tbf: fix two null pointer dereferences on init failure
  sch_netem: avoid null pointer deref on init failure
  sch_hhf: fix null pointer dereference on init failure
  sch_multiq: fix double free on init failure
  sch_htb: fix crash on init failure
  ovl: proper cleanup of workdir
  ovl: override creds with the ones from the superblock mounter
  ovl: rename is_merge to is_lowest
  irqchip/gic: Make interrupt ID 1020 invalid
  irqchip/gic-v3: Add missing barrier to 32bit version of gic_read_iar()
  irqchip/gicv3-its: Avoid cache flush beyond ITS_BASERn memory size
  irqchip/gicv3-its: Fix memory leak in its_free_tables()
  irqchip/gic-v3-its: Recompute the number of pages on page size change
  genirq: Delay incrementing interrupt count if it's disabled/pending
  Fixes: Commit cdbf92675f ("mm: numa: avoid waiting on freed migrated pages")
  enic: do not call enic_change_mtu in enic_probe
  Revert "ARM: imx_v6_v7_defconfig: Select ULPI support"
  irda: Only insert new objects into the global database via setsockopt
  irda: Fix memory leak caused by repeated binds of irda socket
  kbuild: make missing $DEPMOD a Warning instead of an Error
  x86/pae: use 64 bit atomic xchg function in native_ptep_get_and_clear
  debugobjects: Make stack check warning more informative
  btrfs: Don't remove block group that still has pinned down bytes
  btrfs: relocation: Only remove reloc rb_trees if reloc control has been initialized
  btrfs: replace: Reset on-disk dev stats value after replace
  powerpc/pseries: Avoid using the size greater than RTAS_ERROR_LOG_MAX.
  SMB3: Number of requests sent should be displayed for SMB3 not just CIFS
  smb3: fix reset of bytes read and written stats
  selftests/powerpc: Kill child processes on SIGINT
  staging: comedi: ni_mio_common: fix subdevice flags for PFI subdevice
  dm kcopyd: avoid softlockup in run_complete_job
  PCI: mvebu: Fix I/O space end address calculation
  scsi: aic94xx: fix an error code in aic94xx_init()
  s390/dasd: fix hanging offline processing due to canceled worker
  powerpc: Fix size calculation using resource_size()
  net/9p: fix error path of p9_virtio_probe
  irqchip/bcm7038-l1: Hide cpu offline callback when building for !SMP
  platform/x86: asus-nb-wmi: Add keymap entry for lid flip action on UX360
  mfd: sm501: Set coherent_dma_mask when creating subdevices
  ipvs: fix race between ip_vs_conn_new() and ip_vs_del_dest()
  fs/dcache.c: fix kmemcheck splat at take_dentry_name_snapshot()
  mm/fadvise.c: fix signed overflow UBSAN complaint
  scripts: modpost: check memory allocation results
  fat: validate ->i_start before using
  hfsplus: fix NULL dereference in hfsplus_lookup()
  reiserfs: change j_timestamp type to time64_t
  fork: don't copy inconsistent signal handler state to child
  hfs: prevent crash on exit from failed search
  hfsplus: don't return 0 when fill_super() failed
  cifs: check if SMB2 PDU size has been padded and suppress the warning
  vti6: remove !skb->ignore_df check from vti6_xmit()
  tcp: do not restart timewait timer on rst reception
  qlge: Fix netdev features configuration.
  net: bcmgenet: use MAC link status for fixed phy
  staging: android: ion: fix ION_IOC_{MAP,SHARE} use-after-free
  x86/speculation/l1tf: Fix up pte->pfn conversion for PAE

Conflicts:
	drivers/staging/android/ion/ion.c

Change-Id: I7153f61c3a676a788f64eeb8bab13e840bbbf985
[readded the function ion_handle_get_by_id() which got deleted with
commit 'staging: android: ion: fix ION_IOC_{MAP,SHARE} use-after-free'
since it is used in msm/msm_ion.c]
Signed-off-by: Srinivasarao P <spathi@codeaurora.org>
2018-09-28 12:05:58 +05:30
Linux Build Service Account
7c445f5374 Merge "soc: qcom: fix race condition while freeing private data" 2018-09-26 10:40:33 -07:00
Linux Build Service Account
1f809ff5de Merge "ARM: dts: msm: change ION layout for msm8996 ivi vplatform" 2018-09-26 10:40:32 -07:00
Linux Build Service Account
b4ed4a40f9 Merge "defconfig: msm-auto: Disable IOMMU_TESTS from msm8996 auto." 2018-09-26 10:40:08 -07:00
Linux Build Service Account
d94526f1a2 Merge "iommu/debug: Remove dependency on CONFIG_IOMMU_DEBUG_TRACKING" 2018-09-26 10:40:07 -07:00
Linux Build Service Account
7b7b6e1eb8 Merge "ARM: dts: msm: Add support for FHD+ video mode panel" 2018-09-26 10:40:03 -07:00
Linux Build Service Account
3e85aeed15 Merge "msm: camera: Fix arbitrary kernel write" 2018-09-26 10:40:02 -07:00
Linux Build Service Account
ccdf008100 Merge "ARM: dts: msm: Disable mhi and esoc for msm8996 CV2X" 2018-09-26 10:40:01 -07:00
Linux Build Service Account
cc27d876cd Merge "wqcrypto: qcedev: Add null pointer check on sg_src" 2018-09-26 10:39:59 -07:00
Linux Build Service Account
22802b03ad Merge "soc: soundwire: Fix wsa mute issue for stereo playback" 2018-09-26 10:39:55 -07:00
Linux Build Service Account
997c89933a Merge "soc: swr-wcd-ctrl: Fix wsa mute issue for stereo playback" 2018-09-26 10:39:51 -07:00
Vivek Kumar
1b096e7d32 defconfig: msm-auto: Disable IOMMU_TESTS from msm8996 auto.
Disable CONFIG_IOMMU_TESTS for msm8996 auto boards,
as iommu test functions are not mulithread-safe
currently.

Change-Id: I0884a86cef33664712788b863e0eb06f42a5c2b9
Signed-off-by: Vivek Kumar <vivekuma@codeaurora.org>
2018-09-25 21:56:58 -07:00
Vivek Kumar
2773d8adda iommu/debug: Remove dependency on CONFIG_IOMMU_DEBUG_TRACKING
Compile 'iommu_debug_attr_to_string' function only when
CONFIG_IOMMU_TESTS is enabled ,because it is called
only from iommu test functions.

Change-Id: Ifb3624690abc8134c1176b8915dc1cfe0454a91e
Signed-off-by: Vivek Kumar <vivekuma@codeaurora.org>
2018-09-25 21:53:45 -07:00
Linux Build Service Account
61da3fb00f Merge "soc: hab: add more return error checking" 2018-09-25 05:11:14 -07:00
Rashi Bindra
cb56df48b9 ARM: dts: msm: Add support for FHD+ video mode panel
Change to add support for FHD+ Video mode panel node for
sdm630 MTP and CDP platform.

Change-Id: I3c6b1298e754ac9419fe132374bb7f9e35395aca
Signed-off-by: Rashi Bindra <rbindra@codeaurora.org>
2018-09-25 12:24:14 +05:30
Yimin Peng
c3ca30a4c9 ARM: dts: msm: change ION layout for msm8996 ivi vplatform
Add carveout audio ION heap and change system ION heap from
CARVEOUT to SYSTEM.

Change-Id: I38698441a3479e213533d981aa06cc850b77d723
Signed-off-by: Yimin Peng <yiminp@codeaurora.org>
2018-09-24 23:41:58 -07:00
Linux Build Service Account
aa0ebdfe2d Merge "msm: gvmq: avoid uninitialized access for data member" 2018-09-21 09:14:57 -07:00
Linux Build Service Account
eb3869c6ea Merge "wcnss: Fix buffer overflow in wcnss_prealloc_get" 2018-09-21 09:14:56 -07:00
Linux Build Service Account
b874c55ee2 Merge "ARM: dts: msm: Display changes for SDM455" 2018-09-21 09:14:55 -07:00
Linux Build Service Account
215fd23dab Merge "icnss: Add check for rejuvenate in fw_down" 2018-09-21 09:14:54 -07:00
Linux Build Service Account
1804f6dc98 Merge "soc: hab: add bootmarker for hab driver" 2018-09-21 09:14:53 -07:00
Linux Build Service Account
03ef042130 Merge "Merge android-4.4.155 (b3f777e) into msm-4.4" 2018-09-21 09:14:51 -07:00
Linux Build Service Account
1cea0d996e Merge "diag: Update the logging codes of events, logs and msgs" 2018-09-21 09:14:50 -07:00
Linux Build Service Account
99c602995c Merge "ARM: dts: msm: Add support for speed bin 3 for SDM630" 2018-09-21 09:14:49 -07:00
Linux Build Service Account
48865844f0 Merge "Merge remote-tracking branch 'origin/caf/BosSen-msm-44/master' into msm-4.4" 2018-09-21 09:14:48 -07:00
Linux Build Service Account
84309e99d5 Merge "drm: msm: Fix kernel panic error" 2018-09-21 09:14:46 -07:00
Linux Build Service Account
d97979c767 Merge "qseecom: fix kclient free issue in qseecom_remove" 2018-09-21 09:14:44 -07:00
Ramandeep Trehan
6523651f7d wqcrypto: qcedev: Add null pointer check on sg_src
Add a null pointer check on sg_src to avoid a possible
null pointer dereference in qcedev driver.

Change-Id: I9d4f9147ae6c340064110381c98d064f29fd9444
Signed-off-by: Ramandeep Trehan <rtrehan@codeaurora.org>
2018-09-21 16:11:40 +05:30
Yajun Li
35669d7698 soc: hab: add more return error checking
If the exported buffer has been freed in other threads,
dma_buf_get maybe return error, therefore need error
checking here.

Change-Id: Ic1674cada8dc6e0d6b09d75abf695a68896b8bff
Signed-off-by: Yajun Li <yajunl@codeaurora.org>
2018-09-21 17:25:46 +08:00
Venkata Rao Kakani
f30b020e96 msm: gvmq: avoid uninitialized access for data member
Resolve Uninitalized access of data member with initialization
of same.

Change-Id: Ie2ba7ac47e55e55daf6e1dc3b8c8ce73a20320de
Signed-off-by: Venkata Rao Kakani <vkakani@codeaurora.org>
2018-09-21 14:37:40 +05:30
Laxminath Kasam
01a16af1b0 soc: soundwire: Fix wsa mute issue for stereo playback
When stereo playback start and temperature read
initiated at same time, one of speaker PA bits are
not set in particular race scenario. Handle the
broadcast check in soundwire framework to ensure
broadcast is disabled only when respective gr_sid
slave calls swr_remove_from_group.

CRs-Fixed: 2282230
Change-Id: I6f82a8c3c0f39dc20c1def09c1728ce4c26c2f5d
Signed-off-by: Laxminath Kasam <lkasam@codeaurora.org>
2018-09-20 00:03:30 -07:00
Laxminath Kasam
1d5e37fb73 soc: swr-wcd-ctrl: Fix wsa mute issue for stereo playback
When temperature on a single wsa881x device is being read,
then soundwire master wakes up both wsa881x devices but
regcache_sync is happening only for one wsa881x device on
which the temperature is being read. This results in
audio playback mute after temperature read. Fix the
regcache sync during temperature read and playback usecase.

CRs-Fixed: 2282230
Change-Id: I856b96517c629ac685bbc25caabee841037106c8
Signed-off-by: Laxminath Kasam <lkasam@codeaurora.org>
2018-09-20 00:03:09 -07:00
Laxminath Kasam
661e263759 ASoC: wsa881x: Fix regcache sync issue during playback
When temperature on a single wsa881x device is being read,
then soundwire master wakes up both wsa881x devices but
regcache_sync is happening only for one wsa881x device on
which the temperature is being read. This results in
audio playback mute after temperature read. Fix the
regcache sync during temperature read and playback usecase.

CRs-Fixed: 2282230
Change-Id: I054f4432d7ae7bce922341ad62b20544cccd5865
Signed-off-by: Sudheer Papothi <spapothi@codeaurora.org>
Signed-off-by: Laxminath Kasam <lkasam@codeaurora.org>
2018-09-20 00:02:21 -07:00
Anurag Chouhan
708d96ef1b wcnss: Fix buffer overflow in wcnss_prealloc_get
There is potential integer truncation in the wcnss_prealloc_get api.
size_t is 8 byte on x64 platform and "unsigned int" is 4 byte.
To avoid this integer truncation, pass size as size_t instead
of unsigned int.

CRs-Fixed: 2269610
Change-Id: I14b274dd7cad98b55fdce1aaa27783272231afde
Signed-off-by: Anurag Chouhan <achouhan@codeaurora.org>
2018-09-20 11:58:08 +05:30
Nirmal Abraham
54f8726518 ARM: dts: msm: Display changes for SDM455
Disable 'assertive display', 'destination scaler' and
'display port' support for SDM455.

Change-Id: I4de89658a6c5b20c97e9fc0f611aaa81f701a9d7
Signed-off-by: Nirmal Abraham <nabrah@codeaurora.org>
2018-09-20 05:31:55 +05:30
Taniya Das
d83e74d0e2 ARM: dts: msm: Add support for speed bin 3 for SDM630
New speed bin 3 for CPU frequency added to be able to scale to 2GHz.

Change-Id: I60bacc458c295d924a061a042aea058fbb2eb085
Signed-off-by: Taniya Das <tdas@codeaurora.org>
2018-09-19 17:18:09 +05:30
puneet
8f13a23259 Merge remote-tracking branch 'origin/caf/BosSen-msm-44/master' into msm-4.4
* origin/caf/BosSen-msm-44/master:
  Added support for BMI160.
  Fixed bmi160 compile conflicts
  added new base source files
  Changed chipID
  Updated directory structure
  Finalized disclaimer information.

CRs-Fixed: 2318425
Change-Id: I8606d46a26f03baac3940162546f507de76bdb9a
Signed-off-by: puneet <puneet@codeaurora.org>
2018-09-19 15:50:35 +05:30
Anurag Chouhan
63714bffa9 icnss: Add check for rejuvenate in fw_down
Currently, fw_down is not getting set in case of rejuvenate
since the qmi server never exit or arrive in case of rejuvenate.
Add ICNSS_REJUVENATE flag to take care of rejuvenate.

Change-Id: If85e8048cbad9a15e1c94af1c8d0012e004e6150
Signed-off-by: Anurag Chouhan <achouhan@codeaurora.org>
2018-09-19 02:34:00 -07:00
Manoj Prabhu B
70c285e0b1 diag: Update the logging codes of events, logs and msgs
New msg SSIDs, log and event mask codes for different subsystems
are added as a new requirement for enable logging.

Change-Id: I31e784307e6de388e1de0806baacf00116360c30
Signed-off-by: Manoj Prabhu B <bmanoj@codeaurora.org>
2018-09-19 14:18:32 +05:30
Yajun Li
fddde64f3a soc: hab: add bootmarker for hab driver
To measure the boot kpi of hab driver,so add
bootmarker in hab_init function

Change-Id: Ib755e77e7a6768d028279331c4bf3e92c10141a4
Signed-off-by: Yajun Li <yajunl@codeaurora.org>
2018-09-19 14:21:50 +08:00
Haibin Liu
d87b566e73 msm: camera: Fix arbitrary kernel write
In 64 bit kernel and 32 bit userspace,ioctl_ptr from
kernel space, should NOT call the copy_from_user.

In 64 bit kernel and 64 bit userspace,ioctl_ptr from
user space, use the copy_from_user to copy data.

use the is_compat_task to distinguish two condition.

CRs-Fixed: 2283160
Change-Id: If9205e4f3176a52e52f694a3183dc9c5b7617a97
Signed-off-by: Haibin Liu <haibinl@codeaurora.org>
2018-09-18 20:28:53 -07:00
Linux Build Service Account
727593cbf7 Merge "drivers: soc: qcom: qcpe: Fix return values" 2018-09-18 09:44:50 -07:00
Linux Build Service Account
79d712a8a4 Merge "defconfig: Disable CONFIG_INET_LRO to avoid pop up" 2018-09-18 09:44:49 -07:00
Linux Build Service Account
da56125cdc Merge "arm64: Silence first allocation with CONFIG_ARM64_MODULE_PLTS=y" 2018-09-18 09:44:48 -07:00
Linux Build Service Account
5b8d95d021 Merge "mm: Silence vmap() allocation failures based on caller gfp_flags" 2018-09-18 09:44:47 -07:00
Linux Build Service Account
a0c8965866 Merge "soc: qcom: glink: Fix not sending READ_NOTIF command issue" 2018-09-18 09:44:46 -07:00
Linux Build Service Account
1b39365d9e Merge "ARM: Silence first allocation with CONFIG_ARM_MODULE_PLTS=y" 2018-09-18 09:44:45 -07:00
Linux Build Service Account
3c361ea66f Merge "clk: qcom: check for change in RCG configuration during set_rate" 2018-09-18 09:44:42 -07:00
Vara Prasad A V S G
30f7e5cd6c defconfig: Disable CONFIG_INET_LRO to avoid pop up
Disable CONFIG_INET_LRO in sdm660_defconfig
and sdm660-perf_defconfig to avoid pop up.

Change-Id: I62069b3f8df27812f714e9875a0e7b7e20e31d4c
Signed-off-by: Vara Prasad A V S G <vavsg@codeaurora.org>
Signed-off-by: Naitik Bharadiya <bharad@codeaurora.org>
2018-09-18 05:59:13 -07:00
Florian Fainelli
542f97a260 mm: Silence vmap() allocation failures based on caller gfp_flags
If the caller has set __GFP_NOWARN don't print the following message:
vmap allocation for size 15736832 failed: use vmalloc=<size> to increase
size.

This can happen with the ARM/Linux or ARM64/Linux module loader built
with CONFIG_ARM{,64}_MODULE_PLTS=y which does a first attempt at loading
a large module from module space, then falls back to vmalloc space.

Change-Id: Ib907156055959e22a419b79fb424772baea556d0
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Git-Commit: 03497d761c55438144fd63534d4223418fdfd345
Git-Repo: git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
Signed-off-by: Vinayak Menon <vinmenon@codeaurora.org>
2018-09-18 02:11:06 -07:00