[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v5 02/10] hw/intc: GICv3 ITS register definitions added
From: |
Eric Auger |
Subject: |
Re: [PATCH v5 02/10] hw/intc: GICv3 ITS register definitions added |
Date: |
Thu, 8 Jul 2021 19:27:13 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.10.1 |
Hi Shashi,
On 7/6/21 11:29 AM, Eric Auger wrote:
> Hi,
>
> On 6/30/21 5:31 PM, Shashi Mallela wrote:
>> Defined descriptors for ITS device table,collection table and ITS
>> command queue entities.Implemented register read/write functions,
>> extract ITS table parameters and command queue parameters,extended
>> gicv3 common to capture qemu address space(which host the ITS table
>> platform memories required for subsequent ITS processing) and
>> initialize the same in ITS device.
>>
>> Signed-off-by: Shashi Mallela <shashi.mallela@linaro.org>
>> Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
>> ---
>> hw/intc/arm_gicv3_its.c | 376 +++++++++++++++++++++++++
>> hw/intc/gicv3_internal.h | 31 +-
>> include/hw/intc/arm_gicv3_common.h | 3 +
>> include/hw/intc/arm_gicv3_its_common.h | 23 ++
>> 4 files changed, 432 insertions(+), 1 deletion(-)
>>
>> diff --git a/hw/intc/arm_gicv3_its.c b/hw/intc/arm_gicv3_its.c
>> index 545cda3665..2d786a1e21 100644
>> --- a/hw/intc/arm_gicv3_its.c
>> +++ b/hw/intc/arm_gicv3_its.c
>> @@ -28,6 +28,160 @@ struct GICv3ITSClass {
>> void (*parent_reset)(DeviceState *dev);
>> };
>>
>> +static uint64_t baser_base_addr(uint64_t value, uint32_t page_sz)
>> +{
>> + uint64_t result = 0;
>> +
>> + switch (page_sz) {
>> + case GITS_PAGE_SIZE_4K:
>> + case GITS_PAGE_SIZE_16K:
>> + result = FIELD_EX64(value, GITS_BASER, PHYADDR);
> << 12 ?
Did you check that? Seems unchanged in v6?
Thanks
Eric
>> + break;
>> +
>> + case GITS_PAGE_SIZE_64K:
>> + result = FIELD_EX64(value, GITS_BASER, PHYADDRL_64K) << 16;
>> + result |= FIELD_EX64(value, GITS_BASER, PHYADDRH_64K) << 48;
>> + break;
>> +
>> + default:
>> + break;
>> + }
>> + return result;
>> +}
>> +
>> +/*
>> + * This function extracts the ITS Device and Collection table specific
>> + * parameters (like base_addr, size etc) from GITS_BASER register.
>> + * It is called during ITS enable and also during post_load migration
>> + */
>> +static void extract_table_params(GICv3ITSState *s)
>> +{
>> + uint16_t num_pages = 0;
>> + uint8_t page_sz_type;
>> + uint8_t type;
>> + uint32_t page_sz = 0;
>> + uint64_t value;
>> +
>> + for (int i = 0; i < 8; i++) {
>> + value = s->baser[i];
>> +
>> + if (!value) {
>> + continue;
>> + }
>> +
>> + page_sz_type = FIELD_EX64(value, GITS_BASER, PAGESIZE);
>> +
>> + switch (page_sz_type) {
>> + case 0:
>> + page_sz = GITS_PAGE_SIZE_4K;
>> + break;
>> +
>> + case 1:
>> + page_sz = GITS_PAGE_SIZE_16K;
>> + break;
>> +
>> + case 2:
>> + case 3:
>> + page_sz = GITS_PAGE_SIZE_64K;
>> + break;
>> +
>> + default:
>> + g_assert_not_reached();
>> + }
>> +
>> + num_pages = FIELD_EX64(value, GITS_BASER, SIZE) + 1;
>> +
>> + type = FIELD_EX64(value, GITS_BASER, TYPE);
>> +
>> + switch (type) {
>> +
>> + case GITS_ITT_TYPE_DEVICE:
>> + memset(&s->dt, 0 , sizeof(s->dt));
>> + s->dt.valid = FIELD_EX64(value, GITS_BASER, VALID);
>> +
>> + if (!s->dt.valid) {
>> + return;
>> + }
>> +
>> + s->dt.page_sz = page_sz;
>> + s->dt.indirect = FIELD_EX64(value, GITS_BASER, INDIRECT);
>> + s->dt.entry_sz = FIELD_EX64(value, GITS_BASER, ENTRYSIZE);
>> +
>> + if (!s->dt.indirect) {
>> + s->dt.max_entries = (num_pages * page_sz) / s->dt.entry_sz;
>> + } else {
>> + s->dt.max_entries = (((num_pages * page_sz) /
>> + L1TABLE_ENTRY_SIZE) *
>> + (page_sz / s->dt.entry_sz));
>> + }
>> +
>> + s->dt.maxids.max_devids = (1UL << (FIELD_EX64(s->typer,
>> GITS_TYPER,
>> + DEVBITS) + 1));
>> +
>> + s->dt.base_addr = baser_base_addr(value, page_sz);
>> +
>> + break;
>> +
>> + case GITS_ITT_TYPE_COLLECTION:
>> + memset(&s->ct, 0 , sizeof(s->ct));
>> + s->ct.valid = FIELD_EX64(value, GITS_BASER, VALID);
>> +
>> + /*
>> + * GITS_TYPER.HCC is 0 for this implementation
>> + * hence writes are discarded if ct.valid is 0
>> + */
>> + if (!s->ct.valid) {
>> + return;
>> + }
>> +
>> + s->ct.page_sz = page_sz;
>> + s->ct.indirect = FIELD_EX64(value, GITS_BASER, INDIRECT);
>> + s->ct.entry_sz = FIELD_EX64(value, GITS_BASER, ENTRYSIZE);
>> +
>> + if (!s->ct.indirect) {
>> + s->ct.max_entries = (num_pages * page_sz) / s->ct.entry_sz;
>> + } else {
>> + s->ct.max_entries = (((num_pages * page_sz) /
>> + L1TABLE_ENTRY_SIZE) *
>> + (page_sz / s->ct.entry_sz));
>> + }
>> +
>> + if (FIELD_EX64(s->typer, GITS_TYPER, CIL)) {
>> + s->ct.maxids.max_collids = (1UL << (FIELD_EX64(s->typer,
>> + GITS_TYPER, CIDBITS) + 1));
>> + } else {
>> + /* 16-bit CollectionId supported when CIL == 0 */
>> + s->ct.maxids.max_collids = (1UL << 16);
>> + }
>> +
>> + s->ct.base_addr = baser_base_addr(value, page_sz);
>> +
>> + break;
>> +
>> + default:
>> + break;
>> + }
>> + }
>> +}
>> +
>> +static void extract_cmdq_params(GICv3ITSState *s)
>> +{
>> + uint16_t num_pages = 0;
>> + uint64_t value = s->cbaser;
>> +
>> + num_pages = FIELD_EX64(value, GITS_CBASER, SIZE) + 1;
>> +
>> + memset(&s->cq, 0 , sizeof(s->cq));
>> + s->cq.valid = FIELD_EX64(value, GITS_CBASER, VALID);
>> +
>> + if (s->cq.valid) {
>> + s->cq.max_entries = (num_pages * GITS_PAGE_SIZE_4K) /
>> + GITS_CMDQ_ENTRY_SIZE;
>> + s->cq.base_addr = FIELD_EX64(value, GITS_CBASER, PHYADDR);
>> + s->cq.base_addr <<= R_GITS_CBASER_PHYADDR_SHIFT;
>> + }
>> +}
>> +
>> static MemTxResult gicv3_its_translation_write(void *opaque, hwaddr offset,
>> uint64_t data, unsigned size,
>> MemTxAttrs attrs)
>> @@ -41,7 +195,99 @@ static MemTxResult its_writel(GICv3ITSState *s, hwaddr
>> offset,
>> uint64_t value, MemTxAttrs attrs)
>> {
>> MemTxResult result = MEMTX_OK;
>> + int index;
>>
>> + switch (offset) {
>> + case GITS_CTLR:
>> + s->ctlr |= (value & ~(s->ctlr));
>> +
>> + if (s->ctlr & ITS_CTLR_ENABLED) {
>> + extract_table_params(s);
>> + extract_cmdq_params(s);
>> + s->creadr = 0;
>> + }
>> + break;
>> + case GITS_CBASER:
>> + /*
>> + * IMPDEF choice:- GITS_CBASER register becomes RO if ITS is
>> + * already enabled
>> + */
>> + if (!(s->ctlr & ITS_CTLR_ENABLED)) {
>> + s->cbaser = deposit64(s->cbaser, 0, 32, value);
>> + s->creadr = 0;
>> + s->cwriter = s->creadr;
>> + }
>> + break;
>> + case GITS_CBASER + 4:
>> + /*
>> + * IMPDEF choice:- GITS_CBASER register becomes RO if ITS is
>> + * already enabled
>> + */
>> + if (!(s->ctlr & ITS_CTLR_ENABLED)) {
>> + s->cbaser = deposit64(s->cbaser, 32, 32, value);
>> + s->creadr = 0;
>> + s->cwriter = s->creadr;
>> + }
>> + break;
>> + case GITS_CWRITER:
>> + s->cwriter = deposit64(s->cwriter, 0, 32,
>> + (value & ~R_GITS_CWRITER_RETRY_MASK));
>> + break;
>> + case GITS_CWRITER + 4:
>> + s->cwriter = deposit64(s->cwriter, 32, 32, value);
>> + break;
>> + case GITS_CREADR:
>> + if (s->gicv3->gicd_ctlr & GICD_CTLR_DS) {
>> + s->creadr = deposit64(s->creadr, 0, 32,
>> + (value & ~R_GITS_CREADR_STALLED_MASK));
>> + } else {
>> + /* RO register, ignore the write */
>> + qemu_log_mask(LOG_GUEST_ERROR,
>> + "%s: invalid guest write to RO register at offset
>> "
>> + TARGET_FMT_plx "\n", __func__, offset);
>> + }
>> + break;
>> + case GITS_CREADR + 4:
>> + if (s->gicv3->gicd_ctlr & GICD_CTLR_DS) {
>> + s->creadr = deposit64(s->creadr, 32, 32, value);
>> + } else {
>> + /* RO register, ignore the write */
>> + qemu_log_mask(LOG_GUEST_ERROR,
>> + "%s: invalid guest write to RO register at offset
>> "
>> + TARGET_FMT_plx "\n", __func__, offset);
>> + }
>> + break;
>> + case GITS_BASER ... GITS_BASER + 0x3f:
>> + /*
>> + * IMPDEF choice:- GITS_BASERn register becomes RO if ITS is
>> + * already enabled
>> + */
>> + if (!(s->ctlr & ITS_CTLR_ENABLED)) {
>> + index = (offset - GITS_BASER) / 8;
>> +
>> + if (offset & 7) {
>> + value <<= 32;
>> + value &= ~GITS_BASER_RO_MASK;
>> + s->baser[index] &= GITS_BASER_RO_MASK | MAKE_64BIT_MASK(0,
>> 32);
>> + s->baser[index] |= value;
>> + } else {
>> + value &= ~GITS_BASER_RO_MASK;
>> + s->baser[index] &= GITS_BASER_RO_MASK | MAKE_64BIT_MASK(32,
>> 32);
>> + s->baser[index] |= value;
>> + }
>> + }
>> + break;
>> + case GITS_IIDR:
>> + case GITS_IDREGS ... GITS_IDREGS + 0x2f:
>> + /* RO registers, ignore the write */
>> + qemu_log_mask(LOG_GUEST_ERROR,
>> + "%s: invalid guest write to RO register at offset "
>> + TARGET_FMT_plx "\n", __func__, offset);
>> + break;
>> + default:
>> + result = MEMTX_ERROR;
>> + break;
>> + }
>> return result;
>> }
>>
>> @@ -49,7 +295,55 @@ static MemTxResult its_readl(GICv3ITSState *s, hwaddr
>> offset,
>> uint64_t *data, MemTxAttrs attrs)
>> {
>> MemTxResult result = MEMTX_OK;
>> + int index;
>>
>> + switch (offset) {
>> + case GITS_CTLR:
>> + *data = s->ctlr;
>> + break;
>> + case GITS_IIDR:
>> + *data = gicv3_iidr();
>> + break;
>> + case GITS_IDREGS ... GITS_IDREGS + 0x2f:
>> + /* ID registers */
>> + *data = gicv3_idreg(offset - GITS_IDREGS);
>> + break;
>> + case GITS_TYPER:
>> + *data = extract64(s->typer, 0, 32);
>> + break;
>> + case GITS_TYPER + 4:
>> + *data = extract64(s->typer, 32, 32);
>> + break;
>> + case GITS_CBASER:
>> + *data = extract64(s->cbaser, 0, 32);
>> + break;
>> + case GITS_CBASER + 4:
>> + *data = extract64(s->cbaser, 32, 32);
>> + break;
>> + case GITS_CREADR:
>> + *data = extract64(s->creadr, 0, 32);
>> + break;
>> + case GITS_CREADR + 4:
>> + *data = extract64(s->creadr, 32, 32);
>> + break;
>> + case GITS_CWRITER:
>> + *data = extract64(s->cwriter, 0, 32);
>> + break;
>> + case GITS_CWRITER + 4:
>> + *data = extract64(s->cwriter, 32, 32);
>> + break;
>> + case GITS_BASER ... GITS_BASER + 0x3f:
>> + index = (offset - GITS_BASER) / 8;
>> + if (offset & 7) {
>> + *data = extract64(s->baser[index], 32, 32);
>> + } else {
>> + *data = extract64(s->baser[index], 0, 32);
>> + }
>> + break;
>> + default:
>> + result = MEMTX_ERROR;
>> + break;
>> + }
>> return result;
>> }
>>
>> @@ -57,7 +351,54 @@ static MemTxResult its_writell(GICv3ITSState *s, hwaddr
>> offset,
>> uint64_t value, MemTxAttrs attrs)
>> {
>> MemTxResult result = MEMTX_OK;
>> + int index;
>>
>> + switch (offset) {
>> + case GITS_BASER ... GITS_BASER + 0x3f:
>> + /*
>> + * IMPDEF choice:- GITS_BASERn register becomes RO if ITS is
>> + * already enabled
>> + */
>> + if (!(s->ctlr & ITS_CTLR_ENABLED)) {
>> + index = (offset - GITS_BASER) / 8;
>> + s->baser[index] &= GITS_BASER_RO_MASK;
>> + s->baser[index] |= (value & ~GITS_BASER_RO_MASK);
>> + }
>> + break;
>> + case GITS_CBASER:
>> + /*
>> + * IMPDEF choice:- GITS_CBASER register becomes RO if ITS is
>> + * already enabled
>> + */
>> + if (!(s->ctlr & ITS_CTLR_ENABLED)) {
>> + s->cbaser = value;
>> + s->creadr = 0;
>> + s->cwriter = s->creadr;
>> + }
>> + break;
>> + case GITS_CWRITER:
>> + s->cwriter = value & ~R_GITS_CWRITER_RETRY_MASK;
>> + break;
>> + case GITS_CREADR:
>> + if (s->gicv3->gicd_ctlr & GICD_CTLR_DS) {
>> + s->creadr = value & ~R_GITS_CREADR_STALLED_MASK;
>> + } else {
>> + /* RO register, ignore the write */
>> + qemu_log_mask(LOG_GUEST_ERROR,
>> + "%s: invalid guest write to RO register at offset
>> "
>> + TARGET_FMT_plx "\n", __func__, offset);
>> + }
>> + break;
>> + case GITS_TYPER:
>> + /* RO registers, ignore the write */
>> + qemu_log_mask(LOG_GUEST_ERROR,
>> + "%s: invalid guest write to RO register at offset "
>> + TARGET_FMT_plx "\n", __func__, offset);
>> + break;
>> + default:
>> + result = MEMTX_ERROR;
>> + break;
>> + }
>> return result;
>> }
>>
>> @@ -65,7 +406,29 @@ static MemTxResult its_readll(GICv3ITSState *s, hwaddr
>> offset,
>> uint64_t *data, MemTxAttrs attrs)
>> {
>> MemTxResult result = MEMTX_OK;
>> + int index;
>>
>> + switch (offset) {
>> + case GITS_TYPER:
>> + *data = s->typer;
>> + break;
>> + case GITS_BASER ... GITS_BASER + 0x3f:
>> + index = (offset - GITS_BASER) / 8;
>> + *data = s->baser[index];
>> + break;
>> + case GITS_CBASER:
>> + *data = s->cbaser;
>> + break;
>> + case GITS_CREADR:
>> + *data = s->creadr;
>> + break;
>> + case GITS_CWRITER:
>> + *data = s->cwriter;
>> + break;
>> + default:
>> + result = MEMTX_ERROR;
>> + break;
>> + }
>> return result;
>> }
>>
>> @@ -162,6 +525,9 @@ static void gicv3_arm_its_realize(DeviceState *dev,
>> Error **errp)
>> gicv3_its_init_mmio(s, &gicv3_its_control_ops,
>> &gicv3_its_translation_ops);
>>
>> if (s->gicv3->cpu->gicr_typer & GICR_TYPER_PLPIS) {
>> + address_space_init(&s->gicv3->dma_as, s->gicv3->dma,
>> + "gicv3-its-sysmem");
>> +
>> /* set the ITS default features supported */
>> s->typer = FIELD_DP64(s->typer, GITS_TYPER, PHYSICAL,
>> GITS_TYPE_PHYSICAL);
>> @@ -208,6 +574,14 @@ static void gicv3_its_reset(DeviceState *dev)
>> }
>> }
>>
>> +static void gicv3_its_post_load(GICv3ITSState *s)
>> +{
>> + if (s->ctlr & ITS_CTLR_ENABLED) {
>> + extract_table_params(s);
>> + extract_cmdq_params(s);
>> + }
>> +}
>> +
>> static Property gicv3_its_props[] = {
>> DEFINE_PROP_LINK("parent-gicv3", GICv3ITSState, gicv3, "arm-gicv3",
>> GICv3State *),
>> @@ -218,10 +592,12 @@ static void gicv3_its_class_init(ObjectClass *klass,
>> void *data)
>> {
>> DeviceClass *dc = DEVICE_CLASS(klass);
>> GICv3ITSClass *ic = ARM_GICV3_ITS_CLASS(klass);
>> + GICv3ITSCommonClass *icc = ARM_GICV3_ITS_COMMON_CLASS(klass);
>>
>> dc->realize = gicv3_arm_its_realize;
>> device_class_set_props(dc, gicv3_its_props);
>> device_class_set_parent_reset(dc, gicv3_its_reset, &ic->parent_reset);
>> + icc->post_load = gicv3_its_post_load;
>> }
>>
>> static const TypeInfo gicv3_its_info = {
>> diff --git a/hw/intc/gicv3_internal.h b/hw/intc/gicv3_internal.h
>> index e0b06930a7..dc2c1bc45b 100644
>> --- a/hw/intc/gicv3_internal.h
>> +++ b/hw/intc/gicv3_internal.h
>> @@ -238,7 +238,7 @@ FIELD(GITS_BASER, PAGESIZE, 8, 2)
>> FIELD(GITS_BASER, SHAREABILITY, 10, 2)
>> FIELD(GITS_BASER, PHYADDR, 12, 36)
>> FIELD(GITS_BASER, PHYADDRL_64K, 16, 32)
>> -FIELD(GITS_BASER, PHYADDRH_64K, 48, 4)
>> +FIELD(GITS_BASER, PHYADDRH_64K, 12, 4)
> should have been addressed earlier
>> FIELD(GITS_BASER, ENTRYSIZE, 48, 5)
>> FIELD(GITS_BASER, OUTERCACHE, 53, 3)
>> FIELD(GITS_BASER, TYPE, 56, 3)
>> @@ -246,6 +246,20 @@ FIELD(GITS_BASER, INNERCACHE, 59, 3)
>> FIELD(GITS_BASER, INDIRECT, 62, 1)
>> FIELD(GITS_BASER, VALID, 63, 1)
>>
>> +FIELD(GITS_CBASER, SIZE, 0, 8)
>> +FIELD(GITS_CBASER, SHAREABILITY, 10, 2)
>> +FIELD(GITS_CBASER, PHYADDR, 12, 40)
>> +FIELD(GITS_CBASER, OUTERCACHE, 53, 3)
>> +FIELD(GITS_CBASER, INNERCACHE, 59, 3)
>> +FIELD(GITS_CBASER, VALID, 63, 1)
>> +
>> +FIELD(GITS_CREADR, STALLED, 0, 1)
>> +FIELD(GITS_CREADR, OFFSET, 5, 15)
>> +
>> +FIELD(GITS_CWRITER, RETRY, 0, 1)
>> +FIELD(GITS_CWRITER, OFFSET, 5, 15)
>> +
>> +FIELD(GITS_CTLR, ENABLED, 0, 1)
>> FIELD(GITS_CTLR, QUIESCENT, 31, 1)
>>
>> FIELD(GITS_TYPER, PHYSICAL, 0, 1)
>> @@ -257,6 +271,13 @@ FIELD(GITS_TYPER, PTA, 19, 1)
>> FIELD(GITS_TYPER, CIDBITS, 32, 4)
>> FIELD(GITS_TYPER, CIL, 36, 1)
>>
>> +#define GITS_IDREGS 0xFFD0
>> +
>> +#define ITS_CTLR_ENABLED (1U) /* ITS Enabled */
>> +
>> +#define GITS_BASER_RO_MASK (R_GITS_BASER_ENTRYSIZE_MASK | \
>> + R_GITS_BASER_TYPE_MASK)
>> +
>> #define GITS_BASER_PAGESIZE_4K 0
>> #define GITS_BASER_PAGESIZE_16K 1
>> #define GITS_BASER_PAGESIZE_64K 2
>> @@ -264,6 +285,14 @@ FIELD(GITS_TYPER, CIL, 36, 1)
>> #define GITS_ITT_TYPE_DEVICE 1ULL
>> #define GITS_ITT_TYPE_COLLECTION 4ULL
>>
>> +#define GITS_PAGE_SIZE_4K 0x1000
>> +#define GITS_PAGE_SIZE_16K 0x4000
>> +#define GITS_PAGE_SIZE_64K 0x10000
>> +
>> +#define L1TABLE_ENTRY_SIZE 8
>> +
>> +#define GITS_CMDQ_ENTRY_SIZE 32
>> +
>> /**
>> * Default features advertised by this version of ITS
>> */
>> diff --git a/include/hw/intc/arm_gicv3_common.h
>> b/include/hw/intc/arm_gicv3_common.h
>> index 91491a2f66..1fd5cedbbd 100644
>> --- a/include/hw/intc/arm_gicv3_common.h
>> +++ b/include/hw/intc/arm_gicv3_common.h
>> @@ -226,6 +226,9 @@ struct GICv3State {
>> int dev_fd; /* kvm device fd if backed by kvm vgic support */
>> Error *migration_blocker;
>>
>> + MemoryRegion *dma;
>> + AddressSpace dma_as;
>> +
>> /* Distributor */
>>
>> /* for a GIC with the security extensions the NS banked version of this
>> diff --git a/include/hw/intc/arm_gicv3_its_common.h
>> b/include/hw/intc/arm_gicv3_its_common.h
>> index 65d1191db1..4e79145dde 100644
>> --- a/include/hw/intc/arm_gicv3_its_common.h
>> +++ b/include/hw/intc/arm_gicv3_its_common.h
>> @@ -41,6 +41,25 @@
>>
>> #define GITS_TRANSLATER 0x0040
>>
>> +typedef struct {
>> + bool valid;
>> + bool indirect;
>> + uint16_t entry_sz;
>> + uint32_t page_sz;
>> + uint32_t max_entries;
>> + union {
>> + uint32_t max_devids;
>> + uint32_t max_collids;
>> + } maxids;
>> + uint64_t base_addr;
>> +} TableDesc;
>> +
>> +typedef struct {
>> + bool valid;
>> + uint32_t max_entries;
>> + uint64_t base_addr;
>> +} CmdQDesc;
>> +
>> struct GICv3ITSState {
>> SysBusDevice parent_obj;
>>
>> @@ -63,6 +82,10 @@ struct GICv3ITSState {
>> uint64_t creadr;
>> uint64_t baser[8];
>>
>> + TableDesc dt;
>> + TableDesc ct;
>> + CmdQDesc cq;
>> +
>> Error *migration_blocker;
>> };
>>
>>
> Besides
> Reviewed-by: Eric Auger <eric.auger@redhat.com>
>
> Eric
>
>