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

hv: Enumerate IOAPIC info from MADT

Browse Source 
IOAPIC info, specifically ID, is needed to map the IOAPIC to
corresponding DMAR. DMAR table in ACPI has a field that has IOAPIC
ID, that matches the info provided in MADT. Both (IOAPIC info from
MADT and from DMAR) is needed for remapping IOAPIC interrupts.

Tracked-On: #2426
Signed-off-by: Sainath Grandhi <sainath.grandhi@intel.com>
Acked-by: Anthony Xu <anthony.xu@intel.com>
This commit is contained in:
Grandhi, Sainath
2019-01-26 00:04:47 -08:00
committed by Eddie Dong
parent fb6e9267f3
commit 4ff9f5dfb2
8 changed files with 101 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
hypervisor/arch/x86/Kconfig
View File

@@ -324,6 +324,11 @@ config RELOC
wherever appropriate. Without relocation the bootloader must put the
image to RAM_START, otherwise the hypervisor will not start up.
config MAX_IOAPIC_NUM
int "Maximum number of IO-APICs"
range 1 8
default 1
config IOMMU_BUS_NUM
hex "Highest PCI bus ID used during IOMMU initialization"
default 0x10 if PLATFORM_SBL

6
hypervisor/arch/x86/cpu.c
View File

@@ -87,6 +87,7 @@ uint64_t get_active_pcpu_bitmap(void)
void init_cpu_pre(uint16_t pcpu_id_args)
{
uint16_t pcpu_id = pcpu_id_args;
int32_t ret;
if (pcpu_id == BOOT_CPU_ID) {
start_tsc = rdtsc();
@@ -114,6 +115,11 @@ void init_cpu_pre(uint16_t pcpu_id_args)
early_init_lapic();
init_percpu_lapic_id();
ret = init_ioapic_id_info();
if (ret != 0) {
panic("System IOAPIC info is incorrect!");
}
} else {
/* Switch this CPU to use the same page tables set-up by the
* primary/boot CPU

34
hypervisor/arch/x86/ioapic.c
View File

@@ -6,6 +6,7 @@
#include <hypervisor.h>
#include <ioapic.h>
#include <acpi.h>
#define IOAPIC_MAX_PIN 240U
@@ -14,13 +15,13 @@
* The usable RTEs may be a subset of the total on a per IO APIC basis.
*/
#define IOAPIC_MAX_LINES 120U
#define NR_MAX_GSI (NR_IOAPICS * IOAPIC_MAX_LINES)
#define NR_MAX_GSI (CONFIG_MAX_IOAPIC_NUM * IOAPIC_MAX_LINES)
static struct gsi_table gsi_table_data[NR_MAX_GSI];
static uint32_t ioapic_nr_gsi;
static spinlock_t ioapic_lock;
static union ioapic_rte saved_rte[NR_IOAPICS][IOAPIC_MAX_PIN];
static union ioapic_rte saved_rte[CONFIG_MAX_IOAPIC_NUM][IOAPIC_MAX_PIN];
/*
* the irq to ioapic pin mapping should extract from ACPI MADT table
@@ -83,6 +84,9 @@ static const uint32_t pic_ioapic_pin_map[NR_LEGACY_PIN] = {
15U, /* pin15*/
};
static struct ioapic_info ioapic_array[CONFIG_MAX_IOAPIC_NUM];
static uint16_t ioapic_num;
uint32_t get_pic_pin_from_ioapic_pin(uint32_t pin_index)
{
uint32_t pin_id = INVALID_INTERRUPT_PIN;
@@ -152,10 +156,8 @@ ioapic_write_reg32(void *ioapic_base, const uint32_t offset, const uint32_t valu
static inline uint64_t
get_ioapic_base(uint8_t apic_id)
{
const uint64_t addr[2] = {IOAPIC0_BASE, IOAPIC1_BASE};
/* the ioapic base should be extracted from ACPI MADT table */
return addr[apic_id];
return ioapic_array[apic_id].addr;
}
void ioapic_get_rte_entry(void *ioapic_addr, uint32_t pin, union ioapic_rte *rte)
@@ -368,6 +370,18 @@ ioapic_nr_pins(void *ioapic_base)
return nr_pins;
}
int32_t init_ioapic_id_info(void)
{
int32_t ret = 0;
ioapic_num = parse_madt_ioapic(&ioapic_array[0]);
if (ioapic_num > (uint16_t)CONFIG_MAX_IOAPIC_NUM) {
ret = -EINVAL;
}
return ret;
}
void ioapic_setup_irqs(void)
{
uint8_t ioapic_id;
@@ -377,16 +391,16 @@ void ioapic_setup_irqs(void)
spinlock_init(&ioapic_lock);
for (ioapic_id = 0U;
ioapic_id < NR_IOAPICS; ioapic_id++) {
ioapic_id < ioapic_num; ioapic_id++) {
void *addr;
uint32_t pin, nr_pins;
addr = map_ioapic(get_ioapic_base(ioapic_id));
addr = map_ioapic(ioapic_array[ioapic_id].addr);
hv_access_memory_region_update((uint64_t)addr, PAGE_SIZE);
nr_pins = ioapic_nr_pins(addr);
for (pin = 0U; pin < nr_pins; pin++) {
gsi_table_data[gsi].ioapic_id = ioapic_id;
gsi_table_data[gsi].ioapic_id = ioapic_array[ioapic_id].id;
gsi_table_data[gsi].addr = addr;
if (gsi < NR_LEGACY_IRQ) {
@@ -432,7 +446,7 @@ void suspend_ioapic(void)
uint8_t ioapic_id;
uint32_t ioapic_pin;
for (ioapic_id = 0U; ioapic_id < NR_IOAPICS; ioapic_id++) {
for (ioapic_id = 0U; ioapic_id < ioapic_num; ioapic_id++) {
void *addr;
uint32_t nr_pins;
@@ -450,7 +464,7 @@ void resume_ioapic(void)
uint8_t ioapic_id;
uint32_t ioapic_pin;
for (ioapic_id = 0U; ioapic_id < NR_IOAPICS; ioapic_id++) {
for (ioapic_id = 0U; ioapic_id < ioapic_num; ioapic_id++) {
void *addr;
uint32_t nr_pins;