Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5b25199e authored by Alexey Kardashevskiy's avatar Alexey Kardashevskiy Committed by Benjamin Herrenschmidt
Browse files

powerpc/vfio: Enable on pSeries platform 



The enables VFIO on the pSeries platform, enabling user space
programs to access PCI devices directly.

Signed-off-by: default avatarAlexey Kardashevskiy <aik@ozlabs.ru>
Cc: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
Acked-by: default avatarAlex Williamson <alex.williamson@redhat.com>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 5ffd229c

arch/powerpc/platforms/pseries/iommu.c

+4 −0
Original line number Diff line number Diff line
@@ -614,6 +614,7 @@ static void pci_dma_bus_setup_pSeries(struct pci_bus *bus) 


	iommu_table_setparms(pci->phb, dn, tbl);

	pci->iommu_table = iommu_init_table(tbl, pci->phb->node);

	iommu_register_group(tbl, pci_domain_nr(bus), 0);



	/* Divide the rest (1.75GB) among the children */

	pci->phb->dma_window_size = 0x80000000ul;
@@ -658,6 +659,7 @@ static void pci_dma_bus_setup_pSeriesLP(struct pci_bus *bus) 
				   ppci->phb->node);

		iommu_table_setparms_lpar(ppci->phb, pdn, tbl, dma_window);

		ppci->iommu_table = iommu_init_table(tbl, ppci->phb->node);

		iommu_register_group(tbl, pci_domain_nr(bus), 0);

		pr_debug("  created table: %p\n", ppci->iommu_table);

	}

}
@@ -684,6 +686,7 @@ static void pci_dma_dev_setup_pSeries(struct pci_dev *dev) 
				   phb->node);

		iommu_table_setparms(phb, dn, tbl);

		PCI_DN(dn)->iommu_table = iommu_init_table(tbl, phb->node);

		iommu_register_group(tbl, pci_domain_nr(phb->bus), 0);

		set_iommu_table_base(&dev->dev, PCI_DN(dn)->iommu_table);

		return;

	}
@@ -1184,6 +1187,7 @@ static void pci_dma_dev_setup_pSeriesLP(struct pci_dev *dev) 
				   pci->phb->node);

		iommu_table_setparms_lpar(pci->phb, pdn, tbl, dma_window);

		pci->iommu_table = iommu_init_table(tbl, pci->phb->node);

		iommu_register_group(tbl, pci_domain_nr(pci->phb->bus), 0);

		pr_debug("  created table: %p\n", pci->iommu_table);

	} else {

		pr_debug("  found DMA window, table: %p\n", pci->iommu_table);

drivers/iommu/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -263,7 +263,7 @@ config SHMOBILE_IOMMU_L1SIZE 


config SPAPR_TCE_IOMMU

	bool "sPAPR TCE IOMMU Support"

	depends on PPC_POWERNV

	depends on PPC_POWERNV || PPC_PSERIES

	select IOMMU_API

	help

	  Enables bits of IOMMU API required by VFIO. The iommu_ops

drivers/vfio/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ menuconfig VFIO 
	tristate "VFIO Non-Privileged userspace driver framework"

	depends on IOMMU_API

	select VFIO_IOMMU_TYPE1 if X86

	select VFIO_IOMMU_SPAPR_TCE if PPC_POWERNV

	select VFIO_IOMMU_SPAPR_TCE if (PPC_POWERNV || PPC_PSERIES)

	help

	  VFIO provides a framework for secure userspace device drivers.

	  See Documentation/vfio.txt for more details.