ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

s390x/css: add ORB to SubchDev 

Since we are going to need a migration compatibility breaking change to
activate ChannelSubSys migration let us use the opportunity to introduce
ORB to the SubchDev before that (otherwise we would need separate
handling e.g. a compat property).

The ORB will be useful for implementing IDA, or async handling of
subchannel work.

Signed-off-by: Halil Pasic <pasic@linux.vnet.ibm.com>
Reviewed-by: Guenther Hutzl <hutzl@linux.vnet.ibm.com>
Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Message-Id: <20170711145441.33925-5-pasic@linux.vnet.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
This commit is contained in:
Halil Pasic 2017-07-11 16:54:39 +02:00 committed by Christian Borntraeger
parent 457af62603
commit ff443fe6b5
2 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
hw/s390x/css.c
View File

@ -165,6 +165,36 @@ static const VMStateDescription vmstate_sense_id = {
} }
}; };
static const VMStateDescription vmstate_orb = {
.name = "s390_orb",
.version_id = 1,
.minimum_version_id = 1,
.fields = (VMStateField[]) {
VMSTATE_UINT32(intparm, ORB),
VMSTATE_UINT16(ctrl0, ORB),
VMSTATE_UINT8(lpm, ORB),
VMSTATE_UINT8(ctrl1, ORB),
VMSTATE_UINT32(cpa, ORB),
VMSTATE_END_OF_LIST()
}
};
static bool vmstate_schdev_orb_needed(void *opaque)
{
return css_migration_enabled();
}
static const VMStateDescription vmstate_schdev_orb = {
.name = "s390_subch_dev/orb",
.version_id = 1,
.minimum_version_id = 1,
.needed = vmstate_schdev_orb_needed,
.fields = (VMStateField[]) {
VMSTATE_STRUCT(orb, SubchDev, 1, vmstate_orb, ORB),
VMSTATE_END_OF_LIST()
}
};
static int subch_dev_post_load(void *opaque, int version_id); static int subch_dev_post_load(void *opaque, int version_id);
static void subch_dev_pre_save(void *opaque); static void subch_dev_pre_save(void *opaque);
@ -193,6 +223,10 @@ const VMStateDescription vmstate_subch_dev = {
VMSTATE_BOOL(ccw_fmt_1, SubchDev), VMSTATE_BOOL(ccw_fmt_1, SubchDev),
VMSTATE_UINT8(ccw_no_data_cnt, SubchDev), VMSTATE_UINT8(ccw_no_data_cnt, SubchDev),
VMSTATE_END_OF_LIST() VMSTATE_END_OF_LIST()
},
.subsections = (const VMStateDescription * []) {
&vmstate_schdev_orb,
NULL
} }
}; };
@ -1386,6 +1420,7 @@ int css_do_ssch(SubchDev *sch, ORB *orb)
if (channel_subsys.chnmon_active) { if (channel_subsys.chnmon_active) {
css_update_chnmon(sch); css_update_chnmon(sch);
} }
sch->orb = *orb;
sch->channel_prog = orb->cpa; sch->channel_prog = orb->cpa;
/* Trigger the start function. */ /* Trigger the start function. */
s->ctrl |= (SCSW_FCTL_START_FUNC | SCSW_ACTL_START_PEND); s->ctrl |= (SCSW_FCTL_START_FUNC | SCSW_ACTL_START_PEND);

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

@ -90,6 +90,7 @@ struct SubchDev {
bool thinint_active; bool thinint_active;
uint8_t ccw_no_data_cnt; uint8_t ccw_no_data_cnt;
uint16_t migrated_schid; /* used for missmatch detection */ uint16_t migrated_schid; /* used for missmatch detection */
ORB orb;
/* transport-provided data: */ /* transport-provided data: */
int (*ccw_cb) (SubchDev *, CCW1); int (*ccw_cb) (SubchDev *, CCW1);
void (*disable_cb)(SubchDev *); void (*disable_cb)(SubchDev *);