From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E98B0EB64D9 for ; Fri, 7 Jul 2023 16:03:24 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qHnuX-0007Dt-FC; Fri, 07 Jul 2023 12:02:21 -0400 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 1qHnuT-0007Bd-K3; Fri, 07 Jul 2023 12:02:17 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qHnuO-0001Zd-88; Fri, 07 Jul 2023 12:02:16 -0400 Received: from pps.filterd (m0353726.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 367Fl2Hv027985; Fri, 7 Jul 2023 16:01:57 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=message-id : date : subject : to : cc : references : from : in-reply-to : content-type : content-transfer-encoding : mime-version; s=pp1; bh=+D5M1zrjI6HCPpRRraZPhW7gPHl7iI0RF8/EXIq3C0I=; b=TRPSsYK+vuIejGk96RGaxTLB9wINQD0oOKdEwEm6HFF0Xt4f0q1WgybqUri6foN9mHea GDwVZ+plfb/4cWkRcNEjgcWJOTK7gXNrQvq8INLt6AMMyICTF/IDhGF2w6PXuodjZJvm 1chHlhuukOlmEwb6iHHQRO+oFlLjlqx9RxUdYtBqJsofXZG1cAZ2ATYiomAtOCHqTxfZ t0naka64xNGgcaoCzBFGHBqGWT/X9BMR8tcnPzFdy0uu0mOuXksjKMXrsvLWl2dwfa2B hvgI/fZ+MHyJGXOlWVvQoLnfwYVt9iptkeEAujdbt3OiqD7QL3o/vzCAhFs97mjecFx8 LA== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3rpnncgb9p-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 07 Jul 2023 16:01:56 +0000 Received: from m0353726.ppops.net (m0353726.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 367FlPqD029207; Fri, 7 Jul 2023 16:01:56 GMT Received: from ppma06ams.nl.ibm.com (66.31.33a9.ip4.static.sl-reverse.com [169.51.49.102]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3rpnncgb8k-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 07 Jul 2023 16:01:56 +0000 Received: from pps.filterd (ppma06ams.nl.ibm.com [127.0.0.1]) by ppma06ams.nl.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 3674pm02002797; Fri, 7 Jul 2023 16:01:53 GMT Received: from smtprelay07.fra02v.mail.ibm.com ([9.218.2.229]) by ppma06ams.nl.ibm.com (PPS) with ESMTPS id 3rjbde431m-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 07 Jul 2023 16:01:53 +0000 Received: from smtpav01.fra02v.mail.ibm.com (smtpav01.fra02v.mail.ibm.com [10.20.54.100]) by smtprelay07.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 367G1pTm59048224 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 7 Jul 2023 16:01:51 GMT Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 578CB20040; Fri, 7 Jul 2023 16:01:51 +0000 (GMT) Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 7B3772004E; Fri, 7 Jul 2023 16:01:48 +0000 (GMT) Received: from [9.43.6.151] (unknown [9.43.6.151]) by smtpav01.fra02v.mail.ibm.com (Postfix) with ESMTP; Fri, 7 Jul 2023 16:01:48 +0000 (GMT) Message-ID: <93da1bb9-14ef-b465-3ae9-73e894232211@linux.ibm.com> Date: Fri, 7 Jul 2023 21:31:47 +0530 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.12.0 Subject: Re: [PATCH v6] ppc: Enable 2nd DAWR support on p10 Content-Language: en-US To: Daniel Henrique Barboza , Greg Kurz Cc: david@gibson.dropbear.id.au, clg@kaod.org, harshpb@linux.ibm.com, npiggin@gmail.com, pbonzini@redhat.com, qemu-ppc@nongnu.org, qemu-devel@nongnu.org, kvm@vger.kernel.org, ravi.bangoria@amd.com References: <168871963321.58984.15628382614621248470.stgit@ltcd89-lp2> <20230707135909.1b1a89d5@bahia> From: Shivaprasad G Bhat In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed X-TM-AS-GCONF: 00 X-Proofpoint-GUID: U9fc9EPuA3ODp7l97z-1spuCLeDKqmkX X-Proofpoint-ORIG-GUID: Ua7whY743II67dGqQn4R5EM8L4bZnbHt Content-Transfer-Encoding: 8bit X-Proofpoint-UnRewURL: 0 URL was un-rewritten MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-07-07_10,2023-07-06_02,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 mlxlogscore=999 spamscore=0 impostorscore=0 clxscore=1015 lowpriorityscore=0 bulkscore=0 mlxscore=0 adultscore=0 phishscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2305260000 definitions=main-2307070149 Received-SPF: pass client-ip=148.163.156.1; envelope-from=sbhat@linux.ibm.com; helo=mx0a-001b2d01.pphosted.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_EF=-0.1, NICE_REPLY_A=-0.092, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On 7/7/23 17:52, Daniel Henrique Barboza wrote: > > > On 7/7/23 08:59, Greg Kurz wrote: >> Hi Daniel and Shiva ! >> >> On Fri, 7 Jul 2023 08:09:47 -0300 >> Daniel Henrique Barboza wrote: >> >>> This one was a buzzer shot. >>> >> >> Indeed ! :-) I would have appreciated some more time to re-assess >> my R-b tag on this 2 year old bug though ;-) > > My bad! I never thought it was that old. Never occured to me to check > when > the previous version was sent. > > Folks, please bear in mind that a Reviewed-by is given on the context > when the > patch was sent. A handful of months? Keep the R-bs. 6 months, from one > release > to the other? Things starts to get a little murky. 2 years? hahaha c'mon Apologies, since v5 didn't need any rework I retained the Reviewed-bys. I agree, I should have been explicit in changelog about how old it is. > At the very least you need to point out that the acks are old. > > >> >> My concerns were that the DAWR1 spapr cap was still not enabled by >> default but I guess it is because POWER9 is still the default cpu >> type. Related, the apply function should probably spit a warning >> with TCG instead of failing, like already done for some other >> TCG limitations (e.g. cap_safe_bounds_check_apply()). This will >> be needed for `make test` to succeed when DAWR1 is eventually >> enabled by default. Not needed right now. >> Thanks Greg, I will convert the errors to warnings for DAWR1 caps checks in the next version. However, I dont see any new "make test" failures with the patch. Here are the logs "make test", With patch - https://gist.github.com/shivaprasadbhat/859f7f4a0c105ac1232b7ab5d8e161e8#file-gistfile1-txt Without patch - https://gist.github.com/shivaprasadbhat/25e5db9254cbe3292017f16adf41ecc1#file-gistfile1-txt >> My R-b still stands then ! :-) > > This patch got lucky then. If you/Cedric remove your acks I would > simply drop the > patch and re-send the PR with the greatest of ease, no remorse > whatsoever. > > > Thanks, > > Daniel > >> >> Cheers, >> >> -- >> Greg >> >>> >>> Queued in gitlab.com/danielhb/qemu/tree/ppc-next. Thanks, >>> >>> >>> Daniel >>> >>> >>> On 7/7/23 05:47, Shivaprasad G Bhat wrote: >>>> From: Ravi Bangoria >>>> >>>> As per the PAPR, bit 0 of byte 64 in pa-features property >>>> indicates availability of 2nd DAWR registers. i.e. If this bit is >>>> set, 2nd >>>> DAWR is present, otherwise not. Use KVM_CAP_PPC_DAWR1 capability to >>>> find >>>> whether kvm supports 2nd DAWR or not. If it's supported, allow user >>>> to set >>>> the pa-feature bit in guest DT using cap-dawr1 machine capability. >>>> Though, >>>> watchpoint on powerpc TCG guest is not supported and thus 2nd DAWR >>>> is not >>>> enabled for TCG mode. >>>> >>>> Signed-off-by: Ravi Bangoria >>>> Reviewed-by: Greg Kurz >>>> Reviewed-by: Cédric Le Goater >>>> Signed-off-by: Shivaprasad G Bhat >>>> --- >>>> Changelog: >>>> v5: >>>> https://lore.kernel.org/all/20210412114433.129702-1-ravi.bangoria@linux.ibm.com/ >>>> v5->v6: >>>>     - The other patches in the original series already merged. >>>>     - Rebased to the top of the tree. So, the >>>> gen_spr_book3s_310_dbg() is renamed >>>>       to register_book3s_310_dbg_sprs() and moved to cpu_init.c >>>> accordingly. >>>>     - No functional changes. >>>> >>>> v4: >>>> https://lore.kernel.org/r/20210406053833.282907-1-ravi.bangoria@linux.ibm.com >>>> v3->v4: >>>>     - Make error message more proper. >>>> >>>> v3: >>>> https://lore.kernel.org/r/20210330095350.36309-1-ravi.bangoria@linux.ibm.com >>>> v3->v4: >>>>     - spapr_dt_pa_features(): POWER10 processor is compatible with 3.0 >>>>       (PCR_COMPAT_3_00). No need to ppc_check_compat(3_10) for now as >>>>       ppc_check_compati(3_00) will also be true. >>>> ppc_check_compat(3_10) >>>>       can be added while introducing pa_features_310 in future. >>>>     - Use error_append_hint() for hints. Also add ERRP_GUARD(). >>>>     - Add kvmppc_set_cap_dawr1() stub function for CONFIG_KVM=n. >>>> >>>> v2: >>>> https://lore.kernel.org/r/20210329041906.213991-1-ravi.bangoria@linux.ibm.com >>>> v2->v3: >>>>     - Don't introduce pa_features_310[], instead, reuse >>>> pa_features_300[] >>>>       for 3.1 guests, as there is no difference between initial >>>> values of >>>>       them atm. >>>>     - Call gen_spr_book3s_310_dbg() from init_proc_POWER10() >>>> instead of >>>>       init_proc_POWER8(). Also, Don't call gen_spr_book3s_207_dbg() >>>> from >>>>       gen_spr_book3s_310_dbg() as init_proc_POWER10() already calls >>>> it. >>>> >>>> v1: >>>> https://lore.kernel.org/r/20200723104220.314671-1-ravi.bangoria@linux.ibm.com >>>> v1->v2: >>>>     - Introduce machine capability cap-dawr1 to enable/disable >>>>       the feature. By default, 2nd DAWR is OFF for guests even >>>>       when host kvm supports it. User has to manually enable it >>>>       with -machine cap-dawr1=on if he wishes to use it. >>>>     - Split the header file changes into separate patch. (Sync >>>>       headers from v5.12-rc3) >>>> >>>> [1] https://git.kernel.org/torvalds/c/bd1de1a0e6eff >>>> >>>>    hw/ppc/spapr.c         |    7 ++++++- >>>>    hw/ppc/spapr_caps.c    |   32 ++++++++++++++++++++++++++++++++ >>>>    include/hw/ppc/spapr.h |    6 +++++- >>>>    target/ppc/cpu.h       |    2 ++ >>>>    target/ppc/cpu_init.c  |   15 +++++++++++++++ >>>>    target/ppc/kvm.c       |   12 ++++++++++++ >>>>    target/ppc/kvm_ppc.h   |   12 ++++++++++++ >>>>    7 files changed, 84 insertions(+), 2 deletions(-) >>>> >>>> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c >>>> index 54dbfd7fe9..1e54e0c719 100644 >>>> --- a/hw/ppc/spapr.c >>>> +++ b/hw/ppc/spapr.c >>>> @@ -241,7 +241,7 @@ static void >>>> spapr_dt_pa_features(SpaprMachineState *spapr, >>>>            0x80, 0x00, 0x80, 0x00, 0x80, 0x00, /* 48 - 53 */ >>>>            /* 54: DecFP, 56: DecI, 58: SHA */ >>>>            0x80, 0x00, 0x80, 0x00, 0x80, 0x00, /* 54 - 59 */ >>>> -        /* 60: NM atomic, 62: RNG */ >>>> +        /* 60: NM atomic, 62: RNG, 64: DAWR1 (ISA 3.1) */ >>>>            0x80, 0x00, 0x80, 0x00, 0x00, 0x00, /* 60 - 65 */ >>>>        }; >>>>        uint8_t *pa_features = NULL; >>>> @@ -282,6 +282,9 @@ static void >>>> spapr_dt_pa_features(SpaprMachineState *spapr, >>>>             * in pa-features. So hide it from them. */ >>>>            pa_features[40 + 2] &= ~0x80; /* Radix MMU */ >>>>        } >>>> +    if (spapr_get_cap(spapr, SPAPR_CAP_DAWR1)) { >>>> +        pa_features[66] |= 0x80; >>>> +    } >>>> >>>>        _FDT((fdt_setprop(fdt, offset, "ibm,pa-features", >>>> pa_features, pa_size))); >>>>    } >>>> @@ -2084,6 +2087,7 @@ static const VMStateDescription vmstate_spapr >>>> = { >>>>            &vmstate_spapr_cap_fwnmi, >>>>            &vmstate_spapr_fwnmi, >>>>            &vmstate_spapr_cap_rpt_invalidate, >>>> +        &vmstate_spapr_cap_dawr1, >>>>            NULL >>>>        } >>>>    }; >>>> @@ -4683,6 +4687,7 @@ static void >>>> spapr_machine_class_init(ObjectClass *oc, void *data) >>>>        smc->default_caps.caps[SPAPR_CAP_CCF_ASSIST] = SPAPR_CAP_ON; >>>>        smc->default_caps.caps[SPAPR_CAP_FWNMI] = SPAPR_CAP_ON; >>>>        smc->default_caps.caps[SPAPR_CAP_RPT_INVALIDATE] = >>>> SPAPR_CAP_OFF; >>>> +    smc->default_caps.caps[SPAPR_CAP_DAWR1] = SPAPR_CAP_OFF; >>>> >>>>        /* >>>>         * This cap specifies whether the AIL 3 mode for >>>> diff --git a/hw/ppc/spapr_caps.c b/hw/ppc/spapr_caps.c >>>> index 5a0755d34f..2f2cf4a250 100644 >>>> --- a/hw/ppc/spapr_caps.c >>>> +++ b/hw/ppc/spapr_caps.c >>>> @@ -655,6 +655,28 @@ static void >>>> cap_ail_mode_3_apply(SpaprMachineState *spapr, >>>>        } >>>>    } >>>> >>>> +static void cap_dawr1_apply(SpaprMachineState *spapr, uint8_t val, >>>> +                               Error **errp) >>>> +{ >>>> +    ERRP_GUARD(); >>>> +    if (!val) { >>>> +        return; /* Disable by default */ >>>> +    } >>>> + >>>> +    if (tcg_enabled()) { >>>> +        error_setg(errp, "DAWR1 not supported in TCG."); >>>> +        error_append_hint(errp, "Try appending -machine >>>> cap-dawr1=off\n"); >>>> +    } else if (kvm_enabled()) { >>>> +        if (!kvmppc_has_cap_dawr1()) { >>>> +            error_setg(errp, "DAWR1 not supported by KVM."); >>>> +            error_append_hint(errp, "Try appending -machine >>>> cap-dawr1=off\n"); >>>> +        } else if (kvmppc_set_cap_dawr1(val) < 0) { >>>> +            error_setg(errp, "Error enabling cap-dawr1 with KVM."); >>>> +            error_append_hint(errp, "Try appending -machine >>>> cap-dawr1=off\n"); >>>> +        } >>>> +    } >>>> +} >>>> + >>>>    SpaprCapabilityInfo capability_table[SPAPR_CAP_NUM] = { >>>>        [SPAPR_CAP_HTM] = { >>>>            .name = "htm", >>>> @@ -781,6 +803,15 @@ SpaprCapabilityInfo >>>> capability_table[SPAPR_CAP_NUM] = { >>>>            .type = "bool", >>>>            .apply = cap_ail_mode_3_apply, >>>>        }, >>>> +    [SPAPR_CAP_DAWR1] = { >>>> +        .name = "dawr1", >>>> +        .description = "Allow 2nd Data Address Watchpoint Register >>>> (DAWR1)", >>>> +        .index = SPAPR_CAP_DAWR1, >>>> +        .get = spapr_cap_get_bool, >>>> +        .set = spapr_cap_set_bool, >>>> +        .type = "bool", >>>> +        .apply = cap_dawr1_apply, >>>> +    }, >>>>    }; >>>> >>>>    static SpaprCapabilities default_caps_with_cpu(SpaprMachineState >>>> *spapr, >>>> @@ -923,6 +954,7 @@ SPAPR_CAP_MIG_STATE(large_decr, >>>> SPAPR_CAP_LARGE_DECREMENTER); >>>>    SPAPR_CAP_MIG_STATE(ccf_assist, SPAPR_CAP_CCF_ASSIST); >>>>    SPAPR_CAP_MIG_STATE(fwnmi, SPAPR_CAP_FWNMI); >>>>    SPAPR_CAP_MIG_STATE(rpt_invalidate, SPAPR_CAP_RPT_INVALIDATE); >>>> +SPAPR_CAP_MIG_STATE(dawr1, SPAPR_CAP_DAWR1); >>>> >>>>    void spapr_caps_init(SpaprMachineState *spapr) >>>>    { >>>> diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h >>>> index 538b2dfb89..47fffb921a 100644 >>>> --- a/include/hw/ppc/spapr.h >>>> +++ b/include/hw/ppc/spapr.h >>>> @@ -80,8 +80,10 @@ typedef enum { >>>>    #define SPAPR_CAP_RPT_INVALIDATE        0x0B >>>>    /* Support for AIL modes */ >>>>    #define SPAPR_CAP_AIL_MODE_3            0x0C >>>> +/* DAWR1 */ >>>> +#define SPAPR_CAP_DAWR1                 0x0D >>>>    /* Num Caps */ >>>> -#define SPAPR_CAP_NUM (SPAPR_CAP_AIL_MODE_3 + 1) >>>> +#define SPAPR_CAP_NUM                   (SPAPR_CAP_DAWR1 + 1) >>>> >>>>    /* >>>>     * Capability Values >>>> @@ -407,6 +409,7 @@ struct SpaprMachineState { >>>>    #define H_SET_MODE_RESOURCE_SET_DAWR0           2 >>>>    #define H_SET_MODE_RESOURCE_ADDR_TRANS_MODE     3 >>>>    #define H_SET_MODE_RESOURCE_LE                  4 >>>> +#define H_SET_MODE_RESOURCE_SET_DAWR1           5 >>>> >>>>    /* Flags for H_SET_MODE_RESOURCE_LE */ >>>>    #define H_SET_MODE_ENDIAN_BIG    0 >>>> @@ -990,6 +993,7 @@ extern const VMStateDescription >>>> vmstate_spapr_cap_ccf_assist; >>>>    extern const VMStateDescription vmstate_spapr_cap_fwnmi; >>>>    extern const VMStateDescription vmstate_spapr_cap_rpt_invalidate; >>>>    extern const VMStateDescription vmstate_spapr_wdt; >>>> +extern const VMStateDescription vmstate_spapr_cap_dawr1; >>>> >>>>    static inline uint8_t spapr_get_cap(SpaprMachineState *spapr, >>>> int cap) >>>>    { >>>> diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h >>>> index af12c93ebc..64855935f7 100644 >>>> --- a/target/ppc/cpu.h >>>> +++ b/target/ppc/cpu.h >>>> @@ -1588,9 +1588,11 @@ void ppc_compat_add_property(Object *obj, >>>> const char *name, >>>>    #define SPR_PSPB              (0x09F) >>>>    #define SPR_DPDES             (0x0B0) >>>>    #define SPR_DAWR0             (0x0B4) >>>> +#define SPR_DAWR1             (0x0B5) >>>>    #define SPR_RPR               (0x0BA) >>>>    #define SPR_CIABR             (0x0BB) >>>>    #define SPR_DAWRX0            (0x0BC) >>>> +#define SPR_DAWRX1            (0x0BD) >>>>    #define SPR_HFSCR             (0x0BE) >>>>    #define SPR_VRSAVE            (0x100) >>>>    #define SPR_USPRG0            (0x100) >>>> diff --git a/target/ppc/cpu_init.c b/target/ppc/cpu_init.c >>>> index aeff71d063..c688e52928 100644 >>>> --- a/target/ppc/cpu_init.c >>>> +++ b/target/ppc/cpu_init.c >>>> @@ -5131,6 +5131,20 @@ static void >>>> register_book3s_207_dbg_sprs(CPUPPCState *env) >>>>                            KVM_REG_PPC_CIABR, 0x00000000); >>>>    } >>>> >>>> +static void register_book3s_310_dbg_sprs(CPUPPCState *env) >>>> +{ >>>> +    spr_register_kvm_hv(env, SPR_DAWR1, "DAWR1", >>>> +                        SPR_NOACCESS, SPR_NOACCESS, >>>> +                        SPR_NOACCESS, SPR_NOACCESS, >>>> +                        &spr_read_generic, &spr_write_generic, >>>> +                        KVM_REG_PPC_DAWR1, 0x00000000); >>>> +    spr_register_kvm_hv(env, SPR_DAWRX1, "DAWRX1", >>>> +                        SPR_NOACCESS, SPR_NOACCESS, >>>> +                        SPR_NOACCESS, SPR_NOACCESS, >>>> +                        &spr_read_generic, &spr_write_generic32, >>>> +                        KVM_REG_PPC_DAWRX1, 0x00000000); >>>> +} >>>> + >>>>    static void register_970_dbg_sprs(CPUPPCState *env) >>>>    { >>>>        /* Breakpoints */ >>>> @@ -6435,6 +6449,7 @@ static void init_proc_POWER10(CPUPPCState *env) >>>>        /* Common Registers */ >>>>        init_proc_book3s_common(env); >>>>        register_book3s_207_dbg_sprs(env); >>>> +    register_book3s_310_dbg_sprs(env); >>>> >>>>        /* Common TCG PMU */ >>>>        init_tcg_pmu_power8(env); >>>> diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c >>>> index a8a935e267..05f68d2d91 100644 >>>> --- a/target/ppc/kvm.c >>>> +++ b/target/ppc/kvm.c >>>> @@ -89,6 +89,7 @@ static int cap_large_decr; >>>>    static int cap_fwnmi; >>>>    static int cap_rpt_invalidate; >>>>    static int cap_ail_mode_3; >>>> +static int cap_dawr1; >>>> >>>>    static uint32_t debug_inst_opcode; >>>> >>>> @@ -138,6 +139,7 @@ int kvm_arch_init(MachineState *ms, KVMState *s) >>>>        cap_ppc_nested_kvm_hv = kvm_vm_check_extension(s, >>>> KVM_CAP_PPC_NESTED_HV); >>>>        cap_large_decr = kvmppc_get_dec_bits(); >>>>        cap_fwnmi = kvm_vm_check_extension(s, KVM_CAP_PPC_FWNMI); >>>> +    cap_dawr1 = kvm_vm_check_extension(s, KVM_CAP_PPC_DAWR1); >>>>        /* >>>>         * Note: setting it to false because there is not such >>>> capability >>>>         * in KVM at this moment. >>>> @@ -2109,6 +2111,16 @@ int kvmppc_set_fwnmi(PowerPCCPU *cpu) >>>>        return kvm_vcpu_enable_cap(cs, KVM_CAP_PPC_FWNMI, 0); >>>>    } >>>> >>>> +bool kvmppc_has_cap_dawr1(void) >>>> +{ >>>> +    return !!cap_dawr1; >>>> +} >>>> + >>>> +int kvmppc_set_cap_dawr1(int enable) >>>> +{ >>>> +    return kvm_vm_enable_cap(kvm_state, KVM_CAP_PPC_DAWR1, 0, >>>> enable); >>>> +} >>>> + >>>>    int kvmppc_smt_threads(void) >>>>    { >>>>        return cap_ppc_smt ? cap_ppc_smt : 1; >>>> diff --git a/target/ppc/kvm_ppc.h b/target/ppc/kvm_ppc.h >>>> index 611debc3ce..584916a6d1 100644 >>>> --- a/target/ppc/kvm_ppc.h >>>> +++ b/target/ppc/kvm_ppc.h >>>> @@ -67,6 +67,8 @@ bool kvmppc_has_cap_htm(void); >>>>    bool kvmppc_has_cap_mmu_radix(void); >>>>    bool kvmppc_has_cap_mmu_hash_v3(void); >>>>    bool kvmppc_has_cap_xive(void); >>>> +bool kvmppc_has_cap_dawr1(void); >>>> +int kvmppc_set_cap_dawr1(int enable); >>>>    int kvmppc_get_cap_safe_cache(void); >>>>    int kvmppc_get_cap_safe_bounds_check(void); >>>>    int kvmppc_get_cap_safe_indirect_branch(void); >>>> @@ -352,6 +354,16 @@ static inline bool kvmppc_has_cap_xive(void) >>>>        return false; >>>>    } >>>> >>>> +static inline bool kvmppc_has_cap_dawr1(void) >>>> +{ >>>> +    return false; >>>> +} >>>> + >>>> +static inline int kvmppc_set_cap_dawr1(int enable) >>>> +{ >>>> +    abort(); >>>> +} >>>> + >>>>    static inline int kvmppc_get_cap_safe_cache(void) >>>>    { >>>>        return 0; >>>> >>>> >> >> >>