From patchwork Thu May 19 22:54:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Edgar E. Iglesias" X-Patchwork-Id: 9128407 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 20DEC60467 for ; Thu, 19 May 2016 23:03:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 150431FEDE for ; Thu, 19 May 2016 23:03:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 09D3120265; Thu, 19 May 2016 23:03:01 +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=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID 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 7D2801FEDE for ; Thu, 19 May 2016 23:03:00 +0000 (UTC) Received: from localhost ([::1]:52469 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b3Wy3-0006dj-LX for patchwork-qemu-devel@patchwork.kernel.org; Thu, 19 May 2016 19:02:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45903) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b3Wpt-0008R2-2A for qemu-devel@nongnu.org; Thu, 19 May 2016 18:54:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b3Wpn-0007G8-2S for qemu-devel@nongnu.org; Thu, 19 May 2016 18:54:32 -0400 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]:34832) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b3Wpm-0007Fu-D9; Thu, 19 May 2016 18:54:26 -0400 Received: by mail-wm0-x244.google.com with SMTP id s63so10274890wme.2; Thu, 19 May 2016 15:54:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=zFnkE3dN6rw5G4hQBrZz5iM3il3HrY+jjDEA6JqrQpY=; b=daVARecE7rjrKXKPtqhSszr8zo0lKudMkGlQnsKutlBnL/4+uOGNkeTSmlz96qaZNL Flg36vgnn1v/vD/3D2/ncu11lMeFM4LGLVEG3wxbrSWwVpI0thxfp0lhbxUuTGpS7QwA xAi40TdQ7KiSBu1NjIigzZCUohFsqa8CxD9D/5wjiayPFYKg7VRlQQXECMSl5fF0Wbjg ODZkJnwNj3QquEIyEob9bJ6q3VZwNw9wS6Yz+I51g3OJ1QAgVK9thvHCG9oAPyB0AOln 9RBcRGg10c4wLZIGPwGFc+0qYOH7RlDrcEVa/hciAuCwwMMsT/bponpQbUEY1aH693h9 iNVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=zFnkE3dN6rw5G4hQBrZz5iM3il3HrY+jjDEA6JqrQpY=; b=lpfw1Mbr083ntZEXuASmGUFVxV5R6VijEjBn3jDv+s8Ll0+B51E16Fofar+EY3eLpV r/4XYxgLfrglMMDBXmGmudp0mk6OkPFOfa1FRkFpMA6WQrzmm6jdAl0DCehbYxCdPYzS xn5L5xbJwaZsNFSUPk4G1SoPtUvBExX6QJq0K/UMOA0z7LZLG+vdSVJ/7UBRvm0mGrBb CqHFPEWdjbwjS9hY5JqY7Z8CwSQD0yZNTdhPc792CiHbZnBcEJZE0GkkjL8sX8m1hNZ/ 6EHtsrweNFrR0GzpYkaGQjWGyIob2406qHaBMg6vz5BTB3F4l+SdgQhuCeYj6cebN6BL FdaQ== X-Gm-Message-State: AOPr4FXfhlRDfozJkuQeJkgQpaPA6sTlxnTczIg37p6+xpWzkQSOtc6GKGxZpGiCmbnriA== X-Received: by 10.194.122.199 with SMTP id lu7mr17097828wjb.40.1463698465768; Thu, 19 May 2016 15:54:25 -0700 (PDT) Received: from localhost (81-231-233-234-no56.tbcn.telia.com. [81.231.233.234]) by smtp.gmail.com with ESMTPSA id iv1sm16666344wjb.34.2016.05.19.15.54.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 May 2016 15:54:25 -0700 (PDT) From: "Edgar E. Iglesias" To: qemu-devel@nongnu.org Date: Fri, 20 May 2016 00:54:17 +0200 Message-Id: <1463698459-31312-4-git-send-email-edgar.iglesias@gmail.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1463698459-31312-1-git-send-email-edgar.iglesias@gmail.com> References: <1463698459-31312-1-git-send-email-edgar.iglesias@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::244 Subject: [Qemu-devel] [PATCH v1 3/5] xlnx-zynqmp: Make the RPU subsystem optional 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: edgar.iglesias@xilinx.com, peter.maydell@linaro.org, crosthwaite.peter@gmail.com, qemu-arm@nongnu.org, alistair.francis@xilinx.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" The way we currently model the RPU subsystem is of quite limited use. In addition to that, it causes problems for KVM and for GDB debugging. Make the RPU optional by adding a has_rpu property and default to having it disabled. Signed-off-by: Edgar E. Iglesias --- hw/arm/xlnx-zynqmp.c | 50 +++++++++++++++++++++++++++++++++++++------- include/hw/arm/xlnx-zynqmp.h | 2 ++ 2 files changed, 44 insertions(+), 8 deletions(-) diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c index 250ecc4..c180206 100644 --- a/hw/arm/xlnx-zynqmp.c +++ b/hw/arm/xlnx-zynqmp.c @@ -83,6 +83,40 @@ static inline int arm_gic_ppi_index(int cpu_nr, int ppi_index) return GIC_NUM_SPI_INTR + cpu_nr * GIC_INTERNAL + ppi_index; } +static bool xlnx_zynqmp_get_has_rpu(Object *obj, Error **errp) +{ + XlnxZynqMPState *s = XLNX_ZYNQMP(obj); + + return s->has_rpu; +} + +static void xlnx_zynqmp_set_has_rpu(Object *obj, bool value, Error **errp) +{ + XlnxZynqMPState *s = XLNX_ZYNQMP(obj); + int i; + + if (s->has_rpu == value) { + /* Nothing to do. */ + return; + } + + /* We don't support clearing the flag. */ + if (s->has_rpu) { + error_setg(errp, "has_rpu is already set to %u", + s->has_rpu); + return; + } + + /* Create the Cortex R5s. */ + for (i = 0; i < XLNX_ZYNQMP_NUM_RPU_CPUS; i++) { + object_initialize(&s->rpu_cpu[i], sizeof(s->rpu_cpu[i]), + "cortex-r5-" TYPE_ARM_CPU); + object_property_add_child(obj, "rpu-cpu[*]", OBJECT(&s->rpu_cpu[i]), + &error_abort); + } + s->has_rpu = value; +} + static void xlnx_zynqmp_setup_rpu(XlnxZynqMPState *s, const char *boot_cpu, Error **errp) { @@ -118,6 +152,11 @@ static void xlnx_zynqmp_init(Object *obj) XlnxZynqMPState *s = XLNX_ZYNQMP(obj); int i; + object_property_add_bool(obj, "has_rpu", + xlnx_zynqmp_get_has_rpu, + xlnx_zynqmp_set_has_rpu, + &error_abort); + for (i = 0; i < XLNX_ZYNQMP_NUM_APU_CPUS; i++) { object_initialize(&s->apu_cpu[i], sizeof(s->apu_cpu[i]), "cortex-a53-" TYPE_ARM_CPU); @@ -125,13 +164,6 @@ static void xlnx_zynqmp_init(Object *obj) &error_abort); } - for (i = 0; i < XLNX_ZYNQMP_NUM_RPU_CPUS; i++) { - object_initialize(&s->rpu_cpu[i], sizeof(s->rpu_cpu[i]), - "cortex-r5-" TYPE_ARM_CPU); - object_property_add_child(obj, "rpu-cpu[*]", OBJECT(&s->rpu_cpu[i]), - &error_abort); - } - object_property_add_link(obj, "ddr-ram", TYPE_MEMORY_REGION, (Object **)&s->ddr_ram, qdev_prop_allow_set_link_before_realize, @@ -290,7 +322,9 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp) qdev_connect_gpio_out(DEVICE(&s->apu_cpu[i]), 1, irq); } - xlnx_zynqmp_setup_rpu(s, boot_cpu, errp); + if (s->has_rpu) { + xlnx_zynqmp_setup_rpu(s, boot_cpu, errp); + } if (!s->boot_cpu_ptr) { error_setg(errp, "ZynqMP Boot cpu %s not found", boot_cpu); diff --git a/include/hw/arm/xlnx-zynqmp.h b/include/hw/arm/xlnx-zynqmp.h index 38d4c8c..68f6eb0 100644 --- a/include/hw/arm/xlnx-zynqmp.h +++ b/include/hw/arm/xlnx-zynqmp.h @@ -87,6 +87,8 @@ typedef struct XlnxZynqMPState { /* Has the ARM Security extensions? */ bool secure; + /* Has the RPU subsystem? */ + bool has_rpu; } XlnxZynqMPState; #define XLNX_ZYNQMP_H