Unverified Commit ace32245 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!2465 Backport 5.10.177 LTS patches from upstream 

Merge Pull Request from: @sanglipeng 
 
issue：https://gitee.com/openeuler/kernel/issues/I88YNP

Backport 5.10.177 LTS patches from upstream.

Conflicts:

context conflict(2):  
7958663668ef: KVM: Pre-allocate cpumasks for kvm_make_all_cpus_request_except()
18359b8e30c4: power: supply: bq24190_charger: using pm_runtime_resume_and_get instead of pm_runtime_get_sync

Already merged(14):
2b346876b931: power: supply: bq24190: Fix use after free bug in bq24190_remove due to race condition
75e2144291e8: power: supply: da9150: Fix use after free bug in da9150_charger_remove due to race condition
bfeeb3aaad4e: xirc2ps_cs: Fix use after free bug in xirc2ps_detach
ddcf83200036: perf/core: Fix perf_output_begin parameter is incorrectly invoked in perf_event_bpf_output
1fde5782f187: net: tls: fix possible race condition between do_tls_getsockopt_conf() and do_tls_setsockopt_conf()
c09cdf6eb815: scsi: scsi_dh_alua: Fix memleak for 'qdata' in alua_activate()
cb5879efde4f: net: qcom/emac: Fix use after free bug in emac_remove due to race condition
aae6d1bf4d8e: dm thin: fix deadlock when swapping to thin device
1eaa2b7ae90c: i2c: xgene-slimpro: Fix out-of-bounds bug in xgene_slimpro_i2c_xfer()
c68f08cc7456: dm stats: check for and propagate alloc_percpu failure
66ff37993dd7: dm crypt: add cond_resched() to dmcrypt_write()
cb61e1e36fb3: xfs: shut down the filesystem if we screw up quota reservation
a6d345c3a31e: xfs: don't reuse busy extents on extent trim
5f6347034341: btrfs: fix race between quota disable and quota assign ioctls

Rejected(2):
18dd825b8651: perf: fix perf_event_context->time
3392d67af0a4: ext4: fix kernel BUG in 'ext4_write_inline_data_end()

Kabi broken(1):
d04dac7fae75: net: mdio: fix owner field for mdio buses registered using device-tree

Total patches: 172 - 14 - 2 -1 = 155 
 
Link:https://gitee.com/openeuler/kernel/pulls/2465

 

Reviewed-by: default avatarzhao xiaoqiang <zhaoxiaoqiang11@jd.com>
Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 65c1f15a bebe723b

arch/arm/boot/dts/e60k02.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -296,6 +296,7 @@ 


&usbotg1 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_usbotg1>;

	disable-over-current;

	srp-disable;

	hnp-disable;

arch/arm/boot/dts/imx6sl-tolino-shine2hd.dts

+1 −0
Original line number Diff line number Diff line
@@ -580,6 +580,7 @@ 


&usbotg1 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_usbotg1>;

	disable-over-current;

	srp-disable;

	hnp-disable;

arch/m68k/kernel/traps.c

+3 −1
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include <linux/init.h>

#include <linux/ptrace.h>

#include <linux/kallsyms.h>

#include <linux/extable.h>



#include <asm/setup.h>

#include <asm/fpu.h>
@@ -549,7 +550,8 @@ static inline void bus_error030 (struct frame *fp) 
			errorcode |= 2;



		if (mmusr & (MMU_I | MMU_WP)) {

			if (ssw & 4) {

			/* We might have an exception table for this PC */

			if (ssw & 4 && !search_exception_tables(fp->ptregs.pc)) {

				pr_err("Data %s fault at %#010lx in %s (pc=%#lx)\n",

				       ssw & RW ? "read" : "write",

				       fp->un.fmtb.daddr,

arch/mips/bmips/dma.c

+5 −0
Original line number Diff line number Diff line
@@ -64,6 +64,8 @@ phys_addr_t dma_to_phys(struct device *dev, dma_addr_t dma_addr) 
	return dma_addr;

}



bool bmips_rac_flush_disable;



void arch_sync_dma_for_cpu_all(void)

{

	void __iomem *cbr = BMIPS_GET_CBR();
@@ -74,6 +76,9 @@ void arch_sync_dma_for_cpu_all(void) 
	    boot_cpu_type() != CPU_BMIPS4380)

		return;



	if (unlikely(bmips_rac_flush_disable))

		return;



	/* Flush stale data out of the readahead cache */

	cfg = __raw_readl(cbr + BMIPS_RAC_CONFIG);

	__raw_writel(cfg | 0x100, cbr + BMIPS_RAC_CONFIG);

arch/mips/bmips/setup.c

+8 −0
Original line number Diff line number Diff line
@@ -34,6 +34,8 @@ 
#define REG_BCM6328_OTP		((void __iomem *)CKSEG1ADDR(0x1000062c))

#define BCM6328_TP1_DISABLED	BIT(9)



extern bool bmips_rac_flush_disable;



static const unsigned long kbase = VMLINUX_LOAD_ADDRESS & 0xfff00000;



struct bmips_quirk {
@@ -103,6 +105,12 @@ static void bcm6358_quirks(void) 
	 * disable SMP for now

	 */

	bmips_smp_enabled = 0;



	/*

	 * RAC flush causes kernel panics on BCM6358 when booting from TP1

	 * because the bootloader is not initializing it properly.

	 */

	bmips_rac_flush_disable = !!(read_c0_brcm_cmt_local() & (1 << 31));

}



static void bcm6368_quirks(void)