Skip to content
This repository has been archived by the owner on Apr 8, 2024. It is now read-only.

vmm:vtd: postpone activation of VT-d #121

Open
wants to merge 2 commits into
base: trusty
Choose a base branch
from
Open
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
1 change: 1 addition & 0 deletions product/celadon_64.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ EVMM_CMPL_FLAGS += \
-DPACK_LK \
-DMODULE_ACPI \
-DMODULE_VTD \
-DACTIVATE_VTD_BY_VMCALL \
-DDMAR_MAX_ENGINE=16 \
-DSKIP_DMAR_GPU

Expand Down
4 changes: 2 additions & 2 deletions vmm/modules/suspend/acpi_pm.c
Original file line number Diff line number Diff line change
Expand Up @@ -262,8 +262,8 @@ static void acpi_parse_fadt_waking_vector(uint8_t *fadt)
VMM_ASSERT_EX(facs,
"[ACPI] FACS is not detected. S3 is not supported by the platform\n");

acpi_fadt_data.p_waking_vector = (uint32_t *)(void *)(uint64_t)(uint32_t)(facs + FACS_FW_WAKING_VECTOR_OFFSET);
acpi_fadt_data.p_x_waking_vector = (uint64_t *)(void *)(uint64_t)(facs + FACS_X_FW_WAKING_VECTOR_OFFSET);
acpi_fadt_data.p_waking_vector = (uint32_t *)(void *)(facs + FACS_FW_WAKING_VECTOR_OFFSET);
acpi_fadt_data.p_x_waking_vector = (uint64_t *)(void *)(facs + FACS_X_FW_WAKING_VECTOR_OFFSET);
}

acpi_generic_address_t *get_pm1x_reg(uint32_t id)
Expand Down