aports

Custom Alpine Linux aports

git clone git://git.lin.moe/aports.git

 1From a0774aaf7f936980c06470233e1330b6d8fc9bca Mon Sep 17 00:00:00 2001
 2From: Ariadne Conill <ariadne@ariadne.space>
 3Date: Thu, 4 Sep 2025 12:32:45 -0700
 4Subject: [PATCH] x86/CPU/AMD: avoid printing reset reasons on Xen domU
 5
 6Xen domU cannot access the given MMIO address for security reasons,
 7resulting in a failed hypercall in ioremap() due to permissions.
 8
 9Fixes: ab8131028710 ("x86/CPU/AMD: Print the reason for the last reset")
10Signed-off-by: Ariadne Conill <ariadne@ariadne.space>
11Cc: stable@vger.kernel.org
12Signed-off-by: Ariadne Conill <ariadne@ariadne.space>
13---
14 arch/x86/kernel/cpu/amd.c | 6 ++++++
15 1 file changed, 6 insertions(+)
16
17diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
18index a6f88ca1a6b4..99308fba4d7d 100644
19--- a/arch/x86/kernel/cpu/amd.c
20+++ b/arch/x86/kernel/cpu/amd.c
21@@ -29,6 +29,8 @@
22 # include <asm/mmconfig.h>
23 #endif
24 
25+#include <xen/xen.h>
26+
27 #include "cpu.h"
28 
29 u16 invlpgb_count_max __ro_after_init = 1;
30@@ -1333,6 +1335,10 @@ static __init int print_s5_reset_status_mmio(void)
31 	if (!cpu_feature_enabled(X86_FEATURE_ZEN))
32 		return 0;
33 
34+	/* Xen PV domU cannot access hardware directly, so bail for domU case */
35+	if (cpu_feature_enabled(X86_FEATURE_XENPV) && !xen_initial_domain())
36+		return 0;
37+
38 	addr = ioremap(FCH_PM_BASE + FCH_PM_S5_RESET_STATUS, sizeof(value));
39 	if (!addr)
40 		return 0;
41-- 
422.51.0
43