From nobody Sat Oct 25 09:07:51 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 152031039858149.93050924495924; Mon, 5 Mar 2018 20:26:38 -0800 (PST) Received: from localhost ([::1]:52960 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1et4BR-00076S-R1 for importer@patchew.org; Mon, 05 Mar 2018 23:26:37 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49562) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1et3o0-0001aD-BI for qemu-devel@nongnu.org; Mon, 05 Mar 2018 23:02:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1et3nx-0004WE-LE for qemu-devel@nongnu.org; Mon, 05 Mar 2018 23:02:24 -0500 Received: from ozlabs.org ([103.22.144.67]:35015) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1et3nx-0004US-5X; Mon, 05 Mar 2018 23:02:21 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 3zwNQ83t8Vz9shb; Tue, 6 Mar 2018 15:02:04 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1520308928; bh=S96HHKXoI8lxylqF+7tVLV0EWLhNzfw1Y6mvwPulKk4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ftPxmikmezUrRtXqa9jXq7pvMERczABvBPaRg8oc9CTmQ8wYRk0AAiskO45eWjpVs mZ988Ig4j0v6iaN9ZZzo94BI8PpEqt5mUCFxlw3zozYEPE40NNNyPR55fWq7ArgpWW 3o7rOxIQy6lDikkt1Go+ExmiDBKlf+RWUqxpXVxI= From: David Gibson To: peter.maydell@linaro.org, groug@kaod.org Date: Tue, 6 Mar 2018 15:01:47 +1100 Message-Id: <20180306040154.3669-24-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180306040154.3669-1-david@gibson.dropbear.id.au> References: <20180306040154.3669-1-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 103.22.144.67 Subject: [Qemu-devel] [PULL 23/30] ppc/spapr-caps: Convert cap-cfpc to custom spapr-cap 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: surajjs@au1.ibm.com, qemu-devel@nongnu.org, agraf@suse.de, qemu-ppc@nongnu.org, Suraj Jitindar Singh , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Suraj Jitindar Singh Convert cap-cfpc (cache flush on privilege change) to a custom spapr-cap type. Signed-off-by: Suraj Jitindar Singh [dwg: Don't explicitly list "?"/help option, trusting convention] [dwg: Strip no-longer-necessary ATTRIBUTE_UNUSED back off] [dwg: Fix some minor style problems] Signed-off-by: David Gibson --- hw/ppc/spapr_caps.c | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/hw/ppc/spapr_caps.c b/hw/ppc/spapr_caps.c index 3d8b796df9..b5a991f97a 100644 --- a/hw/ppc/spapr_caps.c +++ b/hw/ppc/spapr_caps.c @@ -149,9 +149,8 @@ out: g_free(val); } =20 -static void ATTRIBUTE_UNUSED spapr_cap_get_string(Object *obj, Visitor *v, - const char *name, - void *opaque, Error **er= rp) +static void spapr_cap_get_string(Object *obj, Visitor *v, const char *nam= e, + void *opaque, Error **errp) { sPAPRCapabilityInfo *cap =3D opaque; sPAPRMachineState *spapr =3D SPAPR_MACHINE(obj); @@ -169,9 +168,8 @@ static void ATTRIBUTE_UNUSED spapr_cap_get_string(Objec= t *obj, Visitor *v, g_free(val); } =20 -static void ATTRIBUTE_UNUSED spapr_cap_set_string(Object *obj, Visitor *v, - const char *name, - void *opaque, Error **er= rp) +static void spapr_cap_set_string(Object *obj, Visitor *v, const char *name, + void *opaque, Error **errp) { sPAPRCapabilityInfo *cap =3D opaque; sPAPRMachineState *spapr =3D SPAPR_MACHINE(obj); @@ -250,14 +248,26 @@ static void cap_dfp_apply(sPAPRMachineState *spapr, u= int8_t val, Error **errp) } } =20 +sPAPRCapPossible cap_cfpc_possible =3D { + .num =3D 3, + .vals =3D {"broken", "workaround", "fixed"}, + .help =3D "broken - no protection, workaround - workaround available," + " fixed - fixed in hardware", +}; + static void cap_safe_cache_apply(sPAPRMachineState *spapr, uint8_t val, Error **errp) { + uint8_t kvm_val =3D kvmppc_get_cap_safe_cache(); + if (tcg_enabled() && val) { /* TODO - for now only allow broken for TCG */ - error_setg(errp, "Requested safe cache capability level not suppor= ted by tcg, try a different value for cap-cfpc"); - } else if (kvm_enabled() && (val > kvmppc_get_cap_safe_cache())) { - error_setg(errp, "Requested safe cache capability level not suppor= ted by kvm, try a different value for cap-cfpc"); + error_setg(errp, +"Requested safe cache capability level not supported by tcg, try a differe= nt value for cap-cfpc"); + } else if (kvm_enabled() && (val > kvm_val)) { + error_setg(errp, +"Requested safe cache capability level not supported by kvm, try cap-cfpc= =3D%s", + cap_cfpc_possible.vals[kvm_val]); } } =20 @@ -319,9 +329,10 @@ sPAPRCapabilityInfo capability_table[SPAPR_CAP_NUM] = =3D { .name =3D "cfpc", .description =3D "Cache Flush on Privilege Change" VALUE_DESC_TRIS= TATE, .index =3D SPAPR_CAP_CFPC, - .get =3D spapr_cap_get_tristate, - .set =3D spapr_cap_set_tristate, + .get =3D spapr_cap_get_string, + .set =3D spapr_cap_set_string, .type =3D "string", + .possible =3D &cap_cfpc_possible, .apply =3D cap_safe_cache_apply, }, [SPAPR_CAP_SBBC] =3D { --=20 2.14.3