Message ID | a6fc6cfd71d6d53cf89bf533a348bda799b25d7d.1603728729.git.bertrand.marquis@arm.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | xen/arm: Warn user on cpu errata 832075 | expand |
On Mon, 26 Oct 2020, Bertrand Marquis wrote: > Replace usage of warning_add by printk_once with a **** prefix and > suffix for errata related warnings. > > This prevents the need for the assert which is not secure enough to > protect this print against wrong usage. > > Signed-off-by: Bertrand Marquis <bertrand.marquis@arm.com> Reviewed-by: Stefano Stabellini <sstabellini@kernel.org> > --- > xen/arch/arm/cpuerrata.c | 10 ++-------- > 1 file changed, 2 insertions(+), 8 deletions(-) > > diff --git a/xen/arch/arm/cpuerrata.c b/xen/arch/arm/cpuerrata.c > index 0c63dfa779..0430069a84 100644 > --- a/xen/arch/arm/cpuerrata.c > +++ b/xen/arch/arm/cpuerrata.c > @@ -157,7 +157,6 @@ extern char __smccc_workaround_1_smc_start[], __smccc_workaround_1_smc_end[]; > static int enable_smccc_arch_workaround_1(void *data) > { > struct arm_smccc_res res; > - static bool warned = false; > const struct arm_cpu_capabilities *entry = data; > > /* > @@ -182,13 +181,8 @@ static int enable_smccc_arch_workaround_1(void *data) > "call ARM_SMCCC_ARCH_WORKAROUND_1"); > > warn: > - if ( !warned ) > - { > - ASSERT(system_state < SYS_STATE_active); > - warning_add("No support for ARM_SMCCC_ARCH_WORKAROUND_1.\n" > - "Please update your firmware.\n"); > - warned = true; > - } > + printk_once("**** No support for ARM_SMCCC_ARCH_WORKAROUND_1. ****\n" > + "**** Please update your firmware. ****\n"); > > return 0; > } > -- > 2.17.1 >
diff --git a/xen/arch/arm/cpuerrata.c b/xen/arch/arm/cpuerrata.c index 0c63dfa779..0430069a84 100644 --- a/xen/arch/arm/cpuerrata.c +++ b/xen/arch/arm/cpuerrata.c @@ -157,7 +157,6 @@ extern char __smccc_workaround_1_smc_start[], __smccc_workaround_1_smc_end[]; static int enable_smccc_arch_workaround_1(void *data) { struct arm_smccc_res res; - static bool warned = false; const struct arm_cpu_capabilities *entry = data; /* @@ -182,13 +181,8 @@ static int enable_smccc_arch_workaround_1(void *data) "call ARM_SMCCC_ARCH_WORKAROUND_1"); warn: - if ( !warned ) - { - ASSERT(system_state < SYS_STATE_active); - warning_add("No support for ARM_SMCCC_ARCH_WORKAROUND_1.\n" - "Please update your firmware.\n"); - warned = true; - } + printk_once("**** No support for ARM_SMCCC_ARCH_WORKAROUND_1. ****\n" + "**** Please update your firmware. ****\n"); return 0; }
Replace usage of warning_add by printk_once with a **** prefix and suffix for errata related warnings. This prevents the need for the assert which is not secure enough to protect this print against wrong usage. Signed-off-by: Bertrand Marquis <bertrand.marquis@arm.com> --- xen/arch/arm/cpuerrata.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)