提交 9dec2388 编写于 作者: D David Hildenbrand 提交者: Cornelia Huck

s390x/tcg: take care of external interrupt subclasses

We can now let go of INTERRUPT_EXT. When cr0 changes, we have to
revalidate if we now have a pending external interrupt, just like
when the PSW (or SYSTEM MASK only) changes.
Signed-off-by: NDavid Hildenbrand <david@redhat.com>
Message-Id: <20170928203708.9376-6-david@redhat.com>
Reviewed-by: NRichard Henderson <richard.henderson@linaro.org>
Signed-off-by: NCornelia Huck <cohuck@redhat.com>
上级 8417f904
...@@ -345,6 +345,11 @@ extern const struct VMStateDescription vmstate_s390_cpu; ...@@ -345,6 +345,11 @@ extern const struct VMStateDescription vmstate_s390_cpu;
#define CR0_LOWPROT 0x0000000010000000ULL #define CR0_LOWPROT 0x0000000010000000ULL
#define CR0_SECONDARY 0x0000000004000000ULL #define CR0_SECONDARY 0x0000000004000000ULL
#define CR0_EDAT 0x0000000000800000ULL #define CR0_EDAT 0x0000000000800000ULL
#define CR0_EMERGENCY_SIGNAL_SC 0x0000000000004000ULL
#define CR0_EXTERNAL_CALL_SC 0x0000000000002000ULL
#define CR0_CKC_SC 0x0000000000000800ULL
#define CR0_CPU_TIMER_SC 0x0000000000000400ULL
#define CR0_SERVICE_SC 0x0000000000000200ULL
/* MMU */ /* MMU */
#define MMU_PRIMARY_IDX 0 #define MMU_PRIMARY_IDX 0
...@@ -405,11 +410,6 @@ static inline void cpu_get_tb_cpu_state(CPUS390XState* env, target_ulong *pc, ...@@ -405,11 +410,6 @@ static inline void cpu_get_tb_cpu_state(CPUS390XState* env, target_ulong *pc,
#define INTERRUPT_EXT_CLOCK_COMPARATOR (1 << 4) #define INTERRUPT_EXT_CLOCK_COMPARATOR (1 << 4)
#define INTERRUPT_EXTERNAL_CALL (1 << 5) #define INTERRUPT_EXTERNAL_CALL (1 << 5)
#define INTERRUPT_EMERGENCY_SIGNAL (1 << 6) #define INTERRUPT_EMERGENCY_SIGNAL (1 << 6)
#define INTERRUPT_EXT (INTERRUPT_EXT_SERVICE | \
INTERRUPT_EXT_CPU_TIMER | \
INTERRUPT_EXT_CLOCK_COMPARATOR | \
INTERRUPT_EXTERNAL_CALL | \
INTERRUPT_EMERGENCY_SIGNAL)
/* Program Status Word. */ /* Program Status Word. */
#define S390_PSWM_REGNUM 0 #define S390_PSWM_REGNUM 0
......
...@@ -249,7 +249,8 @@ static void do_ext_interrupt(CPUS390XState *env) ...@@ -249,7 +249,8 @@ static void do_ext_interrupt(CPUS390XState *env)
lowcore = cpu_map_lowcore(env); lowcore = cpu_map_lowcore(env);
if (env->pending_int & INTERRUPT_EMERGENCY_SIGNAL) { if ((env->pending_int & INTERRUPT_EMERGENCY_SIGNAL) &&
(env->cregs[0] & CR0_EMERGENCY_SIGNAL_SC)) {
lowcore->ext_int_code = cpu_to_be16(EXT_EMERGENCY); lowcore->ext_int_code = cpu_to_be16(EXT_EMERGENCY);
cpu_addr = find_first_bit(env->emergency_signals, S390_MAX_CPUS); cpu_addr = find_first_bit(env->emergency_signals, S390_MAX_CPUS);
g_assert(cpu_addr < S390_MAX_CPUS); g_assert(cpu_addr < S390_MAX_CPUS);
...@@ -258,19 +259,23 @@ static void do_ext_interrupt(CPUS390XState *env) ...@@ -258,19 +259,23 @@ static void do_ext_interrupt(CPUS390XState *env)
if (bitmap_empty(env->emergency_signals, max_cpus)) { if (bitmap_empty(env->emergency_signals, max_cpus)) {
env->pending_int &= ~INTERRUPT_EMERGENCY_SIGNAL; env->pending_int &= ~INTERRUPT_EMERGENCY_SIGNAL;
} }
} else if (env->pending_int & INTERRUPT_EXTERNAL_CALL) { } else if ((env->pending_int & INTERRUPT_EXTERNAL_CALL) &&
(env->cregs[0] & CR0_EXTERNAL_CALL_SC)) {
lowcore->ext_int_code = cpu_to_be16(EXT_EXTERNAL_CALL); lowcore->ext_int_code = cpu_to_be16(EXT_EXTERNAL_CALL);
lowcore->cpu_addr = cpu_to_be16(env->external_call_addr); lowcore->cpu_addr = cpu_to_be16(env->external_call_addr);
env->pending_int &= ~INTERRUPT_EXTERNAL_CALL; env->pending_int &= ~INTERRUPT_EXTERNAL_CALL;
} else if (env->pending_int & INTERRUPT_EXT_CLOCK_COMPARATOR) { } else if ((env->pending_int & INTERRUPT_EXT_CLOCK_COMPARATOR) &&
(env->cregs[0] & CR0_CKC_SC)) {
lowcore->ext_int_code = cpu_to_be16(EXT_CLOCK_COMP); lowcore->ext_int_code = cpu_to_be16(EXT_CLOCK_COMP);
lowcore->cpu_addr = 0; lowcore->cpu_addr = 0;
env->pending_int &= ~INTERRUPT_EXT_CLOCK_COMPARATOR; env->pending_int &= ~INTERRUPT_EXT_CLOCK_COMPARATOR;
} else if (env->pending_int & INTERRUPT_EXT_CPU_TIMER) { } else if ((env->pending_int & INTERRUPT_EXT_CPU_TIMER) &&
(env->cregs[0] & CR0_CPU_TIMER_SC)) {
lowcore->ext_int_code = cpu_to_be16(EXT_CPU_TIMER); lowcore->ext_int_code = cpu_to_be16(EXT_CPU_TIMER);
lowcore->cpu_addr = 0; lowcore->cpu_addr = 0;
env->pending_int &= ~INTERRUPT_EXT_CPU_TIMER; env->pending_int &= ~INTERRUPT_EXT_CPU_TIMER;
} else if (env->pending_int & INTERRUPT_EXT_SERVICE) { } else if ((env->pending_int & INTERRUPT_EXT_SERVICE) &&
(env->cregs[0] & CR0_SERVICE_SC)) {
/* /*
* FIXME: floating IRQs should be considered by all CPUs and * FIXME: floating IRQs should be considered by all CPUs and
* shuld not get cleared by CPU reset. * shuld not get cleared by CPU reset.
......
...@@ -209,7 +209,37 @@ bool s390_cpu_has_ext_int(S390CPU *cpu) ...@@ -209,7 +209,37 @@ bool s390_cpu_has_ext_int(S390CPU *cpu)
return false; return false;
} }
return env->pending_int & INTERRUPT_EXT; if ((env->pending_int & INTERRUPT_EMERGENCY_SIGNAL) &&
(env->cregs[0] & CR0_EMERGENCY_SIGNAL_SC)) {
return true;
}
if ((env->pending_int & INTERRUPT_EXTERNAL_CALL) &&
(env->cregs[0] & CR0_EXTERNAL_CALL_SC)) {
return true;
}
if ((env->pending_int & INTERRUPT_EXTERNAL_CALL) &&
(env->cregs[0] & CR0_EXTERNAL_CALL_SC)) {
return true;
}
if ((env->pending_int & INTERRUPT_EXT_CLOCK_COMPARATOR) &&
(env->cregs[0] & CR0_CKC_SC)) {
return true;
}
if ((env->pending_int & INTERRUPT_EXT_CPU_TIMER) &&
(env->cregs[0] & CR0_CPU_TIMER_SC)) {
return true;
}
if ((env->pending_int & INTERRUPT_EXT_SERVICE) &&
(env->cregs[0] & CR0_SERVICE_SC)) {
return true;
}
return false;
} }
bool s390_cpu_has_io_int(S390CPU *cpu) bool s390_cpu_has_io_int(S390CPU *cpu)
......
...@@ -2719,7 +2719,8 @@ static ExitStatus op_lctl(DisasContext *s, DisasOps *o) ...@@ -2719,7 +2719,8 @@ static ExitStatus op_lctl(DisasContext *s, DisasOps *o)
gen_helper_lctl(cpu_env, r1, o->in2, r3); gen_helper_lctl(cpu_env, r1, o->in2, r3);
tcg_temp_free_i32(r1); tcg_temp_free_i32(r1);
tcg_temp_free_i32(r3); tcg_temp_free_i32(r3);
return NO_EXIT; /* Exit to main loop to reevaluate s390_cpu_exec_interrupt. */
return EXIT_PC_STALE_NOCHAIN;
} }
static ExitStatus op_lctlg(DisasContext *s, DisasOps *o) static ExitStatus op_lctlg(DisasContext *s, DisasOps *o)
...@@ -2730,7 +2731,8 @@ static ExitStatus op_lctlg(DisasContext *s, DisasOps *o) ...@@ -2730,7 +2731,8 @@ static ExitStatus op_lctlg(DisasContext *s, DisasOps *o)
gen_helper_lctlg(cpu_env, r1, o->in2, r3); gen_helper_lctlg(cpu_env, r1, o->in2, r3);
tcg_temp_free_i32(r1); tcg_temp_free_i32(r1);
tcg_temp_free_i32(r3); tcg_temp_free_i32(r3);
return NO_EXIT; /* Exit to main loop to reevaluate s390_cpu_exec_interrupt. */
return EXIT_PC_STALE_NOCHAIN;
} }
static ExitStatus op_lra(DisasContext *s, DisasOps *o) static ExitStatus op_lra(DisasContext *s, DisasOps *o)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册