diff options
| author |   Martin Schwidefsky <schwidefsky@de.ibm.com> | 2018-03-18 23:02:52 -0700 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2018-03-18 23:02:52 -0700 |
| commit | bcbd41da3b0a8a3e0f8457bb545a32f5ca3c81f5 (patch) | |
| tree | ca3f72b98c73eb74235c05f204bbbfdd31240910 /drivers/s390 | |
| parent | s390/decompressor: trim uncompressed image head during the build (diff) | |
| parent | vfio-ccw: fence off transport mode (diff) | |
| download | linux-dev-bcbd41da3b0a8a3e0f8457bb545a32f5ca3c81f5.tar.xz linux-dev-bcbd41da3b0a8a3e0f8457bb545a32f5ca3c81f5.zip | |
Merge tag 'vfio-ccw-20180305' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/vfio-ccw into features
Pull vfio-ccw patches from Cornelia Huck:
A small documentation update, and reject transport mode requests
(which we don't support).
Diffstat (limited to 'drivers/s390')
| -rw-r--r-- | drivers/s390/cio/vfio_ccw_fsm.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/s390/cio/vfio_ccw_fsm.c b/drivers/s390/cio/vfio_ccw_fsm.c index c30420c517b1..ff6963ad6e39 100644 --- a/drivers/s390/cio/vfio_ccw_fsm.c +++ b/drivers/s390/cio/vfio_ccw_fsm.c @@ -124,6 +124,11 @@ static void fsm_io_request(struct vfio_ccw_private *private, if (scsw->cmd.fctl & SCSW_FCTL_START_FUNC) { orb = (union orb *)io_region->orb_area; + /* Don't try to build a cp if transport mode is specified. */ + if (orb->tm.b) { + io_region->ret_code = -EOPNOTSUPP; + goto err_out; + } io_region->ret_code = cp_init(&private->cp, mdev_dev(mdev), orb); if (io_region->ret_code) |