intel_iommu: split the resevred fields arrays into two ones
PATCH 1/1 intel_iommu: split the resevred fields arrays into two ones
From: "Zhang, Qi" <[email protected]>
Signed-off-by Zhang, Qi <[email protected]>
--- hw/i386/intel_iommu.c | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-)
hw/i386/intel_iommu.c +17 -14
@@ -910,18 +910,19 @@ static dma_addr_t vtd_get_iova_pgtbl_base(IntelIOMMUState *s,/* * Rsvd field masks for spte: -* Index [1] to [4] 4k pages -* Index [5] to [8] large pages +* vtd_spte_rsvd 4k pages +* vtd_spte_rsvd_large large pages */ -static uint64_t vtd_paging_entry_rsvd_field[9 ]; +static uint64_t vtd_spte_rsvd[5 ]; +static uint64_t vtd_spte_rsvd_large[5 ];static bool vtd_slpte_nonzero_rsvd (uint64_t slpte,uint32_t level) {if (slpte &VTD_SL_PT_PAGE_SIZE_MASK ) {/* Maybe large page */ -return slpte & vtd_paging_entry_rsvd_field[level +4 ]; +return slpte & vtd_spte_rsvd_large[level]; }else { -return slpte & vtd_paging_entry_rsvd_field[level]; +return slpte & vtd_spte_rsvd[level]; } }
@@ -3547,15 +3548,17 @@ static void vtd_init(IntelIOMMUState *s)/* * Rsvd field masks for spte */ - vtd_paging_entry_rsvd_field[0 ] = ~0ULL ; - vtd_paging_entry_rsvd_field[1 ] =VTD_SPTE_PAGE_L1_RSVD_MASK (s->aw_bits); - vtd_paging_entry_rsvd_field[2 ] =VTD_SPTE_PAGE_L2_RSVD_MASK (s->aw_bits); - vtd_paging_entry_rsvd_field[3 ] =VTD_SPTE_PAGE_L3_RSVD_MASK (s->aw_bits); - vtd_paging_entry_rsvd_field[4 ] =VTD_SPTE_PAGE_L4_RSVD_MASK (s->aw_bits); - vtd_paging_entry_rsvd_field[5 ] =VTD_SPTE_LPAGE_L1_RSVD_MASK (s->aw_bits); - vtd_paging_entry_rsvd_field[6 ] =VTD_SPTE_LPAGE_L2_RSVD_MASK (s->aw_bits); - vtd_paging_entry_rsvd_field[7 ] =VTD_SPTE_LPAGE_L3_RSVD_MASK (s->aw_bits); - vtd_paging_entry_rsvd_field[8 ] =VTD_SPTE_LPAGE_L4_RSVD_MASK (s->aw_bits); + vtd_spte_rsvd[0 ] = ~0ULL ; + vtd_spte_rsvd[1 ] =VTD_SPTE_PAGE_L1_RSVD_MASK (s->aw_bits); + vtd_spte_rsvd[2 ] =VTD_SPTE_PAGE_L2_RSVD_MASK (s->aw_bits); + vtd_spte_rsvd[3 ] =VTD_SPTE_PAGE_L3_RSVD_MASK (s->aw_bits); + vtd_spte_rsvd[4 ] =VTD_SPTE_PAGE_L4_RSVD_MASK (s->aw_bits); + + vtd_spte_rsvd_large[0 ] = ~0ULL ; + vtd_spte_rsvd_large[1 ] =VTD_SPTE_LPAGE_L1_RSVD_MASK (s->aw_bits); + vtd_spte_rsvd_large[2 ] =VTD_SPTE_LPAGE_L2_RSVD_MASK (s->aw_bits); + vtd_spte_rsvd_large[3 ] =VTD_SPTE_LPAGE_L3_RSVD_MASK (s->aw_bits); + vtd_spte_rsvd_large[4 ] =VTD_SPTE_LPAGE_L4_RSVD_MASK (s->aw_bits);if (x86_iommu_ir_supported (x86_iommu)) { s->ecap |=VTD_ECAP_IR |VTD_ECAP_MHMV ;
Signature · 1 line
2.20.1