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

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

Merge 5.4.290 into android11-5.4-lts 



Changes in 5.4.290
	jbd2: flush filesystem device before updating tail sequence
	dm array: fix releasing a faulty array block twice in dm_array_cursor_end
	dm array: fix unreleased btree blocks on closing a faulty array cursor
	dm array: fix cursor index when skipping across block boundaries
	ieee802154: ca8210: Add missing check for kfifo_alloc() in ca8210_probe()
	net: 802: LLC+SNAP OID:PID lookup on start of skb data
	tcp/dccp: complete lockless accesses to sk->sk_max_ack_backlog
	tcp/dccp: allow a connection when sk_max_ack_backlog is zero
	net_sched: cls_flow: validate TCA_FLOW_RSHIFT attribute
	tls: Fix tls_sw_sendmsg error handling
	dm thin: make get_first_thin use rcu-safe list first function
	sctp: sysctl: cookie_hmac_alg: avoid using current->nsproxy
	sctp: sysctl: auth_enable: avoid using current->nsproxy
	drm/amd/display: Add check for granularity in dml ceil/floor helpers
	ACPI: resource: Add TongFang GM5HG0A to irq1_edge_low_force_override[]
	ACPI: resource: Add Asus Vivobook X1504VAP to irq1_level_low_skip_override[]
	drm/amd/display: increase MAX_SURFACES to the value supported by hw
	USB: serial: option: add MeiG Smart SRM815
	USB: serial: option: add Neoway N723-EA support
	staging: iio: ad9834: Correct phase range check
	staging: iio: ad9832: Correct phase range check
	usb-storage: Add max sectors quirk for Nokia 208
	USB: serial: cp210x: add Phoenix Contact UPS Device
	usb: gadget: u_serial: Disable ep before setting port to null to fix the crash caused by port being null
	USB: usblp: return error when setting unsupported protocol
	USB: core: Disable LPM only for non-suspended ports
	usb: fix reference leak in usb_new_device()
	usb: gadget: f_fs: Remove WARN_ON in functionfs_bind
	iio: pressure: zpa2326: fix information leak in triggered buffer
	iio: dummy: iio_simply_dummy_buffer: fix information leak in triggered buffer
	iio: light: vcnl4035: fix information leak in triggered buffer
	iio: imu: kmx61: fix information leak in triggered buffer
	iio: adc: ti-ads8688: fix information leak in triggered buffer
	iio: gyro: fxas21002c: Fix missing data update in trigger handler
	iio: adc: ti-ads124s08: Use gpiod_set_value_cansleep()
	iio: adc: at91: call input_free_device() on allocated iio_dev
	iio: inkern: call iio_device_put() only on mapped devices
	arm64: dts: rockchip: fix defines in pd_vio node for rk3399
	arm64: dts: rockchip: fix pd_tcpc0 and pd_tcpc1 node position on rk3399
	arm64: dts: rockchip: add #power-domain-cells to power domain nodes
	arm64: dts: rockchip: add hevc power domain clock to rk3328
	phy: core: fix code style in devm_of_phy_provider_unregister
	phy: core: Fix that API devm_of_phy_provider_unregister() fails to unregister the phy provider
	ocfs2: correct return value of ocfs2_local_free_info()
	ocfs2: fix slab-use-after-free due to dangling pointer dqi_priv
	sctp: sysctl: rto_min/max: avoid using current->nsproxy
	net: ethernet: ti: cpsw_ale: Fix cpsw_ale_get_field()
	net: net_namespace: Optimize the code
	net: add exit_batch_rtnl() method
	gtp: use exit_batch_rtnl() method
	gtp: Use for_each_netdev_rcu() in gtp_genl_dump_pdp().
	gtp: Destroy device along with udp socket's netns dismantle.
	nfp: bpf: prevent integer overflow in nfp_bpf_event_output()
	drm/v3d: Ensure job pointer is set to NULL after job completion
	i2c: mux: demux-pinctrl: check initial mux selection, too
	mac802154: check local interfaces before deleting sdata list
	hfs: Sanity check the root record
	kheaders: Ignore silly-rename files
	poll_wait: add mb() to fix theoretical race between waitqueue_active() and .poll()
	nvmet: propagate npwg topology
	net: ethernet: xgbe: re-add aneg to supported features in PHY quirks
	fs/proc: fix softlockup in __read_vmcore (part 2)
	irqchip/gic-v3: Handle CPU_PM_ENTER_FAILED correctly
	hrtimers: Handle CPU state correctly on hotplug
	ipv6: avoid possible NULL deref in rt6_uncached_list_flush_dev()
	scsi: sg: Fix slab-use-after-free read in sg_release()
	net: fix data-races around sk->sk_forward_alloc
	ASoC: wm8994: Add depends on MFD core
	scsi: iscsi: Fix redundant response for ISCSI_UEVENT_GET_HOST_STATS request
	irqchip/sunxi-nmi: Add missing SKIP_WAKE flag
	gfs2: Truncate address space when flipping GFS2_DIF_JDATA flag
	m68k: Update ->thread.esp0 before calling syscall_trace() in ret_from_signal
	m68k: Add missing mmap_read_lock() to sys_cacheflush()
	signal/m68k: Use force_sigsegv(SIGSEGV) in fpsp040_die
	net: xen-netback: hash.c: Use built-in RCU list checking
	net/xen-netback: prevent UAF in xenvif_flush_hash()
	vfio/platform: check the bounds of read/write syscalls
	ext4: avoid ext4_error()'s caused by ENOMEM in the truncate path
	ext4: fix slab-use-after-free in ext4_split_extent_at()
	USB: serial: quatech2: fix null-ptr-deref in qt2_process_read_urb()
	Revert "usb: gadget: u_serial: Disable ep before setting port to null to fix the crash caused by port being null"
	Input: atkbd - map F23 key to support default copilot shortcut
	Input: xpad - add unofficial Xbox 360 wireless receiver clone
	Input: xpad - add support for wooting two he (arm)
	drm/v3d: Assign job pointer to NULL before signaling the fence
	xhci: use pm_ptr() instead of #ifdef for CONFIG_PM conditionals
	Partial revert of xhci: use pm_ptr() instead #ifdef for CONFIG_PM conditionals
	Linux 5.4.290

Change-Id: Ie2e10bc16d6eb9da965c01168b2b8854e5dfaf8c
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 0e97c4cf 856a2248

Makefile

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

VERSION = 5

PATCHLEVEL = 4

SUBLEVEL = 289

SUBLEVEL = 290

EXTRAVERSION =

NAME = Kleptomaniac Octopus

arch/arm64/boot/dts/rockchip/px30.dtsi

+8 −0
Original line number Diff line number Diff line
@@ -219,12 +219,14 @@ 
					 <&cru HCLK_OTG>,

					 <&cru SCLK_OTG_ADP>;

				pm_qos = <&qos_usb_host>, <&qos_usb_otg>;

				#power-domain-cells = <0>;

			};

			power-domain@PX30_PD_SDCARD {

				reg = <PX30_PD_SDCARD>;

				clocks = <&cru HCLK_SDMMC>,

					 <&cru SCLK_SDMMC>;

				pm_qos = <&qos_sdmmc>;

				#power-domain-cells = <0>;

			};

			power-domain@PX30_PD_GMAC {

				reg = <PX30_PD_GMAC>;
@@ -233,6 +235,7 @@ 
					 <&cru SCLK_MAC_REF>,

					 <&cru SCLK_GMAC_RX_TX>;

				pm_qos = <&qos_gmac>;

				#power-domain-cells = <0>;

			};

			power-domain@PX30_PD_MMC_NAND {

				reg = <PX30_PD_MMC_NAND>;
@@ -246,6 +249,7 @@ 
					  <&cru SCLK_SFC>;

				pm_qos = <&qos_emmc>, <&qos_nand>,

					 <&qos_sdio>, <&qos_sfc>;

				#power-domain-cells = <0>;

			};

			power-domain@PX30_PD_VPU {

				reg = <PX30_PD_VPU>;
@@ -253,6 +257,7 @@ 
					 <&cru HCLK_VPU>,

					 <&cru SCLK_CORE_VPU>;

				pm_qos = <&qos_vpu>, <&qos_vpu_r128>;

				#power-domain-cells = <0>;

			};

			power-domain@PX30_PD_VO {

				reg = <PX30_PD_VO>;
@@ -269,6 +274,7 @@ 
					 <&cru SCLK_VOPB_PWM>;

				pm_qos = <&qos_rga_rd>, <&qos_rga_wr>,

					 <&qos_vop_m0>, <&qos_vop_m1>;

				#power-domain-cells = <0>;

			};

			power-domain@PX30_PD_VI {

				reg = <PX30_PD_VI>;
@@ -280,11 +286,13 @@ 
				pm_qos = <&qos_isp_128>, <&qos_isp_rd>,

					 <&qos_isp_wr>, <&qos_isp_m1>,

					 <&qos_vip>;

				#power-domain-cells = <0>;

			};

			power-domain@PX30_PD_GPU {

				reg = <PX30_PD_GPU>;

				clocks = <&cru SCLK_GPU>;

				pm_qos = <&qos_gpu>;

				#power-domain-cells = <0>;

			};

		};

	};

arch/arm64/boot/dts/rockchip/rk3328.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -272,13 +272,17 @@ 


			power-domain@RK3328_PD_HEVC {

				reg = <RK3328_PD_HEVC>;

				clocks = <&cru SCLK_VENC_CORE>;

				#power-domain-cells = <0>;

			};

			power-domain@RK3328_PD_VIDEO {

				reg = <RK3328_PD_VIDEO>;

				#power-domain-cells = <0>;

			};

			power-domain@RK3328_PD_VPU {

				reg = <RK3328_PD_VPU>;

				clocks = <&cru ACLK_VPU>, <&cru HCLK_VPU>;

				#power-domain-cells = <0>;

			};

		};

arch/arm64/boot/dts/rockchip/rk3399.dtsi

+30 −10
Original line number Diff line number Diff line
@@ -1001,6 +1001,7 @@ 
				clocks = <&cru ACLK_IEP>,

					 <&cru HCLK_IEP>;

				pm_qos = <&qos_iep>;

				#power-domain-cells = <0>;

			};

			pd_rga@RK3399_PD_RGA {

				reg = <RK3399_PD_RGA>;
@@ -1008,12 +1009,14 @@ 
					 <&cru HCLK_RGA>;

				pm_qos = <&qos_rga_r>,

					 <&qos_rga_w>;

				#power-domain-cells = <0>;

			};

			pd_vcodec@RK3399_PD_VCODEC {

				reg = <RK3399_PD_VCODEC>;

				clocks = <&cru ACLK_VCODEC>,

					 <&cru HCLK_VCODEC>;

				pm_qos = <&qos_video_m0>;

				#power-domain-cells = <0>;

			};

			pd_vdu@RK3399_PD_VDU {

				reg = <RK3399_PD_VDU>;
@@ -1021,6 +1024,7 @@ 
					 <&cru HCLK_VDU>;

				pm_qos = <&qos_video_m1_r>,

					 <&qos_video_m1_w>;

				#power-domain-cells = <0>;

			};



			/* These power domains are grouped by VD_GPU */
@@ -1028,43 +1032,63 @@ 
				reg = <RK3399_PD_GPU>;

				clocks = <&cru ACLK_GPU>;

				pm_qos = <&qos_gpu>;

				#power-domain-cells = <0>;

			};



			/* These power domains are grouped by VD_LOGIC */

			pd_edp@RK3399_PD_EDP {

				reg = <RK3399_PD_EDP>;

				clocks = <&cru PCLK_EDP_CTRL>;

				#power-domain-cells = <0>;

			};

			pd_emmc@RK3399_PD_EMMC {

				reg = <RK3399_PD_EMMC>;

				clocks = <&cru ACLK_EMMC>;

				pm_qos = <&qos_emmc>;

				#power-domain-cells = <0>;

			};

			pd_gmac@RK3399_PD_GMAC {

				reg = <RK3399_PD_GMAC>;

				clocks = <&cru ACLK_GMAC>,

					 <&cru PCLK_GMAC>;

				pm_qos = <&qos_gmac>;

				#power-domain-cells = <0>;

			};

			pd_sd@RK3399_PD_SD {

				reg = <RK3399_PD_SD>;

				clocks = <&cru HCLK_SDMMC>,

					 <&cru SCLK_SDMMC>;

				pm_qos = <&qos_sd>;

				#power-domain-cells = <0>;

			};

			pd_sdioaudio@RK3399_PD_SDIOAUDIO {

				reg = <RK3399_PD_SDIOAUDIO>;

				clocks = <&cru HCLK_SDIO>;

				pm_qos = <&qos_sdioaudio>;

				#power-domain-cells = <0>;

			};

			pd_tcpc0@RK3399_PD_TCPD0 {

				reg = <RK3399_PD_TCPD0>;

				clocks = <&cru SCLK_UPHY0_TCPDCORE>,

					 <&cru SCLK_UPHY0_TCPDPHY_REF>;

				#power-domain-cells = <0>;

			};

			pd_tcpc1@RK3399_PD_TCPD1 {

				reg = <RK3399_PD_TCPD1>;

				clocks = <&cru SCLK_UPHY1_TCPDCORE>,

					 <&cru SCLK_UPHY1_TCPDPHY_REF>;

				#power-domain-cells = <0>;

			};

			pd_usb3@RK3399_PD_USB3 {

				reg = <RK3399_PD_USB3>;

				clocks = <&cru ACLK_USB3>;

				pm_qos = <&qos_usb_otg0>,

					 <&qos_usb_otg1>;

				#power-domain-cells = <0>;

			};

			pd_vio@RK3399_PD_VIO {

				reg = <RK3399_PD_VIO>;

				#power-domain-cells = <1>;

				#address-cells = <1>;

				#size-cells = <0>;
@@ -1074,6 +1098,7 @@ 
						 <&cru HCLK_HDCP>,

						 <&cru PCLK_HDCP>;

					pm_qos = <&qos_hdcp>;

					#power-domain-cells = <0>;

				};

				pd_isp0@RK3399_PD_ISP0 {

					reg = <RK3399_PD_ISP0>;
@@ -1081,6 +1106,7 @@ 
						 <&cru HCLK_ISP0>;

					pm_qos = <&qos_isp0_m0>,

						 <&qos_isp0_m1>;

					#power-domain-cells = <0>;

				};

				pd_isp1@RK3399_PD_ISP1 {

					reg = <RK3399_PD_ISP1>;
@@ -1088,19 +1114,11 @@ 
						 <&cru HCLK_ISP1>;

					pm_qos = <&qos_isp1_m0>,

						 <&qos_isp1_m1>;

				};

				pd_tcpc0@RK3399_PD_TCPC0 {

					reg = <RK3399_PD_TCPD0>;

					clocks = <&cru SCLK_UPHY0_TCPDCORE>,

						 <&cru SCLK_UPHY0_TCPDPHY_REF>;

				};

				pd_tcpc1@RK3399_PD_TCPC1 {

					reg = <RK3399_PD_TCPD1>;

					clocks = <&cru SCLK_UPHY1_TCPDCORE>,

						 <&cru SCLK_UPHY1_TCPDPHY_REF>;

					#power-domain-cells = <0>;

				};

				pd_vo@RK3399_PD_VO {

					reg = <RK3399_PD_VO>;

					#power-domain-cells = <1>;

					#address-cells = <1>;

					#size-cells = <0>;
@@ -1110,12 +1128,14 @@ 
							 <&cru HCLK_VOP0>;

						pm_qos = <&qos_vop_big_r>,

							 <&qos_vop_big_w>;

						#power-domain-cells = <0>;

					};

					pd_vopl@RK3399_PD_VOPL {

						reg = <RK3399_PD_VOPL>;

						clocks = <&cru ACLK_VOP1>,

							 <&cru HCLK_VOP1>;

						pm_qos = <&qos_vop_little>;

						#power-domain-cells = <0>;

					};

				};

			};

arch/m68k/fpsp040/skeleton.S

+2 −1
Original line number Diff line number Diff line
@@ -502,7 +502,8 @@ in_ea: 
	.section .fixup,"ax"

	.even

1:

	jbra	fpsp040_die

	jbsr	fpsp040_die

	jbra	.Lnotkern



	.section __ex_table,"a"

	.align	4