From patchwork Wed Mar 5 16:12:48 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: 870575 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:178f:b0:38f:210b:807b with SMTP id e15csp866856wrg; Wed, 5 Mar 2025 08:13:58 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXKl56DWf844Zja3uGKdpeKKL36EvRkOtEExCoBSFZJJAXAjhsx8cjiG7WG3Kty5PVg4k+G7w==@linaro.org X-Google-Smtp-Source: AGHT+IE1drOfL6y5bseiII9xkZIPx6J+MjDdWw6RdfQXQ7CMhzGvFBmgux1/JGxpuI7/kiFCgp+s X-Received: by 2002:a05:6214:1c4e:b0:6e8:955b:141e with SMTP id 6a1803df08f44-6e8e6cf0a63mr50198116d6.21.1741191238742; Wed, 05 Mar 2025 08:13:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741191238; cv=none; d=google.com; s=arc-20240605; b=QsBZkZ7YpOSjcbM93BWqI9naF7jxNSXaE72eLdtjsSCxNHFeaapnf8Jrl1YDUM04aT xDkqY5G8V/lxlo1E3HQGaenA7CyQWjfIJCOcE01mO4EGJFiKgNQ7taQk4vwfTACW8wX8 lVxnYKx5InFbiRf4v3ZNZwWlSz518hYan2o1kN+0Gv4moLFgPeKfhuSrLzCrR584vF+A OlGzJD4A+tUfPsPokmqv+sODcCDavh23+yp0PDhGu+5yP+j7lUjMvoovraoESicx9ig8 n2nj/cxKBR9DyvLIbQb1nEBuf5DdpfhUdLd46KUCsTQXtfYO8bbA9gCvgknQYxVhsgwH 6pKA== 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=gIhGGd0/1q+JIY0hi7j9g+a5nqH/JO9F2rnfsDDPgP4=; fh=NknR+zL1+ohfTSJXO2jB9mm0X6O2dNjmcrMQkf6xkMY=; b=BjKEVNB/R5DXJVUZUM+Pr6e3UoQxDkRUd0WVkaUfVCsr7B59odYtHSAshKlQglSqa5 L4gFdhT9DHlr1FMybeC3aYlH6qSGQvMcSlA2Mj66jw7B2MzlLMYaTHPjFF+OR8aEOaVI 1wADUgoCjASP0AttXWDTmXW0te4qWFrr5mMiWObkcA/Z58UVKOP7iJk7/UObbhKxWKaH Pjtpv7SxwKiQVoBgd+Bq+openZ0Mp4C55zk2dac3gPVMRdtaY07jEByxxfIhu0+aLxfD Tp35juJR2spu8pIcllcry23YQPmZTY9GR+jyubObfTINmbg5iqXxZUMe74bqAtmnBrek O52g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jLcB8MJn; 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-6e8f3981f52si1534436d6.97.2025.03.05.08.13.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 05 Mar 2025 08:13:58 -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=jLcB8MJn; 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 1tprMw-0003BZ-Nr; Wed, 05 Mar 2025 11:13:14 -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 1tprMv-0003B7-1J for qemu-devel@nongnu.org; Wed, 05 Mar 2025 11:13:13 -0500 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tprMt-0007bk-Iw for qemu-devel@nongnu.org; Wed, 05 Mar 2025 11:13:12 -0500 Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-3911748893aso1624874f8f.3 for ; Wed, 05 Mar 2025 08:13:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741191189; x=1741795989; 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=gIhGGd0/1q+JIY0hi7j9g+a5nqH/JO9F2rnfsDDPgP4=; b=jLcB8MJn6aiLDED7LOigsfWfMo/umHTsbG/+hunMpAbgD7NQ5H4ibH6GfZRuIgw6lZ HQ6Eb7ZgoqRb139QDl88wvDQ7jGVrORFIk1lbZWCy5xwJt4dhZJfOzgx9zoiamPxDOfk vYbD/ct6QYRlJ/VmvCRpBo4pFpb9Q6poxjc8jfoC0qdMQQ4z2BAlZlbr6en6e8IZVY2A ZehGII3lihnzARqAI7rhsqdlie7ZAX0GcdUTSM1zmr2Pg9tzelZNtYBwF6dPjqKypmV6 5OLFHghqRc0WxB13IL22osxJbZfmJT2maATUbaRVqpQTCOQilu7nqBHArIOGnzKAcHIZ dzkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741191189; x=1741795989; 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=gIhGGd0/1q+JIY0hi7j9g+a5nqH/JO9F2rnfsDDPgP4=; b=le8E3qiE0ObbAJG4smV2eDDeiaJc7+pkDFMZIz0onFhwaLPdlyW6/TxSg5gj0QxTho YpbBCKoFpOZ+T74ecKKX6jv6lEcstP3Jbuje0AqBm/rBalEO6aSRKb2JigLH3GGXbmUU XazBrsZueFX4zRie8OqLs2/BMDjoYNAviGZb3AlbXk03+kNkdwDdw0yMag04H2G88tiG RwN0RswKwpd0psGzc7joIrhOXi3AghvLy+4ruRjKEXwbVRMtugL94Wp/ZaHhBtKUKmpP 8QahdaiV8DRnC8d12nLVv3gebSiKcdHVnHeghFZSmhjuNpnHFbLl9WeMWSiISlH1WceA WYdw== X-Gm-Message-State: AOJu0YwRHrbBnkH/xfMnqSGbYlNGXLDhzSN14txrxcc8RtvldK9uRuwj PMAiO2NrdUVJeZeOAgsFsFEzz1Dm4Y+IXeivdthCoqly0wUSQXVGuiFlho2xPXyrpoPRwOEawoo Ezfw= X-Gm-Gg: ASbGncvM5T+H5eyp0/DSIZtUCfIbe1JbbWu5VdaeTCuWBFqgPmrLjWsjwP3a6aQamGM CgVeJv4ZlqdC5Q2y5xibu5EaL7krUoGAwb3toNnicsiJ0T3ZIcTNuwGStnmYKJTJ9l/36VuqsYE eQHNsS8iO8Qn4Gc374Ln4pyM3ZnN5WWWSuioekOhHwZs7arVBpUTW4db84R4g6nqKKQd/pDvXop CoJFJ6s7gDHTHvFvNP5C2nTZ4f/9axodQ98A7WuFmwKKjcbjqCmWIh+sWOAw8bNPR/w6iAE8tVX rIsSRc5D1a1FgTH/ZcoOuAnEyl/Zyc0MbDoKbApqor5sZWY4noFULTRN16U60thiMbBzbyyCqpO TLQ6dtWkPjoGnqaHGGyc= X-Received: by 2002:a05:6000:1562:b0:38d:e6f4:5a88 with SMTP id ffacd0b85a97d-3911f749c86mr2983958f8f.12.1741191188770; Wed, 05 Mar 2025 08:13:08 -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-390e47b6f22sm21116273f8f.47.2025.03.05.08.13.07 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 05 Mar 2025 08:13:08 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?utf-8?q?C=C3=A9dric_Le_Goater?= , =?utf-8?q?Daniel_P=2E_Ber?= =?utf-8?q?rang=C3=A9?= , Peter Maydell , Pierrick Bouvier , qemu-arm@nongnu.org, Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= Subject: [RFC PATCH 4/4] hw/ppc: Remove TARGET_PPC64 use in ppc_create_page_sizes_prop() Date: Wed, 5 Mar 2025 17:12:48 +0100 Message-ID: <20250305161248.54901-5-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250305161248.54901-1-philmd@linaro.org> References: <20250305161248.54901-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=philmd@linaro.org; helo=mail-wr1-x429.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 Check the binary is built for 64-bit PPC at runtime, removing the need for TARGET_PPC64 #ifdef'ry. Signed-off-by: Philippe Mathieu-Daudé --- hw/ppc/fdt.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/ppc/fdt.c b/hw/ppc/fdt.c index 0828ad72548..bae269c72ac 100644 --- a/hw/ppc/fdt.c +++ b/hw/ppc/fdt.c @@ -8,12 +8,12 @@ */ #include "qemu/osdep.h" +#include "qemu/legacy_binary_info.h" #include "target/ppc/cpu.h" #include "target/ppc/mmu-hash64.h" #include "hw/ppc/fdt.h" -#if defined(TARGET_PPC64) size_t ppc_create_page_sizes_prop(PowerPCCPU *cpu, uint32_t *prop, size_t maxsize) { @@ -21,6 +21,8 @@ size_t ppc_create_page_sizes_prop(PowerPCCPU *cpu, uint32_t *prop, int i, j, count; uint32_t *p = prop; + assert(legacy_binary_is_64bit()); + for (i = 0; i < PPC_PAGE_SIZES_MAX_SZ; i++) { PPCHash64SegmentPageSizes *sps = &cpu->hash64_opts->sps[i]; @@ -46,4 +48,3 @@ size_t ppc_create_page_sizes_prop(PowerPCCPU *cpu, uint32_t *prop, return (p - prop) * sizeof(uint32_t); } -#endif