From: "Heiko Stübner" <heiko@sntech.de>
To: linux-riscv@lists.infradead.org, Andrew Jones <ajones@ventanamicro.com>
Cc: Paul Walmsley <paul.walmsley@sifive.com>,
Palmer Dabbelt <palmer@dabbelt.com>,
Albert Ou <aou@eecs.berkeley.edu>,
Conor Dooley <conor.dooley@microchip.com>,
Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>,
prabhakar.csengg@gmail.com
Subject: Re: [PATCH v2 3/4] riscv: alternatives: Drop the underscores from the assembly macro names
Date: Wed, 30 Nov 2022 11:06:27 +0100 [thread overview]
Message-ID: <4168918.X9hSmTKtgW@diego> (raw)
In-Reply-To: <20221129150053.50464-4-ajones@ventanamicro.com>
Am Dienstag, 29. November 2022, 16:00:52 CET schrieb Andrew Jones:
> The underscores aren't needed because there isn't anything already
> named without them and the _CFG extension. This is a bit of a cleanup
> by itself, but the real motivation is for a coming patch which would
> otherwise need to add two more underscores to these macro names,
> i.e. ____ALTERNATIVE_CFG, and that'd be gross.
>
> Signed-off-by: Andrew Jones <ajones@ventanamicro.com>
Hmm, I would assume the "_" are there to mark those as
"internal / don't use". So with removing the underscores
you loose that marking.
It works though, so
Tested-by: Heiko Stuebner <heiko.stuebner@vrull.eu>
But I'll leave the judgement on its viability to others.
Heiko
> ---
> 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 7cc2b587c5c4..9ea95331a280 100644
> --- a/arch/riscv/include/asm/alternative-macros.h
> +++ b/arch/riscv/include/asm/alternative-macros.h
> @@ -33,7 +33,7 @@
> .endif
> .endm
>
> -.macro __ALTERNATIVE_CFG old_c, new_c, vendor_id, errata_id, enable
> +.macro ALTERNATIVE_CFG old_c, new_c, vendor_id, errata_id, enable
> 886 :
> .option push
> .option norvc
> @@ -45,11 +45,11 @@
> .endm
>
> #define _ALTERNATIVE_CFG(old_c, new_c, vendor_id, errata_id, CONFIG_k) \
> - __ALTERNATIVE_CFG old_c, new_c, vendor_id, errata_id, IS_ENABLED(CONFIG_k)
> + ALTERNATIVE_CFG old_c, new_c, vendor_id, errata_id, IS_ENABLED(CONFIG_k)
>
> -.macro __ALTERNATIVE_CFG_2 old_c, new_c_1, vendor_id_1, errata_id_1, enable_1, \
> - new_c_2, vendor_id_2, errata_id_2, enable_2
> - __ALTERNATIVE_CFG \old_c, \new_c_1, \vendor_id_1, \errata_id_1, \enable_1
> +.macro ALTERNATIVE_CFG_2 old_c, new_c_1, vendor_id_1, errata_id_1, enable_1, \
> + new_c_2, vendor_id_2, errata_id_2, enable_2
> + ALTERNATIVE_CFG \old_c, \new_c_1, \vendor_id_1, \errata_id_1, \enable_1
> ALT_NEW_CONTENT \vendor_id_2, \errata_id_2, \enable_2, \new_c_2
> .endm
>
> @@ -57,9 +57,9 @@
> CONFIG_k_1, \
> new_c_2, vendor_id_2, errata_id_2, \
> CONFIG_k_2) \
> - __ALTERNATIVE_CFG_2 old_c, new_c_1, vendor_id_1, errata_id_1, \
> + ALTERNATIVE_CFG_2 old_c, new_c_1, vendor_id_1, errata_id_1, \
> IS_ENABLED(CONFIG_k_1), \
> - new_c_2, vendor_id_2, errata_id_2, \
> + new_c_2, vendor_id_2, errata_id_2, \
> IS_ENABLED(CONFIG_k_2)
>
> #else /* !__ASSEMBLY__ */
> @@ -126,15 +126,15 @@
> #else /* CONFIG_RISCV_ALTERNATIVE */
> #ifdef __ASSEMBLY__
>
> -.macro __ALTERNATIVE_CFG old_c
> +.macro ALTERNATIVE_CFG old_c
> \old_c
> .endm
>
> #define _ALTERNATIVE_CFG(old_c, ...) \
> - __ALTERNATIVE_CFG old_c
> + ALTERNATIVE_CFG old_c
>
> #define _ALTERNATIVE_CFG_2(old_c, ...) \
> - __ALTERNATIVE_CFG old_c
> + ALTERNATIVE_CFG old_c
>
> #else /* !__ASSEMBLY__ */
>
>
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
next prev parent reply other threads:[~2022-11-30 10:06 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-29 15:00 [PATCH v2 0/4] riscv: alternative-macros.h cleanups Andrew Jones
2022-11-29 15:00 ` [PATCH v2 1/4] riscv: Don't duplicate __ALTERNATIVE_CFG in __ALTERNATIVE_CFG_2 Andrew Jones
2022-11-30 9:31 ` Heiko Stübner
2022-12-10 4:20 ` patchwork-bot+linux-riscv
2022-11-29 15:00 ` [PATCH v2 2/4] riscv: alternatives: Don't name unused macro parameters Andrew Jones
2022-11-30 9:37 ` Heiko Stübner
2022-11-29 15:00 ` [PATCH v2 3/4] riscv: alternatives: Drop the underscores from the assembly macro names Andrew Jones
2022-11-30 10:06 ` Heiko Stübner [this message]
2022-11-30 11:27 ` Andrew Jones
2022-11-29 15:00 ` [PATCH v2 4/4] riscv: Don't duplicate _ALTERNATIVE_CFG* macros Andrew Jones
2022-11-30 10:07 ` Heiko Stübner
2022-11-30 12:06 ` [PATCH v2 0/4] riscv: alternative-macros.h cleanups Lad, Prabhakar
2022-12-07 17:57 ` Conor Dooley
2022-12-10 2:15 ` Palmer Dabbelt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4168918.X9hSmTKtgW@diego \
--to=heiko@sntech.de \
--cc=ajones@ventanamicro.com \
--cc=aou@eecs.berkeley.edu \
--cc=conor.dooley@microchip.com \
--cc=linux-riscv@lists.infradead.org \
--cc=palmer@dabbelt.com \
--cc=paul.walmsley@sifive.com \
--cc=prabhakar.csengg@gmail.com \
--cc=prabhakar.mahadev-lad.rj@bp.renesas.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox