From patchwork Wed Feb 12 11:24:05 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: 864435 Delivered-To: patch@linaro.org Received: by 2002:a5d:4cc5:0:b0:38f:210b:807b with SMTP id c5csp67561wrt; Wed, 12 Feb 2025 03:26:49 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUNYV8BZGbRxS+2BfYFQClHdnCr4inH3dp8ii6I2Ub/TB0Ck1nX0sg7sqj65B8/ZQ1jq2Tt9A==@linaro.org X-Google-Smtp-Source: AGHT+IEBhcbHPNSBTn//kGU2ceBRTUVaXFRoMCmo2F3XAYyYjj/4q7T+shsLzEsqii2AXFJMDwfQ X-Received: by 2002:a05:620a:1aaa:b0:7b6:d90f:e4ca with SMTP id af79cd13be357-7c070735f36mr386442785a.26.1739359609506; Wed, 12 Feb 2025 03:26:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1739359609; cv=none; d=google.com; s=arc-20240605; b=hZj0h5MQudG4wPVkxFFMB1x8GYn+38waVclttwYFAgAtAbuzcT0wKR8sFGUudLIg1o Ql0fAztZG2+h/z1ojB7fCICx1ibYeABFoxvFpjRE2rfmBTzb05ZPsKsNTrDOxx8Ndk68 lylJbjoX9SGToHz83rIFwC3dutKelQs+a19MD3fXknRrQNxMwkHf3q5TocZ9goZeNiwj cWQ44WnbS1JYMn5u6Km/yUdAM+zfWNiqa/+lBOSEKbdotvJEwV8F+vYg+eV8tmwM7ZPC RwpkRR5IslTt4JO/tLStLnrIwjhSsSCuaGYitl64rGcUZZ6G5ovJZbpk89KHDmBikP64 1ioA== 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=yr92SnJb/t6uJ0pr1wRWm/Vbw0XgzndiQO45zL1RuJw=; fh=jOJCUaqOG2VMPu6JD/jWkxWZtkuLU6Urvd21Kw0n41U=; b=F5DrisvjBKJvayjGJpNL6vSmjPsVPGmWq1mHGp+b3cG9QU9p0+In3dr0NsDs0at2CS 2udFe7HH2jIYhrOEoaBo3nNQW0T4hkC+foWp2vpQ9Q8uNDU2E7+eiFDq/L3IYaUDiyey W/RijnibkP/JjDpsF3zqPDt8R0eysgrQZTCuVUoEkw3oBfy2z7f6lPX8Y6BaJ37JE7Yi RnCymkl9Teb1Ov/VV3TzncAVjQoSSRETBzfk5xOjvNBkqB+Wh/GHj2BRqreT7CtKjnUX cVh8rkx4v3xMklnP8MSaJLjGVdzveDtqeVUNVVbEU3Czt4XVqJ7V16V3P1eGy70/mRQL //hA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=NAkN090K; 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 d75a77b69052e-47192512f06si63260461cf.55.2025.02.12.03.26.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 12 Feb 2025 03:26:49 -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=NAkN090K; 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 1tiAr9-00064Y-0w; Wed, 12 Feb 2025 06:24:39 -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 1tiAr6-00060k-10 for qemu-devel@nongnu.org; Wed, 12 Feb 2025 06:24:36 -0500 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tiAr2-0004WK-Oc for qemu-devel@nongnu.org; Wed, 12 Feb 2025 06:24:35 -0500 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-4394036c0efso22737025e9.2 for ; Wed, 12 Feb 2025 03:24:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1739359470; x=1739964270; 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=yr92SnJb/t6uJ0pr1wRWm/Vbw0XgzndiQO45zL1RuJw=; b=NAkN090Kp0FZ87RlLMLOskOtXGnU8F61w3udpOzm+j0otFfsZiq6cqpVxJDVtpcC6a cVaxYSHYhG0mgP2d5Bm45b2WN/+uXV8IiMFtVjjSP1FQMgYPjaUVRXpfOPcWqfLU7v0x zBLH9wqkOD/06/ohkRncU1KI7AgZygESFmD8HtNU89yeZxDcC9DdJefbF7wocVFrdcgQ KOMHpAE5lOQvaV8M7KN2Jwp82YzkP44zjLTlJDrtnwM3hQPiIjyHnmE0FHNp/3fUagQR wgT3j6YlCw6e3dLy//CKEDbWxkm1XWg2yMSlm53pR0PlcHXDIM/d2bbWRJS7/jfaicQw Gazg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739359470; x=1739964270; 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=yr92SnJb/t6uJ0pr1wRWm/Vbw0XgzndiQO45zL1RuJw=; b=MF6Wpukk/jSpoKaJSystj1u07XF1rV0/3GILhTsiPAqoP61GQLvbszEL59XUIr19Yd OsR3c4oz1ErRNlYofRB93Xx95LYkvtnB+U5KuRK2lJZ3V+ds8oAn2Kcu/8+PtEqY+G2E Agal2Ka4YvBa2n+lZkP14vMH1BwChuyinTTk8f9oiIgcDMXLLeU8yrwFIfPTTb+eKzVH J0Exqn1pTOC+5jCeMT3+lB64rVQQYAhX0qAjqkpBKy6QtvgiVPb+D4/CeAsseaz4iYEC BU5MBQtEOoiRZDRxmns68WW8xIT+GGGSXNc2G2xjmL6H7tIjCdfbC+BPClkvMt/Su55o O63g== X-Gm-Message-State: AOJu0Ywn1TFLBwJBMDwFzB0DV/iXojIgJ10/VF0drvvlKsYfb6k/3uDd UFEwao/HQzLDnBt2d+Bx5d1e//2HntHczc33ITLPcRytyNq/DFttGGEfZTx39XKVbdyOQvOopor sUpo= X-Gm-Gg: ASbGncuSemDxiI1gfRoufjjhfGLGcL7N/SRjVJBN7Cv0OSIBZTNTGKEOoJ5JCDwKeWs hdZ0q6K3gGoDBfHHjvqq0GKco6CkdPPlj0mm3b2vuVSk+OlbadOKkELfFO778kVzgYjfKCHglNA 2aIo2V4HELMOqLDHwi6nQ7RDpWatI4qlvLEAISRnZ5t8yK6IVQSo0PKO09s+j22Qp0Uce0j+Kf2 VUwacl/2g2JO3LUW8pAJoKb7OzMNoumQ2dfzdxKVR2KS9M2U8lJgYmR4p+iJhLpe1DMyRZ/Gh2e J/8FY1hsj0MgBEcqptRSvnDMcxXGvugGMv5ukfgpAWU3mGHBzgw9cfh7Is1xLVvPAQ== X-Received: by 2002:a05:600c:3110:b0:439:35d2:ed2 with SMTP id 5b1f17b1804b1-4395815f593mr26649235e9.2.1739359470337; Wed, 12 Feb 2025 03:24:30 -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-4395a06b1ddsm16974895e9.22.2025.02.12.03.24.29 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 12 Feb 2025 03:24:29 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org, qemu-ppc@nongnu.org, "Edgar E. Iglesias" , Alistair Francis , Richard Henderson , Thomas Huth , Markus Armbruster , qemu-arm@nongnu.org, =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , =?utf-8?q?Phil?= =?utf-8?q?ippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v6 03/11] hw/net/xilinx_ethlite: Make device endianness configurable Date: Wed, 12 Feb 2025 12:24:05 +0100 Message-ID: <20250212112413.37553-4-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250212112413.37553-1-philmd@linaro.org> References: <20250212112413.37553-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=philmd@linaro.org; helo=mail-wm1-x336.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 on the single machine using the device. Signed-off-by: Philippe Mathieu-Daudé --- hw/microblaze/petalogix_s3adsp1800_mmu.c | 1 + hw/net/xilinx_ethlite.c | 27 ++++++++++++++++++------ hw/riscv/microblaze-v-generic.c | 1 + 3 files changed, 23 insertions(+), 6 deletions(-) diff --git a/hw/microblaze/petalogix_s3adsp1800_mmu.c b/hw/microblaze/petalogix_s3adsp1800_mmu.c index 15cabe11777..d419dc49a25 100644 --- a/hw/microblaze/petalogix_s3adsp1800_mmu.c +++ b/hw/microblaze/petalogix_s3adsp1800_mmu.c @@ -123,6 +123,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_enum(dev, "endianness", endianness); 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); diff --git a/hw/net/xilinx_ethlite.c b/hw/net/xilinx_ethlite.c index 14bf2b2e17a..c1cb54a27af 100644 --- a/hw/net/xilinx_ethlite.c +++ b/hw/net/xilinx_ethlite.c @@ -34,6 +34,7 @@ #include "hw/sysbus.h" #include "hw/irq.h" #include "hw/qdev-properties.h" +#include "hw/qdev-properties-system.h" #include "hw/misc/unimp.h" #include "net/net.h" #include "trace.h" @@ -85,6 +86,7 @@ struct XlnxXpsEthLite { SysBusDevice parent_obj; + EndianMode model_endianness; MemoryRegion container; qemu_irq irq; NICState *nic; @@ -183,10 +185,10 @@ static void port_tx_write(void *opaque, hwaddr addr, uint64_t value, } } -static const MemoryRegionOps eth_porttx_ops = { +static const MemoryRegionOps eth_porttx_ops[2] = { + [0 ... 1] = { .read = port_tx_read, .write = port_tx_write, - .endianness = DEVICE_NATIVE_ENDIAN, .impl = { .min_access_size = 4, .max_access_size = 4, @@ -195,6 +197,9 @@ static const MemoryRegionOps eth_porttx_ops = { .min_access_size = 4, .max_access_size = 4, }, + }, + [ENDIAN_MODE_BIG].endianness = DEVICE_BIG_ENDIAN, + [ENDIAN_MODE_LITTLE].endianness = DEVICE_LITTLE_ENDIAN, }; static uint64_t port_rx_read(void *opaque, hwaddr addr, unsigned int size) @@ -232,10 +237,10 @@ static void port_rx_write(void *opaque, hwaddr addr, uint64_t value, } } -static const MemoryRegionOps eth_portrx_ops = { +static const MemoryRegionOps eth_portrx_ops[2] = { + [0 ... 1] = { .read = port_rx_read, .write = port_rx_write, - .endianness = DEVICE_NATIVE_ENDIAN, .impl = { .min_access_size = 4, .max_access_size = 4, @@ -244,6 +249,9 @@ static const MemoryRegionOps eth_portrx_ops = { .min_access_size = 4, .max_access_size = 4, }, + }, + [ENDIAN_MODE_BIG].endianness = DEVICE_BIG_ENDIAN, + [ENDIAN_MODE_LITTLE].endianness = DEVICE_LITTLE_ENDIAN, }; static bool eth_can_rx(NetClientState *nc) @@ -301,6 +309,12 @@ static void xilinx_ethlite_realize(DeviceState *dev, Error **errp) { XlnxXpsEthLite *s = XILINX_ETHLITE(dev); + if (s->model_endianness == ENDIAN_MODE_UNSPECIFIED) { + error_setg(errp, TYPE_XILINX_ETHLITE " property 'endianness'" + " must be set to 'big' or 'little'"); + return; + } + memory_region_init(&s->container, OBJECT(dev), "xlnx.xps-ethernetlite", 0x2000); @@ -328,7 +342,7 @@ static void xilinx_ethlite_realize(DeviceState *dev, Error **errp) BUFSZ_MAX, &error_abort); memory_region_add_subregion(&s->container, 0x0800 * i, &s->port[i].txbuf); memory_region_init_io(&s->port[i].txio, OBJECT(dev), - ð_porttx_ops, s, + ð_porttx_ops[s->model_endianness], s, i ? "ethlite.tx[1]io" : "ethlite.tx[0]io", 4 * TX_MAX); memory_region_add_subregion(&s->container, i ? A_TX_BASE1 : A_TX_BASE0, @@ -340,7 +354,7 @@ static void xilinx_ethlite_realize(DeviceState *dev, Error **errp) memory_region_add_subregion(&s->container, 0x1000 + 0x0800 * i, &s->port[i].rxbuf); memory_region_init_io(&s->port[i].rxio, OBJECT(dev), - ð_portrx_ops, s, + ð_portrx_ops[s->model_endianness], s, i ? "ethlite.rx[1]io" : "ethlite.rx[0]io", 4 * RX_MAX); memory_region_add_subregion(&s->container, i ? A_RX_BASE1 : A_RX_BASE0, @@ -363,6 +377,7 @@ static void xilinx_ethlite_init(Object *obj) } static const Property xilinx_ethlite_properties[] = { + DEFINE_PROP_ENDIAN_NODEFAULT("endianness", XlnxXpsEthLite, model_endianness), DEFINE_PROP_UINT32("tx-ping-pong", XlnxXpsEthLite, c_tx_pingpong, 1), DEFINE_PROP_UINT32("rx-ping-pong", XlnxXpsEthLite, c_rx_pingpong, 1), DEFINE_NIC_PROPERTIES(XlnxXpsEthLite, conf), diff --git a/hw/riscv/microblaze-v-generic.c b/hw/riscv/microblaze-v-generic.c index ebdd461ae98..a21fdfbe6db 100644 --- a/hw/riscv/microblaze-v-generic.c +++ b/hw/riscv/microblaze-v-generic.c @@ -120,6 +120,7 @@ static void mb_v_generic_init(MachineState *machine) /* Emaclite */ dev = qdev_new("xlnx.xps-ethernetlite"); + qdev_prop_set_enum(dev, "endianness", ENDIAN_MODE_LITTLE); 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);