From patchwork Thu Feb 6 13:10:47 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: 862508 Delivered-To: patch@linaro.org Received: by 2002:a5d:51d2:0:b0:385:e875:8a9e with SMTP id n18csp119311wrv; Thu, 6 Feb 2025 05:13:46 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXINPuwzop7BgEg6cl2Ie6IOrSFrWGPM5htXLi76dozRQMabQTQk9jxeQ2ZvAUvC64tpjIU3w==@linaro.org X-Google-Smtp-Source: AGHT+IH/X/yCiZjTEbmuNJH2N9RWOseXBfFobP2Tv3pcGAdrlYQszs8IN5mkv4qd7A5eBWDhRcrU X-Received: by 2002:a05:620a:40c9:b0:7b6:e47a:8e14 with SMTP id af79cd13be357-7c03a016a76mr1136760685a.35.1738847626685; Thu, 06 Feb 2025 05:13:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1738847626; cv=none; d=google.com; s=arc-20240605; b=REXwNxbZ56MazvF51UBt1h3ErFor9Kg6gD82w9//nbMioGCBzz1M3R0tPC7ExaM6ey et3wxK3vMERgkyy3t1rUylcEZ5HOa8ybbx3k7aSe35QD9zy0fZSrOixQ0Hjiu0ExGqLR eN2EE48yMdpofADkLZSZKHhppEIgJb7jZ9crW7agmGcNke0d9njwzdlI/M+LRyrkG/iy wceFFdnVhjxYBrVG90H+y0mOWf6TP+hE1mycm/SwWKERBU9gRH0jKw+1EqBZK4yywA5r xAu2VXoEX7LHF3GoN/a7WUCIVjde7gZski8mpCkHtye/PYDwgSsKRybEPtTCVv9DOCnC fqKA== 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=7NsVx5R+L140HvZ0es4udPXCD2KdHoHcZm3kdyNBbE4=; b=Jwa+HRJhw8c44z6RTXD42DuVW3p33v3Tg2/aD+WQq4mS6y3zBvQpcNwY8rVUgbDpdp SChAJI5Le/opnohh7plZzop0ZgtM6gaxZLHxNaCiJK2ombo9046pYEnvjDG2ifCO0jfg FYNVvUzjV578/f6wRWcb0rfHx+gG6QZhyNy5GPNRxW+bLVEmH9fWcxoFZtl1nVJq2YD1 Pu50/94eI75fuu/OkZEcMJsaHzUfe5unfZXIgMJ/ht0umeMWMY1+/uw3DQHHqaBxCaVs m3lC5PDvuWCAzZ8ueg57015pwyW2bTWS/OWhKEiactUQubBRK/Xoj3OjIAuLX4zPthbJ dv6g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=vVR3F3iB; 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 af79cd13be357-7c041e09fdasi110429385a.142.2025.02.06.05.13.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 06 Feb 2025 05:13:46 -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=vVR3F3iB; 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 1tg1fm-0005vb-9q; Thu, 06 Feb 2025 08:12:02 -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 1tg1fe-0005jJ-Br for qemu-devel@nongnu.org; Thu, 06 Feb 2025 08:11:54 -0500 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tg1fc-0008D4-Aa for qemu-devel@nongnu.org; Thu, 06 Feb 2025 08:11:53 -0500 Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-38dae70f5d9so414925f8f.1 for ; Thu, 06 Feb 2025 05:11:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1738847510; x=1739452310; 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=vVR3F3iBasdjciRsJQWA2uKaG/TtfHkLoBXGOoqxQBga6RCwd4Mjg1ZU1Ob5gLDFvX fRB8NHE3LJ3q1+VRi7lmbANARVWYupD88nE5lpjDq+w77bRc6WLvylwyFe2J0CyaC82X jjfCZiZvt3f8q0wdflJmWvBP5FrEqLGZPqhRDFchATvwTH0FbAj5HQq0ykP2ebh2HEpp cdC17g3jMvQdV3CgQq9TWyKcj+X68p1gBU6l9Fc/ejEk9sra7vunYDw29VcphE+/wvXX N3m72f2Cdt1CO/WPnzDX3tNqEf5ndBuxl8VCGFvRUiuZjj1ShLl1speG0z9Qpb6DDbsr 4g7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738847510; x=1739452310; 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=W2mVHHEBEKsG3RWBBy0T1eiG9xS/l524zf2EtBXBNKSjFcmQRWMMFomgge9EeUsdhp IUzl0ieRoZmwJO0vY048+Zw+0slDcfi2Fz7iqsRtOlzXqHo8XC6FXvlT8gWT9KDz8omN JkM5lcl+qyaBhgNCtVKJozGiQv4QpGbf58m3IGboTInHeVDQWCW44Ph4DQmsxwJ1LA// MZt0fL6R4q7j5cqU8cr/ppD+hBb498lflprtXTs4gJ9etenBeCdjBOkvREBW6UQ5imQN aueGj8cC7iMTYfFxargVGL2sIFRxPp2z70jY/pO1WwXUn8eTQOjAOgIiQYWUmBOKnfGR bQQw== X-Gm-Message-State: AOJu0Yw4chVECv5ZMA7LtiB3XGEfnwAEcb8tZ3TDm2m9VcMWDLiUqQUT 9vZ6SGf8TSsbgHdINJPSIspD+Fm0jLcTS0GzMLK4M2nRK/TcfcoIioFd0f2/lOxSNoZUEH0bjzk oi8U= X-Gm-Gg: ASbGncuvYJcCGYAFZ8Zb9RqdmA8CbNhu8DCwRBfiseryPg6Op9s7TMwzHZCKxe9W7rm CVmELn0KOBb+pIB6vdwgBIIdsAGhd8PCwJGLj2p30XyU58focBbBoIOnLYEsk816cPOZHu/dYvt HugGIBonoDKtR0ENAaQH0bPw9PHg+GkFbNewEWbQ0JybLxSB04hXDdjPbUIi33HHDD9hWs0sxZk 5GvwDMw1HrCgKLRM4AtD48mHhJCwzTJaCFbIWykyIB0enGVUIb/AB/ZS1R5sN7fwUcOWiWr6fnA 1jeb4MyHrPNHZpBcLHVOR+KZi8AvYd/pPTOoBsw3l6M61fQ0wMGOihz/KZlBtGgsog== X-Received: by 2002:a5d:6d8c:0:b0:38d:c2d4:2399 with SMTP id ffacd0b85a97d-38dc2d425admr1321247f8f.41.1738847510203; Thu, 06 Feb 2025 05:11:50 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4390d94d802sm57701525e9.12.2025.02.06.05.11.49 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 06 Feb 2025 05:11:49 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Anton Johansson , Jason Wang , Paolo Bonzini , Alistair Francis , Thomas Huth , Richard Henderson , Peter Maydell , "Edgar E. Iglesias" , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= Subject: [PATCH v5 11/16] hw/microblaze: Support various endianness for s3adsp1800 machines Date: Thu, 6 Feb 2025 14:10:47 +0100 Message-ID: <20250206131052.30207-12-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250206131052.30207-1-philmd@linaro.org> References: <20250206131052.30207-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=philmd@linaro.org; helo=mail-wr1-x42c.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=unavailable 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, }, };