To clarify which messages come from arch/x86/kernel/cpu/amd.c add
a prefix to all messages instead of just the previous reset reason.

Reviewed-by: Yazen Ghannam <yazen.ghannam@amd.com>
Signed-off-by: Mario Limonciello (AMD) <superm1@kernel.org>
---
v3:
 * add tag, put in it's own series
---
 arch/x86/kernel/cpu/amd.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
index bc94ff1e250ad..c19c4ee74dd1f 100644
--- a/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
@@ -1,4 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
+#define pr_fmt(fmt) "x86/amd: " fmt
+
 #include <linux/export.h>
 #include <linux/bitops.h>
 #include <linux/elf.h>
@@ -1396,7 +1398,7 @@ static __init int print_s5_reset_status_mmio(void)
 			continue;
 
 		if (s5_reset_reason_txt[i]) {
-			pr_info("x86/amd: Previous system reset reason [0x%08x]: %s\n",
+			pr_info("Previous system reset reason [0x%08x]: %s\n",
 				value, s5_reset_reason_txt[i]);
 		}
 	}
-- 
2.43.0

On Wed, Jan 21, 2026 at 12:04:30AM -0600, Mario Limonciello (AMD) wrote:
> To clarify which messages come from arch/x86/kernel/cpu/amd.c add
> a prefix to all messages instead of just the previous reset reason.
> 
> Reviewed-by: Yazen Ghannam <yazen.ghannam@amd.com>
> Signed-off-by: Mario Limonciello (AMD) <superm1@kernel.org>
> ---
> v3:
>  * add tag, put in it's own series
> ---
>  arch/x86/kernel/cpu/amd.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
> index bc94ff1e250ad..c19c4ee74dd1f 100644
> --- a/arch/x86/kernel/cpu/amd.c
> +++ b/arch/x86/kernel/cpu/amd.c
> @@ -1,4 +1,6 @@
>  // SPDX-License-Identifier: GPL-2.0-only
> +#define pr_fmt(fmt) "x86/amd: " fmt

I'm still not sure about this. There are a lot of places which you can call
"x86/amd:" - not only this one. So if anything, this prefix should be called
"x86/CPU:".

But looking at cpu/intel.c, they have "x86/tme:" and "x86/mktme:" prefixes
there for the TME specific stuff.

So I still don't see a clear working logic to apply to x86/cpu/ compilation
units.

So unless there's a better idea, pls drop this for now.

Thx.

-- 
Regards/Gruss,
    Boris.

https://people.kernel.org/tglx/notes-about-netiquette

On 1/21/2026 4:49 AM, Borislav Petkov wrote:
> On Wed, Jan 21, 2026 at 12:04:30AM -0600, Mario Limonciello (AMD) wrote:
>> To clarify which messages come from arch/x86/kernel/cpu/amd.c add
>> a prefix to all messages instead of just the previous reset reason.
>>
>> Reviewed-by: Yazen Ghannam <yazen.ghannam@amd.com>
>> Signed-off-by: Mario Limonciello (AMD) <superm1@kernel.org>
>> ---
>> v3:
>>   * add tag, put in it's own series
>> ---
>>   arch/x86/kernel/cpu/amd.c | 4 +++-
>>   1 file changed, 3 insertions(+), 1 deletion(-)
>>
>> diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
>> index bc94ff1e250ad..c19c4ee74dd1f 100644
>> --- a/arch/x86/kernel/cpu/amd.c
>> +++ b/arch/x86/kernel/cpu/amd.c
>> @@ -1,4 +1,6 @@
>>   // SPDX-License-Identifier: GPL-2.0-only
>> +#define pr_fmt(fmt) "x86/amd: " fmt
> 
> I'm still not sure about this. There are a lot of places which you can call
> "x86/amd:" - not only this one. So if anything, this prefix should be called
> "x86/CPU:".
> 
> But looking at cpu/intel.c, they have "x86/tme:" and "x86/mktme:" prefixes
> there for the TME specific stuff.
> 
> So I still don't see a clear working logic to apply to x86/cpu/ compilation
> units.
> 
> So unless there's a better idea, pls drop this for now.
> 
> Thx.
> 

Well so if I drop this patch, I still want to apply some sort of prefix 
to patch 6/6.  Because otherwise you end up with an AGESA string with no 
context of what that actually means or goes with.

Any other ideas of what to prefix that with?  Maybe:
pr_info("AMD BIOS: %s\n")

On Wed, Jan 21, 2026 at 08:28:26AM -0600, Mario Limonciello (AMD) (kernel.org) wrote:
> Well so if I drop this patch, I still want to apply some sort of prefix to
> patch 6/6.  Because otherwise you end up with an AGESA string with no
> context of what that actually means or goes with.

Other useful strings don't have a prefix either:

[    0.000000] DMI: Micro-Star International Co., Ltd. MS-7B79/X470 GAMING PRO (MS-7B79), BIOS 1.70 01/23/2019

> Any other ideas of what to prefix that with?  Maybe:
> pr_info("AMD BIOS: %s\n")

"AGESA: ..."

AGESA is unique and AMD-specific.

-- 
Regards/Gruss,
    Boris.

https://people.kernel.org/tglx/notes-about-netiquette