From patchwork Wed Mar 21 16:32:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Przywara X-Patchwork-Id: 132235 Delivered-To: patch@linaro.org Received: by 10.46.84.29 with SMTP id i29csp2356384ljb; Wed, 21 Mar 2018 09:35:15 -0700 (PDT) X-Google-Smtp-Source: AG47ELtZK/WV5TN87NTvnLf+kGn/PRBxpy+YDNjNjrYsIFlK4CdQOhF5ZIjwTayIeVBxubObL80k X-Received: by 10.107.142.2 with SMTP id q2mr21506571iod.21.1521650115202; Wed, 21 Mar 2018 09:35:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521650115; cv=none; d=google.com; s=arc-20160816; b=E9tfIOVtmbyEJ9nVQfXVthFh3V25wY5BYpWZZjappbaxLQQKLs9C6SrLDr2ODkV4Gz qOwT/WeRqjamhM0Iaa4HKaDrRJVbkAej2wGvNAO8HZHthx5vYx6IB7UiQf/1Zh8enkjV FEPONP2Htp8wrlDOdrhQkSlcW4VqSKgJvcXWdTYSuZoIfXyitye/q6J0VxeavCKEy84W FwMGE1t9W9oX7uGKHVcUwwxlKhzkOLPh4prgUWTrqfq/+DJMnddC+IqDQ+jASRUk+I7x GN9/klxM8gPJsblj72bV0YfwGDjHF0Y9KldG32JLMZ0LpVsDH2oL7reONWDrAZQI+Gy8 vMiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-unsubscribe:list-id :precedence:subject:references:in-reply-to:message-id:date:to:from :dkim-signature:arc-authentication-results; bh=TWHiiMK0Z/QSaiNUP215EIU4CenmR+ngD82EuZT1Was=; b=x+KUtsQdUmKVNOyGv0tVL3mXkhkgKZRAc/EXgpIAoZ2iijFqSjKEuexBteSV8uMMoh GSpahYwxqBaojjNXU9YMaclKpM2oE9cHpLBdteV4vqe8AWMIHo6CiqvM1G8UdEThhJCp OlD0vpOgVLe8ClEb6JtTWcVUrzk33IBmgoLhNVQV5BqPEQw+dVfiD9EZ+qEsypk2A83e u4HzT7xn/5h14neU9XlqQiiiJcG6uvU8NX5XBY9mOnlkjpRm/No4p5ePAPktWf+uJti4 DQJN4huBX6hIEYCqHzMvp4HrKRjoVSv7iZia++FKkwDZCJl9jvwNhDFGTJCo49sPhEsG v6EQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=E3shqwqp; spf=pass (google.com: best guess record for domain of xen-devel-bounces@lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org. [192.237.175.120]) by mx.google.com with ESMTPS id 135-v6si3440706ith.98.2018.03.21.09.35.15 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 21 Mar 2018 09:35:15 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of xen-devel-bounces@lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=E3shqwqp; spf=pass (google.com: best guess record for domain of xen-devel-bounces@lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1eygg8-0003CW-C8; Wed, 21 Mar 2018 16:33:32 +0000 Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1eygg3-00030h-LT for xen-devel@lists.xenproject.org; Wed, 21 Mar 2018 16:33:27 +0000 X-Inumbo-ID: 8af8dda9-2d25-11e8-9728-bc764e045a96 Received: from mail-wm0-x242.google.com (unknown [2a00:1450:400c:c09::242]) by us1-rack-dfw2.inumbo.com (Halon) with ESMTPS id 8af8dda9-2d25-11e8-9728-bc764e045a96; Wed, 21 Mar 2018 17:33:11 +0100 (CET) Received: by mail-wm0-x242.google.com with SMTP id x82so10948842wmg.1 for ; Wed, 21 Mar 2018 09:33:25 -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; bh=0+XRk7R0XY0vHWwJ+zV1jOXFYGjMHIqRuYyRyDxCFJo=; b=E3shqwqp10VY6ijeR5nbh9+jOQEckMYuySDbY280JYckY4EFM2v2i9gSiSQvhFrDsO wMGry0DrR+rT79hBYcafdQYI+qphN0qmntcXDcPsLqL1DFlG1VjvJsInMIygmAoRpRkw Tigr2ZjFtKjV7x/CsC4ajShRmUXCpGVWf8QAo= 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; bh=0+XRk7R0XY0vHWwJ+zV1jOXFYGjMHIqRuYyRyDxCFJo=; b=SgGCZ8sD21GGDGOa67a0yY7j3whEgOzFvac/3ATQhjyS3uiWLh+R0ZkChq0qE7mdKa ddr622KnBxBjkLtRaFzS4hnvjRfWYifuEbqkimBaArIZOcSCTRS+uDSLxOegwGJdYRiF L3xF5DdqfKa04hHsx/S3X5CQzfOceXVDL77xcr2aebA16wcQkWA5lOyuDvJ53ZWi8+S7 QiBPJlzHQx/Ia8M1SWUt2r5IZU+0BRQ5eP2LUrYvh4CD+vflWRsnNkzeJW7Y6ATK9l10 pz9F5pncIbnYDxsnaK10GrogZdscQ6VAsx9xKDbOIR2hblzGAsQzqwDf9kHam0Hb63u8 jXLg== X-Gm-Message-State: AElRT7ER9FVtwEZuWfy8sgB1PjlXcXMIcoEprxTkqCsWDe2PSITYWFZI bHhUrGuPBlj4p0CG1KnrJGlTIg== X-Received: by 10.28.143.148 with SMTP id r142mr3172837wmd.124.1521650004490; Wed, 21 Mar 2018 09:33:24 -0700 (PDT) Received: from e104803-lin.lan (mail.andrep.de. [217.160.17.100]) by smtp.gmail.com with ESMTPSA id n64sm4423724wmd.11.2018.03.21.09.33.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 21 Mar 2018 09:33:24 -0700 (PDT) From: Andre Przywara To: Julien Grall , Stefano Stabellini Date: Wed, 21 Mar 2018 16:32:30 +0000 Message-Id: <20180321163235.12529-35-andre.przywara@linaro.org> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180321163235.12529-1-andre.przywara@linaro.org> References: <20180321163235.12529-1-andre.przywara@linaro.org> Subject: [Xen-devel] [PATCH v3 34/39] ARM: new VGIC: vgic-init: register VGIC X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: xen-devel@lists.xenproject.org, Andre Przywara MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" This patch implements the function which is called by Xen when it wants to register the virtual GIC. This also implements vgic_max_vcpus() for the new VGIC, which reports back the maximum number of VCPUs a certain GIC model supports. Similar to the counterpart in the "old" VGIC, we return some maximum value if the VGIC has not been initialised yet. Signed-off-by: Andre Przywara Reviewed-by: Julien Grall Acked-by: Stefano Stabellini --- Changelog v2 ... v3: - drop premature #ifdef CONFIG_HAS_GICV3 - use new GIC_INVALID to detect uninitialised VGIC xen/arch/arm/vgic/vgic-init.c | 60 +++++++++++++++++++++++++++++++++++++++++++ xen/arch/arm/vgic/vgic.c | 25 ++++++++++++++++++ xen/arch/arm/vgic/vgic.h | 3 +++ 3 files changed, 88 insertions(+) create mode 100644 xen/arch/arm/vgic/vgic-init.c diff --git a/xen/arch/arm/vgic/vgic-init.c b/xen/arch/arm/vgic/vgic-init.c new file mode 100644 index 0000000000..d091c92ed0 --- /dev/null +++ b/xen/arch/arm/vgic/vgic-init.c @@ -0,0 +1,60 @@ +/* + * Copyright (C) 2015, 2016 ARM Ltd. + * Imported from Linux ("new" KVM VGIC) and heavily adapted to Xen. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include +#include + +#include "vgic.h" + +/* CREATION */ + +/** + * domain_vgic_register: create a virtual GIC + * @d: domain pointer + * @mmio_count: pointer to add number of required MMIO regions + * + * was: kvm_vgic_create + */ +int domain_vgic_register(struct domain *d, int *mmio_count) +{ + switch ( d->arch.vgic.version ) + { + case GIC_V2: + *mmio_count = 1; + break; + default: + BUG(); + } + + if ( d->max_vcpus > domain_max_vcpus(d) ) + return -E2BIG; + + d->arch.vgic.vgic_dist_base = VGIC_ADDR_UNDEF; + d->arch.vgic.vgic_cpu_base = VGIC_ADDR_UNDEF; + d->arch.vgic.vgic_redist_base = VGIC_ADDR_UNDEF; + + return 0; +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/arm/vgic/vgic.c b/xen/arch/arm/vgic/vgic.c index b70fdaaecb..131358a5a1 100644 --- a/xen/arch/arm/vgic/vgic.c +++ b/xen/arch/arm/vgic/vgic.c @@ -956,6 +956,31 @@ void vgic_sync_hardware_irq(struct domain *d, spin_unlock_irqrestore(&desc->lock, flags); } +unsigned int vgic_max_vcpus(const struct domain *d) +{ + unsigned int vgic_vcpu_limit; + + switch ( d->arch.vgic.version ) + { + case GIC_INVALID: + /* + * Since evtchn_init would call domain_max_vcpus for poll_mask + * allocation before the VGIC has been initialised, we need to + * return some safe value in this case. As this is for allocation + * purposes, go with the maximum value. + */ + vgic_vcpu_limit = MAX_VIRT_CPUS; + break; + case GIC_V2: + vgic_vcpu_limit = VGIC_V2_MAX_CPUS; + break; + default: + BUG(); + } + + return min_t(unsigned int, MAX_VIRT_CPUS, vgic_vcpu_limit); +} + /* * Local variables: * mode: C diff --git a/xen/arch/arm/vgic/vgic.h b/xen/arch/arm/vgic/vgic.h index c7eeaf7a38..a3fcd4d965 100644 --- a/xen/arch/arm/vgic/vgic.h +++ b/xen/arch/arm/vgic/vgic.h @@ -25,6 +25,9 @@ #define VARIANT_ID_XEN 0x01 #define IMPLEMENTER_ARM 0x43b +#define VGIC_ADDR_UNDEF INVALID_PADDR +#define IS_VGIC_ADDR_UNDEF(_x) ((_x) == VGIC_ADDR_UNDEF) + #define VGIC_PRI_BITS 5 #define vgic_irq_is_sgi(intid) ((intid) < VGIC_NR_SGIS)