Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions platform/pc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,8 @@ SRCS-kernel.elf= \
$(SRCDIR)/virtio/virtio_socket.c \
$(SRCDIR)/virtio/virtqueue.c \
$(SRCDIR)/virtio/scsi.c \
$(SRCDIR)/tpm/tpm_crb.c \
$(SRCDIR)/tpm/tpm_syscall.c \
$(SRCDIR)/vmware/vmxnet3_net.c \
$(SRCDIR)/vmware/vmxnet3_queue.c \
$(SRCDIR)/vmware/pvscsi.c \
Expand Down
9 changes: 9 additions & 0 deletions platform/pc/service.c
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
#include <xen_platform.h>
#include <virtio/virtio.h>
#include <vmware/vmware.h>
#include <tpm/tpm_crb.h>
#include "pvm.h"
#include "serial.h"

Expand Down Expand Up @@ -532,6 +533,14 @@ void detect_devices(kernel_heaps kh, storage_attach sa)

init_virtio_balloon(kh);
init_virtio_rng(kh);

/* WasmOS-on-Nanos: TPM 2.0 CRB discovery + default binding.
* Runs after init_acpi() so the ACPI TPM2 table (once wired) is
* available to the discovery pipeline; on hosts without a TPM the
* QEMU-fixed fallback silently declines and the syscall layer
* reports -ENOTSUP. See docs/design/nanos-tpm-crb-transport.md
* sec 4.4 in the wasmos repository. */
init_tpm(kh);
}

void cmdline_consume(sstring opt_name, cmdline_handler h)
Expand Down
Loading