From patchwork Wed Mar 21 16:32:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Przywara X-Patchwork-Id: 132240 Delivered-To: patch@linaro.org Received: by 10.46.84.29 with SMTP id i29csp2356679ljb; Wed, 21 Mar 2018 09:35:34 -0700 (PDT) X-Google-Smtp-Source: AG47ELtaUim86mJvVmGStaFPljHdlu1Ff5IJJlkwiQoQSuTuIJrtWJqQWPmKp2Dj4YD7WLlbcGkZ X-Received: by 10.107.44.199 with SMTP id s190mr22664830ios.123.1521650133867; Wed, 21 Mar 2018 09:35:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521650133; cv=none; d=google.com; s=arc-20160816; b=hEwbnRFa2MHiioZM+Io6TKtQL14BaZpalibXbrf/jRsBv1KUuBnADlPEfAwQ+MaYvX hU12H//FJQ83hDYU/O+4edUEIE8ky1i78qhTrl/d0ymKWAMKOiuzkHwzdgt5FTNBk4Ja 80Ns2K5NxULeaBk8eeDUCHaX6uCm/QYfEH6SlwB4YBPm4nJiXO8J5UxrAvkz/cXVODBd Mfa6ABJr09PvIocBZXF+/RQtw/6siFlwZB5GzWp6bmKBf5XBxdwpMA10zjQNaCuvnQLm OJJC7JeTfF2Y+9kvKNMRQsfQsskjPqk9xuYNYHvKJTwX1lOJYHuM3EkjW7LtA8AvZrAY O6Xw== 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=9eY7AV0EjuPArUOCTwGq22XueTTUvVxOjlWdm2Y2r3I=; b=ilkQDb712u4dgFM4EMB4zG5kI5fn7cNNLoyO0ZqLOM6AIfl6HHswOZi1oeQtP613ce tBIT0geGvRBAkIWtYH8hB+UcMIT/VJbJ77o3L0b5xlj3u5taQ4u+PuZWfndB30qq1JFn 7BLFsVDW9U5C3acpYJSIpN5VGi2qABnRUJ6ZJ+u0eeNM/mj4cZsudKLZIsGmVjJtiXCo wBrwVB8egaCvWYjOgsx3dX2PznmGCROlhRc29+TxXprmt65XtzG4b5xDhbLiETVCUIUW 4y1smgww8ZXfj+SxvE7WL3kM0kRKy5MMRHUg1DmuH+uXN+NoHIO+fxEk6pYUO+Y/82RI wv4w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=fXlzMhUS; 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 j25si3428916ioi.59.2018.03.21.09.35.33 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 21 Mar 2018 09:35:33 -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=fXlzMhUS; 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 1eygfs-0002ah-Au; Wed, 21 Mar 2018 16:33:16 +0000 Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1eygfq-0002VR-AM for xen-devel@lists.xenproject.org; Wed, 21 Mar 2018 16:33:14 +0000 X-Inumbo-ID: 838f63b6-2d25-11e8-9728-bc764e045a96 Received: from mail-wm0-x244.google.com (unknown [2a00:1450:400c:c09::244]) by us1-rack-dfw2.inumbo.com (Halon) with ESMTPS id 838f63b6-2d25-11e8-9728-bc764e045a96; Wed, 21 Mar 2018 17:32:58 +0100 (CET) Received: by mail-wm0-x244.google.com with SMTP id x82so10947557wmg.1 for ; Wed, 21 Mar 2018 09:33:13 -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=Hue/zTWxyOUWPJ5Y3Ll8K2w7Wov/nzv0e/gb2SEW3pY=; b=fXlzMhUSufQSIzQYB/Weml/Ofau409if+pyHRqRhS4NM6eHuPS0FwMKZROeOzZL8lh TMrpd2JUqFqsfIQ73kF622jZ1xSygG5/r3HXiADDeGAb3oQ1Ovw5xOwH0Pe0RD3Ske5v GUXeQ3cWX2Hiic/3yjGUulK2LufBBUrydVwfI= 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=Hue/zTWxyOUWPJ5Y3Ll8K2w7Wov/nzv0e/gb2SEW3pY=; b=Pam32/UJ5d0wcIJabG/bYarxDcoiIpQ32rd3X8TeqxefoRmhSGppFVLQotRkBM8hXh E974AiDiM0BZqm9X9PmmqrHC8SY4m3Ch/JBZMweZntbpHw0TQVN1l9WB+sLJftSqIvPz qYj448aT9ubwgvG8ckb0E2JFn4sJpiKvaiCjj100e/luDKuqdqv17Cs+73nYYd8qfM5Z Rli+gJ5F65/FOedPe7Pl1x6L0kBgQRdwVlmuCJ8qInG6f2qB1HlOLjDsyXQce8kqR9v8 x9Wydk49Cj7bxNE0vNx5ftal68L2ZQdyslRSa90WN93XkPNUXqF7bEqwxEr+2yKR81+I iCPQ== X-Gm-Message-State: AElRT7HTWoTeyVfq5QPV3YgTBLSZISGOhFuAKyhJAZXFBDXa0hd2sesl oYRvWmC+la7eoKDa1247MxGXAw== X-Received: by 10.28.92.208 with SMTP id q199mr3021748wmb.91.1521649992105; Wed, 21 Mar 2018 09:33:12 -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.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 21 Mar 2018 09:33:11 -0700 (PDT) From: Andre Przywara To: Julien Grall , Stefano Stabellini Date: Wed, 21 Mar 2018 16:32:18 +0000 Message-Id: <20180321163235.12529-23-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 22/39] ARM: new VGIC: Add PRIORITY registers handlers 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" The priority register handlers are shared between the v2 and v3 emulation, so their implementation goes into vgic-mmio.c, to be easily referenced from the v3 emulation as well later. This is based on Linux commit 055658bf48fc, written by Andre Przywara. Signed-off-by: Andre Przywara Reviewed-by: Julien Grall --- xen/arch/arm/vgic/vgic-mmio-v2.c | 2 +- xen/arch/arm/vgic/vgic-mmio.c | 47 ++++++++++++++++++++++++++++++++++++++++ xen/arch/arm/vgic/vgic-mmio.h | 7 ++++++ xen/arch/arm/vgic/vgic.h | 2 ++ 4 files changed, 57 insertions(+), 1 deletion(-) diff --git a/xen/arch/arm/vgic/vgic-mmio-v2.c b/xen/arch/arm/vgic/vgic-mmio-v2.c index 724681e0f8..d2d6a07e1b 100644 --- a/xen/arch/arm/vgic/vgic-mmio-v2.c +++ b/xen/arch/arm/vgic/vgic-mmio-v2.c @@ -107,7 +107,7 @@ static const struct vgic_register_region vgic_v2_dist_registers[] = { vgic_mmio_read_active, vgic_mmio_write_cactive, 1, VGIC_ACCESS_32bit), REGISTER_DESC_WITH_BITS_PER_IRQ(GICD_IPRIORITYR, - vgic_mmio_read_raz, vgic_mmio_write_wi, 8, + vgic_mmio_read_priority, vgic_mmio_write_priority, 8, VGIC_ACCESS_32bit | VGIC_ACCESS_8bit), REGISTER_DESC_WITH_BITS_PER_IRQ(GICD_ITARGETSR, vgic_mmio_read_raz, vgic_mmio_write_wi, 8, diff --git a/xen/arch/arm/vgic/vgic-mmio.c b/xen/arch/arm/vgic/vgic-mmio.c index b79e431f50..14b69d80d4 100644 --- a/xen/arch/arm/vgic/vgic-mmio.c +++ b/xen/arch/arm/vgic/vgic-mmio.c @@ -372,6 +372,53 @@ void vgic_mmio_write_sactive(struct vcpu *vcpu, } } +unsigned long vgic_mmio_read_priority(struct vcpu *vcpu, + paddr_t addr, unsigned int len) +{ + uint32_t intid = VGIC_ADDR_TO_INTID(addr, 8); + unsigned int i; + uint32_t val = 0; + + for ( i = 0; i < len; i++ ) + { + struct vgic_irq *irq = vgic_get_irq(vcpu->domain, vcpu, intid + i); + + val |= (uint32_t)irq->priority << (i * 8); + + vgic_put_irq(vcpu->domain, irq); + } + + return val; +} + +/* + * We currently don't handle changing the priority of an interrupt that + * is already pending on a VCPU. If there is a need for this, we would + * need to make this VCPU exit and re-evaluate the priorities, potentially + * leading to this interrupt getting presented now to the guest (if it has + * been masked by the priority mask before). + */ +void vgic_mmio_write_priority(struct vcpu *vcpu, + paddr_t addr, unsigned int len, + unsigned long val) +{ + uint32_t intid = VGIC_ADDR_TO_INTID(addr, 8); + unsigned int i; + unsigned long flags; + + for ( i = 0; i < len; i++ ) + { + struct vgic_irq *irq = vgic_get_irq(vcpu->domain, vcpu, intid + i); + + spin_lock_irqsave(&irq->irq_lock, flags); + /* Narrow the priority range to what we actually support */ + irq->priority = (val >> (i * 8)) & GENMASK(7, 8 - VGIC_PRI_BITS); + spin_unlock_irqrestore(&irq->irq_lock, flags); + + vgic_put_irq(vcpu->domain, irq); + } +} + static int match_region(const void *key, const void *elt) { const unsigned int offset = (unsigned long)key; diff --git a/xen/arch/arm/vgic/vgic-mmio.h b/xen/arch/arm/vgic/vgic-mmio.h index 832e2eb3d8..b2d572d562 100644 --- a/xen/arch/arm/vgic/vgic-mmio.h +++ b/xen/arch/arm/vgic/vgic-mmio.h @@ -119,6 +119,13 @@ void vgic_mmio_write_sactive(struct vcpu *vcpu, paddr_t addr, unsigned int len, unsigned long val); +unsigned long vgic_mmio_read_priority(struct vcpu *vcpu, + paddr_t addr, unsigned int len); + +void vgic_mmio_write_priority(struct vcpu *vcpu, + paddr_t addr, unsigned int len, + unsigned long val); + unsigned int vgic_v2_init_dist_iodev(struct vgic_io_device *dev); #endif diff --git a/xen/arch/arm/vgic/vgic.h b/xen/arch/arm/vgic/vgic.h index 071e061066..c7eeaf7a38 100644 --- a/xen/arch/arm/vgic/vgic.h +++ b/xen/arch/arm/vgic/vgic.h @@ -25,6 +25,8 @@ #define VARIANT_ID_XEN 0x01 #define IMPLEMENTER_ARM 0x43b +#define VGIC_PRI_BITS 5 + #define vgic_irq_is_sgi(intid) ((intid) < VGIC_NR_SGIS) static inline bool irq_is_pending(struct vgic_irq *irq)