From 15b59b77a4c7b9ef38e82b57a1dcdeb5c88b3156 Mon Sep 17 00:00:00 2001

From: Cornelia Huck <cohuck@redhat.com>

Date: Wed, 17 Apr 2019 13:57:28 +0100

Subject: [PATCH 11/24] s390x/pci: Set the iommu region size mpcifc request

RH-Author: Cornelia Huck <cohuck@redhat.com>

Message-id: <20190417135741.25297-12-cohuck@redhat.com>

Patchwork-id: 85793

O-Subject: [RHEL-8.1.0 qemu-kvm PATCH v2 11/24] s390x/pci: Set the iommu region size mpcifc request

Bugzilla: 1699070

RH-Acked-by: David Hildenbrand <david@redhat.com>

RH-Acked-by: Thomas Huth <thuth@redhat.com>

RH-Acked-by: Jens Freimann <jfreimann@redhat.com>

From: Pierre Morel <pmorel@linux.ibm.com>

The size of the accessible iommu memory region in the guest

is given to the IOMMU by the guest through the mpcifc request

specifying the PCI Base Address and the PCI Address Limit.

Let's set the size of the IOMMU region to:

    (PCI Address Limit) - (PCI Base Address) + 1.

Fixes: f7c40aa1e7 ("s390x/pci: fix failures of dma map/unmap")

Signed-off-by: Pierre Morel <pmorel@linux.ibm.com>

Message-Id: <1547125207-16907-2-git-send-email-pmorel@linux.ibm.com>

Acked-by: Collin Walling <walling@linux.ibm.com>

Signed-off-by: Cornelia Huck <cohuck@redhat.com>

(cherry picked from commit dbe9cf606c2fe7365008be2a71d7b1781bbd5435)

Signed-off-by: Cornelia Huck <cohuck@redhat.com>

Signed-off-by: Danilo C. L. de Paula <ddepaula@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 e19e134..a785acb 100644

--- a/hw/s390x/s390-pci-bus.c

+++ b/hw/s390x/s390-pci-bus.c

@@ -660,7 +660,7 @@ void s390_pci_iommu_enable(S390PCIIOMMU *iommu)

     char *name = g_strdup_printf("iommu-s390-%04x", iommu->pbdev->uid);

     memory_region_init_iommu(&iommu->iommu_mr, sizeof(iommu->iommu_mr),

                              TYPE_S390_IOMMU_MEMORY_REGION, OBJECT(&iommu->mr),

-                             name, iommu->pal + 1);

+                             name, iommu->pal - iommu->pba + 1);

     iommu->enabled = true;

     memory_region_add_subregion(&iommu->mr, 0, MEMORY_REGION(&iommu->iommu_mr));

     g_free(name);

-- 

1.8.3.1