From nobody Mon Apr 29 00:50:20 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 1631284944785364.4393138802627; Fri, 10 Sep 2021 07:42:24 -0700 (PDT) Received: from localhost ([::1]:59922 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mOhjT-0004rx-DB for importer@patchew.org; Fri, 10 Sep 2021 10:42:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44440) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mOhh8-00023c-0b for qemu-devel@nongnu.org; Fri, 10 Sep 2021 10:39:58 -0400 Received: from mail-qt1-x833.google.com ([2607:f8b0:4864:20::833]:41475) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mOhh4-0002rM-VO for qemu-devel@nongnu.org; Fri, 10 Sep 2021 10:39:57 -0400 Received: by mail-qt1-x833.google.com with SMTP id u21so1587732qtw.8 for ; Fri, 10 Sep 2021 07:39: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 a9sm3827042qkk.82.2021.09.10.07.39.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Sep 2021 07:39: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=ySaRPKCabwGZ0xzWheArrkEmcH15rMQ/W2tjVfoSaf8=; b=sDo/0d5zEC7nulCXf/KWqERYUSpKzgKRXX93WIPzYsdEl5nSuKe1ZLZocl+mQbQpeN xZhqoZMohZTuuY7snkl+cuPBXaOhJngA2nZBfAGq7nQu6Ci3tR6XkcDUJ+QAGr/cffuc WXVM6CgZzmjZqLfIB+UfoE2DWZy/ENZVFPoe/pkRR23P3ulN8BpV/VCcNUFXL+cETvae xJc7GrnvzKq9bhaU2KciR9Gy8FTIOS/wO5vbBuvk/t9ppolI6k3bmGqAPWO9z8oPrX+6 FxN9lkmqKepk3Et5P/Ciu4yvnmhYhEu14qvFF+WxYoxMnKLkdvLF+hmYKu3eHE7UuaQO TFvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ySaRPKCabwGZ0xzWheArrkEmcH15rMQ/W2tjVfoSaf8=; b=f/78t4hotU9GWtb4SDsMvEjo5TVwrmQVPtgPx5g7LhbJBfjjS7mKtvUKDsaOynMxO6 JNNmZbc8d1uwOXF6Uovd4bZmbC24nk+zgGM0Ah/GgZSiw48vvX9aB14tNxy9EvGSd+AG nsny3lovghnjpwcRuFAUYq0pqACP/jJRwZSYNjSmCRqNpXfUeDsdY1W/apkn5IdnX9U3 uHTNZxavlWXMPmDNalYZgtW5ISdT8Y0Qh+pFMmcM2GaJltIQYr7PPpv06y/pZgZSxklR rDbLEKVAFc4tG3R2r+9xhdPFEw5D5pkO58ooEGnLrNeAyoq7XZrZc3Q1IMI2wlgrScG3 JEDg== X-Gm-Message-State: AOAM532qX1HPCNFAjfY7od4u0QSNr4NZd/jfasUziwzUyhRTE1fJ8t/3 o6MepC/0oCklcYn1ikaxa9ULFw== X-Google-Smtp-Source: ABdhPJwCICq9kSrb+YcEHdY9FatP3irykk9kqdB9AeBxMGSbXx7suHHHTyISGd8E47i2Troenl4RuQ== X-Received: by 2002:a05:622a:10c:: with SMTP id u12mr8292522qtw.303.1631284793918; Fri, 10 Sep 2021 07:39: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 v9 1/9] hw/intc: GICv3 ITS initial framework Date: Fri, 10 Sep 2021 10:39:43 -0400 Message-Id: <20210910143951.92242-2-shashi.mallela@linaro.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210910143951.92242-1-shashi.mallela@linaro.org> References: <20210910143951.92242-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::833; envelope-from=shashi.mallela@linaro.org; helo=mail-qt1-x833.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: 1631284946267100001 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 | 241 +++++++++++++++++++++++++ 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, 342 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..83ece7c4c1 --- /dev/null +++ b/hw/intc/arm_gicv3_its.c @@ -0,0 +1,241 @@ +/* + * 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) +{ + return MEMTX_OK; +} + +static bool its_writel(GICv3ITSState *s, hwaddr offset, + uint64_t value, MemTxAttrs attrs) +{ + bool result =3D true; + + return result; +} + +static bool its_readl(GICv3ITSState *s, hwaddr offset, + uint64_t *data, MemTxAttrs attrs) +{ + bool result =3D true; + + return result; +} + +static bool its_writell(GICv3ITSState *s, hwaddr offset, + uint64_t value, MemTxAttrs attrs) +{ + bool result =3D true; + + return result; +} + +static bool its_readll(GICv3ITSState *s, hwaddr offset, + uint64_t *data, MemTxAttrs attrs) +{ + bool result =3D true; + + return result; +} + +static MemTxResult gicv3_its_read(void *opaque, hwaddr offset, uint64_t *d= ata, + unsigned size, MemTxAttrs attrs) +{ + GICv3ITSState *s =3D (GICv3ITSState *)opaque; + bool 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 false; + break; + } + + if (!result) { + 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 false 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. + */ + *data =3D 0; + } + return MEMTX_OK; +} + +static MemTxResult gicv3_its_write(void *opaque, hwaddr offset, uint64_t d= ata, + unsigned size, MemTxAttrs attrs) +{ + GICv3ITSState *s =3D (GICv3ITSState *)opaque; + bool 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 false; + break; + } + + if (!result) { + 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 false 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. + */ + } + return MEMTX_OK; +} + +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 Mon Apr 29 00:50:20 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 1631284962591265.22495890276775; Fri, 10 Sep 2021 07:42:42 -0700 (PDT) Received: from localhost ([::1]:32892 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mOhjl-0005gt-8v for importer@patchew.org; Fri, 10 Sep 2021 10:42:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44458) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mOhh9-00025W-62 for qemu-devel@nongnu.org; Fri, 10 Sep 2021 10:39:59 -0400 Received: from mail-qt1-x82b.google.com ([2607:f8b0:4864:20::82b]:46762) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mOhh5-0002sE-QD for qemu-devel@nongnu.org; Fri, 10 Sep 2021 10:39:58 -0400 Received: by mail-qt1-x82b.google.com with SMTP id x5so1567461qtq.13 for ; Fri, 10 Sep 2021 07:39: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 a9sm3827042qkk.82.2021.09.10.07.39.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Sep 2021 07:39:54 -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=VEJlChltItFUBMRm8OIekOZfLy6CqqjC++HhZdAufrg=; b=nQ4fQjYt0lPk0QQ+2Uj4erL//TPJprYE8JjH5hxx2sMb4Y/vkEyVS6COfE8rv/dWcs rnN7lnZh/sWQMI8CDbSGPDysgBnu2W0YO4e+dYqy/4rb9K0ZJq/WoUXq9vmsiU41TiHr iEcP9djqjb+OGm2rrFTvLc3dM2LHQTrKpyWLTMMu/GZZ+cvPK4sXwGlyxYS5mJ10IPSH Aj022J+9ZB3SFB2cBNWwUK3OVBlGTqKsn5ZZFulHN+qkaPCiwAthtDLWs5m5/k4Fty/9 azjICClC3XBttGZPOI8x2/4/NWfotnnYSBoDreZb/+Bp0syYPifs7n72y+mk/iFT3CAN ARiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=VEJlChltItFUBMRm8OIekOZfLy6CqqjC++HhZdAufrg=; b=S3bw1NocqBXr8KyCy/WS5hX5/XqSGz4vxZFFyLBk0sxbFjuvFctwLW3X2gE9wPnvW1 n7lMFC0X5UMEGL35nRBZKH9hQTNSdODY2U1XrnmyunwWTJiMKXiQo1Zobhm0n5SUbaTD bO8GR80JQxQ03L6A7grhyzIFDaRLA2MGAT3o3LKOdn0hcthy0iKltJCkgMQMXuqTIe5d cSWgxCZ7Dxas1BBkCh7x6SihSPGxx8xoFChepA/6HFoZKKNOyuUCfUZxrLZwcPcE0YDx W2eMukoSL02a5YehOMrtPkGWDVRUkVUoWHMsj8giln5leXWh5sRspKa2Ga5jyNyOl48u dOxw== X-Gm-Message-State: AOAM530LtaId8YcocP5Q1fj4UYaNN0qTLxIQ/Vn6hD4I8uwq01YCk0IN U7N4ncr7orAKILONZBVJIw7nOg== X-Google-Smtp-Source: ABdhPJzpmcQ6cn3c12JykGUxjkRpo52BYvZSDI7aLnS4D/hOTzfcIVLi2yEe/KFmN7c5yuXhLrohYQ== X-Received: by 2002:ac8:664e:: with SMTP id j14mr8220384qtp.194.1631284794769; Fri, 10 Sep 2021 07:39: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 v9 2/9] hw/intc: GICv3 ITS register definitions added Date: Fri, 10 Sep 2021 10:39:44 -0400 Message-Id: <20210910143951.92242-3-shashi.mallela@linaro.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210910143951.92242-1-shashi.mallela@linaro.org> References: <20210910143951.92242-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::82b; envelope-from=shashi.mallela@linaro.org; helo=mail-qt1-x82b.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=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: 1631284964754100005 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 83ece7c4c1..8234939ccc 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) @@ -40,7 +194,99 @@ static bool its_writel(GICv3ITSState *s, hwaddr offset, uint64_t value, MemTxAttrs attrs) { bool result =3D true; + 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 false; + break; + } return result; } =20 @@ -48,7 +294,55 @@ static bool its_readl(GICv3ITSState *s, hwaddr offset, uint64_t *data, MemTxAttrs attrs) { bool result =3D true; + 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 false; + break; + } return result; } =20 @@ -56,7 +350,54 @@ static bool its_writell(GICv3ITSState *s, hwaddr offset, uint64_t value, MemTxAttrs attrs) { bool result =3D true; + 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 false; + break; + } return result; } =20 @@ -64,7 +405,29 @@ static bool its_readll(GICv3ITSState *s, hwaddr offset, uint64_t *data, MemTxAttrs attrs) { bool result =3D true; + 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 false; + break; + } return result; } =20 @@ -166,6 +529,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); @@ -209,6 +575,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 *), @@ -219,10 +593,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 Mon Apr 29 00:50:20 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 1631285227199967.4230634929543; Fri, 10 Sep 2021 07:47:07 -0700 (PDT) Received: from localhost ([::1]:43830 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mOho2-0004dn-4U for importer@patchew.org; Fri, 10 Sep 2021 10:47:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44536) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mOhhC-0002AW-5A for qemu-devel@nongnu.org; Fri, 10 Sep 2021 10:40:02 -0400 Received: from mail-qk1-x732.google.com ([2607:f8b0:4864:20::732]:44633) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mOhh6-0002tC-JQ for qemu-devel@nongnu.org; Fri, 10 Sep 2021 10:40:01 -0400 Received: by mail-qk1-x732.google.com with SMTP id c10so2137980qko.11 for ; Fri, 10 Sep 2021 07:39:56 -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 a9sm3827042qkk.82.2021.09.10.07.39.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Sep 2021 07:39:55 -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=tsF66rJwNcN6VJjte4QNI97DpDXbLDC5sF9NGioGWQ0=; b=zU2VNxBnWpTCsuKYGAHZXbvOpKq828mXF70iUK+WvcC3LmL/lS9txnEUeCe5OE3bDC a4U39SEVSDMx2e5GK5d9wnvCrUC8V9Oc+L6ABq3v5fiUkRLnm5YtkuXmPRs8trenmGMc qCx608J5vvvXGqoM3IMLp6az8ZnK7Ruq5gr82mSGvCXLYkaTabeq6n3/uiRInDLIp0ru HRto4I1dbiex1ugHm+FM93fHZ8VONdGgujGKRibDlLU2xsNX7YJaz5ZZxHzcXekyQ4PY dHrwmpvK1/B+RQdijPS2vriaDukipeU/7rmT7rHfYIi072Sn+IuFO0ogze+efcWl15rM P65A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=tsF66rJwNcN6VJjte4QNI97DpDXbLDC5sF9NGioGWQ0=; b=QWKY2cIWxJjRW0N6I6i/2ekxUU3+LP3HmZMP9WJuj+vgT7cYNTfaNiVnqq/yBKjHRh BRLe2LPk38kNDyD6CC74pvI7vgxXp0ubHZGEE1E47+LtH8Sl5tJDscxMoydr+ReIzk0j qK8oik+LAus6Js+ZBwLfqvPzYUSQ4n5Ehitt2ex2zQO12gMdiB6Anpa6ktf3sOgln/8P Uf73Z4ayrOMCZR0Y753pOy4fGmxvDuZOMpLGdCAxu4dS/hdCAIcIvxsXwhyqgJHWypmy 9Lrj9AgcBOW6Iggm8WuCRXnK1NZSR5JoBEL0DFMQz87NWsI2ZVzUeISx1gOBio4X/vrn xs2g== X-Gm-Message-State: AOAM532Vjx5dz15GX8dOqmDKv4o09KFNUicW/q8o4gXBi+sw18F0cFi3 hTFBoZRmCkXg1Trm1OY2EaUC3zaZc/RqYQ== X-Google-Smtp-Source: ABdhPJwxZQ93YXGtfz4hoUyUrxyxE14zbRowHHvmNAschUhkbq6EGLCtr3ogWHZWVaJXyCveYx0EkA== X-Received: by 2002:a05:620a:675:: with SMTP id a21mr7853539qkh.421.1631284795610; Fri, 10 Sep 2021 07:39:55 -0700 (PDT) From: Shashi Mallela To: peter.maydell@linaro.org, leif@nuviainc.com, rad@semihalf.com, mst@redhat.com, imammedo@redhat.com Subject: [PATCH v9 3/9] hw/intc: GICv3 ITS command queue framework Date: Fri, 10 Sep 2021 10:39:45 -0400 Message-Id: <20210910143951.92242-4-shashi.mallela@linaro.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210910143951.92242-1-shashi.mallela@linaro.org> References: <20210910143951.92242-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::732; envelope-from=shashi.mallela@linaro.org; helo=mail-qk1-x732.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: 1631285228717100001 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 | 319 +++++++++++++++++++++++++++++++++++++++ hw/intc/gicv3_internal.h | 40 +++++ 2 files changed, 359 insertions(+) diff --git a/hw/intc/arm_gicv3_its.c b/hw/intc/arm_gicv3_its.c index 8234939ccc..fcd152271a 100644 --- a/hw/intc/arm_gicv3_its.c +++ b/hw/intc/arm_gicv3_its.c @@ -50,6 +50,318 @@ static uint64_t baser_base_addr(uint64_t value, uint32_= t page_sz) return result; } =20 +static bool 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 true; + } + + 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 false; + } + + 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); + } + if (res !=3D MEMTX_OK) { + return false; + } else { + return true; + } +} + +static bool 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; + bool result =3D false; + 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 result; + } + + 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 { + result =3D update_cte(s, icid, valid, rdbase); + } + + return result; +} + +static bool 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 true; + } + + /* + * 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 false; + } + + 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); + } + if (res !=3D MEMTX_OK) { + return false; + } else { + return true; + } +} + +static bool 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; + bool result =3D false; + + 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 result; + } + + 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 result; + } + + 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 { + result =3D update_dte(s, devid, valid, size, itt_addr); + } + + return result; +} + +/* + * 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; + bool result =3D true; + 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); + if (res !=3D MEMTX_OK) { + result =3D false; + } + 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: + result =3D process_mapd(s, data, cq_offset); + break; + case GITS_CMD_MAPC: + result =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 (result) { + 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. @@ -204,6 +516,7 @@ static bool 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: @@ -231,6 +544,9 @@ static bool 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); @@ -377,6 +693,9 @@ static bool 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 Mon Apr 29 00:50:20 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 1631285076154659.662112937304; Fri, 10 Sep 2021 07:44:36 -0700 (PDT) Received: from localhost ([::1]:39320 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mOhlb-0001V9-1j for importer@patchew.org; Fri, 10 Sep 2021 10:44:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44502) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mOhhA-000288-GK for qemu-devel@nongnu.org; Fri, 10 Sep 2021 10:40:00 -0400 Received: from mail-qt1-x82f.google.com ([2607:f8b0:4864:20::82f]:45681) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mOhh7-0002u7-MY for qemu-devel@nongnu.org; Fri, 10 Sep 2021 10:40:00 -0400 Received: by mail-qt1-x82f.google.com with SMTP id s32so1565178qtc.12 for ; Fri, 10 Sep 2021 07:39:57 -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 a9sm3827042qkk.82.2021.09.10.07.39.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Sep 2021 07:39:56 -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=RKp2SFWbzHpFPUXOCtQc9tzMBeLL7iyTO200ciPH24w=; b=C99JU/Jn9x2LgTwwC08QIfNRmudinImylfC0F7rmR69LJhmxmJcMqERHEy02y9CZNP /ju1fWJdaC2x6NginvXhod8WrodoXMDurjT4JuiQQx6jgz3P21zlA80/ETdQVXqzE9G9 1Nyct6Td/KCvOLIVYIlKbIvhSavvOgfAjTJj4WGHUjNrpVMKXTNpLxAyAPQ7hFYeStGv 2qr+2r1UjqogZhLOZ7wz014UbhHesmozf2+zKBaPPSxLlLZh/vCSPgvO5m026etm3weB K8aX8fpo2RlQ3Np1sy6ApS6074blF5GFOY3LAduikfocuqUgyGgPbAuMUQGHT7MUEfzm JvSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=RKp2SFWbzHpFPUXOCtQc9tzMBeLL7iyTO200ciPH24w=; b=cneFdEFId9pD0jI7NITHz3Z59Li9CsIM83WNIKGArWT3bQMhqGe4Sy7IOlzRavLg5N QigarUGboXBESAV5kyLZB9vtNrz3AkHorU8o/R0i/AumNrhxLDOIryFl4dAAn3y8E/cE ZjsHJ3szPIBI0JlpN0AQr9dRJfOeFydQfOOd/UPwfdvN1Z/UC8l8g9/Dxtv0XlhONGmj UM3UTP9LhWdzxNR/gQQuu2z1O1vXsrgapvDAdcBDCTsLM8TqAv1H0mCM4I84K//9VYxF 8c6N3A2ztjj+q0OJ4jH4IpvoCLKWxXhVWP85I/pOmqxAoYWpp6YWNwS+8Es8GA7RLLWB fxqA== X-Gm-Message-State: AOAM530kNrYQFgonhX0EXiz+YknRNkYWcwPBbxa+I1HAunciHiobe4uf xm6naFe1YEsUS2jSERTH7q1TnJ5psNVH8Q== X-Google-Smtp-Source: ABdhPJw4L+EXYOD1UerCrrGbwZ+C7HsFQb1AD2o9SrtfQ+AO49kdL02VxI5iTRsrcltKmgDsaER4Jw== X-Received: by 2002:ac8:5b8d:: with SMTP id a13mr8171396qta.130.1631284796656; Fri, 10 Sep 2021 07:39:56 -0700 (PDT) From: Shashi Mallela To: peter.maydell@linaro.org, leif@nuviainc.com, rad@semihalf.com, mst@redhat.com, imammedo@redhat.com Subject: [PATCH v9 4/9] hw/intc: GICv3 ITS Command processing Date: Fri, 10 Sep 2021 10:39:46 -0400 Message-Id: <20210910143951.92242-5-shashi.mallela@linaro.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210910143951.92242-1-shashi.mallela@linaro.org> References: <20210910143951.92242-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::82f; envelope-from=shashi.mallela@linaro.org; helo=mail-qt1-x82f.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: 1631285076619100001 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 --- hw/intc/arm_gicv3_its.c | 365 ++++++++++++++++++++++++++++- hw/intc/gicv3_internal.h | 12 + include/hw/intc/arm_gicv3_common.h | 2 + 3 files changed, 378 insertions(+), 1 deletion(-) diff --git a/hw/intc/arm_gicv3_its.c b/hw/intc/arm_gicv3_its.c index fcd152271a..03c6800997 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,329 @@ 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 bool 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); + } + if (res !=3D MEMTX_OK) { + return false; + } else { + return true; + } +} + +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 bool process_its_cmd(GICv3ITSState *s, uint64_t value, uint32_t off= set, + 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; + bool result =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 result; + } + + eventid =3D (value & EVENTID_MASK); + + dte =3D get_dte(s, devid, &res); + + if (res !=3D MEMTX_OK) { + return result; + } + 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 result; + } + + if (ite_valid) { + cte_valid =3D get_cte(s, icid, &cte, &res); + } + + if (res !=3D MEMTX_OK) { + return result; + } + } + + 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 */ + result =3D update_ite(s, eventid, dte, ite); + } + } + + return result; +} + +static bool process_mapti(GICv3ITSState *s, uint64_t value, uint32_t offse= t, + 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; + bool result =3D false; + + 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 result; + } + + 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 result; + } + + icid =3D value & ICID_MASK; + + dte =3D get_dte(s, devid, &res); + + if (res !=3D MEMTX_OK) { + return result; + } + 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; + + result =3D update_ite(s, eventid, dte, ite); + } + + return result; +} + static bool update_cte(GICv3ITSState *s, uint16_t icid, bool valid, uint64_t rdbase) { @@ -316,8 +655,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: /* @@ -334,10 +675,13 @@ static void process_cmdq(GICv3ITSState *s) result =3D process_mapc(s, cq_offset); break; case GITS_CMD_MAPTI: + result =3D process_mapti(s, data, cq_offset, false); break; case GITS_CMD_MAPI: + result =3D process_mapti(s, data, cq_offset, true); break; case GITS_CMD_DISCARD: + result =3D process_its_cmd(s, data, cq_offset, DISCARD); break; case GITS_CMD_INV: case GITS_CMD_INVALL: @@ -499,7 +843,26 @@ static MemTxResult gicv3_its_translation_write(void *o= paque, hwaddr offset, uint64_t data, unsigned siz= e, MemTxAttrs attrs) { - return MEMTX_OK; + GICv3ITSState *s =3D (GICv3ITSState *)opaque; + bool result =3D true; + 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; + } + + if (result) { + return MEMTX_OK; + } else { + return MEMTX_ERROR; + } } =20 static bool its_writel(GICv3ITSState *s, hwaddr offset, 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 Mon Apr 29 00:50:20 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 1631285084733784.6800204505016; Fri, 10 Sep 2021 07:44:44 -0700 (PDT) Received: from localhost ([::1]:40072 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mOhlj-00021T-5A for importer@patchew.org; Fri, 10 Sep 2021 10:44:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44532) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mOhhB-00029T-Tw for qemu-devel@nongnu.org; Fri, 10 Sep 2021 10:40:01 -0400 Received: from mail-qt1-x831.google.com ([2607:f8b0:4864:20::831]:45683) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mOhh8-0002up-CM for qemu-devel@nongnu.org; Fri, 10 Sep 2021 10:40:01 -0400 Received: by mail-qt1-x831.google.com with SMTP id s32so1565205qtc.12 for ; Fri, 10 Sep 2021 07:39:57 -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 a9sm3827042qkk.82.2021.09.10.07.39.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Sep 2021 07:39:57 -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=jItzi6UVHf4QTeUOO4ldJwH+gB0yTOeivUSvPdGUzRY=; b=sxGhgZKtcBtABiLnRjLv80rBS3eZ0MGfRsP3ro7uDNdodT+3g7tOZX2EVQ39LDQJk2 jGE1i2d4nUmE8BhUC27b1OblrhXaanJeVUeIxB7j9O/NrejrT+Ly8eFSiZlvpkZ00lsU kTRMogRQuhJVpQpE9AQgwKx1n5c4YLI2RbDzqjo0lFW+ZkXL0TgbQMKNfCr3AYVupXgi d7DizivVMEdtdf/WAg3qZXY15bD2R9YfCTZ01J0aL8qlMc/7kbUUIhywZNZ6PzhkBtMC tjlzuiHr4kHJVEIc84mmu5jgmqjSfjXE6BDfdACj400nZ0tQSrvq1Xm3As9sdZ4sk5Iq 67vA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=jItzi6UVHf4QTeUOO4ldJwH+gB0yTOeivUSvPdGUzRY=; b=g6y0OC01xmBBIFPcZDGpUJFrp6e5f8LYHbwTI1VssAFBIK1mWFRxScBY+UmiTZg5Te TCA39Q5yBccDHPeYAYP9gi+skYedm7/HbJl4itd+2XsXGc1I02xNSDFI2uMCIBoESUa8 FHs8gbl54iS/56O9k4tufMTsMq3G9U70uPC0+AiM86G7D4TSKOp0qCzmQuVUSM+KXOfa qRyZhWOvvIFAwYRJVNrPKvTtMAxJZdrgQDiPRI4T8p2RfZg3TGEtXHDc4l0+g9rMXBQE NDj+Fmvp6e4AcOiGJEO2f8y6fIknIgLWvma7l5Xznz0RBuJV4IloK9HRtIXa8Ch1dJSW tdMg== X-Gm-Message-State: AOAM532KL16nJFjtkTl1DDZTG0MqelsZvVF0NdrzTy1ZIjTjC1Pz5FiJ G/cfJMG/5A+2mtoW9R5nsrUQoA== X-Google-Smtp-Source: ABdhPJzZL5N5F8KkoXARYohpcJYx0RFlsR5Qr73pMpC/YOkkCQUM/QYbk1SfDTyMlGLUCd6X+5ktPA== X-Received: by 2002:ac8:5805:: with SMTP id g5mr8393650qtg.360.1631284797449; Fri, 10 Sep 2021 07:39:57 -0700 (PDT) From: Shashi Mallela To: peter.maydell@linaro.org, leif@nuviainc.com, rad@semihalf.com, mst@redhat.com, imammedo@redhat.com Subject: [PATCH v9 5/9] hw/intc: GICv3 ITS Feature enablement Date: Fri, 10 Sep 2021 10:39:47 -0400 Message-Id: <20210910143951.92242-6-shashi.mallela@linaro.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210910143951.92242-1-shashi.mallela@linaro.org> References: <20210910143951.92242-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::831; envelope-from=shashi.mallela@linaro.org; helo=mail-qt1-x831.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: 1631285085400100001 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 5beb7c4235..4164500ea9 100644 --- a/hw/intc/arm_gicv3_dist.c +++ b/hw/intc/arm_gicv3_dist.c @@ -384,7 +384,9 @@ static bool gicd_readl(GICv3State *s, hwaddr offset, * 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 @@ -399,6 +401,7 @@ static bool gicd_readl(GICv3State *s, hwaddr offset, 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 true; } 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 Mon Apr 29 00:50:20 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 1631285323481749.9386032833997; Fri, 10 Sep 2021 07:48:43 -0700 (PDT) Received: from localhost ([::1]:46582 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mOhpZ-0006Yy-FH for importer@patchew.org; Fri, 10 Sep 2021 10:48:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44674) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mOhhH-0002Sl-SD for qemu-devel@nongnu.org; Fri, 10 Sep 2021 10:40:07 -0400 Received: from mail-qk1-x729.google.com ([2607:f8b0:4864:20::729]:44625) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mOhhB-0002x4-D7 for qemu-devel@nongnu.org; Fri, 10 Sep 2021 10:40:07 -0400 Received: by mail-qk1-x729.google.com with SMTP id c10so2138177qko.11 for ; Fri, 10 Sep 2021 07:39:58 -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 a9sm3827042qkk.82.2021.09.10.07.39.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Sep 2021 07:39:58 -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=wJV5anIPpmX/pDiMMyUt96+zIQuIE2d6XWtvD7Cka7Y=; b=bp1TvkTiOEukwIZL8Yyntx8ybhoGRljlraRCjd2SEcGOf3e2XlMu1dm+5LTQsdMyNT 9KfemJfeB+tr+znI9qaye+rO0+6Dk3wi/Lg6GCZ6Jz2hpm/wHq+1A65QsAjjSJOIGw1W GL7aDPx9mc5nqybKNv68NobwRU9maWXSbdscyX0I1NAsLYEdE9Lidzh2ZsQSxDk51LCv 9TQIuDc7AOErs0ETDAi3sz+6Qiwwd8yfI2TpoxKiX/9e0Pc1qX7U5gqV+cQWXQMWNBZ9 4ABYqXIfV7DASX/W9bl7/Q7wAat6s3gDRmhyWy42oA/p0vxr9Rce9dLvVOSPh7mmWaOg /cnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=wJV5anIPpmX/pDiMMyUt96+zIQuIE2d6XWtvD7Cka7Y=; b=ev3snH2Bc6N+ssieT8hMNCUmQjD92ClfFcgMmgRT4GIMJB5UwSctifS3+lVTT2ZDkI F6trea5WBwE76YomcTyBv/3y2otyX9NO5kHQ4HTpKOse8bYBNTJw9hHju/lJ+ilpurdZ +AS3cwtCcyKiXPX4ifSOCb2hI50ov7N2/3bk6QlNHazqGBVaf1GLXD8+vajpD1r0W2tC oxhgcdLN7wdz+LF5tdXfsinedvn6Rk848tAnLf8BQajnTq9ZSqIdE2vJFne+QswDeehr Rd2dHYSwUhlNmDbcN2NRopWjI3mgzLmgH/EJ2gjL9O4uF5Uwg5FrIqRD6jBWGJ4sz/6v GUyw== X-Gm-Message-State: AOAM530arSwqk6EJ6LkoAAODGLbb9fYFVLUsL3IbrKh+IXilF0a44naP WdcBklXV0zkxDvT+9pA3bXd6Cw== X-Google-Smtp-Source: ABdhPJw/65Tj9avVWq/HJSHy5yOO+sG/bz9+ZhzC1vPUYC7pZqipDwriyoPK5WBJ6nyyha/mMIo1OA== X-Received: by 2002:a05:620a:2408:: with SMTP id d8mr7821243qkn.148.1631284798297; Fri, 10 Sep 2021 07:39:58 -0700 (PDT) From: Shashi Mallela To: peter.maydell@linaro.org, leif@nuviainc.com, rad@semihalf.com, mst@redhat.com, imammedo@redhat.com Subject: [PATCH v9 6/9] hw/intc: GICv3 redistributor ITS processing Date: Fri, 10 Sep 2021 10:39:48 -0400 Message-Id: <20210910143951.92242-7-shashi.mallela@linaro.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210910143951.92242-1-shashi.mallela@linaro.org> References: <20210910143951.92242-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::729; envelope-from=shashi.mallela@linaro.org; helo=mail-qk1-x729.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: 1631285325096100001 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 03c6800997..efb1b5ecab 100644 --- a/hw/intc/arm_gicv3_its.c +++ b/hw/intc/arm_gicv3_its.c @@ -233,6 +233,7 @@ static bool process_its_cmd(GICv3ITSState *s, uint64_t = value, uint32_t offset, uint64_t cte =3D 0; bool cte_valid =3D false; bool result =3D false; + uint64_t rdbase; =20 if (cmd =3D=3D NONE) { devid =3D offset; @@ -293,6 +294,18 @@ static bool process_its_cmd(GICv3ITSState *s, uint64_t= value, uint32_t offset, * 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 result; + } + + 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 */ @@ -621,6 +634,7 @@ static void process_cmdq(GICv3ITSState *s) MemTxResult res =3D MEMTX_OK; bool result =3D true; uint8_t cmd; + int i; =20 if (!(s->ctlr & ITS_CTLR_ENABLED)) { return; @@ -685,6 +699,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 Mon Apr 29 00:50:20 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 1631285363988482.63317255372795; Fri, 10 Sep 2021 07:49:23 -0700 (PDT) Received: from localhost ([::1]:48086 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mOhqE-0007YF-WD for importer@patchew.org; Fri, 10 Sep 2021 10:49:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44614) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mOhhF-0002JD-5P for qemu-devel@nongnu.org; Fri, 10 Sep 2021 10:40:05 -0400 Received: from mail-qk1-x729.google.com ([2607:f8b0:4864:20::729]:43701) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mOhh9-0002xs-Vy for qemu-devel@nongnu.org; Fri, 10 Sep 2021 10:40:04 -0400 Received: by mail-qk1-x729.google.com with SMTP id ay33so2138879qkb.10 for ; Fri, 10 Sep 2021 07:39:59 -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 a9sm3827042qkk.82.2021.09.10.07.39.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Sep 2021 07:39:58 -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=kCylM2PJxf6V961yTwfP1rpV65wzYK9sB+B03vYoel8=; b=kSpjbkC31bkfre1vCjVYBRbqF13eumlTHhjS056hWRPpxjTE0fIdqBaRWkdvOpZLh7 LHQrgCZd37q0lLERJZA5ah50qMqT/WcdRYHdIEqqBuZK9P2s74vl+f6808ZZmqxqDTdu b5Z++7yQWSc3Jpw4uY0m9h0v17L7GJoRoFNELpF7WoPKBmF5UrCq1GMQ2bRR8ezbDP9d t3cOE8wUjHknkyNrFAETBNNiUs44beWYgFj0jHjEt+DIwrq8IxRjx51m2zKvVELKx1bY xNdVdgHi3szCaelglT2qHs+QAXAqaKF9rc7LADo4oobzsJjxW27a5xSIqXUYugA+G3gT yCNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=kCylM2PJxf6V961yTwfP1rpV65wzYK9sB+B03vYoel8=; b=EWO7Q21KT+GZEvJFVs+Ex+0bFiy8Gn4AuGY19IgtT0nr5CB0ImQGerJ9KmNE6dZ5Mk YSst4c1gMHR235nyyR/RbSc5i8bZ0gyBQZTLadhL8mSdgfGlnVIuWTdSpm7MSQdEeFm4 nCTt6FBo34LiAl7LX6RK/wVCSejHeq3nhADk9nXEtFcSPcYChXLrKTwEHr6Vcgxo7VH4 dNYVCQ2r0p/Kx9RYG9/ZgelItmV5AlN4pWkrPDfnZ1fYy5y/x712EwB51FyuiwFTB7do pbHZ2qUSoWD6jE7ZIM1ZBIkGcQsR0QAMYHdMR4DzuMRRzCKK0grYi56OdR//1WtP2VgI PbyA== X-Gm-Message-State: AOAM531GTtIlob8LxGQGuIdtIldaa9v3i5Ag2t9c34ujerUMCvXPMgBJ YFmGBnkKX5OctggE2xSQh/V3Xg== X-Google-Smtp-Source: ABdhPJzsD5EkctnAIkjvmzuJi6g4JkSKWm56ilnPdY5JTfJPBXCTq1Fxbij14yoyPdi+Wc9Z7bsA9w== X-Received: by 2002:a05:620a:b0f:: with SMTP id t15mr8094687qkg.352.1631284799143; Fri, 10 Sep 2021 07:39:59 -0700 (PDT) From: Shashi Mallela To: peter.maydell@linaro.org, leif@nuviainc.com, rad@semihalf.com, mst@redhat.com, imammedo@redhat.com Subject: [PATCH v9 7/9] tests/data/acpi/virt: Add IORT files for ITS Date: Fri, 10 Sep 2021 10:39:49 -0400 Message-Id: <20210910143951.92242-8-shashi.mallela@linaro.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210910143951.92242-1-shashi.mallela@linaro.org> References: <20210910143951.92242-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::729; envelope-from=shashi.mallela@linaro.org; helo=mail-qk1-x729.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: 1631285365510100001 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 Mon Apr 29 00:50:20 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 1631285425895293.7560519311804; Fri, 10 Sep 2021 07:50:25 -0700 (PDT) Received: from localhost ([::1]:50868 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mOhrE-0000zN-V2 for importer@patchew.org; Fri, 10 Sep 2021 10:50:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44676) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mOhhH-0002Sm-SU for qemu-devel@nongnu.org; Fri, 10 Sep 2021 10:40:07 -0400 Received: from mail-qv1-xf31.google.com ([2607:f8b0:4864:20::f31]:36829) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mOhhB-0002yz-5N for qemu-devel@nongnu.org; Fri, 10 Sep 2021 10:40:07 -0400 Received: by mail-qv1-xf31.google.com with SMTP id 4so1380384qvp.3 for ; Fri, 10 Sep 2021 07:40:00 -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 a9sm3827042qkk.82.2021.09.10.07.39.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Sep 2021 07:39:59 -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=Zlb0HsQWoS5ea9vumF8XRLzz0YZw6JIfSm47fIH9pT0=; b=PqH1L7kmhN+vYlpaWydP0BCZapqUY5JUCoBo2w1V0YAxBGUOoyISoS8cGjYwTROmwg xm40aMxnjpTMXh+P2h8Qbe96qTtRA+vyaIfx8O73FNV/m4Mj19XDYw31rit5+hD1aaHo eBzKmwjJI+dAr5vBz4CZZXgYjq5svlAXBFQqqqV8zjBtGTAIGVw4pq79odDOx4VzUz5I u8wDbwxmqwGu2X9BtPw05Jgv4t165AXdBYLDj61vuJyg7uvMJR4fXw8peWLYiZdhzMvX 9DyxU2l+KTnO+Fv41x63iWhx5hC8Jz7OjuwuSua/e6doUzN8eSCAAwHWoa1mg/K+AnB9 QZMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Zlb0HsQWoS5ea9vumF8XRLzz0YZw6JIfSm47fIH9pT0=; b=v8L2PIGk/8bL35cnK9wFlnkBAPkVDD9KU1VkhQgTDZUlGeH3ArN4tTfwRfD6rfqQVP hpxHXyOL/1L5IKEk152qYPWDtGaCZ3Vgp1PniFDMz8ThMvL7nAqrqLfpFd/83QT4Jy1W biA28Yjk9ZebcgszDwNdleI4pe5zm5BI0Be97JX+hdzh6AwWVoFZEssXa++b61HUEy6T 4/3MRqOMHyIDK8z/dInsg59uA/MUm3i2+ibwIc3HXBD+nb9HosAXOfy265UQcQ/oTxwM Em9YovzBr9lzB3zrBUHkpF6/J/YpiMjqIWnDAZvcHhX/9kW/TovfX++AbQ8205LAC9VO nBCg== X-Gm-Message-State: AOAM531K3JTsgNoVPIg02BpdCRMWctg7NASbqzGYyXMcp6Mo6Svqhq1O ornNjhE57Aq31txNLuwMdwk7AQ== X-Google-Smtp-Source: ABdhPJyV+T9Q+/PxeqywencibOFc5WwEL3kccb7lkNnm59riFg/pqiO10F3h8HVkePUJITiAqUzkcQ== X-Received: by 2002:a0c:ef4b:: with SMTP id t11mr8593446qvs.57.1631284800250; Fri, 10 Sep 2021 07:40:00 -0700 (PDT) From: Shashi Mallela To: peter.maydell@linaro.org, leif@nuviainc.com, rad@semihalf.com, mst@redhat.com, imammedo@redhat.com Subject: [PATCH v9 8/9] hw/arm/virt: add ITS support in virt GIC Date: Fri, 10 Sep 2021 10:39:50 -0400 Message-Id: <20210910143951.92242-9-shashi.mallela@linaro.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210910143951.92242-1-shashi.mallela@linaro.org> References: <20210910143951.92242-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::f31; envelope-from=shashi.mallela@linaro.org; helo=mail-qv1-xf31.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: 1631285428116100001 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 | 29 +++++++++++++++++++++++++++-- include/hw/arm/virt.h | 2 ++ target/arm/kvm_arm.h | 4 ++-- 3 files changed, 31 insertions(+), 4 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 73e9c6bb7c..1d59f0e59f 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -584,6 +584,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; @@ -621,7 +627,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 */ @@ -655,6 +661,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; @@ -2039,7 +2053,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 @@ -2742,6 +2756,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 */ @@ -2791,8 +2811,13 @@ DEFINE_VIRT_MACHINE_AS_LATEST(6, 2) =20 static void virt_machine_6_1_options(MachineClass *mc) { + VirtMachineClass *vmc =3D VIRT_MACHINE_CLASS(OBJECT_CLASS(mc)); + virt_machine_6_2_options(mc); compat_props_add(mc->compat_props, hw_compat_6_1, hw_compat_6_1_len); + + /* qemu ITS was introduced with 6.2 */ + vmc->no_tcg_its =3D true; } DEFINE_VIRT_MACHINE(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 Mon Apr 29 00:50:20 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 1631285480273108.54599731912367; Fri, 10 Sep 2021 07:51:20 -0700 (PDT) Received: from localhost ([::1]:52390 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mOhs7-00022v-A8 for importer@patchew.org; Fri, 10 Sep 2021 10:51:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44682) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mOhhI-0002Up-DK for qemu-devel@nongnu.org; Fri, 10 Sep 2021 10:40:08 -0400 Received: from mail-qk1-x729.google.com ([2607:f8b0:4864:20::729]:35335) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mOhhC-00030c-LP for qemu-devel@nongnu.org; Fri, 10 Sep 2021 10:40:08 -0400 Received: by mail-qk1-x729.google.com with SMTP id 22so2173652qkg.2 for ; Fri, 10 Sep 2021 07:40:01 -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 a9sm3827042qkk.82.2021.09.10.07.40.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Sep 2021 07:40:00 -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=nS8mesEcmZKgzshoWZwF/7J6f8xQK7vihPWc8F8kwjI=; b=g+DRF5MKiB9UyLo4httOHAdxMfA8E/g6mzXyHeYibGAke7eurwIaNJGRos+2xTxMzT nC3mxF9oMecS3tovshCFV2SlFSObeJAHn6hjV0xSy95vfDTP1tKsYKhd5UhTJPCpdN3h DUn2fhMA84WgqErg6LFAprxOXj3acUs9L2TL18Vd36bgDyeGM16K9oqI+PpL1Hi9ChSo Rkf12ocP3UfSVLBRdqDhdUyRGN8oG1nvwK5mAeraoP8274B5yAD2cRj7wFZ0F+nR2WI1 nixmZgL6kH9u/1lkxS0GAzUapN7j2a4IW8Oo4FhsxDDjXMI8EKPGxsBAgBQ++xmuUEAl Vesw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=nS8mesEcmZKgzshoWZwF/7J6f8xQK7vihPWc8F8kwjI=; b=TLwx1KKpHdP0sM0e2FdNqTy0BP68WuQhH0hj5Sv9C9VU4ytQvATPp/wbUSX0y1b3SH BUux/vi3zog3+EzwxF7b+bNdRy5xJdH1H3WWLIZXq++11Rg5NV+YcCZhvX9/U/BZ60cy EzIllfNUtqO0EqsrK3DoVWc/RbdHHTGhCGQ7N86BEDmDD4YS5r3EqaBdY1GW0tc2QldB CNoI35rh3p60yogpMjMOcvesGp9GjBGb7vYDTUYUfzDFfcKEOpnLp7BZ1DsjVvD0YH03 hLPxFvy3COZnGFxhwJpbWa0RIHjWI8vCrldC33RiQ2mrqUtluD6sG+P/1rIBrEnaNOI+ x/jg== X-Gm-Message-State: AOAM5338o4Z55zbATO6OujotnRL8PmykLJ4crsC9cTbOUSf1BZ2Hdhub 4Js+M/MbHI3Ahhk9UtdGv9mAAQ== X-Google-Smtp-Source: ABdhPJw4lpLGoS4ee1E3HCaYYAhRjdINXkDzeV4zm74ht9/MBOpT3C02okQz2xToODuVNpIHzqZaSg== X-Received: by 2002:a37:634d:: with SMTP id x74mr8014024qkb.453.1631284801088; Fri, 10 Sep 2021 07:40:01 -0700 (PDT) From: Shashi Mallela To: peter.maydell@linaro.org, leif@nuviainc.com, rad@semihalf.com, mst@redhat.com, imammedo@redhat.com Subject: [PATCH v9 9/9] tests/data/acpi/virt: Update IORT files for ITS Date: Fri, 10 Sep 2021 10:39:51 -0400 Message-Id: <20210910143951.92242-10-shashi.mallela@linaro.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210910143951.92242-1-shashi.mallela@linaro.org> References: <20210910143951.92242-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::729; envelope-from=shashi.mallela@linaro.org; helo=mail-qk1-x729.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: 1631285481935100001 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