tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds e60b5f79 6089a91f

+4
+2
arch/powerpc/platforms/powernv/pci-ioda.c
··· 1593 1593 1594 1594 pnv_pci_ioda2_setup_dma_pe(phb, pe); 1595 1595 #ifdef CONFIG_IOMMU_API 1596 + iommu_register_group(&pe->table_group, 1597 + pe->phb->hose->global_number, pe->pe_number); 1596 1598 pnv_ioda_setup_bus_iommu_group(pe, &pe->table_group, NULL); 1597 1599 #endif 1598 1600 }
+2
arch/powerpc/platforms/powernv/pci.c
··· 1147 1147 return 0; 1148 1148 1149 1149 pe = &phb->ioda.pe_array[pdn->pe_number]; 1150 + if (!pe->table_group.group) 1151 + return 0; 1150 1152 iommu_add_device(&pe->table_group, dev); 1151 1153 return 0; 1152 1154 case BUS_NOTIFY_DEL_DEVICE: