Commit 65d89570 authored May 15, 2024 by Greg Kroah-Hartman

Merge 5.4.275 into android11-5.4-lts



Changes in 5.4.275
	batman-adv: Avoid infinite loop trying to resize local TT
	Bluetooth: Fix memory leak in hci_req_sync_complete()
	nouveau: fix function cast warning
	net: openvswitch: fix unwanted error log on timeout policy probing
	u64_stats: fix u64_stats_init() for lockdep when used repeatedly in one file
	geneve: fix header validation in geneve[6]_xmit_skb
	ipv6: fib: hide unused 'pn' variable
	ipv4/route: avoid unused-but-set-variable warning
	ipv6: fix race condition between ipv6_get_ifaddr and ipv6_del_addr
	net/mlx5: Properly link new fs rules into the tree
	af_unix: Do not use atomic ops for unix_sk(sk)->inflight.
	af_unix: Fix garbage collector racing against connect()
	net: ena: Fix potential sign extension issue
	btrfs: qgroup: correctly model root qgroup rsv in convert
	drm/client: Fully protect modes[] with dev->mode_config.mutex
	vhost: Add smp_rmb() in vhost_vq_avail_empty()
	selftests: timers: Fix abs() warning in posix_timers test
	x86/apic: Force native_apic_mem_read() to use the MOV instruction
	btrfs: record delayed inode root in transaction
	selftests/ftrace: Limit length in subsystem-enable tests
	kprobes: Fix possible use-after-free issue on kprobe registration
	Revert "tracing/trigger: Fix to return error if failed to alloc snapshot"
	netfilter: nf_tables: Fix potential data-race in __nft_expr_type_get()
	tun: limit printing rate when illegal packet received by tun dev
	RDMA/rxe: Fix the problem "mutex_destroy missing"
	RDMA/mlx5: Fix port number for counter query in multi-port configuration
	drm: nv04: Fix out of bounds access
	clk: Remove prepare_lock hold assertion in __clk_release()
	clk: Mark 'all_lists' as const
	clk: remove extra empty line
	clk: Print an info line before disabling unused clocks
	clk: Initialize struct clk_core kref earlier
	clk: Get runtime PM before walking tree during disable_unused
	x86/cpufeatures: Fix dependencies for GFNI, VAES, and VPCLMULQDQ
	binder: check offset alignment in binder_get_object()
	comedi: vmk80xx: fix incomplete endpoint checking
	serial/pmac_zilog: Remove flawed mitigation for rx irq flood
	USB: serial: option: add Fibocom FM135-GL variants
	USB: serial: option: add support for Fibocom FM650/FG650
	USB: serial: option: add Lonsung U8300/U9300 product
	USB: serial: option: support Quectel EM060K sub-models
	USB: serial: option: add Rolling RW101-GL and RW135-GL support
	USB: serial: option: add Telit FN920C04 rmnet compositions
	Revert "usb: cdc-wdm: close race between read and workqueue"
	usb: dwc2: host: Fix dereference issue in DDMA completion flow.
	usb: Disable USB3 LPM at shutdown
	speakup: Avoid crash on very long word
	fs: sysfs: Fix reference leak in sysfs_break_active_protection()
	nouveau: fix instmem race condition around ptr stores
	nilfs2: fix OOB in nilfs_set_de_type
	KVM: async_pf: Cleanup kvm_setup_async_pf()
	arm64: dts: rockchip: fix alphabetical ordering RK3399 puma
	arm64: dts: rockchip: enable internal pull-up on PCIE_WAKE# for RK3399 Puma
	arm64: dts: mediatek: mt7622: fix IR nodename
	arm64: dts: mediatek: mt7622: fix ethernet controller "compatible"
	arm64: dts: mediatek: mt7622: drop "reset-names" from thermal block
	arm64: dts: mt2712: add ethernet device node
	arm64: dts: mediatek: mt2712: fix validation errors
	ARC: [plat-hsdk]: Remove misplaced interrupt-cells property
	vxlan: drop packets from invalid src-address
	mlxsw: core: Unregister EMAD trap using FORWARD action
	NFC: trf7970a: disable all regulators on removal
	net: usb: ax88179_178a: stop lying about skb->truesize
	net: gtp: Fix Use-After-Free in gtp_dellink
	ipvs: Fix checksumming on GSO of SCTP packets
	net: openvswitch: Fix Use-After-Free in ovs_ct_exit
	mlxsw: spectrum_acl_tcam: Fix race during rehash delayed work
	mlxsw: spectrum_acl_tcam: Fix possible use-after-free during activity update
	mlxsw: spectrum_acl_tcam: Fix possible use-after-free during rehash
	mlxsw: spectrum_acl_tcam: Rate limit error message
	mlxsw: spectrum_acl_tcam: Fix memory leak during rehash
	mlxsw: spectrum_acl_tcam: Fix warning during rehash
	mlxsw: spectrum_acl_tcam: Fix incorrect list API usage
	mlxsw: spectrum_acl_tcam: Fix memory leak when canceling rehash work
	i40e: Do not use WQ_MEM_RECLAIM flag for workqueue
	iavf: Fix TC config comparison with existing adapter TC config
	af_unix: Suppress false-positive lockdep splat for spin_lock() in __unix_gc().
	serial: core: Provide port lock wrappers
	serial: mxs-auart: add spinlock around changing cts state
	drm/amdgpu: restrict bo mapping within gpu address limits
	amdgpu: validate offset_in_bo of drm_amdgpu_gem_va
	drm/amdgpu: validate the parameters of bo mapping operations more clearly
	Revert "crypto: api - Disallow identical driver names"
	net/mlx5e: Fix a race in command alloc flow
	tracing: Show size of requested perf buffer
	tracing: Increase PERF_MAX_TRACE_SIZE to handle Sentinel1 and docker together
	Bluetooth: Fix type of len in {l2cap,sco}_sock_getsockopt_old()
	Bluetooth: btusb: Add Realtek RTL8852BE support ID 0x0bda:0x4853
	btrfs: fix information leak in btrfs_ioctl_logical_to_ino()
	arm64: dts: rockchip: enable internal pull-up for Q7_THRM# on RK3399 Puma
	drm/amdgpu: Fix leak when GPU memory allocation fails
	irqchip/gic-v3-its: Prevent double free on error
	ethernet: Add helper for assigning packet type when dest address does not match device address
	net: b44: set pause params only when interface is up
	stackdepot: respect __GFP_NOLOCKDEP allocation flag
	mtd: diskonchip: work around ubsan link failure
	tcp: Clean up kernel listener's reqsk in inet_twsk_purge()
	tcp: Fix NEW_SYN_RECV handling in inet_twsk_purge()
	dmaengine: owl: fix register access functions
	idma64: Don't try to serve interrupts when device is powered off
	i2c: smbus: fix NULL function pointer dereference
	HID: i2c-hid: remove I2C_HID_READ_PENDING flag to prevent lock-up
	bounds: Use the right number of bits for power-of-two CONFIG_NR_CPUS
	dm: limit the number of targets and parameter size area
	udp: preserve the connected status if only UDP cmsg
	serial: core: fix kernel-doc for uart_port_unlock_irqrestore()
	Linux 5.4.275

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

parents 181edea1 936e689e

Makefile

+1 −1

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

arch/arc/boot/dts/hsdk.dts

+0 −1

Original line number	Diff line number	Diff line
		@@ -205,7 +205,6 @@
		};

		gmac: ethernet@8000 {
		#interrupt-cells = <1>;
		compatible = "snps,dwmac";
		reg = <0x8000 0x2000>;
		interrupts = <10>;

arch/arm64/boot/dts/mediatek/mt2712-evb.dts

+76 −2

Original line number	Diff line number	Diff line
		@@ -105,15 +105,89 @@
		proc-supply = <&cpus_fixed_vproc1>;
		};

		&eth {
		phy-mode ="rgmii-rxid";
		phy-handle = <&ethernet_phy0>;
		mediatek,tx-delay-ps = <1530>;
		snps,reset-gpio = <&pio 87 GPIO_ACTIVE_LOW>;
		pinctrl-names = "default", "sleep";
		pinctrl-0 = <&eth_default>;
		pinctrl-1 = <&eth_sleep>;
		status = "okay";

		mdio {
		compatible = "snps,dwmac-mdio";
		#address-cells = <1>;
		#size-cells = <0>;
		ethernet_phy0: ethernet-phy@5 {
		compatible = "ethernet-phy-id0243.0d90";
		reg = <0x5>;
		};
		};
		};

		&pio {
		usb0_id_pins_float: usb0_iddig {
		eth_default: eth-default-pins {
		tx_pins {
		pinmux = <MT2712_PIN_71_GBE_TXD3__FUNC_GBE_TXD3>,
		<MT2712_PIN_72_GBE_TXD2__FUNC_GBE_TXD2>,
		<MT2712_PIN_73_GBE_TXD1__FUNC_GBE_TXD1>,
		<MT2712_PIN_74_GBE_TXD0__FUNC_GBE_TXD0>,
		<MT2712_PIN_75_GBE_TXC__FUNC_GBE_TXC>,
		<MT2712_PIN_76_GBE_TXEN__FUNC_GBE_TXEN>;
		drive-strength = <MTK_DRIVE_8mA>;
		};
		rx_pins {
		pinmux = <MT2712_PIN_78_GBE_RXD3__FUNC_GBE_RXD3>,
		<MT2712_PIN_79_GBE_RXD2__FUNC_GBE_RXD2>,
		<MT2712_PIN_80_GBE_RXD1__FUNC_GBE_RXD1>,
		<MT2712_PIN_81_GBE_RXD0__FUNC_GBE_RXD0>,
		<MT2712_PIN_82_GBE_RXDV__FUNC_GBE_RXDV>,
		<MT2712_PIN_84_GBE_RXC__FUNC_GBE_RXC>;
		input-enable;
		};
		mdio_pins {
		pinmux = <MT2712_PIN_85_GBE_MDC__FUNC_GBE_MDC>,
		<MT2712_PIN_86_GBE_MDIO__FUNC_GBE_MDIO>;
		drive-strength = <MTK_DRIVE_8mA>;
		input-enable;
		};
		};

		eth_sleep: eth-sleep-pins {
		tx_pins {
		pinmux = <MT2712_PIN_71_GBE_TXD3__FUNC_GPIO71>,
		<MT2712_PIN_72_GBE_TXD2__FUNC_GPIO72>,
		<MT2712_PIN_73_GBE_TXD1__FUNC_GPIO73>,
		<MT2712_PIN_74_GBE_TXD0__FUNC_GPIO74>,
		<MT2712_PIN_75_GBE_TXC__FUNC_GPIO75>,
		<MT2712_PIN_76_GBE_TXEN__FUNC_GPIO76>;
		};
		rx_pins {
		pinmux = <MT2712_PIN_78_GBE_RXD3__FUNC_GPIO78>,
		<MT2712_PIN_79_GBE_RXD2__FUNC_GPIO79>,
		<MT2712_PIN_80_GBE_RXD1__FUNC_GPIO80>,
		<MT2712_PIN_81_GBE_RXD0__FUNC_GPIO81>,
		<MT2712_PIN_82_GBE_RXDV__FUNC_GPIO82>,
		<MT2712_PIN_84_GBE_RXC__FUNC_GPIO84>;
		input-disable;
		};
		mdio_pins {
		pinmux = <MT2712_PIN_85_GBE_MDC__FUNC_GPIO85>,
		<MT2712_PIN_86_GBE_MDIO__FUNC_GPIO86>;
		input-disable;
		bias-disable;
		};
		};

		usb0_id_pins_float: usb0-iddig-pins {
		pins_iddig {
		pinmux = <MT2712_PIN_12_IDDIG_P0__FUNC_IDDIG_A>;
		bias-pull-up;
		};
		};

		usb1_id_pins_float: usb1_iddig {
		usb1_id_pins_float: usb1-iddig-pins {
		pins_iddig {
		pinmux = <MT2712_PIN_14_IDDIG_P1__FUNC_IDDIG_B>;
		bias-pull-up;

arch/arm64/boot/dts/mediatek/mt2712e.dtsi

+67 −1

Original line number	Diff line number	Diff line
		@@ -249,10 +249,11 @@
		#clock-cells = <1>;
		};

		infracfg: syscon@10001000 {
		infracfg: clock-controller@10001000 {
		compatible = "mediatek,mt2712-infracfg", "syscon";
		reg = <0 0x10001000 0 0x1000>;
		#clock-cells = <1>;
		#reset-cells = <1>;
		};

		pericfg: syscon@10003000 {
		@@ -632,6 +633,71 @@
		status = "disabled";
		};

		stmmac_axi_setup: stmmac-axi-config {
		snps,wr_osr_lmt = <0x7>;
		snps,rd_osr_lmt = <0x7>;
		snps,blen = <0 0 0 0 16 8 4>;
		};

		mtl_rx_setup: rx-queues-config {
		snps,rx-queues-to-use = <1>;
		snps,rx-sched-sp;
		queue0 {
		snps,dcb-algorithm;
		snps,map-to-dma-channel = <0x0>;
		snps,priority = <0x0>;
		};
		};

		mtl_tx_setup: tx-queues-config {
		snps,tx-queues-to-use = <3>;
		snps,tx-sched-wrr;
		queue0 {
		snps,weight = <0x10>;
		snps,dcb-algorithm;
		snps,priority = <0x0>;
		};
		queue1 {
		snps,weight = <0x11>;
		snps,dcb-algorithm;
		snps,priority = <0x1>;
		};
		queue2 {
		snps,weight = <0x12>;
		snps,dcb-algorithm;
		snps,priority = <0x2>;
		};
		};

		eth: ethernet@1101c000 {
		compatible = "mediatek,mt2712-gmac";
		reg = <0 0x1101c000 0 0x1300>;
		interrupts = <GIC_SPI 237 IRQ_TYPE_LEVEL_LOW>;
		interrupt-names = "macirq";
		mac-address = [00 55 7b b5 7d f7];
		clock-names = "axi",
		"apb",
		"mac_main",
		"ptp_ref";
		clocks = <&pericfg CLK_PERI_GMAC>,
		<&pericfg CLK_PERI_GMAC_PCLK>,
		<&topckgen CLK_TOP_ETHER_125M_SEL>,
		<&topckgen CLK_TOP_ETHER_50M_SEL>;
		assigned-clocks = <&topckgen CLK_TOP_ETHER_125M_SEL>,
		<&topckgen CLK_TOP_ETHER_50M_SEL>;
		assigned-clock-parents = <&topckgen CLK_TOP_ETHERPLL_125M>,
		<&topckgen CLK_TOP_APLL1_D3>;
		power-domains = <&scpsys MT2712_POWER_DOMAIN_AUDIO>;
		mediatek,pericfg = <&pericfg>;
		snps,axi-config = <&stmmac_axi_setup>;
		snps,mtl-rx-config = <&mtl_rx_setup>;
		snps,mtl-tx-config = <&mtl_tx_setup>;
		snps,txpbl = <1>;
		snps,rxpbl = <1>;
		clk_csr = <0>;
		status = "disabled";
		};

		mmc0: mmc@11230000 {
		compatible = "mediatek,mt2712-mmc";
		reg = <0 0x11230000 0 0x1000>;

arch/arm64/boot/dts/mediatek/mt7622.dtsi

+2 −5

Original line number	Diff line number	Diff line
		@@ -244,7 +244,7 @@
		clock-names = "hif_sel";
		};

		cir: cir@10009000 {
		cir: ir-receiver@10009000 {
		compatible = "mediatek,mt7622-cir";
		reg = <0 0x10009000 0 0x1000>;
		interrupts = <GIC_SPI 175 IRQ_TYPE_LEVEL_LOW>;
		@@ -507,7 +507,6 @@
		<&pericfg CLK_PERI_AUXADC_PD>;
		clock-names = "therm", "auxadc";
		resets = <&pericfg MT7622_PERI_THERM_SW_RST>;
		reset-names = "therm";
		mediatek,auxadc = <&auxadc>;
		mediatek,apmixedsys = <&apmixedsys>;
		nvmem-cells = <&thermal_calibration>;
		@@ -901,9 +900,7 @@
		};

		eth: ethernet@1b100000 {
		compatible = "mediatek,mt7622-eth",
		"mediatek,mt2701-eth",
		"syscon";
		compatible = "mediatek,mt7622-eth";
		reg = <0 0x1b100000 0 0x20000>;
		interrupts = <GIC_SPI 223 IRQ_TYPE_LEVEL_LOW>,
		<GIC_SPI 224 IRQ_TYPE_LEVEL_LOW>,