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

Commit 22379645 authored by Ivaylo Georgiev's avatar Ivaylo Georgiev
Browse files

Merge android-4.19-q.68 (f3e9c9b0) into msm-4.19 



* refs/heads/tmp-f3e9c9b0:
  Linux 4.19.68
  mmc: sdhci-of-arasan: Do now show error message in case of deffered probe
  net/mlx5e: Use flow keys dissector to parse packets for ARFS
  net/mlx5e: Only support tx/rx pause setting for port owner
  xen/netback: Reset nr_frags before freeing skb
  tipc: initialise addr_trail_end when setting node addresses
  team: Add vlan tx offload to hw_enc_features
  sctp: fix the transport error_count check
  sctp: fix memleak in sctp_send_reset_streams
  net/packet: fix race in tpacket_snd()
  net/mlx4_en: fix a memory leak bug
  net: dsa: Check existence of .port_mdb_add callback before calling it
  bonding: Add vlan tx offload to hw_enc_features
  bnx2x: Fix VF's VLAN reconfiguration in reload.
  iommu/amd: Move iommu_init_pci() to .init section
  Input: psmouse - fix build error of multiple definition
  netfilter: conntrack: Use consistent ct id hash calculation
  arm64: ftrace: Ensure module ftrace trampoline is coherent with I-side
  dm: disable DISCARD if the underlying storage no longer supports it
  drm/i915/cfl: Add a new CFL PCI ID.
  USB: serial: option: Add Motorola modem UARTs
  USB: serial: option: add the BroadMobi BM818 card
  USB: serial: option: Add support for ZTE MF871A
  USB: serial: option: add D-Link DWM-222 device ID
  USB: CDC: fix sanity checks in CDC union parser
  usb: cdc-acm: make sure a refcount is taken early enough
  usb: gadget: udc: renesas_usb3: Fix sysfs interface of "role"
  USB: core: Fix races in character device registration and deregistraion
  iio: adc: max9611: Fix temperature reading in probe
  staging: comedi: dt3000: Fix rounding up of timer divisor
  staging: comedi: dt3000: Fix signed integer overflow 'divider * base'
  KVM: arm/arm64: Sync ICH_VMCR_EL2 back when about to block
  arm64: KVM: regmap: Fix unexpected switch fall-through
  asm-generic: fix -Wtype-limits compiler warnings
  ocfs2: remove set but not used variable 'last_hash'
  Revert "kmemleak: allow to coexist with fault injection"
  drm/exynos: fix missing decrement of retry counter
  drm: msm: Fix add_gpu_components
  IB/mad: Fix use-after-free in ib mad completion handling
  IB/mlx5: Fix MR registration flow to use UMR properly
  IB/core: Add mitigation for Spectre V1
  arm64/mm: fix variable 'pud' set but not used
  arm64: unwind: Prohibit probing on return_address()
  arm64/efi: fix variable 'si' set but not used
  kbuild: Check for unknown options with cc-option usage in Kconfig and clang
  kbuild: modpost: handle KBUILD_EXTRA_SYMBOLS only for external modules
  ata: libahci: do not complain in case of deferred probe
  drm/amdgpu: fix a potential information leaking bug
  scsi: qla2xxx: Fix possible fcport null-pointer dereferences
  scsi: hpsa: correct scsi command status issue after reset
  Btrfs: fix deadlock between fiemap and transaction commits
  drm/bridge: lvds-encoder: Fix build error while CONFIG_DRM_KMS_HELPER=m
  libata: zpodd: Fix small read overflow in zpodd_get_mech_type()
  perf header: Fix use of unitialized value warning
  perf header: Fix divide by zero error if f_header.attr_size==0
  irqchip/irq-imx-gpcv2: Forward irq type to parent
  irqchip/gic-v3-its: Free unused vpt_page when alloc vpe table fail
  xen/pciback: remove set but not used variable 'old_state'
  clk: renesas: cpg-mssr: Fix reset control race condition
  clk: sprd: Select REGMAP_MMIO to avoid compile errors
  clk: at91: generated: Truncate divisor to GENERATED_MAX_DIV + 1
  riscv: Make __fstate_clean() work correctly.
  netfilter: ebtables: also count base chain policies
  net: usb: pegasus: fix improper read if get_registers() fail
  Input: iforce - add sanity checks
  Input: kbtab - sanity check for endpoint type
  HID: hiddev: do cleanup in failure of opening a device
  HID: hiddev: avoid opening a disconnected device
  HID: holtek: test for sanity of intfdata
  ALSA: hda - Let all conexant codec enter D3 when rebooting
  ALSA: hda - Add a generic reboot_notify
  ALSA: hda - Fix a memory leak bug
  ALSA: hda - Apply workaround for another AMD chip 1022:1487
  ALSA: usb-audio: Fix an OOB bug in parse_audio_mixer_unit
  ALSA: usb-audio: Fix a stack buffer overflow bug in check_input_term
  ALSA: hda/realtek - Add quirk for HP Envy x360
  xtensa: add missing isync to the cpu_reset TLB code
  cpufreq: schedutil: Don't skip freq update when limits change
  Revert "pwm: Set class for exported channels in sysfs"
  mm/usercopy: use memory range to be accessed for wraparound check
  mm/memcontrol.c: fix use after free in mem_cgroup_iter()
  mm: mempolicy: handle vma with unmovable pages mapped correctly in mbind
  mm: mempolicy: make the behavior consistent when MPOL_MF_MOVE* and MPOL_MF_STRICT were specified
  mm/hmm: fix bad subpage pointer in try_to_unmap_one
  seq_file: fix problem when seeking mid-record
  sh: kernel: hw_breakpoint: Fix missing break in switch statement

Conflicts:
	kernel/sched/cpufreq_schedutil.c

Change-Id: I43aee9ca2893d9a393086d8a183b8544c6c5ff6e
Signed-off-by: default avatarIvaylo Georgiev <irgeorgiev@codeaurora.org>
parents e6d80b29 f3e9c9b0

Makefile

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

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 67

SUBLEVEL = 68

EXTRAVERSION =

NAME = "People's Front"

arch/arm64/include/asm/efi.h

+5 −1
Original line number Diff line number Diff line
@@ -94,7 +94,11 @@ static inline unsigned long efi_get_max_initrd_addr(unsigned long dram_base, 
	((protocol##_t *)instance)->f(instance, ##__VA_ARGS__)



#define alloc_screen_info(x...)		&screen_info

#define free_screen_info(x...)



static inline void free_screen_info(efi_system_table_t *sys_table_arg,

				    struct screen_info *si)

{

}



/* redeclare as 'hidden' so the compiler will generate relative references */

extern struct screen_info screen_info __attribute__((__visibility__("hidden")));

arch/arm64/include/asm/pgtable.h

+2 −2
Original line number Diff line number Diff line
@@ -448,8 +448,8 @@ extern pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn, 
				 PMD_TYPE_SECT)



#if defined(CONFIG_ARM64_64K_PAGES) || CONFIG_PGTABLE_LEVELS < 3

#define pud_sect(pud)		(0)

#define pud_table(pud)		(1)

static inline bool pud_sect(pud_t pud) { return false; }

static inline bool pud_table(pud_t pud) { return true; }

#else

#define pud_sect(pud)		((pud_val(pud) & PUD_TYPE_MASK) == \

				 PUD_TYPE_SECT)

arch/arm64/kernel/ftrace.c

+12 −9
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr) 


	if (offset < -SZ_128M || offset >= SZ_128M) {

#ifdef CONFIG_ARM64_MODULE_PLTS

		struct plt_entry trampoline;

		struct plt_entry trampoline, *dst;

		struct module *mod;



		/*
@@ -104,24 +104,27 @@ int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr) 
		 * is added in the future, but for now, the pr_err() below

		 * deals with a theoretical issue only.

		 */

		dst = mod->arch.ftrace_trampoline;

		trampoline = get_plt_entry(addr);

		if (!plt_entries_equal(mod->arch.ftrace_trampoline,

				       &trampoline)) {

			if (!plt_entries_equal(mod->arch.ftrace_trampoline,

					       &(struct plt_entry){})) {

		if (!plt_entries_equal(dst, &trampoline)) {

			if (!plt_entries_equal(dst, &(struct plt_entry){})) {

				pr_err("ftrace: far branches to multiple entry points unsupported inside a single module\n");

				return -EINVAL;

			}



			/* point the trampoline to our ftrace entry point */

			module_disable_ro(mod);

			*mod->arch.ftrace_trampoline = trampoline;

			*dst = trampoline;

			module_enable_ro(mod, true);



			/* update trampoline before patching in the branch */

			smp_wmb();

			/*

			 * Ensure updated trampoline is visible to instruction

			 * fetch before we patch in the branch.

			 */

			__flush_icache_range((unsigned long)&dst[0],

					     (unsigned long)&dst[1]);

		}

		addr = (unsigned long)(void *)mod->arch.ftrace_trampoline;

		addr = (unsigned long)dst;

#else /* CONFIG_ARM64_MODULE_PLTS */

		return -EINVAL;

#endif /* CONFIG_ARM64_MODULE_PLTS */

arch/arm64/kernel/return_address.c

+3 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 


#include <linux/export.h>

#include <linux/ftrace.h>

#include <linux/kprobes.h>



#include <asm/stack_pointer.h>

#include <asm/stacktrace.h>
@@ -32,6 +33,7 @@ static int save_return_addr(struct stackframe *frame, void *d) 
		return 0;

	}

}

NOKPROBE_SYMBOL(save_return_addr);



void *return_address(unsigned int level)

{
@@ -55,3 +57,4 @@ void *return_address(unsigned int level) 
		return NULL;

}

EXPORT_SYMBOL_GPL(return_address);

NOKPROBE_SYMBOL(return_address);