[ Sasha's backport helper bot ]
Hi,
✅ All tests passed successfully. No issues detected. No action required from the submitter.
The upstream commit SHA1 provided is correct: 97e58e395e9c074fd096dad13c54e9f4112cf71d
WARNING: Author mismatch between patch and upstream commit: Backport author: Pu Lehuipulehui@huaweicloud.com Commit author: Hou Taohoutao1@huawei.com
Status in newer kernel trees: 6.15.y | Present (exact SHA1) 6.14.y | Present (exact SHA1) 6.12.y | Present (exact SHA1) 6.6.y | Present (exact SHA1) 6.1.y | Present (exact SHA1) 5.15.y | Not found
Note: The patch differs from the upstream commit: --- 1: 97e58e395e9c0 ! 1: 8387fc9ea68d2 arm64: move AARCH64_BREAK_FAULT into insn-def.h @@ Metadata ## Commit message ## arm64: move AARCH64_BREAK_FAULT into insn-def.h
+ [ Upstream commit 97e58e395e9c074fd096dad13c54e9f4112cf71d ] + If CONFIG_ARM64_LSE_ATOMICS is off, encoders for LSE-related instructions can return AARCH64_BREAK_FAULT directly in insn.h. In order to access AARCH64_BREAK_FAULT in insn.h, we can not include debug-monitors.h in @@ Commit message Signed-off-by: Hou Tao houtao1@huawei.com Link: https://lore.kernel.org/r/20220217072232.1186625-2-houtao1@huawei.com Signed-off-by: Will Deacon will@kernel.org + Conflicts: + arch/arm64/include/asm/insn.h + [not exist insn-def.h file, move to insn.h] + Signed-off-by: Pu Lehui pulehui@huawei.com
## arch/arm64/include/asm/debug-monitors.h ## @@ @@ arch/arm64/include/asm/debug-monitors.h (AARCH64_BREAK_MON | (KGDB_DYN_DBG_BRK_IMM << 5))
- ## arch/arm64/include/asm/insn-def.h ## + ## arch/arm64/include/asm/insn.h ## @@ - #ifndef __ASM_INSN_DEF_H - #define __ASM_INSN_DEF_H - -+#include <asm/brk-imm.h> -+ /* A64 instructions are always 32 bits. */ #define AARCH64_INSN_SIZE 4
@@ arch/arm64/include/asm/insn-def.h + * BRK instruction encoding + * The #imm16 value should be placed at bits[20:5] within BRK ins + */ -+#define AARCH64_BREAK_MON 0xd4200000 ++#define AARCH64_BREAK_MON 0xd4200000 + +/* + * BRK instruction for provoking a fault on purpose + * Unlike kgdb, #imm16 value with unallocated handler is used for faulting. + */ -+#define AARCH64_BREAK_FAULT (AARCH64_BREAK_MON | (FAULT_BRK_IMM << 5)) ++#define AARCH64_BREAK_FAULT (AARCH64_BREAK_MON | (FAULT_BRK_IMM << 5)) + - #endif /* __ASM_INSN_DEF_H */ + #ifndef __ASSEMBLY__ + /* + * ARM Architecture Reference Manual for ARMv8 Profile-A, Issue A.a ---
Results of testing on various branches:
| Branch | Patch Apply | Build Test | |---------------------------|-------------|------------| | stable/linux-5.15.y | Success | Success |