Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b97245ab authored by Blagovest Kolenichev's avatar Blagovest Kolenichev
Browse files

Merge android-4.14.110 (588c6299) into msm-4.14 



* refs/heads/tmp-588c6299:
  Linux 4.14.110
  vfio: ccw: only free cp on final interrupt
  Revert "USB: core: only clean up what we allocated"
  KVM: x86: Emulate MSR_IA32_ARCH_CAPABILITIES on AMD hosts
  KVM: Reject device ioctls from processes other than the VM's creator
  x86/smp: Enforce CONFIG_HOTPLUG_CPU when SMP=y
  cpu/hotplug: Prevent crash when CPU bringup fails on CONFIG_HOTPLUG_CPU=n
  perf intel-pt: Fix TSC slip
  mm/migrate.c: add missing flush_dcache_page for non-mapped page migrate
  usb: cdc-acm: fix race during wakeup blocking TX traffic
  xhci: Fix port resume done detection for SS ports with LPM enabled
  usb: host: xhci-rcar: Add XHCI_TRUST_TX_LENGTH quirk
  usb: common: Consider only available nodes for dr_mode
  USB: gadget: f_hid: fix deadlock in f_hidg_write()
  usb: mtu3: fix EXTCON dependency
  phy: sun4i-usb: Support set_mode to USB_HOST for non-OTG PHYs
  gpio: adnp: Fix testing wrong value in adnp_gpio_direction_input
  gpio: exar: add a check for the return value of ida_simple_get fails
  drm/vgem: fix use-after-free when drm_gem_handle_create() fails
  fs/proc/proc_sysctl.c: fix NULL pointer dereference in put_links
  Disable kgdboc failed by echo space to /sys/module/kgdboc/parameters/kgdboc
  USB: serial: option: add Olicard 600
  USB: serial: option: add support for Quectel EM12
  USB: serial: option: set driver_info for SIM5218 and compatibles
  USB: serial: mos7720: fix mos_parport refcount imbalance on error path
  USB: serial: ftdi_sio: add additional NovaTech products
  USB: serial: cp210x: add new device id
  serial: sh-sci: Fix setting SCSCR_TIE while transferring data
  serial: max310x: Fix to avoid potential NULL pointer dereference
  staging: vt6655: Fix interrupt race condition on device start up.
  staging: vt6655: Remove vif check from vnt_interrupt
  staging: comedi: ni_mio_common: Fix divide-by-zero for DIO cmdtest
  tty: atmel_serial: fix a potential NULL pointer dereference
  scsi: zfcp: fix scsi_eh host reset with port_forced ERP for non-NPIV FCP devices
  scsi: zfcp: fix rport unblock if deleted SCSI devices on Scsi_Host
  scsi: sd: Quiesce warning if device does not report optimal I/O size
  scsi: sd: Fix a race between closing an sd device and sd I/O
  ocfs2: fix inode bh swapping mixup in ocfs2_reflink_inodes_lock
  fs/open.c: allow opening only regular files during execve()
  kbuild: modversions: Fix relative CRC byte order interpretation
  ALSA: hda/realtek - Add support headset mode for New DELL WYSE NB
  ALSA: hda/realtek - Add support headset mode for DELL WYSE AIO
  ALSA: pcm: Don't suspend stream in unrecoverable PCM state
  ALSA: pcm: Fix possible OOB access in PCM oss plugins
  ALSA: seq: oss: Fix Spectre v1 vulnerability
  ALSA: rawmidi: Fix potential Spectre v1 vulnerability
  net: dsa: qca8k: remove leftover phy accessors
  NFSv4.1 don't free interrupted slot on open
  powerpc: bpf: Fix generation of load/store DW instructions
  ARM: imx6q: cpuidle: fix bug that CPU might not wake up at expected time
  btrfs: raid56: properly unmap parity page in finish_parity_scrub()
  btrfs: remove WARN_ON in log_dir_items
  Btrfs: fix incorrect file size after shrinking truncate and fsync
  powerpc/security: Fix spectre_v2 reporting
  powerpc/fsl: Fix the flush of branch predictor.
  powerpc/fsl: Fixed warning: orphan section `__btb_flush_fixup'
  powerpc/fsl: Update Spectre v2 reporting
  powerpc/fsl: Enable runtime patching if nospectre_v2 boot arg is used
  powerpc/fsl: Flush branch predictor when entering KVM
  powerpc/fsl: Flush the branch predictor at each kernel entry (32 bit)
  powerpc/fsl: Flush the branch predictor at each kernel entry (64bit)
  powerpc/fsl: Add nospectre_v2 command line argument
  powerpc/fsl: Emulate SPRN_BUCSR register
  powerpc/fsl: Fix spectre_v2 mitigations reporting
  powerpc/fsl: Add macro to flush the branch predictor
  powerpc/fsl: Add infrastructure to fixup branch predictor flush
  powerpc/powernv: Query firmware for count cache flush settings
  powerpc/pseries: Query hypervisor for count cache flush settings
  powerpc/64s: Add support for software count cache flush
  powerpc/64s: Add new security feature flags for count cache flush
  powerpc/asm: Add a patch_site macro & helpers for patching instructions
  powerpc/fsl: Sanitize the syscall table for NXP PowerPC 32 bit platforms
  powerpc/fsl: Add barrier_nospec implementation for NXP PowerPC Book3E
  powerpc/64: Make meltdown reporting Book3S 64 specific
  powerpc/64: Call setup_barrier_nospec() from setup_arch()
  powerpc/64: Add CONFIG_PPC_BARRIER_NOSPEC
  powerpc/64: Make stf barrier PPC_BOOK3S_64 specific.
  powerpc/64: Disable the speculation barrier from the command line
  powerpc64s: Show ori31 availability in spectre_v1 sysfs file not v2
  powerpc/64s: Enhance the information in cpu_show_spectre_v1()
  powerpc/64: Use barrier_nospec in syscall entry
  powerpc: Use barrier_nospec in copy_from_user()
  powerpc/64s: Enable barrier_nospec based on firmware settings
  powerpc/64s: Patch barrier_nospec in modules
  powerpc/64s: Add support for ori barrier_nospec patching
  tun: add a missing rcu_read_unlock() in error path
  tun: properly test for IFF_UP
  mac8390: Fix mmio access size probe
  net: aquantia: fix rx checksum offload for UDP/TCP over IPv6
  sctp: get sctphdr by offset in sctp_compute_cksum
  vxlan: Don't call gro_cells_destroy() before device is unregistered
  thunderx: eliminate extra calls to put_page() for pages held for recycling
  thunderx: enable page recycling for non-XDP case
  tcp: do not use ipv6 header for ipv4 flow
  rhashtable: Still do rehash when we get EEXIST
  packets: Always register packet sk in the same order
  net-sysfs: call dev_hold if kobject_init_and_add success
  net: stmmac: fix memory corruption with large MTUs
  net: rose: fix a possible stack overflow
  net/packet: Set __GFP_NOWARN upon allocation in alloc_pg_vec
  net: datagram: fix unbounded loop in __skb_try_recv_datagram()
  mISDN: hfcpci: Test both vendor & device ID for Digium HFC4S
  genetlink: Fix a memory leak on error path
  dccp: do not use ipv6 header for ipv4 flow
  stmmac: copy unicast mac address to MAC registers
  video: fbdev: Set pixclock = 0 in goldfishfb
  Bluetooth: Verify that l2cap_get_conf_opt provides large enough buffer
  Bluetooth: Check L2CAP option sizes returned from l2cap_get_conf_opt
  ANDROID: revert the rest of ANDROID_PARANOID_NETWORK
  UPSTREAM: virt_wifi: Remove REGULATORY_WIPHY_SELF_MANAGED

Change-Id: I70fd703c71d37e8d6055c39abcf5cf03c4c448ee
Signed-off-by: default avatarBlagovest Kolenichev <bkolenichev@codeaurora.org>
parents 313f4c9c 588c6299

Documentation/virtual/kvm/api.txt

+11 −5
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ of a virtual machine. The ioctls belong to three classes 


 - VM ioctls: These query and set attributes that affect an entire virtual

   machine, for example memory layout.  In addition a VM ioctl is used to

   create virtual cpus (vcpus).

   create virtual cpus (vcpus) and devices.



   Only run VM ioctls from the same process (address space) that was used

   to create the VM.
@@ -24,6 +24,11 @@ of a virtual machine. The ioctls belong to three classes 
   Only run vcpu ioctls from the same thread that was used to create the

   vcpu.



 - device ioctls: These query and set attributes that control the operation

   of a single device.



   device ioctls must be issued from the same process (address space) that

   was used to create the VM.



2. File descriptors

-------------------
@@ -32,10 +37,11 @@ The kvm API is centered around file descriptors. An initial 
open("/dev/kvm") obtains a handle to the kvm subsystem; this handle

can be used to issue system ioctls.  A KVM_CREATE_VM ioctl on this

handle will create a VM file descriptor which can be used to issue VM

ioctls.  A KVM_CREATE_VCPU ioctl on a VM fd will create a virtual cpu

and return a file descriptor pointing to it.  Finally, ioctls on a vcpu

fd can be used to control the vcpu, including the important task of

actually running guest code.

ioctls.  A KVM_CREATE_VCPU or KVM_CREATE_DEVICE ioctl on a VM fd will

create a virtual cpu or device and return a file descriptor pointing to

the new resource.  Finally, ioctls on a vcpu or device fd can be used

to control the vcpu or device.  For vcpus, this includes the important

task of actually running guest code.



In general file descriptors can be migrated among processes by means

of fork() and the SCM_RIGHTS facility of unix domain socket.  These

Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 109

SUBLEVEL = 110

EXTRAVERSION =

NAME = Petit Gorille

arch/arm/configs/vendor/qcs405-perf_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -78,7 +78,6 @@ CONFIG_IPV6_ROUTE_INFO=y 
# CONFIG_IPV6_SIT is not set

CONFIG_IPV6_MULTIPLE_TABLES=y

CONFIG_IPV6_SUBTREES=y

# CONFIG_ANDROID_PARANOID_NETWORK is not set

CONFIG_NETFILTER=y

CONFIG_NETFILTER_NETLINK_QUEUE=y

CONFIG_NETFILTER_NETLINK_LOG=y

arch/arm/mach-imx/cpuidle-imx6q.c

+10 −17
Original line number Diff line number Diff line
@@ -16,30 +16,23 @@ 
#include "cpuidle.h"

#include "hardware.h"



static atomic_t master = ATOMIC_INIT(0);

static DEFINE_SPINLOCK(master_lock);

static int num_idle_cpus = 0;

static DEFINE_SPINLOCK(cpuidle_lock);



static int imx6q_enter_wait(struct cpuidle_device *dev,

			    struct cpuidle_driver *drv, int index)

{

	if (atomic_inc_return(&master) == num_online_cpus()) {

		/*

		 * With this lock, we prevent other cpu to exit and enter

		 * this function again and become the master.

		 */

		if (!spin_trylock(&master_lock))

			goto idle;

	spin_lock(&cpuidle_lock);

	if (++num_idle_cpus == num_online_cpus())

		imx6_set_lpm(WAIT_UNCLOCKED);

		cpu_do_idle();

		imx6_set_lpm(WAIT_CLOCKED);

		spin_unlock(&master_lock);

		goto done;

	}

	spin_unlock(&cpuidle_lock);



idle:

	cpu_do_idle();

done:

	atomic_dec(&master);



	spin_lock(&cpuidle_lock);

	if (num_idle_cpus-- == num_online_cpus())

		imx6_set_lpm(WAIT_CLOCKED);

	spin_unlock(&cpuidle_lock);



	return index;

}

arch/powerpc/Kconfig

+6 −1
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ config PPC 
	select GENERIC_CLOCKEVENTS_BROADCAST	if SMP

	select GENERIC_CMOS_UPDATE

	select GENERIC_CPU_AUTOPROBE

	select GENERIC_CPU_VULNERABILITIES	if PPC_BOOK3S_64

	select GENERIC_CPU_VULNERABILITIES	if PPC_BARRIER_NOSPEC

	select GENERIC_IRQ_SHOW

	select GENERIC_IRQ_SHOW_LEVEL

	select GENERIC_SMP_IDLE_THREAD
@@ -236,6 +236,11 @@ config PPC 
	# Please keep this list sorted alphabetically.

	#



config PPC_BARRIER_NOSPEC

    bool

    default y

    depends on PPC_BOOK3S_64 || PPC_FSL_BOOK3E



config GENERIC_CSUM

	def_bool n