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

Commit 57d6dd49 authored by Ivaylo Georgiev's avatar Ivaylo Georgiev
Browse files

Merge android-4.19.46 (aa07ecba) into msm-4.19 



* refs/heads/tmp-aa07ecba:
  Revert "x86_64: Allow breakpoints to emulate call instructions"
  Linux 4.19.46
  fbdev: sm712fb: fix memory frequency by avoiding a switch/case fallthrough
  bpf, lru: avoid messing with eviction heuristics upon syscall lookup
  bpf: add map_lookup_elem_sys_only for lookups from syscall side
  bpf: relax inode permission check for retrieving bpf program
  Revert "selftests/bpf: skip verifier tests for unsupported program types"
  driver core: Postpone DMA tear-down until after devres release for probe failure
  md/raid: raid5 preserve the writeback action after the parity check
  Revert "Don't jump to compute_result state from check_result state"
  perf/x86/intel: Fix race in intel_pmu_disable_event()
  perf bench numa: Add define for RUSAGE_THREAD if not present
  ufs: fix braino in ufs_get_inode_gid() for solaris UFS flavour
  x86/mm/mem_encrypt: Disable all instrumentation for early SME setup
  sched/cpufreq: Fix kobject memleak
  iwlwifi: mvm: check for length correctness in iwl_mvm_create_skb()
  qmi_wwan: new Wistron, ZTE and D-Link devices
  bpf: Fix preempt_enable_no_resched() abuse
  power: supply: sysfs: prevent endless uevent loop with CONFIG_POWER_SUPPLY_DEBUG
  KVM: arm/arm64: Ensure vcpu target is unset on reset failure
  net: ieee802154: fix missing checks for regmap_update_bits
  mac80211: Fix kernel panic due to use of txq after free
  x86: kvm: hyper-v: deal with buggy TLB flush requests from WS2012
  PCI: Fix issue with "pci=disable_acs_redir" parameter being ignored
  apparmorfs: fix use-after-free on symlink traversal
  securityfs: fix use-after-free on symlink traversal
  power: supply: cpcap-battery: Fix division by zero
  clk: sunxi-ng: nkmp: Avoid GENMASK(-1, 0)
  xfrm4: Fix uninitialized memory read in _decode_session4
  xfrm: Honor original L3 slave device in xfrmi policy lookup
  esp4: add length check for UDP encapsulation
  xfrm: clean up xfrm protocol checks
  vti4: ipip tunnel deregistration fixes.
  xfrm6_tunnel: Fix potential panic when unloading xfrm6_tunnel module
  xfrm: policy: Fix out-of-bound array accesses in __xfrm_policy_unlink
  fuse: Add FOPEN_STREAM to use stream_open()
  dm mpath: always free attached_handler_name in parse_path()
  dm integrity: correctly calculate the size of metadata area
  dm delay: fix a crash when invalid device is specified
  dm zoned: Fix zone report handling
  dm cache metadata: Fix loading discard bitset
  PCI: Work around Pericom PCIe-to-PCI bridge Retrain Link erratum
  PCI: Factor out pcie_retrain_link() function
  PCI: rcar: Add the initialization of PCIe link in resume_noirq()
  PCI/AER: Change pci_aer_init() stub to return void
  PCI: Init PCIe feature bits for managed host bridge alloc
  PCI: Mark Atheros AR9462 to avoid bus reset
  PCI: Mark AMD Stoney Radeon R7 GPU ATS as broken
  fbdev: sm712fb: fix crashes and garbled display during DPMS modesetting
  fbdev: sm712fb: use 1024x768 by default on non-MIPS, fix garbled display
  fbdev: sm712fb: fix support for 1024x768-16 mode
  fbdev: sm712fb: fix crashes during framebuffer writes by correctly mapping VRAM
  fbdev: sm712fb: fix boot screen glitch when sm712fb replaces VGA
  fbdev: sm712fb: fix white screen of death on reboot, don't set CR3B-CR3F
  fbdev: sm712fb: fix VRAM detection, don't set SR70/71/74/75
  fbdev: sm712fb: fix brightness control on reboot, don't set SR30
  fbdev/efifb: Ignore framebuffer memmap entries that lack any memory types
  objtool: Allow AR to be overridden with HOSTAR
  MIPS: perf: Fix build with CONFIG_CPU_BMIPS5000 enabled
  perf intel-pt: Fix sample timestamp wrt non-taken branches
  perf intel-pt: Fix improved sample timestamp
  perf intel-pt: Fix instructions sampling rate
  memory: tegra: Fix integer overflow on tick value calculation
  tracing: Fix partial reading of trace event's id file
  ftrace/x86_64: Emulate call function while updating in breakpoint handler
  x86_64: Allow breakpoints to emulate call instructions
  x86_64: Add gap to int3 to allow for call emulation
  ceph: flush dirty inodes before proceeding with remount
  iommu/tegra-smmu: Fix invalid ASID bits on Tegra30/114
  ovl: fix missing upper fs freeze protection on copy up for ioctl
  fuse: honor RLIMIT_FSIZE in fuse_file_fallocate
  fuse: fix writepages on 32bit
  udlfb: introduce a rendering mutex
  udlfb: fix sleeping inside spinlock
  udlfb: delete the unused parameter for dlfb_handle_damage
  clk: rockchip: fix wrong clock definitions for rk3328
  clk: mediatek: Disable tuner_en before change PLL rate
  clk: tegra: Fix PLLM programming on Tegra124+ when PMC overrides divider
  clk: hi3660: Mark clk_gate_ufs_subsys as critical
  PNFS fallback to MDS if no deviceid found
  NFS4: Fix v4.0 client state corruption when mount
  media: imx: Clear fwnode link struct for each endpoint iteration
  media: imx: csi: Allow unknown nearest upstream entities
  media: ov6650: Fix sensor possibly not detected on probe
  phy: ti-pipe3: fix missing bit-wise or operator when assigning val
  cifs: fix strcat buffer overflow and reduce raciness in smb21_set_oplock_level()
  of: fix clang -Wunsequenced for be32_to_cpu()
  p54: drop device reference count if fails to enable device
  intel_th: msu: Fix single mode with IOMMU
  dcache: sort the freeing-without-RCU-delay mess for good.
  md: add mddev->pers to avoid potential NULL pointer dereference
  md: batch flush requests.
  Revert "MD: fix lock contention for flush bios"
  proc: prevent changes to overridden credentials
  brd: re-enable __GFP_HIGHMEM in brd_insert_page()
  stm class: Fix channel bitmap on 32-bit systems
  stm class: Fix channel free in stm output free path
  parisc: Rename LEVEL to PA_ASM_LEVEL to avoid name clash with DRBD code
  parisc: Use PA_ASM_LEVEL in boot code
  parisc: Skip registering LED when running in QEMU
  parisc: Export running_on_qemu symbol for modules
  net/mlx5e: Fix ethtool rxfh commands when CONFIG_MLX5_EN_RXNFC is disabled
  net/mlx5: Imply MLXFW in mlx5_core
  vsock/virtio: Initialize core virtio vsock before registering the driver
  tipc: fix modprobe tipc failed after switch order of device registration
  vsock/virtio: free packets during the socket release
  tipc: switch order of device registration to fix a crash
  rtnetlink: always put IFLA_LINK for links with a link-netnsid
  ppp: deflate: Fix possible crash in deflate_init
  nfp: flower: add rcu locks when accessing netdev for tunnels
  net: usb: qmi_wwan: add Telit 0x1260 and 0x1261 compositions
  net: test nouarg before dereferencing zerocopy pointers
  net/mlx4_core: Change the error print to info print
  net: avoid weird emergency message
  net: Always descend into dsa/
  ipv6: prevent possible fib6 leaks
  ipv6: fix src addr routing with the exception table
  Enable CONFIG_ION_SYSTEM_HEAP
  ANDROID: Enable LTO and CFI
  Revert "ANDROID: cuttlefish 4.19: enable CONFIG_CRYPTO_AES_NI_INTEL=y"

Conflicts:
	drivers/hwtracing/stm/core.c

Change-Id: I7da86200695082b7ed40c5e6290c5b3203e094dd
Signed-off-by: default avatarIvaylo Georgiev <irgeorgiev@codeaurora.org>
parents 0f3194a0 3e29df90

Documentation/filesystems/porting

+5 −0
Original line number Diff line number Diff line
@@ -622,3 +622,8 @@ in your dentry operations instead. 
	alloc_file_clone(file, flags, ops) does not affect any caller's references.

	On success you get a new struct file sharing the mount/dentry with the

	original, on failure - ERR_PTR().

--

[mandatory]

	DCACHE_RCUACCESS is gone; having an RCU delay on dentry freeing is the

	default.  DCACHE_NORCU opts out, and only d_alloc_pseudo() has any

	business doing so.

Makefile

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

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 45

SUBLEVEL = 46

EXTRAVERSION =

NAME = "People's Front"

arch/arm64/configs/cuttlefish_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -72,6 +72,8 @@ CONFIG_ARM_SCPI_PROTOCOL=y 
# CONFIG_ARM_SCPI_POWER_DOMAIN is not set

CONFIG_KPROBES=y

CONFIG_JUMP_LABEL=y

CONFIG_LTO_CLANG=y

CONFIG_CFI_CLANG=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_MODVERSIONS=y
@@ -396,6 +398,7 @@ CONFIG_STAGING=y 
CONFIG_ASHMEM=y

CONFIG_ANDROID_VSOC=y

CONFIG_ION=y

CONFIG_ION_SYSTEM_HEAP=y

CONFIG_COMMON_CLK_SCPI=y

# CONFIG_COMMON_CLK_XGENE is not set

CONFIG_MAILBOX=y

arch/mips/kernel/perf_event_mipsxx.c

+3 −18
Original line number Diff line number Diff line
@@ -64,17 +64,11 @@ struct mips_perf_event { 
	#define CNTR_EVEN	0x55555555

	#define CNTR_ODD	0xaaaaaaaa

	#define CNTR_ALL	0xffffffff

#ifdef CONFIG_MIPS_MT_SMP

	enum {

		T  = 0,

		V  = 1,

		P  = 2,

	} range;

#else

	#define T

	#define V

	#define P

#endif

};



static struct mips_perf_event raw_event;
@@ -325,9 +319,7 @@ static void mipsxx_pmu_enable_event(struct hw_perf_event *evt, int idx) 
{

	struct perf_event *event = container_of(evt, struct perf_event, hw);

	struct cpu_hw_events *cpuc = this_cpu_ptr(&cpu_hw_events);

#ifdef CONFIG_MIPS_MT_SMP

	unsigned int range = evt->event_base >> 24;

#endif /* CONFIG_MIPS_MT_SMP */



	WARN_ON(idx < 0 || idx >= mipspmu.num_counters);
@@ -336,21 +328,15 @@ static void mipsxx_pmu_enable_event(struct hw_perf_event *evt, int idx) 
		/* Make sure interrupt enabled. */

		MIPS_PERFCTRL_IE;



#ifdef CONFIG_CPU_BMIPS5000

	{

	if (IS_ENABLED(CONFIG_CPU_BMIPS5000)) {

		/* enable the counter for the calling thread */

		cpuc->saved_ctrl[idx] |=

			(1 << (12 + vpe_id())) | BRCM_PERFCTRL_TC;

	}

#else

#ifdef CONFIG_MIPS_MT_SMP

	if (range > V) {

	} else if (IS_ENABLED(CONFIG_MIPS_MT_SMP) && range > V) {

		/* The counter is processor wide. Set it up to count all TCs. */

		pr_debug("Enabling perf counter for all TCs\n");

		cpuc->saved_ctrl[idx] |= M_TC_EN_ALL;

	} else

#endif /* CONFIG_MIPS_MT_SMP */

	{

	} else {

		unsigned int cpu, ctrl;



		/*
@@ -365,7 +351,6 @@ static void mipsxx_pmu_enable_event(struct hw_perf_event *evt, int idx) 
		cpuc->saved_ctrl[idx] |= ctrl;

		pr_debug("Enabling perf counter for CPU%d\n", cpu);

	}

#endif /* CONFIG_CPU_BMIPS5000 */

	/*

	 * We do not actually let the counter run. Leave it until start().

	 */

arch/parisc/boot/compressed/head.S

+3 −3
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
	__HEAD



ENTRY(startup)

	 .level LEVEL

	 .level PA_ASM_LEVEL



#define PSW_W_SM	0x200

#define PSW_W_BIT       36
@@ -63,7 +63,7 @@ $bss_loop: 
	load32	BOOTADDR(decompress_kernel),%r3



#ifdef CONFIG_64BIT

	.level LEVEL

	.level PA_ASM_LEVEL

	ssm	PSW_W_SM, %r0		/* set W-bit */

	depdi	0, 31, 32, %r3

#endif
@@ -72,7 +72,7 @@ $bss_loop: 


startup_continue:

#ifdef CONFIG_64BIT

	.level LEVEL

	.level PA_ASM_LEVEL

	rsm	PSW_W_SM, %r0		/* clear W-bit */

#endif