From patchwork Mon Mar 5 16:03:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Przywara X-Patchwork-Id: 130676 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp2853854lja; Mon, 5 Mar 2018 08:07:13 -0800 (PST) X-Google-Smtp-Source: AG47ELuieRXkBevKNpftCBlqLnL2cj/l2K0ofweEQKjkFtM3hBxVslZqlLZyT1894MeT+UsaH8N7 X-Received: by 10.36.179.8 with SMTP id e8mr14376291itf.36.1520266033189; Mon, 05 Mar 2018 08:07:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520266033; cv=none; d=google.com; s=arc-20160816; b=bKOjBr97GZv7xsO05VuXiyEMk2KMvGSvNGaCuJ3SbrpFevm+lmhX5W1/oX6j3pIEZJ 8X9XdkAqN1tj3u2qMYg/I3hprbNm+AuMggd7w9bxohEhJPqSHQSiYllCzjhznC65qml1 0hfNDE30jgmMJned/W6aS6D8xj670K+9JFdiVjm/BrCOwKVRxAgFDzEA+TDyTxkRJLhQ Uub0I+RxNJ5a6IX9ryIQ+YuQhPWgLjGtXKGtV9SZ04NXnMavzSfDmT5UQlW2cIf4qopF 58Bw3DleU6S3bD8v0nLm8uTJ5q0b7XhRI4xE0IEtvAD/JgDFxTmzFnS8ricvshOAecmO ePdQ== 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=S3iil/QUZntbXTR+26/ODRMYokluIxEy3UZTSQ3ruOM=; b=ZhHuuWNtEO1ZwyY3X8Vn7tMOA38pGwbJLneb08tT8WMmAoFHscY2rwQGv6PDKKJtWa aj7GZ/X3N+kSfuy0nRaiKXC2ni6LDG8xLoNXIR6WxpQl4AWwcz17xoEXn9ll0LO9kFc4 zV6gSZs511F22mQVnFPmPoSJ+/TiqbS0XZPTBRsbzowuhAYVLx548c6+MVammFiZ6jMa 35iJEuNr+k+qpTaEdWqR+wWdvx1r2Svmmhwj4MAnvj2vEQZjRsqGZ5CbxoBlNG8kFgIE TlX592wqQMlors6j0PtfNHcXEHa9frFery9bQNh6POLLR3JlG2lZwx1wT4lpbBUgc2L7 iMoQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=khYUb46K; 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 f67si9049429ioj.182.2018.03.05.08.07.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Mar 2018 08:07:13 -0800 (PST) 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=khYUb46K; 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 1essbd-0007rO-Eb; Mon, 05 Mar 2018 16:04:53 +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 1essbc-0007mn-3X for xen-devel@lists.xenproject.org; Mon, 05 Mar 2018 16:04:52 +0000 X-Inumbo-ID: c7db4372-208e-11e8-ba59-bc764e045a96 Received: from mail-wm0-x241.google.com (unknown [2a00:1450:400c:c09::241]) by us1-rack-dfw2.inumbo.com (Halon) with ESMTPS id c7db4372-208e-11e8-ba59-bc764e045a96; Mon, 05 Mar 2018 17:03:45 +0100 (CET) Received: by mail-wm0-x241.google.com with SMTP id a20so13874614wmd.1 for ; Mon, 05 Mar 2018 08:04:50 -0800 (PST) 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=PBN6AzzFKd2MvLqC7uL4OvZPzqQ6sfWxnXv8tqaAr6c=; b=khYUb46KHUmnOPE+z2aS4XNvnasmBciELeN7rAmZLw+AUAh61S0Clb8kKOGVIHnNiH 13P17xS0cfiFfo7mEzTl5nJBAMtQOocPU0XpEdWLVjMiNvGvk6EhxLNESH0RjC3gx/mQ PsTww2i5NOJVE0OfUAmULBygMizWTkoS+i6tM= 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=PBN6AzzFKd2MvLqC7uL4OvZPzqQ6sfWxnXv8tqaAr6c=; b=MKUtjKmM/bcFH8JPde6MK8zLFcL0LR3r+DodPN71yBo+5L1AdbvdGmLrXlTxA4MH2p FAfJih06i9juYAh3nPueC0fCjguanDt4rEy7mP/8wbQKek5rwJfOkRluRyKuM/XSnIcO 5QEEp25FiCecnCnMF7oKMkd4gG6KGuu0tb1GGzfPYjKoIrAjE+QBAFtOy53XTyhDrGEF uO1hpryqXaT9Ppijhpqj7klc5B33LBKB3+dBFlpTHwca+fi6gULBhS0gaYNSE7n4fc3h zT8p5hn6p1133c5F/4IZWn8ndgYdeF+ky2NN+Mv/8NrH/e/JU6AvonbHWhjM9884eR6a OAyw== X-Gm-Message-State: AElRT7F7SWVFdnaKcM/UxXzarpNkKWwQcKVYMuUZi/LBkAZJe81mVaY7 FVOIr5/5sr/2u9/VAwtbxlYhkQ== X-Received: by 10.28.66.65 with SMTP id p62mr8238380wma.8.1520265889638; Mon, 05 Mar 2018 08:04:49 -0800 (PST) Received: from e104803-lin.lan (mail.andrep.de. [217.160.17.100]) by smtp.gmail.com with ESMTPSA id y6sm6574381wmy.14.2018.03.05.08.04.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 05 Mar 2018 08:04:49 -0800 (PST) From: Andre Przywara To: Julien Grall , Stefano Stabellini Date: Mon, 5 Mar 2018 16:03:45 +0000 Message-Id: <20180305160415.16760-28-andre.przywara@linaro.org> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180305160415.16760-1-andre.przywara@linaro.org> References: <20180305160415.16760-1-andre.przywara@linaro.org> Cc: xen-devel@lists.xenproject.org Subject: [Xen-devel] [PATCH 27/57] ARM: new VGIC: Add data structure definitions 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" Add a new header file for the new and improved GIC implementation. The big change is that we now have a struct vgic_irq per IRQ instead of spreading all the information over various bitmaps in the ranks. We include this new header conditionally from within the old header file for the time being to avoid touching all the users. This is based on Linux commit b18b57787f5e, written by Christoffer Dall. Signed-off-by: Andre Przywara --- Changelog RFC ... v1: - rename header file to new_vgic.h - drop unneeded data structures (vgic_its, vgic_v_cpu_if) - reorder members in vgic_irq to avoid padding - move flags members into bool bitfields - drop prototypes - use unsigned and uint_t data types - keep arch_vcpu member name as "vgic" xen/include/asm-arm/new_vgic.h | 198 +++++++++++++++++++++++++++++++++++++++++ xen/include/asm-arm/vgic.h | 6 ++ 2 files changed, 204 insertions(+) create mode 100644 xen/include/asm-arm/new_vgic.h diff --git a/xen/include/asm-arm/new_vgic.h b/xen/include/asm-arm/new_vgic.h new file mode 100644 index 0000000000..54be5aa3eb --- /dev/null +++ b/xen/include/asm-arm/new_vgic.h @@ -0,0 +1,198 @@ +/* + * Copyright (C) 2015, 2016 ARM Ltd. + * + * 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 . + */ +#ifndef __ASM_ARM_NEW_VGIC_H +#define __ASM_ARM_NEW_VGIC_H + +#include +#include +#include +#include +#include + +#define VGIC_V3_MAX_CPUS 255 +#define VGIC_V2_MAX_CPUS 8 +#define VGIC_NR_SGIS 16 +#define VGIC_NR_PPIS 16 +#define VGIC_NR_PRIVATE_IRQS (VGIC_NR_SGIS + VGIC_NR_PPIS) +#define VGIC_MAX_PRIVATE (VGIC_NR_PRIVATE_IRQS - 1) +#define VGIC_MAX_SPI 1019 +#define VGIC_MAX_RESERVED 1023 +#define VGIC_MIN_LPI 8192 + +#define irq_is_ppi(irq) ((irq) >= VGIC_NR_SGIS && (irq) < VGIC_NR_PRIVATE_IRQS) +#define irq_is_spi(irq) ((irq) >= VGIC_NR_PRIVATE_IRQS && \ + (irq) <= VGIC_MAX_SPI) + +enum vgic_type { + VGIC_V2, /* Good ol' GICv2 */ + VGIC_V3, /* New fancy GICv3 */ +}; + +#define VGIC_V2_MAX_LRS (1 << 6) +#define VGIC_V3_MAX_LRS 16 +#define VGIC_V3_LR_INDEX(lr) (VGIC_V3_MAX_LRS - 1 - lr) + +enum vgic_irq_config { + VGIC_CONFIG_EDGE = 0, + VGIC_CONFIG_LEVEL +}; + +struct vgic_irq { + struct list_head ap_list; + + struct vcpu *vcpu; /* + * SGIs and PPIs: The VCPU + * SPIs and LPIs: The VCPU whose ap_list + * this is queued on. + */ + + struct vcpu *target_vcpu; /* + * The VCPU that this interrupt should + * be sent to, as a result of the + * targets reg (v2) or the affinity reg (v3). + */ + + spinlock_t irq_lock; /* Protects the content of the struct */ + uint32_t intid; /* Guest visible INTID */ + atomic_t refcount; /* Used for LPIs */ + uint32_t hwintid; /* HW INTID number */ + union + { + struct { + uint8_t targets; /* GICv2 target VCPUs mask */ + uint8_t source; /* GICv2 SGIs only */ + }; + uint32_t mpidr; /* GICv3 target VCPU */ + }; + uint8_t priority; + bool line_level:1; /* Level only */ + bool pending_latch:1; /* + * The pending latch state used to + * calculate the pending state for both + * level and edge triggered IRQs. + */ + bool active:1; /* not used for LPIs */ + bool enabled:1; + bool hw:1; /* Tied to HW IRQ */ + bool config:1; /* Level or edge */ + struct list_head lpi_list; /* Used to link all LPIs together */ +}; + +struct vgic_register_region; + +enum iodev_type { + IODEV_DIST, + IODEV_REDIST, +}; + +struct vgic_io_device { + gfn_t base_fn; + struct vcpu *redist_vcpu; + const struct vgic_register_region *regions; + enum iodev_type iodev_type; + unsigned int nr_regions; +}; + +struct vgic_dist { + bool ready; + bool initialized; + + /* vGIC model the kernel emulates for the guest (GICv2 or GICv3) */ + uint32_t version; + + /* Do injected MSIs require an additional device ID? */ + bool msis_require_devid; + + unsigned int nr_spis; + + /* base addresses in guest physical address space: */ + paddr_t vgic_dist_base; /* distributor */ + union + { + /* either a GICv2 CPU interface */ + paddr_t vgic_cpu_base; + /* or a number of GICv3 redistributor regions */ + struct + { + paddr_t vgic_redist_base; + paddr_t vgic_redist_free_offset; + }; + }; + + /* distributor enabled */ + bool enabled; + + struct vgic_irq *spis; + unsigned long *allocated_irqs; /* bitmap of IRQs allocated */ + + struct vgic_io_device dist_iodev; + + bool has_its; + + /* + * Contains the attributes and gpa of the LPI configuration table. + * Since we report GICR_TYPER.CommonLPIAff as 0b00, we can share + * one address across all redistributors. + * GICv3 spec: 6.1.2 "LPI Configuration tables" + */ + uint64_t propbaser; + + /* Protects the lpi_list and the count value below. */ + spinlock_t lpi_list_lock; + struct list_head lpi_list_head; + unsigned int lpi_list_count; +}; + +struct vgic_cpu { + struct vgic_irq private_irqs[VGIC_NR_PRIVATE_IRQS]; + + struct list_head ap_list_head; + spinlock_t ap_list_lock; /* Protects the ap_list */ + + unsigned int used_lrs; + + /* + * List of IRQs that this VCPU should consider because they are either + * Active or Pending (hence the name; AP list), or because they recently + * were one of the two and need to be migrated off this list to another + * VCPU. + */ + + /* + * Members below are used with GICv3 emulation only and represent + * parts of the redistributor. + */ + struct vgic_io_device rd_iodev; + struct vgic_io_device sgi_iodev; + + /* Contains the attributes and gpa of the LPI pending tables. */ + uint64_t pendbaser; + + bool lpis_enabled; + + /* Cache guest priority bits */ + uint32_t num_pri_bits; + + /* Cache guest interrupt ID bits */ + uint32_t num_id_bits; +}; + +#define vgic_initialized(k) ((k)->arch.vgic.initialized) +#define vgic_ready(k) ((k)->arch.vgic.ready) +#define vgic_valid_spi(k, i) (((i) >= VGIC_NR_PRIVATE_IRQS) && \ + ((i) < (k)->arch.vgic.nr_spis + VGIC_NR_PRIVATE_IRQS)) + +#endif /* __ASM_ARM_NEW_VGIC_H */ diff --git a/xen/include/asm-arm/vgic.h b/xen/include/asm-arm/vgic.h index 84d82e6eb3..b28b8f8df7 100644 --- a/xen/include/asm-arm/vgic.h +++ b/xen/include/asm-arm/vgic.h @@ -18,6 +18,10 @@ #ifndef __ASM_ARM_VGIC_H__ #define __ASM_ARM_VGIC_H__ +#ifdef CONFIG_NEW_VGIC +#include +#else + #include #include #include @@ -299,6 +303,8 @@ extern bool vgic_to_sgi(struct vcpu *v, register_t sgir, const struct sgi_target *target); extern bool vgic_migrate_irq(struct vcpu *old, struct vcpu *new, unsigned int irq); +#endif /* !CONFIG_NEW_VGIC */ + /*** Common VGIC functions used by Xen arch code ****/ /*