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

Commit 9179fe98 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.19.122 into android-4.19 



Changes in 4.19.122
	vhost: vsock: kick send_pkt worker once device is started
	powerpc/pci/of: Parse unassigned resources
	ASoC: topology: Check return value of pcm_new_ver
	selftests/ipc: Fix test failure seen after initial test run
	ASoC: sgtl5000: Fix VAG power-on handling
	usb: dwc3: gadget: Properly set maxpacket limit
	ASoC: rsnd: Fix parent SSI start/stop in multi-SSI mode
	ASoC: rsnd: Fix HDMI channel mapping for multi-SSI mode
	ASoC: codecs: hdac_hdmi: Fix incorrect use of list_for_each_entry
	drm/amdgpu: Correctly initialize thermal controller for GPUs with Powerplay table v0 (e.g Hawaii)
	wimax/i2400m: Fix potential urb refcnt leak
	net: stmmac: fix enabling socfpga's ptp_ref_clock
	net: stmmac: Fix sub-second increment
	ASoC: rsnd: Don't treat master SSI in multi SSI setup as parent
	ASoC: rsnd: Fix "status check failed" spam for multi-SSI
	cifs: protect updating server->dstaddr with a spinlock
	s390/ftrace: fix potential crashes when switching tracers
	scripts/config: allow colons in option strings for sed
	lib/mpi: Fix building for powerpc with clang
	net: bcmgenet: suppress warnings on failed Rx SKB allocations
	net: systemport: suppress warnings on failed Rx SKB allocations
	sctp: Fix SHUTDOWN CTSN Ack in the peer restart case
	drm/amdgpu: Fix oops when pp_funcs is unset in ACPI event
	lib: devres: add a helper function for ioremap_uc
	mfd: intel-lpss: Use devm_ioremap_uc for MMIO
	hexagon: clean up ioremap
	hexagon: define ioremap_uc
	ALSA: hda: Match both PCI ID and SSID for driver blacklist
	platform/x86: GPD pocket fan: Fix error message when temp-limits are out of range
	mac80211: add ieee80211_is_any_nullfunc()
	cgroup, netclassid: remove double cond_resched
	drm/atomic: Take the atomic toys away from X
	Linux 4.19.122

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I7257fc5afa0c25d3ba2f6884822ec315d556426a
parents 2190ece2 033c4ea4

Makefile

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

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 121

SUBLEVEL = 122

EXTRAVERSION =

NAME = "People's Front"

arch/hexagon/include/asm/io.h

+3 −9
Original line number Diff line number Diff line
@@ -186,16 +186,10 @@ static inline void writel(u32 data, volatile void __iomem *addr) 


#define mmiowb()



/*

 * Need an mtype somewhere in here, for cache type deals?

 * This is probably too long for an inline.

 */

void __iomem *ioremap_nocache(unsigned long phys_addr, unsigned long size);

void __iomem *ioremap(unsigned long phys_addr, unsigned long size);

#define ioremap_nocache ioremap

#define ioremap_uc(X, Y) ioremap((X), (Y))



static inline void __iomem *ioremap(unsigned long phys_addr, unsigned long size)

{

	return ioremap_nocache(phys_addr, size);

}



static inline void iounmap(volatile void __iomem *addr)

{

arch/hexagon/kernel/hexagon_ksyms.c

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ EXPORT_SYMBOL(__vmgetie); 
EXPORT_SYMBOL(__vmsetie);

EXPORT_SYMBOL(__vmyield);

EXPORT_SYMBOL(empty_zero_page);

EXPORT_SYMBOL(ioremap_nocache);

EXPORT_SYMBOL(ioremap);

EXPORT_SYMBOL(memcpy);

EXPORT_SYMBOL(memset);

arch/hexagon/mm/ioremap.c

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
#include <linux/vmalloc.h>

#include <linux/mm.h>



void __iomem *ioremap_nocache(unsigned long phys_addr, unsigned long size)

void __iomem *ioremap(unsigned long phys_addr, unsigned long size)

{

	unsigned long last_addr, addr;

	unsigned long offset = phys_addr & ~PAGE_MASK;

arch/powerpc/kernel/pci_of_scan.c

+10 −2
Original line number Diff line number Diff line
@@ -82,10 +82,16 @@ static void of_pci_parse_addrs(struct device_node *node, struct pci_dev *dev) 
	const __be32 *addrs;

	u32 i;

	int proplen;

	bool mark_unset = false;



	addrs = of_get_property(node, "assigned-addresses", &proplen);

	if (!addrs)

	if (!addrs || !proplen) {

		addrs = of_get_property(node, "reg", &proplen);

		if (!addrs || !proplen)

			return;

		mark_unset = true;

	}



	pr_debug("    parse addresses (%d bytes) @ %p\n", proplen, addrs);

	for (; proplen >= 20; proplen -= 20, addrs += 5) {

		flags = pci_parse_of_flags(of_read_number(addrs, 1), 0);
@@ -110,6 +116,8 @@ static void of_pci_parse_addrs(struct device_node *node, struct pci_dev *dev) 
			continue;

		}

		res->flags = flags;

		if (mark_unset)

			res->flags |= IORESOURCE_UNSET;

		res->name = pci_name(dev);

		region.start = base;

		region.end = base + size - 1;