| Message ID | 20180416143905.2716-2-mpe@ellerman.id.au (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 32810d91325ec76b8ef4df463f8a0e9baf353322 |
| Headers | show |
| Series | [1/5] powerpc/lib: Fix off-by-one in alternate feature patching | expand |
On Mon, 2018-04-16 at 14:39:02 UTC, Michael Ellerman wrote: > The expected case for this test was wrong, the source of the alternate > code sequence is: > > FTR_SECTION_ELSE > 2: or 2,2,2 > PPC_LCMPI r3,1 > beq 3f > blt 2b > b 3f > b 1b > ALT_FTR_SECTION_END(0, 1) > 3: or 1,1,1 > or 2,2,2 > 4: or 3,3,3 > > So when it's patched the '3' label should still be on the 'or 1,1,1', > and the 4 label is irrelevant and can be removed. > > Fixes: 362e7701fd18 ("powerpc: Add self-tests of the feature fixup code") > Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Patches 2-5 applied to powerpc next. https://git.kernel.org/powerpc/c/32810d91325ec76b8ef4df463f8a0e cheers
diff --git a/arch/powerpc/lib/feature-fixups-test.S b/arch/powerpc/lib/feature-fixups-test.S index f4613118132e..12ff0f673956 100644 --- a/arch/powerpc/lib/feature-fixups-test.S +++ b/arch/powerpc/lib/feature-fixups-test.S @@ -167,9 +167,9 @@ globl(ftr_fixup_test6_expected) blt 2b b 3f b 1b -2: or 1,1,1 +3: or 1,1,1 or 2,2,2 -3: or 3,3,3 + or 3,3,3 #if 0
The expected case for this test was wrong, the source of the alternate code sequence is: FTR_SECTION_ELSE 2: or 2,2,2 PPC_LCMPI r3,1 beq 3f blt 2b b 3f b 1b ALT_FTR_SECTION_END(0, 1) 3: or 1,1,1 or 2,2,2 4: or 3,3,3 So when it's patched the '3' label should still be on the 'or 1,1,1', and the 4 label is irrelevant and can be removed. Fixes: 362e7701fd18 ("powerpc: Add self-tests of the feature fixup code") Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> --- arch/powerpc/lib/feature-fixups-test.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)