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

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

Merge 4.19.117 into android-4.19 



Changes in 4.19.117
	amd-xgbe: Use __napi_schedule() in BH context
	hsr: check protocol version in hsr_newlink()
	net: ipv4: devinet: Fix crash when add/del multicast IP with autojoin
	net: ipv6: do not consider routes via gateways for anycast address check
	net: qrtr: send msgs from local of same id as broadcast
	net: revert default NAPI poll timeout to 2 jiffies
	net: stmmac: dwmac-sunxi: Provide TX and RX fifo sizes
	net: dsa: mt7530: fix tagged frames pass-through in VLAN-unaware mode
	ovl: fix value of i_ino for lower hardlink corner case
	scsi: ufs: Fix ufshcd_hold() caused scheduling while atomic
	jbd2: improve comments about freeing data buffers whose page mapping is NULL
	pwm: pca9685: Fix PWM/GPIO inter-operation
	ext4: fix incorrect group count in ext4_fill_super error message
	ext4: fix incorrect inodes per group in error message
	ASoC: Intel: mrfld: fix incorrect check on p->sink
	ASoC: Intel: mrfld: return error codes when an error occurs
	ALSA: usb-audio: Filter error from connector kctl ops, too
	ALSA: usb-audio: Don't override ignore_ctl_error value from the map
	ALSA: usb-audio: Don't create jack controls for PCM terminals
	ALSA: usb-audio: Check mapping at creating connector controls, too
	keys: Fix proc_keys_next to increase position index
	tracing: Fix the race between registering 'snapshot' event trigger and triggering 'snapshot' operation
	btrfs: check commit root generation in should_ignore_root
	mac80211_hwsim: Use kstrndup() in place of kasprintf()
	usb: dwc3: gadget: don't enable interrupt when disabling endpoint
	usb: dwc3: gadget: Don't clear flags before transfer ended
	drm/amd/powerplay: force the trim of the mclk dpm_levels if OD is enabled
	ext4: do not zeroout extents beyond i_disksize
	kvm: x86: Host feature SSBD doesn't imply guest feature SPEC_CTRL_SSBD
	scsi: target: remove boilerplate code
	scsi: target: fix hang when multiple threads try to destroy the same iscsi session
	x86/microcode/AMD: Increase microcode PATCH_MAX_SIZE
	x86/resctrl: Preserve CDP enable over CPU hotplug
	x86/resctrl: Fix invalid attempt at removing the default resource group
	wil6210: check rx_buff_mgmt before accessing it
	wil6210: ignore HALP ICR if already handled
	wil6210: add general initialization/size checks
	wil6210: make sure Rx ring sizes are correlated
	wil6210: remove reset file from debugfs
	mm/vmalloc.c: move 'area->pages' after if statement
	Linux 4.19.117

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: Ib4ab9aa34c22c034887be15902a625ecc5622b35
parents eaa42a57 8e2406c8

Makefile

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

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 116

SUBLEVEL = 117

EXTRAVERSION =

NAME = "People's Front"

arch/x86/include/asm/microcode_amd.h

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ struct microcode_amd { 
	unsigned int			mpb[0];

};



#define PATCH_MAX_SIZE PAGE_SIZE

#define PATCH_MAX_SIZE (3 * PAGE_SIZE)



#ifdef CONFIG_MICROCODE_AMD

extern void __init load_ucode_amd_bsp(unsigned int family);

arch/x86/kernel/cpu/intel_rdt.c

+2 −0
Original line number Diff line number Diff line
@@ -555,6 +555,8 @@ static void domain_add_cpu(int cpu, struct rdt_resource *r) 
	d->id = id;

	cpumask_set_cpu(cpu, &d->cpu_mask);



	rdt_domain_reconfigure_cdp(r);



	if (r->alloc_capable && domain_setup_ctrlval(r, d)) {

		kfree(d);

		return;

arch/x86/kernel/cpu/intel_rdt.h

+1 −0
Original line number Diff line number Diff line
@@ -567,5 +567,6 @@ void cqm_setup_limbo_handler(struct rdt_domain *dom, unsigned long delay_ms); 
void cqm_handle_limbo(struct work_struct *work);

bool has_busy_rmid(struct rdt_resource *r, struct rdt_domain *d);

void __check_limbo(struct rdt_domain *d, bool force_free);

void rdt_domain_reconfigure_cdp(struct rdt_resource *r);



#endif /* _ASM_X86_INTEL_RDT_H */

arch/x86/kernel/cpu/intel_rdt_rdtgroup.c

+15 −1
Original line number Diff line number Diff line
@@ -1777,6 +1777,19 @@ static int set_cache_qos_cfg(int level, bool enable) 
	return 0;

}



/* Restore the qos cfg state when a domain comes online */

void rdt_domain_reconfigure_cdp(struct rdt_resource *r)

{

	if (!r->alloc_capable)

		return;



	if (r == &rdt_resources_all[RDT_RESOURCE_L2DATA])

		l2_qos_cfg_update(&r->alloc_enabled);



	if (r == &rdt_resources_all[RDT_RESOURCE_L3DATA])

		l3_qos_cfg_update(&r->alloc_enabled);

}



/*

 * Enable or disable the MBA software controller

 * which helps user specify bandwidth in MBps.
@@ -2910,7 +2923,8 @@ static int rdtgroup_rmdir(struct kernfs_node *kn) 
	 * If the rdtgroup is a mon group and parent directory

	 * is a valid "mon_groups" directory, remove the mon group.

	 */

	if (rdtgrp->type == RDTCTRL_GROUP && parent_kn == rdtgroup_default.kn) {

	if (rdtgrp->type == RDTCTRL_GROUP && parent_kn == rdtgroup_default.kn &&

	    rdtgrp != &rdtgroup_default) {

		if (rdtgrp->mode == RDT_MODE_PSEUDO_LOCKSETUP ||

		    rdtgrp->mode == RDT_MODE_PSEUDO_LOCKED) {

			ret = rdtgroup_ctrl_remove(kn, rdtgrp);