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

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

Merge 5.4.192 into android11-5.4-lts 



Changes in 5.4.192
	floppy: disable FDRAWCMD by default
	hamradio: defer 6pack kfree after unregister_netdev
	hamradio: remove needs_free_netdev to avoid UAF
	lightnvm: disable the subsystem
	usb: mtu3: fix USB 3.0 dual-role-switch from device to host
	USB: quirks: add a Realtek card reader
	USB: quirks: add STRING quirk for VCOM device
	USB: serial: whiteheat: fix heap overflow in WHITEHEAT_GET_DTR_RTS
	USB: serial: cp210x: add PIDs for Kamstrup USB Meter Reader
	USB: serial: option: add support for Cinterion MV32-WA/MV32-WB
	USB: serial: option: add Telit 0x1057, 0x1058, 0x1075 compositions
	xhci: stop polling roothubs after shutdown
	xhci: increase usb U3 -> U0 link resume timeout from 100ms to 500ms
	iio: dac: ad5592r: Fix the missing return value.
	iio: dac: ad5446: Fix read_raw not returning set value
	iio: magnetometer: ak8975: Fix the error handling in ak8975_power_on()
	usb: misc: fix improper handling of refcount in uss720_probe()
	usb: typec: ucsi: Fix role swapping
	usb: gadget: uvc: Fix crash when encoding data for usb request
	usb: gadget: configfs: clear deactivation flag in configfs_composite_unbind()
	usb: dwc3: core: Fix tx/rx threshold settings
	usb: dwc3: gadget: Return proper request status
	serial: imx: fix overrun interrupts in DMA mode
	serial: 8250: Also set sticky MCR bits in console restoration
	serial: 8250: Correct the clock for EndRun PTP/1588 PCIe device
	arch_topology: Do not set llc_sibling if llc_id is invalid
	hex2bin: make the function hex_to_bin constant-time
	hex2bin: fix access beyond string end
	video: fbdev: udlfb: properly check endpoint type
	arm64: dts: meson: remove CPU opps below 1GHz for G12B boards
	arm64: dts: meson: remove CPU opps below 1GHz for SM1 boards
	mtd: rawnand: fix ecc parameters for mt7622
	USB: Fix xhci event ring dequeue pointer ERDP update issue
	ARM: dts: imx6qdl-apalis: Fix sgtl5000 detection issue
	phy: samsung: Fix missing of_node_put() in exynos_sata_phy_probe
	phy: samsung: exynos5250-sata: fix missing device put in probe error paths
	ARM: OMAP2+: Fix refcount leak in omap_gic_of_init
	phy: ti: omap-usb2: Fix error handling in omap_usb2_enable_clocks
	ARM: dts: at91: Map MCLK for wm8731 on at91sam9g20ek
	phy: mapphone-mdm6600: Fix PM error handling in phy_mdm6600_probe
	phy: ti: Add missing pm_runtime_disable() in serdes_am654_probe
	ARM: dts: Fix mmc order for omap3-gta04
	ARM: dts: am3517-evm: Fix misc pinmuxing
	ARM: dts: logicpd-som-lv: Fix wrong pinmuxing on OMAP35
	ipvs: correctly print the memory size of ip_vs_conn_tab
	mtd: rawnand: Fix return value check of wait_for_completion_timeout
	bpf, lwt: Fix crash when using bpf_skb_set_tunnel_key() from bpf_xmit lwt hook
	tcp: md5: incorrect tcp_header_len for incoming connections
	tcp: ensure to use the most recently sent skb when filling the rate sample
	sctp: check asoc strreset_chunk in sctp_generate_reconf_event
	ARM: dts: imx6ull-colibri: fix vqmmc regulator
	arm64: dts: imx8mn-ddr4-evk: Describe the 32.768 kHz PMIC clock
	pinctrl: pistachio: fix use of irq_of_parse_and_map()
	cpufreq: fix memory leak in sun50i_cpufreq_nvmem_probe
	net: hns3: add validity check for message data length
	net/smc: sync err code when tcp connection was refused
	ip_gre: Make o_seqno start from 0 in native mode
	tcp: fix potential xmit stalls caused by TCP_NOTSENT_LOWAT
	bus: sunxi-rsb: Fix the return value of sunxi_rsb_device_create()
	clk: sunxi: sun9i-mmc: check return value after calling platform_get_resource()
	net: bcmgenet: hide status block before TX timestamping
	net: dsa: lantiq_gswip: Don't set GSWIP_MII_CFG_RMII_CLK
	drm/amd/display: Fix memory leak in dcn21_clock_source_create
	tls: Skip tls_append_frag on zero copy size
	bnx2x: fix napi API usage sequence
	ixgbe: ensure IPsec VF<->PF compatibility
	tcp: fix F-RTO may not work correctly when receiving DSACK
	ASoC: wm8731: Disable the regulator when probing fails
	ip6_gre: Avoid updating tunnel->tun_hlen in __gre6_xmit()
	x86: __memcpy_flushcache: fix wrong alignment if size > 2^32
	cifs: destage any unwritten data to the server before calling copychunk_write
	drivers: net: hippi: Fix deadlock in rr_close()
	net: ethernet: stmmac: fix write to sgmii_adapter_base
	x86/cpu: Load microcode during restore_processor_state()
	tty: n_gsm: fix wrong signal octet encoding in convergence layer type 2
	tty: n_gsm: fix malformed counter for out of frame data
	netfilter: nft_socket: only do sk lookups when indev is available
	tty: n_gsm: fix insufficient txframe size
	tty: n_gsm: fix missing explicit ldisc flush
	tty: n_gsm: fix wrong command retry handling
	tty: n_gsm: fix wrong command frame length field encoding
	tty: n_gsm: fix incorrect UA handling
	hugetlbfs: get unmapped area below TASK_UNMAPPED_BASE for hugetlbfs
	mm, hugetlb: allow for "high" userspace addresses
	Linux 5.4.192

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I151e1623022f3629b0cec0685db3ea08c62ab95d
parents 84c84ac7 1d72b776

Makefile

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

# SPDX-License-Identifier: GPL-2.0

VERSION = 5

VERSION = 5

PATCHLEVEL = 4

PATCHLEVEL = 4

SUBLEVEL = 191

SUBLEVEL = 192

EXTRAVERSION =

EXTRAVERSION =

NAME = Kleptomaniac Octopus

NAME = Kleptomaniac Octopus

arch/arm/boot/dts/am3517-evm.dts

+40 −5
Original line number Original line Diff line number Diff line
@@ -160,6 +160,8 @@ 




	/* HS USB Host PHY on PORT 1 */

	/* HS USB Host PHY on PORT 1 */

	hsusb1_phy: hsusb1_phy {

	hsusb1_phy: hsusb1_phy {

		pinctrl-names = "default";

		pinctrl-0 = <&hsusb1_rst_pins>;

		compatible = "usb-nop-xceiv";

		compatible = "usb-nop-xceiv";

		reset-gpios = <&gpio2 25 GPIO_ACTIVE_LOW>; /* gpio_57 */

		reset-gpios = <&gpio2 25 GPIO_ACTIVE_LOW>; /* gpio_57 */

		#phy-cells = <0>;

		#phy-cells = <0>;
@@ -167,6 +169,8 @@ 
};

};





&davinci_emac {

&davinci_emac {

	pinctrl-names = "default";

	pinctrl-0 = <&ethernet_pins>;

	status = "okay";

	status = "okay";

};

};
@@ -192,6 +196,8 @@ 
};

};





&i2c2 {

&i2c2 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c2_pins>;

	clock-frequency = <400000>;

	clock-frequency = <400000>;

	/* User DIP swithes [1:8] / User LEDS [1:2] */

	/* User DIP swithes [1:8] / User LEDS [1:2] */

	tca6416: gpio@21 {

	tca6416: gpio@21 {
@@ -204,6 +210,8 @@ 
};

};





&i2c3 {

&i2c3 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c3_pins>;

	clock-frequency = <400000>;

	clock-frequency = <400000>;

};

};
@@ -222,6 +230,8 @@ 
};

};





&usbhshost {

&usbhshost {

	pinctrl-names = "default";

	pinctrl-0 = <&hsusb1_pins>;

	port1-mode = "ehci-phy";

	port1-mode = "ehci-phy";

};

};
@@ -230,8 +240,35 @@ 
};

};





&omap3_pmx_core {

&omap3_pmx_core {

	pinctrl-names = "default";



	pinctrl-0 = <&hsusb1_rst_pins>;

	ethernet_pins: pinmux_ethernet_pins {

		pinctrl-single,pins = <

			OMAP3_CORE1_IOPAD(0x21fe, PIN_INPUT | MUX_MODE0) /* rmii_mdio_data */

			OMAP3_CORE1_IOPAD(0x2200, MUX_MODE0) /* rmii_mdio_clk */

			OMAP3_CORE1_IOPAD(0x2202, PIN_INPUT_PULLDOWN | MUX_MODE0) /* rmii_rxd0 */

			OMAP3_CORE1_IOPAD(0x2204, PIN_INPUT_PULLDOWN | MUX_MODE0) /* rmii_rxd1 */

			OMAP3_CORE1_IOPAD(0x2206, PIN_INPUT_PULLDOWN | MUX_MODE0) /* rmii_crs_dv */

			OMAP3_CORE1_IOPAD(0x2208, PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* rmii_rxer */

			OMAP3_CORE1_IOPAD(0x220a, PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* rmii_txd0 */

			OMAP3_CORE1_IOPAD(0x220c, PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* rmii_txd1 */

			OMAP3_CORE1_IOPAD(0x220e, PIN_OUTPUT_PULLDOWN |MUX_MODE0) /* rmii_txen */

			OMAP3_CORE1_IOPAD(0x2210, PIN_INPUT_PULLDOWN | MUX_MODE0) /* rmii_50mhz_clk */

		>;

	};



	i2c2_pins: pinmux_i2c2_pins {

		pinctrl-single,pins = <

			OMAP3_CORE1_IOPAD(0x21be, PIN_INPUT_PULLUP | MUX_MODE0)  /* i2c2_scl */

			OMAP3_CORE1_IOPAD(0x21c0, PIN_INPUT_PULLUP | MUX_MODE0)  /* i2c2_sda */

		>;

	};



	i2c3_pins: pinmux_i2c3_pins {

		pinctrl-single,pins = <

			OMAP3_CORE1_IOPAD(0x21c2, PIN_INPUT_PULLUP | MUX_MODE0)  /* i2c3_scl */

			OMAP3_CORE1_IOPAD(0x21c4, PIN_INPUT_PULLUP | MUX_MODE0)  /* i2c3_sda */

		>;

	};





	leds_pins: pinmux_leds_pins {

	leds_pins: pinmux_leds_pins {

		pinctrl-single,pins = <

		pinctrl-single,pins = <
@@ -299,8 +336,6 @@ 
};

};





&omap3_pmx_core2 {

&omap3_pmx_core2 {

	pinctrl-names = "default";

	pinctrl-0 = <&hsusb1_pins>;





	hsusb1_pins: pinmux_hsusb1_pins {

	hsusb1_pins: pinmux_hsusb1_pins {

		pinctrl-single,pins = <

		pinctrl-single,pins = <

arch/arm/boot/dts/am3517-som.dtsi

+9 −0
Original line number Original line Diff line number Diff line
@@ -69,6 +69,8 @@ 
};

};





&i2c1 {

&i2c1 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c1_pins>;

	clock-frequency = <400000>;

	clock-frequency = <400000>;





	s35390a: s35390a@30 {

	s35390a: s35390a@30 {
@@ -179,6 +181,13 @@ 




&omap3_pmx_core {

&omap3_pmx_core {





	i2c1_pins: pinmux_i2c1_pins {

		pinctrl-single,pins = <

			OMAP3_CORE1_IOPAD(0x21ba, PIN_INPUT_PULLUP | MUX_MODE0)  /* i2c1_scl */

			OMAP3_CORE1_IOPAD(0x21bc, PIN_INPUT_PULLUP | MUX_MODE0)  /* i2c1_sda */

		>;

	};



	wl12xx_buffer_pins: pinmux_wl12xx_buffer_pins {

	wl12xx_buffer_pins: pinmux_wl12xx_buffer_pins {

		pinctrl-single,pins = <

		pinctrl-single,pins = <

			OMAP3_CORE1_IOPAD(0x2156, PIN_OUTPUT | MUX_MODE4)  /* mmc1_dat7.gpio_129 */

			OMAP3_CORE1_IOPAD(0x2156, PIN_OUTPUT | MUX_MODE4)  /* mmc1_dat7.gpio_129 */

arch/arm/boot/dts/at91sam9g20ek_common.dtsi

+6 −0
Original line number Original line Diff line number Diff line
@@ -217,6 +217,12 @@ 
		wm8731: wm8731@1b {

		wm8731: wm8731@1b {

			compatible = "wm8731";

			compatible = "wm8731";

			reg = <0x1b>;

			reg = <0x1b>;



			/* PCK0 at 12MHz */

			clocks = <&pmc PMC_TYPE_SYSTEM 8>;

			clock-names = "mclk";

			assigned-clocks = <&pmc PMC_TYPE_SYSTEM 8>;

			assigned-clock-rates = <12000000>;

		};

		};

	};

	};

arch/arm/boot/dts/imx6qdl-apalis.dtsi

+8 −2
Original line number Original line Diff line number Diff line
@@ -314,6 +314,8 @@ 
	codec: sgtl5000@a {

	codec: sgtl5000@a {

		compatible = "fsl,sgtl5000";

		compatible = "fsl,sgtl5000";

		reg = <0x0a>;

		reg = <0x0a>;

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_sgtl5000>;

		clocks = <&clks IMX6QDL_CLK_CKO>;

		clocks = <&clks IMX6QDL_CLK_CKO>;

		VDDA-supply = <&reg_module_3v3_audio>;

		VDDA-supply = <&reg_module_3v3_audio>;

		VDDIO-supply = <&reg_module_3v3>;

		VDDIO-supply = <&reg_module_3v3>;
@@ -543,8 +545,6 @@ 
			MX6QDL_PAD_DISP0_DAT21__AUD4_TXD	0x130b0

			MX6QDL_PAD_DISP0_DAT21__AUD4_TXD	0x130b0

			MX6QDL_PAD_DISP0_DAT22__AUD4_TXFS	0x130b0

			MX6QDL_PAD_DISP0_DAT22__AUD4_TXFS	0x130b0

			MX6QDL_PAD_DISP0_DAT23__AUD4_RXD	0x130b0

			MX6QDL_PAD_DISP0_DAT23__AUD4_RXD	0x130b0

			/* SGTL5000 sys_mclk */

			MX6QDL_PAD_GPIO_5__CCM_CLKO1		0x130b0

		>;

		>;

	};

	};
@@ -810,6 +810,12 @@ 
		>;

		>;

	};

	};





	pinctrl_sgtl5000: sgtl5000grp {

		fsl,pins = <

			MX6QDL_PAD_GPIO_5__CCM_CLKO1	0x130b0

		>;

	};



	pinctrl_spdif: spdifgrp {

	pinctrl_spdif: spdifgrp {

		fsl,pins = <

		fsl,pins = <

			MX6QDL_PAD_GPIO_16__SPDIF_IN  0x1b0b0

			MX6QDL_PAD_GPIO_16__SPDIF_IN  0x1b0b0