From patchwork Thu Mar 15 20:30:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Przywara X-Patchwork-Id: 131845 Delivered-To: patch@linaro.org Received: by 10.46.84.17 with SMTP id i17csp1579186ljb; Thu, 15 Mar 2018 13:33:20 -0700 (PDT) X-Google-Smtp-Source: AG47ELt7k33M1ewNfjbmMGmDtrEU0oUhUtOid3NfBsOyPsDtsIh1R2vOSng36kwNc5/ffGL+brU0 X-Received: by 10.107.48.209 with SMTP id w200mr10105256iow.128.1521145999562; Thu, 15 Mar 2018 13:33:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521145999; cv=none; d=google.com; s=arc-20160816; b=ykU8KxniE1t7SmhNGRIFccOkUUfgQH+xF2HqcO1wg3jF1eQvbhcFXnHByy9w80VCMK SDXJ4HB1nvtwT6WLsWdq11yrQwFp7aulL1fz4pRlx7oQqwLp+KISJm3KZFSQG3i9DQJA ixRCSqH7csPS0NY0I9eGPVxoOLPRwRCHSxBP/4RBnM/lsgnPs9iHf0XhAjlPbjrgAByX KEKd20uXUrMOBe4UTOyX3rBupWzwkb3wdl9/0cEg0/x/RPhSKWnW6dX3KF5rGkCFhFsG BlE0BKkwTvy1+RRGvA48lBBX/acmBq5RhVwIQDgTlLg+zkr6nHItNzEmiPiP+WhGMuRA ZNxw== 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 :list-subscribe:list-help:list-post:list-unsubscribe:list-id :precedence:subject:cc:references:in-reply-to:message-id:date:to :from:dkim-signature:arc-authentication-results; bh=K4CPgb8jT+RLQdtlNsUx6DEnZLlSfvVmBITkxEQsHTs=; b=q7NUSjj6npn281p46rGSFtvAlezxZM0/XmCVIG6RWtWOlXkmq1qxd+Qz3+M7JM1/P5 YMSOdeLXuTGpZ0kjRcYlx9g9FGEINXnH+Iik5OzMlFd2EVrNI3Hv4RWjYY/nLqymfPR/ x8Y79js83LiY5heIWOkzDdbZKZoxBns5N8lGiOjWuPI6RTdatiYgeoBUHo+6ivamF3vz 43sNVbaGEFVqkrAp31kwVMLA91urYvGBwDED+8GfXJH50fDtzMzhB2WScsG+gB6U4Xzt eABFJvG6uzULcJfvINJx6ZQOGEmCJgJEddtwinsHJEJwS/1ZJEs6kzwm6XB+uK+02GhO xFFw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=PghWEpaa; 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 c1-v6si3006931iti.9.2018.03.15.13.33.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Mar 2018 13:33:19 -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=PghWEpaa; 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.84_2) (envelope-from ) id 1ewZXE-0003lL-19; Thu, 15 Mar 2018 20:31:36 +0000 Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ewZXC-0003gq-K5 for xen-devel@lists.xenproject.org; Thu, 15 Mar 2018 20:31:34 +0000 X-Inumbo-ID: d61ee562-288f-11e8-9728-bc764e045a96 Received: from mail-wr0-x242.google.com (unknown [2a00:1450:400c:c0c::242]) by us1-rack-dfw2.inumbo.com (Halon) with ESMTPS id d61ee562-288f-11e8-9728-bc764e045a96; Thu, 15 Mar 2018 21:31:28 +0100 (CET) Received: by mail-wr0-x242.google.com with SMTP id v65so9564593wrc.11 for ; Thu, 15 Mar 2018 13:31:33 -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=2lVWCZiaOxxGeH4m2NutYYox4TkYG+lHcxIa4hj24/o=; b=PghWEpaansijFiXJS8mCRfQpScAjopzmWWUOoy/kn7idrth+/RuMTruHlQVFn9taNW 8vjH7+1jPORjn0LxmG9NpRXl9h6D5Dex8ET5ZSR6LXZ/woAOuAnx9Pclk+euwIs8a/7Q I9ERKX6c82NfNzNHiXkA0/8kL7Anhpuphcack= 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=2lVWCZiaOxxGeH4m2NutYYox4TkYG+lHcxIa4hj24/o=; b=LCX807Pl9p6W9ebeymtbKQlkmWrPF4duAzE9LyA2v5F/+swm5YJ0yT3S+29YCQfbUn sN7uTch65seERZI9qGdMOAA2gsizDlAWubwSo4hKc5Sh+3VADVhKlzDHmE5LFJvPc9LO Y3OtWJz+zHPV70wgANvRYpIZtKCjjVCD4/e9nKuuItz5hSjnFUD7WdBIcKBDyKBOKpEx HZEuts2KjeH3hld6cXFVsR0W7sYM0iYlQnjvERAIrkZ/ucXpU7DWz0S3u/yo11bz23Pt MApiIjRUWXp3iy/FdO4rHD0vq/T/k1IPMFT9+brdPDqvmoQvZuMeEXGJpIuwYSUnsT+7 UEFg== X-Gm-Message-State: AElRT7GR91Cot21sx4M4Lx8Kb2qHUZ115MPNQlHfZ0V1MnXGU7/i3tkh dSeX5GpjhODaXjgBdAB2+9fu3/3IEzo= X-Received: by 10.223.174.227 with SMTP id y90mr7826660wrc.76.1521145892266; Thu, 15 Mar 2018 13:31:32 -0700 (PDT) Received: from e104803-lin.lan (mail.andrep.de. [217.160.17.100]) by smtp.gmail.com with ESMTPSA id w125sm3217102wmw.20.2018.03.15.13.31.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 15 Mar 2018 13:31:31 -0700 (PDT) From: Andre Przywara To: Stefano Stabellini , Julien Grall Date: Thu, 15 Mar 2018 20:30:29 +0000 Message-Id: <20180315203050.19791-25-andre.przywara@linaro.org> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180315203050.19791-1-andre.przywara@linaro.org> References: <20180315203050.19791-1-andre.przywara@linaro.org> Cc: xen-devel@lists.xenproject.org Subject: [Xen-devel] [PATCH v2 24/45] ARM: new VGIC: Add CTLR, TYPER and IIDR handlers X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" Those three registers are v2 emulation specific, so their implementation lives entirely in vgic-mmio-v2.c. Also they are handled in one function, as their implementation is pretty simple. We choose to piggy-back on the existing KVM identification registers, but use a different variant (major revision). When the guest enables the distributor, we kick all VCPUs to get potentially pending interrupts serviced. This is based on Linux commit 2b0cda878965, written by Marc Zyngier. Signed-off-by: Andre Przywara --- Changelog v1 ... v2: - use new IIDR values (KVM product ID, Xen revision) - add comment on handling GICD enablement - use new vcpu_kick() function xen/arch/arm/vgic/vgic-mmio-v2.c | 63 +++++++++++++++++++++++++++++++++++++++- xen/arch/arm/vgic/vgic.c | 15 ++++++++++ xen/arch/arm/vgic/vgic.h | 5 ++++ 3 files changed, 82 insertions(+), 1 deletion(-) diff --git a/xen/arch/arm/vgic/vgic-mmio-v2.c b/xen/arch/arm/vgic/vgic-mmio-v2.c index 6f10cf16ca..43c1ab5906 100644 --- a/xen/arch/arm/vgic/vgic-mmio-v2.c +++ b/xen/arch/arm/vgic/vgic-mmio-v2.c @@ -20,9 +20,70 @@ #include "vgic.h" #include "vgic-mmio.h" +static unsigned long vgic_mmio_read_v2_misc(struct vcpu *vcpu, + paddr_t addr, unsigned int len) +{ + uint32_t value; + + switch ( addr & 0x0c ) /* filter for the 4 registers handled here */ + { + case GICD_CTLR: + value = vcpu->domain->arch.vgic.enabled ? GICD_CTL_ENABLE : 0; + break; + case GICD_TYPER: + value = vcpu->domain->arch.vgic.nr_spis + VGIC_NR_PRIVATE_IRQS; + value = (value >> 5) - 1; + value |= (vcpu->domain->max_vcpus - 1) << 5; + break; + case GICD_IIDR: + value = (PRODUCT_ID_KVM << 24) | + (VARIANT_ID_XEN << 16) | + (IMPLEMENTER_ARM << 0); + break; + default: + return 0; + } + + return value; +} + +static void vgic_mmio_write_v2_misc(struct vcpu *vcpu, + paddr_t addr, unsigned int len, + unsigned long val) +{ + struct vgic_dist *dist = &vcpu->domain->arch.vgic; + bool enabled; + + switch ( addr & 0x0c ) /* filter for the 4 registers handled here */ + { + case GICD_CTLR: + domain_lock(vcpu->domain); + + /* + * Store the new enabled state in our distributor structure. + * Work out whether it was disabled before and now got enabled, + * so that we signal all VCPUs to check for interrupts to be injected. + */ + enabled = dist->enabled; + dist->enabled = val & GICD_CTL_ENABLE; + enabled = !enabled && dist->enabled; + + domain_unlock(vcpu->domain); + + if ( enabled ) + vgic_kick_vcpus(vcpu->domain); + + break; + case GICD_TYPER: + case GICD_IIDR: + /* read-only, writes ignored */ + return; + } +} + static const struct vgic_register_region vgic_v2_dist_registers[] = { REGISTER_DESC_WITH_LENGTH(GICD_CTLR, - vgic_mmio_read_raz, vgic_mmio_write_wi, 12, + vgic_mmio_read_v2_misc, vgic_mmio_write_v2_misc, 12, VGIC_ACCESS_32bit), REGISTER_DESC_WITH_BITS_PER_IRQ(GICD_IGROUPR, vgic_mmio_read_rao, vgic_mmio_write_wi, 1, diff --git a/xen/arch/arm/vgic/vgic.c b/xen/arch/arm/vgic/vgic.c index a1556e53e8..a3aaf20a73 100644 --- a/xen/arch/arm/vgic/vgic.c +++ b/xen/arch/arm/vgic/vgic.c @@ -674,6 +674,21 @@ int vgic_vcpu_pending_irq(struct vcpu *vcpu) return pending; } +void vgic_kick_vcpus(struct domain *d) +{ + struct vcpu *vcpu; + + /* + * We've injected an interrupt, time to find out who deserves + * a good kick... + */ + for_each_vcpu( d, vcpu ) + { + if ( vgic_vcpu_pending_irq(vcpu) ) + vcpu_kick(vcpu); + } +} + /* * Local variables: * mode: C diff --git a/xen/arch/arm/vgic/vgic.h b/xen/arch/arm/vgic/vgic.h index 7f221fd195..e2d0f04440 100644 --- a/xen/arch/arm/vgic/vgic.h +++ b/xen/arch/arm/vgic/vgic.h @@ -17,6 +17,10 @@ #ifndef __XEN_ARM_VGIC_VGIC_H__ #define __XEN_ARM_VGIC_VGIC_H__ +#define PRODUCT_ID_KVM 0x4b /* ASCII code X */ +#define VARIANT_ID_XEN 0x01 +#define IMPLEMENTER_ARM 0x43b + #define vgic_irq_is_sgi(intid) ((intid) < VGIC_NR_SGIS) static inline bool irq_is_pending(struct vgic_irq *irq) @@ -37,6 +41,7 @@ struct vgic_irq *vgic_get_irq(struct domain *d, struct vcpu *vcpu, void vgic_put_irq(struct domain *d, struct vgic_irq *irq); void vgic_queue_irq_unlock(struct domain *d, struct vgic_irq *irq, unsigned long flags); +void vgic_kick_vcpus(struct domain *d); static inline void vgic_get_irq_kref(struct vgic_irq *irq) {