[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [PATCH 02/33] spapr_iommu: Disable in-kernel IOMMU tables for
From: |
David Gibson |
Subject: |
[Qemu-ppc] [PATCH 02/33] spapr_iommu: Disable in-kernel IOMMU tables for >4GB windows |
Date: |
Thu, 7 May 2015 15:33:28 +1000 |
From: Alexey Kardashevskiy <address@hidden>
The existing KVM_CREATE_SPAPR_TCE ioctl only support 4G windows max as
the window size parameter to the kernel ioctl() is 32-bit so
there's no way of expressing a TCE window > 4GB.
We are going to add huge DMA windows support so this will create small
window and unexpectedly fail later.
This disables KVM_CREATE_SPAPR_TCE for windows bigger that 4GB.
Signed-off-by: Alexey Kardashevskiy <address@hidden>
Reviewed-by: David Gibson <address@hidden>
Signed-off-by: David Gibson <address@hidden>
---
hw/ppc/spapr_iommu.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/hw/ppc/spapr_iommu.c b/hw/ppc/spapr_iommu.c
index f3990fd..e19bf89 100644
--- a/hw/ppc/spapr_iommu.c
+++ b/hw/ppc/spapr_iommu.c
@@ -126,11 +126,11 @@ static MemoryRegionIOMMUOps spapr_iommu_ops = {
static int spapr_tce_table_realize(DeviceState *dev)
{
sPAPRTCETable *tcet = SPAPR_TCE_TABLE(dev);
+ uint64_t window_size = (uint64_t)tcet->nb_table << tcet->page_shift;
- if (kvm_enabled()) {
+ if (kvm_enabled() && !(window_size >> 32)) {
tcet->table = kvmppc_create_spapr_tce(tcet->liobn,
- tcet->nb_table <<
- tcet->page_shift,
+ window_size,
&tcet->fd,
tcet->vfio_accel);
}
--
2.1.0
- [Qemu-ppc] [PATCH 00/33] Accumulated -machine pseries patches 2015-05-07, David Gibson, 2015/05/07
- [Qemu-ppc] [PATCH 02/33] spapr_iommu: Disable in-kernel IOMMU tables for >4GB windows,
David Gibson <=
- [Qemu-ppc] [PATCH 03/33] spapr_iommu: Make H_PUT_TCE_INDIRECT endian-safe, David Gibson, 2015/05/07
- [Qemu-ppc] [PATCH 05/33] spapr_vio: Introduce a liobn number generating macros, David Gibson, 2015/05/07
- [Qemu-ppc] [PATCH 07/33] spapr_iommu: Add separate trace points for PCI DMA operations, David Gibson, 2015/05/07
- [Qemu-ppc] [PATCH 04/33] spapr_pci: Introduce a liobn number generating macros, David Gibson, 2015/05/07
- [Qemu-ppc] [PATCH 06/33] spapr_pci: Define default DMA window size as a macro, David Gibson, 2015/05/07
- [Qemu-ppc] [PATCH 01/33] spapr_pci: Fix unsafe signed/unsigned comparisons, David Gibson, 2015/05/07
- [Qemu-ppc] [PATCH 09/33] spapr_iommu: Make spapr_tce_find_by_liobn() public, David Gibson, 2015/05/07
- [Qemu-ppc] [PATCH 14/33] hw/ppc/spapr: Fix error message when firmware could not be loaded, David Gibson, 2015/05/07
- [Qemu-ppc] [PATCH 10/33] spapr_pci: Rework device-tree rendering, David Gibson, 2015/05/07
- [Qemu-ppc] [PATCH 13/33] pseries: Add pseries-2.4 machine type, David Gibson, 2015/05/07