From patchwork Thu Aug 5 22:29:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shashi Mallela X-Patchwork-Id: 492278 Delivered-To: patch@linaro.org Received: by 2002:a05:6638:396:0:0:0:0 with SMTP id y22csp717853jap; Thu, 5 Aug 2021 15:30:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxDhhWoaQWSJj1US5FaffjH5TXVmg8Ig5DXxb4x+YFXmzwgOhYKAKB2LFbZ/ZlqqtF8+J4O X-Received: by 2002:a05:6602:2814:: with SMTP id d20mr160271ioe.65.1628202654481; Thu, 05 Aug 2021 15:30:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628202654; cv=none; d=google.com; s=arc-20160816; b=bHSoZbf6xGerMklrlUg7jWGuzjFpD03ZtIeaxUgrKasOhNYgtm30jBLsmo2oU3SURz DUwIYy6WOSzNwsVK4ktHBTobsOlDMtazUZqyQgOIDJfXY2QlmkMuejS1Gc932Tprhq8v WElaZy2I8zZEOO50lecrsSSkGilRNaBbd4cdZQTySBNabpjSqeOWkCFmEv4bowEtR5bX jMdTZZZJfCVJ/nAJIbuqrU4Gikxm6vJrQbKIY/WP14LFP1iXV4BQv90Vub2dV6A2uEIC 7M1FYRduZwNbVrOaBxO50S9czUqWP8eTOCyrYCrums70BhrDG2uSfwj90tsDTjfnYSYS WNYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=oINuPGEcryVgocqWb2UboVny7kYUXzklLGzq6cJvadg=; b=QRkUiogXEEbLH0adyqmlsd/sLTSyDebnG6BtUWMNQqMeaYxx2kVkJMEG0wkWS6uGng T5wt0zjJ7KrfidithntOmqSNYFrI3O3Oht0cMKVyXUxQ67wMVSL0/gSGoyfJahQxE6Rk sI3QqP3onEZLwqckB2PiSyq8hPD8W9XJTRpc1EpD1px9xfTZPG07kd/9Y4xNRrrjgFT8 up0bo/NYLR5WBVHYU26+OwwdVUbZ7t/iwfq4gTcE0WlFLexTPDttLAzb7KQmegJldWkG RAT2MU5fGv2M1szgToWDYRmnHKknVkSRnFzdwhq0fkLsvNCsBIUsTxLK0IQyw9cBcOZa Tasg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=RzXdWhhd; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id l15si7005826ios.94.2021.08.05.15.30.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 05 Aug 2021 15:30:54 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=RzXdWhhd; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:54710 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mBlt7-0000JE-Rp for patch@linaro.org; Thu, 05 Aug 2021 18:30:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58994) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mBlsR-0007oo-RW for qemu-devel@nongnu.org; Thu, 05 Aug 2021 18:30:11 -0400 Received: from mail-qk1-x734.google.com ([2607:f8b0:4864:20::734]:41667) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mBlsN-0005sf-WA for qemu-devel@nongnu.org; Thu, 05 Aug 2021 18:30:11 -0400 Received: by mail-qk1-x734.google.com with SMTP id t68so7968069qkf.8 for ; Thu, 05 Aug 2021 15:30:07 -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=oINuPGEcryVgocqWb2UboVny7kYUXzklLGzq6cJvadg=; b=RzXdWhhdMc8Ib9vJMThsDDAPhXD2DlvlzJs3fYciXVdd2ZrzR+iFeBTL97XSHXBKOw e9LzkFQvwv3He4R8Gh5AYpHrrkgythrutNk3SC/s4V/9kUK96R0xWASgSpsDl/NBUEdz rtlab6C7iLD9vHgEeGBXlbqkRHwI3uNfDQWKBLXXbQyAA5w1GHn96kIJPkx+hV5soJb1 hznilmdCrJLNEcfrNXS3WJZbmAcWnsTd/0DH6hKgrqjZgkrc26pSJnnztpGkOy+IsQOF 9wBDi57v9gfqDKPKB+HzwREUXuKRKTyFuCu4wKI8gc0x9ozEuhSeS/W55jHfXkIyquwS v2YQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=oINuPGEcryVgocqWb2UboVny7kYUXzklLGzq6cJvadg=; b=k7CtVysFnJL34Zq9CuL+yiAMA9HeGukwqzovijcO5RKG8KriUkwVI9kgkujDKbVSNk eWGdyV5rU2hxMGg+xolzelYZ+/B1qGHAuPUAZDjy0TSQtcfd08iKQY1GKqz8Snm6UX0e dgEXkJbp8PR22g3kpCRj5gu2H+S6weaJus2hx7+o5GSNOq6wG053mPLX8fnLKsVtDhUo 7mQy3DZeiMoSQYc2H9ZCLRuQZYsnhD4MsHRCSS8bKJ7QGCUue0XRkSKBcG4c12N5o9G4 fkOr+9ot0LrsZdr5139cIwwm2muKUtzFaFXhRtSkQjX2of7iHCu0AhKwdVAG3+FWNncU psKw== X-Gm-Message-State: AOAM531Qa43kZSXzVM2mFfAC5jcHuIYQOy1xWioYdH5KQsAWWOf1X/Rf T56NZ1e/cEDuVNNHq2xtmMlX6Q== X-Received: by 2002:a05:620a:5f6:: with SMTP id z22mr7191832qkg.195.1628202607012; Thu, 05 Aug 2021 15:30:07 -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 d28sm3655195qkj.25.2021.08.05.15.30.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Aug 2021 15:30:06 -0700 (PDT) From: Shashi Mallela To: peter.maydell@linaro.org, leif@nuviainc.com, rad@semihalf.com, mst@redhat.com, imammedo@redhat.com Subject: [PATCH v7 05/10] hw/intc: GICv3 ITS Feature enablement Date: Thu, 5 Aug 2021 18:29:57 -0400 Message-Id: <20210805223002.144855-6-shashi.mallela@linaro.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210805223002.144855-1-shashi.mallela@linaro.org> References: <20210805223002.144855-1-shashi.mallela@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::734; envelope-from=shashi.mallela@linaro.org; helo=mail-qk1-x734.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 Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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 --- 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(-) -- 2.27.0 Tested-by: Neil Armstrong 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; } + if (s->lpi_enable && !s->dma) { + error_setg(errp, "Redist-ITS: Guest 'sysmem' reference link not set"); + return; + } + s->cpu = g_new0(GICv3CPUState, s->num_cpu); for (i = 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 |= GICR_TYPER_PLPIS; + } } } @@ -494,9 +503,12 @@ static Property arm_gicv3_common_properties[] = { 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(), }; diff --git a/hw/intc/arm_gicv3_dist.c b/hw/intc/arm_gicv3_dist.c index b65f56f903..43128b376d 100644 --- a/hw/intc/arm_gicv3_dist.c +++ b/hw/intc/arm_gicv3_dist.c @@ -371,7 +371,9 @@ static MemTxResult gicd_readl(GICv3State *s, hwaddr offset, * A3V == 1 (non-zero values of Affinity level 3 supported) * IDbits == 0xf (we support 16-bit interrupt identifiers) * DVIS == 0 (Direct virtual LPI injection not supported) - * LPIS == 0 (LPIs not supported) + * LPIS == 1 (LPIs are supported if affinity routing is enabled) + * num_LPIs == 0b00000 (bits [15:11],Number of LPIs as indicated + * by GICD_TYPER.IDbits) * MBIS == 0 (message-based SPIs not supported) * SecurityExtn == 1 if security extns supported * CPUNumber == 0 since for us ARE is always 1 @@ -386,6 +388,7 @@ static MemTxResult gicd_readl(GICv3State *s, hwaddr offset, bool sec_extn = !(s->gicd_ctlr & GICD_CTLR_DS); *data = (1 << 25) | (1 << 24) | (sec_extn << 10) | + (s->lpi_enable << GICD_TYPER_LPIS_SHIFT) | (0xf << 19) | itlinesnumber; return MEMTX_OK; } diff --git a/hw/intc/arm_gicv3_redist.c b/hw/intc/arm_gicv3_redist.c index 53da703ed8..2108abfe9c 100644 --- a/hw/intc/arm_gicv3_redist.c +++ b/hw/intc/arm_gicv3_redist.c @@ -248,10 +248,16 @@ static MemTxResult gicr_writel(GICv3CPUState *cs, hwaddr 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 |= GICR_CTLR_ENABLE_LPIS; + } else { + cs->gicr_ctlr &= ~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) +#define GICD_TYPER_LPIS_SHIFT 17 + /* 16 bits EventId */ #define GICD_TYPER_IDBITS 0xf 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;