Commit 578db483 authored Sep 08, 2019 by Ivaylo Georgiev

Merge android-4.19-q.70 (544e5516) into msm-4.19



* refs/heads/tmp-544e5516:
  Linux 4.19.70
  Revert "ASoC: Fail card instantiation if DAI format setup fails"
  mt76: mt76x0u: do not reset radio on resume
  x86/ptrace: fix up botched merge of spectrev1 fix
  i2c: piix4: Fix port selection for AMD Family 16h Model 30h
  NFS: Ensure O_DIRECT reports an error if the bytes read/written is 0
  NFS: Pass error information to the pgio error cleanup routine
  NFSv4/pnfs: Fix a page lock leak in nfs_pageio_resend()
  NFS: Clean up list moves of struct nfs_page
  KVM: arm/arm64: vgic-v2: Handle SGI bits in GICD_I{S,C}PENDR0 as WI
  KVM: arm/arm64: vgic: Fix potential deadlock when ap_list is long
  KVM: PPC: Book3S: Fix incorrect guest-to-user-translation error handling
  mac80211: Correctly set noencrypt for PAE frames
  mac80211: Don't memset RXCB prior to PAE intercept
  mac80211: fix possible sta leak
  Revert "cfg80211: fix processing world regdomain when non modular"
  crypto: ccp - Ignore unconfigured CCP device on suspend/resume
  VMCI: Release resource if the work is already queued
  bus: hisi_lpc: Add .remove method to avoid driver unbind crash
  bus: hisi_lpc: Unregister logical PIO range to avoid potential use-after-free
  drm/i915: Call dma_set_max_seg_size() in i915_driver_hw_probe()
  drm/i915: Don't deballoon unused ggtt drm_mm_node in linux guest
  drm/amdgpu: Add APTX quirk for Dell Latitude 5495
  lib: logic_pio: Add logic_pio_unregister_range()
  lib: logic_pio: Avoid possible overlap for unregistering regions
  lib: logic_pio: Fix RCU usage
  fsi: scom: Don't abort operations for minor errors
  typec: tcpm: fix a typo in the comparison of pdo_max_voltage
  intel_th: pci: Add Tiger Lake support
  intel_th: pci: Add support for another Lewisburg PCH
  stm class: Fix a double free of stm_source_device
  mmc: core: Fix init of SD cards reporting an invalid VDD range
  mmc: sdhci-of-at91: add quirk for broken HS200
  mei: me: add Tiger Lake point LP device ID
  USB: storage: ums-realtek: Whitelist auto-delink support
  USB: storage: ums-realtek: Update module parameter description for auto_delink_en
  usb: host: xhci: rcar: Fix typo in compatible string matching
  usb: host: ohci: fix a race condition between shutdown and irq
  usb: chipidea: udc: don't do hardware access if gadget has stopped
  usb: hcd: use managed device resources
  USB: cdc-wdm: fix race between write and disconnect due to flag abuse
  usb-storage: Add new JMS567 revision to unusual_devs
  ftrace: Check for empty hash and comment the race with registering probes
  ftrace: Check for successful allocation of hash
  ftrace: Fix NULL pointer dereference in t_probe_next()
  x86/apic: Include the LDR when clearing out APIC registers
  x86/apic: Do not initialize LDR and DFR for bigsmp
  uprobes/x86: Fix detection of 32-bit user mode
  KVM: x86: Don't update RIP or do single-step on faulting emulation
  kvm: x86: skip populating logical dest map if apic is not sw enabled
  ALSA: usb-audio: Add implicit fb quirk for Behringer UFX1604
  ALSA: usb-audio: Fix invalid NULL check in snd_emuusb_set_samplerate()
  ALSA: seq: Fix potential concurrent access to the deleted pool
  ALSA: hda - Fixes inverted Conexant GPIO mic mute led
  ALSA: line6: Fix memory leak at line6_init_pcm() error path
  ALSA: usb-audio: Check mixer unit bitmap yet more strictly
  mm/zsmalloc.c: fix build when CONFIG_COMPACTION=n
  ipv4/icmp: fix rt dst dev null pointer dereference
  tcp: make sure EPOLLOUT wont be missed
  net/smc: make sure EPOLLOUT is raised
  ipv6: Default fib6_type to RTN_UNICAST when not set
  ipv6/addrconf: allow adding multicast addr if IFA_F_MCAUTOJOIN is set
  net: tls, fix sk_write_space NULL write when tx disabled
  net/tls: swap sk_write_space on close
  net/tls: Fixed return value when tls_complete_pending_work() fails
  drm/tilcdc: Register cpufreq notifier after we have initialized crtc
  scsi: ufs: Fix RX_TERMINATION_FORCE_ENABLE define value
  drm/bridge: tfp410: fix memleak in get_modes()
  watchdog: bcm2835_wdt: Fix module autoload
  drm/i915: fix broadwell EU computation
  tools: hv: fix KVP and VSS daemons exit code
  tools: hv: fixed Python pep8/flake8 warnings for lsvmbus
  usb: host: fotg2: restart hcd after port reset
  drm/ast: Fixed reboot test may cause system hanged
  i2c: emev2: avoid race when unregistering slave client
  i2c: rcar: avoid race when unregistering slave client
  arm64: cpufeature: Don't treat granule sizes as strict
  xen/blkback: fix memory leaks
  usb: gadget: mass_storage: Fix races between fsg_disable and fsg_set_alt
  usb: gadget: composite: Clear "suspended" on reset/disconnect
  iommu/dma: Handle SG length overflow better
  omap-dma/omap_vout_vrfb: fix off-by-one fi value
  dmaengine: stm32-mdma: Fix a possible null-pointer dereference in stm32_mdma_irq_handler()
  auxdisplay: panel: need to delete scan_timer when misc_register fails in panel_attach
  soundwire: cadence_master: fix definitions for INTSTAT0/1
  soundwire: cadence_master: fix register definition for SLAVE_STATE
  nvme-pci: Fix async probe remove race
  nvme: fix a possible deadlock when passthru commands sent to a multipath device
  nvmet-loop: Flush nvme_delete_wq when removing the port
  afs: Only update d_fsdata if different in afs_d_revalidate()
  fs: afs: Fix a possible null-pointer dereference in afs_put_read()
  afs: Fix loop index mixup in afs_deliver_vl_get_entry_by_name_u()
  afs: Fix the CB.ProbeUuid service handler to reply correctly
  nvme-multipath: revalidate nvme_ns_head gendisk in nvme_validate_ns
  dmaengine: ste_dma40: fix unneeded variable warning

Conflicts:
	drivers/usb/gadget/function/f_mass_storage.c

Change-Id: Iddd9fca6e8bf846e41dab672c24fdf8b2fbf2ec4
Signed-off-by: Ivaylo Georgiev <irgeorgiev@codeaurora.org>

parents 773b595b 544e5516

Makefile

+1 −1

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: GPL-2.0
		VERSION = 4
		PATCHLEVEL = 19
		SUBLEVEL = 69
		SUBLEVEL = 70
		EXTRAVERSION =
		NAME = "People's Front"

arch/arm64/kernel/cpufeature.c

+11 −3

Original line number	Diff line number	Diff line
		@@ -170,9 +170,17 @@ static const struct arm64_ftr_bits ftr_id_aa64pfr1[] = {
		};

		static const struct arm64_ftr_bits ftr_id_aa64mmfr0[] = {
		S_ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64MMFR0_TGRAN4_SHIFT, 4, ID_AA64MMFR0_TGRAN4_NI),
		S_ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64MMFR0_TGRAN64_SHIFT, 4, ID_AA64MMFR0_TGRAN64_NI),
		ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64MMFR0_TGRAN16_SHIFT, 4, ID_AA64MMFR0_TGRAN16_NI),
		/*
		* We already refuse to boot CPUs that don't support our configured
		* page size, so we can only detect mismatches for a page size other
		* than the one we're currently using. Unfortunately, SoCs like this
		* exist in the wild so, even though we don't like it, we'll have to go
		* along with it and treat them as non-strict.
		*/
		S_ARM64_FTR_BITS(FTR_HIDDEN, FTR_NONSTRICT, FTR_LOWER_SAFE, ID_AA64MMFR0_TGRAN4_SHIFT, 4, ID_AA64MMFR0_TGRAN4_NI),
		S_ARM64_FTR_BITS(FTR_HIDDEN, FTR_NONSTRICT, FTR_LOWER_SAFE, ID_AA64MMFR0_TGRAN64_SHIFT, 4, ID_AA64MMFR0_TGRAN64_NI),
		ARM64_FTR_BITS(FTR_HIDDEN, FTR_NONSTRICT, FTR_LOWER_SAFE, ID_AA64MMFR0_TGRAN16_SHIFT, 4, ID_AA64MMFR0_TGRAN16_NI),

		ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64MMFR0_BIGENDEL0_SHIFT, 4, 0),
		/* Linux shouldn't care about secure memory */
		ARM64_FTR_BITS(FTR_HIDDEN, FTR_NONSTRICT, FTR_LOWER_SAFE, ID_AA64MMFR0_SNSMEM_SHIFT, 4, 0),

arch/powerpc/kvm/book3s_64_vio.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -602,8 +602,10 @@ long kvmppc_h_put_tce_indirect(struct kvm_vcpu *vcpu,

		if (kvmppc_gpa_to_ua(vcpu->kvm,
		tce & ~(TCE_PCI_READ \| TCE_PCI_WRITE),
		&ua, NULL))
		return H_PARAMETER;
		&ua, NULL)) {
		ret = H_PARAMETER;
		goto unlock_exit;
		}

		list_for_each_entry_lockless(stit, &stt->iommu_tables, next) {
		ret = kvmppc_tce_iommu_map(vcpu->kvm, stt,

arch/powerpc/kvm/book3s_64_vio_hv.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -528,8 +528,10 @@ long kvmppc_rm_h_put_tce_indirect(struct kvm_vcpu *vcpu,
		ua = 0;
		if (kvmppc_gpa_to_ua(vcpu->kvm,
		tce & ~(TCE_PCI_READ \| TCE_PCI_WRITE),
		&ua, NULL))
		return H_PARAMETER;
		&ua, NULL)) {
		ret = H_PARAMETER;
		goto unlock_exit;
		}

		list_for_each_entry_lockless(stit, &stt->iommu_tables, next) {
		ret = kvmppc_rm_tce_iommu_map(vcpu->kvm, stt,

arch/x86/kernel/apic/apic.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -1140,6 +1140,10 @@ void clear_local_APIC(void)
		apic_write(APIC_LVT0, v \| APIC_LVT_MASKED);
		v = apic_read(APIC_LVT1);
		apic_write(APIC_LVT1, v \| APIC_LVT_MASKED);
		if (!x2apic_enabled()) {
		v = apic_read(APIC_LDR) & ~APIC_LDR_MASK;
		apic_write(APIC_LDR, v);
		}
		if (maxlvt >= 4) {
		v = apic_read(APIC_LVTPC);
		apic_write(APIC_LVTPC, v \| APIC_LVT_MASKED);