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

!12135 Backport 5.10.217 LTS patches from upstream 

Merge Pull Request from: @sanglipeng 
 
https://gitee.com/openeuler/kernel/issues/IAWLXC

Conflicts:
Already merged(27):
db6740b4e1343  dmaengine: pl330: issue_pending waits until WFP state
00d09857f8073  dmaengine: Revert "dmaengine: pl330: issue_pending waits until WFP state"
5a730a161ac22  wifi: nl80211: don't free NULL coalescing rule
b2643d2532eee  eeprom: at24: Use dev_err_probe for nvmem register failure
ec9dbddea26b3  eeprom: at24: Probe for DDR3 thermal sensor in the SPD case
c850f71fca09e  eeprom: at24: fix memory corruption race condition
20c91ac14bdc8  pinctrl: pinctrl-aspeed-g6: Fix register offset for pinconf of GPIOR-T
734d2dad607e8  pinctrl/meson: fix typo in PDM's pin name
288bc4aa75f15  pinctrl: core: delete incorrect free in pinctrl_enable()
d676152a7b416  pinctrl: mediatek: paris: Rework mtk_pinconf_{get,set} switch/case logic
e0e916a21e704  pinctrl: mediatek: paris: Fix PIN_CONFIG_INPUT_SCHMITT_ENABLE readback
a3f1a38733d9e  pinctrl: mediatek: paris: Rework support for PIN_CONFIG_{INPUT,OUTPUT}_ENABLE
95ebd5fc15b75  sunrpc: add a struct rpc_stats arg to rpc_create_args
6eef21eb7a165  nfs: expose /proc/net/sunrpc/nfs in net namespaces
afdbc21a92a0c. nfs: make the rpc_stat per net namespace
d4891d817350c. nfs: Handle error of rpc_proc_register() in nfs_net_init().
5ea5d0619779a. power: rt9455: hide unused rt9455_boost_voltage_values
6f0f19b79c085  bna: ensure the copied buf is NUL terminated
ad498539dda08  scsi: bnx2fc: Remove spin_lock_bh while releasing resources after upload
5a605930e19f4  fs/9p: only translate RWX permissions for plain 9P2000
33a6e92161a78  Bluetooth: Fix use-after-free bugs caused by sco_sock_timeout
06acb75e7ed60  Bluetooth: l2cap: fix null-ptr-deref in l2cap_chan_timeout
f085e02f0a32f  phonet: fix rtm_phonet_notify() skb allocation
3284447d66ec2  net: hns3: use appropriate barrier function after setting a bit value
cca330c59c542  firewire: nosy: ensure user_length is taken into account when fetching packet contents
3cd682357c616  drm/vmwgfx: Fix invalid reads in fence signaled events
fb5b347efd1bd  md: fix kmemleak of rdev->serial

Kabi broken(1):
a4b7606732293  xfrm: Preserve vlan tags for transport mode software GRO

Total patches: 90 - 27 - 1 = 62 
 
Link:https://gitee.com/openeuler/kernel/pulls/12135

 

Reviewed-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents caaf346b 96df899e

arch/arm64/boot/dts/qcom/msm8998.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -949,10 +949,10 @@ 
			interrupts = <GIC_SPI 405 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "msi";

			interrupt-map-mask = <0 0 0 0x7>;

			interrupt-map =	<0 0 0 1 &intc 0 135 IRQ_TYPE_LEVEL_HIGH>,

					<0 0 0 2 &intc 0 136 IRQ_TYPE_LEVEL_HIGH>,

					<0 0 0 3 &intc 0 138 IRQ_TYPE_LEVEL_HIGH>,

					<0 0 0 4 &intc 0 139 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-map =	<0 0 0 1 &intc 0 0 135 IRQ_TYPE_LEVEL_HIGH>,

					<0 0 0 2 &intc 0 0 136 IRQ_TYPE_LEVEL_HIGH>,

					<0 0 0 3 &intc 0 0 138 IRQ_TYPE_LEVEL_HIGH>,

					<0 0 0 4 &intc 0 0 139 IRQ_TYPE_LEVEL_HIGH>;



			clocks = <&gcc GCC_PCIE_0_PIPE_CLK>,

				 <&gcc GCC_PCIE_0_MSTR_AXI_CLK>,

arch/arm64/boot/dts/qcom/sdm845.dtsi

+8 −8
Original line number Diff line number Diff line
@@ -1824,10 +1824,10 @@ 
			interrupt-names = "msi";

			#interrupt-cells = <1>;

			interrupt-map-mask = <0 0 0 0x7>;

			interrupt-map = <0 0 0 1 &intc 0 149 IRQ_TYPE_LEVEL_HIGH>, /* int_a */

					<0 0 0 2 &intc 0 150 IRQ_TYPE_LEVEL_HIGH>, /* int_b */

					<0 0 0 3 &intc 0 151 IRQ_TYPE_LEVEL_HIGH>, /* int_c */

					<0 0 0 4 &intc 0 152 IRQ_TYPE_LEVEL_HIGH>; /* int_d */

			interrupt-map = <0 0 0 1 &intc 0 0 0 149 IRQ_TYPE_LEVEL_HIGH>, /* int_a */

					<0 0 0 2 &intc 0 0 0 150 IRQ_TYPE_LEVEL_HIGH>, /* int_b */

					<0 0 0 3 &intc 0 0 0 151 IRQ_TYPE_LEVEL_HIGH>, /* int_c */

					<0 0 0 4 &intc 0 0 0 152 IRQ_TYPE_LEVEL_HIGH>; /* int_d */



			clocks = <&gcc GCC_PCIE_0_PIPE_CLK>,

				 <&gcc GCC_PCIE_0_AUX_CLK>,
@@ -1928,10 +1928,10 @@ 
			interrupt-names = "msi";

			#interrupt-cells = <1>;

			interrupt-map-mask = <0 0 0 0x7>;

			interrupt-map = <0 0 0 1 &intc 0 434 IRQ_TYPE_LEVEL_HIGH>, /* int_a */

					<0 0 0 2 &intc 0 435 IRQ_TYPE_LEVEL_HIGH>, /* int_b */

					<0 0 0 3 &intc 0 438 IRQ_TYPE_LEVEL_HIGH>, /* int_c */

					<0 0 0 4 &intc 0 439 IRQ_TYPE_LEVEL_HIGH>; /* int_d */

			interrupt-map = <0 0 0 1 &intc 0 0 0 434 IRQ_TYPE_LEVEL_HIGH>, /* int_a */

					<0 0 0 2 &intc 0 0 0 435 IRQ_TYPE_LEVEL_HIGH>, /* int_b */

					<0 0 0 3 &intc 0 0 0 438 IRQ_TYPE_LEVEL_HIGH>, /* int_c */

					<0 0 0 4 &intc 0 0 0 439 IRQ_TYPE_LEVEL_HIGH>; /* int_d */



			clocks = <&gcc GCC_PCIE_1_PIPE_CLK>,

				 <&gcc GCC_PCIE_1_AUX_CLK>,

arch/mips/include/asm/ptrace.h

+1 −1
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ static inline long regs_return_value(struct pt_regs *regs) 
#define instruction_pointer(regs) ((regs)->cp0_epc)

#define profile_pc(regs) instruction_pointer(regs)



extern asmlinkage long syscall_trace_enter(struct pt_regs *regs, long syscall);

extern asmlinkage long syscall_trace_enter(struct pt_regs *regs);

extern asmlinkage void syscall_trace_leave(struct pt_regs *regs);



extern void die(const char *, struct pt_regs *) __noreturn;

arch/mips/kernel/asm-offsets.c

+1 −0
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ void output_thread_info_defines(void) 
	OFFSET(TI_PRE_COUNT, thread_info, preempt_count);

	OFFSET(TI_ADDR_LIMIT, thread_info, addr_limit);

	OFFSET(TI_REGS, thread_info, regs);

	OFFSET(TI_SYSCALL, thread_info, syscall);

	DEFINE(_THREAD_SIZE, THREAD_SIZE);

	DEFINE(_THREAD_MASK, THREAD_MASK);

	DEFINE(_IRQ_STACK_SIZE, IRQ_STACK_SIZE);

arch/mips/kernel/ptrace.c

+6 −9
Original line number Diff line number Diff line
@@ -1310,16 +1310,13 @@ long arch_ptrace(struct task_struct *child, long request, 
 * Notification of system call entry/exit

 * - triggered by current->work.syscall_trace

 */

asmlinkage long syscall_trace_enter(struct pt_regs *regs, long syscall)

asmlinkage long syscall_trace_enter(struct pt_regs *regs)

{

	user_exit();



	current_thread_info()->syscall = syscall;



	if (test_thread_flag(TIF_SYSCALL_TRACE)) {

		if (tracehook_report_syscall_entry(regs))

			return -1;

		syscall = current_thread_info()->syscall;

	}



#ifdef CONFIG_SECCOMP
@@ -1328,7 +1325,7 @@ asmlinkage long syscall_trace_enter(struct pt_regs *regs, long syscall) 
		struct seccomp_data sd;

		unsigned long args[6];



		sd.nr = syscall;

		sd.nr = current_thread_info()->syscall;

		sd.arch = syscall_get_arch(current);

		syscall_get_arguments(current, regs, args);

		for (i = 0; i < 6; i++)
@@ -1338,23 +1335,23 @@ asmlinkage long syscall_trace_enter(struct pt_regs *regs, long syscall) 
		ret = __secure_computing(&sd);

		if (ret == -1)

			return ret;

		syscall = current_thread_info()->syscall;

	}

#endif



	if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))

		trace_sys_enter(regs, regs->regs[2]);



	audit_syscall_entry(syscall, regs->regs[4], regs->regs[5],

	audit_syscall_entry(current_thread_info()->syscall,

			    regs->regs[4], regs->regs[5],

			    regs->regs[6], regs->regs[7]);



	/*

	 * Negative syscall numbers are mistaken for rejected syscalls, but

	 * won't have had the return value set appropriately, so we do so now.

	 */

	if (syscall < 0)

	if (current_thread_info()->syscall < 0)

		syscall_set_return_value(current, regs, -ENOSYS, 0);

	return syscall;

	return current_thread_info()->syscall;

}



/*