From nobody Mon Feb 9 15:10:58 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1565511390; cv=none; d=zoho.com; s=zohoarc; b=ImqQAViXqAFb8qTHRUOeAPjJrsnUajBTr4TMyab9TJexw7VMI6tD71JKc1EV7FLPooMpZ0WmwKeTxauwcAFenr7ZQ9Xs8DtTaOfYkKf1yry71ApbKeAiKjWuHCmRFWt6ncqxRwXqkqoFrLzTQHyKBxv4QTdjqCMkbZUTzWkFlms= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1565511390; h=Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=q/Uc71mh9Zf8ABTIYeoUIKjQdWZzYTfjvfJlDAVzP40=; b=C4a/EvlHjiSc/fecXbi8IoKiGxX6kcgLBU6fd7UCeJ/faWFKcPU+3SlCC6lFoSBGS41x6qHeBNf5rk5v/H3lzjUG2ZtNYYMw/HoDkaFSZ/RDglnSBzXb/tUrnrOgAESRizpEOFZV4dlcdU22++OqrA61ZCVIQClaEbs9RvPrbfQ= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1565511390766922.9580357886781; Sun, 11 Aug 2019 01:16:30 -0700 (PDT) Received: from localhost ([::1]:39406 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hwj1h-0001jn-R0 for importer@patchew.org; Sun, 11 Aug 2019 04:16:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60494) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hwit5-0006g2-Cr for qemu-devel@nongnu.org; Sun, 11 Aug 2019 04:07:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hwit4-00046t-0T for qemu-devel@nongnu.org; Sun, 11 Aug 2019 04:07:35 -0400 Received: from mail-pg1-x542.google.com ([2607:f8b0:4864:20::542]:38412) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hwit3-00046E-QS; Sun, 11 Aug 2019 04:07:33 -0400 Received: by mail-pg1-x542.google.com with SMTP id z14so10749930pga.5; Sun, 11 Aug 2019 01:07:33 -0700 (PDT) Received: from localhost.localdomain (unknown-224-80.windriver.com. [147.11.224.80]) by smtp.gmail.com with ESMTPSA id v8sm87339107pgs.82.2019.08.11.01.07.31 (version=TLS1 cipher=AES128-SHA bits=128/128); Sun, 11 Aug 2019 01:07:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=q/Uc71mh9Zf8ABTIYeoUIKjQdWZzYTfjvfJlDAVzP40=; b=sJse3zuUKmaasbLMoq8GQKqkqBOXCaBBkRl0lhNVQsvjDhrnZ5Hr4owayKHWsM8xOa jieP0p7FcZeIN6ssKoEvRzrb5NIwplBxenknpvh9SZK1WW37TWErZg1VSlz8Zidu7nxV oWTgc8eEd6CIL33HlRIlT5g2nVfKzB8r8MMWlsgFLPxWvA6/nSl1KdfVNM6+fRKzNUqa rvrPrLCw3SMbHn+qlGy6vbvLKToJzb4vVY1EvfM00pjGbYNWMEuDqILncHj+b7VSbx3t ke1HjvlCH4CeiPVCb1aYdg9Xg0Kc5DjH3oYIVk35G2EGRqI/NFspkgH9leFHh0QaggmR L5Zw== 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:in-reply-to :references; bh=q/Uc71mh9Zf8ABTIYeoUIKjQdWZzYTfjvfJlDAVzP40=; b=T/h7Eslc1ZPs6CYhNz7vldTZ9Khb1qkSejhype5RB8gBVHgza7SQU4nkWPSnBvTaHZ N9brG9Zfl63kOOLxU5Pwf7JLhBYHcl74mv1LfGs4SC7fsc7sewIUzIRzGYXJHGIQWT9A T77zDMv4DtjJnKlLSixE/T2D1eZu2ZeVDGePutbCINEq2ZVQKiEQ223+JlS0WvM59c18 CPwWkG33aNoQtL6XXmIu1oG4jPXhLuq93jFVYGwyErPIGCrAmqmlLDVL/8n7UmIm3k8S EzlNdial734OM/rPmFzVvbM/J0uK5eEayM9Yc97HNjbmBBZS3qcr6VI1PEzqWp/jFTmD YLVA== X-Gm-Message-State: APjAAAXHJkqfpPOTixmfvvuEVq+eWCR73Lkp71uwQsSy4A6veN6Yva/B GDxNC+YGD16ckwFELNMoG3U= X-Google-Smtp-Source: APXvYqzr8sX7R1fAPkrtOjr9rOT7iRfk5yaLETufRNlzAE2DRcrSSkcSvc68UgE3jhbq1VXVibX5jA== X-Received: by 2002:a62:3445:: with SMTP id b66mr30445968pfa.246.1565510853027; Sun, 11 Aug 2019 01:07:33 -0700 (PDT) From: Bin Meng To: Alistair Francis , Palmer Dabbelt , qemu-devel@nongnu.org, qemu-riscv@nongnu.org Date: Sun, 11 Aug 2019 01:06:56 -0700 Message-Id: <1565510821-3927-24-git-send-email-bmeng.cn@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1565510821-3927-1-git-send-email-bmeng.cn@gmail.com> References: <1565510821-3927-1-git-send-email-bmeng.cn@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::542 Subject: [Qemu-devel] [PATCH v3 23/28] riscv: sifive_u: Fix broken GEM support 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" At present the GEM support in sifive_u machine is seriously broken. - The GEM block register base was set to a weird number (0x100900FC), which for no way could work with the cadence_gem model in QEMU. - The generated DT node for GEM has a "clocks-names" which is an invalid property name. Not like other GEM variants, the FU540-specific GEM has a management block to control 10/100/1000Mbps link speed changes, that is mapped to 0x100a0000. We can simply map it into MMIO space without special handling using create_unimplemented_device(). Update the GEM node compatible string to use the official name used by the upstream Linux kernel, and add the management block reg base & size to the property encoding. Tested with upstream U-Boot and Linux kernel MACB drivers. Signed-off-by: Bin Meng Reviewed-by: Alistair Francis --- Changes in v3: None Changes in v2: - use create_unimplemented_device() to create the GEM management block instead of sifive_mmio_emulate() - add "phy-handle" property to the ethernet node hw/riscv/sifive_u.c | 23 ++++++++++++++++++----- include/hw/riscv/sifive_u.h | 3 ++- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c index 0c1a89f..e8bef44 100644 --- a/hw/riscv/sifive_u.c +++ b/hw/riscv/sifive_u.c @@ -3,6 +3,7 @@ * * Copyright (c) 2016-2017 Sagar Karandikar, sagark@eecs.berkeley.edu * Copyright (c) 2017 SiFive, Inc. + * Copyright (c) 2019 Bin Meng * * Provides a board compatible with the SiFive Freedom U SDK: * @@ -11,6 +12,7 @@ * 2) PLIC (Platform Level Interrupt Controller) * 3) PRCI (Power, Reset, Clock, Interrupt) * 4) OTP (One-Time Programmable) memory with stored serial number + * 5) GEM (Gigabit Ethernet Controller) and management block * * This board currently generates devicetree dynamically that indicates at= least * two harts and up to five harts. @@ -38,6 +40,7 @@ #include "hw/loader.h" #include "hw/sysbus.h" #include "hw/char/serial.h" +#include "hw/misc/unimp.h" #include "target/riscv/cpu.h" #include "hw/riscv/riscv_hart.h" #include "hw/riscv/sifive_plic.h" @@ -69,7 +72,8 @@ static const struct MemmapEntry { [SIFIVE_U_UART1] =3D { 0x10011000, 0x1000 }, [SIFIVE_U_OTP] =3D { 0x10070000, 0x1000 }, [SIFIVE_U_DRAM] =3D { 0x80000000, 0x0 }, - [SIFIVE_U_GEM] =3D { 0x100900FC, 0x2000 }, + [SIFIVE_U_GEM] =3D { 0x10090000, 0x2000 }, + [SIFIVE_U_GEM_MGMT] =3D { 0x100a0000, 0x1000 }, }; =20 #define SIFIVE_OTP_SERIAL 1 @@ -84,7 +88,7 @@ static void create_fdt(SiFiveUState *s, const struct Memm= apEntry *memmap, char *nodename; char ethclk_names[] =3D "pclk\0hclk"; uint32_t plic_phandle, prci_phandle, phandle =3D 1; - uint32_t hfclk_phandle, rtcclk_phandle; + uint32_t hfclk_phandle, rtcclk_phandle, phy_phandle; =20 fdt =3D s->fdt =3D create_device_tree(&s->fdt_size); if (!fdt) { @@ -242,20 +246,25 @@ static void create_fdt(SiFiveUState *s, const struct = MemmapEntry *memmap, g_free(cells); g_free(nodename); =20 + phy_phandle =3D phandle++; nodename =3D g_strdup_printf("/soc/ethernet@%lx", (long)memmap[SIFIVE_U_GEM].base); qemu_fdt_add_subnode(fdt, nodename); - qemu_fdt_setprop_string(fdt, nodename, "compatible", "cdns,macb"); + qemu_fdt_setprop_string(fdt, nodename, "compatible", + "sifive,fu540-c000-gem"); qemu_fdt_setprop_cells(fdt, nodename, "reg", 0x0, memmap[SIFIVE_U_GEM].base, - 0x0, memmap[SIFIVE_U_GEM].size); + 0x0, memmap[SIFIVE_U_GEM].size, + 0x0, memmap[SIFIVE_U_GEM_MGMT].base, + 0x0, memmap[SIFIVE_U_GEM_MGMT].size); qemu_fdt_setprop_string(fdt, nodename, "reg-names", "control"); qemu_fdt_setprop_string(fdt, nodename, "phy-mode", "gmii"); + qemu_fdt_setprop_cell(fdt, nodename, "phy-handle", phy_phandle); qemu_fdt_setprop_cell(fdt, nodename, "interrupt-parent", plic_phandle); qemu_fdt_setprop_cell(fdt, nodename, "interrupts", SIFIVE_U_GEM_IRQ); qemu_fdt_setprop_cells(fdt, nodename, "clocks", prci_phandle, PRCI_CLK_GEMGXLPLL, prci_phandle, PRCI_CLK_GEMGXLPLL= ); - qemu_fdt_setprop(fdt, nodename, "clocks-names", ethclk_names, + qemu_fdt_setprop(fdt, nodename, "clock-names", ethclk_names, sizeof(ethclk_names)); qemu_fdt_setprop_cell(fdt, nodename, "#address-cells", 1); qemu_fdt_setprop_cell(fdt, nodename, "#size-cells", 0); @@ -264,6 +273,7 @@ static void create_fdt(SiFiveUState *s, const struct Me= mmapEntry *memmap, nodename =3D g_strdup_printf("/soc/ethernet@%lx/ethernet-phy@0", (long)memmap[SIFIVE_U_GEM].base); qemu_fdt_add_subnode(fdt, nodename); + qemu_fdt_setprop_cell(fdt, nodename, "phandle", phy_phandle); qemu_fdt_setprop_cell(fdt, nodename, "reg", 0x0); g_free(nodename); =20 @@ -456,6 +466,9 @@ static void riscv_sifive_u_soc_realize(DeviceState *dev= , Error **errp) sysbus_mmio_map(SYS_BUS_DEVICE(&s->gem), 0, memmap[SIFIVE_U_GEM].base); sysbus_connect_irq(SYS_BUS_DEVICE(&s->gem), 0, plic_gpios[SIFIVE_U_GEM_IRQ]); + + create_unimplemented_device("riscv.sifive.u.gem-mgmt", + memmap[SIFIVE_U_GEM_MGMT].base, memmap[SIFIVE_U_GEM_MGMT].size); } =20 static void riscv_sifive_u_machine_init(MachineClass *mc) diff --git a/include/hw/riscv/sifive_u.h b/include/hw/riscv/sifive_u.h index 2a7877e..27b87cf 100644 --- a/include/hw/riscv/sifive_u.h +++ b/include/hw/riscv/sifive_u.h @@ -56,7 +56,8 @@ enum { SIFIVE_U_UART1, SIFIVE_U_OTP, SIFIVE_U_DRAM, - SIFIVE_U_GEM + SIFIVE_U_GEM, + SIFIVE_U_GEM_MGMT }; =20 enum { --=20 2.7.4