Commit graph

121903 commits

Author SHA1 Message Date
Linux Build Service Account
1c9a156e41 Merge "ARM: dts: msm: enable DP functionality for SDA660 HDK platform" 2017-07-26 08:44:58 -07:00
Linux Build Service Account
123ada77d0 Merge "ARM: dts: msm: Add qseecom device node on msm8996 lfv platform" 2017-07-26 08:44:50 -07:00
zhaoyuan
4234d719d9 ARM: dts: msm: enable DP functionality for SDA660 HDK platform
SDA660 HDK platform has DP hardware blocks, so enable it in the
device tree.

CRs-Fixed: 2064346
Change-Id: Ieb524e37ed2f4cdd5776759b00ec182378ff6ff5
Signed-off-by: zhaoyuan <yzhao@codeaurora.org>
2017-07-26 00:26:29 -07:00
Prasanth Kamuju
db6ebef1cb ARM: dts: msm: Add intermediate voting for DDR in memlat for sdm630
The current vote mapping is not sufficient for the most of the
gaming usecases on sdm630. Added intermediate voting in the
current mapping.

CRs-Fixed: 2033301
Change-Id: Ie376a3ce46ccfd31a067dfa93967bb211e9df97a
Signed-off-by: Prasanth Kamuju <pkamuju@codeaurora.org>
2017-07-25 04:47:50 -07:00
Amit Blay
3d5f64fe8f ARM: dts: msm: Add qseecom device node on msm8996 lfv platform
Add qseecom device node in guest VM configuration.
This commit adds the device node for the qseecom driver,
and also the reserved memory region for the QSEECOM ION heap.

Change-Id: Ibdf80d080208b5ab8530a1c40ecbccc7298ae89b
Signed-off-by: Amit Blay <ablay@codeaurora.org>
2017-07-25 12:15:36 +03:00
Linux Build Service Account
72d01fe5e6 Merge "ARM: dts: msm: Add support for TOF sensor on msm8998 QVR" 2017-07-23 17:32:51 -07:00
Linux Build Service Account
7d24b9b417 Merge "ARM: dts: msm: Add remote debugger device configuration for cdsp" 2017-07-21 20:15:23 -07:00
Linux Build Service Account
44f9f08a04 Merge "ARM: dts: msm: Update bootargs with LPM disabled for msm8996pro" 2017-07-21 11:08:30 -07:00
Tharun Kumar Merugu
0c74826be7 ARM: dts: msm: Add remote debugger device configuration for cdsp
Adding remote debugger device configuration. The Remote Debugger driver
allows a debugger running on a host PC to communicate with a remote
stub running on peripheral subsystems.

Change-Id: I4aa40846efbf11739d81a9fbe22df811903d8eee
Acked-by: Chenna Kesava Raju <chennak@qti.qualcomm.com>
Signed-off-by: Tharun Kumar Merugu <mtharu@codeaurora.org>
2017-07-20 23:56:44 -07:00
Lei wang
2523349096 ARM: dts: msm: Add support for MSM8996pro UFS based board
Add board-id for UFS board which has a different board sub type.

Change-Id: Ic231784c46d4439944e403e26410515856fdc5fb
Signed-off-by: Lei wang <leiwan@codeaurora.org>
2017-07-20 18:28:51 -07:00
John Zhao
4bd8dca550 ARM: dts: msm: Update bootargs with LPM disabled for msm8996pro
Update bootargs with configuration of lpm_levels.sleep_disabled.

CRs-Fixed: 2079671
Change-Id: Iced6d6fc8e571b342a77ce49b4fa54bf511d7dbc
Signed-off-by: John Zhao <yuankuiz@codeaurora.org>
2017-07-20 13:40:11 -07:00
Vijay kumar Tumati
daca2e77e5 ARM: dts: msm: Add support for TOF sensor on msm8998 QVR
Add device tree entries to support depth sensor.

Change-Id: I7b2219b95e69b44a4048a4f163b1b079a55050e1
Signed-off-by: Vijay kumar Tumati <vtumati@codeaurora.org>
2017-07-19 05:07:59 -07:00
Yue Ma
33978c4cc4 ARM: dts: msm: Add fixed regulator for WLAN_EN pin in MSM8996
Since the PMIC GPIO runtime configuration is not feasible using
pinctrl framework, add it as fixed regulator for WLAN_EN pin.

Signed-off-by: Yue Ma <yuem@codeaurora.org>
CRs-fixed: 2071634
Change-Id: Ifd08bac34388389c6aced7e450cbf5c6ae37b36d
2017-07-18 12:44:34 -07:00
Linux Build Service Account
a1dcf33ce1 Merge "Perf: arm64: avoid use of uninitialized variable" 2017-07-17 18:40:04 -07:00
Linux Build Service Account
81e9c7bff2 Merge "ARM: dts: msm: Add initial support for msm8998-9x55" 2017-07-16 21:04:52 -07:00
Linux Build Service Account
de4967ee70 Merge "ARM: dts: msm: rename mdss_mdp to sde_kms for msm8996" 2017-07-14 04:01:26 -07:00
Linux Build Service Account
52da1d7a4f Merge "ARM: dts: msm: Enable pmic gpio13 so neutrino driver can toggle it in probe" 2017-07-14 04:01:17 -07:00
Linux Build Service Account
bd63fad4d1 Merge "ARM: dts: msm: Use wlan carveout region for sdm660/sdm630" 2017-07-14 04:01:11 -07:00
Linux Build Service Account
12b782766d Merge "ARM: dts: msm: Add IPA dtsi entries for MSM8996 Auto" 2017-07-14 04:00:23 -07:00
Philippe Gravel
0ad9633b9e ARM: dts: msm: Enable pmic gpio13 so neutrino driver can toggle it in probe
Enables pmic gpio13 on msm8996 so that the neutrino driver can toggle it
during probe to bring the hardware out of reset. This is required for
suspend/resume when neutrino resx is disconnected from pcie_reset.

Change-Id: I21a8e556903756ed39abdde5a17e8b6d353c0504
Signed-off-by: Philippe Gravel <pgravel@codeaurora.org>
2017-07-12 16:27:14 -07:00
Linux Build Service Account
d9fbe4b921 Merge "ARM: dts: msm: Remove WLED short circuit properties for PM660" 2017-07-12 12:47:39 -07:00
Linux Build Service Account
1e6e80aa0e Merge "ARM: dts: msm: Add phy related properties for ethernet on msm8996" 2017-07-12 12:47:38 -07:00
Linux Build Service Account
56c8e3ec0d Merge "defconfig: Disable CGROUP_DEBUG config for msm8998 in perf" 2017-07-12 12:47:37 -07:00
Mohammed Khajapasha
a87cd547f6 ARM: dts: msm: Add initial support for msm8998-9x55
Add initial set of device tree files for msm8998-9x55 target.

Change-Id: Icd2d5555a2b48cd935fc4ced54c9a061f3a62a10
Signed-off-by: Mohammed Khajapasha <mkhaja@codeaurora.org>
2017-07-12 17:55:32 +05:30
Hardik Kantilal Patel
d8e33bd351 ARM: dts: msm: Use wlan carveout region for sdm660/sdm630
Add DT entry to use wlan carveout region for WLAN MSA0.

CRs-Fixed: 2075205
Change-Id: I86d90247155884488e639bd8d487157524b977e9
Signed-off-by: Hardik Kantilal Patel <hkpatel@codeaurora.org>
2017-07-12 16:23:38 +05:30
Linux Build Service Account
7438a89b3c Merge "Merge android-4.4@64a73ff (v4.4.76) into msm-4.4" 2017-07-12 03:29:33 -07:00
Zou Shunxiang
40e39c6095 ARM: dts: msm: Add phy related properties for ethernet on msm8996
Add mdio_bus_id and phy_addr to access phy device
instead of scanning mdio bus. It will reduce time
cost during ethernet driver loading.

Change-Id: Ifb1574d4a68944a087dcafb12bc79098bc3156e4
Signed-off-by: Zou Shunxiang <shunxian@codeaurora.org>
2017-07-11 22:26:24 -07:00
Mohammed Khajapasha
b03fe4c43b defconfig: Disable CGROUP_DEBUG config for msm8998 in perf
Disable CGROUP_DEBUG config for msm8998 in perf defconfig.

Change-Id: Ib321201ea0761548fb26db42d59cad07a08eca85
Signed-off-by: Mohammed Khajapasha <mkhaja@codeaurora.org>
2017-07-12 10:06:15 +05:30
Kiran Gunda
0fd1ce1807 ARM: dts: msm: Remove WLED short circuit properties for PM660
WLED module does not have the SC protection feature on PM660l.
Hence remove the SC properties from the WLED device tree node.

CRs-Fixed: 2071302
Change-Id: I45ea0b7581780988b51ab3665c08d8a67a3ce4d3
Signed-off-by: Kiran Gunda <kgunda@codeaurora.org>
2017-07-12 10:05:23 +05:30
Linux Build Service Account
b0e2239e53 Merge "ARM: dts: msm: Enable ACD functionality for sdm630 CPU rails" 2017-07-11 17:57:50 -07:00
Linux Build Service Account
d8ff341d38 Merge "ARM: dts: msm: add wlan carveout region for sdm660/sdm630" 2017-07-11 09:17:36 -07:00
Linux Build Service Account
e5a68ffaa3 Merge "Merge android-4.4@8c91412 (v4.4.75) into msm-4.4" 2017-07-11 00:40:22 -07:00
Tirupathi Reddy
a4ca7944f4 ARM: dts: msm: Enable ACD functionality for sdm630 CPU rails
The adaptive clock distribution (ACD) mitigates the impact of
high-frequency supply voltage (VDD) droops on microprocessor
performance. Program ACD functional configuration for both
Silver and Gold clusters of sdm630.

Also set VCTL_RAMP_EN & VCTL_RAMP_EN to 1 in SAW4_AVS_CTL.

CRs-Fixed: 2074210
Change-Id: I1f8021b8b436602b22a87d2036aebbfcf6840f58
Signed-off-by: Tirupathi Reddy <tirupath@codeaurora.org>
2017-07-11 09:54:14 +05:30
Charan Teja Reddy
3183420178 ARM: dts: msm: add wlan carveout region for sdm660/sdm630
Add WLAN carveout region of size 1MB. But additional guard of 1MB is
also added due to system limitations.

Change-Id: I1cd38f1ced820132209e31acc55a1321c879a09c
Signed-off-by: Charan Teja Reddy <charante@codeaurora.org>
2017-07-10 18:34:20 +05:30
Blagovest Kolenichev
4c8daae4af Merge android-4.4@64a73ff (v4.4.76) into msm-4.4
* refs/heads/tmp-64a73ff:
  Linux 4.4.76
  KVM: nVMX: Fix exception injection
  KVM: x86: zero base3 of unusable segments
  KVM: x86/vPMU: fix undefined shift in intel_pmu_refresh()
  KVM: x86: fix emulation of RSM and IRET instructions
  cpufreq: s3c2416: double free on driver init error path
  iommu/amd: Fix incorrect error handling in amd_iommu_bind_pasid()
  iommu: Handle default domain attach failure
  iommu/vt-d: Don't over-free page table directories
  ocfs2: o2hb: revert hb threshold to keep compatible
  x86/mm: Fix flush_tlb_page() on Xen
  x86/mpx: Correctly report do_mpx_bt_fault() failures to user-space
  ARM: 8685/1: ensure memblock-limit is pmd-aligned
  ARM64/ACPI: Fix BAD_MADT_GICC_ENTRY() macro implementation
  sched/loadavg: Avoid loadavg spikes caused by delayed NO_HZ accounting
  watchdog: bcm281xx: Fix use of uninitialized spinlock.
  xfrm: Oops on error in pfkey_msg2xfrm_state()
  xfrm: NULL dereference on allocation failure
  xfrm: fix stack access out of bounds with CONFIG_XFRM_SUB_POLICY
  jump label: fix passing kbuild_cflags when checking for asm goto support
  ravb: Fix use-after-free on `ifconfig eth0 down`
  sctp: check af before verify address in sctp_addr_id2transport
  net/mlx4_core: Eliminate warning messages for SRQ_LIMIT under SRIOV
  perf probe: Fix to show correct locations for events on modules
  be2net: fix status check in be_cmd_pmac_add()
  s390/ctl_reg: make __ctl_load a full memory barrier
  swiotlb: ensure that page-sized mappings are page-aligned
  coredump: Ensure proper size of sparse core files
  x86/mpx: Use compatible types in comparison to fix sparse error
  mac80211: initialize SMPS field in HT capabilities
  spi: davinci: use dma_mapping_error()
  scsi: lpfc: avoid double free of resource identifiers
  HID: i2c-hid: Add sleep between POWER ON and RESET
  kernel/panic.c: add missing \n
  ibmveth: Add a proper check for the availability of the checksum features
  vxlan: do not age static remote mac entries
  virtio_net: fix PAGE_SIZE > 64k
  vfio/spapr: fail tce_iommu_attach_group() when iommu_data is null
  drm/amdgpu: check ring being ready before using
  net: dsa: Check return value of phy_connect_direct()
  amd-xgbe: Check xgbe_init() return code
  platform/x86: ideapad-laptop: handle ACPI event 1
  scsi: virtio_scsi: Reject commands when virtqueue is broken
  xen-netfront: Fix Rx stall during network stress and OOM
  swiotlb-xen: update dev_addr after swapping pages
  virtio_console: fix a crash in config_work_handler
  Btrfs: fix truncate down when no_holes feature is enabled
  gianfar: Do not reuse pages from emergency reserve
  powerpc/eeh: Enable IO path on permanent error
  net: bgmac: Remove superflous netif_carrier_on()
  net: bgmac: Start transmit queue in bgmac_open
  net: bgmac: Fix SOF bit checking
  bgmac: Fix reversed test of build_skb() return value.
  mtd: bcm47xxpart: don't fail because of bit-flips
  bgmac: fix a missing check for build_skb
  mtd: bcm47xxpart: limit scanned flash area on BCM47XX (MIPS) only
  MIPS: ralink: fix MT7628 wled_an pinmux gpio
  MIPS: ralink: fix MT7628 pinmux typos
  MIPS: ralink: Fix invalid assignment of SoC type
  MIPS: ralink: fix USB frequency scaling
  MIPS: ralink: MT7688 pinmux fixes
  net: korina: Fix NAPI versus resources freeing
  MIPS: ath79: fix regression in PCI window initialization
  net: mvneta: Fix for_each_present_cpu usage
  ARM: dts: BCM5301X: Correct GIC_PPI interrupt flags
  qla2xxx: Fix erroneous invalid handle message
  scsi: lpfc: Set elsiocb contexts to NULL after freeing it
  scsi: sd: Fix wrong DPOFUA disable in sd_read_cache_type
  KVM: x86: fix fixing of hypercalls
  mm: numa: avoid waiting on freed migrated pages
  block: fix module reference leak on put_disk() call for cgroups throttle
  sysctl: enable strict writes
  usb: gadget: f_fs: Fix possibe deadlock
  drm/vmwgfx: Free hash table allocated by cmdbuf managed res mgr
  ALSA: hda - set input_path bitmap to zero after moving it to new place
  ALSA: hda - Fix endless loop of codec configure
  MIPS: Fix IRQ tracing & lockdep when rescheduling
  MIPS: pm-cps: Drop manual cache-line alignment of ready_count
  MIPS: Avoid accidental raw backtrace
  mm, swap_cgroup: reschedule when neeed in swap_cgroup_swapoff()
  drm/ast: Handle configuration without P2A bridge
  NFSv4: fix a reference leak caused WARNING messages
  netfilter: synproxy: fix conntrackd interaction
  netfilter: xt_TCPMSS: add more sanity tests on tcph->doff
  rtnetlink: add IFLA_GROUP to ifla_policy
  ipv6: Do not leak throw route references
  sfc: provide dummy definitions of vswitch functions
  net: 8021q: Fix one possible panic caused by BUG_ON in free_netdev
  decnet: always not take dst->__refcnt when inserting dst into hash table
  net/mlx5: Wait for FW readiness before initializing command interface
  ipv6: fix calling in6_ifa_hold incorrectly for dad work
  igmp: add a missing spin_lock_init()
  igmp: acquire pmc lock for ip_mc_clear_src()
  net: caif: Fix a sleep-in-atomic bug in cfpkt_create_pfx
  Fix an intermittent pr_emerg warning about lo becoming free.
  af_unix: Add sockaddr length checks before accessing sa_family in bind and connect handlers
  net: Zero ifla_vf_info in rtnl_fill_vfinfo()
  decnet: dn_rtmsg: Improve input length sanitization in dnrmg_receive_user_skb
  net: don't call strlen on non-terminated string in dev_set_alias()
  ipv6: release dst on error in ip6_dst_lookup_tail
  UPSTREAM: selinux: enable genfscon labeling for tracefs

Change-Id: I05ae1d6271769a99ea3817e5066f5ab6511f3254
Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>
2017-07-10 03:00:34 -07:00
Maya Erez
fc3a244ccb ARM: dts: msm: configure GPIO19 on msm8998 for 11ad refclk3
PMIC GPIO19 is used by 11ad device to control the refclk3,
while switching to slow clock.
Configure GPIO as input, no pull and VIN 1 for 1.8V source.

Change-Id: I89c04d70f1d8eff550b85d4fcb16bf08bf128ca7
Signed-off-by: Maya Erez <merez@codeaurora.org>
2017-07-08 22:29:40 -07:00
Mohammed Javid
bd29388486 ARM: dts: msm: Add IPA dtsi entries for MSM8996 Auto
Add the MSM8996 auto dtsi entries for ipa_hw and rmnet-ipa
for kernel 4.4 upgrade

Change-Id: I4f0855ed6f96e51716e82fb85896b1c8c86f6db4
Acked-by: Ashok Vuyyuru <avuyyuru@qti.qualcomm.com>
Signed-off-by: Mohammed Javid <mjavid@codeaurora.org>
2017-07-08 13:48:38 +05:30
Linux Build Service Account
1a20f4d483 Merge "ARM: dts: msm: Support for adv7533 1024x600P panel resolution on msm8996" 2017-07-07 17:45:49 -07:00
Linux Build Service Account
77908d9c93 Merge "Revert "ARM: dts: msm: align removed_region with SDM630 memmap"" 2017-07-07 08:32:00 -07:00
Rahul Sharma
b0b9bd61e9 ARM: dts: msm: rename mdss_mdp to sde_kms for msm8996
Rename mdss_mdp to sde_kms in the device tree to reflect the
new display DRM driver terminology for msm8996.

Change-Id: Ic615bae8b887cebb39ecc07677af92d0e0d5ff91
Signed-off-by: Rahul Sharma <sharah@codeaurora.org>
2017-07-07 03:08:25 -07:00
Linux Build Service Account
807ef98e3f Merge "ARM: dts: msm: Set FDE key size to 256bit for sdm660_64" 2017-07-06 23:41:19 -07:00
Charan Teja Reddy
8d519acd35 Revert "ARM: dts: msm: align removed_region with SDM630 memmap"
Update the carveout regions properly.
This reverts commit 0e6e2ace8c.

Change-Id: Ie93a718c4804d57975d1a2b531328e2fbe889b1f
Signed-off-by: Charan Teja Reddy <charante@codeaurora.org>
2017-07-06 23:13:44 -07:00
Blagovest Kolenichev
9aabfa0596 Merge android-4.4@8c91412 (v4.4.75) into msm-4.4
* refs/heads/tmp-8c91412:
  Linux 4.4.75
  nvme: apply DELAY_BEFORE_CHK_RDY quirk at probe time too
  nvme/quirk: Add a delay before checking for adapter readiness
  net: phy: fix marvell phy status reading
  net: phy: Initialize mdio clock at probe function
  usb: gadget: f_fs: avoid out of bounds access on comp_desc
  powerpc/slb: Force a full SLB flush when we insert for a bad EA
  mtd: spi-nor: fix spansion quad enable
  of: Add check to of_scan_flat_dt() before accessing initial_boot_params
  rxrpc: Fix several cases where a padded len isn't checked in ticket decode
  USB: usbip: fix nonconforming hub descriptor
  drm/amdgpu: adjust default display clock
  drm/amdgpu/atom: fix ps allocation size for EnableDispPowerGating
  drm/radeon: add a quirk for Toshiba Satellite L20-183
  drm/radeon: add a PX quirk for another K53TK variant
  iscsi-target: Reject immediate data underflow larger than SCSI transfer length
  target: Fix kref->refcount underflow in transport_cmd_finish_abort
  time: Fix clock->read(clock) race around clocksource changes
  Input: i8042 - add Fujitsu Lifebook AH544 to notimeout list
  powerpc/kprobes: Pause function_graph tracing during jprobes handling
  signal: Only reschedule timers on signals timers have sent
  HID: Add quirk for Dell PIXART OEM mouse
  CIFS: Improve readdir verbosity
  KVM: PPC: Book3S HV: Preserve userspace HTM state properly
  lib/cmdline.c: fix get_options() overflow while parsing ranges
  autofs: sanity check status reported with AUTOFS_DEV_IOCTL_FAIL
  fs/exec.c: account for argv/envp pointers
  UPSTREAM: drivers/perf: arm-pmu: fix RCU usage on pmu resume from low-power
  UPSTREAM: drivers/perf: arm_pmu: implement CPU_PM notifier
  ANDROID: squashfs: Fix endianness issue
  ANDROID: squashfs: Fix signed division issue

Change-Id: Iabe0921dd7b9a582f5237235338ef0f730de7edb
Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>
2017-07-06 15:42:19 -07:00
Linux Build Service Account
e868dcc8bb Merge "ARM: dts: msm: add MSM external display node to msm8996" 2017-07-06 04:38:59 -07:00
Linux Build Service Account
db94df44a7 Merge "ARM: dtsi: msm: reserve memory for LK's stack on msm8996" 2017-07-06 04:38:57 -07:00
Neeraj Soni
fc4bcd6968 ARM: dts: msm: Set FDE key size to 256bit for sdm660_64
Set FDE encryption key size to 256bit for sdm660_64
target.

Change-Id: Ib90068dc1a4a7c1caa1a65753c1b91827b1eb798
Signed-off-by: Neeraj Soni <neersoni@codeaurora.org>
2017-07-06 16:57:57 +05:30
Neeraj Upadhyay
5db7f2eae3 Revert "defconfig: arm64: msm: Enable virtual platform"
This reverts commit 2bb686dccd ("defconfig: arm64: msm: Enable
virtual platform"). The configs added in this change are not in
proper state and have build failures.

Change-Id: I30922e76761a1c436b54fb07f376ad9a5f5718f8
Signed-off-by: Neeraj Upadhyay <neeraju@codeaurora.org>
2017-07-06 14:44:51 +05:30
Linux Build Service Account
c4de2baacc Merge "defconfig: Enable and disable few configs for msm8998" 2017-07-05 10:28:39 -07:00
Greg Kroah-Hartman
64a73ff728 This is the 4.4.76 stable release
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAllc3f0ACgkQONu9yGCS
 aT4fmA/+OHeYbhpaMRKqrUpsxB3NpROr2Z47ow6vaVjYZzd0irrODLlfIfDQ6EEo
 N3v28povu16VeYXk+4h8bsAP2K2j6/BlRaSi2hB6dmnY8GDMaXEfRojPYAlzVz50
 qnK/6152siDDarUx1h5Zc8GcmX/tEl6h3bOOxDcwLR+RvyIcWxenuR+uqRM/AV6o
 BPEiOuMu7P6LjID7KYgBTFNajVBMLrDXt4SCWdzOZmlNt0QXgKB9yw68vTcc+edC
 ZcXqa0M6nEWSDvwobbwBZhFL8H2dJjzweyjeFBgxnxgmOrRh6kvZG2wsz2c8O3/P
 g8TuMxU7siu+I3lFwKy+dgZ/1REz+6Q3oFBqXsuddrcPYu23rV6mz/GxqWy4cerb
 M4eTWz6L9vA2GoYpvBaWi0tKC9tkNM49g48Y24a6CW1O4dJWlz3RrpTiZmequbNF
 mo8EKomSXn4kYAm1xT03DGljQkK/i2JtyI5sk2hLEqqxKvZ/3q9xxLLKOVx8dPvs
 PIbfpapfYMXXMWgR6e+UKueNLgevfWE12X/OU4SgvSY4n/07/mH40XEd3zd82IsZ
 1Mw0qj3JnqCAFDBBMsDYa+OvABaGD1dHARuiv+aeqW8tqoBglFHxWqF+SQVNXLIE
 qTLiKz78vjQpH0zGpkA3HEOh/h4L7a0y3qRMECsk5SUxXsgu1gg=
 =bwNU
 -----END PGP SIGNATURE-----

Merge 4.4.76 into android-4.4

Changes in 4.4.76
	ipv6: release dst on error in ip6_dst_lookup_tail
	net: don't call strlen on non-terminated string in dev_set_alias()
	decnet: dn_rtmsg: Improve input length sanitization in dnrmg_receive_user_skb
	net: Zero ifla_vf_info in rtnl_fill_vfinfo()
	af_unix: Add sockaddr length checks before accessing sa_family in bind and connect handlers
	Fix an intermittent pr_emerg warning about lo becoming free.
	net: caif: Fix a sleep-in-atomic bug in cfpkt_create_pfx
	igmp: acquire pmc lock for ip_mc_clear_src()
	igmp: add a missing spin_lock_init()
	ipv6: fix calling in6_ifa_hold incorrectly for dad work
	net/mlx5: Wait for FW readiness before initializing command interface
	decnet: always not take dst->__refcnt when inserting dst into hash table
	net: 8021q: Fix one possible panic caused by BUG_ON in free_netdev
	sfc: provide dummy definitions of vswitch functions
	ipv6: Do not leak throw route references
	rtnetlink: add IFLA_GROUP to ifla_policy
	netfilter: xt_TCPMSS: add more sanity tests on tcph->doff
	netfilter: synproxy: fix conntrackd interaction
	NFSv4: fix a reference leak caused WARNING messages
	drm/ast: Handle configuration without P2A bridge
	mm, swap_cgroup: reschedule when neeed in swap_cgroup_swapoff()
	MIPS: Avoid accidental raw backtrace
	MIPS: pm-cps: Drop manual cache-line alignment of ready_count
	MIPS: Fix IRQ tracing & lockdep when rescheduling
	ALSA: hda - Fix endless loop of codec configure
	ALSA: hda - set input_path bitmap to zero after moving it to new place
	drm/vmwgfx: Free hash table allocated by cmdbuf managed res mgr
	usb: gadget: f_fs: Fix possibe deadlock
	sysctl: enable strict writes
	block: fix module reference leak on put_disk() call for cgroups throttle
	mm: numa: avoid waiting on freed migrated pages
	KVM: x86: fix fixing of hypercalls
	scsi: sd: Fix wrong DPOFUA disable in sd_read_cache_type
	scsi: lpfc: Set elsiocb contexts to NULL after freeing it
	qla2xxx: Fix erroneous invalid handle message
	ARM: dts: BCM5301X: Correct GIC_PPI interrupt flags
	net: mvneta: Fix for_each_present_cpu usage
	MIPS: ath79: fix regression in PCI window initialization
	net: korina: Fix NAPI versus resources freeing
	MIPS: ralink: MT7688 pinmux fixes
	MIPS: ralink: fix USB frequency scaling
	MIPS: ralink: Fix invalid assignment of SoC type
	MIPS: ralink: fix MT7628 pinmux typos
	MIPS: ralink: fix MT7628 wled_an pinmux gpio
	mtd: bcm47xxpart: limit scanned flash area on BCM47XX (MIPS) only
	bgmac: fix a missing check for build_skb
	mtd: bcm47xxpart: don't fail because of bit-flips
	bgmac: Fix reversed test of build_skb() return value.
	net: bgmac: Fix SOF bit checking
	net: bgmac: Start transmit queue in bgmac_open
	net: bgmac: Remove superflous netif_carrier_on()
	powerpc/eeh: Enable IO path on permanent error
	gianfar: Do not reuse pages from emergency reserve
	Btrfs: fix truncate down when no_holes feature is enabled
	virtio_console: fix a crash in config_work_handler
	swiotlb-xen: update dev_addr after swapping pages
	xen-netfront: Fix Rx stall during network stress and OOM
	scsi: virtio_scsi: Reject commands when virtqueue is broken
	platform/x86: ideapad-laptop: handle ACPI event 1
	amd-xgbe: Check xgbe_init() return code
	net: dsa: Check return value of phy_connect_direct()
	drm/amdgpu: check ring being ready before using
	vfio/spapr: fail tce_iommu_attach_group() when iommu_data is null
	virtio_net: fix PAGE_SIZE > 64k
	vxlan: do not age static remote mac entries
	ibmveth: Add a proper check for the availability of the checksum features
	kernel/panic.c: add missing \n
	HID: i2c-hid: Add sleep between POWER ON and RESET
	scsi: lpfc: avoid double free of resource identifiers
	spi: davinci: use dma_mapping_error()
	mac80211: initialize SMPS field in HT capabilities
	x86/mpx: Use compatible types in comparison to fix sparse error
	coredump: Ensure proper size of sparse core files
	swiotlb: ensure that page-sized mappings are page-aligned
	s390/ctl_reg: make __ctl_load a full memory barrier
	be2net: fix status check in be_cmd_pmac_add()
	perf probe: Fix to show correct locations for events on modules
	net/mlx4_core: Eliminate warning messages for SRQ_LIMIT under SRIOV
	sctp: check af before verify address in sctp_addr_id2transport
	ravb: Fix use-after-free on `ifconfig eth0 down`
	jump label: fix passing kbuild_cflags when checking for asm goto support
	xfrm: fix stack access out of bounds with CONFIG_XFRM_SUB_POLICY
	xfrm: NULL dereference on allocation failure
	xfrm: Oops on error in pfkey_msg2xfrm_state()
	watchdog: bcm281xx: Fix use of uninitialized spinlock.
	sched/loadavg: Avoid loadavg spikes caused by delayed NO_HZ accounting
	ARM64/ACPI: Fix BAD_MADT_GICC_ENTRY() macro implementation
	ARM: 8685/1: ensure memblock-limit is pmd-aligned
	x86/mpx: Correctly report do_mpx_bt_fault() failures to user-space
	x86/mm: Fix flush_tlb_page() on Xen
	ocfs2: o2hb: revert hb threshold to keep compatible
	iommu/vt-d: Don't over-free page table directories
	iommu: Handle default domain attach failure
	iommu/amd: Fix incorrect error handling in amd_iommu_bind_pasid()
	cpufreq: s3c2416: double free on driver init error path
	KVM: x86: fix emulation of RSM and IRET instructions
	KVM: x86/vPMU: fix undefined shift in intel_pmu_refresh()
	KVM: x86: zero base3 of unusable segments
	KVM: nVMX: Fix exception injection
	Linux 4.4.76

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2017-07-05 16:16:58 +02:00
Wanpeng Li
be8c39b470 KVM: nVMX: Fix exception injection
commit d4912215d1031e4fb3d1038d2e1857218dba0d0a upstream.

 WARNING: CPU: 3 PID: 2840 at arch/x86/kvm/vmx.c:10966 nested_vmx_vmexit+0xdcd/0xde0 [kvm_intel]
 CPU: 3 PID: 2840 Comm: qemu-system-x86 Tainted: G           OE   4.12.0-rc3+ #23
 RIP: 0010:nested_vmx_vmexit+0xdcd/0xde0 [kvm_intel]
 Call Trace:
  ? kvm_check_async_pf_completion+0xef/0x120 [kvm]
  ? rcu_read_lock_sched_held+0x79/0x80
  vmx_queue_exception+0x104/0x160 [kvm_intel]
  ? vmx_queue_exception+0x104/0x160 [kvm_intel]
  kvm_arch_vcpu_ioctl_run+0x1171/0x1ce0 [kvm]
  ? kvm_arch_vcpu_load+0x47/0x240 [kvm]
  ? kvm_arch_vcpu_load+0x62/0x240 [kvm]
  kvm_vcpu_ioctl+0x384/0x7b0 [kvm]
  ? kvm_vcpu_ioctl+0x384/0x7b0 [kvm]
  ? __fget+0xf3/0x210
  do_vfs_ioctl+0xa4/0x700
  ? __fget+0x114/0x210
  SyS_ioctl+0x79/0x90
  do_syscall_64+0x81/0x220
  entry_SYSCALL64_slow_path+0x25/0x25

This is triggered occasionally by running both win7 and win2016 in L2, in
addition, EPT is disabled on both L1 and L2. It can't be reproduced easily.

Commit 0b6ac343fc (KVM: nVMX: Correct handling of exception injection) mentioned
that "KVM wants to inject page-faults which it got to the guest. This function
assumes it is called with the exit reason in vmcs02 being a #PF exception".
Commit e011c663 (KVM: nVMX: Check all exceptions for intercept during delivery to
L2) allows to check all exceptions for intercept during delivery to L2. However,
there is no guarantee the exit reason is exception currently, when there is an
external interrupt occurred on host, maybe a time interrupt for host which should
not be injected to guest, and somewhere queues an exception, then the function
nested_vmx_check_exception() will be called and the vmexit emulation codes will
try to emulate the "Acknowledge interrupt on exit" behavior, the warning is
triggered.

Reusing the exit reason from the L2->L0 vmexit is wrong in this case,
the reason must always be EXCEPTION_NMI when injecting an exception into
L1 as a nested vmexit.

Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Radim Krčmář <rkrcmar@redhat.com>
Signed-off-by: Wanpeng Li <wanpeng.li@hotmail.com>
Fixes: e011c663b9 ("KVM: nVMX: Check all exceptions for intercept during delivery to L2")
Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-07-05 14:37:23 +02:00