Commit bc37d9c8 authored Jan 25, 2023 by Greg Kroah-Hartman

Merge 5.4.230 into android11-5.4-lts



Changes in 5.4.230
	pNFS/filelayout: Fix coalescing test for single DS
	selftests/bpf: check null propagation only neither reg is PTR_TO_BTF_ID
	net/ethtool/ioctl: return -EOPNOTSUPP if we have no phy stats
	RDMA/srp: Move large values to a new enum for gcc13
	f2fs: let's avoid panic if extent_tree is not created
	wifi: brcmfmac: fix regression for Broadcom PCIe wifi devices
	Add exception protection processing for vd in axi_chan_handle_err function
	nilfs2: fix general protection fault in nilfs_btree_insert()
	efi: fix userspace infinite retry read efivars after EFI runtime services page fault
	drm/i915/gt: Reset twice
	ALSA: hda/realtek - Turn on power early
	xhci-pci: set the dma max_seg_size
	usb: xhci: Check endpoint is valid before dereferencing it
	xhci: Fix null pointer dereference when host dies
	xhci: Add update_hub_device override for PCI xHCI hosts
	xhci: Add a flag to disable USB3 lpm on a xhci root port level.
	usb: acpi: add helper to check port lpm capability using acpi _DSM
	xhci: Detect lpm incapable xHC USB3 roothub ports from ACPI tables
	prlimit: do_prlimit needs to have a speculation check
	USB: serial: option: add Quectel EM05-G (GR) modem
	USB: serial: option: add Quectel EM05-G (CS) modem
	USB: serial: option: add Quectel EM05-G (RS) modem
	USB: serial: option: add Quectel EC200U modem
	USB: serial: option: add Quectel EM05CN (SG) modem
	USB: serial: option: add Quectel EM05CN modem
	USB: misc: iowarrior: fix up header size for USB_DEVICE_ID_CODEMERCS_IOW100
	misc: fastrpc: Don't remove map on creater_process and device_release
	misc: fastrpc: Fix use-after-free race condition for maps
	usb: core: hub: disable autosuspend for TI TUSB8041
	comedi: adv_pci1760: Fix PWM instruction handling
	mmc: sunxi-mmc: Fix clock refcount imbalance during unbind
	btrfs: fix race between quota rescan and disable leading to NULL pointer deref
	cifs: do not include page data when checking signature
	USB: gadgetfs: Fix race between mounting and unmounting
	USB: serial: cp210x: add SCALANCE LPE-9000 device id
	usb: host: ehci-fsl: Fix module alias
	usb: typec: altmodes/displayport: Add pin assignment helper
	usb: typec: altmodes/displayport: Fix pin assignment calculation
	usb: gadget: g_webcam: Send color matching descriptor per frame
	usb: gadget: f_ncm: fix potential NULL ptr deref in ncm_bitrate()
	usb-storage: apply IGNORE_UAS only for HIKSEMI MD202 on RTL9210
	dt-bindings: phy: g12a-usb3-pcie-phy: fix compatible string documentation
	serial: pch_uart: Pass correct sg to dma_unmap_sg()
	dmaengine: tegra210-adma: fix global intr clear
	serial: atmel: fix incorrect baudrate setup
	gsmi: fix null-deref in gsmi_get_variable
	drm/i915: re-disable RC6p on Sandy Bridge
	drm/amd/display: Fix set scaling doesn's work
	drm/amd/display: Fix COLOR_SPACE_YCBCR2020_TYPE matrix
	x86/fpu: Use _Alignof to avoid undefined behavior in TYPE_ALIGN
	mm/khugepaged: fix collapse_pte_mapped_thp() to allow anon_vma
	Linux 5.4.230

Change-Id: I6ea8f9dd4f7fe6db9ffdf34f8b914498aa7e34c3
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

parents 931c2a07 90245959

Documentation/devicetree/bindings/phy/amlogic,meson-g12a-usb3-pcie-phy.yaml→Documentation/devicetree/bindings/phy/amlogic,g12a-usb3-pcie-phy.yaml

+3 −3

Original line number	Diff line number	Diff line
		@@ -2,7 +2,7 @@
		# Copyright 2019 BayLibre, SAS
		%YAML 1.2
		---
		$id: "http://devicetree.org/schemas/phy/amlogic,meson-g12a-usb3-pcie-phy.yaml#"
		$id: "http://devicetree.org/schemas/phy/amlogic,g12a-usb3-pcie-phy.yaml#"
		$schema: "http://devicetree.org/meta-schemas/core.yaml#"

		title: Amlogic G12A USB3 + PCIE Combo PHY
		@@ -13,7 +13,7 @@ maintainers:
		properties:
		compatible:
		enum:
		- amlogic,meson-g12a-usb3-pcie-phy
		- amlogic,g12a-usb3-pcie-phy

		reg:
		maxItems: 1
		@@ -47,7 +47,7 @@ required:
		examples:
		- \|
		phy@46000 {
		compatible = "amlogic,meson-g12a-usb3-pcie-phy";
		compatible = "amlogic,g12a-usb3-pcie-phy";
		reg = <0x46000 0x2000>;
		clocks = <&ref_clk>;
		clock-names = "ref_clk";

Makefile

+1 −1

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: GPL-2.0
		VERSION = 5
		PATCHLEVEL = 4
		SUBLEVEL = 229
		SUBLEVEL = 230
		EXTRAVERSION =
		NAME = Kleptomaniac Octopus

arch/x86/kernel/fpu/init.c

+2 −5

Original line number	Diff line number	Diff line
		@@ -139,9 +139,6 @@ static void __init fpu__init_system_generic(void)
		unsigned int fpu_kernel_xstate_size;
		EXPORT_SYMBOL_GPL(fpu_kernel_xstate_size);

		/* Get alignment of the TYPE. */
		#define TYPE_ALIGN(TYPE) offsetof(struct { char x; TYPE test; }, test)

		/*
		* Enforce that 'MEMBER' is the last field of 'TYPE'.
		*
		@@ -149,8 +146,8 @@ EXPORT_SYMBOL_GPL(fpu_kernel_xstate_size);
		* because that's how C aligns structs.
		*/
		#define CHECK_MEMBER_AT_END_OF(TYPE, MEMBER) \
		BUILD_BUG_ON(sizeof(TYPE) != ALIGN(offsetofend(TYPE, MEMBER), \
		TYPE_ALIGN(TYPE)))
		BUILD_BUG_ON(sizeof(TYPE) != \
		ALIGN(offsetofend(TYPE, MEMBER), _Alignof(TYPE)))

		/*
		* We append the 'struct fpu' to the task_struct:

drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -551,6 +551,11 @@ static noinline void axi_chan_handle_err(struct axi_dma_chan *chan, u32 status)

		/* The bad descriptor currently is in the head of vc list */
		vd = vchan_next_desc(&chan->vc);
		if (!vd) {
		dev_err(chan2dev(chan), "BUG: %s, IRQ with no descriptors\n",
		axi_chan_name(chan));
		goto out;
		}
		/* Remove the completed descriptor from issued list */
		list_del(&vd->node);

		@@ -565,6 +570,7 @@ static noinline void axi_chan_handle_err(struct axi_dma_chan *chan, u32 status)
		/* Try to restart the controller */
		axi_chan_start_first_queued(chan);

		out:
		spin_unlock_irqrestore(&chan->vc.lock, flags);
		}

drivers/dma/tegra210-adma.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -224,7 +224,7 @@ static int tegra_adma_init(struct tegra_adma *tdma)
		int ret;

		/* Clear any interrupts */
		tdma_write(tdma, tdma->cdata->global_int_clear, 0x1);
		tdma_write(tdma, tdma->cdata->ch_base_offset + tdma->cdata->global_int_clear, 0x1);

		/* Assert soft reset */
		tdma_write(tdma, ADMA_GLOBAL_SOFT_RESET, 0x1);