ppc: spapr: Introduce FWNMI capability
Introduce fwnmi an spapr capability and add a helper function which tries to enable it, which would be used by following patch of the series. This patch by itself does not change the existing behavior. Signed-off-by: Aravinda Prasad <arawinda.p@gmail.com> [eliminate cap_ppc_fwnmi, add fwnmi cap to migration state and reprhase the commit message] Signed-off-by: Ganesh Goudar <ganeshgr@linux.ibm.com> Reviewed-by: David Gibson <david@gibson.dropbear.id.au> Message-Id: <20200130184423.20519-3-ganeshgr@linux.ibm.com> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
parent
19e067e032
commit
9d953ce447
@ -1992,6 +1992,7 @@ static const VMStateDescription vmstate_spapr = {
|
|||||||
&vmstate_spapr_dtb,
|
&vmstate_spapr_dtb,
|
||||||
&vmstate_spapr_cap_large_decr,
|
&vmstate_spapr_cap_large_decr,
|
||||||
&vmstate_spapr_cap_ccf_assist,
|
&vmstate_spapr_cap_ccf_assist,
|
||||||
|
&vmstate_spapr_cap_fwnmi,
|
||||||
NULL
|
NULL
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@ -4398,6 +4399,7 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data)
|
|||||||
smc->default_caps.caps[SPAPR_CAP_NESTED_KVM_HV] = SPAPR_CAP_OFF;
|
smc->default_caps.caps[SPAPR_CAP_NESTED_KVM_HV] = SPAPR_CAP_OFF;
|
||||||
smc->default_caps.caps[SPAPR_CAP_LARGE_DECREMENTER] = SPAPR_CAP_ON;
|
smc->default_caps.caps[SPAPR_CAP_LARGE_DECREMENTER] = SPAPR_CAP_ON;
|
||||||
smc->default_caps.caps[SPAPR_CAP_CCF_ASSIST] = SPAPR_CAP_ON;
|
smc->default_caps.caps[SPAPR_CAP_CCF_ASSIST] = SPAPR_CAP_ON;
|
||||||
|
smc->default_caps.caps[SPAPR_CAP_FWNMI_MCE] = SPAPR_CAP_OFF;
|
||||||
spapr_caps_add_properties(smc, &error_abort);
|
spapr_caps_add_properties(smc, &error_abort);
|
||||||
smc->irq = &spapr_irq_dual;
|
smc->irq = &spapr_irq_dual;
|
||||||
smc->dr_phb_enabled = true;
|
smc->dr_phb_enabled = true;
|
||||||
|
@ -509,6 +509,14 @@ static void cap_ccf_assist_apply(SpaprMachineState *spapr, uint8_t val,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void cap_fwnmi_mce_apply(SpaprMachineState *spapr, uint8_t val,
|
||||||
|
Error **errp)
|
||||||
|
{
|
||||||
|
if (!val) {
|
||||||
|
return; /* Disabled by default */
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
SpaprCapabilityInfo capability_table[SPAPR_CAP_NUM] = {
|
SpaprCapabilityInfo capability_table[SPAPR_CAP_NUM] = {
|
||||||
[SPAPR_CAP_HTM] = {
|
[SPAPR_CAP_HTM] = {
|
||||||
.name = "htm",
|
.name = "htm",
|
||||||
@ -608,6 +616,15 @@ SpaprCapabilityInfo capability_table[SPAPR_CAP_NUM] = {
|
|||||||
.type = "bool",
|
.type = "bool",
|
||||||
.apply = cap_ccf_assist_apply,
|
.apply = cap_ccf_assist_apply,
|
||||||
},
|
},
|
||||||
|
[SPAPR_CAP_FWNMI_MCE] = {
|
||||||
|
.name = "fwnmi-mce",
|
||||||
|
.description = "Handle fwnmi machine check exceptions",
|
||||||
|
.index = SPAPR_CAP_FWNMI_MCE,
|
||||||
|
.get = spapr_cap_get_bool,
|
||||||
|
.set = spapr_cap_set_bool,
|
||||||
|
.type = "bool",
|
||||||
|
.apply = cap_fwnmi_mce_apply,
|
||||||
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
static SpaprCapabilities default_caps_with_cpu(SpaprMachineState *spapr,
|
static SpaprCapabilities default_caps_with_cpu(SpaprMachineState *spapr,
|
||||||
@ -747,6 +764,7 @@ SPAPR_CAP_MIG_STATE(hpt_maxpagesize, SPAPR_CAP_HPT_MAXPAGESIZE);
|
|||||||
SPAPR_CAP_MIG_STATE(nested_kvm_hv, SPAPR_CAP_NESTED_KVM_HV);
|
SPAPR_CAP_MIG_STATE(nested_kvm_hv, SPAPR_CAP_NESTED_KVM_HV);
|
||||||
SPAPR_CAP_MIG_STATE(large_decr, SPAPR_CAP_LARGE_DECREMENTER);
|
SPAPR_CAP_MIG_STATE(large_decr, SPAPR_CAP_LARGE_DECREMENTER);
|
||||||
SPAPR_CAP_MIG_STATE(ccf_assist, SPAPR_CAP_CCF_ASSIST);
|
SPAPR_CAP_MIG_STATE(ccf_assist, SPAPR_CAP_CCF_ASSIST);
|
||||||
|
SPAPR_CAP_MIG_STATE(fwnmi, SPAPR_CAP_FWNMI_MCE);
|
||||||
|
|
||||||
void spapr_caps_init(SpaprMachineState *spapr)
|
void spapr_caps_init(SpaprMachineState *spapr)
|
||||||
{
|
{
|
||||||
|
@ -79,8 +79,10 @@ typedef enum {
|
|||||||
#define SPAPR_CAP_LARGE_DECREMENTER 0x08
|
#define SPAPR_CAP_LARGE_DECREMENTER 0x08
|
||||||
/* Count Cache Flush Assist HW Instruction */
|
/* Count Cache Flush Assist HW Instruction */
|
||||||
#define SPAPR_CAP_CCF_ASSIST 0x09
|
#define SPAPR_CAP_CCF_ASSIST 0x09
|
||||||
|
/* FWNMI machine check handling */
|
||||||
|
#define SPAPR_CAP_FWNMI_MCE 0x0A
|
||||||
/* Num Caps */
|
/* Num Caps */
|
||||||
#define SPAPR_CAP_NUM (SPAPR_CAP_CCF_ASSIST + 1)
|
#define SPAPR_CAP_NUM (SPAPR_CAP_FWNMI_MCE + 1)
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Capability Values
|
* Capability Values
|
||||||
@ -869,6 +871,7 @@ extern const VMStateDescription vmstate_spapr_cap_hpt_maxpagesize;
|
|||||||
extern const VMStateDescription vmstate_spapr_cap_nested_kvm_hv;
|
extern const VMStateDescription vmstate_spapr_cap_nested_kvm_hv;
|
||||||
extern const VMStateDescription vmstate_spapr_cap_large_decr;
|
extern const VMStateDescription vmstate_spapr_cap_large_decr;
|
||||||
extern const VMStateDescription vmstate_spapr_cap_ccf_assist;
|
extern const VMStateDescription vmstate_spapr_cap_ccf_assist;
|
||||||
|
extern const VMStateDescription vmstate_spapr_cap_fwnmi;
|
||||||
|
|
||||||
static inline uint8_t spapr_get_cap(SpaprMachineState *spapr, int cap)
|
static inline uint8_t spapr_get_cap(SpaprMachineState *spapr, int cap)
|
||||||
{
|
{
|
||||||
|
@ -2057,6 +2057,14 @@ void kvmppc_set_mpic_proxy(PowerPCCPU *cpu, int mpic_proxy)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int kvmppc_set_fwnmi(void)
|
||||||
|
{
|
||||||
|
PowerPCCPU *cpu = POWERPC_CPU(first_cpu);
|
||||||
|
CPUState *cs = CPU(cpu);
|
||||||
|
|
||||||
|
return kvm_vcpu_enable_cap(cs, KVM_CAP_PPC_FWNMI, 0);
|
||||||
|
}
|
||||||
|
|
||||||
int kvmppc_smt_threads(void)
|
int kvmppc_smt_threads(void)
|
||||||
{
|
{
|
||||||
return cap_ppc_smt ? cap_ppc_smt : 1;
|
return cap_ppc_smt ? cap_ppc_smt : 1;
|
||||||
|
@ -27,6 +27,7 @@ void kvmppc_enable_h_page_init(void);
|
|||||||
void kvmppc_set_papr(PowerPCCPU *cpu);
|
void kvmppc_set_papr(PowerPCCPU *cpu);
|
||||||
int kvmppc_set_compat(PowerPCCPU *cpu, uint32_t compat_pvr);
|
int kvmppc_set_compat(PowerPCCPU *cpu, uint32_t compat_pvr);
|
||||||
void kvmppc_set_mpic_proxy(PowerPCCPU *cpu, int mpic_proxy);
|
void kvmppc_set_mpic_proxy(PowerPCCPU *cpu, int mpic_proxy);
|
||||||
|
int kvmppc_set_fwnmi(void);
|
||||||
int kvmppc_smt_threads(void);
|
int kvmppc_smt_threads(void);
|
||||||
void kvmppc_error_append_smt_possible_hint(Error *const *errp);
|
void kvmppc_error_append_smt_possible_hint(Error *const *errp);
|
||||||
int kvmppc_set_smt_threads(int smt);
|
int kvmppc_set_smt_threads(int smt);
|
||||||
@ -160,6 +161,11 @@ static inline void kvmppc_set_mpic_proxy(PowerPCCPU *cpu, int mpic_proxy)
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static inline int kvmppc_set_fwnmi(void)
|
||||||
|
{
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
static inline int kvmppc_smt_threads(void)
|
static inline int kvmppc_smt_threads(void)
|
||||||
{
|
{
|
||||||
return 1;
|
return 1;
|
||||||
|
Loading…
Reference in New Issue
Block a user