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

Commit 5643b9b5 authored by Ivaylo Georgiev's avatar Ivaylo Georgiev
Browse files

Merge android-4.19.19 (18ba00a3) into msm-4.19



* refs/heads/tmp-18ba00a3:
  Revert "scsi: ufs: Use explicit access size in ufshcd_dump_regs"
  Linux 4.19.19
  Input: input_event - fix the CONFIG_SPARC64 mixup
  ide: fix a typo in the settings proc file name
  usb: dwc3: gadget: Clear req->needs_extra_trb flag on cleanup
  Revert "mm, memory_hotplug: initialize struct pages for the full memory section"
  nvmet-rdma: fix null dereference under heavy load
  nvmet-rdma: Add unlikely for response allocated check
  s390/smp: Fix calling smp_call_ipl_cpu() from ipl CPU
  bpf: fix inner map masking to prevent oob under speculation
  bpf: fix sanitation of alu op with pointer / scalar type from different paths
  bpf: prevent out of bounds speculation on pointer arithmetic
  bpf: fix check_map_access smin_value test when pointer contains offset
  bpf: restrict unknown scalars of mixed signed bounds for unprivileged
  bpf: restrict stack pointer arithmetic for unprivileged
  bpf: restrict map value pointer arithmetic for unprivileged
  bpf: enable access to ax register also from verifier rewrite
  bpf: move tmp variable into ax register in interpreter
  bpf: move {prev_,}insn_idx into verifier env
  bpf: add per-insn complexity limit
  bpf: improve verifier branch analysis
  drm/meson: Fix atomic mode switching regression
  vt: invoke notifier on screen size change
  vt: always call notifier with the console lock held
  vt: make vt_console_print() compatible with the unicode screen buffer
  can: flexcan: fix NULL pointer exception during bringup
  can: bcm: check timer values before ktime conversion
  can: dev: __can_get_echo_skb(): fix bogous check for non-existing skb by removing it
  irqchip/gic-v3-its: Align PCI Multi-MSI allocation on their size
  net: sun: cassini: Cleanup license conflict
  posix-cpu-timers: Unbreak timer rearming
  x86/entry/64/compat: Fix stack switching for XEN PV
  x86/kaslr: Fix incorrect i8254 outb() parameters
  x86/selftests/pkeys: Fork() to check for state being preserved
  x86/pkeys: Properly copy pkey state at fork()
  KVM/nVMX: Do not validate that posted_intr_desc_addr is page aligned
  kvm: x86/vmx: Use kzalloc for cached_vmcs12
  KVM: x86: WARN_ONCE if sending a PV IPI returns a fatal error
  KVM: x86: Fix PV IPIs for 32-bit KVM host
  KVM: x86: Fix single-step debugging
  drm/amdgpu: Add APTX quirk for Lenovo laptop
  dm crypt: fix parsing of extended IV arguments
  dm thin: fix passdown_double_checking_shared_status()
  scsi: ufs: Use explicit access size in ufshcd_dump_regs
  acpi/nfit: Fix command-supported detection
  acpi/nfit: Block function zero DSMs
  Input: uinput - fix undefined behavior in uinput_validate_absinfo()
  Input: input_event - provide override for sparc64
  Input: xpad - add support for SteelSeries Stratus Duo
  smb3: add credits we receive from oplock/break PDUs
  CIFS: Do not reconnect TCP session in add_credits()
  CIFS: Fix credit calculation for encrypted reads with errors
  CIFS: Fix credits calculations for reads with errors
  CIFS: Fix possible hang during async MTU reads and writes
  vgacon: unconfuse vc_origin when using soft scrollback
  Drivers: hv: vmbus: Check for ring when getting debug info
  hv_balloon: avoid touching uninitialized struct page during tail onlining
  tty/n_hdlc: fix __might_sleep warning
  uart: Fix crash in uart_write and uart_put_char
  tty: Handle problem if line discipline does not have receive_buf
  staging: rtl8188eu: Add device code for D-Link DWA-121 rev B1
  mmc: meson-gx: Free irq in release() callback
  mmc: dw_mmc-bluefield: : Fix the license information
  char/mwave: fix potential Spectre v1 vulnerability
  misc: ibmvsm: Fix potential NULL pointer dereference
  s390/smp: fix CPU hotplug deadlock with CPU rescan
  s390/early: improve machine detection
  s390/mm: always force a load of the primary ASCE on context switch
  ARC: perf: map generic branches to correct hardware condition
  ARC: adjust memblock_reserve of kernel memory
  ARCv2: lib: memeset: fix doing prefetchw outside of buffer
  ALSA: hda - Add mute LED support for HP ProBook 470 G5
  ALSA: hda/realtek - Fix typo for ALC225 model
  inotify: Fix fd refcount leak in inotify_add_watch().
  clk: socfpga: stratix10: fix naming convention for the fixed-clocks
  clk: socfpga: stratix10: fix rate calculation for pll clocks
  ASoC: tlv320aic32x4: Kernel OOPS while entering DAPM standby mode
  ASoC: rt5514-spi: Fix potential NULL pointer dereference
  ASoC: atom: fix a missing check of snd_pcm_lib_malloc_pages
  ceph: clear inode pointer when snap realm gets dropped by its inode
  USB: serial: pl2303: add new PID to support PL2303TB
  USB: serial: simple: add Motorola Tetra TPG2200 device id
  USB: leds: fix regression in usbport led trigger
  mei: me: add denverton innovation engine device IDs
  mei: me: mark LBG devices as having dma support
  tcp: allow MSG_ZEROCOPY transmission also in CLOSE_WAIT state
  ip6_gre: update version related info when changing link
  net: phy: marvell: Fix deadlock from wrong locking
  erspan: build the header with the right proto according to erspan_ver
  ip6_gre: fix tunnel list corruption for x-netns
  udp: with udp_segment release on error path
  net/sched: cls_flower: allocate mask dynamically in fl_change()
  mlxsw: pci: Ring CQ's doorbell before RDQ's
  mlxsw: spectrum_fid: Update dummy FID index
  net: ipv4: Fix memory leak in network namespace dismantle
  mlxsw: pci: Increase PCI SW reset timeout
  vhost: log dirty page correctly
  openvswitch: Avoid OOB read when parsing flow nlattrs
  net_sched: refetch skb protocol for each filter
  net/sched: act_tunnel_key: fix memory leak in case of action replace
  net: phy: mdio_bus: add missing device_del() in mdiobus_register() error handling
  net: phy: marvell: Errata for mv88e6390 internal PHYs
  net: Fix usage of pskb_trim_rcsum
  net: bridge: Fix ethernet header pointer before check skb forwardable
  amd-xgbe: Fix mdio access for non-zero ports and clause 45 PHYs
  FROMGIT: PM / EM: Expose the Energy Model in debugfs

Change-Id: I2cd5399c3dedc227e2131f689b4905e9d454b190
Signed-off-by: default avatarIvaylo Georgiev <irgeorgiev@codeaurora.org>
parents 45991f3d ec487912
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
# SPDX-License-Identifier: GPL-2.0
VERSION = 4
PATCHLEVEL = 19
SUBLEVEL = 18
SUBLEVEL = 19
EXTRAVERSION =
NAME = "People's Front"

+2 −1
Original line number Diff line number Diff line
@@ -103,7 +103,8 @@ static const char * const arc_pmu_ev_hw_map[] = {

	/* counts condition */
	[PERF_COUNT_HW_INSTRUCTIONS] = "iall",
	[PERF_COUNT_HW_BRANCH_INSTRUCTIONS] = "ijmp", /* Excludes ZOL jumps */
	/* All jump instructions that are taken */
	[PERF_COUNT_HW_BRANCH_INSTRUCTIONS] = "ijmptak",
	[PERF_COUNT_ARC_BPOK]         = "bpok",	  /* NP-NT, PT-T, PNT-NT */
#ifdef CONFIG_ISA_ARCV2
	[PERF_COUNT_HW_BRANCH_MISSES] = "bpmp",
+32 −8
Original line number Diff line number Diff line
@@ -7,11 +7,39 @@
 */

#include <linux/linkage.h>
#include <asm/cache.h>

#undef PREALLOC_NOT_AVAIL
/*
 * The memset implementation below is optimized to use prefetchw and prealloc
 * instruction in case of CPU with 64B L1 data cache line (L1_CACHE_SHIFT == 6)
 * If you want to implement optimized memset for other possible L1 data cache
 * line lengths (32B and 128B) you should rewrite code carefully checking
 * we don't call any prefetchw/prealloc instruction for L1 cache lines which
 * don't belongs to memset area.
 */

#if L1_CACHE_SHIFT == 6

.macro PREALLOC_INSTR	reg, off
	prealloc	[\reg, \off]
.endm

.macro PREFETCHW_INSTR	reg, off
	prefetchw	[\reg, \off]
.endm

#else

.macro PREALLOC_INSTR
.endm

.macro PREFETCHW_INSTR
.endm

#endif

ENTRY_CFI(memset)
	prefetchw [r0]		; Prefetch the write location
	PREFETCHW_INSTR	r0, 0	; Prefetch the first write location
	mov.f	0, r2
;;; if size is zero
	jz.d	[blink]
@@ -48,11 +76,8 @@ ENTRY_CFI(memset)

	lpnz	@.Lset64bytes
	;; LOOP START
#ifdef PREALLOC_NOT_AVAIL
	prefetchw [r3, 64]	;Prefetch the next write location
#else
	prealloc  [r3, 64]
#endif
	PREALLOC_INSTR	r3, 64	; alloc next line w/o fetching

#ifdef CONFIG_ARC_HAS_LL64
	std.ab	r4, [r3, 8]
	std.ab	r4, [r3, 8]
@@ -85,7 +110,6 @@ ENTRY_CFI(memset)
	lsr.f	lp_count, r2, 5 ;Last remaining  max 124 bytes
	lpnz	.Lset32bytes
	;; LOOP START
	prefetchw   [r3, 32]	;Prefetch the next write location
#ifdef CONFIG_ARC_HAS_LL64
	std.ab	r4, [r3, 8]
	std.ab	r4, [r3, 8]
+2 −1
Original line number Diff line number Diff line
@@ -138,7 +138,8 @@ void __init setup_arch_memory(void)
	 */

	memblock_add_node(low_mem_start, low_mem_sz, 0);
	memblock_reserve(low_mem_start, __pa(_end) - low_mem_start);
	memblock_reserve(CONFIG_LINUX_LINK_BASE,
			 __pa(_end) - CONFIG_LINUX_LINK_BASE);

#ifdef CONFIG_BLK_DEV_INITRD
	if (initrd_start)
+2 −3
Original line number Diff line number Diff line
@@ -89,8 +89,6 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
{
	int cpu = smp_processor_id();

	if (prev == next)
		return;
	S390_lowcore.user_asce = next->context.asce;
	cpumask_set_cpu(cpu, &next->context.cpu_attach_mask);
	/* Clear previous user-ASCE from CR1 and CR7 */
@@ -102,6 +100,7 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
		__ctl_load(S390_lowcore.vdso_asce, 7, 7);
		clear_cpu_flag(CIF_ASCE_SECONDARY);
	}
	if (prev != next)
		cpumask_clear_cpu(cpu, &prev->context.cpu_attach_mask);
}

Loading