On 05/11/2016 04:57 PM, Cornelia Huck wrote: > Hi, > > here's an update of the s390x patches I have queued for 2.7. > > Changes from v1: > - Avoid the 'IplBlockCcw fcp;' error in patch 3 from the start > instead of fixing it in a later patch (as noted by Christian) > - Add Xiaoqiang Zhao's SCLP qomification patches > - Add a bunch of fixes in the s390x pci implementation > > Still included: > - The new machine for 2.7 > - Make use of the runtime instrumentation support introduced in > the kernel. > - Enhance our ipl (boot) process: We can now start from devices > in subchannel sets > 0 as well. As a bonus, the conversion to > diag308 in the bios allows us to get rid of the gr7 hack. > > > Alexander Yarygin (6): > s390x/ipl: Extend the IplParameterBlock struct > s390x/ipl: Add type and length checks for IplParameterBlock values > s390x/ipl: Provide ipl parameter block > s390x/ipl: Add ssid field to IplParameterBlock > pc-bios/s390-ccw: Get device address via diag 308/6 > s390x/ipl: Remove redundant usage of gr7 > > Cornelia Huck (2): > s390x: add compat machine for 2.7 > s390-ccw.img: rebuild image > > Fan Zhang (1): > s390x: enable runtime instrumentation > > Yi Min Zhao (9): > s390x/pci: fix reg_irqs() > s390x/pci: separate s390_sclp_configure function > s390x/pci: separate s390_pcihost_iommu_configure function > s390x/pci: export pci_dereg_ioat and pci_dereg_irqs > s390x/pci: introduce S390PCIBusDevice.iommu_enabled > s390x/pci: fix s390_pci_sclp_deconfigure > s390x/pci: enhance mpcifc_service_call > s390x/pci: add length checking for pci sclp handlers > s390x/pci: remove whitespace > > xiaoqiang zhao (2): > hw/char: QOM'ify sclpconsole-lm.c > hw/char: QOM'ify sclpconsole.c > > hw/char/sclpconsole-lm.c | 14 ++++--- > hw/char/sclpconsole.c | 12 ++++-- > hw/s390x/ipl.c | 63 ++++++++++++++++------------ > hw/s390x/ipl.h | 84 > ++++++++++++++++++++++++++++++++++--- > hw/s390x/s390-pci-bus.c | 73 ++++++++++++++++++++++++-------- > hw/s390x/s390-pci-bus.h | 17 ++++---- > hw/s390x/s390-pci-inst.c | 79 +++++++++++++++++++++++++++------- > hw/s390x/s390-pci-inst.h | 11 +++++ > hw/s390x/s390-virtio-ccw.c | 47 ++++++++++++++++++++- > hw/s390x/sclp.c | 4 +- > include/hw/compat.h | 3 ++ > include/hw/s390x/s390-virtio-ccw.h | 4 ++ > pc-bios/s390-ccw.img | Bin 26424 -> 26424 bytes > pc-bios/s390-ccw/iplb.h | 79 ++++++++++++++++++++++++++++++++++ > pc-bios/s390-ccw/main.c | 25 ++++++----- > pc-bios/s390-ccw/s390-ccw.h | 2 +- > pc-bios/s390-ccw/start.S | 2 - > target-s390x/cpu.h | 18 ++++++++ > target-s390x/ioinst.c | 1 + > target-s390x/kvm.c | 21 ++++++++++ > target-s390x/machine.c | 12 ++++++ > target-s390x/misc_helper.c | 20 +++++++-- > 22 files changed, 493 insertions(+), 98 deletions(-) > create mode 100644 pc-bios/s390-ccw/iplb.h >
Patch selection looks good to me.