SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hw/intc/arm_gicv3_its: Use FIELD macros for CTEs

Browse Source 
Use FIELD macros to handle CTEs, rather than ad-hoc mask-and-shift.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Peter Maydell 2022-01-07 17:07:59 +00:00
parent 257bb6501c
commit 437dc0ea98
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hw/intc/arm_gicv3_its.c
View File

@ -104,7 +104,7 @@ static bool get_cte(GICv3ITSState *s, uint16_t icid, uint64_t *cte,
MEMTXATTRS_UNSPECIFIED, res); MEMTXATTRS_UNSPECIFIED, res);
} }
return (*cte & TABLE_ENTRY_VALID_MASK) != 0; return FIELD_EX64(*cte, CTE, VALID);
} }
static bool update_ite(GICv3ITSState *s, uint32_t eventid, uint64_t dte, static bool update_ite(GICv3ITSState *s, uint32_t eventid, uint64_t dte,
@ -308,7 +308,7 @@ static bool process_its_cmd(GICv3ITSState *s, uint64_t value, uint32_t offset,
* Current implementation only supports rdbase == procnum * Current implementation only supports rdbase == procnum
* Hence rdbase physical address is ignored * Hence rdbase physical address is ignored
*/ */
rdbase = (cte & GITS_CTE_RDBASE_PROCNUM_MASK) >> 1U; rdbase = FIELD_EX64(cte, CTE, RDBASE);
if (rdbase >= s->gicv3->num_cpu) { if (rdbase >= s->gicv3->num_cpu) {
return result; return result;
@ -426,7 +426,8 @@ static bool update_cte(GICv3ITSState *s, uint16_t icid, bool valid,
if (valid) { if (valid) {
/* add mapping entry to collection table */ /* add mapping entry to collection table */
cte = (valid & TABLE_ENTRY_VALID_MASK) | (rdbase << 1ULL); cte = FIELD_DP64(cte, CTE, VALID, 1);
cte = FIELD_DP64(cte, CTE, RDBASE, rdbase);
} }
/* /*

3
hw/intc/gicv3_internal.h
View File

@ -403,7 +403,8 @@ FIELD(DTE, ITTADDR, 6, 44)
* Valid = 1 bit, RDBase = 16 bits * Valid = 1 bit, RDBase = 16 bits
*/ */
#define GITS_CTE_SIZE (0x8ULL) #define GITS_CTE_SIZE (0x8ULL)
#define GITS_CTE_RDBASE_PROCNUM_MASK MAKE_64BIT_MASK(1, RDBASE_PROCNUM_LENGTH) FIELD(CTE, VALID, 0, 1)
FIELD(CTE, RDBASE, 1, RDBASE_PROCNUM_LENGTH)
/* Special interrupt IDs */ /* Special interrupt IDs */
#define INTID_SECURE 1020 #define INTID_SECURE 1020