hv: remove redundant code for virtual interrupt injection

- vlapic_pending_intr() is called only for case no
    APICv/VID(Virtual Interrupt Delivery) feature support,
    in this case, there is no need to test VID case.

  - remove 'apicv_pending_intr()' function.

Tracked-On: #2427
Signed-off-by: Yonghua Huang <yonghua.huang@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>

hypervisor/arch/x86/guest/vlapic.c

@@ -80,9 +80,6 @@ static inline void vlapic_dump_isr(__unused const struct acrn_vlapic *vlapic, __
 static int32_t
 apicv_set_intr_ready(struct acrn_vlapic *vlapic, uint32_t vector);
 
-static int32_t
-apicv_pending_intr(const struct acrn_vlapic *vlapic);
-
 /*
  * Post an interrupt to the vcpu running on 'hostcpu'. This will use a
  * hardware assist if available (e.g. Posted Interrupt) or fall back to
@@ -1332,6 +1329,7 @@ vlapic_icrlo_write_handler(struct acrn_vlapic *vlapic)
  *
  * @remark The vector does not automatically transition to the ISR as a
  *	   result of calling this function.
+ *	   This function is only for case that APICv/VID is NOT supported.
  */
 int32_t
 vlapic_pending_intr(const struct acrn_vlapic *vlapic, uint32_t *vecptr)
@@ -1341,10 +1339,6 @@ vlapic_pending_intr(const struct acrn_vlapic *vlapic, uint32_t *vecptr)
 	const struct lapic_reg *irrptr;
 	int32_t	ret = 0;
 
-	if (is_apicv_intr_delivery_supported()) {
-		ret = apicv_pending_intr(vlapic);
-	} else {
-
 	irrptr = &lapic->irr[0];
 
 	/* i ranges effectively from 7 to 0 */
@@ -1363,7 +1357,6 @@ vlapic_pending_intr(const struct acrn_vlapic *vlapic, uint32_t *vecptr)
 			break;
 		}
 	}
-	}
 	return ret;
 }
 
@@ -2229,46 +2222,6 @@ apicv_set_intr_ready(struct acrn_vlapic *vlapic, uint32_t vector)
 	return notify;
 }
 
-static int32_t
-apicv_pending_intr(const struct acrn_vlapic *vlapic)
-{
-	const struct vlapic_pir_desc *pir_desc;
-	const struct lapic_regs *lapic;
-	uint64_t pending, pirval;
-	uint32_t i, ppr, vpr;
-	int32_t ret = 0;
-
-	pir_desc = &(vlapic->pir_desc);
-
-	pending = atomic_load64(&pir_desc->pending);
-	if (pending != 0U) {
-		lapic = &(vlapic->apic_page);
-		ppr = lapic->ppr.v & 0xF0U;
-
-		if (ppr == 0U) {
-			ret = 1;
-		} else {
-
-			/* i ranges effectively from 3 to 0 */
-			i = 4U;
-			while (i > 0U) {
-				i --;
-				if (pir_desc->pir[i] != 0U) {
-					break;
-				}
-			}
-
-			pirval = pir_desc->pir[i];
-			if (pirval != 0U) {
-				vpr = (((i * 64U) + (uint32_t)fls64(pirval)) & 0xF0U);
-				ret = ((vpr > ppr) ? 1 : 0);
-			}
-		}
-	}
-
-	return ret;
-}
-
 /**
  *APIC-v: Get the HPA to APIC-access page
  * **/

hypervisor/arch/x86/virq.c

@@ -70,6 +70,9 @@ static bool is_guest_irq_enabled(struct acrn_vcpu *vcpu)
 	return status;
 }
 
+/*
+ * This function is only for case that APICv/VID is not supported.
+ */
 static bool vcpu_pending_request(struct acrn_vcpu *vcpu)
 {
 	struct acrn_vlapic *vlapic;
@@ -108,20 +111,15 @@ void vcpu_make_request(struct acrn_vcpu *vcpu, uint16_t eventid)
 	}
 }
 
+/*
+ * This function is only for case that APICv/VID is not supported.
+ */
 static int32_t vcpu_inject_vlapic_int(struct acrn_vcpu *vcpu)
 {
 	struct acrn_vlapic *vlapic = vcpu_vlapic(vcpu);
 	uint32_t vector = 0U;
 	int32_t ret = 0;
 
-	/*
-	 * This function used for inject virtual interrupt
-	 * through vmcs.
-	 */
-	if (is_apicv_intr_delivery_supported()) {
-		ret = -1;
-	} else {
-		/* Query vLapic to get vector to inject */
 	ret = vlapic_pending_intr(vlapic, &vector);
 	if (ret != 0) {
 		/*
@@ -142,7 +140,6 @@ static int32_t vcpu_inject_vlapic_int(struct acrn_vcpu *vcpu)
 			ret = 0;
 		}
 	}
-	}
 
 	return ret;
 }