]> www.infradead.org Git - users/jedix/linux-maple.git/commit
arm64: el2_setup.h: Make __init_el2_fgt labels consistent, again
authorRob Herring (Arm) <robh@kernel.org>
Tue, 20 May 2025 22:27:37 +0000 (17:27 -0500)
committerWill Deacon <will@kernel.org>
Thu, 22 May 2025 10:20:59 +0000 (11:20 +0100)
commit80834997154271da58fd69fa7fdfe8238750960e
tree9aa155a0cd8e2c471f3cb9ea08e8ac48bb8f7caf
parent694f574f741a9e5dd60c39aae5aaa34c18231e96
arm64: el2_setup.h: Make __init_el2_fgt labels consistent, again

Commit 5b39db6037e7 ("arm64: el2_setup.h: Rename some labels to be more
diff-friendly") reworked the labels in __init_el2_fgt to say what's
skipped rather than what the target location is. The exception was
"set_fgt_" which is where registers are written. In reviewing the BRBE
additions, Will suggested "set_debug_fgt_" where HDFGxTR_EL2 are
written. Doing that would partially revert commit 5b39db6037e7 undoing
the goal of minimizing additions here, but it would follow the
convention for labels where registers are written.

So let's do both. Branches that skip something go to a "skip" label and
places that set registers have a "set" label. This results in some
double labels, but it makes things entirely consistent.

While we're here, the SME skip label was incorrectly named, so fix it.

Reported-by: Will Deacon <will@kernel.org>
Cc: Dave Martin <Dave.Martin@arm.com>
Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
Link: https://lore.kernel.org/r/20250520-arm-brbe-v19-v22-2-c1ddde38e7f8@kernel.org
Signed-off-by: Will Deacon <will@kernel.org>
arch/arm64/include/asm/el2_setup.h