From nobody Sat May 18 19:24:37 2024 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1554964554; cv=none; d=zoho.com; s=zohoarc; b=Eueav9AC7jestlsaYW7rSO8/ZL/fDit7OdjjCR4YJMEcWqpqT9Na5wWa88F1SVaf+pr0HvuFj/4LXtw+a7EUFFDUIPNjtq7sQ6N8TdWSkeW5U1g9L2XT0bOQH7KiN+veS/cvZsVQ57VXoSlcbE9qi/zLqO3efXywgYZaYAxmHHQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1554964554; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=KN2fzTdZ9dSSkXiD4xVH9epcBHDU0I6Xm1SYf10qAkY=; b=op+UQlpp/tO5/CMcKpblOrKYu6TsyLMg5wPBvWdr41YW3dSahoCnlqJhjwsTEWwYDnsIml+eJX5fh8b74rn/3VtuTyemljMhwk3oDmLjDKRgE2w/eZiz9sVe3lufD04XiY3uUb5qEU5Cy3eC6RaHQ0OcziO3lNrDKBWUKUNnqq4= ARC-Authentication-Results: i=1; mx.zoho.com; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=null header.from= header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1554964554713617.2300495732625; Wed, 10 Apr 2019 23:35:54 -0700 (PDT) Received: from localhost ([127.0.0.1]:42590 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hETJ5-0001FH-Q6 for importer@patchew.org; Thu, 11 Apr 2019 02:35:31 -0400 Received: from eggs.gnu.org ([209.51.188.92]:58775) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hETI5-0000mL-Qz for qemu-devel@nongnu.org; Thu, 11 Apr 2019 02:34:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hETI4-0003iG-MM for qemu-devel@nongnu.org; Thu, 11 Apr 2019 02:34:29 -0400 Received: from 4.mo1.mail-out.ovh.net ([46.105.76.26]:46678) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hETI4-0003Xj-FE for qemu-devel@nongnu.org; Thu, 11 Apr 2019 02:34:28 -0400 Received: from player746.ha.ovh.net (unknown [10.109.159.35]) by mo1.mail-out.ovh.net (Postfix) with ESMTP id CBB6E167D15 for ; Thu, 11 Apr 2019 08:34:18 +0200 (CEST) Received: from kaod.org (lfbn-tou-1-40-22.w86-201.abo.wanadoo.fr [86.201.133.22]) (Authenticated sender: clg@kaod.org) by player746.ha.ovh.net (Postfix) with ESMTPSA id 773AE4BDCF46; Thu, 11 Apr 2019 06:34:12 +0000 (UTC) From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: David Gibson Date: Thu, 11 Apr 2019 08:34:08 +0200 Message-Id: <20190411063408.3998-1-clg@kaod.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Ovh-Tracer-Id: 16134708617910062054 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeduuddrudekgddutdefucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucesvcftvggtihhpihgvnhhtshculddquddttddm Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 46.105.76.26 Subject: [Qemu-devel] [PATCH] ppc/spapr: Add H_PROD and H_CONFER X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-ppc@nongnu.org, qemu-devel@nongnu.org, Nicholas Piggin , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Benjamin Herrenschmidt H_PROD should be fully functional, H_CEDE is modified to ignore a proded CPU. H_CONFER is a stub to avoid returning an error. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: C=C3=A9dric Le Goater Reviewed-by: Greg Kurz --- target/ppc/cpu.h | 3 +++ hw/ppc/spapr_hcall.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h index 42eadc4b7997..07cea7268c0c 100644 --- a/target/ppc/cpu.h +++ b/target/ppc/cpu.h @@ -1141,6 +1141,9 @@ struct CPUPPCState { * sreset), so flag this here. */ bool resume_as_sreset; + + /* Used by SPAPR for H_CEDE/H_PROD */ + bool prodded; #endif =20 /* Those resources are used only during code translation */ diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c index 8a736797b9bf..be8044a92f2f 100644 --- a/hw/ppc/spapr_hcall.c +++ b/hw/ppc/spapr_hcall.c @@ -1057,6 +1057,11 @@ static target_ulong h_cede(PowerPCCPU *cpu, SpaprMac= hineState *spapr, =20 env->msr |=3D (1ULL << MSR_EE); hreg_compute_hflags(env); + if (env->prodded) { + env->prodded =3D false; + return H_SUCCESS; + } + if (!cpu_has_work(cs)) { cs->halted =3D 1; cs->exception_index =3D EXCP_HLT; @@ -1065,6 +1070,36 @@ static target_ulong h_cede(PowerPCCPU *cpu, SpaprMac= hineState *spapr, return H_SUCCESS; } =20 +static void spapr_do_wakeup_on_cpu(CPUState *cs, run_on_cpu_data data) +{ + cs->halted =3D 0; + cs->exception_index =3D -1; +} + +static target_ulong h_prod(PowerPCCPU *cpu, SpaprMachineState *spapr, + target_ulong opcode, target_ulong *args) +{ + target_ulong target =3D args[0]; + CPUPPCState *env; + + cpu =3D spapr_find_cpu(target); + if (cpu) { + env =3D &cpu->env; + env->prodded =3D true; + run_on_cpu(CPU(cpu), spapr_do_wakeup_on_cpu, RUN_ON_CPU_NULL); + } else { + return H_PARAMETER; + } + return H_SUCCESS; +} + +static target_ulong h_confer(PowerPCCPU *cpu, SpaprMachineState *spapr, + target_ulong opcode, target_ulong *args) +{ + /* Do nothing (supposed to confer timeslice). */ + return H_SUCCESS; +} + static target_ulong h_rtas(PowerPCCPU *cpu, SpaprMachineState *spapr, target_ulong opcode, target_ulong *args) { @@ -1860,6 +1895,8 @@ static void hypercall_register_types(void) /* hcall-splpar */ spapr_register_hypercall(H_REGISTER_VPA, h_register_vpa); spapr_register_hypercall(H_CEDE, h_cede); + spapr_register_hypercall(H_PROD, h_prod); + spapr_register_hypercall(H_CONFER, h_confer); spapr_register_hypercall(H_SIGNAL_SYS_RESET, h_signal_sys_reset); =20 /* processor register resource access h-calls */ --=20 2.20.1