From patchwork Thu Nov 29 16:36:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Edgar E. Iglesias" X-Patchwork-Id: 10704883 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DCF3414BD for ; Thu, 29 Nov 2018 16:40:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CE3542F6AB for ; Thu, 29 Nov 2018 16:40:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C18BE2F6B4; Thu, 29 Nov 2018 16:40:52 +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=-3.9 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,FSL_HELO_FAKE,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 4174E2F6AD for ; Thu, 29 Nov 2018 16:40:52 +0000 (UTC) Received: from localhost ([::1]:55184 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gSPMw-0002UA-RY for patchwork-qemu-devel@patchwork.kernel.org; Thu, 29 Nov 2018 11:40:50 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37088) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gSPJK-0006qw-7j for qemu-devel@nongnu.org; Thu, 29 Nov 2018 11:37:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gSPJJ-0007Hy-Bd for qemu-devel@nongnu.org; Thu, 29 Nov 2018 11:37:06 -0500 Received: from mail-lf1-x142.google.com ([2a00:1450:4864:20::142]:46554) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gSPJJ-0007HJ-0n; Thu, 29 Nov 2018 11:37:05 -0500 Received: by mail-lf1-x142.google.com with SMTP id f23so1899392lfc.13; Thu, 29 Nov 2018 08:37:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=yCQBYP+c+rJdGPih61z5OTAPupDDbSWzHLcMswiIhtA=; b=C+IlHcs+fJBlefbpkBp5Eg3mspxomAzlbJjuux46k0xwPoemp8NWTrvGzaD/AHJPFP SaGMEunLuGimuinRnkfz98pLLxOvBSp8h3PmBN2DXF4B+N4q35Y0bUXyC2u/KIK8nl8K GM/vhaSsSf7jQfx7+NyKVXo/6sDyMIZSrDUnQq8ecLYGDi6A8dJRR0CkyzlM5hRHHoqj q6QSrB4n9+kI1Rg5lod12xpMCZxE3D3hLTp+imDQ4An+KLTvijdhA8XVAjRaVlsYCeHw 9j2f9LsOGQraWthZ2yQCaYM+CGbt2+RkKO+4cT8LJZFSaj9g4pAYa6BPTDyp1HugsLsZ qusA== 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=yCQBYP+c+rJdGPih61z5OTAPupDDbSWzHLcMswiIhtA=; b=UY/1oRNTU9omLrN1l8oysAzoOt5p79j3Mcmf6JL/q1QGYpQoBnsdGOAZO/Ee/zpiJv AdGwS9xgtLgA495i98g49wUHxZPaneopV38hy5Nm8OBFK6Jx2Rto4THGhQCh2LxpIR6d s/3mfGYhUs+JL4NHnu85zb11p4OBpT74n0N4MMJqgdF5YDvmMWPLj5P2KOKqQH1fQp11 3qYQxDstzjenfKP+xll3bXcTGyg9Bd34U8YYGCQQvzZY5mv9t4ESU1IsUTzp3z378+dw ZZI94B5Og844BCnuQaxSRrdgz772JC7CGVG9tRVPqTRc5Ovw5AQG73rw8V8L2qp5Aj7Y OQvg== X-Gm-Message-State: AA+aEWasZdGlS7U8W1QfwutjVGtCjuxGDi6s1LHjLOYGUs3FC9/1YvCQ jqA2GzlJ61NpOIYE9yvlew0Dt44L X-Google-Smtp-Source: AFSGD/Wdlm+97hzKxIMCvNQ9xRY/izMm+p63mJmSOOlVxNPVefwguWdJXbcpj9f+NLfB9NK4yiAvfQ== X-Received: by 2002:a19:6e0b:: with SMTP id j11mr1560468lfc.124.1543509423480; Thu, 29 Nov 2018 08:37:03 -0800 (PST) Received: from gmail.com (81-231-232-130-no39.tbcn.telia.com. [81.231.232.130]) by smtp.gmail.com with ESMTPSA id m4-v6sm358065ljb.58.2018.11.29.08.37.01 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 29 Nov 2018 08:37:01 -0800 (PST) From: "Edgar E. Iglesias" To: qemu-devel@nongnu.org, qemu-arm@nongnu.org Date: Thu, 29 Nov 2018 17:36:54 +0100 Message-Id: <20181129163655.20370-4-edgar.iglesias@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181129163655.20370-1-edgar.iglesias@gmail.com> References: <20181129163655.20370-1-edgar.iglesias@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::142 Subject: [Qemu-devel] [PATCH v1 3/4] hw/arm: versal: Use IRQs 111 - 118 for virtio-mmio X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: figlesia@xilinx.com, peter.maydell@linaro.org, sstabellini@kernel.org, edgar.iglesias@xilinx.com, sai.pavan.boddu@xilinx.com, frasse.iglesias@gmail.com, alistair@alistair23.me, frederic.konrad@adacore.com, muhammad_bilal@mentor.com, philmd@redhat.com, luc.michel@greensocs.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: "Edgar E. Iglesias" Use IRQs 111 - 118 for virtio-mmio. The interrupts we're currently using 160+ are not available in the Versal GIC. Signed-off-by: Edgar E. Iglesias Reviewed-by: Alistair Francis --- hw/arm/xlnx-versal-virt.c | 4 ++-- include/hw/arm/xlnx-versal.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/arm/xlnx-versal-virt.c b/hw/arm/xlnx-versal-virt.c index 2ed6ee9934..c6feeac532 100644 --- a/hw/arm/xlnx-versal-virt.c +++ b/hw/arm/xlnx-versal-virt.c @@ -351,7 +351,7 @@ static void create_virtio_regions(VersalVirt *s) for (i = 0; i < NUM_VIRTIO_TRANSPORT; i++) { char *name = g_strdup_printf("virtio%d", i);; hwaddr base = MM_TOP_RSVD + i * virtio_mmio_size; - int irq = VERSAL_RSVD_HIGH_IRQ_FIRST + i; + int irq = VERSAL_RSVD_IRQ_FIRST + i; MemoryRegion *mr; DeviceState *dev; qemu_irq pic_irq; @@ -368,7 +368,7 @@ static void create_virtio_regions(VersalVirt *s) for (i = 0; i < NUM_VIRTIO_TRANSPORT; i++) { hwaddr base = MM_TOP_RSVD + i * virtio_mmio_size; - int irq = VERSAL_RSVD_HIGH_IRQ_FIRST + i; + int irq = VERSAL_RSVD_IRQ_FIRST + i; char *name = g_strdup_printf("/virtio_mmio@%" PRIx64, base); qemu_fdt_add_subnode(s->fdt, name); diff --git a/include/hw/arm/xlnx-versal.h b/include/hw/arm/xlnx-versal.h index 9da621e4b6..76fb9de391 100644 --- a/include/hw/arm/xlnx-versal.h +++ b/include/hw/arm/xlnx-versal.h @@ -75,9 +75,9 @@ typedef struct Versal { #define VERSAL_GEM1_IRQ_0 58 #define VERSAL_GEM1_WAKE_IRQ_0 59 -/* Architecturally eserved IRQs suitable for virtualization. */ -#define VERSAL_RSVD_HIGH_IRQ_FIRST 160 -#define VERSAL_RSVD_HIGH_IRQ_LAST 255 +/* Architecturally reserved IRQs suitable for virtualization. */ +#define VERSAL_RSVD_IRQ_FIRST 111 +#define VERSAL_RSVD_IRQ_LAST 118 #define MM_TOP_RSVD 0xa0000000U #define MM_TOP_RSVD_SIZE 0x4000000