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

!5736 Backport 5.10.202 LTS patches from upstream 

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

Conflicts:
context confilict(1):
dedf2a0eb944  SUNRPC: Fix RPC client cleaned up the freed pipefs dentries

Already merged(7):
f475d5502f33  drm/amdgpu: Fix a null pointer access when the smc_rreg pointer is NULL
3c1ad03a5ff2  ext4: correct return value of ext4_convert_meta_bg
e97bf4ada7dd  crypto: pcrypt - Fix hungtask for PADATA_RESET
b0eac93bae42  net: hns3: fix variable may not initialized problem in hns3_init_mac_addr()
072f0eb962c9  net: hns3: fix VF reset fail issue 
f729cf6f3217  jbd2: fix potential data lost in recovering journal raced with synchronizing fs bdev
c6e8af2a8a63  io_uring/fdinfo: lock SQ thread while retrieving thread cpu/pid

Rejected(3):
8cf6b6658541  x86/cpu/hygon: Fix the CPU topology evaluation for real
a98172e36e5f  tracing: Have trace_event_file have ref counters
43b781e7cb5c  ipvlan: add ipvlan_route_v6_outbound() helper

Total patches: 184 - 7 - 3 = 174 
 
Link:https://gitee.com/openeuler/kernel/pulls/5736

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents f680a9f7 6bffeb61

arch/arm/include/asm/exception.h

+0 −4
Original line number Diff line number Diff line
@@ -10,10 +10,6 @@ 


#include <linux/interrupt.h>



#ifdef CONFIG_FUNCTION_GRAPH_TRACER

#define __exception_irq_entry	__irq_entry

#else

#define __exception_irq_entry

#endif



#endif /* __ASM_ARM_EXCEPTION_H */

arch/arm64/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -1059,6 +1059,8 @@ choice 
config CPU_BIG_ENDIAN

	bool "Build big-endian kernel"

	depends on !LD_IS_LLD || LLD_VERSION >= 130000

	# https://github.com/llvm/llvm-project/commit/1379b150991f70a5782e9a143c2ba5308da1161c

	depends on AS_IS_GNU || AS_VERSION >= 150000

	help

	  Say Y if you plan on running a kernel with a big-endian userspace.

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

+5 −10
Original line number Diff line number Diff line
@@ -129,12 +129,6 @@ 
		};

	};



	tcsr_mutex: hwlock {

		compatible = "qcom,tcsr-mutex";

		syscon = <&tcsr_mutex_regs 0 0x80>;

		#hwlock-cells = <1>;

	};



	pmuv8: pmu {

		compatible = "arm,cortex-a53-pmu";

		interrupts = <GIC_PPI 7 (GIC_CPU_MASK_SIMPLE(4) |
@@ -175,7 +169,7 @@ 
	smem {

		compatible = "qcom,smem";

		memory-region = <&smem_region>;

		hwlocks = <&tcsr_mutex 0>;

		hwlocks = <&tcsr_mutex 3>;

	};



	soc: soc {
@@ -242,9 +236,10 @@ 
			#reset-cells = <1>;

		};



		tcsr_mutex_regs: syscon@1905000 {

			compatible = "syscon";

			reg = <0x0 0x01905000 0x0 0x8000>;

		tcsr_mutex: hwlock@1905000 {

			compatible = "qcom,ipq6018-tcsr-mutex", "qcom,tcsr-mutex";

			reg = <0x0 0x01905000 0x0 0x20000>;

			#hwlock-cells = <1>;

		};



		tcsr_q6: syscon@1945000 {

arch/parisc/include/uapi/asm/pdc.h

+1 −0
Original line number Diff line number Diff line
@@ -465,6 +465,7 @@ struct pdc_model { /* for PDC_MODEL */ 
	unsigned long arch_rev;

	unsigned long pot_key;

	unsigned long curr_key;

	unsigned long width;	/* default of PSW_W bit (1=enabled) */

};



struct pdc_cache_cf {		/* for PDC_CACHE  (I/D-caches) */

arch/parisc/kernel/entry.S

+3 −4
Original line number Diff line number Diff line
@@ -497,13 +497,13 @@ 
	 * to a CPU TLB 4k PFN (4k => 12 bits to shift) */

	#define PAGE_ADD_SHIFT		(PAGE_SHIFT-12)

	#define PAGE_ADD_HUGE_SHIFT	(REAL_HPAGE_SHIFT-12)

	#define PFN_START_BIT	(63-ASM_PFN_PTE_SHIFT+(63-58)-PAGE_ADD_SHIFT)



	/* Drop prot bits and convert to page addr for iitlbt and idtlbt */

	.macro		convert_for_tlb_insert20 pte,tmp

#ifdef CONFIG_HUGETLB_PAGE

	copy		\pte,\tmp

	extrd,u		\tmp,(63-ASM_PFN_PTE_SHIFT)+(63-58)+PAGE_ADD_SHIFT,\

				64-PAGE_SHIFT-PAGE_ADD_SHIFT,\pte

	extrd,u		\tmp,PFN_START_BIT,PFN_START_BIT+1,\pte



	depdi		_PAGE_SIZE_ENCODING_DEFAULT,63,\

				(63-58)+PAGE_ADD_SHIFT,\pte
@@ -511,8 +511,7 @@ 
	depdi		_HUGE_PAGE_SIZE_ENCODING_DEFAULT,63,\

				(63-58)+PAGE_ADD_HUGE_SHIFT,\pte

#else /* Huge pages disabled */

	extrd,u		\pte,(63-ASM_PFN_PTE_SHIFT)+(63-58)+PAGE_ADD_SHIFT,\

				64-PAGE_SHIFT-PAGE_ADD_SHIFT,\pte

	extrd,u		\pte,PFN_START_BIT,PFN_START_BIT+1,\pte

	depdi		_PAGE_SIZE_ENCODING_DEFAULT,63,\

				(63-58)+PAGE_ADD_SHIFT,\pte

#endif