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

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

Merge 5.4.172 into android11-5.4-lts 



Changes in 5.4.172
	workqueue: Fix unbind_workers() VS wq_worker_running() race
	Bluetooth: btusb: fix memory leak in btusb_mtk_submit_wmt_recv_urb()
	Bluetooth: bfusb: fix division by zero in send path
	USB: core: Fix bug in resuming hub's handling of wakeup requests
	USB: Fix "slab-out-of-bounds Write" bug in usb_hcd_poll_rh_status
	mmc: sdhci-pci: Add PCI ID for Intel ADL
	veth: Do not record rx queue hint in veth_xmit
	mfd: intel-lpss: Fix too early PM enablement in the ACPI ->probe()
	drivers core: Use sysfs_emit and sysfs_emit_at for show(device *...) functions
	can: gs_usb: fix use of uninitialized variable, detach device on reception of invalid USB data
	can: gs_usb: gs_can_start_xmit(): zero-initialize hf->{flags,reserved}
	random: fix data race on crng_node_pool
	random: fix data race on crng init time
	random: fix crash on multiple early calls to add_bootloader_randomness()
	media: Revert "media: uvcvideo: Set unique vdev name based in type"
	staging: wlan-ng: Avoid bitwise vs logical OR warning in hfa384x_usb_throttlefn()
	drm/i915: Avoid bitwise vs logical OR warning in snb_wm_latency_quirk()
	staging: greybus: fix stack size warning with UBSAN
	Linux 5.4.172

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I66938f5222e1c76352f288ed8e13ee9221071530
parents e4310132 b7f70762

Makefile

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

VERSION = 5

PATCHLEVEL = 4

SUBLEVEL = 171

SUBLEVEL = 172

EXTRAVERSION =

NAME = Kleptomaniac Octopus

drivers/base/arch_topology.c

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ static ssize_t cpu_capacity_show(struct device *dev, 
{

	struct cpu *cpu = container_of(dev, struct cpu, dev);



	return sprintf(buf, "%lu\n", topology_get_cpu_scale(cpu->dev.id));

	return sysfs_emit(buf, "%lu\n", topology_get_cpu_scale(cpu->dev.id));

}



static void update_topology_flags_workfn(struct work_struct *work);

drivers/base/cacheinfo.c

+9 −9
Original line number Diff line number Diff line
@@ -377,7 +377,7 @@ static ssize_t size_show(struct device *dev, 
{

	struct cacheinfo *this_leaf = dev_get_drvdata(dev);



	return sprintf(buf, "%uK\n", this_leaf->size >> 10);

	return sysfs_emit(buf, "%uK\n", this_leaf->size >> 10);

}



static ssize_t shared_cpumap_show_func(struct device *dev, bool list, char *buf)
@@ -407,11 +407,11 @@ static ssize_t type_show(struct device *dev, 


	switch (this_leaf->type) {

	case CACHE_TYPE_DATA:

		return sprintf(buf, "Data\n");

		return sysfs_emit(buf, "Data\n");

	case CACHE_TYPE_INST:

		return sprintf(buf, "Instruction\n");

		return sysfs_emit(buf, "Instruction\n");

	case CACHE_TYPE_UNIFIED:

		return sprintf(buf, "Unified\n");

		return sysfs_emit(buf, "Unified\n");

	default:

		return -EINVAL;

	}
@@ -425,11 +425,11 @@ static ssize_t allocation_policy_show(struct device *dev, 
	int n = 0;



	if ((ci_attr & CACHE_READ_ALLOCATE) && (ci_attr & CACHE_WRITE_ALLOCATE))

		n = sprintf(buf, "ReadWriteAllocate\n");

		n = sysfs_emit(buf, "ReadWriteAllocate\n");

	else if (ci_attr & CACHE_READ_ALLOCATE)

		n = sprintf(buf, "ReadAllocate\n");

		n = sysfs_emit(buf, "ReadAllocate\n");

	else if (ci_attr & CACHE_WRITE_ALLOCATE)

		n = sprintf(buf, "WriteAllocate\n");

		n = sysfs_emit(buf, "WriteAllocate\n");

	return n;

}
@@ -441,9 +441,9 @@ static ssize_t write_policy_show(struct device *dev, 
	int n = 0;



	if (ci_attr & CACHE_WRITE_THROUGH)

		n = sprintf(buf, "WriteThrough\n");

		n = sysfs_emit(buf, "WriteThrough\n");

	else if (ci_attr & CACHE_WRITE_BACK)

		n = sprintf(buf, "WriteBack\n");

		n = sysfs_emit(buf, "WriteBack\n");

	return n;

}

drivers/base/core.c

+4 −4
Original line number Diff line number Diff line
@@ -1686,7 +1686,7 @@ ssize_t device_show_ulong(struct device *dev, 
			  char *buf)

{

	struct dev_ext_attribute *ea = to_ext_attr(attr);

	return snprintf(buf, PAGE_SIZE, "%lx\n", *(unsigned long *)(ea->var));

	return sysfs_emit(buf, "%lx\n", *(unsigned long *)(ea->var));

}

EXPORT_SYMBOL_GPL(device_show_ulong);
@@ -1716,7 +1716,7 @@ ssize_t device_show_int(struct device *dev, 
{

	struct dev_ext_attribute *ea = to_ext_attr(attr);



	return snprintf(buf, PAGE_SIZE, "%d\n", *(int *)(ea->var));

	return sysfs_emit(buf, "%d\n", *(int *)(ea->var));

}

EXPORT_SYMBOL_GPL(device_show_int);
@@ -1737,7 +1737,7 @@ ssize_t device_show_bool(struct device *dev, struct device_attribute *attr, 
{

	struct dev_ext_attribute *ea = to_ext_attr(attr);



	return snprintf(buf, PAGE_SIZE, "%d\n", *(bool *)(ea->var));

	return sysfs_emit(buf, "%d\n", *(bool *)(ea->var));

}

EXPORT_SYMBOL_GPL(device_show_bool);
@@ -1969,7 +1969,7 @@ static ssize_t online_show(struct device *dev, struct device_attribute *attr, 
	device_lock(dev);

	val = !dev->offline;

	device_unlock(dev);

	return sprintf(buf, "%u\n", val);

	return sysfs_emit(buf, "%u\n", val);

}



static ssize_t online_store(struct device *dev, struct device_attribute *attr,

drivers/base/cpu.c

+17 −22
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ static ssize_t show_crash_notes(struct device *dev, struct device_attribute *att 
	 * operation should be safe. No locking required.

	 */

	addr = per_cpu_ptr_to_phys(per_cpu_ptr(crash_notes, cpunum));

	rc = sprintf(buf, "%Lx\n", addr);

	rc = sysfs_emit(buf, "%Lx\n", addr);

	return rc;

}

static DEVICE_ATTR(crash_notes, 0400, show_crash_notes, NULL);
@@ -167,7 +167,7 @@ static ssize_t show_crash_notes_size(struct device *dev, 
{

	ssize_t rc;



	rc = sprintf(buf, "%zu\n", sizeof(note_buf_t));

	rc = sysfs_emit(buf, "%zu\n", sizeof(note_buf_t));

	return rc;

}

static DEVICE_ATTR(crash_notes_size, 0400, show_crash_notes_size, NULL);
@@ -231,8 +231,7 @@ static struct cpu_attr cpu_attrs[] = { 
static ssize_t print_cpus_kernel_max(struct device *dev,

				     struct device_attribute *attr, char *buf)

{

	int n = snprintf(buf, PAGE_SIZE-2, "%d\n", NR_CPUS - 1);

	return n;

	return sprintf(buf, "%d\n", NR_CPUS - 1);

}

static DEVICE_ATTR(kernel_max, 0444, print_cpus_kernel_max, NULL);
@@ -272,7 +271,7 @@ static DEVICE_ATTR(offline, 0444, print_cpus_offline, NULL); 
static ssize_t print_cpus_isolated(struct device *dev,

				  struct device_attribute *attr, char *buf)

{

	int n = 0, len = PAGE_SIZE-2;

	int n;

	cpumask_var_t isolated;



	if (!alloc_cpumask_var(&isolated, GFP_KERNEL))
@@ -280,7 +279,7 @@ static ssize_t print_cpus_isolated(struct device *dev, 


	cpumask_andnot(isolated, cpu_possible_mask,

		       housekeeping_cpumask(HK_FLAG_DOMAIN));

	n = scnprintf(buf, len, "%*pbl\n", cpumask_pr_args(isolated));

	n = sysfs_emit(buf, "%*pbl\n", cpumask_pr_args(isolated));



	free_cpumask_var(isolated);
@@ -292,11 +291,7 @@ static DEVICE_ATTR(isolated, 0444, print_cpus_isolated, NULL); 
static ssize_t print_cpus_nohz_full(struct device *dev,

				  struct device_attribute *attr, char *buf)

{

	int n = 0, len = PAGE_SIZE-2;



	n = scnprintf(buf, len, "%*pbl\n", cpumask_pr_args(tick_nohz_full_mask));



	return n;

	return sysfs_emit(buf, "%*pbl\n", cpumask_pr_args(tick_nohz_full_mask));

}

static DEVICE_ATTR(nohz_full, 0444, print_cpus_nohz_full, NULL);

#endif
@@ -328,7 +323,7 @@ static ssize_t print_cpu_modalias(struct device *dev, 
	ssize_t n;

	u32 i;



	n = sprintf(buf, "cpu:type:" CPU_FEATURE_TYPEFMT ":feature:",

	n = sysfs_emit(buf, "cpu:type:" CPU_FEATURE_TYPEFMT ":feature:",

		       CPU_FEATURE_TYPEVAL);



	for (i = 0; i < MAX_CPU_FEATURES; i++)
@@ -521,56 +516,56 @@ static void __init cpu_dev_register_generic(void) 
ssize_t __weak cpu_show_meltdown(struct device *dev,

				 struct device_attribute *attr, char *buf)

{

	return sprintf(buf, "Not affected\n");

	return sysfs_emit(buf, "Not affected\n");

}



ssize_t __weak cpu_show_spectre_v1(struct device *dev,

				   struct device_attribute *attr, char *buf)

{

	return sprintf(buf, "Not affected\n");

	return sysfs_emit(buf, "Not affected\n");

}



ssize_t __weak cpu_show_spectre_v2(struct device *dev,

				   struct device_attribute *attr, char *buf)

{

	return sprintf(buf, "Not affected\n");

	return sysfs_emit(buf, "Not affected\n");

}



ssize_t __weak cpu_show_spec_store_bypass(struct device *dev,

					  struct device_attribute *attr, char *buf)

{

	return sprintf(buf, "Not affected\n");

	return sysfs_emit(buf, "Not affected\n");

}



ssize_t __weak cpu_show_l1tf(struct device *dev,

			     struct device_attribute *attr, char *buf)

{

	return sprintf(buf, "Not affected\n");

	return sysfs_emit(buf, "Not affected\n");

}



ssize_t __weak cpu_show_mds(struct device *dev,

			    struct device_attribute *attr, char *buf)

{

	return sprintf(buf, "Not affected\n");

	return sysfs_emit(buf, "Not affected\n");

}



ssize_t __weak cpu_show_tsx_async_abort(struct device *dev,

					struct device_attribute *attr,

					char *buf)

{

	return sprintf(buf, "Not affected\n");

	return sysfs_emit(buf, "Not affected\n");

}



ssize_t __weak cpu_show_itlb_multihit(struct device *dev,

			    struct device_attribute *attr, char *buf)

{

	return sprintf(buf, "Not affected\n");

	return sysfs_emit(buf, "Not affected\n");

}



ssize_t __weak cpu_show_srbds(struct device *dev,

			      struct device_attribute *attr, char *buf)

{

	return sprintf(buf, "Not affected\n");

	return sysfs_emit(buf, "Not affected\n");

}



static DEVICE_ATTR(meltdown, 0444, cpu_show_meltdown, NULL);