From patchwork Tue Feb 26 03:05:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suraj Jitindar Singh X-Patchwork-Id: 10829355 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 45C3D13B5 for ; Tue, 26 Feb 2019 03:07:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2B9582A924 for ; Tue, 26 Feb 2019 03:07:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1D6F42A9F8; Tue, 26 Feb 2019 03:07:18 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id DD6FC2A924 for ; Tue, 26 Feb 2019 03:07:16 +0000 (UTC) Received: from localhost ([127.0.0.1]:47466 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gyT5P-0004e2-NV for patchwork-qemu-devel@patchwork.kernel.org; Mon, 25 Feb 2019 22:07:15 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39618) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gyT4B-0003mP-F2 for qemu-devel@nongnu.org; Mon, 25 Feb 2019 22:06:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gyT49-0007e7-GW for qemu-devel@nongnu.org; Mon, 25 Feb 2019 22:05:58 -0500 Received: from mail-pg1-x543.google.com ([2607:f8b0:4864:20::543]:34060) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gyT43-0007ZZ-UR; Mon, 25 Feb 2019 22:05:53 -0500 Received: by mail-pg1-x543.google.com with SMTP id i130so5490215pgd.1; Mon, 25 Feb 2019 19:05:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=WQDXkCmh5rBijD/gAa3omNNQKSohMAjO2v9mmnrwUjI=; b=pk7PCkttXFKPByoCW5Y7gy6+l8m3Sw4FeriUvWdOka6uyL7xU7X7CCTsIizpnmZwME q5Ipl/V1k99l0fLRjQNSn7TE2+13tA5YLSYO+iUNqf8yLWPjQKaHSKIkh6+jn7TgXXdS QEuheXopR07i7iFarHIWkjxyNFts4Dpu4e/aDxUZdq791+0lLvNG2KhiGVVgO7nbaLK7 +hSRJkvNbiqZdtKqUlxHwdabHrlDopn8K3fK8wrnztw+hjwPwbbnkVMe+Ukmk8yCuYyt lLS30/hwkdne026bqaF3JGQPKnddFvJcRRKhoD2QlDK0lw/wFQYGeK5BT/+axTksgopQ vBoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=WQDXkCmh5rBijD/gAa3omNNQKSohMAjO2v9mmnrwUjI=; b=lyBvRFj+G9jTvUEcPe02WRZ7LkyO/8WJWR8oe2rwYrQVBcH/C1KyLm6UGLmIWbwE26 vJWaouWKaju9ejhe6WdB3r3tKEQtfh8/HTSai0ujTnK8Iq6C8aj2jVHu9E5TWAeJb0SJ FNSaxRoOjQtfwClD+bFlGPUbfAReikqlzHk+7NuvelJ1LoMW3WnVtANBJ+24xTsbvLbi CYo0mkgja/EBYtrOP7JPdWM+Jce4atHaw4156UPTybWTweENrN7Y6lzjSqj8hSxRMAmA uJJ6fexZX8yXjPZQJE4eKQaz9GFEoQw4kjW2MbSTyxVw+B3F18wFbCHobXv+4mElWLDG 6L4g== X-Gm-Message-State: AHQUAuatiNTFgyBFOeOxfJxl2NmGwW0C71aCWWG16pvvjVNleGbOIpld f9OFbDP2pp6foZJJel0yIArM2eMH X-Google-Smtp-Source: AHgI3Ia0tSzCQecoTAe2SfNa7pID5trLJMY4it+angliR+G90tZIa83kJKWKLbe4cLp/bxkLL/8jMQ== X-Received: by 2002:a62:4684:: with SMTP id o4mr2637607pfi.254.1551150350192; Mon, 25 Feb 2019 19:05:50 -0800 (PST) Received: from surajjs2.ozlabs.ibm.com.ozlabs.ibm.com ([122.99.82.10]) by smtp.gmail.com with ESMTPSA id j1sm4427825pgp.84.2019.02.25.19.05.47 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 25 Feb 2019 19:05:49 -0800 (PST) From: Suraj Jitindar Singh To: qemu-ppc@nongnu.org Date: Tue, 26 Feb 2019 14:05:28 +1100 Message-Id: <20190226030531.9932-1-sjitindarsingh@gmail.com> X-Mailer: git-send-email 2.13.6 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::543 Subject: [Qemu-devel] [QEMU-PPC] [PATCH 1/4] target/ppc/spapr: Add SPAPR_CAP_LARGE_DECREMENTER 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-devel@nongnu.org, clg@kaod.org, Suraj Jitindar Singh , david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Add spapr_cap SPAPR_CAP_LARGE_DECREMENTER to be used to control the availability and size of the large decrementer made available to the guest. Signed-off-by: Suraj Jitindar Singh --- hw/ppc/spapr.c | 2 ++ hw/ppc/spapr_caps.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ include/hw/ppc/spapr.h | 5 ++++- 3 files changed, 51 insertions(+), 1 deletion(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index b6a571b6f1..acf62a2b9f 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -2077,6 +2077,7 @@ static const VMStateDescription vmstate_spapr = { &vmstate_spapr_irq_map, &vmstate_spapr_cap_nested_kvm_hv, &vmstate_spapr_dtb, + &vmstate_spapr_cap_large_decr, NULL } }; @@ -4288,6 +4289,7 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data) smc->default_caps.caps[SPAPR_CAP_IBS] = SPAPR_CAP_BROKEN; smc->default_caps.caps[SPAPR_CAP_HPT_MAXPAGESIZE] = 16; /* 64kiB */ smc->default_caps.caps[SPAPR_CAP_NESTED_KVM_HV] = SPAPR_CAP_OFF; + smc->default_caps.caps[SPAPR_CAP_LARGE_DECREMENTER] = 0; spapr_caps_add_properties(smc, &error_abort); smc->irq = &spapr_irq_xics; smc->dr_phb_enabled = true; diff --git a/hw/ppc/spapr_caps.c b/hw/ppc/spapr_caps.c index 64f98ae68d..1545a02729 100644 --- a/hw/ppc/spapr_caps.c +++ b/hw/ppc/spapr_caps.c @@ -182,6 +182,34 @@ static void spapr_cap_set_pagesize(Object *obj, Visitor *v, const char *name, spapr->eff.caps[cap->index] = val; } +static void spapr_cap_get_uint8(Object *obj, Visitor *v, const char *name, + void *opaque, Error **errp) +{ + sPAPRCapabilityInfo *cap = opaque; + sPAPRMachineState *spapr = SPAPR_MACHINE(obj); + uint8_t val = spapr_get_cap(spapr, cap->index); + + visit_type_uint8(v, name, &val, errp); +} + +static void spapr_cap_set_uint8(Object *obj, Visitor *v, const char *name, + void *opaque, Error **errp) +{ + sPAPRCapabilityInfo *cap = opaque; + sPAPRMachineState *spapr = SPAPR_MACHINE(obj); + Error *local_err = NULL; + uint8_t val; + + visit_type_uint8(v, name, &val, &local_err); + if (local_err) { + error_propagate(errp, local_err); + return; + } + + spapr->cmd_line_caps[cap->index] = true; + spapr->eff.caps[cap->index] = val; +} + static void cap_htm_apply(sPAPRMachineState *spapr, uint8_t val, Error **errp) { if (!val) { @@ -390,6 +418,13 @@ static void cap_nested_kvm_hv_apply(sPAPRMachineState *spapr, } } +static void cap_large_decr_apply(sPAPRMachineState *spapr, + uint8_t val, Error **errp) +{ + if (val) + error_setg(errp, "No large decrementer support, try cap-large-decr=0"); +} + sPAPRCapabilityInfo capability_table[SPAPR_CAP_NUM] = { [SPAPR_CAP_HTM] = { .name = "htm", @@ -468,6 +503,15 @@ sPAPRCapabilityInfo capability_table[SPAPR_CAP_NUM] = { .type = "bool", .apply = cap_nested_kvm_hv_apply, }, + [SPAPR_CAP_LARGE_DECREMENTER] = { + .name = "large-decr", + .description = "Size of Large Decrementer for the Guest (bits) 0=disabled", + .index = SPAPR_CAP_LARGE_DECREMENTER, + .get = spapr_cap_get_uint8, + .set = spapr_cap_set_uint8, + .type = "int", + .apply = cap_large_decr_apply, + }, }; static sPAPRCapabilities default_caps_with_cpu(sPAPRMachineState *spapr, @@ -596,6 +640,7 @@ SPAPR_CAP_MIG_STATE(cfpc, SPAPR_CAP_CFPC); SPAPR_CAP_MIG_STATE(sbbc, SPAPR_CAP_SBBC); SPAPR_CAP_MIG_STATE(ibs, SPAPR_CAP_IBS); SPAPR_CAP_MIG_STATE(nested_kvm_hv, SPAPR_CAP_NESTED_KVM_HV); +SPAPR_CAP_MIG_STATE(large_decr, SPAPR_CAP_LARGE_DECREMENTER); void spapr_caps_init(sPAPRMachineState *spapr) { diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index 59073a7579..8efc5e0779 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -74,8 +74,10 @@ typedef enum { #define SPAPR_CAP_HPT_MAXPAGESIZE 0x06 /* Nested KVM-HV */ #define SPAPR_CAP_NESTED_KVM_HV 0x07 +/* Large Decrementer */ +#define SPAPR_CAP_LARGE_DECREMENTER 0x08 /* Num Caps */ -#define SPAPR_CAP_NUM (SPAPR_CAP_NESTED_KVM_HV + 1) +#define SPAPR_CAP_NUM (SPAPR_CAP_LARGE_DECREMENTER + 1) /* * Capability Values @@ -828,6 +830,7 @@ extern const VMStateDescription vmstate_spapr_cap_cfpc; extern const VMStateDescription vmstate_spapr_cap_sbbc; extern const VMStateDescription vmstate_spapr_cap_ibs; extern const VMStateDescription vmstate_spapr_cap_nested_kvm_hv; +extern const VMStateDescription vmstate_spapr_cap_large_decr; static inline uint8_t spapr_get_cap(sPAPRMachineState *spapr, int cap) {