diff options
| author |   Michael Ellerman <mpe@ellerman.id.au> | 2019-02-19 19:56:26 +1100 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2019-02-19 19:56:26 +1100 |
| commit | 637cfeb9f99ca097747139a5419bc23e0b885655 (patch) | |
| tree | 283fbe502c16ff79dfe93e10b565fc5c023be744 /arch/powerpc/platforms/powernv/pci-ioda.c | |
| parent | powerpc/powernv: Escalate reset when IODA reset fails (diff) | |
| parent | powerpc/64s: Fix possible corruption on big endian due to pgd/pud_present() (diff) | |
| download | linux-dev-637cfeb9f99ca097747139a5419bc23e0b885655.tar.xz linux-dev-637cfeb9f99ca097747139a5419bc23e0b885655.zip | |
Merge branch 'fixes' into next
There's a few important fixes in our fixes branch, in particular the
pgd/pud_present() one, so merge it now.
Diffstat (limited to 'arch/powerpc/platforms/powernv/pci-ioda.c')
| -rw-r--r-- | arch/powerpc/platforms/powernv/pci-ioda.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c index 53982f887a7f..4cb2f9a5e78f 100644 --- a/arch/powerpc/platforms/powernv/pci-ioda.c +++ b/arch/powerpc/platforms/powernv/pci-ioda.c @@ -2681,7 +2681,8 @@ static void pnv_pci_ioda_setup_iommu_api(void) list_for_each_entry(hose, &hose_list, list_node) { phb = hose->private_data; - if (phb->type == PNV_PHB_NPU_NVLINK) + if (phb->type == PNV_PHB_NPU_NVLINK || + phb->type == PNV_PHB_NPU_OCAPI) continue; list_for_each_entry(pe, &phb->ioda.pe_list, list) { |