s390x/kvm: some fixes and cleanups
1. sclp: get of of duplicate defines 2. ccw: implement and fix handling of some special cases -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (GNU/Linux) iQIcBAABAgAGBQJUIWNHAAoJEBF7vIC1phx8pmUQAIrcXEdPG+aIfzalAnksHhnB v0bL13aCOsWKNuYfWdNdrkOUlmCI2tkSyQ/D0qmoOQya4k7vWxEXehYgCp7VGS3U s3IrsORRolHOskqWhI+jzejo3DeGWgcAsFl7TEFwzWmo2MZfuugOwOxL9GDz01Qy vsJCwsh4yq7G5z+dm17FF2+qMCkcrQNONrmBrEronfsH2Zfz/aFDcJeWdFYqemaB 369htZqWQ1Q5LJzc5U3eWHAMS8/e3F/6rxMRbC8oeo2kPqBie795Z/1lezIO19TX 5P4ck5cxTuK07Xbzr23sErcbnS8Ktg8LG/2N1/kah0fgjrccDIE3i86kMXXxRfwF xZBsAzr/0+sVuUHnD7ZtwShZqOoPMQwCBQ23pFV0YpnmLfMLfGkCU6zROy1c63wU PGiaUAhttQT7B6kxvsKznf7+F6qSLkvt/e9IYKJGsZVVEHdOfDwCPgbAjEasotFh 7rCjgg8acqFQse2kfEXotRPQA7ASMAq3mTrgMKW+cX55VtsvsyOsp8sEDPQ7X75t nLfM1vQtMXOuRjx/fIakYmLkiUcxvmm8MPEle1PCR7S719B964AGLpivRKX5vR2I H2Mum9L/LjjFWoQLjA1F0lnkOmo7rZCtFHOksIwvc9VarVo0ZJslZ08BFlHePFRn z5Nv056VFDEAKzaA6x0p =B/kw -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/borntraeger/tags/s390x-20140923' into staging s390x/kvm: some fixes and cleanups 1. sclp: get of of duplicate defines 2. ccw: implement and fix handling of some special cases # gpg: Signature made Tue 23 Sep 2014 13:10:47 BST using RSA key ID B5A61C7C # gpg: Can't check signature: public key not found * remotes/borntraeger/tags/s390x-20140923: s390x/css: catch ccw sequence errors s390x/css: support format-0 ccws s390x: remove duplicate defines in SCLP code Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
commit
cad684c538
@ -243,17 +243,25 @@ static void copy_sense_id_to_guest(SenseId *dest, SenseId *src)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static CCW1 copy_ccw_from_guest(hwaddr addr)
|
static CCW1 copy_ccw_from_guest(hwaddr addr, bool fmt1)
|
||||||
{
|
{
|
||||||
CCW1 tmp;
|
CCW0 tmp0;
|
||||||
|
CCW1 tmp1;
|
||||||
CCW1 ret;
|
CCW1 ret;
|
||||||
|
|
||||||
cpu_physical_memory_read(addr, &tmp, sizeof(tmp));
|
if (fmt1) {
|
||||||
ret.cmd_code = tmp.cmd_code;
|
cpu_physical_memory_read(addr, &tmp1, sizeof(tmp1));
|
||||||
ret.flags = tmp.flags;
|
ret.cmd_code = tmp1.cmd_code;
|
||||||
ret.count = be16_to_cpu(tmp.count);
|
ret.flags = tmp1.flags;
|
||||||
ret.cda = be32_to_cpu(tmp.cda);
|
ret.count = be16_to_cpu(tmp1.count);
|
||||||
|
ret.cda = be32_to_cpu(tmp1.cda);
|
||||||
|
} else {
|
||||||
|
cpu_physical_memory_read(addr, &tmp0, sizeof(tmp0));
|
||||||
|
ret.cmd_code = tmp0.cmd_code;
|
||||||
|
ret.flags = tmp0.flags;
|
||||||
|
ret.count = be16_to_cpu(tmp0.count);
|
||||||
|
ret.cda = be16_to_cpu(tmp0.cda1) | (tmp0.cda0 << 16);
|
||||||
|
}
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -268,7 +276,8 @@ static int css_interpret_ccw(SubchDev *sch, hwaddr ccw_addr)
|
|||||||
return -EIO;
|
return -EIO;
|
||||||
}
|
}
|
||||||
|
|
||||||
ccw = copy_ccw_from_guest(ccw_addr);
|
/* Translate everything to format-1 ccws - the information is the same. */
|
||||||
|
ccw = copy_ccw_from_guest(ccw_addr, sch->ccw_fmt_1);
|
||||||
|
|
||||||
/* Check for invalid command codes. */
|
/* Check for invalid command codes. */
|
||||||
if ((ccw.cmd_code & 0x0f) == 0) {
|
if ((ccw.cmd_code & 0x0f) == 0) {
|
||||||
@ -285,6 +294,13 @@ static int css_interpret_ccw(SubchDev *sch, hwaddr ccw_addr)
|
|||||||
|
|
||||||
check_len = !((ccw.flags & CCW_FLAG_SLI) && !(ccw.flags & CCW_FLAG_DC));
|
check_len = !((ccw.flags & CCW_FLAG_SLI) && !(ccw.flags & CCW_FLAG_DC));
|
||||||
|
|
||||||
|
if (!ccw.cda) {
|
||||||
|
if (sch->ccw_no_data_cnt == 255) {
|
||||||
|
return -EINVAL;
|
||||||
|
}
|
||||||
|
sch->ccw_no_data_cnt++;
|
||||||
|
}
|
||||||
|
|
||||||
/* Look at the command. */
|
/* Look at the command. */
|
||||||
switch (ccw.cmd_code) {
|
switch (ccw.cmd_code) {
|
||||||
case CCW_CMD_NOOP:
|
case CCW_CMD_NOOP:
|
||||||
@ -386,6 +402,8 @@ static void sch_handle_start_func(SubchDev *sch, ORB *orb)
|
|||||||
s->ctrl |= (SCSW_STCTL_ALERT | SCSW_STCTL_STATUS_PEND);
|
s->ctrl |= (SCSW_STCTL_ALERT | SCSW_STCTL_STATUS_PEND);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
sch->ccw_fmt_1 = !!(orb->ctrl0 & ORB_CTRL0_MASK_FMT);
|
||||||
|
sch->ccw_no_data_cnt = 0;
|
||||||
} else {
|
} else {
|
||||||
s->ctrl &= ~(SCSW_ACTL_SUSP | SCSW_ACTL_RESUME_PEND);
|
s->ctrl &= ~(SCSW_ACTL_SUSP | SCSW_ACTL_RESUME_PEND);
|
||||||
}
|
}
|
||||||
@ -1347,6 +1365,8 @@ void subch_device_save(SubchDev *s, QEMUFile *f)
|
|||||||
qemu_put_byte(f, s->id.ciw[i].command);
|
qemu_put_byte(f, s->id.ciw[i].command);
|
||||||
qemu_put_be16(f, s->id.ciw[i].count);
|
qemu_put_be16(f, s->id.ciw[i].count);
|
||||||
}
|
}
|
||||||
|
qemu_put_byte(f, s->ccw_fmt_1);
|
||||||
|
qemu_put_byte(f, s->ccw_no_data_cnt);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1402,6 +1422,8 @@ int subch_device_load(SubchDev *s, QEMUFile *f)
|
|||||||
s->id.ciw[i].command = qemu_get_byte(f);
|
s->id.ciw[i].command = qemu_get_byte(f);
|
||||||
s->id.ciw[i].count = qemu_get_be16(f);
|
s->id.ciw[i].count = qemu_get_be16(f);
|
||||||
}
|
}
|
||||||
|
s->ccw_fmt_1 = qemu_get_byte(f);
|
||||||
|
s->ccw_no_data_cnt = qemu_get_byte(f);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -76,7 +76,9 @@ struct SubchDev {
|
|||||||
hwaddr channel_prog;
|
hwaddr channel_prog;
|
||||||
CCW1 last_cmd;
|
CCW1 last_cmd;
|
||||||
bool last_cmd_valid;
|
bool last_cmd_valid;
|
||||||
|
bool ccw_fmt_1;
|
||||||
bool thinint_active;
|
bool thinint_active;
|
||||||
|
uint8_t ccw_no_data_cnt;
|
||||||
/* transport-provided data: */
|
/* transport-provided data: */
|
||||||
int (*ccw_cb) (SubchDev *, CCW1);
|
int (*ccw_cb) (SubchDev *, CCW1);
|
||||||
SenseId id;
|
SenseId id;
|
||||||
|
@ -28,8 +28,6 @@
|
|||||||
#define SCLP_UNASSIGN_STORAGE 0x000C0001
|
#define SCLP_UNASSIGN_STORAGE 0x000C0001
|
||||||
#define SCLP_CMD_READ_EVENT_DATA 0x00770005
|
#define SCLP_CMD_READ_EVENT_DATA 0x00770005
|
||||||
#define SCLP_CMD_WRITE_EVENT_DATA 0x00760005
|
#define SCLP_CMD_WRITE_EVENT_DATA 0x00760005
|
||||||
#define SCLP_CMD_READ_EVENT_DATA 0x00770005
|
|
||||||
#define SCLP_CMD_WRITE_EVENT_DATA 0x00760005
|
|
||||||
#define SCLP_CMD_WRITE_EVENT_MASK 0x00780005
|
#define SCLP_CMD_WRITE_EVENT_MASK 0x00780005
|
||||||
|
|
||||||
/* SCLP Memory hotplug codes */
|
/* SCLP Memory hotplug codes */
|
||||||
|
@ -156,6 +156,16 @@ typedef struct ORB {
|
|||||||
#define ORB_CTRL1_MASK_ORBX 0x01
|
#define ORB_CTRL1_MASK_ORBX 0x01
|
||||||
#define ORB_CTRL1_MASK_INVALID 0x3e
|
#define ORB_CTRL1_MASK_INVALID 0x3e
|
||||||
|
|
||||||
|
/* channel command word (type 0) */
|
||||||
|
typedef struct CCW0 {
|
||||||
|
uint8_t cmd_code;
|
||||||
|
uint8_t cda0;
|
||||||
|
uint16_t cda1;
|
||||||
|
uint8_t flags;
|
||||||
|
uint8_t reserved;
|
||||||
|
uint16_t count;
|
||||||
|
} QEMU_PACKED CCW0;
|
||||||
|
|
||||||
/* channel command word (type 1) */
|
/* channel command word (type 1) */
|
||||||
typedef struct CCW1 {
|
typedef struct CCW1 {
|
||||||
uint8_t cmd_code;
|
uint8_t cmd_code;
|
||||||
|
Loading…
Reference in New Issue
Block a user