Changeset 107929 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Jan 24, 2025 9:43:16 AM (4 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

167164

Message:

VMM: GIC: bugref:10404 Renamed some places where GICv3 to GIC, a doxygen fix plus some minor updates. No functional changes.

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• CPUMAllSysRegs-armv8.cpp (modified) (6 diffs)
• GICAll.cpp (modified) (5 diffs)
• PDMAllGic.cpp (modified) (1 diff)

trunk/src/VBox/VMM/VMMAll/CPUMAllSysRegs-armv8.cpp

@@ -169 +169 @@
 
 /** @callback_method_impl{FNCPUMRDSYSREG} */
-static DECLCALLBACK(VBOXSTRICTRC) cpumSysRegRd_GicV3Icc(PVMCPUCC pVCpu, uint32_t idSysReg, PCCPUMSYSREGRANGE pRange, uint64_t *puValue)
+static DECLCALLBACK(VBOXSTRICTRC) cpumSysRegRd_GicIcc(PVMCPUCC pVCpu, uint32_t idSysReg, PCCPUMSYSREGRANGE pRange, uint64_t *puValue)
 {
     RT_NOREF_PV(pRange);
@@ -177 +177 @@
 
 /** @callback_method_impl{FNCPUMWRSYSREG} */
-static DECLCALLBACK(VBOXSTRICTRC) cpumSysRegWr_GicV3Icc(PVMCPUCC pVCpu, uint32_t idSysReg, PCCPUMSYSREGRANGE pRange, uint64_t uValue, uint64_t uRawValue)
+static DECLCALLBACK(VBOXSTRICTRC) cpumSysRegWr_GicIcc(PVMCPUCC pVCpu, uint32_t idSysReg, PCCPUMSYSREGRANGE pRange, uint64_t uValue, uint64_t uRawValue)
 {
     RT_NOREF_PV(pRange); RT_NOREF_PV(uRawValue);
@@ -231 +231 @@
     { cpumSysRegRd_WriteOnly },
     { cpumSysRegRd_ReadCpumOff },
-    { cpumSysRegRd_GicV3Icc  },
+    { cpumSysRegRd_GicIcc  },
     { cpumSysRegRd_OslsrEl1  },
     { cpumSysRegRd_Pmu       }
@@ -247 +247 @@
     { NULL }, /* Alias */
     { cpumSysRegWr_WriteCpumOff },
-    { cpumSysRegWr_GicV3Icc },
+    { cpumSysRegWr_GicIcc },
     { cpumSysRegWr_OslarEl1 },
     { cpumSysRegWr_Pmu      }
@@ -492 +492 @@
     CPUM_ASSERT_RD_SYSREG_FN(WriteOnly);
     CPUM_ASSERT_RD_SYSREG_FN(ReadCpumOff);
-    CPUM_ASSERT_RD_SYSREG_FN(GicV3Icc);
+    CPUM_ASSERT_RD_SYSREG_FN(GicIcc);
     CPUM_ASSERT_RD_SYSREG_FN(OslsrEl1);
     CPUM_ASSERT_RD_SYSREG_FN(Pmu);
@@ -500 +500 @@
     CPUM_ASSERT_WR_SYSREG_FN(ReadOnly);
     CPUM_ASSERT_WR_SYSREG_FN(WriteCpumOff);
-    CPUM_ASSERT_WR_SYSREG_FN(GicV3Icc);
+    CPUM_ASSERT_WR_SYSREG_FN(GicIcc);
     CPUM_ASSERT_WR_SYSREG_FN(OslarEl1);
     CPUM_ASSERT_WR_SYSREG_FN(Pmu);

trunk/src/VBox/VMM/VMMAll/GICAll.cpp

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * GIC - Generic Interrupt Controller Architecture (GICv3) - All Contexts.
+ * GIC - Generic Interrupt Controller Architecture (GIC) - All Contexts.
  */
 
@@ -406 +406 @@
             break;
         case GIC_DIST_REG_TYPER_OFF:
-            *puValue =   GIC_DIST_REG_TYPER_NUM_ITLINES_SET(1)  /** @todo 32 SPIs for now. */
-                       | GIC_DIST_REG_TYPER_NUM_PES_SET(0)      /* 1 PE */
+            *puValue =   GIC_DIST_REG_TYPER_NUM_ITLINES_SET(pThis->uItLinesNumber)
+                       | GIC_DIST_REG_TYPER_NUM_PES_SET(0)      /* 1 PE */ /** @todo r=ramshankar: Should this be pVCpu->cCpus? Currently it means 'ARE' must always be used? */
                        /*| GIC_DIST_REG_TYPER_ESPI*/            /** @todo */
                        /*| GIC_DIST_REG_TYPER_NMI*/             /** @todo Non-maskable interrupts */
@@ -1148 +1148 @@
         }
         case ARMV8_AARCH64_SYSREG_ICC_BPR1_EL1:
-            *pu64Value = pThis->bBinaryPointGrp1 & 0x7;
+            *pu64Value = ARMV8_ICC_BPR1_EL1_AARCH64_BINARYPOINT_SET(pThis->bBinaryPointGrp1);
             break;
         case ARMV8_AARCH64_SYSREG_ICC_CTLR_EL1:
@@ -1211 +1211 @@
             break;
         case ARMV8_AARCH64_SYSREG_ICC_BPR0_EL1:
-            pThis->bBinaryPointGrp0 = (uint8_t)(u64Value & 0x7);
+            pThis->bBinaryPointGrp0 = (uint8_t)ARMV8_ICC_BPR0_EL1_AARCH64_BINARYPOINT_GET(u64Value);
             break;
         case ARMV8_AARCH64_SYSREG_ICC_AP0R0_EL1:
@@ -1321 +1321 @@
             break;
         case ARMV8_AARCH64_SYSREG_ICC_BPR1_EL1:
-            pThis->bBinaryPointGrp0 = (uint8_t)(u64Value & 0x7);
+            pThis->bBinaryPointGrp1 = (uint8_t)ARMV8_ICC_BPR1_EL1_AARCH64_BINARYPOINT_GET(u64Value);
             break;
         case ARMV8_AARCH64_SYSREG_ICC_CTLR_EL1:

trunk/src/VBox/VMM/VMMAll/PDMAllGic.cpp

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * PDM - GICv3 (Generic Interrupt Controller) Interface.
+ * PDM - Generic Interrupt Controller (GIC) Interface.
  */