diff options
| author | Wei Liu <wei.liu@kernel.org> | 2023-04-17 21:18:13 +0200 |
|---|---|---|
| committer | Wei Liu <wei.liu@kernel.org> | 2023-04-17 21:18:13 +0200 |
| commit | 21eb596fce6c9f034f4e1bd91210336815bf8048 (patch) | |
| tree | 7df638a58df39b2d8cab22908d7f0bf52a1f249e /drivers/hv | |
| parent | Driver: VMBus: Add Devicetree support (diff) | |
| parent | Merge branch 'x86/cc' into x86/sev (diff) | |
| download | linux-21eb596fce6c9f034f4e1bd91210336815bf8048.tar.xz linux-21eb596fce6c9f034f4e1bd91210336815bf8048.zip | |
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 'drivers/hv')
| -rw-r--r-- | drivers/hv/ring_buffer.c | 2 | ||||
| -rw-r--r-- | drivers/hv/vmbus_drv.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/drivers/hv/ring_buffer.c b/drivers/hv/ring_buffer.c index c6692fd5ab15..2111e97c3b63 100644 --- a/drivers/hv/ring_buffer.c +++ b/drivers/hv/ring_buffer.c @@ -211,7 +211,7 @@ int hv_ringbuffer_init(struct hv_ring_buffer_info *ring_info, ring_info->ring_buffer = (struct hv_ring_buffer *) vmap_pfn(pfns_wraparound, page_cnt * 2 - 1, - PAGE_KERNEL); + pgprot_decrypted(PAGE_KERNEL)); kfree(pfns_wraparound); if (!ring_info->ring_buffer) diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c index 20b4be426e0c..19a0069dc4a9 100644 --- a/drivers/hv/vmbus_drv.c +++ b/drivers/hv/vmbus_drv.c @@ -2158,7 +2158,6 @@ void vmbus_device_unregister(struct hv_device *device_obj) * VMBUS is an acpi enumerated device. Get the information we * need from DSDT. */ -#define VTPM_BASE_ADDRESS 0xfed40000 static acpi_status vmbus_walk_resources(struct acpi_resource *res, void *ctx) { resource_size_t start = 0; |