[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RESEND PATCH 30/32] Kconfig: Add CONFIG_SGX support
From: |
Yang Zhong |
Subject: |
[RESEND PATCH 30/32] Kconfig: Add CONFIG_SGX support |
Date: |
Fri, 30 Apr 2021 14:24:53 +0800 |
Add new CONFIG_SGX for sgx support in the Qemu, and the Kconfig
default enable sgx in the i386 platform.
Signed-off-by: Yang Zhong <yang.zhong@intel.com>
---
backends/meson.build | 2 +-
default-configs/devices/i386-softmmu.mak | 1 +
hw/i386/Kconfig | 5 +++++
hw/i386/meson.build | 2 +-
hw/i386/sgx-stub.c | 13 +++++++++++++
5 files changed, 21 insertions(+), 2 deletions(-)
create mode 100644 hw/i386/sgx-stub.c
diff --git a/backends/meson.build b/backends/meson.build
index 46fd16b269..6e68945528 100644
--- a/backends/meson.build
+++ b/backends/meson.build
@@ -16,6 +16,6 @@ softmmu_ss.add(when: ['CONFIG_VHOST_USER', 'CONFIG_VIRTIO'],
if_true: files('vho
softmmu_ss.add(when: 'CONFIG_VIRTIO_CRYPTO', if_true:
files('cryptodev-vhost.c'))
softmmu_ss.add(when: ['CONFIG_VIRTIO_CRYPTO', 'CONFIG_VHOST_CRYPTO'], if_true:
files('cryptodev-vhost-user.c'))
softmmu_ss.add(when: 'CONFIG_GIO', if_true: [files('dbus-vmstate.c'), gio])
-softmmu_ss.add(when: 'CONFIG_LINUX', if_true: files('hostmem-epc.c'))
+softmmu_ss.add(when: 'CONFIG_SGX', if_true: files('hostmem-epc.c'))
subdir('tpm')
diff --git a/default-configs/devices/i386-softmmu.mak
b/default-configs/devices/i386-softmmu.mak
index 84d1a2487c..598c6646df 100644
--- a/default-configs/devices/i386-softmmu.mak
+++ b/default-configs/devices/i386-softmmu.mak
@@ -22,6 +22,7 @@
#CONFIG_TPM_CRB=n
#CONFIG_TPM_TIS_ISA=n
#CONFIG_VTD=n
+#CONFIG_SGX=n
# Boards:
#
diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig
index 7f91f30877..581526be44 100644
--- a/hw/i386/Kconfig
+++ b/hw/i386/Kconfig
@@ -2,6 +2,10 @@ config SEV
bool
depends on KVM
+config SGX
+ bool
+ depends on KVM
+
config PC
bool
imply APPLESMC
@@ -17,6 +21,7 @@ config PC
imply PVPANIC_ISA
imply QXL
imply SEV
+ imply SGX
imply SGA
imply TEST_DEVICES
imply TPM_CRB
diff --git a/hw/i386/meson.build b/hw/i386/meson.build
index 087426c75c..f79f1bafab 100644
--- a/hw/i386/meson.build
+++ b/hw/i386/meson.build
@@ -5,7 +5,6 @@ i386_ss.add(files(
'e820_memory_layout.c',
'multiboot.c',
'x86.c',
- 'sgx-epc.c',
))
i386_ss.add(when: 'CONFIG_X86_IOMMU', if_true: files('x86-iommu.c'),
@@ -17,6 +16,7 @@ i386_ss.add(when: 'CONFIG_Q35', if_true: files('pc_q35.c'))
i386_ss.add(when: 'CONFIG_VMMOUSE', if_true: files('vmmouse.c'))
i386_ss.add(when: 'CONFIG_VMPORT', if_true: files('vmport.c'))
i386_ss.add(when: 'CONFIG_VTD', if_true: files('intel_iommu.c'))
+i386_ss.add(when: 'CONFIG_SGX', if_true: files('sgx-epc.c'), if_false:
files('sgx-stub.c'))
i386_ss.add(when: 'CONFIG_ACPI', if_true: files('acpi-common.c'))
i386_ss.add(when: 'CONFIG_ACPI_HW_REDUCED', if_true:
files('generic_event_device_x86.c'))
diff --git a/hw/i386/sgx-stub.c b/hw/i386/sgx-stub.c
new file mode 100644
index 0000000000..edf17c3309
--- /dev/null
+++ b/hw/i386/sgx-stub.c
@@ -0,0 +1,13 @@
+#include "qemu/osdep.h"
+#include "hw/i386/pc.h"
+#include "hw/i386/sgx-epc.h"
+
+void pc_machine_init_sgx_epc(PCMachineState *pcms)
+{
+ return;
+}
+
+int sgx_epc_get_section(int section_nr, uint64_t *addr, uint64_t *size)
+{
+ return 1;
+}
--
2.29.2.334.gfaefdd61ec
- [RESEND PATCH 22/32] i440fx: Add support for SGX EPC, (continued)
- [RESEND PATCH 22/32] i440fx: Add support for SGX EPC, Yang Zhong, 2021/04/30
- [RESEND PATCH 23/32] hostmem: Add the reset interface for EPC backend reset, Yang Zhong, 2021/04/30
- [RESEND PATCH 24/32] sgx-epc: Add the reset interface for sgx-epc virt device, Yang Zhong, 2021/04/30
- [RESEND PATCH 25/32] qmp: Add query-sgx command, Yang Zhong, 2021/04/30
- [RESEND PATCH 26/32] hmp: Add 'info sgx' command, Yang Zhong, 2021/04/30
- [RESEND PATCH 28/32] bitops: Support 32 and 64 bit mask macro, Yang Zhong, 2021/04/30
- [RESEND PATCH 29/32] qmp: Add the qmp_query_sgx_capabilities(), Yang Zhong, 2021/04/30
- [RESEND PATCH 27/32] i386: Add sgx_get_info() interface, Yang Zhong, 2021/04/30
- [RESEND PATCH 31/32] sgx-epc: Add the fill_device_info() callback support, Yang Zhong, 2021/04/30
- [RESEND PATCH 32/32] doc: Add the SGX doc, Yang Zhong, 2021/04/30
- [RESEND PATCH 30/32] Kconfig: Add CONFIG_SGX support,
Yang Zhong <=