lkml.org 
[lkml]   [2022]   [Apr]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v9 05/12] riscv: extend concatenated alternatives-lines to the same length
    Date
    ALT_NEW_CONTENT already uses same-length assembler lines, so
    extend this to the other elements as well.

    This makes it more readable when these elements need to be extended
    in the future.

    Signed-off-by: Heiko Stuebner <heiko@sntech.de>
    ---
    arch/riscv/include/asm/alternative-macros.h | 20 ++++++++++----------
    1 file changed, 10 insertions(+), 10 deletions(-)

    diff --git a/arch/riscv/include/asm/alternative-macros.h b/arch/riscv/include/asm/alternative-macros.h
    index 9e04cd53afc8..8c2bbc7bbe50 100644
    --- a/arch/riscv/include/asm/alternative-macros.h
    +++ b/arch/riscv/include/asm/alternative-macros.h
    @@ -62,14 +62,14 @@
    #include <asm/asm.h>
    #include <linux/stringify.h>

    -#define ALT_ENTRY(oldptr, newptr, vendor_id, errata_id, newlen) \
    - RISCV_PTR " " oldptr "\n" \
    - RISCV_PTR " " newptr "\n" \
    - REG_ASM " " vendor_id "\n" \
    - REG_ASM " " newlen "\n" \
    +#define ALT_ENTRY(oldptr, newptr, vendor_id, errata_id, newlen) \
    + RISCV_PTR " " oldptr "\n" \
    + RISCV_PTR " " newptr "\n" \
    + REG_ASM " " vendor_id "\n" \
    + REG_ASM " " newlen "\n" \
    ".word " errata_id "\n"

    -#define ALT_NEW_CONTENT(vendor_id, errata_id, enable, new_c) \
    +#define ALT_NEW_CONTENT(vendor_id, errata_id, enable, new_c) \
    ".if " __stringify(enable) " == 1\n" \
    ".pushsection .alternative, \"a\"\n" \
    ALT_ENTRY("886b", "888f", __stringify(vendor_id), __stringify(errata_id), "889f - 888f") \
    @@ -83,10 +83,10 @@
    ".org . - (889b - 888b) + (887b - 886b)\n" \
    ".endif\n"

    -#define __ALTERNATIVE_CFG(old_c, new_c, vendor_id, errata_id, enable) \
    - "886 :\n" \
    - old_c "\n" \
    - "887 :\n" \
    +#define __ALTERNATIVE_CFG(old_c, new_c, vendor_id, errata_id, enable) \
    + "886 :\n" \
    + old_c "\n" \
    + "887 :\n" \
    ALT_NEW_CONTENT(vendor_id, errata_id, enable, new_c)

    #define _ALTERNATIVE_CFG(old_c, new_c, vendor_id, errata_id, CONFIG_k) \
    --
    2.35.1
    \
     
     \ /
      Last update: 2022-04-13 08:14    [W:4.864 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site