| From: Michael Ellerman <mpe@ellerman.id.au> |
| Date: Tue, 17 Apr 2018 00:39:02 +1000 |
| Subject: powerpc/lib: Fix feature fixup test of external branch |
| |
| commit 32810d91325ec76b8ef4df463f8a0e9baf353322 upstream. |
| |
| 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> |
| Signed-off-by: Ben Hutchings <ben@decadent.org.uk> |
| --- |
| arch/powerpc/lib/feature-fixups-test.S | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- 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 |
