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 3F93EE9A04A for ; Thu, 19 Feb 2026 14:42:22 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vt57E-00009J-Ld; Thu, 19 Feb 2026 09:34:52 -0500 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 1vt57D-00007w-C2 for qemu-arm@nongnu.org; Thu, 19 Feb 2026 09:34:51 -0500 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vt57B-0002yF-HL for qemu-arm@nongnu.org; Thu, 19 Feb 2026 09:34:51 -0500 Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-4375d4fb4d4so681562f8f.0 for ; Thu, 19 Feb 2026 06:34:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1771511688; x=1772116488; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=deDtLpm5UCBRVz7TWoi3DqbhG6uyneflICAxyDhjR6g=; b=hWPPQJ/8+6WVeF0/2qHSp6i3TbEgDlsufaQhvW7GpdNLdiMYQ48mBD/AhxayZWwbLu ZpXqJ3mDfbII7X3WbPyg20Gz4UnqEcVv0DBQ568x059CLV68hsi99LUU5/Yc4U0aHa35 AHXIWsZqlZ0Hpdk1q2/MBHvgs1xke/3O2e/A66K5mDtpkKZ0PpHeXx0+IULVt+JQYS0S UIaik6xFrXmXwbMy2B4lkvsS/l9k0PewPFHYb7I9LP+yv5cIH8JNZ0kVJstI6PvNqnNt ngPf9g8wIfI9plY68Ey8H3zVNjNXHCu65O1BtKaCTyyHoR3cMrckvXjtZ3a24SawDPVB s4pg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771511688; x=1772116488; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=deDtLpm5UCBRVz7TWoi3DqbhG6uyneflICAxyDhjR6g=; b=q7e9bEy+z7SMqN93xPAwt0s3/UVnI5dCwQFjZm+pRkAlBYckOvqnDKGwron3vwwCb4 +MJUJyRNAOh5ypzcQQ3po/vOeG/fzf9Hwjcmd1angVmcTfcDYjBkpqAHSFeQSxQbJlom TJieQad9KSK4X9XfiyEPo9yP3pkC3JmRsMKaJplgLFh0583sp0iHuOLeKJSRf8ft6cTY pgIqD01SIUfiurJyPvVSd2is4iZRsVE09hrdkPstjgMtzkA7cNtCXTrnAuysmQLdPvpF ArGplb2j1SBDvfFK0GkQRP40zvah4nKK7W1gYOR4TmLC+He9yDCIAweL64snK4FG/ETB hwiw== X-Gm-Message-State: AOJu0YxBlPPRrrk4ii+WjGYaWMWP/3fH9MGXFe83/pHK3zVqtaydqvEf WrWAwiL/pMKvs4fyHLsGCIzF8S2WxdGnFcStr5cvCqEh3Y0sPASxT0d4rDwDfa8J X-Gm-Gg: AZuq6aIeu0B385pY7IaoCKbmruBb03IuxDdPLSj6u1cB4mmzwKRxtqb2taLgKyNvf0B y2loEIapQojFbeAGDqP8Nf2T25yK729CQATcPjLX7Qt90fei558YxCzNOr+K6g0k01aJjCuRRKV 7wSE/0ux8hSt5GnPL/DbXrTrXCtz4ODCRA6OCZebnhS28PdwJzC3zjgd5pjKBMPFxPN2as3ir3F UvQ3aUo37LTlbdedwyE1hp4SbeobB3iCYRbffDrrhbpjNBKkORGqTt6H/8M5FdysmHKBM/AKFZQ kTUcMWRPguyREPKLtu1E852ZVt2VK/Dbumts8gWimgtE9riQ93KeRz2jRzwtN7xTMQu2NIMgjNx 0JHW7dg1z8MP20N6mEGXJb+YjgMnuoY9+77buowuUvZexRWHJK43O+LcnnVRir8YOAlUAfTkPc1 Ux1GcCrll7t5GMh5H6+yrjgAUqvQkbs9N7z/lbY9AcSACs454Od0d2EIV0bj0Kd1xQEwRF X-Received: by 2002:a05:6000:22c9:b0:437:707e:9f57 with SMTP id ffacd0b85a97d-43958d55f30mr9429236f8f.0.1771511687896; Thu, 19 Feb 2026 06:34:47 -0800 (PST) Received: from thinkpad-t470s.. (93-143-129-182.adsl.net.t-com.hr. [93.143.129.182]) by smtp.googlemail.com with ESMTPSA id ffacd0b85a97d-43796abd259sm52022770f8f.24.2026.02.19.06.34.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Feb 2026 06:34:47 -0800 (PST) From: Ruslan Ruslichenko To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, alex.bennee@linaro.org, peter.maydell@linaro.org, artem_mygaiev@epam.com, volodymyr_babchuk@epam.com, takahiro.nakata.wr@renesas.com, "Edgar E . Iglesias" , Ruslan_Ruslichenko@epam.com, balaton@eik.bme.hu Subject: [PATCH v2 08/33] hw/core/fdt_generic_util: implement fdt_init_qdev Date: Thu, 19 Feb 2026 15:33:07 +0100 Message-ID: <20260219143332.3316679-9-ruslichenko.r@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260219143332.3316679-1-ruslichenko.r@gmail.com> References: <20260219143332.3316679-1-ruslichenko.r@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=ruslichenko.r@gmail.com; helo=mail-wr1-x42b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-arm@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-arm-bounces+qemu-arm=archiver.kernel.org@nongnu.org Sender: qemu-arm-bounces+qemu-arm=archiver.kernel.org@nongnu.org From: Ruslan Ruslichenko Implement main routine to create device object from compat. The following steps implemented: - parse node compatible and device types - try to create object from compat - set correct parent based on device tree. Signed-off-by: Ruslan Ruslichenko --- hw/core/fdt_generic_util.c | 222 +++++++++++++++++++++++++++++++++++++ 1 file changed, 222 insertions(+) diff --git a/hw/core/fdt_generic_util.c b/hw/core/fdt_generic_util.c index 3606c11349..8131511e70 100644 --- a/hw/core/fdt_generic_util.c +++ b/hw/core/fdt_generic_util.c @@ -40,6 +40,7 @@ #include "qemu/config-file.h" #include "hw/core/boards.h" #include "qemu/option.h" +#include "hw/cpu/cluster.h" #ifndef FDT_GENERIC_UTIL_ERR_DEBUG #define FDT_GENERIC_UTIL_ERR_DEBUG 3 @@ -238,8 +239,229 @@ static int simple_bus_fdt_init(char *node_path, FDTMachineInfo *fdti) return 0; } +/* FIXME: figure out a real solution to this */ + +#define DIGIT(a) ((a) >= '0' && (a) <= '9') +#define LOWER_CASE(a) ((a) >= 'a' && (a) <= 'z') + +static void trim_version(char *x) +{ + long result; + + for (;;) { + x = strchr(x, '-'); + if (!x) { + return; + } + if (DIGIT(x[1])) { + /* Try to trim Xilinx version suffix */ + const char *p; + + qemu_strtol(x + 1, &p, 0, &result); + + if (*p == '.') { + *x = 0; + return; + } else if (*p == 0) { + return; + } + } else if (x[1] == 'r' && x[3] == 'p') { + /* Try to trim ARM version suffix */ + if (DIGIT(x[2]) && DIGIT(x[4])) { + *x = 0; + return; + } + } + x++; + } +} + +static void substitute_char(char *s, char a, char b) +{ + for (;;) { + s = strchr(s, a); + if (!s) { + return; + } + *s = b; + s++; + } +} + +static inline const char *trim_vendor(const char *s) +{ + /* FIXME: be more intelligent */ + const char *ret = memchr(s, ',', strlen(s)); + return ret ? ret + 1 : s; +} + +static Object *fdt_create_from_compat(const char *compat, char **dev_type) +{ + Object *ret = NULL; + char *c = g_strdup(compat); + + /* Try to create the object */ + ret = object_new(c); + + if (!ret) { + /* Trim the version off the end and try again */ + trim_version(c); + ret = object_new(c); + + if (!ret) { + /* Replace commas with full stops */ + substitute_char(c, ',', '.'); + ret = object_new(c); + } + } + + if (!ret) { + /* + * Restart with the orginal string and now replace commas with full + * stops and try again. This means that versions are still included. + */ + g_free(c); + c = g_strdup(compat); + substitute_char(c, ',', '.'); + ret = object_new(c); + } + + if (dev_type) { + *dev_type = c; + } else { + g_free(c); + } + + if (!ret) { + const char *no_vendor = trim_vendor(compat); + + if (no_vendor != compat) { + return fdt_create_from_compat(no_vendor, dev_type); + } + } + return ret; +} + +/* + * Error handler for device creation failure. + * + * We look for qemu-fdt-abort-on-error properties up the tree. + * If we find one, we abort with the provided error message. + */ +static void fdt_dev_error(FDTMachineInfo *fdti, char *node_path, char *compat) +{ + const char *abort_on_error; + const char *warn_on_error; + + warn_on_error = qemu_fdt_getprop_inherited(fdti->fdt, node_path, + "qemu-fdt-warn-on-error", 0, NULL); + abort_on_error = qemu_fdt_getprop_inherited(fdti->fdt, node_path, + "qemu-fdt-abort-on-error", 0, NULL); + if (warn_on_error) { + if (strncmp("device_type", compat, strlen("device_type"))) { + warn_report("%s: %s", compat, warn_on_error); + } + } + + if (abort_on_error) { + error_report("Failed to create %s", compat); + error_setg(&error_fatal, "%s", abort_on_error); + } +} + static int fdt_init_qdev(char *node_path, FDTMachineInfo *fdti, char *compat) { + Object *dev, *parent; + char *dev_type = NULL; + char parent_node_path[DT_PATH_LENGTH]; + + if (!compat) { + return 1; + } + dev = fdt_create_from_compat(compat, &dev_type); + if (!dev) { + DB_PRINT_NP(1, "no match found for %s\n", compat); + fdt_dev_error(fdti, node_path, compat); + return 1; + } + DB_PRINT_NP(1, "matched compat %s\n", compat); + + /* Do this super early so fdt_generic_num_cpus is correct ASAP */ + if (object_dynamic_cast(dev, TYPE_CPU)) { + fdt_generic_num_cpus++; + DB_PRINT_NP(0, "is a CPU - total so far %d\n", fdt_generic_num_cpus); + } + + if (qemu_devtree_getparent(fdti->fdt, parent_node_path, node_path)) { + abort(); + } + while (!fdt_init_has_opaque(fdti, parent_node_path) && + !object_dynamic_cast(dev, TYPE_CPU)) { + fdt_init_yield(fdti); + } + + parent = fdt_init_get_opaque(fdti, parent_node_path); + + if (object_dynamic_cast(dev, TYPE_CPU)) { + parent = fdt_init_get_cpu_cluster(fdti, parent, compat); + } + + if (dev->parent) { + DB_PRINT_NP(0, "Node already parented - skipping node\n"); + } else if (parent) { + DB_PRINT_NP(1, "parenting node\n"); + object_property_add_child(OBJECT(parent), + strdup(strrchr(node_path, '/') + 1), + OBJECT(dev)); + if (object_dynamic_cast(dev, TYPE_DEVICE)) { + Object *parent_bus = parent; + unsigned int depth = 0; + + DB_PRINT_NP(1, "bus parenting node\n"); + /* Look for an FDT ancestor that is a Bus. */ + while (parent_bus && !object_dynamic_cast(parent_bus, TYPE_BUS)) { + /* + * Assert against insanely deep hierarchies which are an + * indication of loops. + */ + assert(depth < 4096); + + parent_bus = parent_bus->parent; + depth++; + } + + if (!parent_bus + && object_dynamic_cast(OBJECT(dev), TYPE_SYS_BUS_DEVICE)) { + /* + * Didn't find any bus. Use the default sysbus one. + * This allows ad-hoc busses belonging to sysbus devices to be + * visible to -device bus=x. + */ + parent_bus = OBJECT(sysbus_get_default()); + } + + if (parent_bus) { + qdev_set_parent_bus(DEVICE(dev), BUS(parent_bus), + &error_abort); + } + } + } else { + DB_PRINT_NP(1, "orphaning node\n"); + if (object_dynamic_cast(OBJECT(dev), TYPE_SYS_BUS_DEVICE)) { + qdev_set_parent_bus(DEVICE(dev), BUS(sysbus_get_default()), + &error_abort); + } + + /* FIXME: Make this go away (centrally) */ + object_property_add_child( + object_get_root(), + strrchr(node_path, '/') + 1, + OBJECT(dev)); + } + fdt_init_set_opaque(fdti, node_path, dev); + + g_free(dev_type); + return 0; } -- 2.43.0