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

Commit b5926430 authored by Alexey Kardashevskiy's avatar Alexey Kardashevskiy Committed by Michael Ellerman
Browse files

powerpc/iommu/ioda2: Enable compile with IOV=on and IOMMU_API=off 



The pnv_pci_ioda2_unset_window() function is used to do the final
cleanup of a DMA window being released:
- via VFIO ioctl by the guest request;
- via unplugging a virtual PCI function.
However the function was under #ifdef CONFIG_IOMMU_API and was missing.

This moves the helper outside of IOMMU_API block and enables it
for either or both IOMMU_API and PCI_IOV.

Signed-off-by: default avatarAlexey Kardashevskiy <aik@ozlabs.ru>
Reviewed-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent cdf2bc1c

arch/powerpc/platforms/powernv/pci-ioda.c

+26 −24
Original line number Diff line number Diff line
@@ -2116,6 +2116,32 @@ static long pnv_pci_ioda2_setup_default_config(struct pnv_ioda_pe *pe) 
	return 0;

}



#if defined(CONFIG_IOMMU_API) || defined(CONFIG_PCI_IOV)

static long pnv_pci_ioda2_unset_window(struct iommu_table_group *table_group,

		int num)

{

	struct pnv_ioda_pe *pe = container_of(table_group, struct pnv_ioda_pe,

			table_group);

	struct pnv_phb *phb = pe->phb;

	long ret;



	pe_info(pe, "Removing DMA window #%d\n", num);



	ret = opal_pci_map_pe_dma_window(phb->opal_id, pe->pe_number,

			(pe->pe_number << 1) + num,

			0/* levels */, 0/* table address */,

			0/* table size */, 0/* page size */);

	if (ret)

		pe_warn(pe, "Unmapping failed, ret = %ld\n", ret);

	else

		pnv_pci_ioda2_tce_invalidate_entire(pe);



	pnv_pci_unlink_table_and_group(table_group->tables[num], table_group);



	return ret;

}

#endif



#ifdef CONFIG_IOMMU_API

static unsigned long pnv_pci_ioda2_get_table_size(__u32 page_shift,

		__u64 window_size, __u32 levels)
@@ -2149,30 +2175,6 @@ static unsigned long pnv_pci_ioda2_get_table_size(__u32 page_shift, 
	return bytes;

}



static long pnv_pci_ioda2_unset_window(struct iommu_table_group *table_group,

		int num)

{

	struct pnv_ioda_pe *pe = container_of(table_group, struct pnv_ioda_pe,

			table_group);

	struct pnv_phb *phb = pe->phb;

	long ret;



	pe_info(pe, "Removing DMA window #%d\n", num);



	ret = opal_pci_map_pe_dma_window(phb->opal_id, pe->pe_number,

			(pe->pe_number << 1) + num,

			0/* levels */, 0/* table address */,

			0/* table size */, 0/* page size */);

	if (ret)

		pe_warn(pe, "Unmapping failed, ret = %ld\n", ret);

	else

		pnv_pci_ioda2_tce_invalidate_entire(pe);



	pnv_pci_unlink_table_and_group(table_group->tables[num], table_group);



	return ret;

}



static void pnv_ioda2_take_ownership(struct iommu_table_group *table_group)

{

	struct pnv_ioda_pe *pe = container_of(table_group, struct pnv_ioda_pe,