From fd113b172d4e75cc66f4d08e261e2950f9c29f69 Mon Sep 17 00:00:00 2001 From: Alexey Kardashevskiy Date: Tue, 4 Sep 2012 15:19:35 +0000 Subject: [PATCH] --- yaml --- r: 330301 b: refs/heads/master c: 11f63d3fb9c4257b1f005db8d11deba9f992bdf6 h: refs/heads/master i: 330299: 5883e2ab9e74216d082ec7d2d1f59d623536d0a0 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/platforms/powernv/pci.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 8c2a77e0df84..d8af1d13a0d2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4715fed600109e0bd3d6cfa2b925a643173a08b4 +refs/heads/master: 11f63d3fb9c4257b1f005db8d11deba9f992bdf6 diff --git a/trunk/arch/powerpc/platforms/powernv/pci.c b/trunk/arch/powerpc/platforms/powernv/pci.c index 1e908aef4201..c01688a1a741 100644 --- a/trunk/arch/powerpc/platforms/powernv/pci.c +++ b/trunk/arch/powerpc/platforms/powernv/pci.c @@ -446,6 +446,11 @@ static void pnv_tce_free(struct iommu_table *tbl, long index, long npages) pnv_tce_invalidate(tbl, tces, tcep - 1); } +static unsigned long pnv_tce_get(struct iommu_table *tbl, long index) +{ + return ((u64 *)tbl->it_base)[index - tbl->it_offset]; +} + void pnv_pci_setup_iommu_table(struct iommu_table *tbl, void *tce_mem, u64 tce_size, u64 dma_offset) @@ -596,6 +601,7 @@ void __init pnv_pci_init(void) ppc_md.pci_dma_dev_setup = pnv_pci_dma_dev_setup; ppc_md.tce_build = pnv_tce_build; ppc_md.tce_free = pnv_tce_free; + ppc_md.tce_get = pnv_tce_get; ppc_md.pci_probe_mode = pnv_pci_probe_mode; set_pci_dma_ops(&dma_iommu_ops);