From patchwork Thu Feb 8 01:28:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Clark X-Patchwork-Id: 10206447 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 A677C60327 for ; Thu, 8 Feb 2018 01:49:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 94D6529122 for ; Thu, 8 Feb 2018 01:49:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 85F8229172; Thu, 8 Feb 2018 01:49:44 +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_SIGNED, 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 CDB7B29122 for ; Thu, 8 Feb 2018 01:49:43 +0000 (UTC) Received: from localhost ([::1]:55166 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ejbLL-0002l2-3D for patchwork-qemu-devel@patchwork.kernel.org; Wed, 07 Feb 2018 20:49:43 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33001) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ejb3H-0003Pi-8N for qemu-devel@nongnu.org; Wed, 07 Feb 2018 20:31:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ejb3F-0002Kj-Sa for qemu-devel@nongnu.org; Wed, 07 Feb 2018 20:31:03 -0500 Received: from mail-pg0-x22b.google.com ([2607:f8b0:400e:c05::22b]:41419) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ejb3F-0002Ja-Kv for qemu-devel@nongnu.org; Wed, 07 Feb 2018 20:31:01 -0500 Received: by mail-pg0-x22b.google.com with SMTP id 141so1044926pgd.8 for ; Wed, 07 Feb 2018 17:31:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=W8BSPiJ6KBVO25KOa+/xsIQr/l6ab6YJoPobEk4Qv8o=; b=NmrJl2Z2BX1ZygeqIYxEmTN+NbdlYbwZRYaj8vhb/0a8t21KS17AjgW4fDneLtb2rH FP/g9L8H1jNWnGdJHLcerKECm47CMxwkfY576fSlGJ4ufcrZ7qF+qY8l1EmWNQFXaVXw RMffim/LJprRB6L62FYotuBCTGRGofKZ2zUa0Qj7smvTW9MgSygQv4TGl2gIXMrIx2OQ 6wlSc/xT7428qj2KFW7FO8sKacq/fVT+9Q2+A6gBQ7Z5QqRpyFm6dSVL56VCmczJd8ML uQJ4uKsQdQQble/+DBcw0KXT88pp0CcoSEI9jsviMLWBfqWTu9WsUwt7MqjPIx0tTfG2 cTPA== 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=W8BSPiJ6KBVO25KOa+/xsIQr/l6ab6YJoPobEk4Qv8o=; b=Ws2WzOnE0EDLlBgmNc7KChPzQyz4JY+8B3xy8settASWiJ/V4GM8svOHTpTtr4gj3w igdKSxJ/Q4xuLtlUNd6UR6+rbETmJjNcmxcJ/YP4Qzq274xZYtab6dGbl8D/EpjM6c8L ou+9gmos744xzzudoj/y8zhielvAMjrPsqj8WH3pLxY/vgtEajZw1pXRK0FdwREnSHLA jadXgHp6IxDWi1LAGYY+T1YZLVfwPWLWDZAMYtI3shjcmUTytFX6OM1S96VC7YjnTC7j EcVtYC0lKHWlBuPXjiCSpbDMgCuKqG0SYMNR/YDqG0UgRE8j9QZmNHhS43OVp9IDupN7 BAIA== X-Gm-Message-State: APf1xPDYth0qzGOESpRPAaEdpoUF4z0B4hKXqXxxvbEYpTyr9Qf3orPy rTOJpSYOlE9tT8ZXl1SmsTOSg0+CRb8= X-Google-Smtp-Source: AH8x226uWA5vQ/fArUe04GhE7SGCYl49YXWWtK8gc1xCD3dKRaRDiqyMOYBcdrzpDwIlfVlIvGwsIg== X-Received: by 10.99.189.26 with SMTP id a26mr664702pgf.373.1518053460577; Wed, 07 Feb 2018 17:31:00 -0800 (PST) Received: from localhost.localdomain (125-237-39-90.jetstream.xtra.co.nz. [125.237.39.90]) by smtp.gmail.com with ESMTPSA id k3sm5097653pff.41.2018.02.07.17.30.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 07 Feb 2018 17:31:00 -0800 (PST) From: Michael Clark To: qemu-devel@nongnu.org Date: Thu, 8 Feb 2018 14:28:38 +1300 Message-Id: <1518053328-34687-14-git-send-email-mjc@sifive.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1518053328-34687-1-git-send-email-mjc@sifive.com> References: <1518053328-34687-1-git-send-email-mjc@sifive.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c05::22b Subject: [Qemu-devel] [PATCH v5 13/23] RISC-V HART Array 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: Bastian Koppelmann , Michael Clark , Palmer Dabbelt , Sagar Karandikar , RISC-V Patches Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Holds the state of a heterogenous array of RISC-V hardware threads. Signed-off-by: Michael Clark Reviewed-by: Richard Henderson --- hw/riscv/riscv_hart.c | 95 +++++++++++++++++++++++++++++++++++++++++++ include/hw/riscv/riscv_hart.h | 45 ++++++++++++++++++++ 2 files changed, 140 insertions(+) create mode 100644 hw/riscv/riscv_hart.c create mode 100644 include/hw/riscv/riscv_hart.h diff --git a/hw/riscv/riscv_hart.c b/hw/riscv/riscv_hart.c new file mode 100644 index 0000000..88d5836 --- /dev/null +++ b/hw/riscv/riscv_hart.c @@ -0,0 +1,95 @@ +/* + * QEMU RISCV Hart Array + * + * Copyright (c) 2017 SiFive, Inc. + * + * Holds the state of a heterogenous array of RISC-V harts + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#include "qemu/osdep.h" +#include "qapi/error.h" +#include "hw/sysbus.h" +#include "target/riscv/cpu.h" +#include "hw/riscv/riscv_hart.h" + +static Property riscv_harts_props[] = { + DEFINE_PROP_UINT32("num-harts", RISCVHartArrayState, num_harts, 1), + DEFINE_PROP_STRING("cpu-type", RISCVHartArrayState, cpu_type), + DEFINE_PROP_END_OF_LIST(), +}; + +static void riscv_harts_cpu_reset(void *opaque) +{ + RISCVCPU *cpu = opaque; + cpu_reset(CPU(cpu)); +} + +static void riscv_harts_realize(DeviceState *dev, Error **errp) +{ + RISCVHartArrayState *s = RISCV_HART_ARRAY(dev); + Error *err = NULL; + int n; + + s->harts = g_new0(RISCVCPU, s->num_harts); + + for (n = 0; n < s->num_harts; n++) { + + object_initialize(&s->harts[n], sizeof(RISCVCPU), s->cpu_type); + s->harts[n].env.mhartid = n; + object_property_add_child(OBJECT(s), "harts[*]", OBJECT(&s->harts[n]), + &error_abort); + qemu_register_reset(riscv_harts_cpu_reset, &s->harts[n]); + object_property_set_bool(OBJECT(&s->harts[n]), true, + "realized", &err); + if (err) { + error_propagate(errp, err); + return; + } + } +} + +static void riscv_harts_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc = DEVICE_CLASS(klass); + + dc->props = riscv_harts_props; + dc->realize = riscv_harts_realize; +} + +static void riscv_harts_init(Object *obj) +{ + /* RISCVHartArrayState *s = SIFIVE_COREPLEX(obj); */ +} + +static const TypeInfo riscv_harts_info = { + .name = TYPE_RISCV_HART_ARRAY, + .parent = TYPE_SYS_BUS_DEVICE, + .instance_size = sizeof(RISCVHartArrayState), + .instance_init = riscv_harts_init, + .class_init = riscv_harts_class_init, +}; + +static void riscv_harts_register_types(void) +{ + type_register_static(&riscv_harts_info); +} + +type_init(riscv_harts_register_types) diff --git a/include/hw/riscv/riscv_hart.h b/include/hw/riscv/riscv_hart.h new file mode 100644 index 0000000..39acb0f --- /dev/null +++ b/include/hw/riscv/riscv_hart.h @@ -0,0 +1,45 @@ +/* + * QEMU RISC-V Hart Array interface + * + * Copyright (c) 2017 SiFive, Inc. + * + * Holds the state of a heterogenous array of RISC-V harts + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#ifndef HW_RISCV_HART_H +#define HW_RISCV_HART_H + +#define TYPE_RISCV_HART_ARRAY "riscv.hart_array" + +#define RISCV_HART_ARRAY(obj) \ + OBJECT_CHECK(RISCVHartArrayState, (obj), TYPE_RISCV_HART_ARRAY) + +typedef struct RISCVHartArrayState { + /*< private >*/ + SysBusDevice parent_obj; + + /*< public >*/ + uint32_t num_harts; + char *cpu_type; + RISCVCPU *harts; +} RISCVHartArrayState; + +#endif