vitalif
/
mirror_qemu
mirror of https://github.com/proxmox/mirror_qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

s390x: introduce defines for SIGP condition codes 

This patch introduces defines for the SIGP condition codes and replaces all
occurrences of numeral condition codes with the new defines.

Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Jens Freimann <jfrei@linux.vnet.ibm.com>
Signed-off-by: David Hildenbrand <dahi@linux.vnet.ibm.com>
Message-Id: <1424783731-43426-2-git-send-email-jfrei@linux.vnet.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
master
David Hildenbrand 2015-02-24 14:15:22 +01:00 committed by Christian Borntraeger
parent 51628b1898
commit 5172b780c5
3 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
target-s390x/cpu.h
View File

@ -864,6 +864,7 @@ struct sysib_322 {
#define SK_F (0x1 << 3) #define SK_F (0x1 << 3)
#define SK_ACC_MASK (0xf << 4) #define SK_ACC_MASK (0xf << 4)
/* SIGP order codes */
#define SIGP_SENSE 0x01 #define SIGP_SENSE 0x01
#define SIGP_EXTERNAL_CALL 0x02 #define SIGP_EXTERNAL_CALL 0x02
#define SIGP_EMERGENCY 0x03 #define SIGP_EMERGENCY 0x03
@ -877,7 +878,13 @@ struct sysib_322 {
#define SIGP_STORE_STATUS_ADDR 0x0e #define SIGP_STORE_STATUS_ADDR 0x0e
#define SIGP_SET_ARCH 0x12 #define SIGP_SET_ARCH 0x12
/* cpu status bits */ /* SIGP condition codes */
#define SIGP_CC_ORDER_CODE_ACCEPTED 0
#define SIGP_CC_STATUS_STORED 1
#define SIGP_CC_BUSY 2
#define SIGP_CC_NOT_OPERATIONAL 3
/* SIGP status bits */
#define SIGP_STAT_EQUIPMENT_CHECK 0x80000000UL #define SIGP_STAT_EQUIPMENT_CHECK 0x80000000UL
#define SIGP_STAT_INCORRECT_STATE 0x00000200UL #define SIGP_STAT_INCORRECT_STATE 0x00000200UL
#define SIGP_STAT_INVALID_PARAMETER 0x00000100UL #define SIGP_STAT_INVALID_PARAMETER 0x00000100UL

14
target-s390x/kvm.c
View File

@ -1178,37 +1178,37 @@ static int handle_sigp(S390CPU *cpu, struct kvm_run *run, uint8_t ipa1)
cpu_addr = env->regs[ipa1 & 0x0f]; cpu_addr = env->regs[ipa1 & 0x0f];
target_cpu = s390_cpu_addr2state(cpu_addr); target_cpu = s390_cpu_addr2state(cpu_addr);
if (target_cpu == NULL) { if (target_cpu == NULL) {
cc = 3; /* not operational */ cc = SIGP_CC_NOT_OPERATIONAL;
goto out; goto out;
} }
switch (order_code) { switch (order_code) {
case SIGP_START: case SIGP_START:
run_on_cpu(CPU(target_cpu), sigp_cpu_start, CPU(target_cpu)); run_on_cpu(CPU(target_cpu), sigp_cpu_start, CPU(target_cpu));
cc = 0; cc = SIGP_CC_ORDER_CODE_ACCEPTED;
break; break;
case SIGP_RESTART: case SIGP_RESTART:
run_on_cpu(CPU(target_cpu), sigp_cpu_restart, CPU(target_cpu)); run_on_cpu(CPU(target_cpu), sigp_cpu_restart, CPU(target_cpu));
cc = 0; cc = SIGP_CC_ORDER_CODE_ACCEPTED;
break; break;
case SIGP_SET_ARCH: case SIGP_SET_ARCH:
*statusreg &= 0xffffffff00000000UL; *statusreg &= 0xffffffff00000000UL;
*statusreg |= SIGP_STAT_INVALID_PARAMETER; *statusreg |= SIGP_STAT_INVALID_PARAMETER;
cc = 1; /* status stored */ cc = SIGP_CC_STATUS_STORED;
break; break;
case SIGP_INITIAL_CPU_RESET: case SIGP_INITIAL_CPU_RESET:
run_on_cpu(CPU(target_cpu), sigp_initial_cpu_reset, CPU(target_cpu)); run_on_cpu(CPU(target_cpu), sigp_initial_cpu_reset, CPU(target_cpu));
cc = 0; cc = SIGP_CC_ORDER_CODE_ACCEPTED;
break; break;
case SIGP_CPU_RESET: case SIGP_CPU_RESET:
run_on_cpu(CPU(target_cpu), sigp_cpu_reset, CPU(target_cpu)); run_on_cpu(CPU(target_cpu), sigp_cpu_reset, CPU(target_cpu));
cc = 0; cc = SIGP_CC_ORDER_CODE_ACCEPTED;
break; break;
default: default:
DPRINTF("KVM: unknown SIGP: 0x%x\n", order_code); DPRINTF("KVM: unknown SIGP: 0x%x\n", order_code);
*statusreg &= 0xffffffff00000000UL; *statusreg &= 0xffffffff00000000UL;
*statusreg |= SIGP_STAT_INVALID_ORDER; *statusreg |= SIGP_STAT_INVALID_ORDER;
cc = 1; /* status stored */ cc = SIGP_CC_STATUS_STORED;
break; break;
} }

4
target-s390x/misc_helper.c
View File

@ -456,7 +456,7 @@ uint32_t HELPER(stsi)(CPUS390XState *env, uint64_t a0,
uint32_t HELPER(sigp)(CPUS390XState *env, uint64_t order_code, uint32_t r1, uint32_t HELPER(sigp)(CPUS390XState *env, uint64_t order_code, uint32_t r1,
uint64_t cpu_addr) uint64_t cpu_addr)
{ {
int cc = 0; int cc = SIGP_CC_ORDER_CODE_ACCEPTED;
HELPER_LOG("%s: %016" PRIx64 " %08x %016" PRIx64 "\n", HELPER_LOG("%s: %016" PRIx64 " %08x %016" PRIx64 "\n",
__func__, order_code, r1, cpu_addr); __func__, order_code, r1, cpu_addr);
@ -490,7 +490,7 @@ uint32_t HELPER(sigp)(CPUS390XState *env, uint64_t order_code, uint32_t r1,
default: default:
/* unknown sigp */ /* unknown sigp */
fprintf(stderr, "XXX unknown sigp: 0x%" PRIx64 "\n", order_code); fprintf(stderr, "XXX unknown sigp: 0x%" PRIx64 "\n", order_code);
cc = 3; cc = SIGP_CC_NOT_OPERATIONAL;
} }
return cc; return cc;