From patchwork Mon Aug 5 15:59:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 11077281 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 60F401398 for ; Mon, 5 Aug 2019 16:05:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4F5F4274D1 for ; Mon, 5 Aug 2019 16:05:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 43BAD28174; Mon, 5 Aug 2019 16:05:54 +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=-5.0 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id BFF11274D1 for ; Mon, 5 Aug 2019 16:05:53 +0000 (UTC) Received: from localhost ([::1]:55556 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hufUf-0001Ae-2i for patchwork-qemu-devel@patchwork.kernel.org; Mon, 05 Aug 2019 12:05:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58187) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hufPT-0008Pc-B5 for qemu-devel@nongnu.org; Mon, 05 Aug 2019 12:00:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hufPR-0002jI-MS for qemu-devel@nongnu.org; Mon, 05 Aug 2019 12:00:31 -0400 Received: from mail-pl1-x641.google.com ([2607:f8b0:4864:20::641]:32805) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hufPR-0002hB-E8; Mon, 05 Aug 2019 12:00:29 -0400 Received: by mail-pl1-x641.google.com with SMTP id c14so36567129plo.0; Mon, 05 Aug 2019 09:00:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=TtE2TN8qJaX/qotNkH+V8ocOIPSa55Bf89V7FHWWfhI=; b=k4V2ZquL2qc0YwVsFTEv6YpQDfnSDeIwRGh7Pj4+hh84JAM3sjSVv3ePFi28QHZu5O fYUZaVC016UGcXEYW6EMEU7iAKOoSWB682NHALsZcINzHklMm2v2ZKxhKviMI4fKJqMs 81taMcD2aZ1ca8IF9rtmViIivXcB4kATQs46xOC21kzC/YArFZRwcqSjkFTKvAqRp5nE UAo6Tslma+HGEfu/d35293G/YLh9DKkwilgYSTRCBeObzBm3tDFDTkJ8dZZ47kUxVvLl 4rl64wwj36DMMkPHNJWRwy05t0bEeK8CTSTpn6leIzbSiK4SGYayP6Dkijs/bAHCvkLE OF7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=TtE2TN8qJaX/qotNkH+V8ocOIPSa55Bf89V7FHWWfhI=; b=ZqJL4jNGfGpPRT+Q9ealTR5koePwESfonS9nE43uspbdwJMi0i5XGMnEvGK6Co5XuJ fJJBlUzepmbNk5qgmKKsAAi66jhj/QWlm5gnmjmpKvjTDvDEUz/z+egttc1y4xyEEqCJ gZo6zAXP2yz1iwwoKjWo+jalOSoT8yGMBNWiPuGVYQVywviWNAC5ME1V/7A2naZocxtC KHWoe5nUf0apTdWl7p8qNpDjvuWoLYNtD/GeG8EOmlgQEWlg5690LfVNliyGxKCsQufO bSMST2oFBM/39in9C+Xw/kK9hPt9nJrUjJyPbPTwj7WTFVQkvU0sPV83nrCz36kY/PzJ 084A== X-Gm-Message-State: APjAAAULS5zL9k6W9W1YNS7hbHH2F9T/EHhAxMWBnkvB9hQvuU8ik0e5 JkFChZYEEtZgSvN210RgOvs= X-Google-Smtp-Source: APXvYqwwO9HgWPwF32EwEltptxLV+cmPifY0jRovZ38asf/kjB6rIj6GJUbyihqylDtsVgUJBruiZg== X-Received: by 2002:a17:902:41:: with SMTP id 59mr51438959pla.195.1565020828262; Mon, 05 Aug 2019 09:00:28 -0700 (PDT) Received: from localhost.localdomain (unknown-224-80.windriver.com. [147.11.224.80]) by smtp.gmail.com with ESMTPSA id d18sm47728793pgi.40.2019.08.05.09.00.27 (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 05 Aug 2019 09:00:27 -0700 (PDT) From: Bin Meng To: Alistair Francis , Bastian Koppelmann , Palmer Dabbelt , Sagar Karandikar , qemu-devel@nongnu.org, qemu-riscv@nongnu.org Date: Mon, 5 Aug 2019 08:59:55 -0700 Message-Id: <1565020823-24223-1-git-send-email-bmeng.cn@gmail.com> X-Mailer: git-send-email 1.7.1 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::641 Subject: [Qemu-devel] [PATCH 00/28] riscv: sifive_u: Improve the emulation fidelity of sifive_u machine X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP As of today, the QEMU 'sifive_u' machine is a special target that does not boot the upstream OpenSBI/U-Boot firmware images built for the real SiFive HiFive Unleashed board. Hence OpenSBI supports a special platform "qemu/sifive_u". For U-Boot, the sifive_fu540_defconfig is referenced in the OpenSBI doc as its payload, but that does not boot at all due to various issues in current QEMU 'sifive_u' machine codes. This series aims to improve the emulation fidelity of sifive_u machine, so that the upstream OpenSBI, U-Boot and kernel images built for the SiFive HiFive Unleashed board can be used out of the box without any special hack. The major changes are: - Heterogeneous harts creation supported, so that we can create a CPU that exactly mirrors the real hardware: 1 E51 + 4 U54. - Implemented a PRCI model for FU540 - Implemented an OTP model for FU540, primarily used for storing serial number of the board - Fixed GEM support that was seriously broken on sifive_u - Synced device tree with upstream Linux kernel on sifive_u - Adding initramfs loading support on sifive_u OpenSBI v0.4 image built for sifive/fu540 is included as the default bios image for 'sifive_u' machine. The series is tested against OpenSBI v0.4 image for sifive/fu540 paltform, U-Boot v2019.10-rc1 image for sifive_fu540_defconfig, and Linux kernel v5.3-rc3 image with the following patch: macb: Update compatibility string for SiFive FU540-C000 https://patchwork.kernel.org/patch/11050003/ OpenSBI + U-Boot, ping/tftpboot with U-Boot MACB driver works well. For Linux, only checked boot log of MACB probe success without error. Bin Meng (28): riscv: hw: Remove superfluous "linux,phandle" property riscv: hw: Use qemu_fdt_setprop_cell() for property with only 1 cell riscv: Add a sifive_cpu.h to include both E and U cpu type defines riscv: hart: Extract hart realize to a separate routine riscv: hart: Support heterogeneous harts population riscv: sifive_u: Update hart configuration to reflect the real FU540 SoC riscv: sifive_u: Set the minimum number of cpus to 2 riscv: sifive_u: Update PLIC hart topology configuration string riscv: sifive_u: Update UART base addresses riscv: sifive_u: Remove the unnecessary include of prci header riscv: sifive: Rename sifive_prci.{c,h} to sifive_e_prci.{c,h} riscv: sifive_e: prci: Fix a typo of hfxosccfg register programming riscv: sifive_e: prci: Update the PRCI register block size riscv: sifive: Implement PRCI model for FU540 riscv: sifive_u: Generate hfclk and rtcclk nodes riscv: sifive_u: Add PRCI block to the SoC riscv: sifive_u: Change UART node name in device tree riscv: hw: Implement a model for SiFive FU540 OTP riscv: sifive_u: Instantiate OTP memory with a serial number riscv: roms: Update default bios for sifive_u machine riscv: sifive_u: Update UART and ethernet node clock properties riscv: sifive_u: Generate an aliases node in the device tree riscv: sifive: Move sifive_mmio_emulate() to a common place riscv: sifive_u: Fix broken GEM support riscv: sifive_u: Support loading initramfs riscv: hw: Update PLIC device tree riscv: virt: Change create_fdt() to return void riscv: sifive_u: Update model and compatible strings in device tree hw/riscv/Makefile.objs | 4 +- hw/riscv/riscv_hart.c | 75 ++++++-- hw/riscv/sifive_e.c | 12 +- hw/riscv/{sifive_prci.c => sifive_e_prci.c} | 16 +- hw/riscv/sifive_u.c | 181 +++++++++++++------ hw/riscv/sifive_u_otp.c | 194 +++++++++++++++++++++ hw/riscv/sifive_u_prci.c | 163 +++++++++++++++++ hw/riscv/virt.c | 42 ++--- include/hw/riscv/sifive_cpu.h | 39 +++++ include/hw/riscv/sifive_e.h | 7 +- .../hw/riscv/{sifive_prci.h => sifive_e_prci.h} | 16 +- include/hw/riscv/sifive_u.h | 15 +- include/hw/riscv/sifive_u_otp.h | 90 ++++++++++ include/hw/riscv/sifive_u_prci.h | 100 +++++++++++ pc-bios/opensbi-riscv64-sifive_u-fw_jump.bin | Bin 40968 -> 45064 bytes roms/Makefile | 4 +- 16 files changed, 824 insertions(+), 134 deletions(-) rename hw/riscv/{sifive_prci.c => sifive_e_prci.c} (88%) create mode 100644 hw/riscv/sifive_u_otp.c create mode 100644 hw/riscv/sifive_u_prci.c create mode 100644 include/hw/riscv/sifive_cpu.h rename include/hw/riscv/{sifive_prci.h => sifive_e_prci.h} (80%) create mode 100644 include/hw/riscv/sifive_u_otp.h create mode 100644 include/hw/riscv/sifive_u_prci.h