s390 patch queue 2013-03-08
Hi Blue / Aurelien,
This is my current patch queue for s390. Please pull.
Alex
The following changes since commit 0bc472a9d6b80567c212023c5eae413f4dfb53ad:
Kuo-Jung Su (1):
hw/nand.c: correct the sense of the BUSY/READY status bit
are available in the git repository at:
git://github.com/agraf/qemu.git s390-for-upstream
Christian Borntraeger (4):
s390: simplify kvm cpu init
Allow virtio-net features for legacy s390 virtio bus s390/css: Fix subchannel detection
s390/virtio-ccw: remove redundant call to blockdev_mark_auto_del
Cornelia Huck (1):
s390: virtio-ccw maintainer
MAINTAINERS | 14 ++++++++++++++ hw/s390x/css.c | 11 +++++++---- hw/s390x/s390-virtio-bus.c | 1 + hw/s390x/virtio-ccw.c | 1 - target-s390x/cpu.h | 2 +- target-s390x/ioinst.c | 2 +- target-s390x/kvm.c | 9 ++------- 7 files changed, 26 insertions(+), 14 deletions(-)
PATCH 1/5 s390: simplify kvm cpu init
From: Christian Borntraeger <[email protected]>
There is no special code right now and the reset ioctl is done later on in the the reset handler anyway. Lets simplify the cpu init.
--- target-s390x/kvm.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-)
target-s390x/kvm.c +2 -7
@@ -103,13 +103,8 @@ unsigned long kvm_arch_vcpu_id(CPUState *cpu)int kvm_arch_init_vcpu (CPUState *cpu) { -int ret =0 ; - -if (kvm_vcpu_ioctl (cpu,KVM_S390_INITIAL_RESET ,NULL ) <0 ) { -perror ("cannot init reset vcpu" ); - } - -return ret; +/* nothing todo yet */ +return 0 ; }void kvm_arch_reset_vcpu (CPUState *cpu)
Signature · 1 line
1.6.0.2
PATCH 2/5 s390: virtio-ccw maintainer
In reply to Alexander GrafFrom: Cornelia Huck <[email protected]>
Add myself as maintainer for virtio-ccw and the s390-ccw-virtio machine.
--- MAINTAINERS | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-)
MAINTAINERS +14 -0
@@ -454,6 +454,14 @@ M: Alexander Graf <[email protected]> S: Maintained F: hw/s390-*.c +S390 Virtio-ccw +M: Cornelia Huck <[email protected]> +M: Alexander Graf <[email protected]> +S: Supported +F: hw/s390x/s390-virtio-ccw.c +F: hw/s390x/css.[hc] +T: git git://github.com/cohuck/qemu virtio-ccw-upstr + UniCore32 Machines ------------- PKUnity-3 SoC initramfs-with-busybox
@@ -565,6 +573,12 @@ M: Stefan Hajnoczi <[email protected]> S: Supported F: hw/virtio-blk* +virtio-ccw +M: Cornelia Huck <[email protected]> +S: Supported +F: hw/s390x/virtio-ccw.[hc] +T: git git://github.com/cohuck/qemu virtio-ccw-upstr + virtio-serial M: Amit Shah <[email protected]> S: Supported
Signature · 1 line
1.6.0.2
PATCH 3/5 Allow virtio-net features for legacy s390 virtio bus
In reply to Alexander GrafFrom: Christian Borntraeger <[email protected]>
Enable all virtio-net features for the legacy s390 virtio bus. This also fixes
kernel BUG at /usr/src/packages/BUILD/kernel-default-3.0.58/linux-3.0/drivers/s390/kvm/kvm_virtio.c:121!
--- hw/s390x/s390-virtio-bus.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
hw/s390x/s390-virtio-bus.c +1 -0
@@ -402,6 +402,7 @@ static const VirtIOBindings virtio_s390_bindings = {static Property s390_virtio_net_properties[] = {DEFINE_NIC_PROPERTIES (VirtIOS390Device, nic), +DEFINE_VIRTIO_NET_FEATURES (VirtIOS390Device, host_features),DEFINE_PROP_UINT32 ("x-txtimer" , VirtIOS390Device, net.txtimer,TX_TIMER_INTERVAL ), DEFINE_PROP_INT32("x-txburst", VirtIOS390Device,
Signature · 1 line
1.6.0.2
PATCH 4/5 s390/css: Fix subchannel detection
In reply to Alexander GrafFrom: Christian Borntraeger <[email protected]>
We have to consider the m bit to find the real channel subsystem when determining the last subchannel.
If we fail to take this into account, removal of a subchannel in the middle of a big list of devices will stop device detection after a reboot.
--- hw/s390x/css.c | 11 +++++++---- target-s390x/cpu.h | 2 +- target-s390x/ioinst.c | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-)
hw/s390x/css.c +7 -4
@@ -988,15 +988,18 @@ int css_do_rchp(uint8_t cssid, uint8_t chpid)return 0 ; } -bool css_schid_final (uint8_t cssid,uint8_t ssid,uint16_t schid) +bool css_schid_final (int m,uint8_t cssid,uint8_t ssid,uint16_t schid) {SubchSet *set; +uint8_t real_cssid; -if (cssid >MAX_CSSID || ssid >MAX_SSID || !channel_subsys->css[cssid] || - !channel_subsys->css[cssid]->sch_set[ssid]) { + real_cssid = (!m && (cssid ==0 )) ? channel_subsys->default_cssid : cssid; +if (real_cssid >MAX_CSSID || ssid >MAX_SSID || + !channel_subsys->css[real_cssid] || + !channel_subsys->css[real_cssid]->sch_set[ssid]) {return true; } - set = channel_subsys->css[cssid]->sch_set[ssid]; + set = channel_subsys->css[real_cssid]->sch_set[ssid];return schid >find_last_bit (set->schids_used, (MAX_SCHID +1 ) /sizeof (unsigned long )); }
target-s390x/cpu.h +1 -1
@@ -404,7 +404,7 @@ SubchDev *css_find_subch(uint8_t m, uint8_t cssid, uint8_t ssid,bool css_subch_visible (SubchDev *sch);void css_conditional_io_interrupt (SubchDev *sch);int css_do_stsch (SubchDev *sch,SCHIB *schib); -bool css_schid_final (uint8_t cssid,uint8_t ssid,uint16_t schid); +bool css_schid_final (int m,uint8_t cssid,uint8_t ssid,uint16_t schid);int css_do_msch (SubchDev *sch,SCHIB *schib);int css_do_xsch (SubchDev *sch);int css_do_csch (SubchDev *sch);
target-s390x/ioinst.c +1 -1
@@ -316,7 +316,7 @@ int ioinst_handle_stsch(CPUS390XState *env, uint64_t reg1, uint32_t ipb) cc =3 ; } }else { -if (css_schid_final (cssid, ssid, schid)) { +if (css_schid_final (m, cssid, ssid, schid)) { cc =3 ;/* No more subchannels in this css/ss */ }else {/* Store an empty schib. */
Signature · 1 line
1.6.0.2
PATCH 5/5 s390/virtio-ccw: remove redundant call to blockdev_mark_auto_del
In reply to Alexander GrafFrom: Christian Borntraeger <[email protected]>
blockdev_mark_auto_del is already called in virtio-blk-exit. Remove the redundant call.
--- hw/s390x/virtio-ccw.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)
hw/s390x/virtio-ccw.c +0 -1
@@ -585,7 +585,6 @@ static int virtio_ccw_blk_init(VirtioCcwDevice *dev)static int virtio_ccw_blk_exit (VirtioCcwDevice *dev) {virtio_blk_exit (dev->vdev); -blockdev_mark_auto_del (dev->blk.conf.bs);return virtio_ccw_exit (dev); }
Signature · 1 line
1.6.0.2
Quoted 3 lines · Alexander Graf
Hi Blue / Aurelien,
This is my current patch queue for s390. Please pull.
Thanks, pulled.
Quoted 29 lines
Alex
The following changes since commit
0bc472a9d6b80567c212023c5eae413f4dfb53ad:
Kuo-Jung Su (1):
hw/nand.c: correct the sense of the BUSY/READY status bitare available in the git repository at:
git://github.com/agraf/qemu.gits390-for-upstreamChristian Borntraeger (4):
s390: simplify kvm cpu init
Allow virtio-net features for legacy s390 virtio bus s390/css: Fix subchannel detection
s390/virtio-ccw: remove redundant call toblockdev_mark_auto_delCornelia Huck (1):
s390: virtio-ccw maintainerMAINTAINERS | 14 ++++++++++++++ hw/s390x/css.c | 11 +++++++---- hw/s390x/s390-virtio-bus.c | 1 + hw/s390x/virtio-ccw.c | 1 - target-s390x/cpu.h | 2 +- target-s390x/ioinst.c | 2 +- target-s390x/kvm.c | 9 ++------- 7 files changed, 26 insertions(+), 14 deletions(-)