From nobody Sat Sep 21 03:07:36 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1705584767; cv=none; d=zohomail.com; s=zohoarc; b=AuBxD0CR9rQw0kSRtDpCjKHnv8ww3+nB282K2yCkIgNXooJsZfPbvhusOMMt7m6mUVmGMUQc1xlX9AzaajKIIDjlNvAnFJIALA4HsXZyc8O7acix3xhnC70LfQ90SbyFBgcshJxOoPK41F3s0wtCPXIPLQpzsL77NUPQNUWrQOU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1705584767; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=tFCXVTcmuilSkmSKJd/6D+1Ho9O5iJCIW5d0ENXqJY4=; b=mJGY+dsrF2LisONT8+TbUapB4MnOKnlhWjNDMBpi+id+Y6aGdaRESbbVWxg4GLXjrnCOa46/2XoNoe5ltEBf/1LbzE2sJi5Fcvi9jpRYUrd+OJX4NuSbxc//liiNLJgsD8Ato9qFXtMxEvWtZR3oi6C0y3eZinGfJ7lSCMgbB+s= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1705584767537962.4312174775085; Thu, 18 Jan 2024 05:32:47 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rQSVR-0004wB-LV; Thu, 18 Jan 2024 08:32:29 -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 1rQSVN-0004s9-9i; Thu, 18 Jan 2024 08:32:26 -0500 Received: from mail-pf1-x429.google.com ([2607:f8b0: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 1rQSVK-00021X-6o; Thu, 18 Jan 2024 08:32:23 -0500 Received: by mail-pf1-x429.google.com with SMTP id d2e1a72fcca58-6dbb26ec1deso135921b3a.0; Thu, 18 Jan 2024 05:32:21 -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.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Jan 2024 05:32:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705584740; x=1706189540; 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=tFCXVTcmuilSkmSKJd/6D+1Ho9O5iJCIW5d0ENXqJY4=; b=a27uHmtRlU391PB8tIhxh5Azle2d6GhleBl4FnJQJUT9oSY7NWmncuHJYImV14KQx+ QR0saEOQYUX00coUF3APRH/o+z6n6LiAd2IhVRxEnSqDnzmlHB/6IKxT6qBaAyaD3w9B GKXWIWxoxxq0hl3UD6Helg5ByREYv3hrdpFg9AiVQ5UIxJ9MzmjqId0m2pLti7Z9qtlc 1QJAW9pfl8HPENPnukeRZKDVHQAj+/I1/US6i91i1RaUtQ8eXMYjDBq0R2/rr4y5k8hP HS3LrxbjNOrKrRQwpFkrlH8df3NkxF+SRu+qTLD45rGeE0cIJWQN2BliZlMuvcfSO/sN FhfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705584740; x=1706189540; 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=tFCXVTcmuilSkmSKJd/6D+1Ho9O5iJCIW5d0ENXqJY4=; b=KuYMCTSDmL5Qu/FQ9ruWpzSmSsKl3x2AJVvgY/YCvG3uOZlgACTuNqEPIDNgWzDgEc Uy1/r5j/KgVsKcP1dYFJEMTa4duFJitIQdnBIY0VyR5I6a/tTui983CowiYoDqD+3Nfz uwnh2lilgynN+1iusurf15njhQjjpCCxRrcA4FL8+ddDR1d9SL9y/dCHkoYt6NMzZglB zIQWCEQkakM3Z85GIszwYm+bdDw71tG78Mm7LgfFXueywDShG37SklzpNwuj+m0ei+9E O9hJNbgWQFTmo2axeueNuddulVh0smN3mJB4KMpSWjxTv15Gp1KbVhVvhIDTeSSb2N2m DtzA== X-Gm-Message-State: AOJu0YyPt+aeuPV+/MLDKp2pEiQs9tAcl3X3tSwU1JuYpuKda3h0YtVF GYyeFREf3kTUj7mfqkPJlKAk+6MJ7Kc+8o0TiRG2t1MWfrRhBf9cBIFLzYS4 X-Google-Smtp-Source: AGHT+IHO9LiXhA8iEveqM4eD4RJ8tTzj4MgPCUpoQ8pVDauBgz25UwRIAbknRbykoRJH8gDJK+lxWQ== X-Received: by 2002:a05:6a00:13a7:b0:6db:722c:cdfb with SMTP id t39-20020a056a0013a700b006db722ccdfbmr886194pfg.22.1705584739923; Thu, 18 Jan 2024 05:32:19 -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=20Le=20Goater?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Subject: [PATCH v2 1/4] hw/ppc/spapr: Add missing license Date: Thu, 18 Jan 2024 23:32:03 +1000 Message-ID: <20240118133206.158453-2-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::429; envelope-from=npiggin@gmail.com; helo=mail-pf1-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, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1705584769194100003 From: Philippe Mathieu-Daud=C3=A9 Commit 9fdf0c2995 ("Start implementing pSeries logical partition machine") added hw/ppc/spapr_hcall.c, then commit 962104f044 ("hw/ppc: moved hcalls that depend on softmmu") extracted the system code to hw/ppc/spapr_softmmu.c. Take the license and copyrights from the original spapr_hcall.c at commit 9fdf0c2995. Signed-off-by: Philippe Mathieu-Daud=C3=A9 [npiggin: Update file description.] Signed-off-by: Nicholas Piggin Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/ppc/spapr_softmmu.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/hw/ppc/spapr_softmmu.c b/hw/ppc/spapr_softmmu.c index fc1bbc0b61..2fade94029 100644 --- a/hw/ppc/spapr_softmmu.c +++ b/hw/ppc/spapr_softmmu.c @@ -1,3 +1,12 @@ +/* + * MMU hypercalls for the sPAPR (pseries) vHyp hypervisor that is used by = TCG + * + * Copyright (c) 2004-2007 Fabrice Bellard + * Copyright (c) 2007 Jocelyn Mayer + * Copyright (c) 2010 David Gibson, IBM Corporation. + * + * SPDX-License-Identifier: MIT + */ #include "qemu/osdep.h" #include "qemu/cutils.h" #include "qemu/memalign.h" --=20 2.42.0 From nobody Sat Sep 21 03:07:36 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1705584832; cv=none; d=zohomail.com; s=zohoarc; b=JEMJQbUCiUUI7xlOo26w8yt2PYY/TNKQythzedVHqZVkxIXaWv252vWngeKvZ1wQ26tpdYrVAjKkYJElz+lGZGGAlWivmaW73dOzo287mnpYZReLqDguDRa/TrQezxPeqElD6wfUo6YRfpuKxFv2zDLgTaRNmHNSuIy1fQEuhCo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1705584832; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=18FTOOuT/UCqVddP9iv7m0yXr2Iq7DkLdl484P+3gU4=; b=Qs1QHZszXC2OMX7RIEdJD9cS6y0/AfIxiwjYfoTxB+e+eGZVIYx09MWijXjAAenc4/GysF2v4bk05Gmu7jwTPW57hfoNzIa0p0X4AYhLOWIkR7LnMT69qjROvzV9oRrrwmrS1J9kFrvANsBoQt6xH73h7pa6BJ3OphlOrSUhAdY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1705584832006380.1586212556708; Thu, 18 Jan 2024 05:33:52 -0800 (PST) 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) 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) 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-Google-Smtp-Source: AGHT+IFgMMNigPLr1LvhHfY0YHY6OkeylsVRkWncMy6MOmpxq7YZRfgQJVVsz8OtBXyVFEd0x16MoA== 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) 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=20Le=20Goater?= , =?UTF-8?q?Philippe=20Mathieu-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1705584833152100001 From: Philippe Mathieu-Daud=C3=A9 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=C3=A9 Signed-off-by: Nicholas Piggin Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- 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 *c= pu, =20 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); } =20 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 *cp= u, =20 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); } =20 =20 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(); -} --=20 2.42.0 From nobody Sat Sep 21 03:07:36 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1705584776; cv=none; d=zohomail.com; s=zohoarc; b=KPTgTbp+QMgN6umuuGoddQKuMsfASCA1p50xzzsE31HmyjhH8FdwJEiCSSmwMKM1ymKvtTDjCnQoMa+bIYM/qOgr+v+YNml5tGljvq34zbY0RtW4ZsHVN/G0xrRRNqSd286/4f4YBma0Dg1exbS+MHR/y/ArfQ/OdakkwYNNVco= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1705584776; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Gp4VqctlcOHDSbky/1yqB0zizFgsvSyeOkwNaVp6158=; b=glw51a0q/bgZ2VwUXo9zWaHe/9G9UJpcXL3hUkPw49RoNcY1XfaYOyrAXI5NjLHhuBsiJ+hwbF3ZBKDaHulr5vk3tZyOQDpklz82P2+xrZqoHeQdmLCTurl7ei67bCuLwvvdOntloi0S05W5u4bWxkxphO406JNp6KH/otNs3d4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 170558477664842.71445829322249; Thu, 18 Jan 2024 05:32:56 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rQSVW-0004xs-9L; Thu, 18 Jan 2024 08:32:34 -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 1rQSVT-0004x2-Tu; Thu, 18 Jan 2024 08:32:31 -0500 Received: from mail-pf1-x431.google.com ([2607:f8b0:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rQSVS-00022f-8o; Thu, 18 Jan 2024 08:32:31 -0500 Received: by mail-pf1-x431.google.com with SMTP id d2e1a72fcca58-6d9cdd0a5e6so7110202b3a.3; Thu, 18 Jan 2024 05:32:29 -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.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Jan 2024 05:32:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705584748; x=1706189548; 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=Gp4VqctlcOHDSbky/1yqB0zizFgsvSyeOkwNaVp6158=; b=eQ7W85Fa5AXvFUo2xz826Kq4iheg+5mjI4PrBMzkTDhbbgnspEwfIB4+BnmxVhO35N kWk6bTnS9ddq3TwumhgwxzV5nNK9YIBg5gA03FOlXJholrBiVphcsvNryo0+7/CJxDsZ isAosXLXSrP0xhO9saFaJF78WhVdWs17xWw1h6724IsG2nEzgImRWST/fOOo82zpmaYB sr0QSx3rS60hCxDQCKEn+BbVCedt1KD7CfUR+s5wcJJ2BORxf0dmq2qW3oCgpl083XQW ZbSYhBQrF4dwDPP1G9PT74F9udRp63sh9YW95U2yYvVLNBMjOfswLn0dH6b8yu9XBX+U EmGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705584748; x=1706189548; 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=Gp4VqctlcOHDSbky/1yqB0zizFgsvSyeOkwNaVp6158=; b=b9BpwaTdcDoFb2aZjpyhyZP0d/+qlTEleY5uxyAjStHkTOBafecLimTntQv+nglT+t n6pJVDiZM0KRjVpeuvQOufcuqpDytKdlEZM2+qEV5Bkyq6DANudjJrpph03GZ5o7Pm0y GhhKSwsVLI4mDHqBv0fV61eswEawSbMiWLlSpjygQnmfdvXaBi0KIUWOf/qznlvY0LqK 36oeSNUcTxcCpVhJApPkET+U+1ClpvSPsQuCvHipmBGQV26dych6Zqcy7Gvl3SgMuCix R8EI+F+EpVZHqimfRu8MtYENwLZVWNZL1F6pkz4BgDKV0VSffo0A6v4NaUjOyINqcM79 xh4w== X-Gm-Message-State: AOJu0YybrWN7U+FJPTsMC1J8BJi1x6JV9jdc2kTXfeQd/F0/cXcWzlK3 FPucuWuBeMAwmhZ+jjzGHQgpBv6FWlqwfMeTzJFuaWAVCWsBVUjw4/vLjruF X-Google-Smtp-Source: AGHT+IFket2fBfFvcn4kls2QA2T3MFAhU64/+ufwXxq40TCq0WFkOjapMQU0gOdhqT/msBXpnqlqbQ== X-Received: by 2002:a05:6a00:2a0a:b0:6db:1038:ee52 with SMTP id ce10-20020a056a002a0a00b006db1038ee52mr905999pfb.16.1705584748103; Thu, 18 Jan 2024 05:32:28 -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=20Le=20Goater?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Subject: [PATCH v2 3/4] hw/ppc/spapr_hcall: Rename {softmmu -> vhyp_mmu}_resize_hpt_pr Date: Thu, 18 Jan 2024 23:32:05 +1000 Message-ID: <20240118133206.158453-4-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::431; envelope-from=npiggin@gmail.com; helo=mail-pf1-x431.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1705584778787100003 From: Philippe Mathieu-Daud=C3=A9 Since 'softmmu' is quite a loaded term in QEMU, rename the vhyp MMU facilities to use the vhyp_mmu_ prefix rather than softmmu_. Signed-off-by: Philippe Mathieu-Daud=C3=A9 [npiggin: Pick a different name.] Signed-off-by: Nicholas Piggin Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/ppc/spapr.h | 9 ++++++--- hw/ppc/spapr_hcall.c | 4 ++-- hw/ppc/spapr_softmmu.c | 4 ++-- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index e91791a1a9..5b5ba9ef77 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -634,10 +634,13 @@ void spapr_register_hypercall(target_ulong opcode, sp= apr_hcall_fn fn); target_ulong spapr_hypercall(PowerPCCPU *cpu, target_ulong opcode, target_ulong *args); =20 -target_ulong softmmu_resize_hpt_prepare(PowerPCCPU *cpu, SpaprMachineState= *spapr, +target_ulong vhyp_mmu_resize_hpt_prepare(PowerPCCPU *cpu, + SpaprMachineState *spapr, target_ulong shift); -target_ulong softmmu_resize_hpt_commit(PowerPCCPU *cpu, SpaprMachineState = *spapr, - target_ulong flags, target_ulong s= hift); +target_ulong vhyp_mmu_resize_hpt_commit(PowerPCCPU *cpu, + SpaprMachineState *spapr, + target_ulong flags, + target_ulong shift); bool is_ram_address(SpaprMachineState *spapr, hwaddr addr); void push_sregs_to_kvm_pr(SpaprMachineState *spapr); =20 diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c index 0d7d523e6d..75c2d12978 100644 --- a/hw/ppc/spapr_hcall.c +++ b/hw/ppc/spapr_hcall.c @@ -124,7 +124,7 @@ static target_ulong h_resize_hpt_prepare(PowerPCCPU *cp= u, if (kvm_enabled()) { return H_HARDWARE; } else if (tcg_enabled()) { - return softmmu_resize_hpt_prepare(cpu, spapr, shift); + return vhyp_mmu_resize_hpt_prepare(cpu, spapr, shift); } else { g_assert_not_reached(); } @@ -194,7 +194,7 @@ 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); + return vhyp_mmu_resize_hpt_commit(cpu, spapr, flags, shift); } else { g_assert_not_reached(); } diff --git a/hw/ppc/spapr_softmmu.c b/hw/ppc/spapr_softmmu.c index 2fade94029..b3dd8b3a59 100644 --- a/hw/ppc/spapr_softmmu.c +++ b/hw/ppc/spapr_softmmu.c @@ -378,7 +378,7 @@ static void cancel_hpt_prepare(SpaprMachineState *spapr) free_pending_hpt(pending); } =20 -target_ulong softmmu_resize_hpt_prepare(PowerPCCPU *cpu, +target_ulong vhyp_mmu_resize_hpt_prepare(PowerPCCPU *cpu, SpaprMachineState *spapr, target_ulong shift) { @@ -562,7 +562,7 @@ static int rehash_hpt(PowerPCCPU *cpu, return H_SUCCESS; } =20 -target_ulong softmmu_resize_hpt_commit(PowerPCCPU *cpu, +target_ulong vhyp_mmu_resize_hpt_commit(PowerPCCPU *cpu, SpaprMachineState *spapr, target_ulong flags, target_ulong shift) --=20 2.42.0 From nobody Sat Sep 21 03:07:36 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1705584791; cv=none; d=zohomail.com; s=zohoarc; b=OqheI7jDOh2RdYIbpiJqjMEtc6lx3daxtS6PnZM+tJesR9qAlrvMyn8HKcLU6L9wNA/V+Edon7fiO/bMWeWG+dXZphCZ5QuNZ0QoZga2HrkBQw/8wIFMEwf88ZfnNzv/ugxNkItyQ1JyDbP+TajRuWULWnotoom2edLw0Q7gUTw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1705584791; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=vHaAra0yiJpjPl5M+0aVbS5rb6YYjPPEl4Zi1Bp8Ct4=; b=Sj5AHxumVrgM1MR0s+rjn0o6Xp2sq6OqTu0lHzP09tQaa92FXfYJgG3qVuRCxP/n2KQe/rXj/F+t0or03A0QPSwkLLkhmdZk3y9tOu2XEZTmulmNKCIHkzzOGeTVqPTJnN8Xo6vJBM7039Z1FJKYLEyeuvrwlyF49mp8tTqqqZg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1705584791609584.4865863640423; Thu, 18 Jan 2024 05:33:11 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rQSVd-00056X-0D; Thu, 18 Jan 2024 08:32:41 -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 1rQSVZ-00051I-CD; Thu, 18 Jan 2024 08:32:37 -0500 Received: from mail-pf1-x42b.google.com ([2607:f8b0: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 1rQSVX-000232-It; Thu, 18 Jan 2024 08:32:37 -0500 Received: by mail-pf1-x42b.google.com with SMTP id d2e1a72fcca58-6da4a923b1bso6726548b3a.2; Thu, 18 Jan 2024 05:32:34 -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.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Jan 2024 05:32:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705584752; x=1706189552; 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=vHaAra0yiJpjPl5M+0aVbS5rb6YYjPPEl4Zi1Bp8Ct4=; b=YQ2qhE+rNeuaS44IPtWZ4nsHGb7EAa7w5JCodlMByHiJEPCh7X+as9n4k8N5v1GXQS hmBJWkvux5Big9W8CGiGCgg4ozIqRcMNqom0m4uTA9d1cRzVeAEdHuC4E0AL0BVEmX0d +a1Ag9Gobj7+hjK9lSGXysgmA9JtFXU34pc7FTyZUgvDbuOa5y6+CJbP2GNTjOJaInB4 UjgTVnBfHf/rwXLQBzIJIWJ2Fe3FiW2LZs6nvPACwVPpxcbRf0g/eZoGwxQogK9NlFp4 tQZbmG2uif5Fvlzobz+yj2MSJZ7XgZGkrWW03qg8dFOpMCAfqMPWeFEMUcnt88UYtCX+ kKQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705584752; x=1706189552; 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=vHaAra0yiJpjPl5M+0aVbS5rb6YYjPPEl4Zi1Bp8Ct4=; b=BaHCuek3IHXMnsYa5pkJD62cKeRTOGx8tYdGa3YmyBTHYe2GnzBT7Yys0VKMxCrVEX X7t9SvqIvbMkQaGjgbQbTHM92omjuOwIY+a39aqqbQxrJ1R63JSUaGelYoXxtX0XvAgi T6oiNA1oXhsIv1HjNVA6eADEmjK3lJ18qMzFlCvzyccRRessT/m74sGggECyf2UlGbms 0zGGoCeO7v9EJMBffmGO4KRRVx9FNv1NVnaeKuC6mpi0XkNkbH1SHJv2JrJwXw85DQji IyLPZXcsvK/UtFVRQHyqDTTqCn1/B9DSclbwwpVqy3FoPuk4/JGC733SD62k7pTU+i+z BeoQ== X-Gm-Message-State: AOJu0Yy7krv0H70MyH2LPnPPlnbBBw3DDREKrTFAlOrT/StUS9N6aECK diZXDnD1p8m59Brm18vQTZNcv8L70QGXZTd6Gj388pIf5IBfnKEGKiPYU/SQ X-Google-Smtp-Source: AGHT+IGCfwqJoMylsM58zp6V2LyDerTyHxadmKah8oLnUsxSausg/mtbNS+6F0PpxSL2hoD69gJJrQ== X-Received: by 2002:a05:6a00:3995:b0:6db:ade0:4bc9 with SMTP id fi21-20020a056a00399500b006dbade04bc9mr523623pfb.31.1705584752432; Thu, 18 Jan 2024 05:32:32 -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=20Le=20Goater?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Subject: [PATCH v2 4/4] hw/ppc/spapr: Rename 'softmmu' -> 'vhyp_mmu' Date: Thu, 18 Jan 2024 23:32:06 +1000 Message-ID: <20240118133206.158453-5-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::42b; envelope-from=npiggin@gmail.com; helo=mail-pf1-x42b.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1705584792943100001 From: Philippe Mathieu-Daud=C3=A9 In the spirit of reducing use of the term 'softmmu', rename spapr_softmmu.c to spapr_vhyp_mmu.c. Logically, the TLB loading code that walks the hash table is the implementation of the ppc hash MMU, and the code that manipulates the hash table is the implementation of the PAPR hypervisor interface (called vhyp). Signed-off-by: Philippe Mathieu-Daud=C3=A9 [npiggin: Pick a different name, explain it in changelog.] Signed-off-by: Nicholas Piggin Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/ppc/{spapr_softmmu.c =3D> spapr_vhyp_mmu.c} | 0 hw/ppc/meson.build | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename hw/ppc/{spapr_softmmu.c =3D> spapr_vhyp_mmu.c} (100%) diff --git a/hw/ppc/spapr_softmmu.c b/hw/ppc/spapr_vhyp_mmu.c similarity index 100% rename from hw/ppc/spapr_softmmu.c rename to hw/ppc/spapr_vhyp_mmu.c diff --git a/hw/ppc/meson.build b/hw/ppc/meson.build index eba3406e7f..30bd2aaccf 100644 --- a/hw/ppc/meson.build +++ b/hw/ppc/meson.build @@ -31,7 +31,7 @@ ppc_ss.add(when: 'CONFIG_PSERIES', if_true: files( 'pef.c', )) ppc_ss.add(when: ['CONFIG_PSERIES', 'CONFIG_TCG'], if_true: files( - 'spapr_softmmu.c', + 'spapr_vhyp_mmu.c', )) ppc_ss.add(when: 'CONFIG_SPAPR_RNG', if_true: files('spapr_rng.c')) if host_os =3D=3D 'linux' --=20 2.42.0