From patchwork Thu Mar 15 20:30:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Przywara X-Patchwork-Id: 131866 Delivered-To: patch@linaro.org Received: by 10.46.84.17 with SMTP id i17csp1579546ljb; Thu, 15 Mar 2018 13:33:39 -0700 (PDT) X-Google-Smtp-Source: AG47ELsgtD7Ztw+K1Immx58WeOHDBbB077wD69Q1v7gbVVAi2NdRAsS0yT9esT+SlEMywHmg9OuX X-Received: by 10.107.50.17 with SMTP id y17mr10016455ioy.223.1521146018934; Thu, 15 Mar 2018 13:33:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521146018; cv=none; d=google.com; s=arc-20160816; b=mtGlGNkbB5bzm3SVDuV0VrGT6y/G9HHH39gpeatODwcDuEwGxsriEKweKerE/xcR6s yUV6n1r4g+cjwcAmoIEIn1YwyUzzLSQ8QB9taEjiAJZEMWvgSkEStDu/FcpG/6YATATN Lwdd7xr+hhWIayS8qqmuYxyrZ9hNeFFsLfpmswecTdu6K7SToX7/mD2Vb3hDSRk0VYik wfJISMTkAvVQ+d+XGIrbYkiNrImAlmuj6c2JASVdwWXFUVf0s7o3pTp8YpZ0fC8UERxL zDadYdDOLN6fo5OQUHbE7C8KryNBscu2K4szxUc+3MdCjUE+DHVu6A0f3TD4ogGQMCAr SBxw== 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=ZIPi9Uw+D13Ul8pp4Vy46s4Nu4B+hnUwaRmmq+tmJrg=; b=kSTY2rjStwszkm1NFYzriAnEnn2vZFX0sRLA6XVNBkSpuUJHe6R1Rms6UZlijoDg9t UwatXAigGnvwVrnvpUcrDULSfdKGfJCFmbtEdiBezgN905t+l+87StI2LZKurZSnOj3h k2ZKjGQwdIMFtah7Xs8AhrYLFwPJq9HRRnf6k8thE8f3IDW5cS/yEn17yU6CGEBG+UHP MdEhLOriTfa9Ryib+2rHbx5mzz5mVuLqRmRoQyuurBkImOjSj9AO1953CPZRcskQNMCU b5KNybctZxbegVusbihWxTGo7WgdzkVsrYj41nq7Hjf63rKZ4hfC9mhXlyZTJYBHcDdF FyUg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=iyc5Dmaw; 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 g66si3710891iof.9.2018.03.15.13.33.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Mar 2018 13:33:38 -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=iyc5Dmaw; 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-00042f-9u; 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-0003yk-No for xen-devel@lists.xenproject.org; Thu, 15 Mar 2018 20:31:40 +0000 X-Inumbo-ID: da0bb24d-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 da0bb24d-288f-11e8-9728-bc764e045a96; Thu, 15 Mar 2018 21:31:34 +0100 (CET) Received: by mail-wr0-x241.google.com with SMTP id z12so9640985wrg.4 for ; Thu, 15 Mar 2018 13:31:39 -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=MwYUj/p7zTX2f0PHh67itpLNH1CpHlxiOt/E6jUPN0U=; b=iyc5DmawsojOjeQMpv8oteemqJmCRnr+BwO4nn0jLDjGTbCS+Xl7IoH0BvnP7ytK/f r5eDJr9wVgTUznLvX575QvLr7ssJKTfm28jM4cLuP6KdZxX7/Y5kvIkOOlp5l8C86EaT YSnBuM4wNuNdzVP9w3WlRL75eca7hnBiLZ6Uw= 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=MwYUj/p7zTX2f0PHh67itpLNH1CpHlxiOt/E6jUPN0U=; b=UBlZUC0Aa4yFfgh1t5qRFcXnaGXH5gzN0O2lCmnxGVU2RwfRz1AAdDt2kbddIorLG8 waNsVTq6TDfyWk0EmJV7v9UfgfAhuZHKcAYz1ex+PGiH9yd/PBUQhKZnTavQnOk2kvRG 0sN0gmsJ0IfJxSgGKtXVX6riJK+lmO+ciDEWYW4L5fZzkSZ2xsUUHTZj4BTSITa8HTZA rKutTbNsPeACoLiGLWaVshCYSxZq2yw8OgMF4kMfvaVYFihMsRk/gmnx2Sao51qf+LNR 2BN5gdrz8E8rd5w9txVfG8vNlikcC80HPXV8eVAcPO85QSkXMztOPyAYqV8WqEagHEGb jKnw== X-Gm-Message-State: AElRT7E8H/Bz3skKrUYQzGaYIm65o2rFOP0udUk5gNzcugY9hF0Tblz2 wLk2cD6/NIxUXSA7SYwnBHoxUA== X-Received: by 10.223.155.129 with SMTP id d1mr8950007wrc.8.1521145898888; Thu, 15 Mar 2018 13:31:38 -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.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 15 Mar 2018 13:31:38 -0700 (PDT) From: Andre Przywara To: Stefano Stabellini , Julien Grall Date: Thu, 15 Mar 2018 20:30:34 +0000 Message-Id: <20180315203050.19791-30-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 29/45] ARM: new VGIC: Add CONFIG 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 config 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 79717e4ac09c, written by Andre Przywara. Signed-off-by: Andre Przywara Reviewed-by: Julien Grall --- Changelog v1 ... v2: - Add Reviewed-by: xen/arch/arm/vgic/vgic-mmio-v2.c | 2 +- xen/arch/arm/vgic/vgic-mmio.c | 54 ++++++++++++++++++++++++++++++++++++++++ xen/arch/arm/vgic/vgic-mmio.h | 7 ++++++ 3 files changed, 62 insertions(+), 1 deletion(-) diff --git a/xen/arch/arm/vgic/vgic-mmio-v2.c b/xen/arch/arm/vgic/vgic-mmio-v2.c index d2d6a07e1b..a28d0e459b 100644 --- a/xen/arch/arm/vgic/vgic-mmio-v2.c +++ b/xen/arch/arm/vgic/vgic-mmio-v2.c @@ -113,7 +113,7 @@ static const struct vgic_register_region vgic_v2_dist_registers[] = { vgic_mmio_read_raz, vgic_mmio_write_wi, 8, VGIC_ACCESS_32bit | VGIC_ACCESS_8bit), REGISTER_DESC_WITH_BITS_PER_IRQ(GICD_ICFGR, - vgic_mmio_read_raz, vgic_mmio_write_wi, 2, + vgic_mmio_read_config, vgic_mmio_write_config, 2, VGIC_ACCESS_32bit), REGISTER_DESC_WITH_LENGTH(GICD_SGIR, vgic_mmio_read_raz, vgic_mmio_write_wi, 4, diff --git a/xen/arch/arm/vgic/vgic-mmio.c b/xen/arch/arm/vgic/vgic-mmio.c index c6eef7b948..1af76909f8 100644 --- a/xen/arch/arm/vgic/vgic-mmio.c +++ b/xen/arch/arm/vgic/vgic-mmio.c @@ -419,6 +419,60 @@ void vgic_mmio_write_priority(struct vcpu *vcpu, } } +unsigned long vgic_mmio_read_config(struct vcpu *vcpu, + paddr_t addr, unsigned int len) +{ + uint32_t intid = VGIC_ADDR_TO_INTID(addr, 2); + uint32_t value = 0; + int i; + + for ( i = 0; i < len * 4; i++ ) + { + struct vgic_irq *irq = vgic_get_irq(vcpu->domain, vcpu, intid + i); + + if ( irq->config == VGIC_CONFIG_EDGE ) + value |= (2U << (i * 2)); + + vgic_put_irq(vcpu->domain, irq); + } + + return value; +} + +void vgic_mmio_write_config(struct vcpu *vcpu, + paddr_t addr, unsigned int len, + unsigned long val) +{ + uint32_t intid = VGIC_ADDR_TO_INTID(addr, 2); + int i; + unsigned long flags; + + for ( i = 0; i < len * 4; i++ ) + { + struct vgic_irq *irq; + + /* + * The configuration cannot be changed for SGIs in general, + * for PPIs this is IMPLEMENTATION DEFINED. The arch timer + * code relies on PPIs being level triggered, so we also + * make them read-only here. + */ + if ( intid + i < VGIC_NR_PRIVATE_IRQS ) + continue; + + irq = vgic_get_irq(vcpu->domain, vcpu, intid + i); + spin_lock_irqsave(&irq->irq_lock, flags); + + if ( test_bit(i * 2 + 1, &val) ) + irq->config = VGIC_CONFIG_EDGE; + else + irq->config = VGIC_CONFIG_LEVEL; + + 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 b2d572d562..3566cf237c 100644 --- a/xen/arch/arm/vgic/vgic-mmio.h +++ b/xen/arch/arm/vgic/vgic-mmio.h @@ -126,6 +126,13 @@ void vgic_mmio_write_priority(struct vcpu *vcpu, paddr_t addr, unsigned int len, unsigned long val); +unsigned long vgic_mmio_read_config(struct vcpu *vcpu, + paddr_t addr, unsigned int len); + +void vgic_mmio_write_config(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