From patchwork Mon Apr 3 20:28:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Przywara X-Patchwork-Id: 9660569 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 015DC6032D for ; Mon, 3 Apr 2017 20:29:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E5E7228403 for ; Mon, 3 Apr 2017 20:29:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DACDC2841C; Mon, 3 Apr 2017 20:29:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E70B528403 for ; Mon, 3 Apr 2017 20:29:09 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cv8Yt-00054n-6F; Mon, 03 Apr 2017 20:26:51 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cv8Yr-00052D-8q for xen-devel@lists.xenproject.org; Mon, 03 Apr 2017 20:26:49 +0000 Received: from [193.109.254.147] by server-3.bemta-6.messagelabs.com id A7/41-27751-800B2E85; Mon, 03 Apr 2017 20:26:48 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrCLMWRWlGSWpSXmKPExsVysyfVTZd9w6M Ig//b1S2+b5nM5MDocfjDFZYAxijWzLyk/IoE1oxzL5cyFdxcwFgxf/UuxgbGs+VdjFwcQgKb GCWWzPzFCuEsZ5T4tfwRkMPJwSagK7Hj5mtmEFtEIFTi6YLvYDazgJLE/rPXGEFsYQFPiTcPJ 7CD2CwCqhI3lu0Cq+EVsJboe7qTCcSWEJCTaDh/HyzOCRRv/XgUrFdIwEpiwsMmpgmM3AsYGV YxahSnFpWlFukamuglFWWmZ5TkJmbm6BoamOnlphYXJ6an5iQmFesl5+duYgT6mAEIdjBe3xh wiFGSg0lJlFd90qMIIb6k/JTKjMTijPii0pzU4kOMMhwcShK8x9YB5QSLUtNTK9Iyc4DBBpOW 4OBREuHdDJLmLS5IzC3OTIdInWLU5Vj0b/cbJiGWvPy8VClxXv71QEUCIEUZpXlwI2CBf4lRV kqYlxHoKCGegtSi3MwSVPlXjOIcjErCvC/WAk3hycwrgdv0CugIJqAjntx5CHJESSJCSqqB0b 7f+KjFoj/HNU9r37u58fEZc4knUjP6l1me2B9uubv8L2Md75e6/vjebyHs19Ll3yeprkhMfs4 YYC4Y8+ITU4bDXZFPPlMuNP04ddMkydP2w/RKY9eblXdMevT4Y8zWrp9v/ubg3eVnXmcaS95f nN7OXb+AY5ORSW3cmdm2p1ZoGwnWGt86p8RSnJFoqMVcVJwIALN7S/N3AgAA X-Env-Sender: andre.przywara@arm.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1491251206!42872062!1 X-Originating-IP: [217.140.101.70] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.2.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 35430 invoked from network); 3 Apr 2017 20:26:47 -0000 Received: from foss.arm.com (HELO foss.arm.com) (217.140.101.70) by server-2.tower-27.messagelabs.com with SMTP; 3 Apr 2017 20:26:47 -0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id A247380D; Mon, 3 Apr 2017 13:26:46 -0700 (PDT) Received: from e104803-lin.lan (unknown [10.1.207.46]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 9FEA63F4FF; Mon, 3 Apr 2017 13:26:45 -0700 (PDT) From: Andre Przywara To: Julien Grall , Stefano Stabellini Date: Mon, 3 Apr 2017 21:28:16 +0100 Message-Id: <20170403202829.7278-15-andre.przywara@arm.com> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170403202829.7278-1-andre.przywara@arm.com> References: <20170403202829.7278-1-andre.przywara@arm.com> Cc: xen-devel@lists.xenproject.org Subject: [Xen-devel] [PATCH v4 14/27] ARM: vGICv3: introduce basic ITS emulation bits X-BeenThere: xen-devel@lists.xen.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.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Create a new file to hold the emulation code for the ITS widget. For now we emulate the memory mapped ITS registers and provide a stub to introduce the ITS command handling framework (but without actually emulating any commands at this time). Signed-off-by: Andre Przywara --- xen/arch/arm/Makefile | 1 + xen/arch/arm/vgic-v3-its.c | 547 ++++++++++++++++++++++++++++++++++++++ xen/arch/arm/vgic-v3.c | 9 - xen/include/asm-arm/gic_v3_defs.h | 19 ++ xen/include/asm-arm/gic_v3_its.h | 2 + 5 files changed, 569 insertions(+), 9 deletions(-) create mode 100644 xen/arch/arm/vgic-v3-its.c diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile index 6be85ab..49e1fb2 100644 --- a/xen/arch/arm/Makefile +++ b/xen/arch/arm/Makefile @@ -47,6 +47,7 @@ obj-y += traps.o obj-y += vgic.o obj-y += vgic-v2.o obj-$(CONFIG_HAS_GICV3) += vgic-v3.o +obj-$(CONFIG_HAS_ITS) += vgic-v3-its.o obj-y += vm_event.o obj-y += vtimer.o obj-y += vpsci.o diff --git a/xen/arch/arm/vgic-v3-its.c b/xen/arch/arm/vgic-v3-its.c new file mode 100644 index 0000000..fd3b9a1 --- /dev/null +++ b/xen/arch/arm/vgic-v3-its.c @@ -0,0 +1,547 @@ +/* + * xen/arch/arm/vgic-v3-its.c + * + * ARM Interrupt Translation Service (ITS) emulation + * + * Andre Przywara + * Copyright (c) 2016,2017 ARM Ltd. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; under version 2 of the License. + * + * 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 . + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/* Data structure to describe a virtual ITS */ +#define VIRT_ITS_ENABLED 0 +#define VIRT_ITS_COLL_VALID 1 +#define VIRT_ITS_DEV_VALID 2 +#define VIRT_ITS_CMDBUF_VALID 3 +struct virt_its { + struct domain *d; + spinlock_t vcmd_lock; /* Protects the virtual command buffer. */ + uint64_t cbaser; + uint64_t cwriter; + uint64_t creadr; + spinlock_t its_lock; /* Protects the collection and device tables. */ + uint64_t baser_dev, baser_coll; + unsigned int max_collections; + unsigned int max_devices; + unsigned int devid_bits; + unsigned int intid_bits; + unsigned long flags; +}; + +/* + * An Interrupt Translation Table Entry: this is indexed by a + * DeviceID/EventID pair and is located in guest memory. + */ +struct vits_itte +{ + uint32_t vlpi; + uint16_t collection; + uint16_t pad; +}; + +static bool its_is_enabled(struct virt_its *its) +{ + return test_bit(VIRT_ITS_ENABLED, &its->flags); +} + +/************************************** + * Functions that handle ITS commands * + **************************************/ + +static uint64_t its_cmd_mask_field(uint64_t *its_cmd, unsigned int word, + unsigned int shift, unsigned int size) +{ + return (le64_to_cpu(its_cmd[word]) >> shift) & (BIT(size) - 1); +} + +#define its_cmd_get_command(cmd) its_cmd_mask_field(cmd, 0, 0, 8) +#define its_cmd_get_deviceid(cmd) its_cmd_mask_field(cmd, 0, 32, 32) +#define its_cmd_get_size(cmd) its_cmd_mask_field(cmd, 1, 0, 5) +#define its_cmd_get_id(cmd) its_cmd_mask_field(cmd, 1, 0, 32) +#define its_cmd_get_physical_id(cmd) its_cmd_mask_field(cmd, 1, 32, 32) +#define its_cmd_get_collection(cmd) its_cmd_mask_field(cmd, 2, 0, 16) +#define its_cmd_get_target_addr(cmd) its_cmd_mask_field(cmd, 2, 16, 32) +#define its_cmd_get_validbit(cmd) its_cmd_mask_field(cmd, 2, 63, 1) + +#define ITS_CMD_BUFFER_SIZE(baser) ((((baser) & 0xff) + 1) << 12) + +static int vgic_its_handle_cmds(struct domain *d, struct virt_its *its, + uint32_t writer) +{ + paddr_t cmdbuf_addr = its->cbaser & GENMASK_ULL(51, 12); + void *cmdbuf = NULL; + uint64_t *cmdptr; + + if ( writer >= ITS_CMD_BUFFER_SIZE(its->cbaser) ) + return -1; + + spin_lock(&its->vcmd_lock); + + while ( its->creadr != writer ) + { + int ret; + + ret = 0; + + /* + * If this is the first command we handle or we cross a page boundary, + * we need to (re)map the command buffer. + */ + if ( !cmdbuf || (its->creadr & ~PAGE_MASK) == 0 ) + { + if ( cmdbuf ) + unmap_one_guest_page(cmdbuf); + cmdbuf = map_one_guest_page(d, + (cmdbuf_addr + its->creadr) & PAGE_MASK); + if ( !cmdbuf ) + return -EFAULT; + } + cmdptr = cmdbuf + (its->creadr & ~PAGE_MASK); + + switch ( its_cmd_get_command(cmdptr) ) + { + case GITS_CMD_SYNC: + /* We handle ITS commands synchronously, so we ignore SYNC. */ + break; + default: + gdprintk(XENLOG_WARNING, "ITS: unhandled ITS command %lu\n", + its_cmd_get_command(cmdptr)); + break; + } + + its->creadr += ITS_CMD_SIZE; + if ( its->creadr == ITS_CMD_BUFFER_SIZE(its->cbaser) ) + its->creadr = 0; + + if ( ret ) + gdprintk(XENLOG_WARNING, + "ITS: ITS command error %d while handling command %lu\n", + ret, its_cmd_get_command(cmdptr)); + } + its->cwriter = writer; + + spin_unlock(&its->vcmd_lock); + + if ( cmdbuf ) + unmap_one_guest_page(cmdbuf); + + return 0; +} + +/***************************** + * ITS registers read access * + *****************************/ + +static int vgic_v3_its_mmio_read(struct vcpu *v, mmio_info_t *info, + register_t *r, void *priv) +{ + struct virt_its *its = priv; + uint64_t reg; + + switch ( info->gpa & 0xffff ) + { + case VREG32(GITS_CTLR): + if ( info->dabt.size != DABT_WORD ) goto bad_width; + if ( its_is_enabled(its) ) + reg = GITS_CTLR_ENABLE | BIT(31); + else + reg = BIT(31); + *r = vgic_reg32_extract(reg, info); + break; + case VREG32(GITS_IIDR): + if ( info->dabt.size != DABT_WORD ) goto bad_width; + *r = vgic_reg32_extract(GITS_IIDR_VALUE, info); + break; + case VREG64(GITS_TYPER): + if ( !vgic_reg64_check_access(info->dabt) ) goto bad_width; + + reg = GITS_TYPER_PHYSICAL; + reg |= (sizeof(struct vits_itte) - 1) << GITS_TYPER_ITT_SIZE_SHIFT; + reg |= (its->intid_bits - 1) << GITS_TYPER_IDBITS_SHIFT; + reg |= (its->devid_bits - 1) << GITS_TYPER_DEVIDS_SHIFT; + *r = vgic_reg64_extract(reg, info); + break; + case VREG64(GITS_CBASER): + if ( ! vgic_reg64_check_access(info->dabt) ) goto bad_width; + *r = vgic_reg64_extract(its->cbaser, info); + break; + case VREG64(GITS_CWRITER): + if ( ! vgic_reg64_check_access(info->dabt) ) goto bad_width; + *r = vgic_reg64_extract(its->cwriter, info); + break; + case VREG64(GITS_CREADR): + if ( ! vgic_reg64_check_access(info->dabt) ) goto bad_width; + *r = vgic_reg64_extract(its->creadr, info); + break; + case VREG64(GITS_BASER0): + if ( ! vgic_reg64_check_access(info->dabt) ) goto bad_width; + *r = vgic_reg64_extract(its->baser_dev, info); + break; + case VREG64(GITS_BASER1): + if ( ! vgic_reg64_check_access(info->dabt) ) goto bad_width; + *r = vgic_reg64_extract(its->baser_coll, info); + break; + case VRANGE64(GITS_BASER2, GITS_BASER7): + if ( ! vgic_reg64_check_access(info->dabt) ) goto bad_width; + *r = vgic_reg64_extract(0, info); + break; + case VREG32(GITS_PIDR2): + if ( info->dabt.size != DABT_WORD ) goto bad_width; + *r = vgic_reg32_extract(GICV3_GICD_PIDR2, info); + break; + } + + return 1; + +bad_width: + domain_crash_synchronous(); + + return 0; +} + +/****************************** + * ITS registers write access * + ******************************/ + +static int its_baser_table_size(uint64_t baser) +{ + int page_size = 0; + + switch ( (baser >> 8) & 3 ) + { + case 0: page_size = SZ_4K; break; + case 1: page_size = SZ_16K; break; + case 2: + case 3: page_size = SZ_64K; break; + } + + return page_size * ((baser & GENMASK_ULL(7, 0)) + 1); +} + +static int its_baser_nr_entries(uint64_t baser) +{ + int entry_size = ((baser & GENMASK_ULL(52, 48)) >> 48) + 1; + + return its_baser_table_size(baser) / entry_size; +} + +static int vgic_its_map_cmdbuf(struct virt_its *its) +{ + if ( !(its->cbaser & GITS_VALID_BIT) ) + return -EBUSY; + + return get_guest_pages(its->d, its->cbaser & GENMASK_ULL(51, 12), + (its->cbaser & 0xff) + 1); +} + +static void vgic_its_unmap_cmdbuf(struct virt_its *its) +{ + int nr_pages = (its->cbaser & 0xff) + 1; + + put_guest_pages(its->d, its->cbaser & GENMASK_ULL(51, 12), nr_pages); +} + +static int vgic_its_map_its_table(struct virt_its *its, uint64_t reg) +{ + unsigned int i, table_size = its_baser_table_size(reg); + paddr_t guest_addr = get_baser_phys_addr(reg); + + if ( !(reg & GITS_VALID_BIT) ) + return -EINVAL; + + get_guest_pages(its->d, guest_addr, table_size >> PAGE_SHIFT); + /* Map each page one by one to check and clear it. */ + for ( i = 0; i < table_size >> PAGE_SHIFT; i++ ) + { + void *ptr = map_one_guest_page(its->d, guest_addr + (i << PAGE_SHIFT)); + + if ( !ptr ) + return -EFAULT; + + memset(ptr, 0, table_size); + unmap_one_guest_page(ptr); + } + + return 0; +} + +static void vgic_its_unmap_its_table(struct domain *d, uint64_t reg) +{ + put_guest_pages(d, get_baser_phys_addr(reg), + its_baser_table_size(reg) >> PAGE_SHIFT); +} + +static bool vgic_v3_its_change_its_status(struct virt_its *its, bool status) +{ + bool ret = true; + + if ( !status ) + { + clear_bit(VIRT_ITS_ENABLED, &its->flags); + return false; + } + + if ( !vgic_its_map_cmdbuf(its) ) + set_bit(VIRT_ITS_CMDBUF_VALID, &its->flags); + else + { + clear_bit(VIRT_ITS_CMDBUF_VALID, &its->flags); + ret = false; + } + + if ( !vgic_its_map_its_table(its, its->baser_dev) ) + set_bit(VIRT_ITS_DEV_VALID, &its->flags); + else + { + clear_bit(VIRT_ITS_DEV_VALID, &its->flags); + ret = false; + } + + if ( !vgic_its_map_its_table(its, its->baser_coll) ) + set_bit(VIRT_ITS_COLL_VALID, &its->flags); + else + { + clear_bit(VIRT_ITS_COLL_VALID, &its->flags); + ret = false; + } + + if ( ret ) + set_bit(VIRT_ITS_ENABLED, &its->flags); + else + clear_bit(VIRT_ITS_ENABLED, &its->flags); + + return ret; +} + +static void sanitize_its_base_reg(uint64_t *reg) +{ + uint64_t r = *reg; + + /* Avoid outer shareable. */ + switch ( (r >> GITS_BASER_SHAREABILITY_SHIFT) & 0x03 ) + { + case GIC_BASER_OuterShareable: + r = r & ~GITS_BASER_SHAREABILITY_MASK; + r |= GIC_BASER_InnerShareable << GITS_BASER_SHAREABILITY_SHIFT; + break; + default: + break; + } + + /* Avoid any inner non-cacheable mapping. */ + switch ( (r >> GITS_BASER_INNER_CACHEABILITY_SHIFT) & 0x07 ) + { + case GIC_BASER_CACHE_nCnB: + case GIC_BASER_CACHE_nC: + r = r & ~GITS_BASER_INNER_CACHEABILITY_MASK; + r |= GIC_BASER_CACHE_RaWb << GITS_BASER_INNER_CACHEABILITY_SHIFT; + break; + default: + break; + } + + /* Only allow non-cacheable or same-as-inner. */ + switch ( (r >> GITS_BASER_OUTER_CACHEABILITY_SHIFT) & 0x07 ) + { + case GIC_BASER_CACHE_SameAsInner: + case GIC_BASER_CACHE_nC: + break; + default: + r = r & ~GITS_BASER_OUTER_CACHEABILITY_MASK; + r |= GIC_BASER_CACHE_nC << GITS_BASER_OUTER_CACHEABILITY_SHIFT; + break; + } + + *reg = r; +} + +static int vgic_v3_its_mmio_write(struct vcpu *v, mmio_info_t *info, + register_t r, void *priv) +{ + struct domain *d = v->domain; + struct virt_its *its = priv; + uint64_t reg; + uint32_t reg32, ctlr; + + switch ( info->gpa & 0xffff ) + { + case VREG32(GITS_CTLR): + if ( info->dabt.size != DABT_WORD ) goto bad_width; + + ctlr = its_is_enabled(its) ? GITS_CTLR_ENABLE : 0; + reg32 = ctlr; + vgic_reg32_update(®32, r, info); + + if ( ctlr ^ reg32 ) + vgic_v3_its_change_its_status(its, reg32 & GITS_CTLR_ENABLE); + return 1; + + case VREG32(GITS_IIDR): + goto write_ignore_32; + case VREG32(GITS_TYPER): + goto write_ignore_32; + case VREG64(GITS_CBASER): + if ( ! vgic_reg64_check_access(info->dabt) ) goto bad_width; + + /* Changing base registers with the ITS enabled is UNPREDICTABLE. */ + if ( its_is_enabled(its) ) + { + gdprintk(XENLOG_WARNING, "ITS: Domain %d tried to change CBASER with the ITS enabled.\n", d->domain_id); + return 1; + } + + reg = its->cbaser; + vgic_reg64_update(®, r, info); + sanitize_its_base_reg(®); + + vgic_its_unmap_cmdbuf(its); + its->cbaser = reg; + + return 1; + + case VREG64(GITS_CWRITER): + if ( ! vgic_reg64_check_access(info->dabt) ) goto bad_width; + reg = its->cwriter & 0xfffe0; + vgic_reg64_update(®, r, info); + its->cwriter = reg & 0xfffe0; + + if ( its_is_enabled(its) ) + vgic_its_handle_cmds(d, its, reg); + + return 1; + + case VREG64(GITS_CREADR): + goto write_ignore_64; + case VREG64(GITS_BASER0): + if ( ! vgic_reg64_check_access(info->dabt) ) goto bad_width; + + /* Changing base registers with the ITS enabled is UNPREDICTABLE. */ + if ( its_is_enabled(its) ) + { + gdprintk(XENLOG_WARNING, "ITS: Domain %d tried to change BASER with the ITS enabled.\n", + d->domain_id); + + return 1; + } + + reg = its->baser_dev; + vgic_reg64_update(®, r, info); + + reg &= ~GITS_BASER_RO_MASK; + reg |= (sizeof(uint64_t) - 1) << GITS_BASER_ENTRY_SIZE_SHIFT; + reg |= GITS_BASER_TYPE_DEVICE << GITS_BASER_TYPE_SHIFT; + sanitize_its_base_reg(®); + + /* Has the table address been changed or invalidated? */ + if ( !(reg & GITS_VALID_BIT) || + get_baser_phys_addr(reg) != get_baser_phys_addr(its->baser_dev) ) + { + vgic_its_unmap_its_table(its->d, its->baser_dev); + clear_bit(VIRT_ITS_DEV_VALID, &its->flags); + } + + if ( reg & GITS_VALID_BIT ) + its->max_devices = its_baser_nr_entries(reg); + else + its->max_devices = 0; + + its->baser_dev = reg; + return 1; + case VREG64(GITS_BASER1): + if ( ! vgic_reg64_check_access(info->dabt) ) goto bad_width; + + /* Changing base registers with the ITS enabled is UNPREDICTABLE. */ + if ( its_is_enabled(its) ) + { + gdprintk(XENLOG_INFO, "ITS: Domain %d tried to change BASER with the ITS enabled.\n", + d->domain_id); + return 1; + } + + reg = its->baser_coll; + vgic_reg64_update(®, r, info); + reg &= ~GITS_BASER_RO_MASK; + reg |= (sizeof(uint16_t) - 1) << GITS_BASER_ENTRY_SIZE_SHIFT; + reg |= GITS_BASER_TYPE_COLLECTION << GITS_BASER_TYPE_SHIFT; + sanitize_its_base_reg(®); + + if ( !(reg & GITS_VALID_BIT) || + get_baser_phys_addr(reg) != get_baser_phys_addr(its->baser_coll) ) + { + vgic_its_unmap_its_table(its->d, its->baser_coll); + clear_bit(VIRT_ITS_COLL_VALID, &its->flags); + } + + if ( reg & GITS_VALID_BIT ) + its->max_collections = its_baser_nr_entries(reg); + else + its->max_collections = 0; + its->baser_coll = reg; + return 1; + case VRANGE64(GITS_BASER2, GITS_BASER7): + goto write_ignore_64; + default: + gdprintk(XENLOG_G_WARNING, "ITS: unhandled ITS register 0x%lx\n", + info->gpa & 0xffff); + return 0; + } + + return 1; + +write_ignore_64: + if ( ! vgic_reg64_check_access(info->dabt) ) goto bad_width; + return 1; + +write_ignore_32: + if ( info->dabt.size != DABT_WORD ) goto bad_width; + return 1; + +bad_width: + printk(XENLOG_G_ERR "%pv vGICR: bad read width %d r%d offset %#08lx\n", + v, info->dabt.size, info->dabt.reg, info->gpa & 0xffff); + + domain_crash_synchronous(); + + return 0; +} + +static const struct mmio_handler_ops vgic_its_mmio_handler = { + .read = vgic_v3_its_mmio_read, + .write = vgic_v3_its_mmio_write, +}; + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/arm/vgic-v3.c b/xen/arch/arm/vgic-v3.c index 2c6b317..ebcfc16 100644 --- a/xen/arch/arm/vgic-v3.c +++ b/xen/arch/arm/vgic-v3.c @@ -158,15 +158,6 @@ static void vgic_store_irouter(struct domain *d, struct vgic_irq_rank *rank, write_atomic(&rank->vcpu[offset], new_vcpu->vcpu_id); } -static inline bool vgic_reg64_check_access(struct hsr_dabt dabt) -{ - /* - * 64 bits registers can be accessible using 32-bit and 64-bit unless - * stated otherwise (See 8.1.3 ARM IHI 0069A). - */ - return ( dabt.size == DABT_DOUBLE_WORD || dabt.size == DABT_WORD ); -} - static int __vgic_v3_rdistr_rd_mmio_read(struct vcpu *v, mmio_info_t *info, uint32_t gicr_reg, register_t *r) diff --git a/xen/include/asm-arm/gic_v3_defs.h b/xen/include/asm-arm/gic_v3_defs.h index b01b6ed..8999937 100644 --- a/xen/include/asm-arm/gic_v3_defs.h +++ b/xen/include/asm-arm/gic_v3_defs.h @@ -155,6 +155,16 @@ #define LPI_PROP_RES1 (1 << 1) #define LPI_PROP_ENABLED (1 << 0) +/* + * PIDR2: Only bits[7:4] are not implementation defined. We are + * emulating a GICv3 ([7:4] = 0x3). + * + * We don't emulate a specific registers scheme so implement the others + * bits as RES0 as recommended by the spec (see 8.1.13 in ARM IHI 0069A). + */ +#define GICV3_GICD_PIDR2 0x30 +#define GICV3_GICR_PIDR2 GICV3_GICD_PIDR2 + #define GICH_VMCR_EOI (1 << 9) #define GICH_VMCR_VENG1 (1 << 1) @@ -198,6 +208,15 @@ struct rdist_region { bool single_rdist; }; +/* + * 64 bits registers can be accessible using 32-bit and 64-bit unless + * stated otherwise (See 8.1.3 ARM IHI 0069A). + */ +static inline bool vgic_reg64_check_access(struct hsr_dabt dabt) +{ + return ( dabt.size == DABT_DOUBLE_WORD || dabt.size == DABT_WORD ); +} + #endif /* __ASM_ARM_GIC_V3_DEFS_H__ */ /* diff --git a/xen/include/asm-arm/gic_v3_its.h b/xen/include/asm-arm/gic_v3_its.h index d8165c4..b2a9586 100644 --- a/xen/include/asm-arm/gic_v3_its.h +++ b/xen/include/asm-arm/gic_v3_its.h @@ -35,6 +35,7 @@ #define GITS_BASER5 0x128 #define GITS_BASER6 0x130 #define GITS_BASER7 0x138 +#define GITS_PIDR2 GICR_PIDR2 /* Register bits */ #define GITS_VALID_BIT BIT_ULL(63) @@ -56,6 +57,7 @@ #define GITS_TYPER_ITT_SIZE_MASK (0xfUL << GITS_TYPER_ITT_SIZE_SHIFT) #define GITS_TYPER_ITT_SIZE(r) ((((r) & GITS_TYPER_ITT_SIZE_MASK) >> \ GITS_TYPER_ITT_SIZE_SHIFT) + 1) +#define GITS_TYPER_PHYSICAL (1U << 0) #define GITS_IIDR_VALUE 0x34c