From: Jared Rossi <[email protected]>
This patch series introduces an IPLB subtype to support PCI devices, which may
be built if a device has been assigned a boot index and is identified as a PCI
device with a corresponding s390 PCI Bus device.
Boot support is only added for virtio-blk-pci at this time and is limited to
devices with an assigned bootindex.
A "loadparm" property is added to virtio-blk-pci boot devices on s390x.
A simple test to check basic functionality is added to the cdrom-tests in qtest.
Changes v4 -> v5:
- Fix incorrect switch/case for virtio block device ID
- Use target_s390x() instead of qemu_arch_available(QEMU_ARCH_S390X)
- Properly denote switch fallthrough
- Remove reduntant RC checks in PCI read/write
Jared Rossi (15):
pc-bios/s390-ccw: Fix misattributed function prototypes
pc-bios/s390-ccw: Remove redundant vring schid attribute
pc-bios/s390-ccw: Always reset virtio device on failed boot attempt
s390x: Remove duplicate definitions of IPL types
pc-bios/s390-ccw: Store device type independent of sense data
pc-bios/s390-ccw: Split virtio-ccw and generic virtio
include/hw/s390x: Move CLP definitions for easier BIOS access
pc-bios/s390-ccw: Introduce CLP Architecture
s390x: Add definitions for PCI IPL type
pc-bios/s390-ccw: Introduce PCI device
pc-bios/s390-ccw: Introduce virtio-pci functions
pc-bios/s390-ccw: Add support for virtio-blk-pci IPL
s390x: Build IPLB for virtio-pci devices
hw: Add "loadparm" property to virtio block PCI devices booting on
s390x
tests/qtest: Add s390x PCI boot test to cdrom-test.c
MAINTAINERS | 1 +
hw/pci/pci.c | 38 ++
hw/s390x/ipl.c | 63 +++-
hw/s390x/ipl.h | 8 +-
hw/s390x/s390-pci-bus.c | 3 +-
hw/s390x/s390-pci-vfio.c | 2 +-
hw/virtio/virtio-blk-pci.c | 1 +
include/hw/pci/pci.h | 1 +
include/hw/pci/pci_device.h | 3 +
include/hw/s390x/ipl/qipl.h | 20 +
include/hw/s390x/{ => ipl}/s390-pci-clp.h | 0
include/hw/s390x/s390-pci-bus.h | 4 +-
pc-bios/s390-ccw/Makefile | 3 +-
pc-bios/s390-ccw/bootmap.c | 2 +-
pc-bios/s390-ccw/clp.c | 99 +++++
pc-bios/s390-ccw/clp.h | 24 ++
pc-bios/s390-ccw/iplb.h | 4 -
pc-bios/s390-ccw/main.c | 88 ++++-
pc-bios/s390-ccw/netmain.c | 2 +-
pc-bios/s390-ccw/pci.c | 118 ++++++
pc-bios/s390-ccw/pci.h | 42 +++
pc-bios/s390-ccw/s390-ccw.h | 7 -
pc-bios/s390-ccw/virtio-blkdev.c | 76 ++--
pc-bios/s390-ccw/virtio-ccw.c | 241 ++++++++++++
pc-bios/s390-ccw/virtio-ccw.h | 24 ++
pc-bios/s390-ccw/virtio-net.c | 5 +-
pc-bios/s390-ccw/virtio-pci.c | 432 ++++++++++++++++++++++
pc-bios/s390-ccw/virtio-pci.h | 82 ++++
pc-bios/s390-ccw/virtio-scsi.c | 8 +-
pc-bios/s390-ccw/virtio-scsi.h | 2 +-
pc-bios/s390-ccw/virtio.c | 293 +++++----------
pc-bios/s390-ccw/virtio.h | 19 +-
tests/qtest/cdrom-test.c | 7 +
33 files changed, 1449 insertions(+), 273 deletions(-)
rename include/hw/s390x/{ => ipl}/s390-pci-clp.h (100%)
create mode 100644 pc-bios/s390-ccw/clp.c
create mode 100644 pc-bios/s390-ccw/clp.h
create mode 100644 pc-bios/s390-ccw/pci.c
create mode 100644 pc-bios/s390-ccw/pci.h
create mode 100644 pc-bios/s390-ccw/virtio-ccw.c
create mode 100644 pc-bios/s390-ccw/virtio-ccw.h
create mode 100644 pc-bios/s390-ccw/virtio-pci.c
create mode 100644 pc-bios/s390-ccw/virtio-pci.h
--
2.52.0
