diff options
| author | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2017-03-31 13:01:46 +0200 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2017-03-31 13:01:46 +0200 |
| commit | 6fb81d69d0bb455e6dbb5bd99529e2dea74b93e7 (patch) | |
| tree | 50ec4711bfb152cf463616b5789f42858409c5ad /arch/s390 | |
| parent | 485527ba578254bb1171b13c55394257fd63cd59 (diff) | |
| parent | 1877888d0ad21858693d8a5594734b125a068638 (diff) | |
| download | talos-op-linux-6fb81d69d0bb455e6dbb5bd99529e2dea74b93e7.tar.gz talos-op-linux-6fb81d69d0bb455e6dbb5bd99529e2dea74b93e7.zip | |
Merge branch 'vfio-ccw-for-martin' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/vfio-ccw into features
Pull vfio-ccw branch to add the basic channel I/O passthrough
intrastructure based on vfio.
The focus is on supporting dasd-eckd(cu_type/dev_type = 0x3990/0x3390)
as the target device.
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/Kconfig | 10 | ||||
| -rw-r--r-- | arch/s390/include/asm/cio.h | 18 | ||||
| -rw-r--r-- | arch/s390/include/asm/isc.h | 1 |
3 files changed, 29 insertions, 0 deletions
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index afac5d89ad1f..ca2fe764be2d 100644 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig @@ -682,6 +682,16 @@ config EADM_SCH To compile this driver as a module, choose M here: the module will be called eadm_sch. +config VFIO_CCW + def_tristate n + prompt "Support for VFIO-CCW subchannels" + depends on S390_CCW_IOMMU && VFIO_MDEV + help + This driver allows usage of I/O subchannels via VFIO-CCW. + + To compile this driver as a module, choose M here: the + module will be called vfio_ccw. + endmenu menu "Dump support" diff --git a/arch/s390/include/asm/cio.h b/arch/s390/include/asm/cio.h index f7ed88cc066e..7a38ca85190b 100644 --- a/arch/s390/include/asm/cio.h +++ b/arch/s390/include/asm/cio.h @@ -33,6 +33,24 @@ struct ccw1 { __u32 cda; } __attribute__ ((packed,aligned(8))); +/** + * struct ccw0 - channel command word + * @cmd_code: command code + * @cda: data address + * @flags: flags, like IDA addressing, etc. + * @reserved: will be ignored + * @count: byte count + * + * The format-0 ccw structure. + */ +struct ccw0 { + __u8 cmd_code; + __u32 cda : 24; + __u8 flags; + __u8 reserved; + __u16 count; +} __packed __aligned(8); + #define CCW_FLAG_DC 0x80 #define CCW_FLAG_CC 0x40 #define CCW_FLAG_SLI 0x20 diff --git a/arch/s390/include/asm/isc.h b/arch/s390/include/asm/isc.h index 68d7d68300f2..8a0b721a9b8d 100644 --- a/arch/s390/include/asm/isc.h +++ b/arch/s390/include/asm/isc.h @@ -16,6 +16,7 @@ #define CONSOLE_ISC 1 /* console I/O subchannel */ #define EADM_SCH_ISC 4 /* EADM subchannels */ #define CHSC_SCH_ISC 7 /* CHSC subchannels */ +#define VFIO_CCW_ISC IO_SCH_ISC /* VFIO-CCW I/O subchannels */ /* Adapter interrupts. */ #define QDIO_AIRQ_ISC IO_SCH_ISC /* I/O subchannel in qdio mode */ #define PCI_ISC 2 /* PCI I/O subchannels */ |
