github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-19 20:22:46 +00:00
Code Issues Projects Releases Wiki Activity

HV:transfer DMAR_[GS]ET_BITSLICE to inline function

Browse Source 
Transfer DMAR_[GS]ET_BITSLICE to inline function
to limit the parameter type and return type.

Signed-off-by: Huihuang Shi <huihuang.shi@intel.com>
Reviewed-by: Junjie Mao <junjie.mao@intel.com>
This commit is contained in:
Huihuang Shi 2018-07-18 10:19:52 +08:00 committed by lijinxia
parent e2ad788f63
commit a17653b3cc
1 changed files with 62 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
hypervisor/arch/x86/vtd.c
View File

@ -49,12 +49,18 @@
#define CTX_ENTRY_LOWER_SLPTPTR_MASK \ #define CTX_ENTRY_LOWER_SLPTPTR_MASK \
(0xFFFFFFFFFFFFFUL << CTX_ENTRY_LOWER_SLPTPTR_POS) (0xFFFFFFFFFFFFFUL << CTX_ENTRY_LOWER_SLPTPTR_POS)
#define DMAR_GET_BITSLICE(var, bitname) \ static inline uint64_t
((var & bitname ## _MASK) >> bitname ## _POS) dmar_get_bitslice(uint64_t var, uint64_t mask, uint32_t pos)
{
return ((var & mask) >> pos);
}
#define DMAR_SET_BITSLICE(var, bitname, val) \ static inline uint64_t
((var & \ dmar_set_bitslice(uint64_t var, uint64_t mask,
~bitname ## _MASK) | ((val << bitname ## _POS) & bitname ## _MASK)) uint32_t pos, uint64_t val)
{
return ((var & ~mask) | ((val << pos) & mask));
}
/* translation type */ /* translation type */
#define DMAR_CTX_TT_UNTRANSLATED 0x0UL #define DMAR_CTX_TT_UNTRANSLATED 0x0UL
@ -973,7 +979,9 @@ static int add_iommu_device(struct iommu_domain *domain, uint16_t segment,
root_entry = (struct dmar_root_entry *)&root_table[bus * 2]; root_entry = (struct dmar_root_entry *)&root_table[bus * 2];
if (DMAR_GET_BITSLICE(root_entry->lower, ROOT_ENTRY_LOWER_PRESENT) == 0U) { if (dmar_get_bitslice(root_entry->lower,
ROOT_ENTRY_LOWER_PRESENT_MASK,
ROOT_ENTRY_LOWER_PRESENT_POS) == 0UL) {
void *vaddr = alloc_paging_struct(); void *vaddr = alloc_paging_struct();
if (vaddr != NULL) { if (vaddr != NULL) {
@ -982,10 +990,13 @@ static int add_iommu_device(struct iommu_domain *domain, uint16_t segment,
context_table_addr = context_table_addr >> 12; context_table_addr = context_table_addr >> 12;
lower = DMAR_SET_BITSLICE(lower, ROOT_ENTRY_LOWER_CTP, lower = dmar_set_bitslice(lower,
ROOT_ENTRY_LOWER_CTP_MASK,
ROOT_ENTRY_LOWER_CTP_POS,
context_table_addr); context_table_addr);
lower = DMAR_SET_BITSLICE(lower, lower = dmar_set_bitslice(lower,
ROOT_ENTRY_LOWER_PRESENT, 1); ROOT_ENTRY_LOWER_PRESENT_MASK,
ROOT_ENTRY_LOWER_PRESENT_POS, 1UL);
root_entry->upper = 0UL; root_entry->upper = 0UL;
root_entry->lower = lower; root_entry->lower = lower;
@ -996,8 +1007,9 @@ static int add_iommu_device(struct iommu_domain *domain, uint16_t segment,
return 1; return 1;
} }
} else { } else {
context_table_addr = DMAR_GET_BITSLICE(root_entry->lower, context_table_addr = dmar_get_bitslice(root_entry->lower,
ROOT_ENTRY_LOWER_CTP); ROOT_ENTRY_LOWER_CTP_MASK,
ROOT_ENTRY_LOWER_CTP_POS);
} }
context_table_addr = context_table_addr << 12; context_table_addr = context_table_addr << 12;
@ -1006,7 +1018,9 @@ static int add_iommu_device(struct iommu_domain *domain, uint16_t segment,
context_entry = (struct dmar_context_entry *)&context_table[devfun * 2]; context_entry = (struct dmar_context_entry *)&context_table[devfun * 2];
/* the context entry should not be present */ /* the context entry should not be present */
if (DMAR_GET_BITSLICE(context_entry->lower, CTX_ENTRY_LOWER_P) != 0U) { if (dmar_get_bitslice(context_entry->lower,
CTX_ENTRY_LOWER_P_MASK,
CTX_ENTRY_LOWER_P_POS) != 0UL) {
pr_err("%s: context entry@0x%llx (Lower:%x) ", pr_err("%s: context entry@0x%llx (Lower:%x) ",
__func__, context_entry, context_entry->lower); __func__, context_entry, context_entry->lower);
pr_err("already present for %x:%x.%x", pr_err("already present for %x:%x.%x",
@ -1024,9 +1038,13 @@ static int add_iommu_device(struct iommu_domain *domain, uint16_t segment,
* programmed to indicate the largest AGAW value * programmed to indicate the largest AGAW value
* supported by hardware. * supported by hardware.
*/ */
upper = DMAR_SET_BITSLICE(upper, CTX_ENTRY_UPPER_AW, upper = dmar_set_bitslice(upper,
CTX_ENTRY_UPPER_AW_MASK,
CTX_ENTRY_UPPER_AW_POS,
dmar_uint->cap_msagaw); dmar_uint->cap_msagaw);
lower = DMAR_SET_BITSLICE(lower, CTX_ENTRY_LOWER_TT, lower = dmar_set_bitslice(lower,
CTX_ENTRY_LOWER_TT_MASK,
CTX_ENTRY_LOWER_TT_POS,
DMAR_CTX_TT_PASSTHROUGH); DMAR_CTX_TT_PASSTHROUGH);
} else { } else {
ASSERT(false, ASSERT(false,
@ -1034,18 +1052,28 @@ static int add_iommu_device(struct iommu_domain *domain, uint16_t segment,
} }
} else { } else {
/* TODO: add Device TLB support */ /* TODO: add Device TLB support */
upper = upper = dmar_set_bitslice(upper,
DMAR_SET_BITSLICE(upper, CTX_ENTRY_UPPER_AW, CTX_ENTRY_UPPER_AW_MASK,
width_to_agaw( CTX_ENTRY_UPPER_AW_POS,
domain->addr_width)); (uint64_t)width_to_agaw(domain->addr_width));
lower = DMAR_SET_BITSLICE(lower, CTX_ENTRY_LOWER_TT, lower = dmar_set_bitslice(lower,
CTX_ENTRY_LOWER_TT_MASK,
CTX_ENTRY_LOWER_TT_POS,
DMAR_CTX_TT_UNTRANSLATED); DMAR_CTX_TT_UNTRANSLATED);
} }
upper = DMAR_SET_BITSLICE(upper, CTX_ENTRY_UPPER_DID, domain->dom_id); upper = dmar_set_bitslice(upper,
lower = DMAR_SET_BITSLICE(lower, CTX_ENTRY_LOWER_SLPTPTR, CTX_ENTRY_UPPER_DID_MASK,
domain->trans_table_ptr >> 12); CTX_ENTRY_UPPER_DID_POS,
lower = DMAR_SET_BITSLICE(lower, CTX_ENTRY_LOWER_P, 1); domain->dom_id);
lower = dmar_set_bitslice(lower,
CTX_ENTRY_LOWER_SLPTPTR_MASK,
CTX_ENTRY_LOWER_SLPTPTR_POS,
domain->trans_table_ptr >> 12U);
lower = dmar_set_bitslice(lower,
CTX_ENTRY_LOWER_P_MASK,
CTX_ENTRY_LOWER_P_POS,
1UL);
context_entry->upper = upper; context_entry->upper = upper;
context_entry->lower = lower; context_entry->lower = lower;
@ -1065,6 +1093,7 @@ remove_iommu_device(struct iommu_domain *domain, uint16_t segment,
uint64_t *context_table; uint64_t *context_table;
struct dmar_root_entry *root_entry; struct dmar_root_entry *root_entry;
struct dmar_context_entry *context_entry; struct dmar_context_entry *context_entry;
uint16_t dom_id;
if (domain == NULL) { if (domain == NULL) {
return 1; return 1;
@ -1080,15 +1109,17 @@ remove_iommu_device(struct iommu_domain *domain, uint16_t segment,
root_table = (uint64_t *)HPA2HVA(dmar_uint->root_table_addr); root_table = (uint64_t *)HPA2HVA(dmar_uint->root_table_addr);
root_entry = (struct dmar_root_entry *)&root_table[bus * 2]; root_entry = (struct dmar_root_entry *)&root_table[bus * 2];
context_table_addr = DMAR_GET_BITSLICE(root_entry->lower, context_table_addr = dmar_get_bitslice(root_entry->lower,
ROOT_ENTRY_LOWER_CTP); ROOT_ENTRY_LOWER_CTP_MASK,
ROOT_ENTRY_LOWER_CTP_POS);
context_table_addr = context_table_addr << 12; context_table_addr = context_table_addr << 12;
context_table = (uint64_t *)HPA2HVA(context_table_addr); context_table = (uint64_t *)HPA2HVA(context_table_addr);
context_entry = (struct dmar_context_entry *)&context_table[devfun * 2]; context_entry = (struct dmar_context_entry *)&context_table[devfun * 2];
if (DMAR_GET_BITSLICE(context_entry->upper, dom_id = (uint16_t)dmar_get_bitslice(context_entry->upper,
CTX_ENTRY_UPPER_DID) != domain->dom_id) { CTX_ENTRY_UPPER_DID_MASK, CTX_ENTRY_UPPER_DID_POS);
if (dom_id != domain->dom_id) {
pr_err("%s: domain id mismatch", __func__); pr_err("%s: domain id mismatch", __func__);
return 1; return 1;
} }