From patchwork Thu Feb 6 11:33:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 862496 Delivered-To: patch@linaro.org Received: by 2002:a5d:51d2:0:b0:385:e875:8a9e with SMTP id n18csp79326wrv; Thu, 6 Feb 2025 03:36:42 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCX/QBhLflCkzOZxq6698V2ECUiTDNSunNDCcs8C3h8dma+1PkVAksH5sMzYtN7hn1dgNkRB+Q==@linaro.org X-Google-Smtp-Source: AGHT+IEbaefrGDF+6UQWvGH9AQxdw4lLobL3kx29e7Zq2eoeDfy7QzoKVz1R/5NyRugAw85CuULL X-Received: by 2002:ad4:5f45:0:b0:6e4:2551:7bd6 with SMTP id 6a1803df08f44-6e42fc05836mr85979886d6.26.1738841801598; Thu, 06 Feb 2025 03:36:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1738841801; cv=none; d=google.com; s=arc-20240605; b=g1cR0aXQRwJxxnZShaYaL80ve/qE966g8dmfgnnH6/uoXHLWbiiPJtYzMarhHLiA0I 7Ht3WXpXMXC0eAsIB0G38MgeSitW6DB79yk/dAlMCyM1fu4HQB3jSwwtA6MiGMCL6U8S EebaJMIXUYwAnJa9g/UAaMNcmCw9umZO74Wsv3ka2qQI8CjlWEiAU5qepXvZ0P2XDnvV uhNQf/IcrNfC17s2O23e039iv2N2AfI3lNKY8/fxemxJ/g4oHsNwuC/DNGuWl+oib6/r URB9a+lTV7mfPwuYBYNpKT+UjHhd6iqsPvIrVAXEsHETj40e2RUXoeYMzEjk3BVV1DBi Y4/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Y5yL8FD/exSYKs1rjCaM0CVY1gRhFjhBlCLpvUbDQjM=; fh=KB7JHaNjI5K4DpKM/QhtRxZS6iSNZtGQL2GKAsTumMw=; b=d1rLrSfMZ99ozbNPV7aHIl900wg5B2OlaR6vFG8OQ0MzMREAk+YoMZt2cUFezURbK/ BiNBrgRyoYXewZYZUpVZD63a6S5N7oOaglqWKJD2RFeC92msJ4Oror+RetHtDTXflNE/ f8BI5usXizLgaUKE0ePdehZ8MYG/QcgGQ6Nn4tmO4ixxP4V2jPxXcHhTIPKVCIFAyTY0 WuYAeI6QVqmTDjNgSDJQvHwHY0FrtDHOB6ygG/zqf6R+/ihl9vQzyuLBk4/HKcwhUGUF BZVWWBgOTws8Cb0IDWmXUuDFWuvUyqjZz+bagFRSi6mTW4fSD4W3CI5UfuNlenmP53ze /NaA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=YlteEe0m; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6e43ba2d301si9757696d6.94.2025.02.06.03.36.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 06 Feb 2025 03:36:41 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=YlteEe0m; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tg09I-0007co-3f; Thu, 06 Feb 2025 06:34:24 -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 1tg09E-0007Zi-7N for qemu-devel@nongnu.org; Thu, 06 Feb 2025 06:34:20 -0500 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tg09C-0000so-8T for qemu-devel@nongnu.org; Thu, 06 Feb 2025 06:34:19 -0500 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-4361815b96cso5092035e9.1 for ; Thu, 06 Feb 2025 03:34:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1738841655; x=1739446455; 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=Y5yL8FD/exSYKs1rjCaM0CVY1gRhFjhBlCLpvUbDQjM=; b=YlteEe0mHXW82jDzWz7ujAhJlq+i5CAD515rgJC9szWMnAobmt38mrmCWT6WUEa4do jjPNn0PLn+cfca6aVGAWF9wqu2y+pvx8ZQi4ps8NslYDKEXz3v7wh1X7JMC3MhkMdlDE 4DpbmrLUR9if4dQOb8rc4cfmkF+fYACvpgPnFhkQkEFBBww0h8TdZJAjL7rLgj8Mscsd h89JyGDsKprGoJVZEiuFetChEbdfbDh9c3r24jekAtQNcjottN8CzSYGXX+cB56Rxv1e rpc9oOH6xVSYHPcIxDJkAmLFAMsyV6cbc36VtnmZja8JMJmMm3krzGSEIVMGA0oGFUxb 7CkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738841655; x=1739446455; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Y5yL8FD/exSYKs1rjCaM0CVY1gRhFjhBlCLpvUbDQjM=; b=hSQlsBBh8JU8DChiQHd5MYlL7tE/338DouxNjtd4+rb4QnehjwgAce4j2ZgsFatIA5 UJUdPUcByckR4sEYuI8Dd6sAOmK11JDGz+S0MJ91nfcujtYmq3NauBE0SGlxKwloOo3y C2SZ9MA0ASsoFQ5HCRs5H1GCEJZB1UGythXrlJjQC5RXwdqfM9rG7PEv2ct99fn23pSE in98Wxv3BSvoeIGAn9K1xMBEsMuU+6Jhcf17iB/7dvaSnU1OTuu7mMPq0LQKd9OFfPEn 4L9fuFEIMPbkGHgiW+u/CEcKjvH3U/y4s2Fh+pOiS/Ud9eP13fiatgJ+Te5XiGzzhDmN 24BQ== X-Gm-Message-State: AOJu0Ywn56bWS2tAdn9nRHDvEYEfdIbBEWxnlWHzC9mhz71MjfgqYlR+ ugdRTrO7Snp3j3kWJMtxYi0ATps1x/0iMjhWam8pp/OaglQsizFfLO2cOSnxp6cS/uRWAl1wTl0 8yZg= X-Gm-Gg: ASbGncu/9LiBrt0DtdVK/Qj2rJ8zOlsJBrzyJiSyYY3GxRwG2fa3q2hlfu30O9d9xQ1 bcIt+8UY7bSSt/DIdktue3aY9qgPFOtumabRK6Vonjzj8s7vit5fsnMYrEj/LQbD7ns3YZ63Umc dbg/K7mgj+Np2od9kRmHJTKGbyiSL2PN4IXQ2F6V4YjL0mtnx6KBtKvx5YK88IeLCThmkHjMlJy HaqupWjSDvSVz9CwARH7qa+SgYV4AMOFzO9DyZn9LsLwS44svTVGxmMSkwDVnM4tc2FHgZ5zRDd a5SUqO7DhMX1V4/B5UruRfa6IcvPe3eN1hD14Wth3hxpNcNHhpMkvSxl4KJMoghbmg== X-Received: by 2002:a05:600c:1d1e:b0:436:faeb:2a1b with SMTP id 5b1f17b1804b1-4390d43e579mr50763485e9.13.1738841655580; Thu, 06 Feb 2025 03:34:15 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38dbdd7f18bsm1518007f8f.60.2025.02.06.03.34.14 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 06 Feb 2025 03:34:15 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Anton Johansson , Alistair Francis , Richard Henderson , Thomas Huth , Jason Wang , "Edgar E. Iglesias" , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= Subject: [PATCH v4 11/16] hw/microblaze: Support various endianness for s3adsp1800 machines Date: Thu, 6 Feb 2025 12:33:16 +0100 Message-ID: <20250206113321.94906-12-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250206113321.94906-1-philmd@linaro.org> References: <20250206113321.94906-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=philmd@linaro.org; helo=mail-wm1-x335.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, 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-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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Introduce an abstract machine parent class which defines the 'little_endian' property. Duplicate the current machine, which endian is tied to the binary endianness, to one big endian and a little endian machine; updating the machine description. Keep the current default machine for each binary. 'petalogix-s3adsp1800' machine is aliased as: - 'petalogix-s3adsp1800-be' on big-endian binary, - 'petalogix-s3adsp1800-le' on little-endian one. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé --- hw/microblaze/petalogix_s3adsp1800_mmu.c | 62 +++++++++++++++++++----- 1 file changed, 51 insertions(+), 11 deletions(-) diff --git a/hw/microblaze/petalogix_s3adsp1800_mmu.c b/hw/microblaze/petalogix_s3adsp1800_mmu.c index 96aed4ed1a3..aea727eb7ee 100644 --- a/hw/microblaze/petalogix_s3adsp1800_mmu.c +++ b/hw/microblaze/petalogix_s3adsp1800_mmu.c @@ -55,8 +55,17 @@ #define ETHLITE_IRQ 1 #define UARTLITE_IRQ 3 +typedef struct PetalogixS3adsp1800MachineClass { + MachineClass parent_obj; + + bool little_endian; +} PetalogixS3adsp1800MachineClass; + #define TYPE_PETALOGIX_S3ADSP1800_MACHINE \ - MACHINE_TYPE_NAME("petalogix-s3adsp1800") + MACHINE_TYPE_NAME("petalogix-s3adsp1800-common") +DECLARE_CLASS_CHECKERS(PetalogixS3adsp1800MachineClass, + PETALOGIX_S3ADSP1800_MACHINE, + TYPE_PETALOGIX_S3ADSP1800_MACHINE) static void petalogix_s3adsp1800_init(MachineState *machine) @@ -71,11 +80,13 @@ petalogix_s3adsp1800_init(MachineState *machine) MemoryRegion *phys_ram = g_new(MemoryRegion, 1); qemu_irq irq[32]; MemoryRegion *sysmem = get_system_memory(); + PetalogixS3adsp1800MachineClass *pmc; + pmc = PETALOGIX_S3ADSP1800_MACHINE_GET_CLASS(machine); cpu = MICROBLAZE_CPU(object_new(TYPE_MICROBLAZE_CPU)); object_property_set_str(OBJECT(cpu), "version", "7.10.d", &error_abort); object_property_set_bool(OBJECT(cpu), "little-endian", - !TARGET_BIG_ENDIAN, &error_abort); + pmc->little_endian, &error_abort); qdev_realize(DEVICE(cpu), NULL, &error_abort); /* Attach emulated BRAM through the LMB. */ @@ -95,7 +106,7 @@ petalogix_s3adsp1800_init(MachineState *machine) 64 * KiB, 1, 0x89, 0x18, 0x0000, 0x0, 1); dev = qdev_new("xlnx.xps-intc"); - qdev_prop_set_bit(dev, "little-endian", !TARGET_BIG_ENDIAN); + qdev_prop_set_bit(dev, "little-endian", pmc->little_endian); qdev_prop_set_uint32(dev, "kind-of-intr", 1 << ETHLITE_IRQ | 1 << UARTLITE_IRQ); sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); @@ -107,7 +118,7 @@ petalogix_s3adsp1800_init(MachineState *machine) } dev = qdev_new(TYPE_XILINX_UARTLITE); - qdev_prop_set_bit(dev, "little-endian", !TARGET_BIG_ENDIAN); + qdev_prop_set_bit(dev, "little-endian", pmc->little_endian); 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); @@ -115,7 +126,7 @@ petalogix_s3adsp1800_init(MachineState *machine) /* 2 timers at irq 2 @ 62 Mhz. */ dev = qdev_new("xlnx.xps-timer"); - qdev_prop_set_bit(dev, "little-endian", !TARGET_BIG_ENDIAN); + qdev_prop_set_bit(dev, "little-endian", pmc->little_endian); qdev_prop_set_uint32(dev, "one-timer-only", 0); qdev_prop_set_uint32(dev, "clock-frequency", 62 * 1000000); sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); @@ -123,7 +134,7 @@ petalogix_s3adsp1800_init(MachineState *machine) sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, irq[TIMER_IRQ]); dev = qdev_new("xlnx.xps-ethernetlite"); - qdev_prop_set_bit(dev, "little-endian", !TARGET_BIG_ENDIAN); + qdev_prop_set_bit(dev, "little-endian", pmc->little_endian); 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); @@ -133,26 +144,55 @@ petalogix_s3adsp1800_init(MachineState *machine) create_unimplemented_device("xps_gpio", GPIO_BASEADDR, 0x10000); - microblaze_load_kernel(cpu, !TARGET_BIG_ENDIAN, ddr_base, ram_size, + microblaze_load_kernel(cpu, pmc->little_endian, ddr_base, ram_size, machine->initrd_filename, BINARY_DEVICE_TREE_FILE, NULL); } -static void petalogix_s3adsp1800_machine_class_init(ObjectClass *oc, void *data) +static void petalogix_s3adsp1800_machine_class_init(ObjectClass *oc, + bool little_endian) { MachineClass *mc = MACHINE_CLASS(oc); + PetalogixS3adsp1800MachineClass *pmc = PETALOGIX_S3ADSP1800_MACHINE_CLASS(oc); - mc->desc = "PetaLogix linux refdesign for xilinx Spartan 3ADSP1800"; mc->init = petalogix_s3adsp1800_init; - mc->is_default = true; + pmc->little_endian = little_endian; + mc->desc = little_endian + ? "PetaLogix linux refdesign for xilinx Spartan 3ADSP1800 (little endian)" + : "PetaLogix linux refdesign for xilinx Spartan 3ADSP1800 (big endian)"; + if (little_endian == !TARGET_BIG_ENDIAN) { + mc->is_default = true; + mc->alias = "petalogix-s3adsp1800"; + } +} + +static void petalogix_s3adsp1800_machine_class_init_be(ObjectClass *oc, void *data) +{ + petalogix_s3adsp1800_machine_class_init(oc, false); +} + +static void petalogix_s3adsp1800_machine_class_init_le(ObjectClass *oc, void *data) +{ + petalogix_s3adsp1800_machine_class_init(oc, true); } static const TypeInfo petalogix_s3adsp1800_machine_types[] = { { .name = TYPE_PETALOGIX_S3ADSP1800_MACHINE, .parent = TYPE_MACHINE, - .class_init = petalogix_s3adsp1800_machine_class_init, + .abstract = true, + .class_size = sizeof(PetalogixS3adsp1800MachineClass), + }, + { + .name = MACHINE_TYPE_NAME("petalogix-s3adsp1800-be"), + .parent = TYPE_PETALOGIX_S3ADSP1800_MACHINE, + .class_init = petalogix_s3adsp1800_machine_class_init_be, + }, + { + .name = MACHINE_TYPE_NAME("petalogix-s3adsp1800-le"), + .parent = TYPE_PETALOGIX_S3ADSP1800_MACHINE, + .class_init = petalogix_s3adsp1800_machine_class_init_le, }, };