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

Commit 42e38008 authored by Ivaylo Georgiev's avatar Ivaylo Georgiev
Browse files

Merge android-4.19.33 (0b065cd5) into msm-4.19 



* refs/heads/tmp-0b065cd5:
  Linux 4.19.33
  platform: x86: intel_cht_int33fe: Remove the old connections for the muxes
  usb: typec: class: Don't use port parent for getting mux handles
  platform: x86: intel_cht_int33fe: Add connections for the USB Type-C port
  platform: x86: intel_cht_int33fe: Add connection for the DP alt mode
  platform: x86: intel_cht_int33fe: Register all connections at once
  drivers: base: Helpers for adding device connection descriptions
  bpf: do not restore dst_reg when cur_state is freed
  staging: erofs: keep corrupted fs from crashing kernel in erofs_readdir()
  staging: erofs: fix error handling when failed to read compresssed data
  KVM: x86: Emulate MSR_IA32_ARCH_CAPABILITIES on AMD hosts
  KVM: x86: update %rip after emulating IO
  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
  watchdog: Respect watchdog cpumask on CPU hotplug
  powerpc/64: Fix memcmp reading past the end of src/dest
  powerpc/pseries/energy: Use OF accessor functions to read ibm,drc-indexes
  objtool: Query pkg-config for libelf location
  perf intel-pt: Fix TSC slip
  perf pmu: Fix parser error for uncore event alias
  mm/migrate.c: add missing flush_dcache_page for non-mapped page migrate
  mm: mempolicy: make mbind() return -EIO when MPOL_MF_STRICT is specified
  iommu/io-pgtable-arm-v7s: request DMA32 memory, and improve debugging
  mm: add support for kmem caches in DMA32 zone
  usb: cdc-acm: fix race during wakeup blocking TX traffic
  xhci: Don't let USB3 ports stuck in polling state prevent suspend
  usb: xhci: dbc: Don't free all memory with spinlock held
  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/i915/gvt: Fix MI_FLUSH_DW parsing with correct index check
  drm/vkms: fix use-after-free when drm_gem_handle_create() 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: mvebu-uart: Fix to avoid a potential NULL pointer dereference
  serial: max310x: Fix to avoid potential NULL pointer dereference
  staging: erofs: fix to handle error path of erofs_vmap()
  staging: vt6655: Fix interrupt race condition on device start up.
  staging: vt6655: Remove vif check from vnt_interrupt
  staging: speakup_soft: Fix alternate speech with other synths
  staging: comedi: ni_mio_common: Fix divide-by-zero for DIO cmdtest
  tty: serial: qcom_geni_serial: Initialize baud in qcom_geni_console_setup
  tty: atmel_serial: fix a potential NULL pointer dereference
  tty: mxs-auart: fix a potential NULL pointer dereference
  drm/rockchip: vop: reset scale mode when win is disabled
  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 - Fix speakers on Acer Predator Helios 500 Ryzen laptops
  ALSA: hda/realtek: Enable headset MIC of ASUS X430UN and X512DK with ALC256
  ALSA: hda/realtek: Enable headset mic of ASUS P5440FF with ALC256
  ALSA: hda/realtek: Enable ASUS X441MB and X705FD headset MIC with ALC256
  ALSA: hda/realtek - Add support for Acer Aspire E5-523G/ES1-432 headset mic
  ALSA: hda/realtek: Enable headset MIC of Acer Aspire Z24-890 with ALC286
  ALSA: hda/realtek: Enable headset MIC of Acer AIO with ALC286
  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
  NFS: fix mount/umount race in nlmclnt.
  vfio: ccw: only free cp on final interrupt
  powerpc: bpf: Fix generation of load/store DW instructions
  ARM: imx6q: cpuidle: fix bug that CPU might not wake up at expected time
  Btrfs: fix assertion failure on fsync with NO_HOLES enabled
  btrfs: Avoid possible qgroup_rsv_size overflow in btrfs_calculate_inode_block_rsv_size
  btrfs: raid56: properly unmap parity page in finish_parity_scrub()
  btrfs: don't report readahead errors and don't update statistics
  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: Add macro to flush the branch predictor
  powerpc/fsl: Add infrastructure to fixup branch predictor flush
  tun: add a missing rcu_read_unlock() in error path
  thunderx: eliminate extra calls to put_page() for pages held for recycling
  thunderx: enable page recycling for non-XDP case
  net: sched: fix cleanup NULL pointer exception in act_mirr
  ila: Fix rhashtable walker list corruption
  vxlan: Don't call gro_cells_destroy() before device is unregistered
  vrf: prevent adding upper devices
  tun: properly test for IFF_UP
  tipc: fix cancellation of topology subscriptions
  tipc: change to check tipc_own_id to return in tipc_net_stop
  tipc: allow service ranges to be connect()'ed on RDM/DGRAM
  tcp: do not use ipv6 header for ipv4 flow
  sctp: use memdup_user instead of vmemdup_user
  sctp: get sctphdr by offset in sctp_compute_cksum
  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: phy: meson-gxl: fix interrupt support
  net/packet: Set __GFP_NOWARN upon allocation in alloc_pg_vec
  net: datagram: fix unbounded loop in __skb_try_recv_datagram()
  net: aquantia: fix rx checksum offload for UDP/TCP over IPv6
  mISDN: hfcpci: Test both vendor & device ID for Digium HFC4S
  mac8390: Fix mmio access size probe
  ipv6: make ip6_create_rt_rcu return ip6_null_entry instead of NULL
  gtp: change NET_UDP_TUNNEL dependency to select
  genetlink: Fix a memory leak on error path
  dccp: do not use ipv6 header for ipv4 flow
  ipmi_si: Fix crash when using hard-coded device
  Bluetooth: Verify that l2cap_get_conf_opt provides large enough buffer
  Bluetooth: Check L2CAP option sizes returned from l2cap_get_conf_opt
  UPSTREAM: virt_wifi: Remove REGULATORY_WIPHY_SELF_MANAGED

Change-Id: I681a654a3079e9b243bdc46d1e11d5abd6e9d774
Signed-off-by: default avatarIvaylo Georgiev <irgeorgiev@codeaurora.org>
parents 4925b056 0b065cd5

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

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

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 32

SUBLEVEL = 33

EXTRAVERSION =

NAME = "People's Front"
@@ -999,9 +999,11 @@ mod_sign_cmd = true 
endif

export mod_sign_cmd



HOST_LIBELF_LIBS = $(shell pkg-config libelf --libs 2>/dev/null || echo -lelf)



ifdef CONFIG_STACK_VALIDATION

  has_libelf := $(call try-run,\

		echo "int main() {}" | $(HOSTCC) -xc -o /dev/null -lelf -,1,0)

		echo "int main() {}" | $(HOSTCC) -xc -o /dev/null $(HOST_LIBELF_LIBS) -,1,0)

  ifeq ($(has_libelf),1)

    objtool_target := tools/objtool FORCE

  else

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/include/asm/feature-fixups.h

+12 −0
Original line number Diff line number Diff line
@@ -221,6 +221,17 @@ label##3: \ 
	FTR_ENTRY_OFFSET 953b-954b;			\

	.popsection;



#define START_BTB_FLUSH_SECTION			\

955:							\



#define END_BTB_FLUSH_SECTION			\

956:							\

	.pushsection __btb_flush_fixup,"a";	\

	.align 2;							\

957:						\

	FTR_ENTRY_OFFSET 955b-957b;			\

	FTR_ENTRY_OFFSET 956b-957b;			\

	.popsection;



#ifndef __ASSEMBLY__

#include <linux/types.h>
@@ -230,6 +241,7 @@ extern long __start___stf_entry_barrier_fixup, __stop___stf_entry_barrier_fixup; 
extern long __start___stf_exit_barrier_fixup, __stop___stf_exit_barrier_fixup;

extern long __start___rfi_flush_fixup, __stop___rfi_flush_fixup;

extern long __start___barrier_nospec_fixup, __stop___barrier_nospec_fixup;

extern long __start__btb_flush_fixup, __stop__btb_flush_fixup;



void apply_feature_fixups(void);

void setup_feature_keys(void);

arch/powerpc/include/asm/ppc-opcode.h

+2 −0
Original line number Diff line number Diff line
@@ -300,6 +300,7 @@ 
/* Misc instructions for BPF compiler */

#define PPC_INST_LBZ			0x88000000

#define PPC_INST_LD			0xe8000000

#define PPC_INST_LDX			0x7c00002a

#define PPC_INST_LHZ			0xa0000000

#define PPC_INST_LWZ			0x80000000

#define PPC_INST_LHBRX			0x7c00062c
@@ -307,6 +308,7 @@ 
#define PPC_INST_STB			0x98000000

#define PPC_INST_STH			0xb0000000

#define PPC_INST_STD			0xf8000000

#define PPC_INST_STDX			0x7c00012a

#define PPC_INST_STDU			0xf8000001

#define PPC_INST_STW			0x90000000

#define PPC_INST_STWU			0x94000000