summaryrefslogtreecommitdiff
path: root/include/asm-generic
diff options
context:
space:
mode:
authorWei Liu <wei.liu@kernel.org>2023-04-17 22:18:13 +0300
committerWei Liu <wei.liu@kernel.org>2023-04-17 22:18:13 +0300
commit21eb596fce6c9f034f4e1bd91210336815bf8048 (patch)
tree7df638a58df39b2d8cab22908d7f0bf52a1f249e /include/asm-generic
parentf83705a51275ed29117d46e1d68e8b16dcb40507 (diff)
parent87efe384109f7938c94e74b1ce9c613136f50fd9 (diff)
downloadlinux-21eb596fce6c9f034f4e1bd91210336815bf8048.tar.xz
Merge remote-tracking branch 'tip/x86/sev' into hyperv-next
Merge the following 6 patches from tip/x86/sev, which are taken from Michael Kelley's series [0]. The rest of Michael's series depend on them. x86/hyperv: Change vTOM handling to use standard coco mechanisms init: Call mem_encrypt_init() after Hyper-V hypercall init is done x86/mm: Handle decryption/re-encryption of bss_decrypted consistently Drivers: hv: Explicitly request decrypted in vmap_pfn() calls x86/hyperv: Reorder code to facilitate future work x86/ioremap: Add hypervisor callback for private MMIO mapping in coco VM 0: https://lore.kernel.org/linux-hyperv/1679838727-87310-1-git-send-email-mikelley@microsoft.com/
Diffstat (limited to 'include/asm-generic')
-rw-r--r--include/asm-generic/mshyperv.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-generic/mshyperv.h b/include/asm-generic/mshyperv.h
index 8845a2eca339..90d7f68ed39d 100644
--- a/include/asm-generic/mshyperv.h
+++ b/include/asm-generic/mshyperv.h
@@ -26,6 +26,8 @@
#include <asm/ptrace.h>
#include <asm/hyperv-tlfs.h>
+#define VTPM_BASE_ADDRESS 0xfed40000
+
struct ms_hyperv_info {
u32 features;
u32 priv_high;