From nobody Sun May 19 20:02:56 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1628787379369340.5179822501592; Thu, 12 Aug 2021 09:56:19 -0700 (PDT) Received: from localhost ([::1]:54850 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mEE02-0002R2-SV for importer@patchew.org; Thu, 12 Aug 2021 12:56:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50756) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mEDxq-0007kP-HA for qemu-devel@nongnu.org; Thu, 12 Aug 2021 12:53:55 -0400 Received: from mail-qk1-x72e.google.com ([2607:f8b0:4864:20::72e]:41723) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mEDxi-00060E-9a for qemu-devel@nongnu.org; Thu, 12 Aug 2021 12:53:54 -0400 Received: by mail-qk1-x72e.google.com with SMTP id t68so7359602qkf.8 for ; Thu, 12 Aug 2021 09:53:45 -0700 (PDT) Received: from localhost.localdomain (bras-base-stsvon1503w-grc-22-142-114-143-47.dsl.bell.ca. [142.114.143.47]) by smtp.googlemail.com with ESMTPSA id c69sm1714864qkg.1.2021.08.12.09.53.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Aug 2021 09:53:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=t6WF3SVT7Mrzf2gTWv+uWn1QQj69Oryh6uQQ8VAUK1o=; b=uLs4alTyO2xRJAPWUp8kzbcC1qkSHScJqEeZV+1BjubWE7Kf/G0YZTLQWM3OZ29xG5 QFe0RsuOnzD6UERaSdzqm+VuAQJjmAZKJ/idFW3ziGHqz4wVuSIpUXnVeiLZ7uQQCDNW Xpi+8VewD5PGz2zOh85IMxfFI+9uLcs+a76QPciZb78HZe0Z46MTppoovjJeElilxB4U YFHlYlcgVCtSyoyUsWRbmAat8t4P8aqCxYqz0tQGlM3g/92b9Hqtb7G1QyYO67ON31Ox CxO3/yRWeePgIANE5AoBGmrE1z+CPmy8SlV2j3nD8jcgU5eVr78D1hYffGmUQ+aQojfx zFvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=t6WF3SVT7Mrzf2gTWv+uWn1QQj69Oryh6uQQ8VAUK1o=; b=o3ZiRtKY8qSoAp8FhZ8CjqTuK24LtSXG7GgVSfEFJS7QvEkh9CeBMxBKEz2Yq8636U xKB23KATi9WzDAXMLV5iL4pNrDlApr8F69NnTPxRBUyO82f+oBULo5E/d6/8HqAcO86E 01VLvB5Qf+N8s/U+SsIOsNGUpYdObpIYdXEmVM6VDITeqJ0vHVuVk6k0BF3lZRlzP7dM atgzjmDfrx7XeUcFH2X6wi4gkw9Vd+WeewMnc340QXYRu3au1uQzUrrEzsO/mDOIOn9x 02z+uPmQL32QCeHThVS1LF/v2ixCowvnoG1nAy8QZFjbUZAP2W6BLQVqm2peNDkTUxch Jmmw== X-Gm-Message-State: AOAM530nEcZdn3xmcwJIoEFWBOEU1VFDNeyyF5hWyvOO2tmEyb5bbgAr AMA3rmI1y2Kj6ymZlHfP7Ub+fA== X-Google-Smtp-Source: ABdhPJyT23txdYHqI1N2AYoiUs5ekLmpB/PkbaSfVqK4rpFZSvznwyPl8iDUkVBC6pPJZwJfRAcZqw== X-Received: by 2002:a05:620a:2193:: with SMTP id g19mr5563876qka.307.1628787225128; Thu, 12 Aug 2021 09:53:45 -0700 (PDT) From: Shashi Mallela To: peter.maydell@linaro.org, leif@nuviainc.com, rad@semihalf.com, mst@redhat.com, imammedo@redhat.com Subject: [PATCH v8 01/10] hw/intc: GICv3 ITS initial framework Date: Thu, 12 Aug 2021 12:53:32 -0400 Message-Id: <20210812165341.40784-2-shashi.mallela@linaro.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210812165341.40784-1-shashi.mallela@linaro.org> References: <20210812165341.40784-1-shashi.mallela@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::72e; envelope-from=shashi.mallela@linaro.org; helo=mail-qk1-x72e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: eric.auger@redhat.com, qemu-arm@nongnu.org, qemu-devel@nongnu.org, narmstrong@baylibre.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1628787381722100001 Content-Type: text/plain; charset="utf-8" Added register definitions relevant to ITS,implemented overall ITS device framework with stubs for ITS control and translater regions read/write,extended ITS common to handle mmio init between existing kvm device and newer qemu device. Signed-off-by: Shashi Mallela Reviewed-by: Peter Maydell Reviewed-by: Eric Auger Tested-by: Neil Armstrong --- hw/intc/arm_gicv3_its.c | 245 +++++++++++++++++++++++++ hw/intc/arm_gicv3_its_common.c | 7 +- hw/intc/arm_gicv3_its_kvm.c | 2 +- hw/intc/gicv3_internal.h | 96 +++++++++- hw/intc/meson.build | 1 + include/hw/intc/arm_gicv3_its_common.h | 9 +- 6 files changed, 346 insertions(+), 14 deletions(-) create mode 100644 hw/intc/arm_gicv3_its.c diff --git a/hw/intc/arm_gicv3_its.c b/hw/intc/arm_gicv3_its.c new file mode 100644 index 0000000000..2286b3f757 --- /dev/null +++ b/hw/intc/arm_gicv3_its.c @@ -0,0 +1,245 @@ +/* + * ITS emulation for a GICv3-based system + * + * Copyright Linaro.org 2021 + * + * Authors: + * Shashi Mallela + * + * This work is licensed under the terms of the GNU GPL, version 2 or (at = your + * option) any later version. See the COPYING file in the top-level direc= tory. + * + */ + +#include "qemu/osdep.h" +#include "qemu/log.h" +#include "hw/qdev-properties.h" +#include "hw/intc/arm_gicv3_its_common.h" +#include "gicv3_internal.h" +#include "qom/object.h" +#include "qapi/error.h" + +typedef struct GICv3ITSClass GICv3ITSClass; +/* This is reusing the GICv3ITSState typedef from ARM_GICV3_ITS_COMMON */ +DECLARE_OBJ_CHECKERS(GICv3ITSState, GICv3ITSClass, + ARM_GICV3_ITS, TYPE_ARM_GICV3_ITS) + +struct GICv3ITSClass { + GICv3ITSCommonClass parent_class; + void (*parent_reset)(DeviceState *dev); +}; + +static MemTxResult gicv3_its_translation_write(void *opaque, hwaddr offset, + uint64_t data, unsigned siz= e, + MemTxAttrs attrs) +{ + MemTxResult result =3D MEMTX_OK; + + return result; +} + +static MemTxResult its_writel(GICv3ITSState *s, hwaddr offset, + uint64_t value, MemTxAttrs attrs) +{ + MemTxResult result =3D MEMTX_OK; + + return result; +} + +static MemTxResult its_readl(GICv3ITSState *s, hwaddr offset, + uint64_t *data, MemTxAttrs attrs) +{ + MemTxResult result =3D MEMTX_OK; + + return result; +} + +static MemTxResult its_writell(GICv3ITSState *s, hwaddr offset, + uint64_t value, MemTxAttrs attrs) +{ + MemTxResult result =3D MEMTX_OK; + + return result; +} + +static MemTxResult its_readll(GICv3ITSState *s, hwaddr offset, + uint64_t *data, MemTxAttrs attrs) +{ + MemTxResult result =3D MEMTX_OK; + + return result; +} + +static MemTxResult gicv3_its_read(void *opaque, hwaddr offset, uint64_t *d= ata, + unsigned size, MemTxAttrs attrs) +{ + GICv3ITSState *s =3D (GICv3ITSState *)opaque; + MemTxResult result; + + switch (size) { + case 4: + result =3D its_readl(s, offset, data, attrs); + break; + case 8: + result =3D its_readll(s, offset, data, attrs); + break; + default: + result =3D MEMTX_ERROR; + break; + } + + if (result =3D=3D MEMTX_ERROR) { + qemu_log_mask(LOG_GUEST_ERROR, + "%s: invalid guest read at offset " TARGET_FMT_plx + "size %u\n", __func__, offset, size); + /* + * The spec requires that reserved registers are RAZ/WI; + * so use MEMTX_ERROR returns from leaf functions as a way to + * trigger the guest-error logging but don't return it to + * the caller, or we'll cause a spurious guest data abort. + */ + result =3D MEMTX_OK; + *data =3D 0; + } + return result; +} + +static MemTxResult gicv3_its_write(void *opaque, hwaddr offset, uint64_t d= ata, + unsigned size, MemTxAttrs attrs) +{ + GICv3ITSState *s =3D (GICv3ITSState *)opaque; + MemTxResult result; + + switch (size) { + case 4: + result =3D its_writel(s, offset, data, attrs); + break; + case 8: + result =3D its_writell(s, offset, data, attrs); + break; + default: + result =3D MEMTX_ERROR; + break; + } + + if (result =3D=3D MEMTX_ERROR) { + qemu_log_mask(LOG_GUEST_ERROR, + "%s: invalid guest write at offset " TARGET_FMT_plx + "size %u\n", __func__, offset, size); + /* + * The spec requires that reserved registers are RAZ/WI; + * so use MEMTX_ERROR returns from leaf functions as a way to + * trigger the guest-error logging but don't return it to + * the caller, or we'll cause a spurious guest data abort. + */ + result =3D MEMTX_OK; + } + return result; +} + +static const MemoryRegionOps gicv3_its_control_ops =3D { + .read_with_attrs =3D gicv3_its_read, + .write_with_attrs =3D gicv3_its_write, + .valid.min_access_size =3D 4, + .valid.max_access_size =3D 8, + .impl.min_access_size =3D 4, + .impl.max_access_size =3D 8, + .endianness =3D DEVICE_NATIVE_ENDIAN, +}; + +static const MemoryRegionOps gicv3_its_translation_ops =3D { + .write_with_attrs =3D gicv3_its_translation_write, + .valid.min_access_size =3D 2, + .valid.max_access_size =3D 4, + .impl.min_access_size =3D 2, + .impl.max_access_size =3D 4, + .endianness =3D DEVICE_NATIVE_ENDIAN, +}; + +static void gicv3_arm_its_realize(DeviceState *dev, Error **errp) +{ + GICv3ITSState *s =3D ARM_GICV3_ITS_COMMON(dev); + int i; + + for (i =3D 0; i < s->gicv3->num_cpu; i++) { + if (!(s->gicv3->cpu[i].gicr_typer & GICR_TYPER_PLPIS)) { + error_setg(errp, "Physical LPI not supported by CPU %d", i); + return; + } + } + + gicv3_its_init_mmio(s, &gicv3_its_control_ops, &gicv3_its_translation_= ops); + + /* set the ITS default features supported */ + s->typer =3D FIELD_DP64(s->typer, GITS_TYPER, PHYSICAL, + GITS_TYPE_PHYSICAL); + s->typer =3D FIELD_DP64(s->typer, GITS_TYPER, ITT_ENTRY_SIZE, + ITS_ITT_ENTRY_SIZE - 1); + s->typer =3D FIELD_DP64(s->typer, GITS_TYPER, IDBITS, ITS_IDBITS); + s->typer =3D FIELD_DP64(s->typer, GITS_TYPER, DEVBITS, ITS_DEVBITS); + s->typer =3D FIELD_DP64(s->typer, GITS_TYPER, CIL, 1); + s->typer =3D FIELD_DP64(s->typer, GITS_TYPER, CIDBITS, ITS_CIDBITS); +} + +static void gicv3_its_reset(DeviceState *dev) +{ + GICv3ITSState *s =3D ARM_GICV3_ITS_COMMON(dev); + GICv3ITSClass *c =3D ARM_GICV3_ITS_GET_CLASS(s); + + c->parent_reset(dev); + + /* Quiescent bit reset to 1 */ + s->ctlr =3D FIELD_DP32(s->ctlr, GITS_CTLR, QUIESCENT, 1); + + /* + * setting GITS_BASER0.Type =3D 0b001 (Device) + * GITS_BASER1.Type =3D 0b100 (Collection Table) + * GITS_BASER.Type,where n =3D 3 to 7 are 0b00 (Unimplement= ed) + * GITS_BASER<0,1>.Page_Size =3D 64KB + * and default translation table entry size to 16 bytes + */ + s->baser[0] =3D FIELD_DP64(s->baser[0], GITS_BASER, TYPE, + GITS_BASER_TYPE_DEVICE); + s->baser[0] =3D FIELD_DP64(s->baser[0], GITS_BASER, PAGESIZE, + GITS_BASER_PAGESIZE_64K); + s->baser[0] =3D FIELD_DP64(s->baser[0], GITS_BASER, ENTRYSIZE, + GITS_DTE_SIZE - 1); + + s->baser[1] =3D FIELD_DP64(s->baser[1], GITS_BASER, TYPE, + GITS_BASER_TYPE_COLLECTION); + s->baser[1] =3D FIELD_DP64(s->baser[1], GITS_BASER, PAGESIZE, + GITS_BASER_PAGESIZE_64K); + s->baser[1] =3D FIELD_DP64(s->baser[1], GITS_BASER, ENTRYSIZE, + GITS_CTE_SIZE - 1); +} + +static Property gicv3_its_props[] =3D { + DEFINE_PROP_LINK("parent-gicv3", GICv3ITSState, gicv3, "arm-gicv3", + GICv3State *), + DEFINE_PROP_END_OF_LIST(), +}; + +static void gicv3_its_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc =3D DEVICE_CLASS(klass); + GICv3ITSClass *ic =3D ARM_GICV3_ITS_CLASS(klass); + + dc->realize =3D gicv3_arm_its_realize; + device_class_set_props(dc, gicv3_its_props); + device_class_set_parent_reset(dc, gicv3_its_reset, &ic->parent_reset); +} + +static const TypeInfo gicv3_its_info =3D { + .name =3D TYPE_ARM_GICV3_ITS, + .parent =3D TYPE_ARM_GICV3_ITS_COMMON, + .instance_size =3D sizeof(GICv3ITSState), + .class_init =3D gicv3_its_class_init, + .class_size =3D sizeof(GICv3ITSClass), +}; + +static void gicv3_its_register_types(void) +{ + type_register_static(&gicv3_its_info); +} + +type_init(gicv3_its_register_types) diff --git a/hw/intc/arm_gicv3_its_common.c b/hw/intc/arm_gicv3_its_common.c index 66c4c6a188..7d7f3882e7 100644 --- a/hw/intc/arm_gicv3_its_common.c +++ b/hw/intc/arm_gicv3_its_common.c @@ -50,6 +50,8 @@ static int gicv3_its_post_load(void *opaque, int version_= id) =20 static const VMStateDescription vmstate_its =3D { .name =3D "arm_gicv3_its", + .version_id =3D 1, + .minimum_version_id =3D 1, .pre_save =3D gicv3_its_pre_save, .post_load =3D gicv3_its_post_load, .priority =3D MIG_PRI_GICV3_ITS, @@ -99,14 +101,15 @@ static const MemoryRegionOps gicv3_its_trans_ops =3D { .endianness =3D DEVICE_NATIVE_ENDIAN, }; =20 -void gicv3_its_init_mmio(GICv3ITSState *s, const MemoryRegionOps *ops) +void gicv3_its_init_mmio(GICv3ITSState *s, const MemoryRegionOps *ops, + const MemoryRegionOps *tops) { SysBusDevice *sbd =3D SYS_BUS_DEVICE(s); =20 memory_region_init_io(&s->iomem_its_cntrl, OBJECT(s), ops, s, "control", ITS_CONTROL_SIZE); memory_region_init_io(&s->iomem_its_translation, OBJECT(s), - &gicv3_its_trans_ops, s, + tops ? tops : &gicv3_its_trans_ops, s, "translation", ITS_TRANS_SIZE); =20 /* Our two regions are always adjacent, therefore we now combine them diff --git a/hw/intc/arm_gicv3_its_kvm.c b/hw/intc/arm_gicv3_its_kvm.c index b554d2ede0..0b4cbed28b 100644 --- a/hw/intc/arm_gicv3_its_kvm.c +++ b/hw/intc/arm_gicv3_its_kvm.c @@ -106,7 +106,7 @@ static void kvm_arm_its_realize(DeviceState *dev, Error= **errp) kvm_arm_register_device(&s->iomem_its_cntrl, -1, KVM_DEV_ARM_VGIC_GRP_= ADDR, KVM_VGIC_ITS_ADDR_TYPE, s->dev_fd, 0); =20 - gicv3_its_init_mmio(s, NULL); + gicv3_its_init_mmio(s, NULL, NULL); =20 if (!kvm_device_check_attr(s->dev_fd, KVM_DEV_ARM_VGIC_GRP_ITS_REGS, GITS_CTLR)) { diff --git a/hw/intc/gicv3_internal.h b/hw/intc/gicv3_internal.h index 05303a55c8..b99bf9db46 100644 --- a/hw/intc/gicv3_internal.h +++ b/hw/intc/gicv3_internal.h @@ -24,6 +24,7 @@ #ifndef QEMU_ARM_GICV3_INTERNAL_H #define QEMU_ARM_GICV3_INTERNAL_H =20 +#include "hw/registerfields.h" #include "hw/intc/arm_gicv3_common.h" =20 /* Distributor registers, as offsets from the distributor base address */ @@ -67,6 +68,9 @@ #define GICD_CTLR_E1NWF (1U << 7) #define GICD_CTLR_RWP (1U << 31) =20 +/* 16 bits EventId */ +#define GICD_TYPER_IDBITS 0xf + /* * Redistributor frame offsets from RD_base */ @@ -122,17 +126,17 @@ #define GICR_WAKER_ProcessorSleep (1U << 1) #define GICR_WAKER_ChildrenAsleep (1U << 2) =20 -#define GICR_PROPBASER_OUTER_CACHEABILITY_MASK (7ULL << 56) -#define GICR_PROPBASER_ADDR_MASK (0xfffffffffULL << 12) -#define GICR_PROPBASER_SHAREABILITY_MASK (3U << 10) -#define GICR_PROPBASER_CACHEABILITY_MASK (7U << 7) -#define GICR_PROPBASER_IDBITS_MASK (0x1f) +FIELD(GICR_PROPBASER, IDBITS, 0, 5) +FIELD(GICR_PROPBASER, INNERCACHE, 7, 3) +FIELD(GICR_PROPBASER, SHAREABILITY, 10, 2) +FIELD(GICR_PROPBASER, PHYADDR, 12, 40) +FIELD(GICR_PROPBASER, OUTERCACHE, 56, 3) =20 -#define GICR_PENDBASER_PTZ (1ULL << 62) -#define GICR_PENDBASER_OUTER_CACHEABILITY_MASK (7ULL << 56) -#define GICR_PENDBASER_ADDR_MASK (0xffffffffULL << 16) -#define GICR_PENDBASER_SHAREABILITY_MASK (3U << 10) -#define GICR_PENDBASER_CACHEABILITY_MASK (7U << 7) +FIELD(GICR_PENDBASER, INNERCACHE, 7, 3) +FIELD(GICR_PENDBASER, SHAREABILITY, 10, 2) +FIELD(GICR_PENDBASER, PHYADDR, 16, 36) +FIELD(GICR_PENDBASER, OUTERCACHE, 56, 3) +FIELD(GICR_PENDBASER, PTZ, 62, 1) =20 #define ICC_CTLR_EL1_CBPR (1U << 0) #define ICC_CTLR_EL1_EOIMODE (1U << 1) @@ -239,6 +243,78 @@ #define ICH_VTR_EL2_PREBITS_SHIFT 26 #define ICH_VTR_EL2_PRIBITS_SHIFT 29 =20 +/* ITS Registers */ + +FIELD(GITS_BASER, SIZE, 0, 8) +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, 12, 4) +FIELD(GITS_BASER, ENTRYSIZE, 48, 5) +FIELD(GITS_BASER, OUTERCACHE, 53, 3) +FIELD(GITS_BASER, TYPE, 56, 3) +FIELD(GITS_BASER, INNERCACHE, 59, 3) +FIELD(GITS_BASER, INDIRECT, 62, 1) +FIELD(GITS_BASER, VALID, 63, 1) + +FIELD(GITS_CTLR, QUIESCENT, 31, 1) + +FIELD(GITS_TYPER, PHYSICAL, 0, 1) +FIELD(GITS_TYPER, ITT_ENTRY_SIZE, 4, 4) +FIELD(GITS_TYPER, IDBITS, 8, 5) +FIELD(GITS_TYPER, DEVBITS, 13, 5) +FIELD(GITS_TYPER, SEIS, 18, 1) +FIELD(GITS_TYPER, PTA, 19, 1) +FIELD(GITS_TYPER, CIDBITS, 32, 4) +FIELD(GITS_TYPER, CIL, 36, 1) + +#define GITS_BASER_PAGESIZE_4K 0 +#define GITS_BASER_PAGESIZE_16K 1 +#define GITS_BASER_PAGESIZE_64K 2 + +#define GITS_BASER_TYPE_DEVICE 1ULL +#define GITS_BASER_TYPE_COLLECTION 4ULL + +/** + * Default features advertised by this version of ITS + */ +/* Physical LPIs supported */ +#define GITS_TYPE_PHYSICAL (1U << 0) + +/* + * 12 bytes Interrupt translation Table Entry size + * as per Table 5.3 in GICv3 spec + * ITE Lower 8 Bytes + * Bits: | 49 ... 26 | 25 ... 2 | 1 | 0 | + * Values: | 1023 | IntNum | IntType | Valid | + * ITE Higher 4 Bytes + * Bits: | 31 ... 16 | 15 ...0 | + * Values: | vPEID | ICID | + */ +#define ITS_ITT_ENTRY_SIZE 0xC + +/* 16 bits EventId */ +#define ITS_IDBITS GICD_TYPER_IDBITS + +/* 16 bits DeviceId */ +#define ITS_DEVBITS 0xF + +/* 16 bits CollectionId */ +#define ITS_CIDBITS 0xF + +/* + * 8 bytes Device Table Entry size + * Valid =3D 1 bit,ITTAddr =3D 44 bits,Size =3D 5 bits + */ +#define GITS_DTE_SIZE (0x8ULL) + +/* + * 8 bytes Collection Table Entry size + * Valid =3D 1 bit,RDBase =3D 36 bits(considering max RDBASE) + */ +#define GITS_CTE_SIZE (0x8ULL) + /* Special interrupt IDs */ #define INTID_SECURE 1020 #define INTID_NONSECURE 1021 diff --git a/hw/intc/meson.build b/hw/intc/meson.build index 6e52a166e3..4dcfea6aa8 100644 --- a/hw/intc/meson.build +++ b/hw/intc/meson.build @@ -8,6 +8,7 @@ softmmu_ss.add(when: 'CONFIG_ARM_GIC', if_true: files( 'arm_gicv3_dist.c', 'arm_gicv3_its_common.c', 'arm_gicv3_redist.c', + 'arm_gicv3_its.c', )) softmmu_ss.add(when: 'CONFIG_ETRAXFS', if_true: files('etraxfs_pic.c')) softmmu_ss.add(when: 'CONFIG_HEATHROW_PIC', if_true: files('heathrow_pic.c= ')) diff --git a/include/hw/intc/arm_gicv3_its_common.h b/include/hw/intc/arm_g= icv3_its_common.h index 5a0952b404..65d1191db1 100644 --- a/include/hw/intc/arm_gicv3_its_common.h +++ b/include/hw/intc/arm_gicv3_its_common.h @@ -25,17 +25,22 @@ #include "hw/intc/arm_gicv3_common.h" #include "qom/object.h" =20 +#define TYPE_ARM_GICV3_ITS "arm-gicv3-its" + #define ITS_CONTROL_SIZE 0x10000 #define ITS_TRANS_SIZE 0x10000 #define ITS_SIZE (ITS_CONTROL_SIZE + ITS_TRANS_SIZE) =20 #define GITS_CTLR 0x0 #define GITS_IIDR 0x4 +#define GITS_TYPER 0x8 #define GITS_CBASER 0x80 #define GITS_CWRITER 0x88 #define GITS_CREADR 0x90 #define GITS_BASER 0x100 =20 +#define GITS_TRANSLATER 0x0040 + struct GICv3ITSState { SysBusDevice parent_obj; =20 @@ -52,6 +57,7 @@ struct GICv3ITSState { /* Registers */ uint32_t ctlr; uint32_t iidr; + uint64_t typer; uint64_t cbaser; uint64_t cwriter; uint64_t creadr; @@ -62,7 +68,8 @@ struct GICv3ITSState { =20 typedef struct GICv3ITSState GICv3ITSState; =20 -void gicv3_its_init_mmio(GICv3ITSState *s, const MemoryRegionOps *ops); +void gicv3_its_init_mmio(GICv3ITSState *s, const MemoryRegionOps *ops, + const MemoryRegionOps *tops); =20 #define TYPE_ARM_GICV3_ITS_COMMON "arm-gicv3-its-common" typedef struct GICv3ITSCommonClass GICv3ITSCommonClass; --=20 2.27.0 From nobody Sun May 19 20:02:56 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 162878736961574.89793668093512; Thu, 12 Aug 2021 09:56:09 -0700 (PDT) Received: from localhost ([::1]:54582 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mEE00-0002FK-Dy for importer@patchew.org; Thu, 12 Aug 2021 12:56:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50752) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mEDxq-0007kH-Fj for qemu-devel@nongnu.org; Thu, 12 Aug 2021 12:53:55 -0400 Received: from mail-qv1-xf2a.google.com ([2607:f8b0:4864:20::f2a]:38772) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mEDxj-00061B-Ap for qemu-devel@nongnu.org; Thu, 12 Aug 2021 12:53:53 -0400 Received: by mail-qv1-xf2a.google.com with SMTP id bl13so3502290qvb.5 for ; Thu, 12 Aug 2021 09:53:46 -0700 (PDT) Received: from localhost.localdomain (bras-base-stsvon1503w-grc-22-142-114-143-47.dsl.bell.ca. [142.114.143.47]) by smtp.googlemail.com with ESMTPSA id c69sm1714864qkg.1.2021.08.12.09.53.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Aug 2021 09:53:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5p3T1psRSxN3EC4LcLnAjbPfIWdbypNPYnZp/MB2MiA=; b=KjvxGKb3xGrQGgRpu8bZGmURa1nFS0dcDul1bt77guj4i+iyAIqvavxNwVYbx2YtMG 96eZWJZ4BmyahcYb+ztsYntqPg/fCXfl//7XJ88SGAS9ye4tD4JCSL1JTf1hBU1Nzz3c UMmas9NxtdC6bLVf7EB2HPugrU6d6ef/yKde856nGV5C2EFeGeUuWezLkGJtcZDXb6VM WG3M9Kty6Ukqlaw2HOXDXRyjJtPXNV40mJmU1t0BFkJZotV68BMbfy+UIZd+1CRL1fdd PRfiDdsii41/dFluSLULP8CLKE8kTmzokyp0VNuAzgmx2b+bJgSayG0OcExR1yz+OMx7 CmZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5p3T1psRSxN3EC4LcLnAjbPfIWdbypNPYnZp/MB2MiA=; b=mKmF23ig0O08QAuD3Wi5/GkmOtgtHcl84lliloj52R55JoOa76bI8z1ZIl3cv5SzBr 5hjkT8nJF+pjLrP8rjt/b8QuvmHIkBWrbxlDPMZWduTQktKsCgZHuW1bN+jfj91ggFLC KiLyfizx5WUUxsOwhuuqyxmqyHQogbKGZB0LTQlz++IH9oNxyb4eCugsfc7k4QPy3cyJ Uq+Y8YDwYlbYX7wDNkCgGM0JrvsFJ9K0UGtRqjsqFfBY9fS5XmwN612qka+R6p5XcdHJ SY1n9YlOGa62ZK72MXldD82/o1MauvjVopQfD4/NcRgsj0Xi9AImGNFf7XDvktGNEuyF ZNSQ== X-Gm-Message-State: AOAM533evH7dY1KT2ODli94bcsd3d+6fmj292VMGR3DNjnxMu2Ptb2Fn 1JgVqPxP63aGuS9PjG2g2j8Tuw== X-Google-Smtp-Source: ABdhPJxftmaM8shL6xe8uJ3ppE3V3b3EUry6Zyc9Y0NyF1lNGMOqF6F06il+LgJ8LPBXRja3uw/P3g== X-Received: by 2002:a05:6214:e4e:: with SMTP id o14mr4832561qvc.55.1628787226260; Thu, 12 Aug 2021 09:53:46 -0700 (PDT) From: Shashi Mallela To: peter.maydell@linaro.org, leif@nuviainc.com, rad@semihalf.com, mst@redhat.com, imammedo@redhat.com Subject: [PATCH v8 02/10] hw/intc: GICv3 ITS register definitions added Date: Thu, 12 Aug 2021 12:53:33 -0400 Message-Id: <20210812165341.40784-3-shashi.mallela@linaro.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210812165341.40784-1-shashi.mallela@linaro.org> References: <20210812165341.40784-1-shashi.mallela@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::f2a; envelope-from=shashi.mallela@linaro.org; helo=mail-qv1-xf2a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: eric.auger@redhat.com, qemu-arm@nongnu.org, qemu-devel@nongnu.org, narmstrong@baylibre.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1628787370233100001 Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Peter Maydell Reviewed-by: Eric Auger Tested-by: Neil Armstrong --- hw/intc/arm_gicv3_its.c | 376 +++++++++++++++++++++++++ hw/intc/gicv3_internal.h | 29 ++ include/hw/intc/arm_gicv3_common.h | 3 + include/hw/intc/arm_gicv3_its_common.h | 23 ++ 4 files changed, 431 insertions(+) diff --git a/hw/intc/arm_gicv3_its.c b/hw/intc/arm_gicv3_its.c index 2286b3f757..b2210dffdc 100644 --- a/hw/intc/arm_gicv3_its.c +++ b/hw/intc/arm_gicv3_its.c @@ -29,6 +29,160 @@ struct GICv3ITSClass { void (*parent_reset)(DeviceState *dev); }; =20 +static uint64_t baser_base_addr(uint64_t value, uint32_t page_sz) +{ + uint64_t result =3D 0; + + switch (page_sz) { + case GITS_PAGE_SIZE_4K: + case GITS_PAGE_SIZE_16K: + result =3D FIELD_EX64(value, GITS_BASER, PHYADDR) << 12; + break; + + case GITS_PAGE_SIZE_64K: + result =3D FIELD_EX64(value, GITS_BASER, PHYADDRL_64K) << 16; + result |=3D 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 =3D 0; + uint8_t page_sz_type; + uint8_t type; + uint32_t page_sz =3D 0; + uint64_t value; + + for (int i =3D 0; i < 8; i++) { + value =3D s->baser[i]; + + if (!value) { + continue; + } + + page_sz_type =3D FIELD_EX64(value, GITS_BASER, PAGESIZE); + + switch (page_sz_type) { + case 0: + page_sz =3D GITS_PAGE_SIZE_4K; + break; + + case 1: + page_sz =3D GITS_PAGE_SIZE_16K; + break; + + case 2: + case 3: + page_sz =3D GITS_PAGE_SIZE_64K; + break; + + default: + g_assert_not_reached(); + } + + num_pages =3D FIELD_EX64(value, GITS_BASER, SIZE) + 1; + + type =3D FIELD_EX64(value, GITS_BASER, TYPE); + + switch (type) { + + case GITS_BASER_TYPE_DEVICE: + memset(&s->dt, 0 , sizeof(s->dt)); + s->dt.valid =3D FIELD_EX64(value, GITS_BASER, VALID); + + if (!s->dt.valid) { + return; + } + + s->dt.page_sz =3D page_sz; + s->dt.indirect =3D FIELD_EX64(value, GITS_BASER, INDIRECT); + s->dt.entry_sz =3D FIELD_EX64(value, GITS_BASER, ENTRYSIZE); + + if (!s->dt.indirect) { + s->dt.max_entries =3D (num_pages * page_sz) / s->dt.entry_= sz; + } else { + s->dt.max_entries =3D (((num_pages * page_sz) / + L1TABLE_ENTRY_SIZE) * + (page_sz / s->dt.entry_sz)); + } + + s->dt.maxids.max_devids =3D (1UL << (FIELD_EX64(s->typer, GITS= _TYPER, + DEVBITS) + 1)); + + s->dt.base_addr =3D baser_base_addr(value, page_sz); + + break; + + case GITS_BASER_TYPE_COLLECTION: + memset(&s->ct, 0 , sizeof(s->ct)); + s->ct.valid =3D 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 =3D page_sz; + s->ct.indirect =3D FIELD_EX64(value, GITS_BASER, INDIRECT); + s->ct.entry_sz =3D FIELD_EX64(value, GITS_BASER, ENTRYSIZE); + + if (!s->ct.indirect) { + s->ct.max_entries =3D (num_pages * page_sz) / s->ct.entry_= sz; + } else { + s->ct.max_entries =3D (((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 =3D (1UL << (FIELD_EX64(s->typer, + GITS_TYPER, CIDBITS) + 1)); + } else { + /* 16-bit CollectionId supported when CIL =3D=3D 0 */ + s->ct.maxids.max_collids =3D (1UL << 16); + } + + s->ct.base_addr =3D baser_base_addr(value, page_sz); + + break; + + default: + break; + } + } +} + +static void extract_cmdq_params(GICv3ITSState *s) +{ + uint16_t num_pages =3D 0; + uint64_t value =3D s->cbaser; + + num_pages =3D FIELD_EX64(value, GITS_CBASER, SIZE) + 1; + + memset(&s->cq, 0 , sizeof(s->cq)); + s->cq.valid =3D FIELD_EX64(value, GITS_CBASER, VALID); + + if (s->cq.valid) { + s->cq.max_entries =3D (num_pages * GITS_PAGE_SIZE_4K) / + GITS_CMDQ_ENTRY_SIZE; + s->cq.base_addr =3D FIELD_EX64(value, GITS_CBASER, PHYADDR); + s->cq.base_addr <<=3D R_GITS_CBASER_PHYADDR_SHIFT; + } +} + static MemTxResult gicv3_its_translation_write(void *opaque, hwaddr offset, uint64_t data, unsigned siz= e, MemTxAttrs attrs) @@ -42,7 +196,99 @@ static MemTxResult its_writel(GICv3ITSState *s, hwaddr = offset, uint64_t value, MemTxAttrs attrs) { MemTxResult result =3D MEMTX_OK; + int index; =20 + switch (offset) { + case GITS_CTLR: + s->ctlr |=3D (value & ~(s->ctlr)); + + if (s->ctlr & ITS_CTLR_ENABLED) { + extract_table_params(s); + extract_cmdq_params(s); + s->creadr =3D 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 =3D deposit64(s->cbaser, 0, 32, value); + s->creadr =3D 0; + s->cwriter =3D 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 =3D deposit64(s->cbaser, 32, 32, value); + s->creadr =3D 0; + s->cwriter =3D s->creadr; + } + break; + case GITS_CWRITER: + s->cwriter =3D deposit64(s->cwriter, 0, 32, + (value & ~R_GITS_CWRITER_RETRY_MASK)); + break; + case GITS_CWRITER + 4: + s->cwriter =3D deposit64(s->cwriter, 32, 32, value); + break; + case GITS_CREADR: + if (s->gicv3->gicd_ctlr & GICD_CTLR_DS) { + s->creadr =3D 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 offse= t " + TARGET_FMT_plx "\n", __func__, offset); + } + break; + case GITS_CREADR + 4: + if (s->gicv3->gicd_ctlr & GICD_CTLR_DS) { + s->creadr =3D 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 offse= t " + 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 =3D (offset - GITS_BASER) / 8; + + if (offset & 7) { + value <<=3D 32; + value &=3D ~GITS_BASER_RO_MASK; + s->baser[index] &=3D GITS_BASER_RO_MASK | MAKE_64BIT_MASK(= 0, 32); + s->baser[index] |=3D value; + } else { + value &=3D ~GITS_BASER_RO_MASK; + s->baser[index] &=3D GITS_BASER_RO_MASK | MAKE_64BIT_MASK(= 32, 32); + s->baser[index] |=3D 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 =3D MEMTX_ERROR; + break; + } return result; } =20 @@ -50,7 +296,55 @@ static MemTxResult its_readl(GICv3ITSState *s, hwaddr o= ffset, uint64_t *data, MemTxAttrs attrs) { MemTxResult result =3D MEMTX_OK; + int index; =20 + switch (offset) { + case GITS_CTLR: + *data =3D s->ctlr; + break; + case GITS_IIDR: + *data =3D gicv3_iidr(); + break; + case GITS_IDREGS ... GITS_IDREGS + 0x2f: + /* ID registers */ + *data =3D gicv3_idreg(offset - GITS_IDREGS); + break; + case GITS_TYPER: + *data =3D extract64(s->typer, 0, 32); + break; + case GITS_TYPER + 4: + *data =3D extract64(s->typer, 32, 32); + break; + case GITS_CBASER: + *data =3D extract64(s->cbaser, 0, 32); + break; + case GITS_CBASER + 4: + *data =3D extract64(s->cbaser, 32, 32); + break; + case GITS_CREADR: + *data =3D extract64(s->creadr, 0, 32); + break; + case GITS_CREADR + 4: + *data =3D extract64(s->creadr, 32, 32); + break; + case GITS_CWRITER: + *data =3D extract64(s->cwriter, 0, 32); + break; + case GITS_CWRITER + 4: + *data =3D extract64(s->cwriter, 32, 32); + break; + case GITS_BASER ... GITS_BASER + 0x3f: + index =3D (offset - GITS_BASER) / 8; + if (offset & 7) { + *data =3D extract64(s->baser[index], 32, 32); + } else { + *data =3D extract64(s->baser[index], 0, 32); + } + break; + default: + result =3D MEMTX_ERROR; + break; + } return result; } =20 @@ -58,7 +352,54 @@ static MemTxResult its_writell(GICv3ITSState *s, hwaddr= offset, uint64_t value, MemTxAttrs attrs) { MemTxResult result =3D MEMTX_OK; + int index; =20 + 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 =3D (offset - GITS_BASER) / 8; + s->baser[index] &=3D GITS_BASER_RO_MASK; + s->baser[index] |=3D (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 =3D value; + s->creadr =3D 0; + s->cwriter =3D s->creadr; + } + break; + case GITS_CWRITER: + s->cwriter =3D value & ~R_GITS_CWRITER_RETRY_MASK; + break; + case GITS_CREADR: + if (s->gicv3->gicd_ctlr & GICD_CTLR_DS) { + s->creadr =3D 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 offse= t " + 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 =3D MEMTX_ERROR; + break; + } return result; } =20 @@ -66,7 +407,29 @@ static MemTxResult its_readll(GICv3ITSState *s, hwaddr = offset, uint64_t *data, MemTxAttrs attrs) { MemTxResult result =3D MEMTX_OK; + int index; =20 + switch (offset) { + case GITS_TYPER: + *data =3D s->typer; + break; + case GITS_BASER ... GITS_BASER + 0x3f: + index =3D (offset - GITS_BASER) / 8; + *data =3D s->baser[index]; + break; + case GITS_CBASER: + *data =3D s->cbaser; + break; + case GITS_CREADR: + *data =3D s->creadr; + break; + case GITS_CWRITER: + *data =3D s->cwriter; + break; + default: + result =3D MEMTX_ERROR; + break; + } return result; } =20 @@ -170,6 +533,9 @@ static void gicv3_arm_its_realize(DeviceState *dev, Err= or **errp) =20 gicv3_its_init_mmio(s, &gicv3_its_control_ops, &gicv3_its_translation_= ops); =20 + address_space_init(&s->gicv3->dma_as, s->gicv3->dma, + "gicv3-its-sysmem"); + /* set the ITS default features supported */ s->typer =3D FIELD_DP64(s->typer, GITS_TYPER, PHYSICAL, GITS_TYPE_PHYSICAL); @@ -213,6 +579,14 @@ static void gicv3_its_reset(DeviceState *dev) GITS_CTE_SIZE - 1); } =20 +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[] =3D { DEFINE_PROP_LINK("parent-gicv3", GICv3ITSState, gicv3, "arm-gicv3", GICv3State *), @@ -223,10 +597,12 @@ static void gicv3_its_class_init(ObjectClass *klass, = void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); GICv3ITSClass *ic =3D ARM_GICV3_ITS_CLASS(klass); + GICv3ITSCommonClass *icc =3D ARM_GICV3_ITS_COMMON_CLASS(klass); =20 dc->realize =3D 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 =3D gicv3_its_post_load; } =20 static const TypeInfo gicv3_its_info =3D { diff --git a/hw/intc/gicv3_internal.h b/hw/intc/gicv3_internal.h index b99bf9db46..92e0a4fa68 100644 --- a/hw/intc/gicv3_internal.h +++ b/hw/intc/gicv3_internal.h @@ -258,6 +258,20 @@ FIELD(GITS_BASER, INNERCACHE, 59, 3) FIELD(GITS_BASER, INDIRECT, 62, 1) FIELD(GITS_BASER, VALID, 63, 1) =20 +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) =20 FIELD(GITS_TYPER, PHYSICAL, 0, 1) @@ -269,6 +283,13 @@ FIELD(GITS_TYPER, PTA, 19, 1) FIELD(GITS_TYPER, CIDBITS, 32, 4) FIELD(GITS_TYPER, CIL, 36, 1) =20 +#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 @@ -276,6 +297,14 @@ FIELD(GITS_TYPER, CIL, 36, 1) #define GITS_BASER_TYPE_DEVICE 1ULL #define GITS_BASER_TYPE_COLLECTION 4ULL =20 +#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; =20 + MemoryRegion *dma; + AddressSpace dma_as; + /* Distributor */ =20 /* 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_g= icv3_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 @@ =20 #define GITS_TRANSLATER 0x0040 =20 +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; =20 @@ -63,6 +82,10 @@ struct GICv3ITSState { uint64_t creadr; uint64_t baser[8]; =20 + TableDesc dt; + TableDesc ct; + CmdQDesc cq; + Error *migration_blocker; }; =20 --=20 2.27.0 From nobody Sun May 19 20:02:56 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1628787364786356.53368795245854; Thu, 12 Aug 2021 09:56:04 -0700 (PDT) Received: from localhost ([::1]:54334 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mEDzv-00025e-J5 for importer@patchew.org; Thu, 12 Aug 2021 12:56:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50740) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mEDxo-0007jt-TT for qemu-devel@nongnu.org; Thu, 12 Aug 2021 12:53:52 -0400 Received: from mail-qk1-x735.google.com ([2607:f8b0:4864:20::735]:35777) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mEDxk-00061b-6r for qemu-devel@nongnu.org; Thu, 12 Aug 2021 12:53:52 -0400 Received: by mail-qk1-x735.google.com with SMTP id a19so7375675qkg.2 for ; Thu, 12 Aug 2021 09:53:47 -0700 (PDT) Received: from localhost.localdomain (bras-base-stsvon1503w-grc-22-142-114-143-47.dsl.bell.ca. [142.114.143.47]) by smtp.googlemail.com with ESMTPSA id c69sm1714864qkg.1.2021.08.12.09.53.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Aug 2021 09:53:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ahGQ5CURjKS1DrPJd7YaRXBBy6LCMJxhtIDgoJAPtPU=; b=IoMGZHBVeaX0/4GZS4kBLUM5ncaLO+HCmspvtuhBdnxtOXnv99JyDkWyYEGAweye12 hFiJjM3EZTktjYie+AzrZXyUN5MLE04YhTBdyu6JoAsUxuAHGpSlGx6N5WofItwWYr+i F3OUnRdTLCr3x/9x+YAtDos9WGyYztiUTdEu9xdkoxazceQKUEijjNYzj8Up7n25lG9y EXE5VOg92vDaGDUlqzFhwW5e8jKSzRFPJA0+Y1qxtpTCHOgWNlz7pXCgj/ohE+1jFddI HuaUWI3YIZ8KzYq05eK0CEcN5HFEMxqkyOxH8gV+e3CTYFclR201tHcdn4NtnBCS/EUE EQYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ahGQ5CURjKS1DrPJd7YaRXBBy6LCMJxhtIDgoJAPtPU=; b=e8OnyOAH9yf4zTOtJvCaYIilWJnpg76OOf6/7o3EXedWhn2Y70NdAsbwLe8uWUFNkt Sn5HGnXHOZTg1dmmUMovbR0cMm7s5iyDcdS4Uj9AD44tmXbaKh0iS2fj1BpBT5JjvhFJ uxZMgyxp/Kng6vecNLAgqmAkb2rOq5SGGS/t4T5bJSvlFedxk+kRZxTjYKaqGd2a8/hC e121U9M5OJllg5I4r9bjQ6TdcOt/EuWs7ThBlTCPejO1gUg+aZcd+Djr0du+gzfXdRbp vDh/19VDdX9IeYaA/vVbBmjLD9I4cxuBuYydNr8Y7CBQQy57fauTsCkNi686l95zM/O2 1KSQ== X-Gm-Message-State: AOAM5301U+CDtVSUqkuCXTvOGOPuPs7LwILviL6/unaRr0O0iIidlTmW VVL/QbyxsxS8Ua53CYRUghvwCg== X-Google-Smtp-Source: ABdhPJx28s6FuckddKklAhe/xpf9staZfxB1gfcNH7AT8AaMfdMr3j9ZIxeGO4I2YPn/pRqbijji8g== X-Received: by 2002:a05:620a:4cf:: with SMTP id 15mr3409424qks.316.1628787227274; Thu, 12 Aug 2021 09:53:47 -0700 (PDT) From: Shashi Mallela To: peter.maydell@linaro.org, leif@nuviainc.com, rad@semihalf.com, mst@redhat.com, imammedo@redhat.com Subject: [PATCH v8 03/10] hw/intc: GICv3 ITS command queue framework Date: Thu, 12 Aug 2021 12:53:34 -0400 Message-Id: <20210812165341.40784-4-shashi.mallela@linaro.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210812165341.40784-1-shashi.mallela@linaro.org> References: <20210812165341.40784-1-shashi.mallela@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::735; envelope-from=shashi.mallela@linaro.org; helo=mail-qk1-x735.google.com X-Spam_score_int: -1 X-Spam_score: -0.2 X-Spam_bar: / X-Spam_report: (-0.2 / 5.0 requ) DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: eric.auger@redhat.com, qemu-arm@nongnu.org, qemu-devel@nongnu.org, narmstrong@baylibre.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1628787365799100003 Content-Type: text/plain; charset="utf-8" Added functionality to trigger ITS command queue processing on write to CWRITE register and process each command queue entry to identify the command type and handle commands like MAPD,MAPC,SYNC. Signed-off-by: Shashi Mallela Reviewed-by: Peter Maydell Reviewed-by: Eric Auger Tested-by: Neil Armstrong --- hw/intc/arm_gicv3_its.c | 306 +++++++++++++++++++++++++++++++++++++++ hw/intc/gicv3_internal.h | 40 +++++ 2 files changed, 346 insertions(+) diff --git a/hw/intc/arm_gicv3_its.c b/hw/intc/arm_gicv3_its.c index b2210dffdc..8bdbebbeca 100644 --- a/hw/intc/arm_gicv3_its.c +++ b/hw/intc/arm_gicv3_its.c @@ -50,6 +50,305 @@ static uint64_t baser_base_addr(uint64_t value, uint32_= t page_sz) return result; } =20 +static MemTxResult update_cte(GICv3ITSState *s, uint16_t icid, bool valid, + uint64_t rdbase) +{ + AddressSpace *as =3D &s->gicv3->dma_as; + uint64_t value; + uint64_t l2t_addr; + bool valid_l2t; + uint32_t l2t_id; + uint32_t max_l2_entries; + uint64_t cte =3D 0; + MemTxResult res =3D MEMTX_OK; + + if (!s->ct.valid) { + return res; + } + + if (valid) { + /* add mapping entry to collection table */ + cte =3D (valid & TABLE_ENTRY_VALID_MASK) | (rdbase << 1ULL); + } + + /* + * The specification defines the format of level 1 entries of a + * 2-level table, but the format of level 2 entries and the format + * of flat-mapped tables is IMPDEF. + */ + if (s->ct.indirect) { + l2t_id =3D icid / (s->ct.page_sz / L1TABLE_ENTRY_SIZE); + + value =3D address_space_ldq_le(as, + s->ct.base_addr + + (l2t_id * L1TABLE_ENTRY_SIZE), + MEMTXATTRS_UNSPECIFIED, &res); + + if (res !=3D MEMTX_OK) { + return res; + } + + valid_l2t =3D (value & L2_TABLE_VALID_MASK) !=3D 0; + + if (valid_l2t) { + max_l2_entries =3D s->ct.page_sz / s->ct.entry_sz; + + l2t_addr =3D value & ((1ULL << 51) - 1); + + address_space_stq_le(as, l2t_addr + + ((icid % max_l2_entries) * GITS_CTE_SIZE), + cte, MEMTXATTRS_UNSPECIFIED, &res); + } + } else { + /* Flat level table */ + address_space_stq_le(as, s->ct.base_addr + (icid * GITS_CTE_SIZE), + cte, MEMTXATTRS_UNSPECIFIED, &res); + } + return res; +} + +static MemTxResult process_mapc(GICv3ITSState *s, uint32_t offset) +{ + AddressSpace *as =3D &s->gicv3->dma_as; + uint16_t icid; + uint64_t rdbase; + bool valid; + MemTxResult res =3D MEMTX_OK; + uint64_t value; + + offset +=3D NUM_BYTES_IN_DW; + offset +=3D NUM_BYTES_IN_DW; + + value =3D address_space_ldq_le(as, s->cq.base_addr + offset, + MEMTXATTRS_UNSPECIFIED, &res); + + if (res !=3D MEMTX_OK) { + return res; + } + + icid =3D value & ICID_MASK; + + rdbase =3D (value & R_MAPC_RDBASE_MASK) >> R_MAPC_RDBASE_SHIFT; + rdbase &=3D RDBASE_PROCNUM_MASK; + + valid =3D (value & CMD_FIELD_VALID_MASK); + + if ((icid > s->ct.maxids.max_collids) || (rdbase > s->gicv3->num_cpu))= { + qemu_log_mask(LOG_GUEST_ERROR, + "ITS MAPC: invalid collection table attributes " + "icid %d rdbase %lu\n", icid, rdbase); + /* + * in this implementation, in case of error + * we ignore this command and move onto the next + * command in the queue + */ + } else { + res =3D update_cte(s, icid, valid, rdbase); + } + + return res; +} + +static MemTxResult update_dte(GICv3ITSState *s, uint32_t devid, bool valid, + uint8_t size, uint64_t itt_addr) +{ + AddressSpace *as =3D &s->gicv3->dma_as; + uint64_t value; + uint64_t l2t_addr; + bool valid_l2t; + uint32_t l2t_id; + uint32_t max_l2_entries; + uint64_t dte =3D 0; + MemTxResult res =3D MEMTX_OK; + + if (s->dt.valid) { + if (valid) { + /* add mapping entry to device table */ + dte =3D (valid & TABLE_ENTRY_VALID_MASK) | + ((size & SIZE_MASK) << 1U) | + (itt_addr << GITS_DTE_ITTADDR_SHIFT); + } + } else { + return res; + } + + /* + * The specification defines the format of level 1 entries of a + * 2-level table, but the format of level 2 entries and the format + * of flat-mapped tables is IMPDEF. + */ + if (s->dt.indirect) { + l2t_id =3D devid / (s->dt.page_sz / L1TABLE_ENTRY_SIZE); + + value =3D address_space_ldq_le(as, + s->dt.base_addr + + (l2t_id * L1TABLE_ENTRY_SIZE), + MEMTXATTRS_UNSPECIFIED, &res); + + if (res !=3D MEMTX_OK) { + return res; + } + + valid_l2t =3D (value & L2_TABLE_VALID_MASK) !=3D 0; + + if (valid_l2t) { + max_l2_entries =3D s->dt.page_sz / s->dt.entry_sz; + + l2t_addr =3D value & ((1ULL << 51) - 1); + + address_space_stq_le(as, l2t_addr + + ((devid % max_l2_entries) * GITS_DTE_SIZE= ), + dte, MEMTXATTRS_UNSPECIFIED, &res); + } + } else { + /* Flat level table */ + address_space_stq_le(as, s->dt.base_addr + (devid * GITS_DTE_SIZE), + dte, MEMTXATTRS_UNSPECIFIED, &res); + } + return res; +} + +static MemTxResult process_mapd(GICv3ITSState *s, uint64_t value, + uint32_t offset) +{ + AddressSpace *as =3D &s->gicv3->dma_as; + uint32_t devid; + uint8_t size; + uint64_t itt_addr; + bool valid; + MemTxResult res =3D MEMTX_OK; + + devid =3D ((value & DEVID_MASK) >> DEVID_SHIFT); + + offset +=3D NUM_BYTES_IN_DW; + value =3D address_space_ldq_le(as, s->cq.base_addr + offset, + MEMTXATTRS_UNSPECIFIED, &res); + + if (res !=3D MEMTX_OK) { + return res; + } + + size =3D (value & SIZE_MASK); + + offset +=3D NUM_BYTES_IN_DW; + value =3D address_space_ldq_le(as, s->cq.base_addr + offset, + MEMTXATTRS_UNSPECIFIED, &res); + + if (res !=3D MEMTX_OK) { + return res; + } + + itt_addr =3D (value & ITTADDR_MASK) >> ITTADDR_SHIFT; + + valid =3D (value & CMD_FIELD_VALID_MASK); + + if ((devid > s->dt.maxids.max_devids) || + (size > FIELD_EX64(s->typer, GITS_TYPER, IDBITS))) { + qemu_log_mask(LOG_GUEST_ERROR, + "ITS MAPD: invalid device table attributes " + "devid %d or size %d\n", devid, size); + /* + * in this implementation, in case of error + * we ignore this command and move onto the next + * command in the queue + */ + } else { + res =3D update_dte(s, devid, valid, size, itt_addr); + } + + return res; +} + +/* + * Current implementation blocks until all + * commands are processed + */ +static void process_cmdq(GICv3ITSState *s) +{ + uint32_t wr_offset =3D 0; + uint32_t rd_offset =3D 0; + uint32_t cq_offset =3D 0; + uint64_t data; + AddressSpace *as =3D &s->gicv3->dma_as; + MemTxResult res =3D MEMTX_OK; + uint8_t cmd; + + if (!(s->ctlr & ITS_CTLR_ENABLED)) { + return; + } + + wr_offset =3D FIELD_EX64(s->cwriter, GITS_CWRITER, OFFSET); + + if (wr_offset > s->cq.max_entries) { + qemu_log_mask(LOG_GUEST_ERROR, + "%s: invalid write offset " + "%d\n", __func__, wr_offset); + return; + } + + rd_offset =3D FIELD_EX64(s->creadr, GITS_CREADR, OFFSET); + + if (rd_offset > s->cq.max_entries) { + qemu_log_mask(LOG_GUEST_ERROR, + "%s: invalid read offset " + "%d\n", __func__, rd_offset); + return; + } + + while (wr_offset !=3D rd_offset) { + cq_offset =3D (rd_offset * GITS_CMDQ_ENTRY_SIZE); + data =3D address_space_ldq_le(as, s->cq.base_addr + cq_offset, + MEMTXATTRS_UNSPECIFIED, &res); + cmd =3D (data & CMD_MASK); + + switch (cmd) { + case GITS_CMD_INT: + break; + case GITS_CMD_CLEAR: + break; + case GITS_CMD_SYNC: + /* + * Current implementation makes a blocking synchronous call + * for every command issued earlier, hence the internal state + * is already consistent by the time SYNC command is executed. + * Hence no further processing is required for SYNC command. + */ + break; + case GITS_CMD_MAPD: + res =3D process_mapd(s, data, cq_offset); + break; + case GITS_CMD_MAPC: + res =3D process_mapc(s, cq_offset); + break; + case GITS_CMD_MAPTI: + break; + case GITS_CMD_MAPI: + break; + case GITS_CMD_DISCARD: + break; + case GITS_CMD_INV: + case GITS_CMD_INVALL: + break; + default: + break; + } + if (res =3D=3D MEMTX_OK) { + rd_offset++; + rd_offset %=3D s->cq.max_entries; + s->creadr =3D FIELD_DP64(s->creadr, GITS_CREADR, OFFSET, rd_of= fset); + } else { + /* + * in this implementation, in case of dma read/write error + * we stall the command processing + */ + s->creadr =3D FIELD_DP64(s->creadr, GITS_CREADR, STALLED, 1); + qemu_log_mask(LOG_GUEST_ERROR, + "%s: %x cmd processing failed\n", __func__, cmd); + break; + } + } +} + /* * This function extracts the ITS Device and Collection table specific * parameters (like base_addr, size etc) from GITS_BASER register. @@ -206,6 +505,7 @@ static MemTxResult its_writel(GICv3ITSState *s, hwaddr = offset, extract_table_params(s); extract_cmdq_params(s); s->creadr =3D 0; + process_cmdq(s); } break; case GITS_CBASER: @@ -233,6 +533,9 @@ static MemTxResult its_writel(GICv3ITSState *s, hwaddr = offset, case GITS_CWRITER: s->cwriter =3D deposit64(s->cwriter, 0, 32, (value & ~R_GITS_CWRITER_RETRY_MASK)); + if (s->cwriter !=3D s->creadr) { + process_cmdq(s); + } break; case GITS_CWRITER + 4: s->cwriter =3D deposit64(s->cwriter, 32, 32, value); @@ -379,6 +682,9 @@ static MemTxResult its_writell(GICv3ITSState *s, hwaddr= offset, break; case GITS_CWRITER: s->cwriter =3D value & ~R_GITS_CWRITER_RETRY_MASK; + if (s->cwriter !=3D s->creadr) { + process_cmdq(s); + } break; case GITS_CREADR: if (s->gicv3->gicd_ctlr & GICD_CTLR_DS) { diff --git a/hw/intc/gicv3_internal.h b/hw/intc/gicv3_internal.h index 92e0a4fa68..034fadfebe 100644 --- a/hw/intc/gicv3_internal.h +++ b/hw/intc/gicv3_internal.h @@ -304,6 +304,43 @@ FIELD(GITS_TYPER, CIL, 36, 1) #define L1TABLE_ENTRY_SIZE 8 =20 #define GITS_CMDQ_ENTRY_SIZE 32 +#define NUM_BYTES_IN_DW 8 + +#define CMD_MASK 0xff + +/* ITS Commands */ +#define GITS_CMD_CLEAR 0x04 +#define GITS_CMD_DISCARD 0x0F +#define GITS_CMD_INT 0x03 +#define GITS_CMD_MAPC 0x09 +#define GITS_CMD_MAPD 0x08 +#define GITS_CMD_MAPI 0x0B +#define GITS_CMD_MAPTI 0x0A +#define GITS_CMD_INV 0x0C +#define GITS_CMD_INVALL 0x0D +#define GITS_CMD_SYNC 0x05 + +/* MAPC command fields */ +#define ICID_LENGTH 16 +#define ICID_MASK ((1U << ICID_LENGTH) - 1) +FIELD(MAPC, RDBASE, 16, 32) + +#define RDBASE_PROCNUM_LENGTH 16 +#define RDBASE_PROCNUM_MASK ((1ULL << RDBASE_PROCNUM_LENGTH) - 1) + +/* MAPD command fields */ +#define ITTADDR_LENGTH 44 +#define ITTADDR_SHIFT 8 +#define ITTADDR_MASK MAKE_64BIT_MASK(ITTADDR_SHIFT, ITTADDR_LE= NGTH) +#define SIZE_MASK 0x1f + +#define DEVID_SHIFT 32 +#define DEVID_MASK MAKE_64BIT_MASK(32, 32) + +#define VALID_SHIFT 63 +#define CMD_FIELD_VALID_MASK (1ULL << VALID_SHIFT) +#define L2_TABLE_VALID_MASK CMD_FIELD_VALID_MASK +#define TABLE_ENTRY_VALID_MASK (1ULL << 0) =20 /** * Default features advertised by this version of ITS @@ -337,6 +374,9 @@ FIELD(GITS_TYPER, CIL, 36, 1) * Valid =3D 1 bit,ITTAddr =3D 44 bits,Size =3D 5 bits */ #define GITS_DTE_SIZE (0x8ULL) +#define GITS_DTE_ITTADDR_SHIFT 6 +#define GITS_DTE_ITTADDR_MASK MAKE_64BIT_MASK(GITS_DTE_ITTADDR_SHI= FT, \ + ITTADDR_LENGTH) =20 /* * 8 bytes Collection Table Entry size --=20 2.27.0 From nobody Sun May 19 20:02:56 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1628787628090208.1747758372702; Thu, 12 Aug 2021 10:00:28 -0700 (PDT) Received: from localhost ([::1]:37590 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mEE4A-0001OE-Mb for importer@patchew.org; Thu, 12 Aug 2021 13:00:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50832) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mEDxu-0007o4-C7 for qemu-devel@nongnu.org; Thu, 12 Aug 2021 12:53:59 -0400 Received: from mail-qt1-x82d.google.com ([2607:f8b0:4864:20::82d]:35591) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mEDxl-000622-8D for qemu-devel@nongnu.org; Thu, 12 Aug 2021 12:53:58 -0400 Received: by mail-qt1-x82d.google.com with SMTP id a12so5776347qtb.2 for ; Thu, 12 Aug 2021 09:53:48 -0700 (PDT) Received: from localhost.localdomain (bras-base-stsvon1503w-grc-22-142-114-143-47.dsl.bell.ca. [142.114.143.47]) by smtp.googlemail.com with ESMTPSA id c69sm1714864qkg.1.2021.08.12.09.53.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Aug 2021 09:53:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=sFqL6JtThMV/uzqj7CPDUttJzXO4ytm6/MBAGbhLJDI=; b=CAWOThyxkbV0X32UAKAIPlpWfO/b24F+S+goQHZJ535dAH6d36MnwnIOJF6LhyHIgn cdnu8MCUM89Dsa17U5HgXXJdlGDJTZHQp/H8lJ33PF6dq5R8u0EbzHXABHaB4bqVALU2 T2jclaKKfJ0mCU8AMz+txAro7vwebwhINI0GVQdTn2l2UaQQ+ZBcIAacScvZ6Awd2osy PoD2+lDWHtNA9YmB+A0BD8jEfp+r3Q88AoWXXbZtJvpkaUhd20BOXqk1GbS+y1JQnwWV jApH/nDJXhktSSJXwRtxxPmNt6HwmKuwaxSqdKSwKosU8BiMze6+BFQsx8TJfilehqcO 04Ew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=sFqL6JtThMV/uzqj7CPDUttJzXO4ytm6/MBAGbhLJDI=; b=cSdP1kmS9qScgwyWCrukGHG76oCpEEBlUq3wUUZHZ6Bok1r3F9yROWgGqLuuXrhko2 ArylA6Zq0yNZ3i4mEkhrBO+djRGtfmfVboW7l87YyQwo2sP8yo7tYEWW3+2+UzIHbzq7 1ea+y1OlyxcPUdiReTPfGE4RlappR4XfwWoOZEZ8DFrWkm0ZuaW0Xv0TemHwBq0caTKr nzCYQudy0geio7BloIUnKt8NmGdy9LFM6X8i4Ag84MgDylHzYrMdgHVpWVpMATFftGf3 N+64UufuiTU6GKzgkTexoArbqsDpIZHlox+kes3PqPrhZDhdyHjLzKu0OEsEjJfXg96u FThw== X-Gm-Message-State: AOAM533oj0xfqf5YTBfMu811xhmVa3KHJ2qjwfxJZV6EGlQke6SnK49x h/cytFBXj1jTx2zXlBt4o9uNPqMhJwiXXA== X-Google-Smtp-Source: ABdhPJwucXOdvQVHzsjXVCD190E2PzqOJF8yjMmyAUYbxch+WmtWZpKHVAtz/jJ4KA1oPltPFtCsAw== X-Received: by 2002:ac8:468b:: with SMTP id g11mr4798398qto.385.1628787228180; Thu, 12 Aug 2021 09:53:48 -0700 (PDT) From: Shashi Mallela To: peter.maydell@linaro.org, leif@nuviainc.com, rad@semihalf.com, mst@redhat.com, imammedo@redhat.com Subject: [PATCH v8 04/10] hw/intc: GICv3 ITS Command processing Date: Thu, 12 Aug 2021 12:53:35 -0400 Message-Id: <20210812165341.40784-5-shashi.mallela@linaro.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210812165341.40784-1-shashi.mallela@linaro.org> References: <20210812165341.40784-1-shashi.mallela@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::82d; envelope-from=shashi.mallela@linaro.org; helo=mail-qt1-x82d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: eric.auger@redhat.com, qemu-arm@nongnu.org, qemu-devel@nongnu.org, narmstrong@baylibre.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1628787629707100001 Content-Type: text/plain; charset="utf-8" Added ITS command queue handling for MAPTI,MAPI commands,handled ITS translation which triggers an LPI via INT command as well as write to GITS_TRANSLATER register,defined enum to differentiate between ITS command interrupt trigger and GITS_TRANSLATER based interrupt trigger. Each of these commands make use of other functionalities implemented to get device table entry,collection table entry or interrupt translation table entry required for their processing. Signed-off-by: Shashi Mallela Reviewed-by: Peter Maydell Tested-by: Neil Armstrong --- hw/intc/arm_gicv3_its.c | 351 +++++++++++++++++++++++++++++ hw/intc/gicv3_internal.h | 12 + include/hw/intc/arm_gicv3_common.h | 2 + 3 files changed, 365 insertions(+) diff --git a/hw/intc/arm_gicv3_its.c b/hw/intc/arm_gicv3_its.c index 8bdbebbeca..d98b0e0f4c 100644 --- a/hw/intc/arm_gicv3_its.c +++ b/hw/intc/arm_gicv3_its.c @@ -29,6 +29,22 @@ struct GICv3ITSClass { void (*parent_reset)(DeviceState *dev); }; =20 +/* + * This is an internal enum used to distinguish between LPI triggered + * via command queue and LPI triggered via gits_translater write. + */ +typedef enum ItsCmdType { + NONE =3D 0, /* internal indication for GITS_TRANSLATER write */ + CLEAR =3D 1, + DISCARD =3D 2, + INT =3D 3, +} ItsCmdType; + +typedef struct { + uint32_t iteh; + uint64_t itel; +} IteEntry; + static uint64_t baser_base_addr(uint64_t value, uint32_t page_sz) { uint64_t result =3D 0; @@ -50,6 +66,323 @@ static uint64_t baser_base_addr(uint64_t value, uint32_= t page_sz) return result; } =20 +static bool get_cte(GICv3ITSState *s, uint16_t icid, uint64_t *cte, + MemTxResult *res) +{ + AddressSpace *as =3D &s->gicv3->dma_as; + uint64_t l2t_addr; + uint64_t value; + bool valid_l2t; + uint32_t l2t_id; + uint32_t max_l2_entries; + + if (s->ct.indirect) { + l2t_id =3D icid / (s->ct.page_sz / L1TABLE_ENTRY_SIZE); + + value =3D address_space_ldq_le(as, + s->ct.base_addr + + (l2t_id * L1TABLE_ENTRY_SIZE), + MEMTXATTRS_UNSPECIFIED, res); + + if (*res =3D=3D MEMTX_OK) { + valid_l2t =3D (value & L2_TABLE_VALID_MASK) !=3D 0; + + if (valid_l2t) { + max_l2_entries =3D s->ct.page_sz / s->ct.entry_sz; + + l2t_addr =3D value & ((1ULL << 51) - 1); + + *cte =3D address_space_ldq_le(as, l2t_addr + + ((icid % max_l2_entries) * GITS_CTE_SI= ZE), + MEMTXATTRS_UNSPECIFIED, res); + } + } + } else { + /* Flat level table */ + *cte =3D address_space_ldq_le(as, s->ct.base_addr + + (icid * GITS_CTE_SIZE), + MEMTXATTRS_UNSPECIFIED, res); + } + + return (*cte & TABLE_ENTRY_VALID_MASK) !=3D 0; +} + +static MemTxResult update_ite(GICv3ITSState *s, uint32_t eventid, uint64_t= dte, + IteEntry ite) +{ + AddressSpace *as =3D &s->gicv3->dma_as; + uint64_t itt_addr; + MemTxResult res =3D MEMTX_OK; + + itt_addr =3D (dte & GITS_DTE_ITTADDR_MASK) >> GITS_DTE_ITTADDR_SHIFT; + itt_addr <<=3D ITTADDR_SHIFT; /* 256 byte aligned */ + + address_space_stq_le(as, itt_addr + (eventid * (sizeof(uint64_t) + + sizeof(uint32_t))), ite.itel, MEMTXATTRS_UNSPECIF= IED, + &res); + + if (res =3D=3D MEMTX_OK) { + address_space_stl_le(as, itt_addr + (eventid * (sizeof(uint64_t) + + sizeof(uint32_t))) + sizeof(uint32_t), ite.it= eh, + MEMTXATTRS_UNSPECIFIED, &res); + } + return res; +} + +static bool get_ite(GICv3ITSState *s, uint32_t eventid, uint64_t dte, + uint16_t *icid, uint32_t *pIntid, MemTxResult *res) +{ + AddressSpace *as =3D &s->gicv3->dma_as; + uint64_t itt_addr; + bool status =3D false; + IteEntry ite =3D {}; + + itt_addr =3D (dte & GITS_DTE_ITTADDR_MASK) >> GITS_DTE_ITTADDR_SHIFT; + itt_addr <<=3D ITTADDR_SHIFT; /* 256 byte aligned */ + + ite.itel =3D address_space_ldq_le(as, itt_addr + + (eventid * (sizeof(uint64_t) + + sizeof(uint32_t))), MEMTXATTRS_UNSPECI= FIED, + res); + + if (*res =3D=3D MEMTX_OK) { + ite.iteh =3D address_space_ldl_le(as, itt_addr + + (eventid * (sizeof(uint64_t) + + sizeof(uint32_t))) + sizeof(uint32= _t), + MEMTXATTRS_UNSPECIFIED, res); + + if (*res =3D=3D MEMTX_OK) { + if (ite.itel & TABLE_ENTRY_VALID_MASK) { + if ((ite.itel >> ITE_ENTRY_INTTYPE_SHIFT) & + GITS_TYPE_PHYSICAL) { + *pIntid =3D (ite.itel & ITE_ENTRY_INTID_MASK) >> + ITE_ENTRY_INTID_SHIFT; + *icid =3D ite.iteh & ITE_ENTRY_ICID_MASK; + status =3D true; + } + } + } + } + return status; +} + +static uint64_t get_dte(GICv3ITSState *s, uint32_t devid, MemTxResult *res) +{ + AddressSpace *as =3D &s->gicv3->dma_as; + uint64_t l2t_addr; + uint64_t value; + bool valid_l2t; + uint32_t l2t_id; + uint32_t max_l2_entries; + + if (s->dt.indirect) { + l2t_id =3D devid / (s->dt.page_sz / L1TABLE_ENTRY_SIZE); + + value =3D address_space_ldq_le(as, + s->dt.base_addr + + (l2t_id * L1TABLE_ENTRY_SIZE), + MEMTXATTRS_UNSPECIFIED, res); + + if (*res =3D=3D MEMTX_OK) { + valid_l2t =3D (value & L2_TABLE_VALID_MASK) !=3D 0; + + if (valid_l2t) { + max_l2_entries =3D s->dt.page_sz / s->dt.entry_sz; + + l2t_addr =3D value & ((1ULL << 51) - 1); + + value =3D address_space_ldq_le(as, l2t_addr + + ((devid % max_l2_entries) * GITS_DTE_SI= ZE), + MEMTXATTRS_UNSPECIFIED, res); + } + } + } else { + /* Flat level table */ + value =3D address_space_ldq_le(as, s->dt.base_addr + + (devid * GITS_DTE_SIZE), + MEMTXATTRS_UNSPECIFIED, res); + } + + return value; +} + +/* + * This function handles the processing of following commands based on + * the ItsCmdType parameter passed:- + * 1. triggering of lpi interrupt translation via ITS INT command + * 2. triggering of lpi interrupt translation via gits_translater register + * 3. handling of ITS CLEAR command + * 4. handling of ITS DISCARD command + */ +static MemTxResult process_its_cmd(GICv3ITSState *s, uint64_t value, + uint32_t offset, ItsCmdType cmd) +{ + AddressSpace *as =3D &s->gicv3->dma_as; + uint32_t devid, eventid; + MemTxResult res =3D MEMTX_OK; + bool dte_valid; + uint64_t dte =3D 0; + uint32_t max_eventid; + uint16_t icid =3D 0; + uint32_t pIntid =3D 0; + bool ite_valid =3D false; + uint64_t cte =3D 0; + bool cte_valid =3D false; + + if (cmd =3D=3D NONE) { + devid =3D offset; + } else { + devid =3D ((value & DEVID_MASK) >> DEVID_SHIFT); + + offset +=3D NUM_BYTES_IN_DW; + value =3D address_space_ldq_le(as, s->cq.base_addr + offset, + MEMTXATTRS_UNSPECIFIED, &res); + } + + if (res !=3D MEMTX_OK) { + return res; + } + + eventid =3D (value & EVENTID_MASK); + + dte =3D get_dte(s, devid, &res); + + if (res !=3D MEMTX_OK) { + return res; + } + dte_valid =3D dte & TABLE_ENTRY_VALID_MASK; + + if (dte_valid) { + max_eventid =3D (1UL << (((dte >> 1U) & SIZE_MASK) + 1)); + + ite_valid =3D get_ite(s, eventid, dte, &icid, &pIntid, &res); + + if (res !=3D MEMTX_OK) { + return res; + } + + if (ite_valid) { + cte_valid =3D get_cte(s, icid, &cte, &res); + } + + if (res !=3D MEMTX_OK) { + return res; + } + } + + if ((devid > s->dt.maxids.max_devids) || !dte_valid || !ite_valid || + !cte_valid || (eventid > max_eventid)) { + qemu_log_mask(LOG_GUEST_ERROR, + "%s: invalid command attributes " + "devid %d or eventid %d or invalid dte %d or" + "invalid cte %d or invalid ite %d\n", + __func__, devid, eventid, dte_valid, cte_valid, + ite_valid); + /* + * in this implementation, in case of error + * we ignore this command and move onto the next + * command in the queue + */ + } else { + /* + * Current implementation only supports rdbase =3D=3D procnum + * Hence rdbase physical address is ignored + */ + if (cmd =3D=3D DISCARD) { + IteEntry ite =3D {}; + /* remove mapping from interrupt translation table */ + res =3D update_ite(s, eventid, dte, ite); + } + } + + return res; +} + +static MemTxResult process_mapti(GICv3ITSState *s, uint64_t value, + uint32_t offset, bool ignore_pInt) +{ + AddressSpace *as =3D &s->gicv3->dma_as; + uint32_t devid, eventid; + uint32_t pIntid =3D 0; + uint32_t max_eventid, max_Intid; + bool dte_valid; + MemTxResult res =3D MEMTX_OK; + uint16_t icid =3D 0; + uint64_t dte =3D 0; + IteEntry ite; + uint32_t int_spurious =3D INTID_SPURIOUS; + + devid =3D ((value & DEVID_MASK) >> DEVID_SHIFT); + offset +=3D NUM_BYTES_IN_DW; + value =3D address_space_ldq_le(as, s->cq.base_addr + offset, + MEMTXATTRS_UNSPECIFIED, &res); + + if (res !=3D MEMTX_OK) { + return res; + } + + eventid =3D (value & EVENTID_MASK); + + if (!ignore_pInt) { + pIntid =3D ((value & pINTID_MASK) >> pINTID_SHIFT); + } + + offset +=3D NUM_BYTES_IN_DW; + value =3D address_space_ldq_le(as, s->cq.base_addr + offset, + MEMTXATTRS_UNSPECIFIED, &res); + + if (res !=3D MEMTX_OK) { + return res; + } + + icid =3D value & ICID_MASK; + + dte =3D get_dte(s, devid, &res); + + if (res !=3D MEMTX_OK) { + return res; + } + dte_valid =3D dte & TABLE_ENTRY_VALID_MASK; + + max_eventid =3D (1UL << (((dte >> 1U) & SIZE_MASK) + 1)); + + if (!ignore_pInt) { + max_Intid =3D (1ULL << (GICD_TYPER_IDBITS + 1)) - 1; + } + + if ((devid > s->dt.maxids.max_devids) || (icid > s->ct.maxids.max_coll= ids) + || !dte_valid || (eventid > max_eventid) || + (!ignore_pInt && (((pIntid < GICV3_LPI_INTID_START) || + (pIntid > max_Intid)) && (pIntid !=3D INTID_SPURIOUS)))) { + qemu_log_mask(LOG_GUEST_ERROR, + "%s: invalid command attributes " + "devid %d or icid %d or eventid %d or pIntid %d or" + "unmapped dte %d\n", __func__, devid, icid, eventid, + pIntid, dte_valid); + /* + * in this implementation, in case of error + * we ignore this command and move onto the next + * command in the queue + */ + } else { + /* add ite entry to interrupt translation table */ + ite.itel =3D (dte_valid & TABLE_ENTRY_VALID_MASK) | + (GITS_TYPE_PHYSICAL << ITE_ENTRY_INTTYPE_SHIFT); + + if (ignore_pInt) { + ite.itel |=3D (eventid << ITE_ENTRY_INTID_SHIFT); + } else { + ite.itel |=3D (pIntid << ITE_ENTRY_INTID_SHIFT); + } + ite.itel |=3D (int_spurious << ITE_ENTRY_INTSP_SHIFT); + ite.iteh =3D icid; + + res =3D update_ite(s, eventid, dte, ite); + } + + return res; +} + static MemTxResult update_cte(GICv3ITSState *s, uint16_t icid, bool valid, uint64_t rdbase) { @@ -303,8 +636,10 @@ static void process_cmdq(GICv3ITSState *s) =20 switch (cmd) { case GITS_CMD_INT: + res =3D process_its_cmd(s, data, cq_offset, INT); break; case GITS_CMD_CLEAR: + res =3D process_its_cmd(s, data, cq_offset, CLEAR); break; case GITS_CMD_SYNC: /* @@ -321,10 +656,13 @@ static void process_cmdq(GICv3ITSState *s) res =3D process_mapc(s, cq_offset); break; case GITS_CMD_MAPTI: + res =3D process_mapti(s, data, cq_offset, false); break; case GITS_CMD_MAPI: + res =3D process_mapti(s, data, cq_offset, true); break; case GITS_CMD_DISCARD: + res =3D process_its_cmd(s, data, cq_offset, DISCARD); break; case GITS_CMD_INV: case GITS_CMD_INVALL: @@ -486,7 +824,20 @@ static MemTxResult gicv3_its_translation_write(void *o= paque, hwaddr offset, uint64_t data, unsigned siz= e, MemTxAttrs attrs) { + GICv3ITSState *s =3D (GICv3ITSState *)opaque; MemTxResult result =3D MEMTX_OK; + uint32_t devid =3D 0; + + switch (offset) { + case GITS_TRANSLATER: + if (s->ctlr & ITS_CTLR_ENABLED) { + devid =3D attrs.requester_id; + result =3D process_its_cmd(s, data, devid, NONE); + } + break; + default: + break; + } =20 return result; } diff --git a/hw/intc/gicv3_internal.h b/hw/intc/gicv3_internal.h index 034fadfebe..1966444790 100644 --- a/hw/intc/gicv3_internal.h +++ b/hw/intc/gicv3_internal.h @@ -334,6 +334,13 @@ FIELD(MAPC, RDBASE, 16, 32) #define ITTADDR_MASK MAKE_64BIT_MASK(ITTADDR_SHIFT, ITTADDR_LE= NGTH) #define SIZE_MASK 0x1f =20 +/* MAPI command fields */ +#define EVENTID_MASK ((1ULL << 32) - 1) + +/* MAPTI command fields */ +#define pINTID_SHIFT 32 +#define pINTID_MASK MAKE_64BIT_MASK(32, 32) + #define DEVID_SHIFT 32 #define DEVID_MASK MAKE_64BIT_MASK(32, 32) =20 @@ -359,6 +366,11 @@ FIELD(MAPC, RDBASE, 16, 32) * Values: | vPEID | ICID | */ #define ITS_ITT_ENTRY_SIZE 0xC +#define ITE_ENTRY_INTTYPE_SHIFT 1 +#define ITE_ENTRY_INTID_SHIFT 2 +#define ITE_ENTRY_INTID_MASK MAKE_64BIT_MASK(2, 24) +#define ITE_ENTRY_INTSP_SHIFT 26 +#define ITE_ENTRY_ICID_MASK MAKE_64BIT_MASK(0, 16) =20 /* 16 bits EventId */ #define ITS_IDBITS GICD_TYPER_IDBITS diff --git a/include/hw/intc/arm_gicv3_common.h b/include/hw/intc/arm_gicv3= _common.h index 1fd5cedbbd..0715b0bc2a 100644 --- a/include/hw/intc/arm_gicv3_common.h +++ b/include/hw/intc/arm_gicv3_common.h @@ -36,6 +36,8 @@ #define GICV3_MAXIRQ 1020 #define GICV3_MAXSPI (GICV3_MAXIRQ - GIC_INTERNAL) =20 +#define GICV3_LPI_INTID_START 8192 + #define GICV3_REDIST_SIZE 0x20000 =20 /* Number of SGI target-list bits */ --=20 2.27.0 From nobody Sun May 19 20:02:56 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1628787620221155.87368754754323; Thu, 12 Aug 2021 10:00:20 -0700 (PDT) Received: from localhost ([::1]:37094 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mEE43-00013C-39 for importer@patchew.org; Thu, 12 Aug 2021 13:00:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50854) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mEDxv-0007oB-BZ for qemu-devel@nongnu.org; Thu, 12 Aug 2021 12:53:59 -0400 Received: from mail-qk1-x736.google.com ([2607:f8b0:4864:20::736]:39553) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mEDxm-00062q-K8 for qemu-devel@nongnu.org; Thu, 12 Aug 2021 12:53:59 -0400 Received: by mail-qk1-x736.google.com with SMTP id y130so7371365qkb.6 for ; Thu, 12 Aug 2021 09:53:50 -0700 (PDT) Received: from localhost.localdomain (bras-base-stsvon1503w-grc-22-142-114-143-47.dsl.bell.ca. [142.114.143.47]) by smtp.googlemail.com with ESMTPSA id c69sm1714864qkg.1.2021.08.12.09.53.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Aug 2021 09:53:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8+435bw22s57J4dB7dZnjVtq/PQBXSBTmGSwBfTw/2k=; b=wIaiMU5xhvrMbEEdCOGReohEZcUQ6e7bq04ZANSP8Tcwdj/sQ7Clq9oO9RLsnoKTjH DbLC41nlOFodS3byJ+cmfp5igIdDMLYincTmSWm5YeGwmoxfrWFrT8PIhx8zVLALtWkQ TnZhePRdQ6tgJe1w+cbJwsgXyeYQaopOBPfHrjU27wSTeYmYes/J6mdFrgEpQAlRbQM6 sBBYQsynPjnrOf3RKbiDmXAmMjfWODqHHiylJkp3YeOtLpN/jjPAh0wdRjgr4Zm/ZpOu 7XvpqQLXFDafP6y0MTpc4BdbyYzXNc9D6zeRroUKjSDWwsXwd7G/ehT3YuBC5gdX8vw/ 1Jcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8+435bw22s57J4dB7dZnjVtq/PQBXSBTmGSwBfTw/2k=; b=JlOO6Vy0ZHtC0kGlNIOwvdvPJO4Lf25q9Pv1fQepOCPA454k7+UurEVWIKk6wVU4rf 8/H8jsXV3LlN6CQTFutAIVTOxIMOJZ3G8MFMBm2/8UvMn3NAXkywYvzkXkiI2HtP4j7V nQGdmZCJt+e7xczejzb3PypC3UgFbBUH5o4qJ83mGvf7fQQQPITWMzxuTE439A4rkAUH ELpT+VRqk2BUpSUhlWhiZuhLShgv+ZdoPskWKMrJPWMK1X3D4pXNYe7OLKn4sO4pBHVi tiULKV1M+heefCQrKrzwZX28ipVM1IpWsbGlz7CVU6jU7kUecg9fDpTAQ5iy3CbsFfGB 4thw== X-Gm-Message-State: AOAM531pL+2PhPlIQhhsnj9FCXjZppTD3WFmIgyMyf/rRYLFXOOkILHC y4oXbiK7f5nJaIKbnobDYpeFJQ== X-Google-Smtp-Source: ABdhPJw2Dqpdzja3T5IPIkvb1GWqY8lrF/XBlgHFzVRFgM/bUxkeLeOxNrsU/IcmQs8jAlg7ajZwXA== X-Received: by 2002:a37:6514:: with SMTP id z20mr3837538qkb.23.1628787229560; Thu, 12 Aug 2021 09:53:49 -0700 (PDT) From: Shashi Mallela To: peter.maydell@linaro.org, leif@nuviainc.com, rad@semihalf.com, mst@redhat.com, imammedo@redhat.com Subject: [PATCH v8 05/10] hw/intc: GICv3 ITS Feature enablement Date: Thu, 12 Aug 2021 12:53:36 -0400 Message-Id: <20210812165341.40784-6-shashi.mallela@linaro.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210812165341.40784-1-shashi.mallela@linaro.org> References: <20210812165341.40784-1-shashi.mallela@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::736; envelope-from=shashi.mallela@linaro.org; helo=mail-qk1-x736.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: eric.auger@redhat.com, qemu-arm@nongnu.org, qemu-devel@nongnu.org, narmstrong@baylibre.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1628787621199100001 Content-Type: text/plain; charset="utf-8" Added properties to enable ITS feature and define qemu system address space memory in gicv3 common,setup distributor and redistributor registers to indicate LPI support. Signed-off-by: Shashi Mallela Reviewed-by: Peter Maydell Tested-by: Neil Armstrong --- hw/intc/arm_gicv3_common.c | 12 ++++++++++++ hw/intc/arm_gicv3_dist.c | 5 ++++- hw/intc/arm_gicv3_redist.c | 12 +++++++++--- hw/intc/gicv3_internal.h | 2 ++ include/hw/intc/arm_gicv3_common.h | 1 + 5 files changed, 28 insertions(+), 4 deletions(-) diff --git a/hw/intc/arm_gicv3_common.c b/hw/intc/arm_gicv3_common.c index 58ef65f589..53dea2a775 100644 --- a/hw/intc/arm_gicv3_common.c +++ b/hw/intc/arm_gicv3_common.c @@ -345,6 +345,11 @@ static void arm_gicv3_common_realize(DeviceState *dev,= Error **errp) return; } =20 + if (s->lpi_enable && !s->dma) { + error_setg(errp, "Redist-ITS: Guest 'sysmem' reference link not se= t"); + return; + } + s->cpu =3D g_new0(GICv3CPUState, s->num_cpu); =20 for (i =3D 0; i < s->num_cpu; i++) { @@ -381,6 +386,10 @@ static void arm_gicv3_common_realize(DeviceState *dev,= Error **errp) (1 << 24) | (i << 8) | (last << 4); + + if (s->lpi_enable) { + s->cpu[i].gicr_typer |=3D GICR_TYPER_PLPIS; + } } } =20 @@ -494,9 +503,12 @@ static Property arm_gicv3_common_properties[] =3D { DEFINE_PROP_UINT32("num-cpu", GICv3State, num_cpu, 1), DEFINE_PROP_UINT32("num-irq", GICv3State, num_irq, 32), DEFINE_PROP_UINT32("revision", GICv3State, revision, 3), + DEFINE_PROP_BOOL("has-lpi", GICv3State, lpi_enable, 0), DEFINE_PROP_BOOL("has-security-extensions", GICv3State, security_extn,= 0), DEFINE_PROP_ARRAY("redist-region-count", GICv3State, nb_redist_regions, redist_region_count, qdev_prop_uint32, uint32_t), + DEFINE_PROP_LINK("sysmem", GICv3State, dma, TYPE_MEMORY_REGION, + MemoryRegion *), DEFINE_PROP_END_OF_LIST(), }; =20 diff --git a/hw/intc/arm_gicv3_dist.c b/hw/intc/arm_gicv3_dist.c index b65f56f903..43128b376d 100644 --- a/hw/intc/arm_gicv3_dist.c +++ b/hw/intc/arm_gicv3_dist.c @@ -371,7 +371,9 @@ static MemTxResult gicd_readl(GICv3State *s, hwaddr off= set, * A3V =3D=3D 1 (non-zero values of Affinity level 3 supported) * IDbits =3D=3D 0xf (we support 16-bit interrupt identifiers) * DVIS =3D=3D 0 (Direct virtual LPI injection not supported) - * LPIS =3D=3D 0 (LPIs not supported) + * LPIS =3D=3D 1 (LPIs are supported if affinity routing is enable= d) + * num_LPIs =3D=3D 0b00000 (bits [15:11],Number of LPIs as indicat= ed + * by GICD_TYPER.IDbits) * MBIS =3D=3D 0 (message-based SPIs not supported) * SecurityExtn =3D=3D 1 if security extns supported * CPUNumber =3D=3D 0 since for us ARE is always 1 @@ -386,6 +388,7 @@ static MemTxResult gicd_readl(GICv3State *s, hwaddr off= set, bool sec_extn =3D !(s->gicd_ctlr & GICD_CTLR_DS); =20 *data =3D (1 << 25) | (1 << 24) | (sec_extn << 10) | + (s->lpi_enable << GICD_TYPER_LPIS_SHIFT) | (0xf << 19) | itlinesnumber; return MEMTX_OK; } diff --git a/hw/intc/arm_gicv3_redist.c b/hw/intc/arm_gicv3_redist.c index 53da703ed8..2108abfe9c 100644 --- a/hw/intc/arm_gicv3_redist.c +++ b/hw/intc/arm_gicv3_redist.c @@ -248,10 +248,16 @@ static MemTxResult gicr_writel(GICv3CPUState *cs, hwa= ddr offset, case GICR_CTLR: /* For our implementation, GICR_TYPER.DPGS is 0 and so all * the DPG bits are RAZ/WI. We don't do anything asynchronously, - * so UWP and RWP are RAZ/WI. And GICR_TYPER.LPIS is 0 (we don't - * implement LPIs) so Enable_LPIs is RES0. So there are no writable - * bits for us. + * so UWP and RWP are RAZ/WI. GICR_TYPER.LPIS is 1 (we + * implement LPIs) so Enable_LPIs is programmable. */ + if (cs->gicr_typer & GICR_TYPER_PLPIS) { + if (value & GICR_CTLR_ENABLE_LPIS) { + cs->gicr_ctlr |=3D GICR_CTLR_ENABLE_LPIS; + } else { + cs->gicr_ctlr &=3D ~GICR_CTLR_ENABLE_LPIS; + } + } return MEMTX_OK; case GICR_STATUSR: /* RAZ/WI for our implementation */ diff --git a/hw/intc/gicv3_internal.h b/hw/intc/gicv3_internal.h index 1966444790..530d1c1789 100644 --- a/hw/intc/gicv3_internal.h +++ b/hw/intc/gicv3_internal.h @@ -68,6 +68,8 @@ #define GICD_CTLR_E1NWF (1U << 7) #define GICD_CTLR_RWP (1U << 31) =20 +#define GICD_TYPER_LPIS_SHIFT 17 + /* 16 bits EventId */ #define GICD_TYPER_IDBITS 0xf =20 diff --git a/include/hw/intc/arm_gicv3_common.h b/include/hw/intc/arm_gicv3= _common.h index 0715b0bc2a..c1348cc60a 100644 --- a/include/hw/intc/arm_gicv3_common.h +++ b/include/hw/intc/arm_gicv3_common.h @@ -221,6 +221,7 @@ struct GICv3State { uint32_t num_cpu; uint32_t num_irq; uint32_t revision; + bool lpi_enable; bool security_extn; bool irq_reset_nonsecure; bool gicd_no_migration_shift_bug; --=20 2.27.0 From nobody Sun May 19 20:02:56 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 162878755928748.596749402730666; Thu, 12 Aug 2021 09:59:19 -0700 (PDT) Received: from localhost ([::1]:35446 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mEE33-0008OA-PO for importer@patchew.org; Thu, 12 Aug 2021 12:59:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50834) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mEDxu-0007o5-Id for qemu-devel@nongnu.org; Thu, 12 Aug 2021 12:53:59 -0400 Received: from mail-qv1-xf2b.google.com ([2607:f8b0:4864:20::f2b]:46987) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mEDxn-00063q-Qz for qemu-devel@nongnu.org; Thu, 12 Aug 2021 12:53:58 -0400 Received: by mail-qv1-xf2b.google.com with SMTP id e1so3483845qvs.13 for ; Thu, 12 Aug 2021 09:53:51 -0700 (PDT) Received: from localhost.localdomain (bras-base-stsvon1503w-grc-22-142-114-143-47.dsl.bell.ca. [142.114.143.47]) by smtp.googlemail.com with ESMTPSA id c69sm1714864qkg.1.2021.08.12.09.53.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Aug 2021 09:53:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=su4xCDDUwBVj36ipZPqrC0MRO0vtpZIDqd8JcYIVdOU=; b=joQP/cP7XbyC6vFgV1gqLcr6aSMmdgwKJmpSyLE0q+N2/OHJs8s/Pgf+n3F3cDuJqF b25sVMuQEXJ1jTjb2U5ft3AHiiiU5+pfCzk7PYRbXV2EmREwx0actqVWbuXAmq9/C0FK 33a8aHJMjK37dgzvoiBEF1MVOpP8XwXB4WpHdHPGRnmkJGwMUOFeLxE7jpJSkoSh6wxC 56c9ybJLpN9GaNT/OrSg9NkDRxa0C5YIBndrsu3IhPO6dJ9IKg+CTxWzrsFr7Tc8xAAY nLY0anFM5GV0rtlrVHSxStJCj1reHKSHW5aSy5j677X7e11QXjSv3a05GWsXyF1FKb9e eAKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=su4xCDDUwBVj36ipZPqrC0MRO0vtpZIDqd8JcYIVdOU=; b=oT6bxMKsvNAdDUhxNJFH20QsLoYg5hH2AKMQgq9vWmvYL57JDV7WYSu6arXbOMcsxv HrUAUzdd91Q+UFMhm+rJXg/ftV9ytNnWJnSKCggrghlyyxwbwMbccEnZhlayRUY/eNWl ApSshmnPByNDXMRJrq8UIlTZXP+O1FC/+hF8a9PH9k0KnTkWDTO53yAfyWIYwtVa85Dw txDN/2Xhf4retK6SIAJTPn7uoHxXUzk28T05VJtUyykVU+iLa45w8LERyBUtExq4XlAZ 79azv1P/oghaAhQj+b/qaj6JbwGxn/Al2epT4GDOITB2MHSs0MAG0SLu2RovJf7vVTep D7yQ== X-Gm-Message-State: AOAM533xIkjpXRVre0/vGQ/QS2OMzGz3LY7dwRFBEkZvT2GA3g72obVU 7RhaIjnUfD3WOrW022SympREiA== X-Google-Smtp-Source: ABdhPJxhohGlDg0N5I24HhIi8pQ/slGhujkmwOyDy2mi40roEfIjwZbtOJFtBCXhb8ik20RkTk68TA== X-Received: by 2002:a05:6214:80a:: with SMTP id df10mr4851515qvb.58.1628787230493; Thu, 12 Aug 2021 09:53:50 -0700 (PDT) From: Shashi Mallela To: peter.maydell@linaro.org, leif@nuviainc.com, rad@semihalf.com, mst@redhat.com, imammedo@redhat.com Subject: [PATCH v8 06/10] hw/intc: GICv3 redistributor ITS processing Date: Thu, 12 Aug 2021 12:53:37 -0400 Message-Id: <20210812165341.40784-7-shashi.mallela@linaro.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210812165341.40784-1-shashi.mallela@linaro.org> References: <20210812165341.40784-1-shashi.mallela@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::f2b; envelope-from=shashi.mallela@linaro.org; helo=mail-qv1-xf2b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: eric.auger@redhat.com, qemu-arm@nongnu.org, qemu-devel@nongnu.org, narmstrong@baylibre.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1628787560192100001 Content-Type: text/plain; charset="utf-8" Implemented lpi processing at redistributor to get lpi config info from lpi configuration table,determine priority,set pending state in lpi pending table and forward the lpi to cpuif.Added logic to invoke redistributor lpi processing with translated LPI which set/clear LPI from ITS device as part of ITS INT,CLEAR,DISCARD command and GITS_TRANSLATER processing. Signed-off-by: Shashi Mallela Tested-by: Neil Armstrong Reviewed-by: Peter Maydell --- hw/intc/arm_gicv3.c | 14 +++ hw/intc/arm_gicv3_common.c | 1 + hw/intc/arm_gicv3_cpuif.c | 7 +- hw/intc/arm_gicv3_its.c | 23 +++++ hw/intc/arm_gicv3_redist.c | 141 +++++++++++++++++++++++++++++ hw/intc/gicv3_internal.h | 9 ++ include/hw/intc/arm_gicv3_common.h | 7 ++ 7 files changed, 200 insertions(+), 2 deletions(-) diff --git a/hw/intc/arm_gicv3.c b/hw/intc/arm_gicv3.c index d63f8af604..3f24707838 100644 --- a/hw/intc/arm_gicv3.c +++ b/hw/intc/arm_gicv3.c @@ -165,6 +165,16 @@ static void gicv3_redist_update_noirqset(GICv3CPUState= *cs) cs->hppi.grp =3D gicv3_irq_group(cs->gic, cs, cs->hppi.irq); } =20 + if ((cs->gicr_ctlr & GICR_CTLR_ENABLE_LPIS) && cs->gic->lpi_enable && + (cs->hpplpi.prio !=3D 0xff)) { + if (irqbetter(cs, cs->hpplpi.irq, cs->hpplpi.prio)) { + cs->hppi.irq =3D cs->hpplpi.irq; + cs->hppi.prio =3D cs->hpplpi.prio; + cs->hppi.grp =3D cs->hpplpi.grp; + seenbetter =3D true; + } + } + /* If the best interrupt we just found would preempt whatever * was the previous best interrupt before this update, then * we know it's definitely the best one now. @@ -339,9 +349,13 @@ static void gicv3_set_irq(void *opaque, int irq, int l= evel) =20 static void arm_gicv3_post_load(GICv3State *s) { + int i; /* Recalculate our cached idea of the current highest priority * pending interrupt, but don't set IRQ or FIQ lines. */ + for (i =3D 0; i < s->num_cpu; i++) { + gicv3_redist_update_lpi(&s->cpu[i]); + } gicv3_full_update_noirqset(s); /* Repopulate the cache of GICv3CPUState pointers for target CPUs */ gicv3_cache_all_target_cpustates(s); diff --git a/hw/intc/arm_gicv3_common.c b/hw/intc/arm_gicv3_common.c index 53dea2a775..223db16fec 100644 --- a/hw/intc/arm_gicv3_common.c +++ b/hw/intc/arm_gicv3_common.c @@ -435,6 +435,7 @@ static void arm_gicv3_common_reset(DeviceState *dev) memset(cs->gicr_ipriorityr, 0, sizeof(cs->gicr_ipriorityr)); =20 cs->hppi.prio =3D 0xff; + cs->hpplpi.prio =3D 0xff; =20 /* State in the CPU interface must *not* be reset here, because it * is part of the CPU's reset domain, not the GIC device's. diff --git a/hw/intc/arm_gicv3_cpuif.c b/hw/intc/arm_gicv3_cpuif.c index a032d505f5..462a35f66e 100644 --- a/hw/intc/arm_gicv3_cpuif.c +++ b/hw/intc/arm_gicv3_cpuif.c @@ -899,10 +899,12 @@ static void icc_activate_irq(GICv3CPUState *cs, int i= rq) cs->gicr_iactiver0 =3D deposit32(cs->gicr_iactiver0, irq, 1, 1); cs->gicr_ipendr0 =3D deposit32(cs->gicr_ipendr0, irq, 1, 0); gicv3_redist_update(cs); - } else { + } else if (irq < GICV3_LPI_INTID_START) { gicv3_gicd_active_set(cs->gic, irq); gicv3_gicd_pending_clear(cs->gic, irq); gicv3_update(cs->gic, irq, 1); + } else { + gicv3_redist_lpi_pending(cs, irq, 0); } } =20 @@ -1318,7 +1320,8 @@ static void icc_eoir_write(CPUARMState *env, const AR= MCPRegInfo *ri, trace_gicv3_icc_eoir_write(is_eoir0 ? 0 : 1, gicv3_redist_affid(cs), value); =20 - if (irq >=3D cs->gic->num_irq) { + if ((irq >=3D cs->gic->num_irq) && + !(cs->gic->lpi_enable && (irq >=3D GICV3_LPI_INTID_START))) { /* This handles two cases: * 1. If software writes the ID of a spurious interrupt [ie 1020-1= 023] * to the GICC_EOIR, the GIC ignores that write. diff --git a/hw/intc/arm_gicv3_its.c b/hw/intc/arm_gicv3_its.c index d98b0e0f4c..d09ad6f556 100644 --- a/hw/intc/arm_gicv3_its.c +++ b/hw/intc/arm_gicv3_its.c @@ -228,6 +228,7 @@ static MemTxResult process_its_cmd(GICv3ITSState *s, ui= nt64_t value, bool ite_valid =3D false; uint64_t cte =3D 0; bool cte_valid =3D false; + uint64_t rdbase; =20 if (cmd =3D=3D NONE) { devid =3D offset; @@ -288,6 +289,18 @@ static MemTxResult process_its_cmd(GICv3ITSState *s, u= int64_t value, * Current implementation only supports rdbase =3D=3D procnum * Hence rdbase physical address is ignored */ + rdbase =3D (cte & GITS_CTE_RDBASE_PROCNUM_MASK) >> 1U; + + if (rdbase > s->gicv3->num_cpu) { + return res; + } + + if ((cmd =3D=3D CLEAR) || (cmd =3D=3D DISCARD)) { + gicv3_redist_process_lpi(&s->gicv3->cpu[rdbase], pIntid, 0); + } else { + gicv3_redist_process_lpi(&s->gicv3->cpu[rdbase], pIntid, 1); + } + if (cmd =3D=3D DISCARD) { IteEntry ite =3D {}; /* remove mapping from interrupt translation table */ @@ -605,6 +618,7 @@ static void process_cmdq(GICv3ITSState *s) AddressSpace *as =3D &s->gicv3->dma_as; MemTxResult res =3D MEMTX_OK; uint8_t cmd; + int i; =20 if (!(s->ctlr & ITS_CTLR_ENABLED)) { return; @@ -666,6 +680,15 @@ static void process_cmdq(GICv3ITSState *s) break; case GITS_CMD_INV: case GITS_CMD_INVALL: + /* + * Current implementation doesn't cache any ITS tables, + * but the calculated lpi priority information. We only + * need to trigger lpi priority re-calculation to be in + * sync with LPI config table or pending table changes. + */ + for (i =3D 0; i < s->gicv3->num_cpu; i++) { + gicv3_redist_update_lpi(&s->gicv3->cpu[i]); + } break; default: break; diff --git a/hw/intc/arm_gicv3_redist.c b/hw/intc/arm_gicv3_redist.c index 2108abfe9c..7072bfcbb1 100644 --- a/hw/intc/arm_gicv3_redist.c +++ b/hw/intc/arm_gicv3_redist.c @@ -254,6 +254,9 @@ static MemTxResult gicr_writel(GICv3CPUState *cs, hwadd= r offset, if (cs->gicr_typer & GICR_TYPER_PLPIS) { if (value & GICR_CTLR_ENABLE_LPIS) { cs->gicr_ctlr |=3D GICR_CTLR_ENABLE_LPIS; + /* Check for any pending interr in pending table */ + gicv3_redist_update_lpi(cs); + gicv3_redist_update(cs); } else { cs->gicr_ctlr &=3D ~GICR_CTLR_ENABLE_LPIS; } @@ -532,6 +535,144 @@ MemTxResult gicv3_redist_write(void *opaque, hwaddr o= ffset, uint64_t data, return r; } =20 +static void gicv3_redist_check_lpi_priority(GICv3CPUState *cs, int irq) +{ + AddressSpace *as =3D &cs->gic->dma_as; + uint64_t lpict_baddr; + uint8_t lpite; + uint8_t prio; + + lpict_baddr =3D cs->gicr_propbaser & R_GICR_PROPBASER_PHYADDR_MASK; + + address_space_read(as, lpict_baddr + ((irq - GICV3_LPI_INTID_START) * + sizeof(lpite)), MEMTXATTRS_UNSPECIFIED, &lpite, + sizeof(lpite)); + + if (!(lpite & LPI_CTE_ENABLED)) { + return; + } + + if (cs->gic->gicd_ctlr & GICD_CTLR_DS) { + prio =3D lpite & LPI_PRIORITY_MASK; + } else { + prio =3D ((lpite & LPI_PRIORITY_MASK) >> 1) | 0x80; + } + + if ((prio < cs->hpplpi.prio) || + ((prio =3D=3D cs->hpplpi.prio) && (irq <=3D cs->hpplpi.irq))) { + cs->hpplpi.irq =3D irq; + cs->hpplpi.prio =3D prio; + /* LPIs are always non-secure Grp1 interrupts */ + cs->hpplpi.grp =3D GICV3_G1NS; + } +} + +void gicv3_redist_update_lpi(GICv3CPUState *cs) +{ + /* + * This function scans the LPI pending table and for each pending + * LPI, reads the corresponding entry from LPI configuration table + * to extract the priority info and determine if the current LPI + * priority is lower than the last computed high priority lpi interrup= t. + * If yes, replace current LPI as the new high priority lpi interrupt. + */ + AddressSpace *as =3D &cs->gic->dma_as; + uint64_t lpipt_baddr; + uint32_t pendt_size =3D 0; + uint8_t pend; + int i, bit; + uint64_t idbits; + + idbits =3D MIN(FIELD_EX64(cs->gicr_propbaser, GICR_PROPBASER, IDBITS), + GICD_TYPER_IDBITS); + + if (!(cs->gicr_ctlr & GICR_CTLR_ENABLE_LPIS) || !cs->gicr_propbaser || + !cs->gicr_pendbaser) { + return; + } + + cs->hpplpi.prio =3D 0xff; + + lpipt_baddr =3D cs->gicr_pendbaser & R_GICR_PENDBASER_PHYADDR_MASK; + + /* Determine the highest priority pending interrupt among LPIs */ + pendt_size =3D (1ULL << (idbits + 1)); + + for (i =3D GICV3_LPI_INTID_START / 8; i < pendt_size / 8; i++) { + address_space_read(as, lpipt_baddr + i, MEMTXATTRS_UNSPECIFIED, &p= end, + sizeof(pend)); + + while (pend) { + bit =3D ctz32(pend); + gicv3_redist_check_lpi_priority(cs, i * 8 + bit); + pend &=3D ~(1 << bit); + } + } +} + +void gicv3_redist_lpi_pending(GICv3CPUState *cs, int irq, int level) +{ + /* + * This function updates the pending bit in lpi pending table for + * the irq being activated or deactivated. + */ + AddressSpace *as =3D &cs->gic->dma_as; + uint64_t lpipt_baddr; + bool ispend =3D false; + uint8_t pend; + + /* + * get the bit value corresponding to this irq in the + * lpi pending table + */ + lpipt_baddr =3D cs->gicr_pendbaser & R_GICR_PENDBASER_PHYADDR_MASK; + + address_space_read(as, lpipt_baddr + ((irq / 8) * sizeof(pend)), + MEMTXATTRS_UNSPECIFIED, &pend, sizeof(pend)); + + ispend =3D extract32(pend, irq % 8, 1); + + /* no change in the value of pending bit, return */ + if (ispend =3D=3D level) { + return; + } + pend =3D deposit32(pend, irq % 8, 1, level ? 1 : 0); + + address_space_write(as, lpipt_baddr + ((irq / 8) * sizeof(pend)), + MEMTXATTRS_UNSPECIFIED, &pend, sizeof(pend)); + + /* + * check if this LPI is better than the current hpplpi, if yes + * just set hpplpi.prio and .irq without doing a full rescan + */ + if (level) { + gicv3_redist_check_lpi_priority(cs, irq); + } else { + if (irq =3D=3D cs->hpplpi.irq) { + gicv3_redist_update_lpi(cs); + } + } +} + +void gicv3_redist_process_lpi(GICv3CPUState *cs, int irq, int level) +{ + uint64_t idbits; + + idbits =3D MIN(FIELD_EX64(cs->gicr_propbaser, GICR_PROPBASER, IDBITS), + GICD_TYPER_IDBITS); + + if (!(cs->gicr_ctlr & GICR_CTLR_ENABLE_LPIS) || !cs->gicr_propbaser || + !cs->gicr_pendbaser || (irq > (1ULL << (idbits + 1)) - 1) || + irq < GICV3_LPI_INTID_START) { + return; + } + + /* set/clear the pending bit for this irq */ + gicv3_redist_lpi_pending(cs, irq, level); + + gicv3_redist_update(cs); +} + void gicv3_redist_set_irq(GICv3CPUState *cs, int irq, int level) { /* Update redistributor state for a change in an external PPI input li= ne */ diff --git a/hw/intc/gicv3_internal.h b/hw/intc/gicv3_internal.h index 530d1c1789..a0369dace7 100644 --- a/hw/intc/gicv3_internal.h +++ b/hw/intc/gicv3_internal.h @@ -140,6 +140,8 @@ FIELD(GICR_PENDBASER, PHYADDR, 16, 36) FIELD(GICR_PENDBASER, OUTERCACHE, 56, 3) FIELD(GICR_PENDBASER, PTZ, 62, 1) =20 +#define GICR_PROPBASER_IDBITS_THRESHOLD 0xd + #define ICC_CTLR_EL1_CBPR (1U << 0) #define ICC_CTLR_EL1_EOIMODE (1U << 1) #define ICC_CTLR_EL1_PMHE (1U << 6) @@ -305,6 +307,9 @@ FIELD(GITS_TYPER, CIL, 36, 1) =20 #define L1TABLE_ENTRY_SIZE 8 =20 +#define LPI_CTE_ENABLED TABLE_ENTRY_VALID_MASK +#define LPI_PRIORITY_MASK 0xfc + #define GITS_CMDQ_ENTRY_SIZE 32 #define NUM_BYTES_IN_DW 8 =20 @@ -397,6 +402,7 @@ FIELD(MAPC, RDBASE, 16, 32) * Valid =3D 1 bit,RDBase =3D 36 bits(considering max RDBASE) */ #define GITS_CTE_SIZE (0x8ULL) +#define GITS_CTE_RDBASE_PROCNUM_MASK MAKE_64BIT_MASK(1, RDBASE_PROCNUM_LE= NGTH) =20 /* Special interrupt IDs */ #define INTID_SECURE 1020 @@ -455,6 +461,9 @@ MemTxResult gicv3_redist_write(void *opaque, hwaddr off= set, uint64_t data, unsigned size, MemTxAttrs attrs); void gicv3_dist_set_irq(GICv3State *s, int irq, int level); void gicv3_redist_set_irq(GICv3CPUState *cs, int irq, int level); +void gicv3_redist_process_lpi(GICv3CPUState *cs, int irq, int level); +void gicv3_redist_lpi_pending(GICv3CPUState *cs, int irq, int level); +void gicv3_redist_update_lpi(GICv3CPUState *cs); void gicv3_redist_send_sgi(GICv3CPUState *cs, int grp, int irq, bool ns); void gicv3_init_cpuif(GICv3State *s); =20 diff --git a/include/hw/intc/arm_gicv3_common.h b/include/hw/intc/arm_gicv3= _common.h index c1348cc60a..aa4f0d6770 100644 --- a/include/hw/intc/arm_gicv3_common.h +++ b/include/hw/intc/arm_gicv3_common.h @@ -204,6 +204,13 @@ struct GICv3CPUState { * real state above; it doesn't need to be migrated. */ PendingIrq hppi; + + /* + * Cached information recalculated from LPI tables + * in guest memory + */ + PendingIrq hpplpi; + /* This is temporary working state, to avoid a malloc in gicv3_update(= ) */ bool seenbetter; }; --=20 2.27.0 From nobody Sun May 19 20:02:56 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1628787753877609.3332442293107; Thu, 12 Aug 2021 10:02:33 -0700 (PDT) Received: from localhost ([::1]:45624 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mEE6C-0006n1-MJ for importer@patchew.org; Thu, 12 Aug 2021 13:02:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50928) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mEDxy-0007yL-57 for qemu-devel@nongnu.org; Thu, 12 Aug 2021 12:54:02 -0400 Received: from mail-qt1-x836.google.com ([2607:f8b0:4864:20::836]:40932) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mEDxo-000646-IM for qemu-devel@nongnu.org; Thu, 12 Aug 2021 12:54:01 -0400 Received: by mail-qt1-x836.google.com with SMTP id y9so5745986qtv.7 for ; Thu, 12 Aug 2021 09:53:52 -0700 (PDT) Received: from localhost.localdomain (bras-base-stsvon1503w-grc-22-142-114-143-47.dsl.bell.ca. [142.114.143.47]) by smtp.googlemail.com with ESMTPSA id c69sm1714864qkg.1.2021.08.12.09.53.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Aug 2021 09:53:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vRtkRSWJCX6tGhWs/vBYUaAykj6RF3z+5UwVziTK5vE=; b=W8B9Go45SNr3Y4Il2IFXLfCrCA8/6jE67+Rmp8c+OEdUScuC3zvbtwAElkEgp6blE2 TsIyaX1pSFCtxY36+jKVw/9+WJiTfs16Tm+GHOwEPK1drrwL0mr7yqtQ2JF7J8xqzYcn g3V3OwNQ4mDDPvxzfK0wWPUvE8StQ0a3DWIK3xlRr2HHm3Lgf2oHOBs0SyPB0p3raeS0 SK33Zxe7vA6ayYmdbi5g05jXBOiFQij6kA5hSrXeOYdbyl5kUdYCOA9Ko1L+gQqKo6Oq mt83xVp+dQxJpe2ccKm29/TS+AqPF+JvMifwY7gYPNfr5LRW9LLfTm/USoFltMMVJGQG qaKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vRtkRSWJCX6tGhWs/vBYUaAykj6RF3z+5UwVziTK5vE=; b=c4rixMuTxvllGXV9ybiFt/kFVJY/Pl3DR8wJ9k1mOmtzJjx8hw2sFH1PaELt6Mv+bW 1daPP2uc+k/njPqnT08+Qiz6eHZzL/LV1JMhcfAt016jzNcIIjzM+Tgu/OSnPyT4dWTb nBRu300wVOpG0ycWPITqXkkc4joqv1RVONBhq5Bq4dXmvqHYUO6xlOI77xf0OMeOkckX gpSzPp5bmt5WPONy17baRRaTpKNGNhMh1X8VO0g+z+iAWvlwfDaKrK3iHXphopxr4TAk ugBzOFRe5Bb713Bc6O/5bMzmNN2Db7xMUfQxIAu6a5h5YfqgMfwhnyUq0qGar6kd5yyl NB6w== X-Gm-Message-State: AOAM532XpnWNJpJFJrWGC0tuKDVXBILnqeplhYPmd5kqD9yy3Ld2J9mV H7c+GWn2UJBIPBU/UfMMux5aPw== X-Google-Smtp-Source: ABdhPJzju0nLKUVvXJNXuA4fwLzfLBQvzAN6qX5AufkKGncZgZHnsVn6TyBAVH8yzuJayDZ2SqXvtg== X-Received: by 2002:a05:622a:1998:: with SMTP id u24mr4744800qtc.40.1628787231439; Thu, 12 Aug 2021 09:53:51 -0700 (PDT) From: Shashi Mallela To: peter.maydell@linaro.org, leif@nuviainc.com, rad@semihalf.com, mst@redhat.com, imammedo@redhat.com Subject: [PATCH v8 07/10] hw/arm/sbsa-ref: add ITS support in SBSA GIC Date: Thu, 12 Aug 2021 12:53:38 -0400 Message-Id: <20210812165341.40784-8-shashi.mallela@linaro.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210812165341.40784-1-shashi.mallela@linaro.org> References: <20210812165341.40784-1-shashi.mallela@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::836; envelope-from=shashi.mallela@linaro.org; helo=mail-qt1-x836.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: eric.auger@redhat.com, qemu-arm@nongnu.org, qemu-devel@nongnu.org, narmstrong@baylibre.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1628787755647100001 Content-Type: text/plain; charset="utf-8" Included creation of ITS as part of SBSA platform GIC initialization. Signed-off-by: Shashi Mallela --- hw/arm/sbsa-ref.c | 79 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 75 insertions(+), 4 deletions(-) diff --git a/hw/arm/sbsa-ref.c b/hw/arm/sbsa-ref.c index c1629df603..feadae2f33 100644 --- a/hw/arm/sbsa-ref.c +++ b/hw/arm/sbsa-ref.c @@ -34,7 +34,7 @@ #include "hw/boards.h" #include "hw/ide/internal.h" #include "hw/ide/ahci_internal.h" -#include "hw/intc/arm_gicv3_common.h" +#include "hw/intc/arm_gicv3_its_common.h" #include "hw/loader.h" #include "hw/pci-host/gpex.h" #include "hw/qdev-properties.h" @@ -58,12 +58,26 @@ #define ARCH_TIMER_NS_EL1_IRQ 14 #define ARCH_TIMER_NS_EL2_IRQ 10 =20 +/* + * Enumeration of the possible values of sbsa-ref version + * property. These are arbitrary QEMU-internal values. + * values are :- + * DEFAULT =3D without ITS memory map + * SBSA_GIC_ITS =3D with ITS memory map between distributor & redistributor + * regions. This is the current version supported. + */ +typedef enum SbsaRefVersion { + SBSA_DEFAULT, + SBSA_ITS, +} SbsaRefVersion; + enum { SBSA_FLASH, SBSA_MEM, SBSA_CPUPERIPHS, SBSA_GIC_DIST, SBSA_GIC_REDIST, + SBSA_GIC_ITS, SBSA_SECURE_EC, SBSA_GWDT, SBSA_GWDT_REFRESH, @@ -91,6 +105,7 @@ struct SBSAMachineState { void *fdt; int fdt_size; int psci_conduit; + SbsaRefVersion version; DeviceState *gic; PFlashCFI01 *flash[2]; }; @@ -105,8 +120,11 @@ static const MemMapEntry sbsa_ref_memmap[] =3D { [SBSA_SECURE_MEM] =3D { 0x20000000, 0x20000000 }, /* Space reserved for CPU peripheral devices */ [SBSA_CPUPERIPHS] =3D { 0x40000000, 0x00040000 }, + /* GIC components reserved space Start */ [SBSA_GIC_DIST] =3D { 0x40060000, 0x00010000 }, - [SBSA_GIC_REDIST] =3D { 0x40080000, 0x04000000 }, + [SBSA_GIC_ITS] =3D { 0x40070000, 0x00020000 }, + [SBSA_GIC_REDIST] =3D { 0x400B0000, 0x04000000 }, + /* GIC components reserved space End */ [SBSA_SECURE_EC] =3D { 0x50000000, 0x00001000 }, [SBSA_GWDT_REFRESH] =3D { 0x50010000, 0x00001000 }, [SBSA_GWDT_CONTROL] =3D { 0x50011000, 0x00001000 }, @@ -377,7 +395,20 @@ static void create_secure_ram(SBSAMachineState *sms, memory_region_add_subregion(secure_sysmem, base, secram); } =20 -static void create_gic(SBSAMachineState *sms) +static void create_its(SBSAMachineState *sms) +{ + DeviceState *dev; + + dev =3D qdev_new(TYPE_ARM_GICV3_ITS); + SysBusDevice *s =3D SYS_BUS_DEVICE(dev); + + object_property_set_link(OBJECT(dev), "parent-gicv3", OBJECT(sms->gic), + &error_abort); + sysbus_realize_and_unref(s, &error_fatal); + sysbus_mmio_map(s, 0, sbsa_ref_memmap[SBSA_GIC_ITS].base); +} + +static void create_gic(SBSAMachineState *sms, MemoryRegion *mem) { unsigned int smp_cpus =3D MACHINE(sms)->smp.cpus; SysBusDevice *gicbusdev; @@ -404,6 +435,10 @@ static void create_gic(SBSAMachineState *sms) qdev_prop_set_uint32(sms->gic, "len-redist-region-count", 1); qdev_prop_set_uint32(sms->gic, "redist-region-count[0]", redist0_count= ); =20 + object_property_set_link(OBJECT(sms->gic), "sysmem", OBJECT(mem), + &error_fatal); + qdev_prop_set_bit(sms->gic, "has-lpi", true); + gicbusdev =3D SYS_BUS_DEVICE(sms->gic); sysbus_realize_and_unref(gicbusdev, &error_fatal); sysbus_mmio_map(gicbusdev, 0, sbsa_ref_memmap[SBSA_GIC_DIST].base); @@ -450,6 +485,7 @@ static void create_gic(SBSAMachineState *sms) sysbus_connect_irq(gicbusdev, i + 3 * smp_cpus, qdev_get_gpio_in(cpudev, ARM_CPU_VFIQ)); } + create_its(sms); } =20 static void create_uart(const SBSAMachineState *sms, int uart, @@ -755,7 +791,7 @@ static void sbsa_ref_init(MachineState *machine) =20 create_secure_ram(sms, secure_sysmem); =20 - create_gic(sms); + create_gic(sms, sysmem); =20 create_uart(sms, SBSA_UART, sysmem, serial_hd(0)); create_uart(sms, SBSA_SECURE_UART, secure_sysmem, serial_hd(1)); @@ -825,10 +861,39 @@ sbsa_ref_get_default_cpu_node_id(const MachineState *= ms, int idx) return idx % ms->numa_state->num_nodes; } =20 +static char *sbsa_get_version(Object *obj, Error **errp) +{ + SBSAMachineState *sms =3D SBSA_MACHINE(obj); + + switch (sms->version) { + case SBSA_DEFAULT: + return g_strdup("default"); + case SBSA_ITS: + return g_strdup("sbsaits"); + default: + g_assert_not_reached(); + } +} + +static void sbsa_set_version(Object *obj, const char *value, Error **errp) +{ + SBSAMachineState *sms =3D SBSA_MACHINE(obj); + + if (!strcmp(value, "sbsaits")) { + sms->version =3D SBSA_ITS; + } else if (!strcmp(value, "default")) { + sms->version =3D SBSA_DEFAULT; + } else { + error_setg(errp, "Invalid version value"); + error_append_hint(errp, "Valid values are default, sbsaits.\n"); + } +} + static void sbsa_ref_instance_init(Object *obj) { SBSAMachineState *sms =3D SBSA_MACHINE(obj); =20 + sms->version =3D SBSA_ITS; sbsa_flash_create(sms); } =20 @@ -850,6 +915,12 @@ static void sbsa_ref_class_init(ObjectClass *oc, void = *data) mc->possible_cpu_arch_ids =3D sbsa_ref_possible_cpu_arch_ids; mc->cpu_index_to_instance_props =3D sbsa_ref_cpu_index_to_props; mc->get_default_cpu_node_id =3D sbsa_ref_get_default_cpu_node_id; + + object_class_property_add_str(oc, "version", sbsa_get_version, + sbsa_set_version); + object_class_property_set_description(oc, "version", + "Set the Version type. " + "Valid values are default & sbsa= its"); } =20 static const TypeInfo sbsa_ref_info =3D { --=20 2.27.0 From nobody Sun May 19 20:02:56 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1628787759065653.6169161721704; Thu, 12 Aug 2021 10:02:39 -0700 (PDT) Received: from localhost ([::1]:46198 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mEE6H-0007An-S5 for importer@patchew.org; Thu, 12 Aug 2021 13:02:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50890) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mEDxw-0007tH-MD for qemu-devel@nongnu.org; Thu, 12 Aug 2021 12:54:00 -0400 Received: from mail-qk1-x72c.google.com ([2607:f8b0:4864:20::72c]:37582) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mEDxq-00064u-9W for qemu-devel@nongnu.org; Thu, 12 Aug 2021 12:54:00 -0400 Received: by mail-qk1-x72c.google.com with SMTP id 14so7379089qkc.4 for ; Thu, 12 Aug 2021 09:53:52 -0700 (PDT) Received: from localhost.localdomain (bras-base-stsvon1503w-grc-22-142-114-143-47.dsl.bell.ca. [142.114.143.47]) by smtp.googlemail.com with ESMTPSA id c69sm1714864qkg.1.2021.08.12.09.53.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Aug 2021 09:53:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2Z9C/CE+ufbrmEIPZ5EzW7+qdrK3GH7DzEHvIuwOuiY=; b=zDPpISjA5V6kc8hUUeqRWuV2IfSKlCj7r/LnHxg/bexmj0M0ePeRNp/IJ76+hkLpvc ntpo5pB5tph1TAzqDc22Fb5Pt6vINoM7REapDL6nngumVEz9xkNAKZqgso0vAuVf8kir sha7wqjxRWd3tEdf8Vo31DXz0gPGu7MrEPRyzcAgPeGiXI6Y3AYhlvwYUi6fobAqFJ71 jeqgS/FYb62PZeD2mFu0kB/SAdqO0//U4MQywmcrJcB185bwsqcfyK9r7btvnrc2Hr45 7okw3tty+rk2hgb2GZQt4YtlxJL873SLb8bC9BEjn8Doj4TZKD7TCCk3SmDBiUXsdKKj sHjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2Z9C/CE+ufbrmEIPZ5EzW7+qdrK3GH7DzEHvIuwOuiY=; b=BWdMyr/70LK9qMsJwP1xiA3ZSw3f6S/iCPuCBBGcJiTzR1haZJzcVWuux9tcAgo/vo 1QT30JPOTY5Y2xNY+A5EF8LJ79sSKEoUA79hs674Yhk8YGWBvAxm+hQdBIbtFay5hMqm ZUwHmzzwtP/RGZHI8c+PWNjXCLr3+2BZkLJ6/ZmWNRhfxpMne4Tv34rg1CNECjjHDzq0 z2KaFF0DXO0WPX5P1LcsY/KaL+ymTO3iAWbSOUHf/OLTGop6cakjl5XpbpaxCafaC5an HdK+Chy7VUIxnS43YcVj4O/7/O7vQ2K/vWQHL9eNzsFhAnbPuK9CCMy1kv7xxoavVsqL oxUw== X-Gm-Message-State: AOAM530KAQvIq6E4X6btyuIaQcwCFKvSncUFiTl4YP8cPgPt9XH+Xyld 8fo60tF+h0iGrBLBxebNG5fpZw== X-Google-Smtp-Source: ABdhPJzylGq0tX+9hXZaEW+K0I9nMmyHO4hcZQSuDDqn8FWU34GYzMPiJRvRHiXsdn8E+IT5JDyaSQ== X-Received: by 2002:ae9:e813:: with SMTP id a19mr5600845qkg.246.1628787232288; Thu, 12 Aug 2021 09:53:52 -0700 (PDT) From: Shashi Mallela To: peter.maydell@linaro.org, leif@nuviainc.com, rad@semihalf.com, mst@redhat.com, imammedo@redhat.com Subject: [PATCH v8 08/10] tests/data/acpi/virt: Add IORT files for ITS Date: Thu, 12 Aug 2021 12:53:39 -0400 Message-Id: <20210812165341.40784-9-shashi.mallela@linaro.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210812165341.40784-1-shashi.mallela@linaro.org> References: <20210812165341.40784-1-shashi.mallela@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::72c; envelope-from=shashi.mallela@linaro.org; helo=mail-qk1-x72c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: eric.auger@redhat.com, qemu-arm@nongnu.org, qemu-devel@nongnu.org, narmstrong@baylibre.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1628787761365100001 Content-Type: text/plain; charset="utf-8" Added expected IORT files applicable with latest GICv3 ITS changes.Temporarily differences in these files are okay. Signed-off-by: Shashi Mallela Acked-by: Igor Mammedov Reviewed-by: Peter Maydell --- tests/data/acpi/virt/IORT | 0 tests/data/acpi/virt/IORT.memhp | 0 tests/data/acpi/virt/IORT.numamem | 0 tests/data/acpi/virt/IORT.pxb | 0 tests/qtest/bios-tables-test-allowed-diff.h | 4 ++++ 5 files changed, 4 insertions(+) create mode 100644 tests/data/acpi/virt/IORT create mode 100644 tests/data/acpi/virt/IORT.memhp create mode 100644 tests/data/acpi/virt/IORT.numamem create mode 100644 tests/data/acpi/virt/IORT.pxb diff --git a/tests/data/acpi/virt/IORT b/tests/data/acpi/virt/IORT new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/data/acpi/virt/IORT.memhp b/tests/data/acpi/virt/IORT.me= mhp new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/data/acpi/virt/IORT.numamem b/tests/data/acpi/virt/IORT.= numamem new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/data/acpi/virt/IORT.pxb b/tests/data/acpi/virt/IORT.pxb new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios= -tables-test-allowed-diff.h index dfb8523c8b..2ef211df59 100644 --- a/tests/qtest/bios-tables-test-allowed-diff.h +++ b/tests/qtest/bios-tables-test-allowed-diff.h @@ -1 +1,5 @@ /* List of comma-separated changed AML files to ignore */ +"tests/data/acpi/virt/IORT", +"tests/data/acpi/virt/IORT.memhp", +"tests/data/acpi/virt/IORT.numamem", +"tests/data/acpi/virt/IORT.pxb", --=20 2.27.0 From nobody Sun May 19 20:02:56 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1628787919789560.9354551936736; Thu, 12 Aug 2021 10:05:19 -0700 (PDT) Received: from localhost ([::1]:51618 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mEE8s-0002O3-F5 for importer@patchew.org; Thu, 12 Aug 2021 13:05:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50916) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mEDxx-0007wk-P5 for qemu-devel@nongnu.org; Thu, 12 Aug 2021 12:54:01 -0400 Received: from mail-qv1-xf32.google.com ([2607:f8b0:4864:20::f32]:37767) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mEDxq-00065D-Sm for qemu-devel@nongnu.org; Thu, 12 Aug 2021 12:54:01 -0400 Received: by mail-qv1-xf32.google.com with SMTP id js7so3505075qvb.4 for ; Thu, 12 Aug 2021 09:53:54 -0700 (PDT) Received: from localhost.localdomain (bras-base-stsvon1503w-grc-22-142-114-143-47.dsl.bell.ca. [142.114.143.47]) by smtp.googlemail.com with ESMTPSA id c69sm1714864qkg.1.2021.08.12.09.53.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Aug 2021 09:53:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Kyjpq/o+nyGQCVVXepRD7yL60Hllj+cbnk5hSa+ob8U=; b=LPPb53qfW5CrHK29wAv3kd9TlWYA0+BrAZeghHdqquKi4DmCkrhqa58y4Wa3daQHQd mlXZ9fIgacLxuv1sfOOdEC/P3qiJkABZKCs7mxKgA4JNr2bukgBPkKDeikpbW9ri+lhK WYXuZsE67EkXlFo96SxQvFJ0s2kg53en1f3VdB6RFDpoO6FLQfwSy7kGp/x24zUqgGMC JpTpQX/Vrfh6wN9f7exVPe5lrHFhHg/rCrYJOvu0f1uNxFY+QPK1uaLAtU6lKn7+98Ss GA3pCnPs6W3Sm+M4Cg9ypZ21W1ZBN+IX1tt4e2+4O6nVCGKqjq3oKgTaeNGsFIHYKCGp Zicw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Kyjpq/o+nyGQCVVXepRD7yL60Hllj+cbnk5hSa+ob8U=; b=F/YetPqEaom21bEiRSMIJXxSWA+lNMSCjJDk2NZgdejUH6fImIgmmIBuRYFaGXQTBM nnyFTK60gdB6Z0nGafW5MbaXRh/qu35EjrKlS3/T/XZ8V5wDc8RCYI6p+ClmN/zLHSp5 cEksI+bTSSGJwVViERoXe/KokyjnUFB/is22xttXEokBOD21kB65yUqMr+rWYy6uJFya SNBUTML2dmZI60pFOp+rn65LIORutxMMcHAkYUAM4C7IvAVi+QfaWRkQnXNEaVG71WMk ySB6yWgQ8yahJ3YZYr9y0psCVtM1t8TqsXsSusKJrjyiAS0tQgIxjH9QU0E/pZ05P9Rh 2oIA== X-Gm-Message-State: AOAM530+knAS95gcvFRWexljGwyeU1ash0Ovro3N6p6T9U5TlYNwhmX+ 8LhL66SpQdTSMwCmsPvLklibcw== X-Google-Smtp-Source: ABdhPJzJI72sl+euIhdQGwBzzeRDUqJ4s5tmRAYByD/DCTlvVmE/V5FJPZsARav3XkoMAmvXaElmYQ== X-Received: by 2002:a0c:fe6a:: with SMTP id b10mr4896533qvv.6.1628787233247; Thu, 12 Aug 2021 09:53:53 -0700 (PDT) From: Shashi Mallela To: peter.maydell@linaro.org, leif@nuviainc.com, rad@semihalf.com, mst@redhat.com, imammedo@redhat.com Subject: [PATCH v8 09/10] hw/arm/virt: add ITS support in virt GIC Date: Thu, 12 Aug 2021 12:53:40 -0400 Message-Id: <20210812165341.40784-10-shashi.mallela@linaro.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210812165341.40784-1-shashi.mallela@linaro.org> References: <20210812165341.40784-1-shashi.mallela@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::f32; envelope-from=shashi.mallela@linaro.org; helo=mail-qv1-xf32.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: eric.auger@redhat.com, qemu-arm@nongnu.org, qemu-devel@nongnu.org, narmstrong@baylibre.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1628787921044100001 Content-Type: text/plain; charset="utf-8" Included creation of ITS as part of virt platform GIC initialization. This Emulated ITS model now co-exists with kvm ITS and is enabled in absence of kvm irq kernel support in a platform. Signed-off-by: Shashi Mallela Reviewed-by: Peter Maydell --- hw/arm/virt.c | 28 ++++++++++++++++++++++++++-- include/hw/arm/virt.h | 2 ++ target/arm/kvm_arm.h | 4 ++-- 3 files changed, 30 insertions(+), 4 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 81eda46b0b..3cea2aa039 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -583,6 +583,12 @@ static void create_its(VirtMachineState *vms) const char *itsclass =3D its_class_name(); DeviceState *dev; =20 + if (!strcmp(itsclass, "arm-gicv3-its")) { + if (!vms->tcg_its) { + itsclass =3D NULL; + } + } + if (!itsclass) { /* Do nothing if not supported */ return; @@ -620,7 +626,7 @@ static void create_v2m(VirtMachineState *vms) vms->msi_controller =3D VIRT_MSI_CTRL_GICV2M; } =20 -static void create_gic(VirtMachineState *vms) +static void create_gic(VirtMachineState *vms, MemoryRegion *mem) { MachineState *ms =3D MACHINE(vms); /* We create a standalone GIC */ @@ -654,6 +660,14 @@ static void create_gic(VirtMachineState *vms) nb_redist_regions); qdev_prop_set_uint32(vms->gic, "redist-region-count[0]", redist0_c= ount); =20 + if (!kvm_irqchip_in_kernel()) { + if (vms->tcg_its) { + object_property_set_link(OBJECT(vms->gic), "sysmem", + OBJECT(mem), &error_fatal); + qdev_prop_set_bit(vms->gic, "has-lpi", true); + } + } + if (nb_redist_regions =3D=3D 2) { uint32_t redist1_capacity =3D vms->memmap[VIRT_HIGH_GIC_REDIST2].size / GICV3_REDIST= _SIZE; @@ -2043,7 +2057,7 @@ static void machvirt_init(MachineState *machine) =20 virt_flash_fdt(vms, sysmem, secure_sysmem ?: sysmem); =20 - create_gic(vms); + create_gic(vms, sysmem); =20 virt_cpu_post_init(vms, sysmem); =20 @@ -2746,6 +2760,12 @@ static void virt_instance_init(Object *obj) } else { /* Default allows ITS instantiation */ vms->its =3D true; + + if (vmc->no_tcg_its) { + vms->tcg_its =3D false; + } else { + vms->tcg_its =3D true; + } } =20 /* Default disallows iommu instantiation */ @@ -2790,6 +2810,10 @@ type_init(machvirt_machine_init); =20 static void virt_machine_6_1_options(MachineClass *mc) { + VirtMachineClass *vmc =3D VIRT_MACHINE_CLASS(OBJECT_CLASS(mc)); + + /* qemu ITS was introduced with 6.2 */ + vmc->no_tcg_its =3D true; } DEFINE_VIRT_MACHINE_AS_LATEST(6, 1) =20 diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h index 9661c46699..b461b8d261 100644 --- a/include/hw/arm/virt.h +++ b/include/hw/arm/virt.h @@ -120,6 +120,7 @@ struct VirtMachineClass { MachineClass parent; bool disallow_affinity_adjustment; bool no_its; + bool no_tcg_its; bool no_pmu; bool claim_edge_triggered_timers; bool smbios_old_sys_ver; @@ -141,6 +142,7 @@ struct VirtMachineState { bool highmem; bool highmem_ecam; bool its; + bool tcg_its; bool virt; bool ras; bool mte; diff --git a/target/arm/kvm_arm.h b/target/arm/kvm_arm.h index 34f8daa377..0613454975 100644 --- a/target/arm/kvm_arm.h +++ b/target/arm/kvm_arm.h @@ -525,8 +525,8 @@ static inline const char *its_class_name(void) /* KVM implementation requires this capability */ return kvm_direct_msi_enabled() ? "arm-its-kvm" : NULL; } else { - /* Software emulation is not implemented yet */ - return NULL; + /* Software emulation based model */ + return "arm-gicv3-its"; } } =20 --=20 2.27.0 From nobody Sun May 19 20:02:56 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1628787797057377.4401510732429; Thu, 12 Aug 2021 10:03:17 -0700 (PDT) Received: from localhost ([::1]:47794 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mEE6t-0008EH-AX for importer@patchew.org; Thu, 12 Aug 2021 13:03:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50946) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mEDxy-00080o-Uv for qemu-devel@nongnu.org; Thu, 12 Aug 2021 12:54:02 -0400 Received: from mail-qk1-x72b.google.com ([2607:f8b0:4864:20::72b]:44799) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mEDxs-00065Y-2x for qemu-devel@nongnu.org; Thu, 12 Aug 2021 12:54:02 -0400 Received: by mail-qk1-x72b.google.com with SMTP id t3so7341351qkg.11 for ; Thu, 12 Aug 2021 09:53:55 -0700 (PDT) Received: from localhost.localdomain (bras-base-stsvon1503w-grc-22-142-114-143-47.dsl.bell.ca. [142.114.143.47]) by smtp.googlemail.com with ESMTPSA id c69sm1714864qkg.1.2021.08.12.09.53.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Aug 2021 09:53:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SJCUwL5f6au4sf1X95Z6GuyjBnhdb6xqOI0T8mpWiLg=; b=hRwXxtxIzPGPq8lH7irNhpscQwbDpqFXdYOD0gtTtNsSKwSnGmJxets0Nc6hCeSJa6 Xesv2j43X6jT1OVLRaIik8FyBZuannpmMvO9+txSr3GozesKEJgUGQaCr7KQgNxBDJ50 5FzuzQDt0/+vHYm7+IouZGYkcTovTryqaYigCKf/rP1RHcQF34CKddDY/Awc/rSIiyM5 n+P2rGk60AvWGShH8Tz5d4BXqGlMg/6qOZVVM0aQLtK6dOiZr58c1O02wxiEuVt2NptP 1KJbYUmXIPBZ0W9ICCprcjXdBl54sut+SohY7zY3z7CztQzM/JGLpcoC5Krcb2jtJEoK GwWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=SJCUwL5f6au4sf1X95Z6GuyjBnhdb6xqOI0T8mpWiLg=; b=sF0MnWyWgc08htccNvKuoRhgrSMMe3Tcog3xCxIf4jrunXuRKFLJ3rVcJudDJJ7eYB lAM63wOn1GWC+icSuv4WOhxQBEyVnBUHsjPeeUxzAyPXnvV8M1PtuGfUZSShK9Oh6t7n qtg4qc+87c/QUNIqhPvUTndIMe/YxBSUYGB7nTclbJHRFx8cVRQ475oVCK1Vi07zhRwz 7xDAR1E/Mx7E3F+76MoUpubh+z6tJXeuaIUIpKeZbZGSgdhuJs6p6401kFz6MYzruYvK 3Xn137UMFghu3vsRqFoxddwxV8U7NnuhdNdZmqipjtAJ+0dWSlvOADeXbhNWN4xVfFVI AU6g== X-Gm-Message-State: AOAM531RnxHm5dWwPwho1K9nTxI9Ze+NvrvYuKkL7m7A+8EGwnX6CvCy gZ5J2E3oOIv4EeI+ZHxsptZGxXdmUCr8Bg== X-Google-Smtp-Source: ABdhPJwcT8F8cuIJmQT9b8sEEDuX772Ry91ccoKFllpRsGZNMgq8dWkSfTXmRE8aIRe69t7BWktCXQ== X-Received: by 2002:a37:8406:: with SMTP id g6mr5627045qkd.105.1628787234115; Thu, 12 Aug 2021 09:53:54 -0700 (PDT) From: Shashi Mallela To: peter.maydell@linaro.org, leif@nuviainc.com, rad@semihalf.com, mst@redhat.com, imammedo@redhat.com Subject: [PATCH v8 10/10] tests/data/acpi/virt: Update IORT files for ITS Date: Thu, 12 Aug 2021 12:53:41 -0400 Message-Id: <20210812165341.40784-11-shashi.mallela@linaro.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210812165341.40784-1-shashi.mallela@linaro.org> References: <20210812165341.40784-1-shashi.mallela@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::72b; envelope-from=shashi.mallela@linaro.org; helo=mail-qk1-x72b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: eric.auger@redhat.com, qemu-arm@nongnu.org, qemu-devel@nongnu.org, narmstrong@baylibre.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1628787797949100001 Content-Type: text/plain; charset="utf-8" Updated expected IORT files applicable with latest GICv3 ITS changes. Full diff of new file disassembly: /* * Intel ACPI Component Architecture * AML/ASL+ Disassembler version 20180629 (64-bit version) * Copyright (c) 2000 - 2018 Intel Corporation * * Disassembly of tests/data/acpi/virt/IORT.pxb, Tue Jun 29 17:35:38 2021 * * ACPI Data Table [IORT] * * Format: [HexOffset DecimalOffset ByteLength] FieldName : FieldValue */ [000h 0000 4] Signature : "IORT" [IO Remapping Tabl= e] [004h 0004 4] Table Length : 0000007C [008h 0008 1] Revision : 00 [009h 0009 1] Checksum : 07 [00Ah 0010 6] Oem ID : "BOCHS " [010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001 [024h 0036 4] Node Count : 00000002 [028h 0040 4] Node Offset : 00000030 [02Ch 0044 4] Reserved : 00000000 [030h 0048 1] Type : 00 [031h 0049 2] Length : 0018 [033h 0051 1] Revision : 00 [034h 0052 4] Reserved : 00000000 [038h 0056 4] Mapping Count : 00000000 [03Ch 0060 4] Mapping Offset : 00000000 [040h 0064 4] ItsCount : 00000001 [044h 0068 4] Identifiers : 00000000 [048h 0072 1] Type : 02 [049h 0073 2] Length : 0034 [04Bh 0075 1] Revision : 00 [04Ch 0076 4] Reserved : 00000000 [050h 0080 4] Mapping Count : 00000001 [054h 0084 4] Mapping Offset : 00000020 [058h 0088 8] Memory Properties : [IORT Memory Access Properti= es] [058h 0088 4] Cache Coherency : 00000001 [05Ch 0092 1] Hints (decoded below) : 00 Transient : 0 Write Allocate : 0 Read Allocate : 0 Override : 0 [05Dh 0093 2] Reserved : 0000 [05Fh 0095 1] Memory Flags (decoded below) : 03 Coherency : 1 Device Attribute : 1 [060h 0096 4] ATS Attribute : 00000000 [064h 0100 4] PCI Segment Number : 00000000 [068h 0104 1] Memory Size Limit : 00 [069h 0105 3] Reserved : 000000 [068h 0104 4] Input base : 00000000 [06Ch 0108 4] ID Count : 0000FFFF [070h 0112 4] Output Base : 00000000 [074h 0116 4] Output Reference : 00000030 [078h 0120 4] Flags (decoded below) : 00000000 Single Mapping : 0 Raw Table Data: Length 124 (0x7C) 0000: 49 4F 52 54 7C 00 00 00 00 07 42 4F 43 48 53 20 // IORT|.....BOC= HS 0010: 42 58 50 43 20 20 20 20 01 00 00 00 42 58 50 43 // BXPC ....B= XPC 0020: 01 00 00 00 02 00 00 00 30 00 00 00 00 00 00 00 // ........0....= ... 0030: 00 18 00 00 00 00 00 00 00 00 00 00 00 00 00 00 // .............= ... 0040: 01 00 00 00 00 00 00 00 02 34 00 00 00 00 00 00 // .........4...= ... 0050: 01 00 00 00 20 00 00 00 01 00 00 00 00 00 00 03 // .... ........= ... 0060: 00 00 00 00 00 00 00 00 00 00 00 00 FF FF 00 00 // .............= ... 0070: 00 00 00 00 30 00 00 00 00 00 00 00 // ....0....... Signed-off-by: Shashi Mallela Acked-by: Igor Mammedov Reviewed-by: Peter Maydell --- tests/data/acpi/virt/IORT | Bin 0 -> 124 bytes tests/data/acpi/virt/IORT.memhp | Bin 0 -> 124 bytes tests/data/acpi/virt/IORT.numamem | Bin 0 -> 124 bytes tests/data/acpi/virt/IORT.pxb | Bin 0 -> 124 bytes tests/qtest/bios-tables-test-allowed-diff.h | 4 ---- 5 files changed, 4 deletions(-) diff --git a/tests/data/acpi/virt/IORT b/tests/data/acpi/virt/IORT index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..521acefe9ba66706c5607321a82= d330586f3f280 100644 GIT binary patch literal 124 zcmebD4+^Pa00MR=3De`k+i1*eDrX9XZ&1PX!JAesq?4S*O7Bw!2(4Uz`|CKCt^;wu0# QRGb+i3L*dhhtM#y0PN=3Dp0RR91 literal 0 HcmV?d00001 diff --git a/tests/data/acpi/virt/IORT.memhp b/tests/data/acpi/virt/IORT.me= mhp index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..521acefe9ba66706c5607321a82= d330586f3f280 100644 GIT binary patch literal 124 zcmebD4+^Pa00MR=3De`k+i1*eDrX9XZ&1PX!JAesq?4S*O7Bw!2(4Uz`|CKCt^;wu0# QRGb+i3L*dhhtM#y0PN=3Dp0RR91 literal 0 HcmV?d00001 diff --git a/tests/data/acpi/virt/IORT.numamem b/tests/data/acpi/virt/IORT.= numamem index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..521acefe9ba66706c5607321a82= d330586f3f280 100644 GIT binary patch literal 124 zcmebD4+^Pa00MR=3De`k+i1*eDrX9XZ&1PX!JAesq?4S*O7Bw!2(4Uz`|CKCt^;wu0# QRGb+i3L*dhhtM#y0PN=3Dp0RR91 literal 0 HcmV?d00001 diff --git a/tests/data/acpi/virt/IORT.pxb b/tests/data/acpi/virt/IORT.pxb index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..521acefe9ba66706c5607321a82= d330586f3f280 100644 GIT binary patch literal 124 zcmebD4+^Pa00MR=3De`k+i1*eDrX9XZ&1PX!JAesq?4S*O7Bw!2(4Uz`|CKCt^;wu0# QRGb+i3L*dhhtM#y0PN=3Dp0RR91 literal 0 HcmV?d00001 diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios= -tables-test-allowed-diff.h index 2ef211df59..dfb8523c8b 100644 --- a/tests/qtest/bios-tables-test-allowed-diff.h +++ b/tests/qtest/bios-tables-test-allowed-diff.h @@ -1,5 +1 @@ /* List of comma-separated changed AML files to ignore */ -"tests/data/acpi/virt/IORT", -"tests/data/acpi/virt/IORT.memhp", -"tests/data/acpi/virt/IORT.numamem", -"tests/data/acpi/virt/IORT.pxb", --=20 2.27.0