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

Commit e60b5f79 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'powerpc-5.0-6' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux 

Pull powerpc fix from Michael Ellerman:
 "One fix for an oops when using SRIOV, introduced by the recent changes
  to support compound IOMMU groups.

  Thanks to Alexey Kardashevskiy"

* tag 'powerpc-5.0-6' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc/powernv/sriov: Register IOMMU groups for VFs
parents 6089a91f 8f5b2734

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

+2 −0
Original line number Diff line number Diff line
@@ -1593,6 +1593,8 @@ static void pnv_ioda_setup_vf_PE(struct pci_dev *pdev, u16 num_vfs) 


		pnv_pci_ioda2_setup_dma_pe(phb, pe);

#ifdef CONFIG_IOMMU_API

		iommu_register_group(&pe->table_group,

				pe->phb->hose->global_number, pe->pe_number);

		pnv_ioda_setup_bus_iommu_group(pe, &pe->table_group, NULL);

#endif

	}

arch/powerpc/platforms/powernv/pci.c

+2 −0
Original line number Diff line number Diff line
@@ -1147,6 +1147,8 @@ static int pnv_tce_iommu_bus_notifier(struct notifier_block *nb, 
			return 0;



		pe = &phb->ioda.pe_array[pdn->pe_number];

		if (!pe->table_group.group)

			return 0;

		iommu_add_device(&pe->table_group, dev);

		return 0;

	case BUS_NOTIFY_DEL_DEVICE: