From patchwork Wed Feb 12 12:36:51 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: 864453 Delivered-To: patch@linaro.org Received: by 2002:a5d:4cc5:0:b0:38f:210b:807b with SMTP id c5csp95450wrt; Wed, 12 Feb 2025 04:39:25 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUD0SgcVqOnSrKhhLvtJc0GbJzeSwB2Y+XMLK5Vek+NOvHpdV3akrkmm0L/EeHNIZmbhNCUaQ==@linaro.org X-Google-Smtp-Source: AGHT+IHJTPg3+D2JQcdmB/bH8XCGrds+2yCPluvZnWtxqoksrppn8x9l8A//FySCz2gYZiX8gW22 X-Received: by 2002:a05:620a:618c:b0:7b6:ce6e:229c with SMTP id af79cd13be357-7c06fcd4f01mr494850285a.55.1739363965205; Wed, 12 Feb 2025 04:39:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1739363965; cv=none; d=google.com; s=arc-20240605; b=ISTRxkPCkJA8ehdBjgX/lV0zsDaOiz9D+PiUJpwueZK4mxqM+ITJGaTSbM27DV7nxk tmuDPErkX9YGe34v11A8o/CdOx7GuhxARR84+XAUbCGkGdAVs+Gq9J/RjeFQVJtgxNc/ 34eZ9nxy4io2LYBxWoZocGFh43Q85OlPnokPFnTR/NvpU1+QZ5fgMlKT11Ob2aB8qj5W MeTfbR+0bwognq+u+Sd14AOWGMvW8Yinv0EcU8/nng7Y49B45qClrQfJyj0mgYFToj06 wEqEcnzznWyHf8phJiNJw/udguqgOTVff3ddqvdbka//fK7m/9S6hg9WiEfsDsFlRjWd 35FA== 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=HqvweuXzxTEGE7Ytky6rwqFAbfXEcGIETL91y68eY3A=; fh=HlENWry5pBMj1xy+XPJJKz1+KJ8prrg3FvBcv7/VjNo=; b=Jr4TDJx/oQ+ZxbY//NuVW5bgET8hBpZ4zvcD9C78VSVNTwQewyBw0LYJ/xxlYc80r1 uXdkjCIvLW+yLAPDtj8il/b9IASMQ+EwBWAAT2u7GiOhcBbAB9lQGOjYKobrcu1wJwFb y759zy2l05z4tbwjAiMf9YjQDikc87v7DHBFi4cgHABeRYt/2Z2IKJTyyuf7Tfx3YeLD dzgIZxnWx3+p4mtKCLFUmBZ85VmKT/YkkmGc6chGFAojYuGT5lGsOmy5wOQEoYByqAk9 AW0SN2z8vByO/W+9IQENL393I+eJLh4uQ9aKoDrSS+RY5LCGJbv0NnRiRhvJRFYIhV7E JlNA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=OHHgMdZw; 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-7c0506f1b67si896303285a.353.2025.02.12.04.39.25 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 12 Feb 2025 04:39:25 -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=OHHgMdZw; 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 1tiC0H-00045c-VU; Wed, 12 Feb 2025 07:38:10 -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 1tiBza-0003T4-G5 for qemu-devel@nongnu.org; Wed, 12 Feb 2025 07:37:26 -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 1tiBzN-0000Pv-Us for qemu-devel@nongnu.org; Wed, 12 Feb 2025 07:37:19 -0500 Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-38dd9b3419cso2061985f8f.0 for ; Wed, 12 Feb 2025 04:37:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1739363831; x=1739968631; 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=HqvweuXzxTEGE7Ytky6rwqFAbfXEcGIETL91y68eY3A=; b=OHHgMdZwoUKLE/JJEzE3xpTlFA8hf70P6l+44A6cArOiPblCbAO/nOFXgkj5YPQ2pB cFYAWv/HOmXeT6usjE0iZlwLyu0GOyHdEsg8QCmhyLoU9CQGvFNr5q/5mjA17YQEpvJd 2g6pMqBGtL7kMRiwu0fHcnnV9g6KVSDHWQCzD5RdjigguRXc20sIXj5kP6vo+A/8+5t7 pbpQTVIriFs/vw3YUaSu78HG3P2hu+FQC2wVpoXPmln80bM5fxLYTu7f6rAL9+TsDPhx FBPjg+QjDux6v6k2iCiOD1wycVUdYjsawiG6AnqKi0ZTvzXRT0VLrxT6MI7mSVzIYnPG whPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739363831; x=1739968631; 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=HqvweuXzxTEGE7Ytky6rwqFAbfXEcGIETL91y68eY3A=; b=QXpeLeTJWdUb129aA2sb7ENs2hHwBnu9q/R/UwVv9HI1oHnLMYZv0mixC3FF2OIuYa w1AoaBORvvfOBoEoy7cRUlCyi3+47Y40Yv1rgAvICztgPQ9XhP9PGFMW5tyIJ2eMQmow SiiA8dJUn+wHZG5reA2d7kF2rAv4dcLXsfXgyleBvRLjivNh+eNJ734Y6lGxz2dHcJzo FoccYiX2w7OJZr36j435FLWFCjU9L5ACtl+HNz25cK3GUqH5efyhK/8N3NHHoqgzkVUU n4+KnOFR4FjSwTwPRTcPtkapzuJ7JrIfw0wApA4Y92CrT/vgOQlyIKkgTe7Q/fpoYVkD qa3Q== X-Gm-Message-State: AOJu0YymqzFAhVz5c3/87fpig/rxobFqkWuCeZgcqZK4OP1jvOgG6ko0 o1kK8Zgf1f9rQ1uBTOENRFPVGEdv3CuSu+ZFGIm7JoNbnuIS+p7xR7geVOeSlfTjxacFIqodksR AylM= X-Gm-Gg: ASbGncs3EYYTLtDEvmc442awzcvHwLfqm5pTv07xtzu7PwIQj7kMGvt18glhpR+KdK5 mzQgkVX4Ar2AxtUOFkcgTS40CxrwSiFoa1aMwjDntvbZF9Zb9Yt7KccpLs8CAldt1NAuehao3RB 86I15/BStGpb6kf5wtVQEKMAYKUzi3KdI4vqglk4AEDCrDoNwnejCGKSw2glPt5KC6Aw0IfsC39 wC7GhQuWF8Xg/xJwfVhFNcO+oeMMDix9alkEVUjrHW/wjnSRgzkjTE/3cO6icPvZ3wjTuOx8dEH XU3DXX2pX/ZgsoylQR0iUY1Yfk0+zOpuEcPRmySPnjXJ24wl1CozVULxpf/EBfZhZA== X-Received: by 2002:a5d:6d0d:0:b0:38d:e3fd:1990 with SMTP id ffacd0b85a97d-38dea354aafmr2995134f8f.0.1739363831289; Wed, 12 Feb 2025 04:37:11 -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-38dc73c2e00sm15487467f8f.57.2025.02.12.04.37.10 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 12 Feb 2025 04:37:10 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org, Thomas Huth , qemu-arm@nongnu.org, Richard Henderson , qemu-ppc@nongnu.org, Sai Pavan Boddu , Markus Armbruster , "Edgar E. Iglesias" , Alistair Francis , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= Subject: [PATCH v7 02/10] hw/intc/xilinx_intc: Make device endianness configurable Date: Wed, 12 Feb 2025 13:36:51 +0100 Message-ID: <20250212123659.52764-3-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250212123659.52764-1-philmd@linaro.org> References: <20250212123659.52764-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=philmd@linaro.org; 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, 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 Replace the DEVICE_NATIVE_ENDIAN MemoryRegionOps by a pair of DEVICE_LITTLE_ENDIAN / DEVICE_BIG_ENDIAN. Add the "little-endian" property to select the device endianness, defaulting to little endian. Set the proper endianness for each machine using the device. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth --- hw/intc/xilinx_intc.c | 59 ++++++++++++++++++------ hw/microblaze/petalogix_ml605_mmu.c | 1 + hw/microblaze/petalogix_s3adsp1800_mmu.c | 3 ++ hw/ppc/virtex_ml507.c | 1 + hw/riscv/microblaze-v-generic.c | 1 + 5 files changed, 51 insertions(+), 14 deletions(-) diff --git a/hw/intc/xilinx_intc.c b/hw/intc/xilinx_intc.c index 6930f83907a..ab1c4a32221 100644 --- a/hw/intc/xilinx_intc.c +++ b/hw/intc/xilinx_intc.c @@ -3,6 +3,9 @@ * * Copyright (c) 2009 Edgar E. Iglesias. * + * https://docs.amd.com/v/u/en-US/xps_intc + * DS572: LogiCORE IP XPS Interrupt Controller (v2.01a) + * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal * in the Software without restriction, including without limitation the rights @@ -23,10 +26,12 @@ */ #include "qemu/osdep.h" +#include "qapi/error.h" #include "hw/sysbus.h" #include "qemu/module.h" #include "hw/irq.h" #include "hw/qdev-properties.h" +#include "hw/qdev-properties-system.h" #include "qom/object.h" #define D(x) @@ -49,6 +54,7 @@ struct XpsIntc { SysBusDevice parent_obj; + EndianMode model_endianness; MemoryRegion mmio; qemu_irq parent_irq; @@ -140,18 +146,28 @@ static void pic_write(void *opaque, hwaddr addr, update_irq(p); } -static const MemoryRegionOps pic_ops = { - .read = pic_read, - .write = pic_write, - .endianness = DEVICE_NATIVE_ENDIAN, - .impl = { - .min_access_size = 4, - .max_access_size = 4, +static const MemoryRegionOps pic_ops[2] = { + [0 ... 1] = { + .read = pic_read, + .write = pic_write, + .impl = { + .min_access_size = 4, + .max_access_size = 4, + }, + .valid = { + /* + * All XPS INTC registers are accessed through the PLB interface. + * The base address for these registers is provided by the + * configuration parameter, C_BASEADDR. Each register is 32 bits + * although some bits may be unused and is accessed on a 4-byte + * boundary offset from the base address. + */ + .min_access_size = 4, + .max_access_size = 4, + }, }, - .valid = { - .min_access_size = 4, - .max_access_size = 4 - } + [0].endianness = DEVICE_LITTLE_ENDIAN, + [1].endianness = DEVICE_BIG_ENDIAN, }; static void irq_handler(void *opaque, int irq, int level) @@ -174,13 +190,27 @@ static void xilinx_intc_init(Object *obj) qdev_init_gpio_in(DEVICE(obj), irq_handler, 32); sysbus_init_irq(SYS_BUS_DEVICE(obj), &p->parent_irq); - - memory_region_init_io(&p->mmio, obj, &pic_ops, p, "xlnx.xps-intc", - R_MAX * 4); sysbus_init_mmio(SYS_BUS_DEVICE(obj), &p->mmio); } +static void xilinx_intc_realize(DeviceState *dev, Error **errp) +{ + XpsIntc *p = XILINX_INTC(dev); + + if (p->model_endianness == ENDIAN_MODE_UNSPECIFIED) { + error_setg(errp, TYPE_XILINX_INTC " property 'endianness'" + " must be set to 'big' or 'little'"); + return; + } + + memory_region_init_io(&p->mmio, OBJECT(dev), + &pic_ops[p->model_endianness == ENDIAN_MODE_BIG], + p, "xlnx.xps-intc", + R_MAX * 4); +} + static const Property xilinx_intc_properties[] = { + DEFINE_PROP_ENDIAN_NODEFAULT("endianness", XpsIntc, model_endianness), DEFINE_PROP_UINT32("kind-of-intr", XpsIntc, c_kind_of_intr, 0), }; @@ -188,6 +218,7 @@ static void xilinx_intc_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); + dc->realize = xilinx_intc_realize; device_class_set_props(dc, xilinx_intc_properties); } diff --git a/hw/microblaze/petalogix_ml605_mmu.c b/hw/microblaze/petalogix_ml605_mmu.c index 8b44be75a22..55398cc67d1 100644 --- a/hw/microblaze/petalogix_ml605_mmu.c +++ b/hw/microblaze/petalogix_ml605_mmu.c @@ -111,6 +111,7 @@ petalogix_ml605_init(MachineState *machine) dev = qdev_new("xlnx.xps-intc"); + qdev_prop_set_enum(dev, "endianness", ENDIAN_MODE_LITTLE); qdev_prop_set_uint32(dev, "kind-of-intr", 1 << TIMER_IRQ); sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, INTC_BASEADDR); diff --git a/hw/microblaze/petalogix_s3adsp1800_mmu.c b/hw/microblaze/petalogix_s3adsp1800_mmu.c index 2c0d8c34cd2..15cabe11777 100644 --- a/hw/microblaze/petalogix_s3adsp1800_mmu.c +++ b/hw/microblaze/petalogix_s3adsp1800_mmu.c @@ -71,6 +71,8 @@ petalogix_s3adsp1800_init(MachineState *machine) MemoryRegion *phys_ram = g_new(MemoryRegion, 1); qemu_irq irq[32]; MemoryRegion *sysmem = get_system_memory(); + EndianMode endianness = TARGET_BIG_ENDIAN ? ENDIAN_MODE_BIG + : ENDIAN_MODE_LITTLE; cpu = MICROBLAZE_CPU(object_new(TYPE_MICROBLAZE_CPU)); object_property_set_str(OBJECT(cpu), "version", "7.10.d", &error_abort); @@ -95,6 +97,7 @@ petalogix_s3adsp1800_init(MachineState *machine) 64 * KiB, 1, 0x89, 0x18, 0x0000, 0x0, 1); dev = qdev_new("xlnx.xps-intc"); + qdev_prop_set_enum(dev, "endianness", endianness); qdev_prop_set_uint32(dev, "kind-of-intr", 1 << ETHLITE_IRQ | 1 << UARTLITE_IRQ); sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c index 23238119273..df8f9644829 100644 --- a/hw/ppc/virtex_ml507.c +++ b/hw/ppc/virtex_ml507.c @@ -217,6 +217,7 @@ static void virtex_init(MachineState *machine) cpu_irq = qdev_get_gpio_in(DEVICE(cpu), PPC40x_INPUT_INT); dev = qdev_new("xlnx.xps-intc"); + qdev_prop_set_enum(dev, "endianness", ENDIAN_MODE_BIG); qdev_prop_set_uint32(dev, "kind-of-intr", 0); sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, INTC_BASEADDR); diff --git a/hw/riscv/microblaze-v-generic.c b/hw/riscv/microblaze-v-generic.c index 26788a1824a..ebdd461ae98 100644 --- a/hw/riscv/microblaze-v-generic.c +++ b/hw/riscv/microblaze-v-generic.c @@ -79,6 +79,7 @@ static void mb_v_generic_init(MachineState *machine) memory_region_add_subregion(sysmem, ddr_base, phys_ram); dev = qdev_new("xlnx.xps-intc"); + qdev_prop_set_enum(dev, "endianness", ENDIAN_MODE_LITTLE); qdev_prop_set_uint32(dev, "kind-of-intr", 1 << UARTLITE_IRQ); sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);