Commit 89ba4565 authored by Nicholas Piggin's avatar Nicholas Piggin Committed by David Gibson
Browse files

ppc/spapr: Allow FWNMI on TCG 



There should no longer be a reason to prevent TCG providing FWNMI.
System Reset interrupts are generated to the guest with nmi monitor
command and H_SIGNAL_SYS_RESET. Machine Checks can not be injected
currently, but this could be implemented with the mce monitor cmd
similarly to i386.

Signed-off-by: default avatarNicholas Piggin <npiggin@gmail.com>
Message-Id: <20200316142613.121089-6-npiggin@gmail.com>
Reviewed-by: default avatarCédric Le Goater <clg@kaod.org>
Reviewed-by: default avatarGreg Kurz <groug@kaod.org>
[dwg: Re-enable FWNMI in qtests, since that now works]
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent ad77c6ca

hw/ppc/spapr_caps.c

+1 −4
Original line number Diff line number Diff line
@@ -516,10 +516,7 @@ static void cap_fwnmi_apply(SpaprMachineState *spapr, uint8_t val, 
        return; /* Disabled by default */

    }



    if (tcg_enabled()) {

        warn_report("Firmware Assisted Non-Maskable Interrupts(FWNMI) not "

                    "supported in TCG");

    } else if (kvm_enabled()) {

    if (kvm_enabled()) {

        if (kvmppc_set_fwnmi() < 0) {

            error_setg(errp, "Firmware Assisted Non-Maskable Interrupts(FWNMI) "

                             "not supported by KVM");

tests/qtest/libqos/libqos-spapr.h

+1 −2
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ void qtest_spapr_shutdown(QOSState *qs); 
    "cap-cfpc=broken,"                           \

    "cap-sbbc=broken,"                           \

    "cap-ibs=broken,"                            \

    "cap-ccf-assist=off,"                        \

    "cap-fwnmi=off"

    "cap-ccf-assist=off,"



#endif