[Qemu-devel] [PULL for-2.11 0/2] s390x changes for 2.11-rc1

[Qemu-devel] [PULL for-2.11 0/2] s390x changes for 2.11-rc1

[Cornelia Huck]

The following changes since commit b0fbe46ad82982b289a44ee2495b59b0bad8a842:

  Update version for v2.11.0-rc0 release (2017-11-07 16:05:28 +0000)

are available in the git repository at:

  git://github.com/cohuck/qemu tags/s390x-20171109

for you to fetch changes up to fdaae351435147b9be6161d0f136ca7c40308059:

  target/s390x: Finish implementing RISBGN (2017-11-09 10:36:06 +0100)

----------------------------------------------------------------
s390x changes: let pci devices start out in a usable state, and make
RISBGN work in tcg.

----------------------------------------------------------------

Christian Borntraeger (1):
  s390x/pci: let pci devices start in configured mode

Richard Henderson (1):
  target/s390x: Finish implementing RISBGN

 hw/s390x/s390-pci-bus.c  | 2 +-
 target/s390x/translate.c | 9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

-- 
2.13.6

[Qemu-devel] [PULL for-2.11 1/2] s390x/pci: let pci devices start in configured mode

[Cornelia Huck]

From: Christian Borntraeger <borntraeger@de.ibm.com>

Currently, to enable a pci device in the guest, the user has to issue
echo 1 > /sys/bus/pci/slots/00000000/power. This is not what people
expect. On an LPAR, the user can put a PCI device in configured or
deconfigured state via IOCDS. The "start in deconfigured state" can be
used for "sharing" a pci function across LPARs. This is not what we are
going to use in KVM, so always start configured.

Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Acked-by: Yi Min Zhao <zyimin@linux.vnet.ibm.com>
Reviewed-by: Pierre Morel <pmorel@linux.vnet.ibm.com>
Message-Id: <20171107175455.73793-2-borntraeger@de.ibm.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
---
 hw/s390x/s390-pci-bus.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c
index e7a58e81f7..2b1e1409bf 100644
--- a/hw/s390x/s390-pci-bus.c
+++ b/hw/s390x/s390-pci-bus.c
@@ -715,7 +715,7 @@ static void s390_pcihost_hot_plug(HotplugHandler *hotplug_dev,
         pbdev->pdev = pdev;
         pbdev->iommu = s390_pci_get_iommu(s, pdev->bus, pdev->devfn);
         pbdev->iommu->pbdev = pbdev;
-        pbdev->state = ZPCI_FS_STANDBY;
+        pbdev->state = ZPCI_FS_DISABLED;
 
         if (s390_pci_msix_init(pbdev)) {
             error_setg(errp, "MSI-X support is mandatory "
-- 
2.13.6

[Qemu-devel] [PULL for-2.11 2/2] target/s390x: Finish implementing RISBGN

[Cornelia Huck]

From: Richard Henderson <richard.henderson@linaro.org>

We added the entry to insn-data.def, but failed to update op_risbg
to match.  No need to special-case the imask inversion, since that
is already ~0 for RISBG (and now RISBGN).

Fixes: 375ee58bedcda359011fe7fa99e0647f66f9ffa0
Fixes: https://bugs.launchpad.net/qemu/+bug/1701798 (s390x part)
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20171107145546.767-1-richard.henderson@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Tested-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
---
 target/s390x/translate.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/target/s390x/translate.c b/target/s390x/translate.c
index dee72a787d..85d0a6c3af 100644
--- a/target/s390x/translate.c
+++ b/target/s390x/translate.c
@@ -3432,6 +3432,7 @@ static ExitStatus op_risbg(DisasContext *s, DisasOps *o)
     /* Adjust the arguments for the specific insn.  */
     switch (s->fields->op2) {
     case 0x55: /* risbg */
+    case 0x59: /* risbgn */
         i3 &= 63;
         i4 &= 63;
         pmask = ~0;
@@ -3447,7 +3448,7 @@ static ExitStatus op_risbg(DisasContext *s, DisasOps *o)
         pmask = 0x00000000ffffffffull;
         break;
     default:
-        abort();
+        g_assert_not_reached();
     }
 
     /* MASK is the set of bits to be inserted from R2.
@@ -3464,11 +3465,7 @@ static ExitStatus op_risbg(DisasContext *s, DisasOps *o)
        insns, we need to keep the other half of the register.  */
     imask = ~mask | ~pmask;
     if (do_zero) {
-        if (s->fields->op2 == 0x55) {
-            imask = 0;
-        } else {
-            imask = ~pmask;
-        }
+        imask = ~pmask;
     }
 
     len = i4 - i3 + 1;
-- 
2.13.6

Re: [Qemu-devel] [PULL for-2.11 0/2] s390x changes for 2.11-rc1

[Peter Maydell]

On 9 November 2017 at 15:32, Cornelia Huck <cohuck@redhat.com> wrote:
> The following changes since commit b0fbe46ad82982b289a44ee2495b59b0bad8a842:
>
>   Update version for v2.11.0-rc0 release (2017-11-07 16:05:28 +0000)
>
> are available in the git repository at:
>
>   git://github.com/cohuck/qemu tags/s390x-20171109
>
> for you to fetch changes up to fdaae351435147b9be6161d0f136ca7c40308059:
>
>   target/s390x: Finish implementing RISBGN (2017-11-09 10:36:06 +0100)
>
> ----------------------------------------------------------------
> s390x changes: let pci devices start out in a usable state, and make
> RISBGN work in tcg.
>
> ----------------------------------------------------------------
>
> Christian Borntraeger (1):
>   s390x/pci: let pci devices start in configured mode
>
> Richard Henderson (1):
>   target/s390x: Finish implementing RISBGN
>
>  hw/s390x/s390-pci-bus.c  | 2 +-
>  target/s390x/translate.c | 9 +++------
>  2 files changed, 4 insertions(+), 7 deletions(-)

Applied, thanks.

-- PMM