github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-09-23 09:47:44 +00:00
Code Issues Projects Releases Wiki Activity

hv: remove mptable code for pre-launched VMs

Browse Source 
Now that ACPI is enabled for pre-launched VMs, we can remove all mptable code.

Tracked-On: #3601
Signed-off-by: dongshen <dongsheng.x.zhang@intel.com>
Reviewed-by: Eddie Dong <eddie.dong@intel.com>
This commit is contained in:
dongshen
2019-08-20 17:43:15 -07:00
committed by wenlingz
parent b447ce3d86
commit 295701cc55
5 changed files with 0 additions and 296 deletions
Download Patch File Download Diff File Expand all files Collapse all files

142
hypervisor/arch/x86/configs/vmptable.c
View File

@@ -1,142 +0,0 @@
/*
* Copyright (C) 2018 Intel Corporation. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
#include <vm.h>
#include <per_cpu.h>
#include <mptable.h>
#include <default_acpi_info.h>
static struct mptable_info vm_mptables[CONFIG_MAX_VM_NUM];
static struct mptable_info mptable_template = {
.mpfp = {
.signature = MPFP_SIG,
.pap = MPTABLE_BASE + sizeof(struct mpfps),
.length = 1U,
.spec_rev = MP_SPECREV,
},
.mpch = {
.signature = MPCH_SIG,
.spec_rev = MP_SPECREV,
.oem_id = MPCH_OEMID,
.product_id = MPCH_PRODID,
.apic_address = LAPIC_BASE,
},
.bus_entry_array = {
{
.type = MPCT_ENTRY_BUS,
.bus_id = 0U,
.bus_type = MPE_BUSNAME_PCI,
},
{
.type = MPCT_ENTRY_BUS,
.bus_id = 1U,
.bus_type = MPE_BUSNAME_ISA,
},
},
.int_entry_array = {
{
.type = MPCT_ENTRY_LOCAL_INT,
.int_type = INTENTRY_TYPE_EXTINT,
.int_flags = INTENTRY_FLAGS_POLARITY_CONFORM \
| INTENTRY_FLAGS_TRIGGER_CONFORM,
.dst_apic_id = 0xFFU,
.dst_apic_int = 0U,
},
{
.type = MPCT_ENTRY_LOCAL_INT,
.int_type = INTENTRY_TYPE_NMI,
.int_flags = INTENTRY_FLAGS_POLARITY_CONFORM \
| INTENTRY_FLAGS_TRIGGER_CONFORM,
.dst_apic_id = 0xFFU,
.dst_apic_int = 1U,
},
},
};
static struct proc_entry proc_entry_template = {
.type = MPCT_ENTRY_PROCESSOR,
.apic_version = LAPIC_VERSION_NUM,
.cpu_flags = PROCENTRY_FLAG_EN,
.cpu_signature = MPEP_SIG,
.feature_flags = MPEP_FEATURES
};
static uint8_t mpt_compute_checksum(const void *base, size_t len)
{
uint8_t sum = 0U;
size_t length;
const uint8_t *bytes = (const uint8_t *)base;
for (length = len; length > 0U; length--) {
sum += *bytes;
bytes++;
}
return (~sum) + 1U;
}
/**
* @pre vm != NULL
* @pre vm->vm_id < CONFIG_MAX_VM_NUM
*/
int32_t mptable_build(struct acrn_vm *vm)
{
struct mpcth *mpch;
struct mpfps *mpfp;
struct mptable_info *mpinfo;
size_t mptable_length;
uint16_t i;
uint16_t vcpu_num;
int32_t ret = 0;
uint64_t pcpu_bitmap = 0U;
struct mptable_info *mptable;
struct acrn_vm_config *vm_config;
vm_config = get_vm_config(vm->vm_id);
mptable = &vm_mptables[vm->vm_id];
vcpu_num = vm->hw.created_vcpus;
pcpu_bitmap = vm_config->pcpu_bitmap;
(void)memcpy_s((void *)mptable, sizeof(struct mptable_info),
(const void *)&mptable_template, sizeof(struct mptable_info));
mptable->mpch.entry_count = vcpu_num + MPE_NUM_BUSES + MPEII_NUM_LOCAL_IRQ;
mptable->mpch.base_table_length = (uint16_t)sizeof(struct mpcth)
+ vcpu_num * (uint16_t)sizeof(struct proc_entry)
+ MPE_NUM_BUSES * (uint16_t)sizeof(struct bus_entry)
+ MPEII_NUM_LOCAL_IRQ * (uint16_t)sizeof(struct int_entry);
mptable_length = sizeof(struct mpfps) + (uint32_t)mptable->mpch.base_table_length;
if (mptable_length <= MPTABLE_MAX_LENGTH) {
for (i = 0U; i < vcpu_num; i++) {
uint16_t pcpu_id = ffs64(pcpu_bitmap);
(void)memcpy_s((void *)(mptable->proc_entry_array + i), sizeof(struct proc_entry),
(const void *)&proc_entry_template, sizeof(struct proc_entry));
mptable->proc_entry_array[i].apic_id = (uint8_t) i;
if (i == 0U) {
mptable->proc_entry_array[i].cpu_flags |= PROCENTRY_FLAG_BP;
}
bitmap_clear_lock(pcpu_id, &pcpu_bitmap);
}
/* Copy mptable info into guest memory */
(void)copy_to_gpa(vm, (void *)mptable, MPTABLE_BASE, mptable_length);
mpinfo = (struct mptable_info *) gpa2hva(vm, MPTABLE_BASE);
stac();
mpfp = &mpinfo->mpfp;
mpfp->checksum = mpt_compute_checksum(mpfp, sizeof(struct mpfps));
mpch = &mpinfo->mpch;
mpch->checksum = mpt_compute_checksum(mpch, mpch->base_table_length);
clac();
ret = 0;
} else {
ret = -1;
}
return ret;
}

1
hypervisor/arch/x86/guest/vm.c
View File

@@ -742,7 +742,6 @@ void prepare_vm(uint16_t vm_id, struct acrn_vm_config *vm_config)
if (err == 0) {
if (is_prelaunched_vm(vm)) {
(void)mptable_build(vm);
build_vacpi(vm);
}