Commit e18398e8 authored by Josh Poimboeuf's avatar Josh Poimboeuf Committed by Peter Zijlstra
Browse files

Revert "objtool: Support addition to set CFA base" 



Commit 468af56a ("objtool: Support addition to set CFA base") was
added as a preparatory patch for arm64 support, but that support never
came.  It triggers a false positive warning on x86, so just revert it
for now.

Fixes the following warning:

  vmlinux.o: warning: objtool: cdce925_regmap_i2c_write+0xdb: stack state mismatch: cfa1=4+120 cfa2=5+40

Fixes: 468af56a ("objtool: Support addition to set CFA base")
Reported-by: default avatarkernel test robot <lkp@intel.com>
Signed-off-by: default avatarJosh Poimboeuf <jpoimboe@kernel.org>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lore.kernel.org/oe-kbuild-all/202304080538.j5G6h1AB-lkp@intel.com/
parent f571da05

tools/objtool/check.c

+0 −11
Original line number Diff line number Diff line
@@ -3002,17 +3002,6 @@ static int update_cfi_state(struct instruction *insn, 
				break;

			}



			if (!cfi->drap && op->src.reg == CFI_SP &&

			    op->dest.reg == CFI_BP && cfa->base == CFI_SP &&

			    check_reg_frame_pos(&regs[CFI_BP], -cfa->offset + op->src.offset)) {



				/* lea disp(%rsp), %rbp */

				cfa->base = CFI_BP;

				cfa->offset -= op->src.offset;

				cfi->bp_scratch = false;

				break;

			}



			if (op->src.reg == CFI_SP && cfa->base == CFI_SP) {



				/* drap: lea disp(%rsp), %drap */