OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

s390x: refactor error handling for HSCH handler 

Simplify the error handling of the HSCH.  Let the code detecting the
condition tell (in a less ambiguous way) how it's to be handled. No
changes in behavior.

Signed-off-by: Halil Pasic <pasic@linux.vnet.ibm.com>
Message-Id: <20171017140453.51099-7-pasic@linux.vnet.ibm.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Dong Jia Shi <bjsdjshi@linux.vnet.ibm.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
This commit is contained in:
Halil Pasic 2017-10-17 16:04:52 +02:00 committed by Cornelia Huck
parent 773314426e
commit ae9f1be3bd
3 changed files with 10 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hw/s390x/css.c
View File

@ -1451,28 +1451,24 @@ IOInstEnding css_do_csch(SubchDev *sch)
return do_subchannel_work(sch); return do_subchannel_work(sch);
} }
int css_do_hsch(SubchDev *sch) IOInstEnding css_do_hsch(SubchDev *sch)
{ {
SCSW *s = &sch->curr_status.scsw; SCSW *s = &sch->curr_status.scsw;
PMCW *p = &sch->curr_status.pmcw; PMCW *p = &sch->curr_status.pmcw;
int ret;
if (~(p->flags) & (PMCW_FLAGS_MASK_DNV | PMCW_FLAGS_MASK_ENA)) { if (~(p->flags) & (PMCW_FLAGS_MASK_DNV | PMCW_FLAGS_MASK_ENA)) {
ret = -ENODEV; return IOINST_CC_NOT_OPERATIONAL;
goto out;
} }
if (((s->ctrl & SCSW_CTRL_MASK_STCTL) == SCSW_STCTL_STATUS_PEND) || if (((s->ctrl & SCSW_CTRL_MASK_STCTL) == SCSW_STCTL_STATUS_PEND) ||
(s->ctrl & (SCSW_STCTL_PRIMARY | (s->ctrl & (SCSW_STCTL_PRIMARY |
SCSW_STCTL_SECONDARY | SCSW_STCTL_SECONDARY |
SCSW_STCTL_ALERT))) { SCSW_STCTL_ALERT))) {
ret = -EINPROGRESS; return IOINST_CC_STATUS_PRESENT;
goto out;
} }
if (s->ctrl & (SCSW_FCTL_HALT_FUNC | SCSW_FCTL_CLEAR_FUNC)) { if (s->ctrl & (SCSW_FCTL_HALT_FUNC | SCSW_FCTL_CLEAR_FUNC)) {
ret = -EBUSY; return IOINST_CC_BUSY;
goto out;
} }
/* Trigger the halt function. */ /* Trigger the halt function. */
@ -1485,11 +1481,7 @@ int css_do_hsch(SubchDev *sch)
} }
s->ctrl |= SCSW_ACTL_HALT_PEND; s->ctrl |= SCSW_ACTL_HALT_PEND;
do_subchannel_work(sch); return do_subchannel_work(sch);
ret = 0;
out:
return ret;
} }
static void css_update_chnmon(SubchDev *sch) static void css_update_chnmon(SubchDev *sch)

2
include/hw/s390x/css.h
View File

@ -242,7 +242,7 @@ bool css_schid_final(int m, uint8_t cssid, uint8_t ssid, uint16_t schid);
int css_do_msch(SubchDev *sch, const SCHIB *schib); int css_do_msch(SubchDev *sch, const SCHIB *schib);
IOInstEnding css_do_xsch(SubchDev *sch); IOInstEnding css_do_xsch(SubchDev *sch);
IOInstEnding css_do_csch(SubchDev *sch); IOInstEnding css_do_csch(SubchDev *sch);
int css_do_hsch(SubchDev *sch); IOInstEnding css_do_hsch(SubchDev *sch);
IOInstEnding css_do_ssch(SubchDev *sch, ORB *orb); IOInstEnding css_do_ssch(SubchDev *sch, ORB *orb);
int css_do_tsch_get_irb(SubchDev *sch, IRB *irb, int *irb_len); int css_do_tsch_get_irb(SubchDev *sch, IRB *irb, int *irb_len);
void css_do_tsch_update_subch(SubchDev *sch); void css_do_tsch_update_subch(SubchDev *sch);

23
target/s390x/ioinst.c
View File

@ -78,8 +78,6 @@ void ioinst_handle_hsch(S390CPU *cpu, uint64_t reg1)
{ {
int cssid, ssid, schid, m; int cssid, ssid, schid, m;
SubchDev *sch; SubchDev *sch;
int ret = -ENODEV;
int cc;
if (ioinst_disassemble_sch_ident(reg1, &m, &cssid, &ssid, &schid)) { if (ioinst_disassemble_sch_ident(reg1, &m, &cssid, &ssid, &schid)) {
program_interrupt(&cpu->env, PGM_OPERAND, 4); program_interrupt(&cpu->env, PGM_OPERAND, 4);
@ -87,24 +85,11 @@ void ioinst_handle_hsch(S390CPU *cpu, uint64_t reg1)
} }
trace_ioinst_sch_id("hsch", cssid, ssid, schid); trace_ioinst_sch_id("hsch", cssid, ssid, schid);
sch = css_find_subch(m, cssid, ssid, schid); sch = css_find_subch(m, cssid, ssid, schid);
if (sch && css_subch_visible(sch)) { if (!sch || !css_subch_visible(sch)) {
ret = css_do_hsch(sch); setcc(cpu, 3);
return;
} }
switch (ret) { setcc(cpu, css_do_hsch(sch));
case -ENODEV:
cc = 3;
break;
case -EBUSY:
cc = 2;
break;
case 0:
cc = 0;
break;
default:
cc = 1;
break;
}
setcc(cpu, cc);
} }
static int ioinst_schib_valid(SCHIB *schib) static int ioinst_schib_valid(SCHIB *schib)