Commit 5435f1d7 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20150112-v3' into staging 



s390x patches for 2.3.

Highlight is support for PCI devices on s390x. Otherwise, performance
improvements (register sync) and small cleanups.

# gpg: Signature made Mon 12 Jan 2015 09:49:31 GMT using RSA key ID C6F02FAF
# gpg: Good signature from "Cornelia Huck <huckc@linux.vnet.ibm.com>"
# gpg:                 aka "Cornelia Huck <cornelia.huck@de.ibm.com>"

* remotes/cohuck/tags/s390x-20150112-v3:
  kvm: extend kvm_irqchip_add_msi_route to work on s390
  s390: implement pci instructions
  s390: Add PCI bus support
  s390x/kvm: avoid syscalls by syncing registers with kvm_run
  s390x/kvm: sync register support helper function
  s390x/css: Clean up unnecessary CONFIG_USER_ONLY wrappers
  s390x/ccw: fix oddity in machine class init

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 64ea8038 9e03a040

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -538,6 +538,7 @@ S390 Virtio 
M: Alexander Graf <agraf@suse.de>

S: Maintained

F: hw/s390x/s390-*.c

X: hw/s390x/*pci*.[hc]



S390 Virtio-ccw

M: Cornelia Huck <cornelia.huck@de.ibm.com>
@@ -548,6 +549,7 @@ F: hw/s390x/s390-virtio-ccw.c 
F: hw/s390x/css.[hc]

F: hw/s390x/sclp*.[hc]

F: hw/s390x/ipl*.[hc]

F: hw/s390x/*pci*.[hc]

F: include/hw/s390x/

F: pc-bios/s390-ccw/

T: git git://github.com/cohuck/qemu virtio-ccw-upstr

default-configs/s390x-softmmu.mak

+1 −0
Original line number Diff line number Diff line 
include pci.mak

CONFIG_VIRTIO=y

CONFIG_SCLPCONSOLE=y

CONFIG_S390_FLIC=y

hw/s390x/Makefile.objs

+1 −0
Original line number Diff line number Diff line
@@ -8,3 +8,4 @@ obj-y += ipl.o 
obj-y += css.o

obj-y += s390-virtio-ccw.o

obj-y += virtio-ccw.o

obj-y += s390-pci-bus.o s390-pci-inst.o

hw/s390x/css.c

+5 −0
Original line number Diff line number Diff line
@@ -1299,6 +1299,11 @@ void css_generate_chp_crws(uint8_t cssid, uint8_t chpid) 
    /* TODO */

}



void css_generate_css_crws(uint8_t cssid)

{

    css_queue_crw(CRW_RSC_CSS, 0, 0, cssid);

}



int css_enable_mcsse(void)

{

    trace_css_enable_facility("mcsse");

hw/s390x/css.h

+1 −0
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ void css_queue_crw(uint8_t rsc, uint8_t erc, int chain, uint16_t rsid); 
void css_generate_sch_crws(uint8_t cssid, uint8_t ssid, uint16_t schid,

                           int hotplugged, int add);

void css_generate_chp_crws(uint8_t cssid, uint8_t chpid);

void css_generate_css_crws(uint8_t cssid);

void css_adapter_interrupt(uint8_t isc);



#define CSS_IO_ADAPTER_VIRTIO 1