riscv: alternative-macros.h cleanups
Status from this message: Applied, thanks!
Get series with b4
b4 am [email protected]Versions newest first · linked by author and title
- v2 Latest4 patches 8 repliesApplied 4/4
- v14 patches 4 repliesSuperseded
Patches in v2 All 4 applied
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/4 | riscv: Don't duplicate __ALTERNATIVE_CFG in __ALTERNATIVE_CFG_2arch/ | +2 | 1 reply | Applied |
| 2/4 | riscv: alternatives: Don't name unused macro parametersarch/ | +7 | 1 reply | Applied |
| 3/4 | riscv: alternatives: Drop the underscores from the assembly macro namesarch/ | +10 | 2 replies | Applied |
| 4/4 | riscv: Don't duplicate _ALTERNATIVE_CFG* macrosarch/ | +17 | 1 reply | Applied |
Reviews trailers per patch
2 of 4 patches have a Reviewed-by or Acked-by of their own; the series has one for all of them.
| Patch | Heiko Stuebner | Lad Prabhakar | Conor Dooley |
|---|---|---|---|
| Series | T-b | A-b | |
| 1/4 | R-b T-b | ||
| 2/4 | R-b T-b | ||
| 3/4 | T-b | ||
| 4/4 | T-b |
Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 3 reviewers.
Cover letter [PATCH v2 0/4] riscv: alternative-macros.h cleanups
This series is a collection of cleanups for alternative-macros.h with the main motivation being that adding new ALTERNATIVE_3, ALTERNATIVE_4, ... will be possible without lots of bloat. For example, adding ALTERNATIVE_3 should look something like the diff below and ALTERNATIVE_4 the same. This has really only been compile tested, as not all alternatives are used when quickly booting over QEMU, which I also did.
Thanks,
drew
arch/riscv/include/asm/alternative-macros.h +36 -0
@@ -50,8 +50,17 @@ ALT_NEW_CONTENT \vendor_id_2, \errata_id_2, \enable_2, \new_c_2 .endm +.macro ALTERNATIVE_CFG_3 old_c, new_c_1, vendor_id_1, errata_id_1, enable_1, \ + new_c_2, vendor_id_2, errata_id_2, enable_2, \ + new_c_3, vendor_id_3, errata_id_3, enable_3 + 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 + ALT_NEW_CONTENT \vendor_id_3, \errata_id_3, \enable_3, \new_c_3 +.endm + #define __ALTERNATIVE_CFG(...) ALTERNATIVE_CFG __VA_ARGS__ #define __ALTERNATIVE_CFG_2(...) ALTERNATIVE_CFG_2 __VA_ARGS__ +#define __ALTERNATIVE_CFG_3(...) ALTERNATIVE_CFG_3 __VA_ARGS__#else /* !__ASSEMBLY__ */
@@ -98,6 +107,13 @@ __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) +#define __ALTERNATIVE_CFG_3 (old_c, new_c_1, vendor_id_1, errata_id_1, enable_1, \ + new_c_2, vendor_id_2, errata_id_2, enable_2, \ + new_c_3, vendor_id_3, errata_id_3, enable_3) \ + __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) \ + ALT_NEW_CONTENT(vendor_id_3, errata_id_3, enable_3, new_c_3) +#endif /* __ASSEMBLY__ */ #define _ALTERNATIVE_CFG (old_c, new_c, vendor_id, errata_id, CONFIG_k) \
@@ -108,6 +124,13 @@__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, IS_ENABLED(CONFIG_k_2)) +#define _ALTERNATIVE_CFG_3 (old_c, new_c_1, vendor_id_1, errata_id_1, CONFIG_k_1, \ + new_c_2, vendor_id_2, errata_id_2, CONFIG_k_2, \ + new_c_3, vendor_id_3, errata_id_3, CONFIG_k_3) \ + __ALTERNATIVE_CFG_3(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, IS_ENABLED(CONFIG_k_2), \ + new_c_3, vendor_id_3, errata_id_3, IS_ENABLED(CONFIG_k_3)) +#else /* CONFIG_RISCV_ALTERNATIVE */ #ifdef __ASSEMBLY__
@@ -121,6 +144,9 @@#define _ALTERNATIVE_CFG_2 (old_c, ...) \ ALTERNATIVE_CFG old_c +#define _ALTERNATIVE_CFG_3 (old_c, ...) \ + ALTERNATIVE_CFG old_c +#else /* !__ASSEMBLY__ */ #define __ALTERNATIVE_CFG (old_c) \
@@ -132,6 +158,9 @@#define _ALTERNATIVE_CFG_2 (old_c, ...) \ __ALTERNATIVE_CFG(old_c) +#define _ALTERNATIVE_CFG_3 (old_c, ...) \ + __ALTERNATIVE_CFG(old_c) +#endif /* __ASSEMBLY__ */ #endif /* CONFIG_RISCV_ALTERNATIVE */
@@ -163,4 +192,11 @@_ALTERNATIVE_CFG_2 (old_content, new_content_1, vendor_id_1, errata_id_1, CONFIG_k_1, \ new_content_2, vendor_id_2, errata_id_2, CONFIG_k_2) +#define ALTERNATIVE_3 (old_content, new_content_1, vendor_id_1, errata_id_1, CONFIG_k_1, \ + new_content_2, vendor_id_2, errata_id_2, CONFIG_k_2, \ + new_content_3, vendor_id_3, errata_id_3, CONFIG_k_3) \ + _ALTERNATIVE_CFG_3(old_content, new_content_1, vendor_id_1, errata_id_1, CONFIG_k_1, \ + new_content_2, vendor_id_2, errata_id_2, CONFIG_k_2, \ + new_content_3, vendor_id_3, errata_id_3, CONFIG_k_3) +#endif
Andrew Jones (4):
riscv: Don't duplicate __ALTERNATIVE_CFG in __ALTERNATIVE_CFG_2
riscv: alternatives: Don't name unused macro parameters
riscv: alternatives: Drop the underscores from the assembly macro
names
riscv: Don't duplicate _ALTERNATIVE_CFG* macros
arch/riscv/include/asm/alternative-macros.h | 99 +++++++-------------- 1 file changed, 30 insertions(+), 69 deletions(-)
Signature · 7 lines
2.38.1 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv