From patchwork Thu Oct 17 07:25:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sai Pavan Boddu X-Patchwork-Id: 13839543 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5FC3AD2F7F9 for ; Thu, 17 Oct 2024 07:26:22 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t1KtI-0006t9-Fz; Thu, 17 Oct 2024 03:25:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t1KtG-0006sh-Cz; Thu, 17 Oct 2024 03:25:46 -0400 Received: from mail-dm6nam11on20611.outbound.protection.outlook.com ([2a01:111:f403:2415::611] helo=NAM11-DM6-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t1KtD-0003Fq-Hm; Thu, 17 Oct 2024 03:25:46 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=AKEXtXEYjy60cHbp02ezJRscADOR69SUXyKfb4sxBSjVG2rCRj/ePLiLNhMIaZWlgy3ld3gQwVh1J4tduEb0XL35vZaOQKX21oyr9SV1+ip6nLpw+Gswi4gEfcKYyjczk9K1FOdbqBGqGJec3iFXlHWaBmfc56lJcg6SxZjIDiVSOkC+ZXKUc7I9SbPQEI66ukjnF+/dlAKsKAJ0XG/yetR38jCz4LZo4k9TzxVFGu7ORSuWgt0GK0XOCK6J5sTh0C8LCo7MEAXCWGxHo1afs9RTxw8FYf/bjwpmMbC7JP80n7szS2bMMQ36gXhjm4yd76wDrHpzYTxGjI0ru+A/QQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=4XJfn56kH7MgbFci7Bv07XSmgvRDGYrl6vc4+0uWUyk=; b=uwGPuVLJvy5Bb4TxYsABFn5Up3A3m01CF3s6Sfbt/DS++1cd8S/QFQ6pkvmO8k98nDCTYDZb0F0IOypGj8kw/Z5JO0jlnz372exCtK7qpwIBegl8bmAkLlAxfXfX+5NcawDFgwyY/g7D7XlKTXU2lIpBMHVcPL9PMJUKEQopkGxuE+GUH75HO1gfr+yEsoi6R5GiRql8hSZclL1laMYPrirZdRR/0vKipjAIJXKMGIdDm3RnQiXtFZf9/QxzXSfEJ5FFyluQGQnfxQInTt/myv+xPmcyXHbcUsqURdf6IYvoEXxY5lnz5R1+h+j5qcPOVIJD7sruLapV+1pKgaIDvA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=nongnu.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=4XJfn56kH7MgbFci7Bv07XSmgvRDGYrl6vc4+0uWUyk=; b=lGf84rjd69fDcjpQwcvfgSp//1D65z0114s72jy/7MYnDu0nz5H74vdVv49HN9lOhpp3gHGdjXc+Xb3VLI+tpYWMI8Fz0hqYikNMxOhsOtwiFQFYfHs5v45rpUP7teE7POcmQUrKSApDgMOlds3fdQ/mD8HlZaHuJ+k/mv6K+wA= Received: from PH7P220CA0104.NAMP220.PROD.OUTLOOK.COM (2603:10b6:510:32d::26) by CY8PR12MB9035.namprd12.prod.outlook.com (2603:10b6:930:77::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8069.18; Thu, 17 Oct 2024 07:25:33 +0000 Received: from SN1PEPF00036F40.namprd05.prod.outlook.com (2603:10b6:510:32d:cafe::e3) by PH7P220CA0104.outlook.office365.com (2603:10b6:510:32d::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8069.18 via Frontend Transport; Thu, 17 Oct 2024 07:25:33 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB03.amd.com; pr=C Received: from SATLEXMB03.amd.com (165.204.84.17) by SN1PEPF00036F40.mail.protection.outlook.com (10.167.248.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8069.17 via Frontend Transport; Thu, 17 Oct 2024 07:25:33 +0000 Received: from SATLEXMB05.amd.com (10.181.40.146) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Thu, 17 Oct 2024 02:25:32 -0500 Received: from SATLEXMB04.amd.com (10.181.40.145) by SATLEXMB05.amd.com (10.181.40.146) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Thu, 17 Oct 2024 02:25:13 -0500 Received: from xhdsaipava41.xilinx.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server id 15.1.2507.39 via Frontend Transport; Thu, 17 Oct 2024 02:25:10 -0500 From: Sai Pavan Boddu To: , CC: Paolo Bonzini , Palmer Dabbelt , Alistair Francis , Bin Meng , Weiwei Li , Daniel Henrique Barboza , Liu Zhiwei , Michal Simek , Subject: [PATCH v2] hw/riscv: Add Microblaze V 32bit virt board Date: Thu, 17 Oct 2024 12:55:07 +0530 Message-ID: <20241017072507.4033413-1-sai.pavan.boddu@amd.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Received-SPF: None (SATLEXMB05.amd.com: sai.pavan.boddu@amd.com does not designate permitted sender hosts) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF00036F40:EE_|CY8PR12MB9035:EE_ X-MS-Office365-Filtering-Correlation-Id: c8d62622-eda8-4660-d7ff-08dcee7ce326 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|82310400026|36860700013|376014|1800799024; X-Microsoft-Antispam-Message-Info: =?utf-8?q?pkdcuTA0RU4YPia/bUmUJwx/KmJaQA6?= =?utf-8?q?W7Z/obzx325rrGIMlT9Jg+K6CyZjxOKTUYmpollK8QSuM4mJod2MIiqQk9HPobL3D?= =?utf-8?q?jW/rS40gQcPVZ+E4hVRz+6mJj1gl+stjEV1jJXPus3IKLZeDB01wFPKPwEmGpg1c7?= =?utf-8?q?0grxzRwFh4c9D5JWtubT6b7P+udQb8rWYkdZteDhbwbsFr/VfJdXk/7+5AQvhpq/J?= =?utf-8?q?kNt6YpLSVWavmiZWdGa2u7n1v6+bneVfH4GKBIhjlDEu8pJLyZuFB/BF5yjTq6HIR?= =?utf-8?q?eUeUmRKPb1wMW6EbfxWDhTMpDO0iXpdcJiT4D3Ftl3z1B2+jxLnvmAbcpgoOlHNOk?= =?utf-8?q?Czhjb/vHsVvbOUEvvVPlLvClhVPsm8vffuYGF/GEpdJ0XyVdFQX8WBnEJ08SSS4lf?= =?utf-8?q?P03zUT/watPOk7hM1wzCmH6NMhO8i946MmHcQrpAsfVSXwJRYSJKCf1iETiogb8AT?= =?utf-8?q?lfeFmw3Gh22VPJz3ZlAAUVXC3kK53EwFYklsZvc35n2VflxUCNvoniB4w6mKgW9jk?= =?utf-8?q?3KbMBbUfh7fBa5obT0LIxl5p/fabpqqCuqdqimS9nEsw3G4m8Xjl5tuXFa3ZAtdFC?= =?utf-8?q?VnY3VyiKRbncBf8xjOY7AEBIIuaDqUFaggv/YE2971tIPzDYi1r0CyXVCYpqmQAkI?= =?utf-8?q?tocbM7scpwFE++I6DAVHvjtH0xYBnWGg4LVXkYionRPPchrehfKKhE2FSnKMn5UJC?= =?utf-8?q?6B2K8AUpxmMcan//722A/MguXjyT0t2rEcBJKXnRqkUZ81thGO+vdKND/Szo+Ak5O?= =?utf-8?q?LrKIFjA3JC2a1hPUKKFQvdtxFb08m+QYxipviJTgPxMvY0z7DLeRjsQolvyE7QVrC?= =?utf-8?q?oPOdcLP1YeAbEpN9Y7E1KmnN/sUlVLyX1Iuc83C22F0+sFfr0mXAhHPL3Jw35xDRU?= =?utf-8?q?HeH5rlrlQYygbEF235yGVOta64XWIgByHgJP8bXYxwrqt5ehzkOkObQLv9YW2CYcM?= =?utf-8?q?aeTs9IGID8a1o9+FX11YrGBicyVUvNWuk9PIhIUZUbkN7JXIoC5Rsa6L88JG9ZsLZ?= =?utf-8?q?WTdAOGnjfGKyf8UgvsAO7eii8lZw1A/rXU1I5+ofMnbW/UHdnd9OJoSxGECu+B9pW?= =?utf-8?q?nGypHKyyCpmajhAm5Tusvkn8aBCqrxQdjf4RZyZrQMMhY4lxhmPdMZYRSSPWk9Bwo?= =?utf-8?q?9PTPqBkxCqE6/ErArFisasXlMCocSzS3EOj+491H91m2XEBKakFWcaJbSrSTqOZiI?= =?utf-8?q?bJc+2hg2arfRXD7i/Uit5L40hg0f628mZL0olbogxTIyE+See+yKUerqaQ6ScgiwV?= =?utf-8?q?T3SHT+U/glAVLgRvNuorcDdt3HR8vOHZhFkOwbZySh9/edMRWAqFZJC4Lbl86Bz49?= =?utf-8?q?+FzoxNKz6JsqetmnskT6E5FDFzYa+3y/aA=3D=3D?= X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB03.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230040)(82310400026)(36860700013)(376014)(1800799024); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Oct 2024 07:25:33.3471 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c8d62622-eda8-4660-d7ff-08dcee7ce326 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXMB03.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF00036F40.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR12MB9035 Received-SPF: permerror client-ip=2a01:111:f403:2415::611; envelope-from=sai.pavan.boddu@amd.com; helo=NAM11-DM6-obe.outbound.protection.outlook.com X-Spam_score_int: 4 X-Spam_score: 0.4 X-Spam_bar: / X-Spam_report: (0.4 / 5.0 requ) AC_FROM_MANY_DOTS=2.499, BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.038, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, WEIRD_QUOTING=0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Add a basic board with interrupt controller (intc), timer, serial (uartlite), small memory called LMB@0 (128kB) and DDR@0x80000000 (configured via command line eg. -m 2g). This is basic configuration which matches HW generated out of AMD Vivado (design tools). But initial configuration is going beyond what it is configured by default because validation should be done on other configurations too. That's why wire also additional uart16500, axi ethernet(with axi dma). GPIOs, i2c and qspi is also listed for completeness. IRQ map is: (addr) 0 - timer (0x41c00000) 1 - uartlite (0x40600000) 2 - i2c (0x40800000) 3 - qspi (0x44a00000) 4 - uart16550 (0x44a10000) 5 - emaclite (0x40e00000) 6 - timer2 (0x41c10000) 7 - axi emac (0x40c00000) 8 - axi dma (0x41e00000) 9 - axi dma 10 - gpio (0x40000000) 11 - gpio2 (0x40010000) 12 - gpio3 (0x40020000) Signed-off-by: Sai Pavan Boddu Signed-off-by: Michal Simek Reviewed-by: Francisco Iglesias --- Changes for V2: Make changes to support -cpu switch Remove setting of default board Include doc to toctree Remove setting of 'imac' extensions as they are available by default. MAINTAINERS | 6 + docs/system/riscv/microblaze-v-virt.rst | 39 +++++ docs/system/target-riscv.rst | 1 + hw/riscv/microblaze-v-virt.c | 181 ++++++++++++++++++++++++ hw/riscv/Kconfig | 8 ++ hw/riscv/meson.build | 1 + 6 files changed, 236 insertions(+) create mode 100644 docs/system/riscv/microblaze-v-virt.rst create mode 100644 hw/riscv/microblaze-v-virt.c diff --git a/MAINTAINERS b/MAINTAINERS index d7a11fe6017..b104b6d0f7f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1274,6 +1274,12 @@ M: Edgar E. Iglesias S: Maintained F: hw/microblaze/petalogix_ml605_mmu.c +amd-microblaze-v-virt +M: Sai Pavan Boddu +S: Maintained +F: hw/riscv/microblaze-v-virt.c +F: docs/system/riscv/microblaze-v-virt.rst + MIPS Machines ------------- Overall MIPS Machines diff --git a/docs/system/riscv/microblaze-v-virt.rst b/docs/system/riscv/microblaze-v-virt.rst new file mode 100644 index 00000000000..d2ad6a60266 --- /dev/null +++ b/docs/system/riscv/microblaze-v-virt.rst @@ -0,0 +1,39 @@ +Microblaze-V virt board (``amd-microblaze-v-virt``) +=================================================== +The AMD MicroBlaze™ V processor is a soft-core RISC-V processor IP for AMD adaptive SoCs and FPGAs. +The MicroBlaze V processor is based on a 32-bit RISC-V instruction set architecture (ISA). + +More details here: +https://docs.amd.com/r/en-US/ug1629-microblaze-v-user-guide/MicroBlaze-V-Architecture + +The microblaze-v virt board in QEMU is a virtual board with +following supported devices + +Implemented CPU cores: + +1 RISCV32 core + +Implemented devices: + + - timer + - uartlite + - uart16550 + - emaclite + - timer2 + - axi emac + - axi dma + +Running +""""""" +Running U-boot + +.. code-block:: bash + + + $ qemu-system-riscv32 -M amd-microblaze-v-virt \ + -display none \ + -device loader,addr=0x80000000,file=u-boot-spl.bin,cpu-num=0 \ + -device loader,addr=0x80200000,file=u-boot.img \ + -serial mon:stdio \ + -device loader,addr=0x83000000,file=system.dtb \ + -m 2g diff --git a/docs/system/target-riscv.rst b/docs/system/target-riscv.rst index ba195f1518a..cd5c5ce1883 100644 --- a/docs/system/target-riscv.rst +++ b/docs/system/target-riscv.rst @@ -66,6 +66,7 @@ undocumented; you can get a complete list by running .. toctree:: :maxdepth: 1 + riscv/microblaze-v-virt riscv/microchip-icicle-kit riscv/shakti-c riscv/sifive_u diff --git a/hw/riscv/microblaze-v-virt.c b/hw/riscv/microblaze-v-virt.c new file mode 100644 index 00000000000..6603e6d6b06 --- /dev/null +++ b/hw/riscv/microblaze-v-virt.c @@ -0,0 +1,181 @@ +/* + * QEMU model of Microblaze V (32bit version) + * + * based on hw/microblaze/petalogix_ml605_mmu.c + * + * Copyright (c) 2011 Michal Simek + * Copyright (c) 2011 PetaLogix + * Copyright (c) 2009 Edgar E. Iglesias. + * Copyright (C) 2024, Advanced Micro Devices, Inc. + * SPDX-License-Identifier: GPL-2.0-or-later + * Written by Sai Pavan Boddu + * and by Michal Simek . + */ + +#include "qemu/osdep.h" +#include "qemu/units.h" +#include "qapi/error.h" +#include "cpu.h" +#include "hw/sysbus.h" +#include "sysemu/sysemu.h" +#include "net/net.h" +#include "hw/boards.h" +#include "hw/char/serial-mm.h" +#include "exec/address-spaces.h" +#include "hw/char/xilinx_uartlite.h" +#include "hw/misc/unimp.h" + +#define LMB_BRAM_SIZE (128 * KiB) +#define MEMORY_BASEADDR 0x80000000 +#define INTC_BASEADDR 0x41200000 +#define TIMER_BASEADDR 0x41c00000 +#define TIMER_BASEADDR2 0x41c10000 +#define UARTLITE_BASEADDR 0x40600000 +#define ETHLITE_BASEADDR 0x40e00000 +#define UART16550_BASEADDR 0x44a10000 +#define AXIENET_BASEADDR 0x40c00000 +#define AXIDMA_BASEADDR 0x41e00000 +#define GPIO_BASEADDR 0x40000000 +#define GPIO_BASEADDR2 0x40010000 +#define GPIO_BASEADDR3 0x40020000 +#define I2C_BASEADDR 0x40800000 +#define QSPI_BASEADDR 0x44a00000 + +#define TIMER_IRQ 0 +#define UARTLITE_IRQ 1 +#define UART16550_IRQ 4 +#define ETHLITE_IRQ 5 +#define TIMER_IRQ2 6 +#define AXIENET_IRQ 7 +#define AXIDMA_IRQ1 8 +#define AXIDMA_IRQ0 9 + +static void mb_v_virt_init(MachineState *machine) +{ + ram_addr_t ram_size = machine->ram_size; + DeviceState *dev, *dma, *eth0; + Object *ds, *cs; + int i; + RISCVCPU *cpu; + hwaddr ddr_base = MEMORY_BASEADDR; + MemoryRegion *phys_lmb_bram = g_new(MemoryRegion, 1); + MemoryRegion *phys_ram = g_new(MemoryRegion, 1); + qemu_irq irq[32]; + MemoryRegion *sysmem = get_system_memory(); + + cpu = RISCV_CPU(object_new(machine->cpu_type)); + qdev_realize(DEVICE(cpu), NULL, &error_abort); + /* Attach emulated BRAM through the LMB. */ + memory_region_init_ram(phys_lmb_bram, NULL, + "mb_v.lmb_bram", LMB_BRAM_SIZE, + &error_fatal); + memory_region_add_subregion(sysmem, 0x00000000, phys_lmb_bram); + + memory_region_init_ram(phys_ram, NULL, "mb_v.ram", + ram_size, &error_fatal); + memory_region_add_subregion(sysmem, ddr_base, phys_ram); + + dev = qdev_new("xlnx.xps-intc"); + qdev_prop_set_uint32(dev, "kind-of-intr", + 1 << UARTLITE_IRQ); + sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); + sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, INTC_BASEADDR); + sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, + qdev_get_gpio_in(DEVICE(cpu), 11)); + for (i = 0; i < 32; i++) { + irq[i] = qdev_get_gpio_in(dev, i); + } + + /* Uartlite */ + dev = qdev_new(TYPE_XILINX_UARTLITE); + qdev_prop_set_chr(dev, "chardev", serial_hd(0)); + sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); + sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, UARTLITE_BASEADDR); + sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, irq[UARTLITE_IRQ]); + + /* Full uart */ + serial_mm_init(sysmem, UART16550_BASEADDR + 0x1000, 2, + irq[UART16550_IRQ], 115200, serial_hd(1), + DEVICE_LITTLE_ENDIAN); + + /* 2 timers at irq 0 @ 100 Mhz. */ + dev = qdev_new("xlnx.xps-timer"); + qdev_prop_set_uint32(dev, "one-timer-only", 0); + qdev_prop_set_uint32(dev, "clock-frequency", 100000000); + sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); + sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, TIMER_BASEADDR); + sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, irq[TIMER_IRQ]); + + /* 2 timers at irq 3 @ 100 Mhz. */ + dev = qdev_new("xlnx.xps-timer"); + qdev_prop_set_uint32(dev, "one-timer-only", 0); + qdev_prop_set_uint32(dev, "clock-frequency", 100000000); + sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); + sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, TIMER_BASEADDR2); + sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, irq[TIMER_IRQ2]); + + /* Emaclite */ + dev = qdev_new("xlnx.xps-ethernetlite"); + qemu_configure_nic_device(dev, true, NULL); + qdev_prop_set_uint32(dev, "tx-ping-pong", 0); + qdev_prop_set_uint32(dev, "rx-ping-pong", 0); + sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); + sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, ETHLITE_BASEADDR); + sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, irq[ETHLITE_IRQ]); + + /* axi ethernet and dma initialization. */ + eth0 = qdev_new("xlnx.axi-ethernet"); + dma = qdev_new("xlnx.axi-dma"); + + /* FIXME: attach to the sysbus instead */ + object_property_add_child(qdev_get_machine(), "xilinx-eth", OBJECT(eth0)); + object_property_add_child(qdev_get_machine(), "xilinx-dma", OBJECT(dma)); + + ds = object_property_get_link(OBJECT(dma), + "axistream-connected-target", NULL); + cs = object_property_get_link(OBJECT(dma), + "axistream-control-connected-target", NULL); + qemu_configure_nic_device(eth0, true, NULL); + qdev_prop_set_uint32(eth0, "rxmem", 0x1000); + qdev_prop_set_uint32(eth0, "txmem", 0x1000); + object_property_set_link(OBJECT(eth0), "axistream-connected", ds, + &error_abort); + object_property_set_link(OBJECT(eth0), "axistream-control-connected", cs, + &error_abort); + sysbus_realize_and_unref(SYS_BUS_DEVICE(eth0), &error_fatal); + sysbus_mmio_map(SYS_BUS_DEVICE(eth0), 0, AXIENET_BASEADDR); + sysbus_connect_irq(SYS_BUS_DEVICE(eth0), 0, irq[AXIENET_IRQ]); + + ds = object_property_get_link(OBJECT(eth0), + "axistream-connected-target", NULL); + cs = object_property_get_link(OBJECT(eth0), + "axistream-control-connected-target", NULL); + qdev_prop_set_uint32(dma, "freqhz", 100000000); + object_property_set_link(OBJECT(dma), "axistream-connected", ds, + &error_abort); + object_property_set_link(OBJECT(dma), "axistream-control-connected", cs, + &error_abort); + sysbus_realize_and_unref(SYS_BUS_DEVICE(dma), &error_fatal); + sysbus_mmio_map(SYS_BUS_DEVICE(dma), 0, AXIDMA_BASEADDR); + sysbus_connect_irq(SYS_BUS_DEVICE(dma), 0, irq[AXIDMA_IRQ0]); + sysbus_connect_irq(SYS_BUS_DEVICE(dma), 1, irq[AXIDMA_IRQ1]); + + /* unimplemented devices */ + create_unimplemented_device("gpio", GPIO_BASEADDR, 0x10000); + create_unimplemented_device("gpio2", GPIO_BASEADDR2, 0x10000); + create_unimplemented_device("gpio3", GPIO_BASEADDR3, 0x10000); + create_unimplemented_device("i2c", I2C_BASEADDR, 0x10000); + create_unimplemented_device("qspi", QSPI_BASEADDR, 0x10000); +} + +static void mb_v_virt_machine_init(MachineClass *mc) +{ + mc->desc = "AMD Microblaze-V Virt platform"; + mc->init = mb_v_virt_init; + mc->min_cpus = 1; + mc->max_cpus = 1; + mc->default_cpu_type = TYPE_RISCV_CPU_BASE32; + mc->default_cpus = 1; +} + +DEFINE_MACHINE("amd-microblaze-v-virt", mb_v_virt_machine_init) diff --git a/hw/riscv/Kconfig b/hw/riscv/Kconfig index 44695ff9f2c..5424803a82e 100644 --- a/hw/riscv/Kconfig +++ b/hw/riscv/Kconfig @@ -22,6 +22,14 @@ config MICROCHIP_PFSOC select SIFIVE_PLIC select UNIMP +config MICROBLAZE_V + bool + default y + depends on RISCV32 + select XILINX + select XILINX_AXI + select XILINX_ETHLITE + config OPENTITAN bool default y diff --git a/hw/riscv/meson.build b/hw/riscv/meson.build index f872674093a..8ea0412a376 100644 --- a/hw/riscv/meson.build +++ b/hw/riscv/meson.build @@ -10,5 +10,6 @@ riscv_ss.add(when: 'CONFIG_SIFIVE_U', if_true: files('sifive_u.c')) riscv_ss.add(when: 'CONFIG_SPIKE', if_true: files('spike.c')) riscv_ss.add(when: 'CONFIG_MICROCHIP_PFSOC', if_true: files('microchip_pfsoc.c')) riscv_ss.add(when: 'CONFIG_ACPI', if_true: files('virt-acpi-build.c')) +riscv_ss.add(when: 'CONFIG_MICROBLAZE_V', if_true: files('microblaze-v-virt.c')) hw_arch += {'riscv': riscv_ss}