mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/intc/arm_gicv3_its: Implement VMOVP

Browse Source 
Implement the GICv4 VMOVP command, which updates an entry in the vPE
table to change its rdbase field. This command is unique in the ITS
command set because its effects must be propagated to all the other
ITSes connected to the same GIC as the ITS which executes the VMOVP
command.

The GICv4 spec allows two implementation choices for handling the
propagation to other ITSes:
 * If GITS_TYPER.VMOVP is 1, the guest only needs to issue the command
   on one ITS, and the implementation handles the propagation to
   all ITSes
 * If GITS_TYPER.VMOVP is 0, the guest must issue the command on
   every ITS, and arrange for the ITSes to synchronize the updates
   with each other by setting ITSList and Sequence Number fields
   in the command packets

We choose the GITS_TYPER.VMOVP = 1 approach, and synchronously
execute the update on every ITS.

For GICv4.1 this command has extra fields in the command packet and
additional behaviour.  We define the 4.1-only fields with the FIELD
macro, but only implement the GICv4.0 version of the command.

Note that we don't update the reported GITS_TYPER value here;
we'll do that later in a commit which updates all the reported
feature bit and ID register values for GICv4.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20220408141550.1271295-17-peter.maydell@linaro.org
[PMM: Moved gicv3_foreach_its() to arm_gicv3_its_common.h,
 for consistency with gicv3_add_its()]
This commit is contained in:
Peter Maydell 2022-04-08 15:15:25 +01:00
parent 7c087bd330
commit 3851af4585
4 changed files with 94 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
hw/intc/arm_gicv3_its.c
View File

@ -1012,6 +1012,78 @@ static ItsCmdResult process_vmapp(GICv3ITSState *s, const uint64_t *cmdpkt)
return update_vte(s, vpeid, &vte) ? CMD_CONTINUE_OK : CMD_STALL;
}
typedef struct VmovpCallbackData {
uint64_t rdbase;
uint32_t vpeid;
/*
* Overall command result. If more than one callback finds an
* error, STALL beats CONTINUE.
*/
ItsCmdResult result;
} VmovpCallbackData;
static void vmovp_callback(gpointer data, gpointer opaque)
{
/*
* This function is called to update the VPEID field in a VPE
* table entry for this ITS. This might be because of a VMOVP
* command executed on any ITS that is connected to the same GIC
* as this ITS. We need to read the VPE table entry for the VPEID
* and update its RDBASE field.
*/
GICv3ITSState *s = data;
VmovpCallbackData *cbdata = opaque;
VTEntry vte;
ItsCmdResult cmdres;
cmdres = lookup_vte(s, __func__, cbdata->vpeid, &vte);
switch (cmdres) {
case CMD_STALL:
cbdata->result = CMD_STALL;
return;
case CMD_CONTINUE:
if (cbdata->result != CMD_STALL) {
cbdata->result = CMD_CONTINUE;
}
return;
case CMD_CONTINUE_OK:
break;
}
vte.rdbase = cbdata->rdbase;
if (!update_vte(s, cbdata->vpeid, &vte)) {
cbdata->result = CMD_STALL;
}
}
static ItsCmdResult process_vmovp(GICv3ITSState *s, const uint64_t *cmdpkt)
{
VmovpCallbackData cbdata;
if (!its_feature_virtual(s)) {
return CMD_CONTINUE;
}
cbdata.vpeid = FIELD_EX64(cmdpkt[1], VMOVP_1, VPEID);
cbdata.rdbase = FIELD_EX64(cmdpkt[2], VMOVP_2, RDBASE);
trace_gicv3_its_cmd_vmovp(cbdata.vpeid, cbdata.rdbase);
if (cbdata.rdbase >= s->gicv3->num_cpu) {
return CMD_CONTINUE;
}
/*
* Our ITS implementation reports GITS_TYPER.VMOVP == 1, which means
* that when the VMOVP command is executed on an ITS to change the
* VPEID field in a VPE table entry the change must be propagated
* to all the ITSes connected to the same GIC.
*/
cbdata.result = CMD_CONTINUE_OK;
gicv3_foreach_its(s->gicv3, vmovp_callback, &cbdata);
return cbdata.result;
}
/*
* Current implementation blocks until all
* commands are processed
@ -1136,6 +1208,9 @@ static void process_cmdq(GICv3ITSState *s)
case GITS_CMD_VMAPP:
result = process_vmapp(s, cmdpkt);
break;
case GITS_CMD_VMOVP:
result = process_vmovp(s, cmdpkt);
break;
default:
trace_gicv3_its_cmd_unknown(cmd);
break;

9
hw/intc/gicv3_internal.h
View File

@ -329,6 +329,7 @@ FIELD(GITS_TYPER, CIL, 36, 1)
#define GITS_CMD_INVALL 0x0D
#define GITS_CMD_MOVALL 0x0E
#define GITS_CMD_DISCARD 0x0F
#define GITS_CMD_VMOVP 0x22
#define GITS_CMD_VMAPP 0x29
#define GITS_CMD_VMAPTI 0x2A
#define GITS_CMD_VMAPI 0x2B
@ -389,6 +390,14 @@ FIELD(VMAPP_2, V, 63, 1)
FIELD(VMAPP_3, VPTSIZE, 0, 8) /* For GICv4.0, bits [7:6] are RES0 */
FIELD(VMAPP_3, VPTADDR, 16, 36)
/* VMOVP command fields */
FIELD(VMOVP_0, SEQNUM, 32, 16) /* not used for GITS_TYPER.VMOVP == 1 */
FIELD(VMOVP_1, ITSLIST, 0, 16) /* not used for GITS_TYPER.VMOVP == 1 */
FIELD(VMOVP_1, VPEID, 32, 16)
FIELD(VMOVP_2, RDBASE, 16, 36)
FIELD(VMOVP_2, DB, 63, 1) /* GICv4.1 only */
FIELD(VMOVP_3, DEFAULT_DOORBELL, 0, 32) /* GICv4.1 only */
/*
* 12 bytes Interrupt translation Table Entry size
* as per Table 5.3 in GICv3 spec

1
hw/intc/trace-events
View File

@ -190,6 +190,7 @@ gicv3_its_cmd_movi(uint32_t devid, uint32_t eventid, uint32_t icid) "GICv3 ITS:
gicv3_its_cmd_vmapi(uint32_t devid, uint32_t eventid, uint32_t vpeid, uint32_t doorbell) "GICv3 ITS: command VMAPI DeviceID 0x%x EventID 0x%x vPEID 0x%x Dbell_pINTID 0x%x"
gicv3_its_cmd_vmapti(uint32_t devid, uint32_t eventid, uint32_t vpeid, uint32_t vintid, uint32_t doorbell) "GICv3 ITS: command VMAPI DeviceID 0x%x EventID 0x%x vPEID 0x%x vINTID 0x%x Dbell_pINTID 0x%x"
gicv3_its_cmd_vmapp(uint32_t vpeid, uint64_t rdbase, int valid, uint64_t vptaddr, uint32_t vptsize) "GICv3 ITS: command VMAPP vPEID 0x%x RDbase 0x%" PRIx64 " V %d VPT_addr 0x%" PRIx64 " VPT_size 0x%x"
gicv3_its_cmd_vmovp(uint32_t vpeid, uint64_t rdbase) "GICv3 ITS: command VMOVP vPEID 0x%x RDbase 0x%" PRIx64
gicv3_its_cmd_unknown(unsigned cmd) "GICv3 ITS: unknown command 0x%x"
gicv3_its_cte_read(uint32_t icid, int valid, uint32_t rdbase) "GICv3 ITS: Collection Table read for ICID 0x%x: valid %d RDBase 0x%x"
gicv3_its_cte_write(uint32_t icid, int valid, uint32_t rdbase) "GICv3 ITS: Collection Table write for ICID 0x%x: valid %d RDBase 0x%x"

9
include/hw/intc/arm_gicv3_its_common.h
View File

@ -98,6 +98,15 @@ static inline void gicv3_add_its(GICv3State *s, DeviceState *its)
g_ptr_array_add(s->itslist, its);
}
/*
* The ITS can use this for operations that must be performed on
* every ITS connected to the same GIC that it is
*/
static inline void gicv3_foreach_its(GICv3State *s, GFunc func, void *opaque)
{
g_ptr_array_foreach(s->itslist, func, opaque);
}
#define TYPE_ARM_GICV3_ITS_COMMON "arm-gicv3-its-common"
typedef struct GICv3ITSCommonClass GICv3ITSCommonClass;
DECLARE_OBJ_CHECKERS(GICv3ITSState, GICv3ITSCommonClass,