github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-09-24 02:08:04 +00:00
Code Issues Projects Releases Wiki Activity

hv: Variable/macro renaming for intr handling of PT devices using IO-APIC/PIC

Browse Source 
1. Renames DEFINE_IOAPIC_SID with DEFINE_INTX_SID as the virtual source can
   be IOAPIC or PIC
2. Rename the src member of source_id.intx_id to ctlr to indicate interrupt
   controller
2. Changes the type of src member of source_id.intx_id from uint32_t to
   enum with INTX_CTLR_IOAPIC and INTX_CTLR_PIC

Tracked-On: #4447
Signed-off-by: Sainath Grandhi <sainath.grandhi@intel.com>
This commit is contained in:
Sainath Grandhi
2020-03-02 06:14:19 -08:00
committed by wenlingz
parent 9a79443204
commit 460e7ee5b1
6 changed files with 49 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
hypervisor/include/arch/x86/guest/assign.h
View File

@@ -30,14 +30,14 @@
*
* @param[in] vm pointer to acrn_vm
* @param[in] virt_pin virtual pin number associated with the passthrough device
* @param[in] vpin_src ioapic or pic
* @param[in] vpin_ctlr INTX_CTLR_IOAPIC or INTX_CTLR_PIC
*
* @return None
*
* @pre vm != NULL
*
*/
void ptirq_intx_ack(struct acrn_vm *vm, uint32_t virt_pin, uint32_t vpin_src);
void ptirq_intx_ack(struct acrn_vm *vm, uint32_t virt_pin, enum intx_ctlr vpin_ctlr);
/**
* @brief MSI/MSI-x remapping for passthrough device.
@@ -73,7 +73,7 @@ int32_t ptirq_prepare_msix_remap(struct acrn_vm *vm, uint16_t virt_bdf, uint16_
*
* @param[in] vm pointer to acrn_vm
* @param[in] virt_pin virtual pin number associated with the passthrough device
* @param[in] vpin_src ioapic or pic
* @param[in] vpin_ctlr INTX_CTLR_IOAPIC or INTX_CTLR_PIC
*
* @return
* - 0: on success
@@ -84,7 +84,7 @@ int32_t ptirq_prepare_msix_remap(struct acrn_vm *vm, uint16_t virt_bdf, uint16_
* @pre vm != NULL
*
*/
int32_t ptirq_intx_pin_remap(struct acrn_vm *vm, uint32_t virt_pin, uint32_t vpin_src);
int32_t ptirq_intx_pin_remap(struct acrn_vm *vm, uint32_t virt_pin, enum intx_ctlr vpin_ctlr);
/**
* @brief Add an interrupt remapping entry for INTx as pre-hold mapping.

20
hypervisor/include/common/ptdev.h
View File

@@ -10,19 +10,22 @@
#include <spinlock.h>
#include <timer.h>
enum intx_ctlr {
INTX_CTLR_IOAPIC = 0U,
INTX_CTLR_PIC
};
#define PTDEV_INTR_MSI (1U << 0U)
#define PTDEV_INTR_INTX (1U << 1U)
#define INVALID_PTDEV_ENTRY_ID 0xffffU
#define PTDEV_VPIN_IOAPIC 0x0U
#define PTDEV_VPIN_PIC 0x1U
#define DEFINE_MSI_SID(name, a, b) \
union source_id (name) = {.msi_id = {.bdf = (a), .entry_nr = (b)} }
#define DEFINE_IOAPIC_SID(name, a, b) \
union source_id (name) = {.intx_id = {.pin = (a), .src = (b)} }
#define DEFINE_INTX_SID(name, a, b) \
union source_id (name) = {.intx_id = {.pin = (a), .ctlr = (b)} }
union irte_index {
uint16_t index;
@@ -32,6 +35,7 @@ union irte_index {
} bits __packed;
};
union source_id {
uint64_t value;
struct {
@@ -39,9 +43,13 @@ union source_id {
uint16_t entry_nr;
uint32_t reserved;
} msi_id;
/*
* ctlr indicates if the source of interrupt is IO-APIC or PIC
* pin indicates the pin number of interrupt controller determined by ctlr
*/
struct {
enum intx_ctlr ctlr;
uint32_t pin;
uint32_t src;
} intx_id;
};