s390x/kvm: generalize SIGP stop and restart interrupt injection
Preparation for factoring it out into !kvm code. Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Signed-off-by: David Hildenbrand <david@redhat.com> Message-Id: <20170928203708.9376-13-david@redhat.com> Signed-off-by: Cornelia Huck <cohuck@redhat.com>
This commit is contained in:
parent
27292ff18d
commit
eabcea18f8
|
@ -369,6 +369,8 @@ bool s390_cpu_has_io_int(S390CPU *cpu);
|
||||||
bool s390_cpu_has_ext_int(S390CPU *cpu);
|
bool s390_cpu_has_ext_int(S390CPU *cpu);
|
||||||
bool s390_cpu_has_mcck_int(S390CPU *cpu);
|
bool s390_cpu_has_mcck_int(S390CPU *cpu);
|
||||||
bool s390_cpu_has_int(S390CPU *cpu);
|
bool s390_cpu_has_int(S390CPU *cpu);
|
||||||
|
void cpu_inject_restart(S390CPU *cpu);
|
||||||
|
void cpu_inject_stop(S390CPU *cpu);
|
||||||
|
|
||||||
|
|
||||||
/* ioinst.c */
|
/* ioinst.c */
|
||||||
|
|
|
@ -107,6 +107,26 @@ int cpu_inject_external_call(S390CPU *cpu, uint16_t src_cpu_addr)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void cpu_inject_restart(S390CPU *cpu)
|
||||||
|
{
|
||||||
|
if (kvm_enabled()) {
|
||||||
|
kvm_s390_restart_interrupt(cpu);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
/* FIXME TCG */
|
||||||
|
g_assert_not_reached();
|
||||||
|
}
|
||||||
|
|
||||||
|
void cpu_inject_stop(S390CPU *cpu)
|
||||||
|
{
|
||||||
|
if (kvm_enabled()) {
|
||||||
|
kvm_s390_stop_interrupt(cpu);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
/* FIXME TCG */
|
||||||
|
g_assert_not_reached();
|
||||||
|
}
|
||||||
|
|
||||||
static void cpu_inject_io(S390CPU *cpu, uint16_t subchannel_id,
|
static void cpu_inject_io(S390CPU *cpu, uint16_t subchannel_id,
|
||||||
uint16_t subchannel_number,
|
uint16_t subchannel_number,
|
||||||
uint32_t io_int_parm, uint32_t io_int_word)
|
uint32_t io_int_parm, uint32_t io_int_word)
|
||||||
|
|
|
@ -119,3 +119,11 @@ int kvm_s390_set_mem_limit(uint64_t new_limit, uint64_t *hw_limit)
|
||||||
void kvm_s390_crypto_reset(void)
|
void kvm_s390_crypto_reset(void)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void kvm_s390_stop_interrupt(S390CPU *cpu)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
void kvm_s390_restart_interrupt(S390CPU *cpu)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
|
@ -1539,9 +1539,6 @@ static void sigp_stop(CPUState *cs, run_on_cpu_data arg)
|
||||||
{
|
{
|
||||||
S390CPU *cpu = S390_CPU(cs);
|
S390CPU *cpu = S390_CPU(cs);
|
||||||
SigpInfo *si = arg.host_ptr;
|
SigpInfo *si = arg.host_ptr;
|
||||||
struct kvm_s390_irq irq = {
|
|
||||||
.type = KVM_S390_SIGP_STOP,
|
|
||||||
};
|
|
||||||
|
|
||||||
if (s390_cpu_get_state(cpu) != CPU_STATE_OPERATING) {
|
if (s390_cpu_get_state(cpu) != CPU_STATE_OPERATING) {
|
||||||
si->cc = SIGP_CC_ORDER_CODE_ACCEPTED;
|
si->cc = SIGP_CC_ORDER_CODE_ACCEPTED;
|
||||||
|
@ -1554,7 +1551,7 @@ static void sigp_stop(CPUState *cs, run_on_cpu_data arg)
|
||||||
} else {
|
} else {
|
||||||
/* execute the stop function */
|
/* execute the stop function */
|
||||||
cpu->env.sigp_order = SIGP_STOP;
|
cpu->env.sigp_order = SIGP_STOP;
|
||||||
kvm_s390_vcpu_interrupt(cpu, &irq);
|
cpu_inject_stop(cpu);
|
||||||
}
|
}
|
||||||
si->cc = SIGP_CC_ORDER_CODE_ACCEPTED;
|
si->cc = SIGP_CC_ORDER_CODE_ACCEPTED;
|
||||||
}
|
}
|
||||||
|
@ -1653,9 +1650,6 @@ static void sigp_stop_and_store_status(CPUState *cs, run_on_cpu_data arg)
|
||||||
{
|
{
|
||||||
S390CPU *cpu = S390_CPU(cs);
|
S390CPU *cpu = S390_CPU(cs);
|
||||||
SigpInfo *si = arg.host_ptr;
|
SigpInfo *si = arg.host_ptr;
|
||||||
struct kvm_s390_irq irq = {
|
|
||||||
.type = KVM_S390_SIGP_STOP,
|
|
||||||
};
|
|
||||||
|
|
||||||
/* disabled wait - sleeping in user space */
|
/* disabled wait - sleeping in user space */
|
||||||
if (s390_cpu_get_state(cpu) == CPU_STATE_OPERATING && cs->halted) {
|
if (s390_cpu_get_state(cpu) == CPU_STATE_OPERATING && cs->halted) {
|
||||||
|
@ -1665,7 +1659,7 @@ static void sigp_stop_and_store_status(CPUState *cs, run_on_cpu_data arg)
|
||||||
switch (s390_cpu_get_state(cpu)) {
|
switch (s390_cpu_get_state(cpu)) {
|
||||||
case CPU_STATE_OPERATING:
|
case CPU_STATE_OPERATING:
|
||||||
cpu->env.sigp_order = SIGP_STOP_STORE_STATUS;
|
cpu->env.sigp_order = SIGP_STOP_STORE_STATUS;
|
||||||
kvm_s390_vcpu_interrupt(cpu, &irq);
|
cpu_inject_stop(cpu);
|
||||||
/* store will be performed when handling the stop intercept */
|
/* store will be performed when handling the stop intercept */
|
||||||
break;
|
break;
|
||||||
case CPU_STATE_STOPPED:
|
case CPU_STATE_STOPPED:
|
||||||
|
@ -1755,9 +1749,6 @@ static void sigp_restart(CPUState *cs, run_on_cpu_data arg)
|
||||||
{
|
{
|
||||||
S390CPU *cpu = S390_CPU(cs);
|
S390CPU *cpu = S390_CPU(cs);
|
||||||
SigpInfo *si = arg.host_ptr;
|
SigpInfo *si = arg.host_ptr;
|
||||||
struct kvm_s390_irq irq = {
|
|
||||||
.type = KVM_S390_RESTART,
|
|
||||||
};
|
|
||||||
|
|
||||||
switch (s390_cpu_get_state(cpu)) {
|
switch (s390_cpu_get_state(cpu)) {
|
||||||
case CPU_STATE_STOPPED:
|
case CPU_STATE_STOPPED:
|
||||||
|
@ -1767,7 +1758,7 @@ static void sigp_restart(CPUState *cs, run_on_cpu_data arg)
|
||||||
s390_cpu_set_state(CPU_STATE_OPERATING, cpu);
|
s390_cpu_set_state(CPU_STATE_OPERATING, cpu);
|
||||||
break;
|
break;
|
||||||
case CPU_STATE_OPERATING:
|
case CPU_STATE_OPERATING:
|
||||||
kvm_s390_vcpu_interrupt(cpu, &irq);
|
cpu_inject_restart(cpu);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
si->cc = SIGP_CC_ORDER_CODE_ACCEPTED;
|
si->cc = SIGP_CC_ORDER_CODE_ACCEPTED;
|
||||||
|
@ -2818,3 +2809,21 @@ void kvm_s390_apply_cpu_model(const S390CPUModel *model, Error **errp)
|
||||||
kvm_s390_enable_cmma();
|
kvm_s390_enable_cmma();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void kvm_s390_restart_interrupt(S390CPU *cpu)
|
||||||
|
{
|
||||||
|
struct kvm_s390_irq irq = {
|
||||||
|
.type = KVM_S390_RESTART,
|
||||||
|
};
|
||||||
|
|
||||||
|
kvm_s390_vcpu_interrupt(cpu, &irq);
|
||||||
|
}
|
||||||
|
|
||||||
|
void kvm_s390_stop_interrupt(S390CPU *cpu)
|
||||||
|
{
|
||||||
|
struct kvm_s390_irq irq = {
|
||||||
|
.type = KVM_S390_SIGP_STOP,
|
||||||
|
};
|
||||||
|
|
||||||
|
kvm_s390_vcpu_interrupt(cpu, &irq);
|
||||||
|
}
|
||||||
|
|
|
@ -42,6 +42,8 @@ void kvm_s390_cmma_reset(void);
|
||||||
void kvm_s390_reset_vcpu(S390CPU *cpu);
|
void kvm_s390_reset_vcpu(S390CPU *cpu);
|
||||||
int kvm_s390_set_mem_limit(uint64_t new_limit, uint64_t *hw_limit);
|
int kvm_s390_set_mem_limit(uint64_t new_limit, uint64_t *hw_limit);
|
||||||
void kvm_s390_crypto_reset(void);
|
void kvm_s390_crypto_reset(void);
|
||||||
|
void kvm_s390_restart_interrupt(S390CPU *cpu);
|
||||||
|
void kvm_s390_stop_interrupt(S390CPU *cpu);
|
||||||
|
|
||||||
/* implemented outside of target/s390x/ */
|
/* implemented outside of target/s390x/ */
|
||||||
int kvm_s390_inject_flic(struct kvm_s390_irq *irq);
|
int kvm_s390_inject_flic(struct kvm_s390_irq *irq);
|
||||||
|
|
Loading…
Reference in a new issue