From patchwork Thu Mar 15 20:30:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Przywara X-Patchwork-Id: 131875 Delivered-To: patch@linaro.org Received: by 10.46.84.17 with SMTP id i17csp1579802ljb; Thu, 15 Mar 2018 13:33:55 -0700 (PDT) X-Google-Smtp-Source: AG47ELtRb6E31o8+rEMz7Etqm83hZAq4Wgb5A/8+f39Z+i5SdrxMoyj54PRJ4BtEinXcPeUEcIa+ X-Received: by 10.107.143.148 with SMTP id r142mr10603722iod.115.1521146035235; Thu, 15 Mar 2018 13:33:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521146035; cv=none; d=google.com; s=arc-20160816; b=eDAm+eXV1pgCiUimFCuQXyU36AEfPh4cQ3HcZJ2fjKhvYT78Dbcc6astqWP76Lbfoo lYIurogRtNYrWuOIKYDCVSRJRADgPTzRxNVtwHrBf7S53a/cpBX1DNtdonyudB6dG38B XSoBh346CvKo1UOfj3DZ5hT/ACZ9Wi6I6NY6qDCd19hl7rhbLeeCaNLtg/eoPN4zRw0U pxzsrL+I1t0DzR1ZqXIbjUmvaXTCBNUJ+yyu2Td/EWsSfR3TnTRmlYkDeCfB1HCmAyww YjnabUJGONChAWd5WIX3OENXafjP+EHJK2NuXqWPfDAXhl2qqnlcpY+U2mqjEd/zVqry +ZYw== 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=5yXP68htNX/BAIELpg6XU3B62oP6kwbVWkfMvj8JcX4=; b=Uo0CGah2WyjUrDrreAO0TYst9NzpCtmbNffSWgxyalI0SkyXCXYIbB71Z1/X9f04w0 611nXKx3RqkremoeXNYEc63OlqklnVUm5w5chk5641mUzyhGb2XUeHJwK4VbG9WD6lRA 5/1bUf3wdWOA9nQNisCQG8bMuxSHlFayX7Ixurf8hiVQjB4U8tu8+1OdgglcdK2Q1GEP 53yijqKc1ZxdIawijgTN491r1rUMXyKclnB4EfWP8igscl1oS661HqfsmkYzc0/L0Ngj eC8ZBBpOpQUtvKSkPOPVYeFmsWrY8nb9eo/wlZzyRG1sKTYr8McCvuI9GkOIoZt7vOQZ zDqg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=cJrCQt+F; 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 w15si124186iof.6.2018.03.15.13.33.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Mar 2018 13:33:55 -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=cJrCQt+F; 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 1ewZXK-00043d-J4; Thu, 15 Mar 2018 20:31:42 +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 1ewZXI-0003yj-Oe for xen-devel@lists.xenproject.org; Thu, 15 Mar 2018 20:31:40 +0000 X-Inumbo-ID: d95f86ef-288f-11e8-9728-bc764e045a96 Received: from mail-wr0-x241.google.com (unknown [2a00:1450:400c:c0c::241]) by us1-rack-dfw2.inumbo.com (Halon) with ESMTPS id d95f86ef-288f-11e8-9728-bc764e045a96; Thu, 15 Mar 2018 21:31:33 +0100 (CET) Received: by mail-wr0-x241.google.com with SMTP id h2so9563506wre.12 for ; Thu, 15 Mar 2018 13:31:38 -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=fNKJzZB+fyW8JNZqrHhDNEDe8VNDbni4vY32Uqs1ywQ=; b=cJrCQt+FQ2S4qBTwuJwHAKPIDeacTkexYAhmX+u6yp/MQZb/XJN/kmk0VAhN/zwCbr PjL+ntyrjMlf/onlG43cvyaWmuJYueO5JfxmY5nTVBE7+5Twgr1KX+s+ZCVkkarPt+LY cZ0FxcXwJyp8rxSNOTzWCyvbcsqzPcdxuA3iE= 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=fNKJzZB+fyW8JNZqrHhDNEDe8VNDbni4vY32Uqs1ywQ=; b=flwhMlgv5kn3DZRIrTuDbFYbZQgfKb0Jn7F1JHUcHcQWKeveM9gcj+2B2/l5DKjg1r mR+Bd0UwBiK+yzvWYCGsYaZmLX0g3awGEJouv91xmIuTDUAEKQd7UW0k03PMjl5Ov3nm R0oeK13mX4EEv+0OhhvNnH3OFMt7cyJ8U2v0FvJDTWeo693/y4GsdMZYusmynv5GsONB m8qRed5H3CJTux04dZwZ6lVSsS/xL4UdoXxGMzIYZRV60vBHkxPXokJqmoIQVDglvuuy ojd/jcqEqfaXmKkrwLEwzrZEP9Vs4RK9ghq30XRT69y+mQLmP48u47DyuM7j9TN25ehF PB0A== X-Gm-Message-State: AElRT7FO6WRFOYPHWenCh9Gm+4RcVGQRkthFPd1n37soVJeciWdju7Xa xEaQ7bUyLzr/XFDC6qA0Hq+slA== X-Received: by 10.223.201.142 with SMTP id f14mr8663740wrh.40.1521145897744; Thu, 15 Mar 2018 13:31:37 -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.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 15 Mar 2018 13:31:37 -0700 (PDT) From: Andre Przywara To: Stefano Stabellini , Julien Grall Date: Thu, 15 Mar 2018 20:30:33 +0000 Message-Id: <20180315203050.19791-29-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 28/45] ARM: new VGIC: Add PRIORITY registers 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" 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 --- Changelog v1 ... v2: - fix commit message 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 170017bde3..c6eef7b948 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 d135c26c80..2feed9615f 100644 --- a/xen/arch/arm/vgic/vgic.h +++ b/xen/arch/arm/vgic/vgic.h @@ -21,6 +21,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)