From patchwork Fri Sep 27 21:50:39 2024 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: 1990435 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=scF2UBII; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-ppc-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XFkhT0F8fz1xt8 for ; Sat, 28 Sep 2024 07:52:09 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1suIrt-0001OG-C4; Fri, 27 Sep 2024 17:51:17 -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 1suIrl-0000ql-Pw for qemu-ppc@nongnu.org; Fri, 27 Sep 2024 17:51:10 -0400 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 1suIri-0004Wi-VW for qemu-ppc@nongnu.org; Fri, 27 Sep 2024 17:51:09 -0400 Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-37cd8972738so763529f8f.3 for ; Fri, 27 Sep 2024 14:51:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1727473865; x=1728078665; 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=ncMwuXMgt8w0SPLSq4FNQgB95v0Fxit0yyRMSKvDcb8=; b=scF2UBIIBiYiLDbYDnsB3QYay6mBwhBxAgIghWKzonYoLiGLKitRMA8Oi9rm7OkZau StavgAwciko8YWhNNPF4zLopqce67vrrXmAsZQmPVEfh6tuobs/DEY2lB4ahCaGoODG5 3EoqZINZAfL8MrXZ7hr72/e0tE5u3yzMVqw8XXndflzsTVVPCNyxhC3+H8A+sP4V+Wrt GCEmM0aQwOvxyXiqPkCL9LgZB6G93g+ldLCPNcV1046Qy7CUh9SpA7G9dOVkiTCUQvU9 bR5ekydBwGTOKEoYSxKE0gPfkCIWI8anFXPf3ccZruY7MspXJLdBnK1lkST9XlyZdr+B E1pA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727473865; x=1728078665; 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=ncMwuXMgt8w0SPLSq4FNQgB95v0Fxit0yyRMSKvDcb8=; b=fchIxprUAG0FL2prExia4IGSDcUUGi6y7RfSo8V9MsobhHk9vwM74NXMj394df3Hwv QfdckfXENwkN3r83GwDbey+BTfkjUv7oioh2hTFSFvl9+Qk/5fj+ZNapDX04bAs6SXk+ j3Em4rlJeoUw9j4Ltp446Pu2HP4Eq1bSASv0l+egcRs03c9Y2YliwIdSJQcZ78RbWP/o LZOMyuEHe0r/IG1eHLLlgxODJ8w0Ogw/TAikKSlT0RrF0N62zB89M4VxKYjTDgJ1cFOw cxVtHtZhgYxdQNhbX6L26ec4K1TH00YNG5Z/x3MLNytRFFvt/+WSrfMxLjHvNzOHfir1 hdHw== X-Forwarded-Encrypted: i=1; AJvYcCWedbWyw60OzoqfRM+qDe2tfeoXuPokUTkE+pSMyNndXCuCNrnzfnHEZMd49/Ch85q3546V9v4hZg==@nongnu.org X-Gm-Message-State: AOJu0Yw2W/kZgy10ugl0L7cyAs/xcu8Dy2ikf1XQWdWBFHrvk00OpZCf N3d0nVzaPcNLebSaceqk8p8JAJl07wjBio3itJs7s8ylwmJVcfADpsr1A6nwZBg= X-Google-Smtp-Source: AGHT+IEBAbxD2guHS7kxHuoSHqUr9V2OViIGn0xcMxSiEVBN4ZIL2QhZTS4108ZUqyKQMoygrsHxSQ== X-Received: by 2002:a05:6000:52:b0:37c:d244:bdb1 with SMTP id ffacd0b85a97d-37cd5ad83c8mr2643155f8f.26.1727473865525; Fri, 27 Sep 2024 14:51:05 -0700 (PDT) Received: from localhost.localdomain ([176.187.217.136]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-37cd565dd86sm3420517f8f.27.2024.09.27.14.51.02 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 27 Sep 2024 14:51:04 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Daniel Henrique Barboza , Jason Wang , Nicholas Piggin , David Gibson , qemu-ppc@nongnu.org, Alexey Kardashevskiy , Harsh Prateek Bora , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= Subject: [PATCH v2 3/4] hw/ppc/vof: Simplify LD/ST API uses Date: Fri, 27 Sep 2024 23:50:39 +0200 Message-ID: <20240927215040.20552-4-philmd@linaro.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240927215040.20552-1-philmd@linaro.org> References: <20240927215040.20552-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: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 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_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-ppc@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-ppc-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-ppc-bounces+incoming=patchwork.ozlabs.org@nongnu.org Instead of be32_to_cpu (equivalent of ldl_be_p) and ldq_be_p, use ldn_be_p(). Similarly instead of cpu_to_be32 (equiv. stl_be_p) and cpu_to_be64 (equiv. stq_be_p), use stn_be_p(). Signed-off-by: Philippe Mathieu-Daudé --- hw/ppc/vof.c | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/hw/ppc/vof.c b/hw/ppc/vof.c index b5b6514d79..e2549ab786 100644 --- a/hw/ppc/vof.c +++ b/hw/ppc/vof.c @@ -628,6 +628,7 @@ static void vof_dt_memory_available(void *fdt, GArray *claimed, uint64_t base) const uint8_t *mem0_reg; g_autofree uint8_t *avail = NULL; uint8_t *availcur; + size_t elsz; if (!fdt || !claimed) { return; @@ -645,11 +646,8 @@ static void vof_dt_memory_available(void *fdt, GArray *claimed, uint64_t base) mem0_reg = fdt_getprop(fdt, offset, "reg", &proplen); g_assert(mem0_reg && proplen == sizeof(uint32_t) * (ac + sc)); - if (sc == 2) { - mem0_end = ldq_be_p(mem0_reg + sizeof(uint32_t) * ac); - } else { - mem0_end = be32_to_cpu(*(uint32_t *)(mem0_reg + sizeof(uint32_t) * ac)); - } + elsz = sc * sizeof(uint32_t); + mem0_end = ldn_be_p(mem0_reg + sizeof(uint32_t) * ac, elsz); g_array_sort(claimed, of_claimed_compare_func); vof_claimed_dump(claimed); @@ -674,18 +672,12 @@ static void vof_dt_memory_available(void *fdt, GArray *claimed, uint64_t base) size = mem0_end - start; } - if (ac == 2) { - *(uint64_t *) availcur = cpu_to_be64(start); - } else { - *(uint32_t *) availcur = cpu_to_be32(start); - } - availcur += sizeof(uint32_t) * ac; - if (sc == 2) { - *(uint64_t *) availcur = cpu_to_be64(size); - } else { - *(uint32_t *) availcur = cpu_to_be32(size); - } - availcur += sizeof(uint32_t) * sc; + elsz = ac * sizeof(uint32_t); + stn_be_p(&availcur, elsz, start); + availcur += elsz; + elsz = sc * sizeof(uint32_t); + stn_be_p(&availcur, elsz, size); + availcur += elsz; if (size) { trace_vof_avail(c.start + c.size, c.start + c.size + size, size);