From patchwork Mon Mar 17 18:34:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 874181 Delivered-To: patch@linaro.org Received: by 2002:a5d:4308:0:b0:38f:210b:807b with SMTP id h8csp2148239wrq; Mon, 17 Mar 2025 11:40:53 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVrLapIf2O1og4FDFI8LrYucrwNx2k7sC7JsMcR2sIm1OyQaFuaEfdUmnE2HytTh4QOaThfMQ==@linaro.org X-Google-Smtp-Source: AGHT+IHXPf4QqwTKUi9CRQ0yvvp9YeZ4xv70LNbKn8fr3TNyprb5UEhYbWswBnJs5MqiprFpf/c7 X-Received: by 2002:a05:622a:114b:b0:474:fbb4:8f7c with SMTP id d75a77b69052e-476fcca3392mr9574421cf.11.1742236853308; Mon, 17 Mar 2025 11:40:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1742236853; cv=none; d=google.com; s=arc-20240605; b=cnL8dIhXNa4ITiklNwG9F9sM9+4Llq1KSnvk5Xjx+xdfCDocfQHe99imX0e1+KzvYG lDURWBO8qcf4O9OU4ZPM/DND2ImcAZ1T4IrYyZGcSSHfSX+FpQuLxNvczfL/pHdvwEF5 LfSWVEl812SzhYCdmYJ8hJy4oKdD+2MKThFMjlh/HGMTa7FxVrEiiaIKGxw0EbhCnhHn yB5sJBrqJlYp9/er/d9CbGLW7sNiJcF8yEcOTLXad7/3OsnMSrWz+35jRtLc1LeTTyO/ 29lt4yvthK9jrtJTHPdqWOLBTCQacnixmEDZBoJVCdSHl522Ck1lsoHzllGf9ap1lIm4 PAKQ== 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=EBRugwqnxw4q7Phz2P050i5IjB6Zbf1WGwdoEilqtkY=; fh=VA667rDBaVWM8Te9IvKB7F5X0gZcxYsweQ/ZVp5kO3s=; b=BNzYLJzYRoEvBKvkhmlewxhDuhtoAnEUH77bNS4zcop/jWB2XakYcESCCoJsgpbVHk j6bL8Wm8viw2t05tbuCLXIx8qz/CvCl5uBsEVBHbLJ2764K80Dl1+Vq3hXcdV+6yLvBs ij/3a5aVGC32d8mUWhHBqhUV9GBNjym+6i9g8tNsFzxQltDoMBeLnnB713zmbfm4MhUR Y3j4vJZe9FZrG+DNG1d/f6xtuYFvXBg13cqdsaY4QT2RceRFvA51ol4WYLVMGkSy9mea wzCnpVoYKYbEARqR7eBpKj3u+Q/Wk4RsTVE3o8fkKcXRawApYw/c79Rkkp3+wVIse12R 9a+Q==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=wtclrS1v; 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-476bb81eb46si99389771cf.455.2025.03.17.11.40.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 17 Mar 2025 11:40:53 -0700 (PDT) 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=wtclrS1v; 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 1tuFJY-00053E-QB; Mon, 17 Mar 2025 14:35:52 -0400 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 1tuFJG-0004nX-NM for qemu-devel@nongnu.org; Mon, 17 Mar 2025 14:35:34 -0400 Received: from mail-pl1-x631.google.com ([2607:f8b0:4864:20::631]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tuFIX-0006Dk-Cy for qemu-devel@nongnu.org; Mon, 17 Mar 2025 14:35:34 -0400 Received: by mail-pl1-x631.google.com with SMTP id d9443c01a7336-225df540edcso61416755ad.0 for ; Mon, 17 Mar 2025 11:34:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742236484; x=1742841284; 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=EBRugwqnxw4q7Phz2P050i5IjB6Zbf1WGwdoEilqtkY=; b=wtclrS1vnQKrSCKG+duhvTktAa8YXsFt61dGfLCWkZk6A7N/ihYAKedibD9NuwR3+E S4kRL31mReks20wi5pcKJnTg3ccZt9LSwAwtnwd11YC6lCJX8b88Z78KIVAA5CDS+SPh kOYVSVaMpofKNoMd0rtqtcgXFtUieNIAgrjA9za4q6CR8nsC3XlFi9FR8DXxktnkGp5W LK3dVHPSyiD7Pa+hHP/V+cHAQSXpIjkz87QOo4cb9vVssRSqeI8FfiGyUtK6hi+aeLwx S+O0cFFMUsUzJhZf3gQNrameNDfsIf2aRAqDAm2DCk9mrau/KPc9QZ5Q4y7Oq63qtyqD 3gXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742236484; x=1742841284; 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=EBRugwqnxw4q7Phz2P050i5IjB6Zbf1WGwdoEilqtkY=; b=IpeHbaA21jMEn9OXurOHzxqNyFgSj7xB4F0DSpDbnvPVgHGpQgfuxSG1BtAtUU6FkH ErjkPh5eQ2l/LAVwSOr+xx+SbbJoIFXp9gFP9lSXgHpJfgrtl+DqVKhZIkAf7XIE1tzu bfXsCJHC07pLoR6zQJnDNx2amU13kXFu1NOsyZ3k/GB2hIvhU10eH5mEcKEFXj6bJdBA 2ax2PFJDwYZHmwdNHVm99QrEgpfZTktntt8e1x8i+I5Ffc4EnG0eJkAwhrgkAx80MNV2 LA3l7mdOzc0Dmpo7gxRJ0YxZJ8wklVYUKJt1N7FbPOsLcowU6D/VQwqxd8OXV42bfRx7 7rsA== X-Gm-Message-State: AOJu0YxeR74E2s21oEVT2qEMSpNAPubDbR+9SKe/OhVSgZhH5WQ1M1o+ f3pSG54qNagvAFHFSSfiKY2C5ZmiodunLjp/sHuoKEX3FM0RSjNcvzL507VS4klSKlU0EzrCOoi 8 X-Gm-Gg: ASbGncucWWimqkg9TJXwUeaadNuxNxnMPoUDeUHqcNaTWMbZ4C3cAsTMMNSSb9NGNbV 3gm82/htRT0Sy0Ob2Inh+kT2n7F98fUtYeLq0hPxYCDGMHqP/FAyUsGR/boqeyJXdO/tEwBHFe+ 2YWFQ8pq5X6Lz3tntaII5X4ZqwvfvrYTVDTyLCIC+QEBheBtphvuLGrv3SzkAcvcHaDi3fE8alb j7F1ZacJbVKDwirD9lwrxRQ2mY4EerCtG78JFyvR6Xas9ip08Z+S4eLsryCPh0mpBZYUphVDV7P n2zwlGMZBwt+1mcd4pIx+RGgNf7HV+yERmdiBtonD4ls X-Received: by 2002:a05:6a00:2e84:b0:736:476b:fccc with SMTP id d2e1a72fcca58-737577c60dcmr700300b3a.8.1742236484037; Mon, 17 Mar 2025 11:34:44 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73711695a2esm8188770b3a.144.2025.03.17.11.34.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Mar 2025 11:34:43 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , xen-devel@lists.xenproject.org, David Hildenbrand , "Edgar E. Iglesias" , qemu-riscv@nongnu.org, Liu Zhiwei , Paolo Bonzini , Harsh Prateek Bora , alex.bennee@linaro.org, manos.pitsidianakis@linaro.org, Daniel Henrique Barboza , Richard Henderson , Alistair Francis , qemu-ppc@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Weiwei Li , kvm@vger.kernel.org, Palmer Dabbelt , Peter Xu , Yoshinori Sato , Anthony PERARD , Stefano Stabellini , Nicholas Piggin , Pierrick Bouvier Subject: [PATCH v6 17/18] system/memory: make compilation unit common Date: Mon, 17 Mar 2025 11:34:16 -0700 Message-Id: <20250317183417.285700-18-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250317183417.285700-1-pierrick.bouvier@linaro.org> References: <20250317183417.285700-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::631; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x631.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, T_SPF_TEMPERROR=0.01 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 Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- system/memory.c | 17 +++++------------ system/meson.build | 2 +- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/system/memory.c b/system/memory.c index 4c829793a0a..eddd21a6cdb 100644 --- a/system/memory.c +++ b/system/memory.c @@ -353,15 +353,6 @@ static void flatview_simplify(FlatView *view) } } -static bool memory_region_big_endian(MemoryRegion *mr) -{ -#if TARGET_BIG_ENDIAN - return mr->ops->endianness != DEVICE_LITTLE_ENDIAN; -#else - return mr->ops->endianness == DEVICE_BIG_ENDIAN; -#endif -} - static void adjust_endianness(MemoryRegion *mr, uint64_t *data, MemOp op) { if ((op & MO_BSWAP) != devend_memop(mr->ops->endianness)) { @@ -563,7 +554,7 @@ static MemTxResult access_with_adjusted_size(hwaddr addr, /* FIXME: support unaligned access? */ access_size = MAX(MIN(size, access_size_max), access_size_min); access_mask = MAKE_64BIT_MASK(0, access_size * 8); - if (memory_region_big_endian(mr)) { + if (devend_big_endian(mr->ops->endianness)) { for (i = 0; i < size; i += access_size) { r |= access_fn(mr, addr + i, value, access_size, (size - access_size - i) * 8, access_mask, attrs); @@ -2584,7 +2575,8 @@ void memory_region_add_eventfd(MemoryRegion *mr, unsigned i; if (size) { - adjust_endianness(mr, &mrfd.data, size_memop(size) | MO_TE); + MemOp mop = (target_words_bigendian() ? MO_BE : MO_LE) | size_memop(size); + adjust_endianness(mr, &mrfd.data, mop); } memory_region_transaction_begin(); for (i = 0; i < mr->ioeventfd_nb; ++i) { @@ -2619,7 +2611,8 @@ void memory_region_del_eventfd(MemoryRegion *mr, unsigned i; if (size) { - adjust_endianness(mr, &mrfd.data, size_memop(size) | MO_TE); + MemOp mop = (target_words_bigendian() ? MO_BE : MO_LE) | size_memop(size); + adjust_endianness(mr, &mrfd.data, mop); } memory_region_transaction_begin(); for (i = 0; i < mr->ioeventfd_nb; ++i) { diff --git a/system/meson.build b/system/meson.build index bd82ef132e7..4f44b78df31 100644 --- a/system/meson.build +++ b/system/meson.build @@ -2,7 +2,6 @@ specific_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_true: [files( 'arch_init.c', 'ioport.c', 'globals-target.c', - 'memory.c', )]) system_ss.add(files( @@ -15,6 +14,7 @@ system_ss.add(files( 'dma-helpers.c', 'globals.c', 'memory_mapping.c', + 'memory.c', 'physmem.c', 'qdev-monitor.c', 'qtest.c',