From patchwork Wed Mar 21 16:32:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Przywara X-Patchwork-Id: 132214 Delivered-To: patch@linaro.org Received: by 10.46.84.29 with SMTP id i29csp2356004ljb; Wed, 21 Mar 2018 09:34:57 -0700 (PDT) X-Google-Smtp-Source: AG47ELtF9d07FXZCWhObpA6c8qx9Ekj3lqAWZ3xBh/YODrqSkHgSeL+Kwy1XHLkj0BTmRdTmwELR X-Received: by 10.107.47.198 with SMTP id v67mr12043978iov.281.1521650097051; Wed, 21 Mar 2018 09:34:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521650097; cv=none; d=google.com; s=arc-20160816; b=u3Pi73WpBayb6ixD5LYhVFnIpPV2GOEyXQJcjQCX558Pwg10NCDlPVoirBGp4MX9Kv j/RGTxuUMdz4FBG5sdxUxq3cvZY/lH9JGtpSRqyOEXNwbCz43vGREVTo+7Gsa4znt8eO yKx+M6jJ6N/WTomzioYBK5AtshPjmS9DxunpafA3xMxDxKiFO3EqVe5V4Vq0JVIIK1Pj 8TvBOd78gK/R/m8s+FYp5AmzJC7hdEWheYLN5UfaleKUjcdoPrb3rs2rXFYttxTVQd5z PJAIamimPa6GyPn/CnjNhz/49ykxwSmTIvzBWy04+mnsXXMr23JeSzRTmsoIQiW0fKK5 iq6A== 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=vobgIKvXBl2LlyBQRWGwoWv3tVpqqGHjrvD/+ZWP6UI=; b=aeHb0SyCrexNfj9nJC7HL2Y+jwQ6GOBtzoulF4r4sDMZrSuZ3MfQ0jrc0f7a1fddO3 7OhJ6tri2abdlNomKEfwhz9bhz36gVcX/RXNNCu7xG4h9l+BabjIHXJz/zH83a65b6bX C6qjbjH8me8lXvQ1J1yb4l91UmuB4Makuk++sR9CsspffZ72bbUNY2QxdiKqHkwaGsfU Guwo2ii+EJTc/dJZmw28sPxlK46+JL3Y1TJwl4wYfpkElpGhPwgATfjh1FS/vzO5cG9Z RHNpVj4Wb9K+aX0EY023U6S/evoXwV2owO4wB7bikmnwWF6f1dmiCj4uKiSHpyHiGAFI 6KCg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=HTH840Zu; 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 y140si3564092iof.236.2018.03.21.09.34.56 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 21 Mar 2018 09:34:57 -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=HTH840Zu; 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-0002c3-V2; 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 1eygfr-0002Yk-Or for xen-devel@lists.xenproject.org; Wed, 21 Mar 2018 16:33:15 +0000 X-Inumbo-ID: 84346562-2d25-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 84346562-2d25-11e8-9728-bc764e045a96; Wed, 21 Mar 2018 17:32:59 +0100 (CET) Received: by mail-wr0-x242.google.com with SMTP id z12so5845983wrg.4 for ; Wed, 21 Mar 2018 09:33:14 -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=2yMOMoEUl9iadCQD/Xm7emF9GnEDSEykd9gongtqzHQ=; b=HTH840ZurADeT81gk9yta4AxRmp7vTQdJEHqneovOFtbUMhBaQqUP5l/nIX9n7ZYMT rH4Wc9Qi00a9LRBcZsmXCE/WYO81IkgAfeCSQ33+Q2ekI3+yaxybPI9yyYxzZkJR7zOS Da5V5k+8CdZYVsarI+GTyBkPQ9eWrdkD5rsVo= 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=2yMOMoEUl9iadCQD/Xm7emF9GnEDSEykd9gongtqzHQ=; b=WH5928GMl7AuejlYIpB5/EseJy71bQ9tmK6HRWWewQyHeypISGH+4e7A8umea+vUa+ hRgA9HSFkGbhtgdLIeZcBN+yNfB/93Hq3kuHlW51Jg4R8MFe7u5wVSBw32igiYPearfP BydLM8J++c2ecdO5pULY2zpbFDm1doIZxGMEJw7i7BBBpfLQCQAG76X7pYJNoY5hWKOY mnoz7DyW6+pClqmFctoAPCTXMTnl0/sTHCP6tKkixKYpZPus925eFhdAzr9h1+GSRaUM JoXHsSakAalvCvjFeH2pBxGhfwGJBjYWuim6FGWNIC0e/lGDlpE2oKAI8LwharYoFVFG qL0g== X-Gm-Message-State: AElRT7FZYSEIMFOIKG/hSeP/Bijazjo5O7DJMQcVx+7CE4LVly/zvxg1 arwiVJwiSEFeoMFsj7op3JDS6Q== X-Received: by 10.223.152.142 with SMTP id w14mr18108700wrb.210.1521649993160; Wed, 21 Mar 2018 09:33:13 -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.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 21 Mar 2018 09:33:12 -0700 (PDT) From: Andre Przywara To: Julien Grall , Stefano Stabellini Date: Wed, 21 Mar 2018 16:32:19 +0000 Message-Id: <20180321163235.12529-24-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 23/39] ARM: new VGIC: Add CONFIG 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 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 --- 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 14b69d80d4..5bcb02e8c6 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