On Wed, 2008-02-27 at 18:28 +1100, Michael Ellerman wrote:
> The cell IOMMU code no longer needs to save the pte_offset variable
> separately, it is incorporated into tbl->it_offset.
>
> Signed-off-by: Michael Ellerman <[EMAIL PROTECTED]>
> ---
Do this work on spider ?
There is a subtle difference with spider is that the 0x80000000 you give
to devices disappears when reaching the iommu (so isn't to be catered
in the iommu offset).
It's a bit like the offset you have to add to the direct mapping on
axon, in fact (the 0x8000060000000000 or so ...)
Ben.
> arch/powerpc/platforms/cell/iommu.c | 5 +----
> 1 files changed, 1 insertions(+), 4 deletions(-)
>
> diff --git a/arch/powerpc/platforms/cell/iommu.c
> b/arch/powerpc/platforms/cell/iommu.c
> index 4e75919..555d264 100644
> --- a/arch/powerpc/platforms/cell/iommu.c
> +++ b/arch/powerpc/platforms/cell/iommu.c
> @@ -123,7 +123,6 @@ struct iommu_window {
> struct cbe_iommu *iommu;
> unsigned long offset;
> unsigned long size;
> - unsigned long pte_offset;
> unsigned int ioid;
> struct iommu_table table;
> };
> @@ -475,13 +474,11 @@ cell_iommu_setup_window(struct cbe_iommu *iommu, struct
> device_node *np,
> window->size = size;
> window->ioid = ioid;
> window->iommu = iommu;
> - window->pte_offset = pte_offset;
>
> window->table.it_blocksize = 16;
> window->table.it_base = (unsigned long)iommu->ptab;
> window->table.it_index = iommu->nid;
> - window->table.it_offset = (offset >> IOMMU_PAGE_SHIFT) +
> - window->pte_offset;
> + window->table.it_offset = (offset >> IOMMU_PAGE_SHIFT) + pte_offset;
> window->table.it_size = size >> IOMMU_PAGE_SHIFT;
>
> iommu_init_table(&window->table, iommu->nid);
_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@ozlabs.org
https://ozlabs.org/mailman/listinfo/linuxppc-dev
