From patchwork Thu Jan 18 13:32:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 763627 Delivered-To: patch@linaro.org Received: by 2002:a5d:6e5d:0:b0:337:62d3:c6d5 with SMTP id j29csp782587wrz; Thu, 18 Jan 2024 05:33:51 -0800 (PST) X-Google-Smtp-Source: AGHT+IFXgjZSoUatBnBFoqMePpLm48lhGG/gxhzNVom6Gpys0jjUdsHsL/Tp75l4O65on19U99KU X-Received: by 2002:a0c:f551:0:b0:681:8c26:d763 with SMTP id p17-20020a0cf551000000b006818c26d763mr712357qvm.91.1705584831649; Thu, 18 Jan 2024 05:33:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1705584831; cv=none; d=google.com; s=arc-20160816; b=nxbpNEYbvDBzYf5gcnU+PD6WAvTeNDdbyV9J/J2wK5psXyAKqKQWsuTYovFxz+WCFc aCevQ+iCLDvFghOSAQPBB3MGtmCRc+AU2Ie+6eYuAvduSkJlh+fu+Ph82MEUo+M89p5b JnFHLePKGz0Du/I/ziSfUxjK3byjKqozGFQNsHIQ0h0JcaSRL8LqooRKCU8y6S4/xeq4 9zLY2eP4s9haRv9YvBxszi/mkYlYvXlFz0zZg5y3N/FupPMD2TnMxz2PoayiRWHmA9fa 68jVeyB2eu5A3lCGVO2ctmYpZ1wPWWHpueDoqf3qiUGuiERprDHHG16pzhGe7FRBDW8j RA8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; 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=18FTOOuT/UCqVddP9iv7m0yXr2Iq7DkLdl484P+3gU4=; fh=I3CvSagWLJO+wpDcc6HvKrGvnEkWHf6M8nazzdiVDKs=; b=XmXSvi6bSiDZsMbUCzQ+X3e7r4vy5COXhjaENRkCvxklhJ2ECHv9oMDwdWLdJzunY0 lkEEJ/zi3TVB+wWwcHFaRDzKu+hXpaisviNnkhUxkL/vUPKk1Zau6IKSlMmFnbH/ouRR FX7QZVC2iuXfD7j8cP8AFShPKuAyEfUY7ArCZ+F3ghClQ+LRbTDSVaI2XjsJTIuuPHjG a7ohALKBjV1vzEwfU1pGvBRnQheV6/1JrHFveIrIHGM+8XC+F3/FhjGFifhAENrS9p0o t7Zwf5zfOLJYmyhqJvipwnHYHt9bynVLjIdg+aLtNIn5LUhKYBBculnil5fxAw2QLQ7N RXaQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=BWgQu8bC; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id x3-20020a0cc503000000b0067f9da638afsi13639595qvi.293.2024.01.18.05.33.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 18 Jan 2024 05:33:51 -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=@gmail.com header.s=20230601 header.b=BWgQu8bC; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rQSVT-0004wm-Jj; Thu, 18 Jan 2024 08:32:31 -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 1rQSVP-0004ui-Jt; Thu, 18 Jan 2024 08:32:27 -0500 Received: from mail-pg1-x52e.google.com ([2607:f8b0:4864:20::52e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rQSVO-00021u-08; Thu, 18 Jan 2024 08:32:27 -0500 Received: by mail-pg1-x52e.google.com with SMTP id 41be03b00d2f7-5cfaf7ef393so27029a12.3; Thu, 18 Jan 2024 05:32:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705584744; x=1706189544; 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=18FTOOuT/UCqVddP9iv7m0yXr2Iq7DkLdl484P+3gU4=; b=BWgQu8bCpu/cab5dZfr0KSo+BKsAqcgxNbN8olwOfGwaPoMlirqjJSBbRyZfdoPcz8 3B7Ji1BNf6ioe1Ddn6JVi5z39sOU0avsPd0QmCvI7aqkrN1vpO0+1ABkSv6af68Z8ohR OndV9XYZ5Fi5zM7O74YKgzdhNpO0+HCCAvXPOqV3yQtjkuSrl2hPe9c5RvLIuM2WYVYY tGEEZhvAshPgDqlo9XX43Di0eI3JbxObW1dcYrVrGpseBeCfygbk0HwBEmqyZSrUlk2B EZSTA4Sd3vtC6xZyWzKF+s9AAeGv3t8lJ2OORRdqFiyBKPb5asehplgeuG8Gk3ME/SAl UXoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705584744; x=1706189544; 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=18FTOOuT/UCqVddP9iv7m0yXr2Iq7DkLdl484P+3gU4=; b=vrGrleZu0DgzYvQYFECpa+BGvb7gmgGlBzR47KnfBQMsON6RCPkSDATDrojDEFqg/B qJfmdqPgejP8BUJEQrmRtphO9RNTAKVyqz8DL4Xqj1GgBNBXEX0fYEDp+5IG+Xq2QZYG 2a9fmW31mgtGluxb45HQ39q/l/xCoIHrtIk/xCiuDrmZxLWfTXf8qg8JB21ZDPiesBJW wlJ62PtkdpJ63H0b6DCaHBsWmSutm0QfCV2oycHW10fMlMAR+HYMjqEdTXaZVTnCVkIl 6s8b1VnC4awdmF4cOCQfte/Ly2NFfTXAVsf0dSOZ444xxy/XHUuccEaJEG405igif+dA F43w== X-Gm-Message-State: AOJu0YxB2R0ltrgMxsyv0tOO/hLtdLnrJZ/yBVLuPsd9FTRThFLYFFNy Krm8t3Atot/yXF7eQI2jEm30rNAZfLSSupRVSmoDJze6r1M9zRKyHzumS8+U X-Received: by 2002:a05:6a20:a9c:b0:19a:536e:64f5 with SMTP id b28-20020a056a200a9c00b0019a536e64f5mr536679pzf.67.1705584743913; Thu, 18 Jan 2024 05:32:23 -0800 (PST) Received: from wheely.local0.net (124-171-76-150.tpgi.com.au. [124.171.76.150]) by smtp.gmail.com with ESMTPSA id a19-20020aa780d3000000b006daf1ded817sm3282551pfn.209.2024.01.18.05.32.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Jan 2024 05:32:23 -0800 (PST) From: Nicholas Piggin To: qemu-ppc@nongnu.org Cc: Nicholas Piggin , David Gibson , Harsh Prateek Bora , Daniel Henrique Barboza , =?utf-8?q?C=C3=A9dric_Le_G?= =?utf-8?q?oater?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Subject: [PATCH v2 2/4] hw/ppc/spapr_hcall: Allow elision of softmmu_resize_hpt_prep Date: Thu, 18 Jan 2024 23:32:04 +1000 Message-ID: <20240118133206.158453-3-npiggin@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240118133206.158453-1-npiggin@gmail.com> References: <20240118133206.158453-1-npiggin@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::52e; envelope-from=npiggin@gmail.com; helo=mail-pg1-x52e.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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-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 From: Philippe Mathieu-Daudé Check tcg_enabled() before calling softmmu_resize_hpt_prepare() and softmmu_resize_hpt_commit() to allow the compiler to elide their calls. The stubs are then unnecessary, remove them. Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Nicholas Piggin --- hw/ppc/spapr_hcall.c | 12 ++++++++---- target/ppc/tcg-stub.c | 15 --------------- 2 files changed, 8 insertions(+), 19 deletions(-) diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c index fcefd1d1c7..0d7d523e6d 100644 --- a/hw/ppc/spapr_hcall.c +++ b/hw/ppc/spapr_hcall.c @@ -123,9 +123,11 @@ static target_ulong h_resize_hpt_prepare(PowerPCCPU *cpu, if (kvm_enabled()) { return H_HARDWARE; + } else if (tcg_enabled()) { + return softmmu_resize_hpt_prepare(cpu, spapr, shift); + } else { + g_assert_not_reached(); } - - return softmmu_resize_hpt_prepare(cpu, spapr, shift); } static void do_push_sregs_to_kvm_pr(CPUState *cs, run_on_cpu_data data) @@ -191,9 +193,11 @@ static target_ulong h_resize_hpt_commit(PowerPCCPU *cpu, if (kvm_enabled()) { return H_HARDWARE; + } else if (tcg_enabled()) { + return softmmu_resize_hpt_commit(cpu, spapr, flags, shift); + } else { + g_assert_not_reached(); } - - return softmmu_resize_hpt_commit(cpu, spapr, flags, shift); } diff --git a/target/ppc/tcg-stub.c b/target/ppc/tcg-stub.c index aadcf59d26..740d796b98 100644 --- a/target/ppc/tcg-stub.c +++ b/target/ppc/tcg-stub.c @@ -28,18 +28,3 @@ void create_ppc_opcodes(PowerPCCPU *cpu, Error **errp) void destroy_ppc_opcodes(PowerPCCPU *cpu) { } - -target_ulong softmmu_resize_hpt_prepare(PowerPCCPU *cpu, - SpaprMachineState *spapr, - target_ulong shift) -{ - g_assert_not_reached(); -} - -target_ulong softmmu_resize_hpt_commit(PowerPCCPU *cpu, - SpaprMachineState *spapr, - target_ulong flags, - target_ulong shift) -{ - g_assert_not_reached(); -}