* [PATCH] riscv: alternative: fix typo in macro name
@ 2021-05-31 9:33 Vitaly Wool
2021-05-31 9:39 ` Jisheng Zhang
2021-06-11 15:59 ` Palmer Dabbelt
0 siblings, 2 replies; 3+ messages in thread
From: Vitaly Wool @ 2021-05-31 9:33 UTC (permalink / raw)
To: linux-riscv; +Cc: Palmer Dabbelt, Vincent Chen, Vitaly Wool
alternative-macros.h defines ALT_NEW_CONTENT in its assembly part
and ALT_NEW_CONSTENT in the C part. Most likely it is the latter
that is wrong.
Fixes: 6f4eea90465ad
(riscv: Introduce alternative mechanism to apply errata solution)
Signed-off-by: Vitaly Wool <vitaly.wool@konsulko.com>
---
arch/riscv/include/asm/alternative-macros.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/riscv/include/asm/alternative-macros.h b/arch/riscv/include/asm/alternative-macros.h
index 88c08705f64a..67406c376389 100644
--- a/arch/riscv/include/asm/alternative-macros.h
+++ b/arch/riscv/include/asm/alternative-macros.h
@@ -51,7 +51,7 @@
REG_ASM " " newlen "\n" \
".word " errata_id "\n"
-#define ALT_NEW_CONSTENT(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") \
@@ -69,7 +69,7 @@
"886 :\n" \
old_c "\n" \
"887 :\n" \
- ALT_NEW_CONSTENT(vendor_id, errata_id, enable, new_c)
+ ALT_NEW_CONTENT(vendor_id, errata_id, enable, new_c)
#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))
--
2.29.2
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] riscv: alternative: fix typo in macro name
2021-05-31 9:33 [PATCH] riscv: alternative: fix typo in macro name Vitaly Wool
@ 2021-05-31 9:39 ` Jisheng Zhang
2021-06-11 15:59 ` Palmer Dabbelt
1 sibling, 0 replies; 3+ messages in thread
From: Jisheng Zhang @ 2021-05-31 9:39 UTC (permalink / raw)
To: Vitaly Wool; +Cc: linux-riscv, Palmer Dabbelt, Vincent Chen
On Mon, 31 May 2021 12:33:10 +0300
Vitaly Wool <vitaly.wool@konsulko.com> wrote:
>
>
> alternative-macros.h defines ALT_NEW_CONTENT in its assembly part
> and ALT_NEW_CONSTENT in the C part. Most likely it is the latter
> that is wrong.
>
> Fixes: 6f4eea90465ad
> (riscv: Introduce alternative mechanism to apply errata solution)
IIRC, the "Fixes" tag can exceed 72 chars limitation, does checkpatch.pl
report anything wrong if the two lines are combined into one line?
> Signed-off-by: Vitaly Wool <vitaly.wool@konsulko.com>
> ---
> arch/riscv/include/asm/alternative-macros.h | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/riscv/include/asm/alternative-macros.h b/arch/riscv/include/asm/alternative-macros.h
> index 88c08705f64a..67406c376389 100644
> --- a/arch/riscv/include/asm/alternative-macros.h
> +++ b/arch/riscv/include/asm/alternative-macros.h
> @@ -51,7 +51,7 @@
> REG_ASM " " newlen "\n" \
> ".word " errata_id "\n"
>
> -#define ALT_NEW_CONSTENT(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") \
> @@ -69,7 +69,7 @@
> "886 :\n" \
> old_c "\n" \
> "887 :\n" \
> - ALT_NEW_CONSTENT(vendor_id, errata_id, enable, new_c)
> + ALT_NEW_CONTENT(vendor_id, errata_id, enable, new_c)
>
> #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))
> --
> 2.29.2
>
>
> _______________________________________________
> linux-riscv mailing list
> linux-riscv@lists.infradead.org
> https://urldefense.proofpoint.com/v2/url?u=http-3A__lists.infradead.org_mailman_listinfo_linux-2Driscv&d=DwICAg&c=7dfBJ8cXbWjhc0BhImu8wQ&r=wlaKTGoVCDxOzHc2QUzpzGEf9oY3eidXlAe3OF1omvo&m=XpLbXG83zwtZs3uGGCdFOUHtgVGdsHL_-p1VdXjQIrs&s=9fAWECR0St-s9ShfmRXAMsyhAPbuZpSVEK4iD_rb35Y&e=
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] riscv: alternative: fix typo in macro name
2021-05-31 9:33 [PATCH] riscv: alternative: fix typo in macro name Vitaly Wool
2021-05-31 9:39 ` Jisheng Zhang
@ 2021-06-11 15:59 ` Palmer Dabbelt
1 sibling, 0 replies; 3+ messages in thread
From: Palmer Dabbelt @ 2021-06-11 15:59 UTC (permalink / raw)
To: vitaly.wool; +Cc: linux-riscv, vincent.chen, vitaly.wool
On Mon, 31 May 2021 02:33:10 PDT (-0700), vitaly.wool@konsulko.com wrote:
> alternative-macros.h defines ALT_NEW_CONTENT in its assembly part
> and ALT_NEW_CONSTENT in the C part. Most likely it is the latter
> that is wrong.
>
> Fixes: 6f4eea90465ad
> (riscv: Introduce alternative mechanism to apply errata solution)
> Signed-off-by: Vitaly Wool <vitaly.wool@konsulko.com>
> ---
> arch/riscv/include/asm/alternative-macros.h | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/riscv/include/asm/alternative-macros.h b/arch/riscv/include/asm/alternative-macros.h
> index 88c08705f64a..67406c376389 100644
> --- a/arch/riscv/include/asm/alternative-macros.h
> +++ b/arch/riscv/include/asm/alternative-macros.h
> @@ -51,7 +51,7 @@
> REG_ASM " " newlen "\n" \
> ".word " errata_id "\n"
>
> -#define ALT_NEW_CONSTENT(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") \
> @@ -69,7 +69,7 @@
> "886 :\n" \
> old_c "\n" \
> "887 :\n" \
> - ALT_NEW_CONSTENT(vendor_id, errata_id, enable, new_c)
> + ALT_NEW_CONTENT(vendor_id, errata_id, enable, new_c)
>
> #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))
Thanks, this is on fixes.
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-06-11 15:59 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-05-31 9:33 [PATCH] riscv: alternative: fix typo in macro name Vitaly Wool
2021-05-31 9:39 ` Jisheng Zhang
2021-06-11 15:59 ` Palmer Dabbelt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox