From patchwork Mon Feb 10 20:41:34 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: 863824 Delivered-To: patch@linaro.org Received: by 2002:a5d:4e42:0:b0:385:e875:8a9e with SMTP id r2csp1791308wrt; Mon, 10 Feb 2025 12:43:30 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUY5/b8Avyd1ard8mc65gwnhm+CzC+GjsH3M7gHnuw3nh3bZJ8McOSk1TMzJqYgOHkC9D2l9A==@linaro.org X-Google-Smtp-Source: AGHT+IG1ZIWj0+d1WsUDmUh9AD8tWWiyrlMFIGY5QSr+/Z0AOm329DD6kU1PSx8UktUEmaHHc+bq X-Received: by 2002:a05:6214:20aa:b0:6d4:1613:be3e with SMTP id 6a1803df08f44-6e4680809dbmr12793666d6.22.1739220210065; Mon, 10 Feb 2025 12:43:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1739220210; cv=none; d=google.com; s=arc-20240605; b=lKVpLn2K/uY4eTlCachadkzZLbW3neX8H+Lb17Ae00hNoweCQ6Kr5v4kq+A9blhNuw Z2FgSTH5fcnzY0RVq5dtc5s5KIoLpPVUh/jGiFw5g9P8nycAD1iTOXEyKSAul1LHEupr egnhIEZAEisjfq8V9d/HSgTpJk+R6Wpv8CGUbNEWJFMZ08WcGmktJBUEckQw3tlZXJ1G hUAah/wkTC3T+n1rYAPa8VEs1zEJ5vBkkBUDwXm29k04FBouTrL3+1w8sc15IGGL4Xjr TP6bzdOfzRPQRjxA0Uz/vFSSx3XdOIKVB5WJyGsz/BuZV3VBo0axPFqT7f60MYExp4+X raOg== 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=9wy3ySZz1ZQEjARg3uJtNCm7NxMxde8hFUEYBH3h0BI=; fh=qtn8prgQtzf5IzCNvLChUZDElvNECP6ej9YfjQeBz3I=; b=giX04KHUxnMlCaFjSEcVNZXZllBBZnoAbdAMd4+YbD1uolA0Fm6VyTDj0n1SeuHRXG vxnBmC+2ezY2dNrnAnMdU9RyjcHkMNpiQgIDrRqzxAtpUunrdAA01cbPc8b0wNKR+2eI 2/2RLtFXL2ja915K4NhUjves1IqnDaQJFeBztd7T2wFrwc7fH7HbyBOuO6csD9fRJbtC Av9bf0uo+URUmhTiltYZaUCTjtO7YwQPNYyt28bV0wQc3bZgNsJRzjnH/LeA4mg2llp/ 1o747irqamUzfZ2L94TDh4LMiN779TYyzwT2OLKwo1SgcONpbX60PUacAieH8mjBzPZL F7jg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Xd7IvQmI; 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-6e4420eb7b0si90236136d6.287.2025.02.10.12.43.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 10 Feb 2025 12:43:30 -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=Xd7IvQmI; 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 1thabn-00065b-U0; Mon, 10 Feb 2025 15:42:23 -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 1thabn-00065S-2B for qemu-devel@nongnu.org; Mon, 10 Feb 2025 15:42:23 -0500 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1thabl-0003Xx-1U for qemu-devel@nongnu.org; Mon, 10 Feb 2025 15:42:22 -0500 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-438a3216fc2so48186455e9.1 for ; Mon, 10 Feb 2025 12:42:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1739220138; x=1739824938; 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=9wy3ySZz1ZQEjARg3uJtNCm7NxMxde8hFUEYBH3h0BI=; b=Xd7IvQmIMe17NWNWxiXXdSAKD01YepENj/gaj/goPG0asY26n/CdW8d88N/e4zJb5v V4ck9vDb1lk8IQAR5RRyiNDgJw4eE7pvVEvKrJl5GbxA4Ag/JMSDqnguyQ78EMGd5eKv 4eCYhG98zTbbdd6/iwkh0r/3dab4ErZYRsa+QXoUUl0WAWXJb55HnJlzq7gQSXzhaRO6 KogKuwmfYSr6tfYBkyJttaIHbmiAOjDGa0dsCJYgYEzOTBcWxu1y4KmH1jxypLmHx/mK JauOKETgdnlb4LkfQC+x1vCs3YhgP1a15MkgRxp+3dWUFAiXDeGGLc3be0sDC+KEKJyL e9bg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739220138; x=1739824938; 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=9wy3ySZz1ZQEjARg3uJtNCm7NxMxde8hFUEYBH3h0BI=; b=sbMgh3W7xpexH3t4L0PmD9KPW5KkEm7Bz6kbLBDsPMzYvcsx41XIqV2B4qMR8Q8nly 1LrVuL/O18xM68CmdaPV853kTw+IAuxidKJ8DwuufENsq/PkXt9zqhD5BeXykLrn/3Oz pAXMwfUNmyJCbeWCITw0YxPXzcY6h2nTUJD/aZ56LbsmVITOu4Pv6AXUNELCXr3GChH3 lm0an+x3WlSMod9Btj8uScz/jlwx43rVY66q7yJOe4S1Ik/C8KTB12BsEjX5VRp1vTy6 6PnUx7S1ekGa8SRd9x26/dJdgTIrajZy06erfGUMKJKmjLbGnW5mZJlb5yMUcH7ki0BV Z5IA== X-Gm-Message-State: AOJu0Yyk5i4HQNByMAAz/NtXowLJWJJ5YgjruzGbZdpOi7NWVl92y9hN vMyZP4OuYEXqD8INtziAXUi16QteeHKncOcjUT0Sk6Tv2gpVeyAbLpnYNjPtnYyDDF9Zj60VU/P B5JI= X-Gm-Gg: ASbGncucIdlTo0qyVdDmEhobg1wUtG7mK+cKLPc56nRoQx46wQkLZ5nQAn/P+fiJDha ckd70AkIP4LM+z5gr3my449A9mHqOPqZRvxHFDsaEBDvpsld02us87w6AiZWEE2EuaTQr9IrOc8 VZd7DRNY1fqVnIE+6Hw70FVFZHWzBtaQ90cK2aTL2AeowYM4NWquZCSdDCtXV4Q0b8GTe2IWXLC 0z2fCceuZd8FpyK+GEFnE6trF276fB97/Xf15QbyrjSp6mKBtnVyi47pAwxShqas1xQBUr179lB cB8w0SgY3qZD6MvF3uA2x4ERq7ubVlpgXHJqHSxGasBxH3uuQuqqo2Kyh88BQJ1qeg== X-Received: by 2002:a05:6000:e48:b0:38d:b6a9:2cd2 with SMTP id ffacd0b85a97d-38dc937347bmr9349357f8f.46.1739220137758; Mon, 10 Feb 2025 12:42:17 -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-38dbde0fd18sm13166529f8f.72.2025.02.10.12.42.16 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 10 Feb 2025 12:42:17 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PULL 02/32] hw/intc/xilinx_intc: Make device endianness configurable Date: Mon, 10 Feb 2025 21:41:34 +0100 Message-ID: <20250210204204.54407-3-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250210204204.54407-1-philmd@linaro.org> References: <20250210204204.54407-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=philmd@linaro.org; helo=mail-wm1-x331.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 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. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20250206131052.30207-2-philmd@linaro.org> --- hw/intc/xilinx_intc.c | 52 +++++++++++++++++------- hw/microblaze/petalogix_ml605_mmu.c | 1 + hw/microblaze/petalogix_s3adsp1800_mmu.c | 1 + 3 files changed, 40 insertions(+), 14 deletions(-) diff --git a/hw/intc/xilinx_intc.c b/hw/intc/xilinx_intc.c index 6930f83907a..cd79ac4d4ff 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 @@ -49,6 +52,7 @@ struct XpsIntc { SysBusDevice parent_obj; + bool little_endian_model; MemoryRegion mmio; qemu_irq parent_irq; @@ -140,18 +144,29 @@ 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, + .endianness = DEVICE_BIG_ENDIAN, + .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_BIG_ENDIAN, + [1].endianness = DEVICE_LITTLE_ENDIAN, }; static void irq_handler(void *opaque, int irq, int level) @@ -174,13 +189,21 @@ 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); + + memory_region_init_io(&p->mmio, OBJECT(dev), + &pic_ops[p->little_endian_model], + p, "xlnx.xps-intc", + R_MAX * 4); +} + static const Property xilinx_intc_properties[] = { + DEFINE_PROP_BOOL("little-endian", XpsIntc, little_endian_model, true), DEFINE_PROP_UINT32("kind-of-intr", XpsIntc, c_kind_of_intr, 0), }; @@ -188,6 +211,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..cf3b9574db3 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_bit(dev, "little-endian", true); 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..0506497ad0a 100644 --- a/hw/microblaze/petalogix_s3adsp1800_mmu.c +++ b/hw/microblaze/petalogix_s3adsp1800_mmu.c @@ -95,6 +95,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_uint32(dev, "kind-of-intr", 1 << ETHLITE_IRQ | 1 << UARTLITE_IRQ); sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);