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

Commit 16c056d2 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.19.12 into android-4.19 



Changes in 4.19.12
	locking/qspinlock: Re-order code
	locking/qspinlock, x86: Provide liveness guarantee
	IB/hfi1: Remove race conditions in user_sdma send path
	mac80211_hwsim: fix module init error paths for netlink
	Input: hyper-v - fix wakeup from suspend-to-idle
	i2c: rcar: check bus state before reinitializing
	scsi: libiscsi: Fix NULL pointer dereference in iscsi_eh_session_reset
	scsi: vmw_pscsi: Rearrange code to avoid multiple calls to free_irq during unload
	tools/bpf: fix two test_btf unit test cases
	tools/bpf: add addition type tests to test_btf
	net: ethernet: ave: Replace NET_IP_ALIGN with AVE_FRAME_HEADROOM
	drm/amd/display: Fix 6x4K displays light-up on Vega20 (v2)
	x86/earlyprintk/efi: Fix infinite loop on some screen widths
	drm/msm: Fix task dump in gpu recovery
	drm/msm/gpu: Fix a couple memory leaks in debugfs
	drm/msm: fix handling of cmdstream offset
	drm/msm/dsi: configure VCO rate for 10nm PLL driver
	drm/msm: Grab a vblank reference when waiting for commit_done
	drm/ttm: fix LRU handling in ttm_buffer_object_transfer
	drm/amdgpu: wait for IB test on first device open
	ARC: io.h: Implement reads{x}()/writes{x}()
	net: stmmac: Move debugfs init/exit to ->probe()/->remove()
	net: aquantia: fix rx checksum offload bits
	bonding: fix 802.3ad state sent to partner when unbinding slave
	bpf: Fix verifier log string check for bad alignment.
	liquidio: read sc->iq_no before release sc
	nfs: don't dirty kernel pages read by direct-io
	SUNRPC: Fix a potential race in xprt_connect()
	sbus: char: add of_node_put()
	drivers/sbus/char: add of_node_put()
	drivers/tty: add missing of_node_put()
	ide: pmac: add of_node_put()
	drm/msm/hdmi: Enable HPD after HDMI IRQ is set up
	drm/msm: dpu: Don't set legacy plane->crtc pointer
	drm/msm: dpu: Fix "WARNING: invalid free of devm_ allocated data"
	drm/msm: Fix error return checking
	drm/amd/powerplay: issue pre-display settings for display change event
	clk: mvebu: Off by one bugs in cp110_of_clk_get()
	clk: mmp: Off by one in mmp_clk_add()
	Input: synaptics - enable SMBus for HP 15-ay000
	Input: omap-keypad - fix keyboard debounce configuration
	libata: whitelist all SAMSUNG MZ7KM* solid-state disks
	macvlan: return correct error value
	mv88e6060: disable hardware level MAC learning
	net/mlx4_en: Fix build break when CONFIG_INET is off
	bpf: check pending signals while verifying programs
	ARM: 8814/1: mm: improve/fix ARM v7_dma_inv_range() unaligned address handling
	ARM: 8815/1: V7M: align v7m_dma_inv_range() with v7 counterpart
	ARM: 8816/1: dma-mapping: fix potential uninitialized return
	ethernet: fman: fix wrong of_node_put() in probe function
	thermal: armada: fix legacy validity test sense
	net: mvpp2: fix detection of 10G SFP modules
	net: mvpp2: fix phylink handling of invalid PHY modes
	drm/amdgpu/vcn: Update vcn.cur_state during suspend
	tools/testing/nvdimm: Align test resources to 128M
	acpi/nfit: Fix user-initiated ARS to be "ARS-long" rather than "ARS-short"
	drm/ast: Fix connector leak during driver unload
	cifs: In Kconfig CONFIG_CIFS_POSIX needs depends on legacy (insecure cifs)
	vhost/vsock: fix reset orphans race with close timeout
	mlxsw: spectrum_switchdev: Fix VLAN device deletion via ioctl
	i2c: axxia: properly handle master timeout
	i2c: scmi: Fix probe error on devices with an empty SMB0001 ACPI device node
	i2c: uniphier: fix violation of tLOW requirement for Fast-mode
	i2c: uniphier-f: fix violation of tLOW requirement for Fast-mode
	nvme: validate controller state before rescheduling keep alive
	nvmet-rdma: fix response use after free
	Btrfs: fix missing delayed iputs on unmount
	Linux 4.19.12

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents e5af6125 2a7cb228

Makefile

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

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 11

SUBLEVEL = 12

EXTRAVERSION =

NAME = "People's Front"

arch/arc/include/asm/io.h

+72 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <linux/types.h>

#include <asm/byteorder.h>

#include <asm/page.h>

#include <asm/unaligned.h>



#ifdef CONFIG_ISA_ARCV2

#include <asm/barrier.h>
@@ -94,6 +95,42 @@ static inline u32 __raw_readl(const volatile void __iomem *addr) 
	return w;

}



/*

 * {read,write}s{b,w,l}() repeatedly access the same IO address in

 * native endianness in 8-, 16-, 32-bit chunks {into,from} memory,

 * @count times

 */

#define __raw_readsx(t,f) \

static inline void __raw_reads##f(const volatile void __iomem *addr,	\

				  void *ptr, unsigned int count)	\

{									\

	bool is_aligned = ((unsigned long)ptr % ((t) / 8)) == 0;	\

	u##t *buf = ptr;						\

									\

	if (!count)							\

		return;							\

									\

	/* Some ARC CPU's don't support unaligned accesses */		\

	if (is_aligned) {						\

		do {							\

			u##t x = __raw_read##f(addr);			\

			*buf++ = x;					\

		} while (--count);					\

	} else {							\

		do {							\

			u##t x = __raw_read##f(addr);			\

			put_unaligned(x, buf++);			\

		} while (--count);					\

	}								\

}



#define __raw_readsb __raw_readsb

__raw_readsx(8, b)

#define __raw_readsw __raw_readsw

__raw_readsx(16, w)

#define __raw_readsl __raw_readsl

__raw_readsx(32, l)



#define __raw_writeb __raw_writeb

static inline void __raw_writeb(u8 b, volatile void __iomem *addr)

{
@@ -126,6 +163,35 @@ static inline void __raw_writel(u32 w, volatile void __iomem *addr) 


}



#define __raw_writesx(t,f)						\

static inline void __raw_writes##f(volatile void __iomem *addr, 	\

				   const void *ptr, unsigned int count)	\

{									\

	bool is_aligned = ((unsigned long)ptr % ((t) / 8)) == 0;	\

	const u##t *buf = ptr;						\

									\

	if (!count)							\

		return;							\

									\

	/* Some ARC CPU's don't support unaligned accesses */		\

	if (is_aligned) {						\

		do {							\

			__raw_write##f(*buf++, addr);			\

		} while (--count);					\

	} else {							\

		do {							\

			__raw_write##f(get_unaligned(buf++), addr);	\

		} while (--count);					\

	}								\

}



#define __raw_writesb __raw_writesb

__raw_writesx(8, b)

#define __raw_writesw __raw_writesw

__raw_writesx(16, w)

#define __raw_writesl __raw_writesl

__raw_writesx(32, l)



/*

 * MMIO can also get buffered/optimized in micro-arch, so barriers needed

 * Based on ARM model for the typical use case
@@ -141,10 +207,16 @@ static inline void __raw_writel(u32 w, volatile void __iomem *addr) 
#define readb(c)		({ u8  __v = readb_relaxed(c); __iormb(); __v; })

#define readw(c)		({ u16 __v = readw_relaxed(c); __iormb(); __v; })

#define readl(c)		({ u32 __v = readl_relaxed(c); __iormb(); __v; })

#define readsb(p,d,l)		({ __raw_readsb(p,d,l); __iormb(); })

#define readsw(p,d,l)		({ __raw_readsw(p,d,l); __iormb(); })

#define readsl(p,d,l)		({ __raw_readsl(p,d,l); __iormb(); })



#define writeb(v,c)		({ __iowmb(); writeb_relaxed(v,c); })

#define writew(v,c)		({ __iowmb(); writew_relaxed(v,c); })

#define writel(v,c)		({ __iowmb(); writel_relaxed(v,c); })

#define writesb(p,d,l)		({ __iowmb(); __raw_writesb(p,d,l); })

#define writesw(p,d,l)		({ __iowmb(); __raw_writesw(p,d,l); })

#define writesl(p,d,l)		({ __iowmb(); __raw_writesl(p,d,l); })



/*

 * Relaxed API for drivers which can handle barrier ordering themselves

arch/arm/mm/cache-v7.S

+5 −3
Original line number Diff line number Diff line
@@ -360,14 +360,16 @@ v7_dma_inv_range: 
	ALT_UP(W(nop))

#endif

	mcrne	p15, 0, r0, c7, c14, 1		@ clean & invalidate D / U line

	addne	r0, r0, r2



	tst	r1, r3

	bic	r1, r1, r3

	mcrne	p15, 0, r1, c7, c14, 1		@ clean & invalidate D / U line

1:

	mcr	p15, 0, r0, c7, c6, 1		@ invalidate D / U line

	add	r0, r0, r2

	cmp	r0, r1

1:

	mcrlo	p15, 0, r0, c7, c6, 1		@ invalidate D / U line

	addlo	r0, r0, r2

	cmplo	r0, r1

	blo	1b

	dsb	st

	ret	lr

arch/arm/mm/cache-v7m.S

+9 −5
Original line number Diff line number Diff line
@@ -73,9 +73,11 @@ 
/*

 * dcimvac: Invalidate data cache line by MVA to PoC

 */

.macro dcimvac, rt, tmp

	v7m_cacheop \rt, \tmp, V7M_SCB_DCIMVAC

.irp    c,,eq,ne,cs,cc,mi,pl,vs,vc,hi,ls,ge,lt,gt,le,hs,lo

.macro dcimvac\c, rt, tmp

	v7m_cacheop \rt, \tmp, V7M_SCB_DCIMVAC, \c

.endm

.endr



/*

 * dccmvau: Clean data cache line by MVA to PoU
@@ -369,14 +371,16 @@ v7m_dma_inv_range: 
	tst	r0, r3

	bic	r0, r0, r3

	dccimvacne r0, r3

	addne	r0, r0, r2

	subne	r3, r2, #1	@ restore r3, corrupted by v7m's dccimvac

	tst	r1, r3

	bic	r1, r1, r3

	dccimvacne r1, r3

1:

	dcimvac r0, r3

	add	r0, r0, r2

	cmp	r0, r1

1:

	dcimvaclo r0, r3

	addlo	r0, r0, r2

	cmplo	r0, r1

	blo	1b

	dsb	st

	ret	lr

arch/arm/mm/dma-mapping.c

+1 −1
Original line number Diff line number Diff line
@@ -830,7 +830,7 @@ static int __arm_dma_mmap(struct device *dev, struct vm_area_struct *vma, 
		 void *cpu_addr, dma_addr_t dma_addr, size_t size,

		 unsigned long attrs)

{

	int ret;

	int ret = -ENXIO;

	unsigned long nr_vma_pages = vma_pages(vma);

	unsigned long nr_pages = PAGE_ALIGN(size) >> PAGE_SHIFT;

	unsigned long pfn = dma_to_pfn(dev, dma_addr);