1. 01 2月, 2008 38 次提交
  2. 31 1月, 2008 2 次提交
    • L
      Merge branch 'for-2.6.25' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc · 8af03e78
      Linus Torvalds 提交于
      * 'for-2.6.25' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (454 commits)
        [POWERPC] Cell IOMMU fixed mapping support
        [POWERPC] Split out the ioid fetching/checking logic
        [POWERPC] Add support to cell_iommu_setup_page_tables() for multiple windows
        [POWERPC] Split out the IOMMU logic from cell_dma_dev_setup()
        [POWERPC] Split cell_iommu_setup_hardware() into two parts
        [POWERPC] Split out the logic that allocates struct iommus
        [POWERPC] Allocate the hash table under 1G on cell
        [POWERPC] Add set_dma_ops() to match get_dma_ops()
        [POWERPC] 83xx: Clean up / convert mpc83xx board DTS files to v1 format.
        [POWERPC] 85xx: Only invalidate TLB0 and TLB1
        [POWERPC] 83xx: Fix typo in mpc837x compatible entries
        [POWERPC] 85xx: convert sbc85* boards to use machine_device_initcall
        [POWERPC] 83xx: rework platform Kconfig
        [POWERPC] 85xx: rework platform Kconfig
        [POWERPC] 86xx: Remove unused IRQ defines
        [POWERPC] QE: Explicitly set address-cells and size cells for muram
        [POWERPC] Convert StorCenter DTS file to /dts-v1/ format.
        [POWERPC] 86xx: Convert all 86xx DTS files to /dts-v1/ format.
        [PPC] Remove 85xx from arch/ppc
        [PPC] Remove 83xx from arch/ppc
        ...
      8af03e78
    • M
      [POWERPC] Cell IOMMU fixed mapping support · 99e13912
      Michael Ellerman 提交于
      This patch adds support for setting up a fixed IOMMU mapping on certain
      cell machines.  For 64-bit devices this avoids the performance overhead of
      mapping and unmapping pages at runtime.  32-bit devices are unable to use
      the fixed mapping.
      
      The fixed mapping is established at boot, and maps all of physical memory
      1:1 into device space at some offset.  On machines with < 30 GB of memory
      we setup the fixed mapping immediately above the normal IOMMU window.
      
      For example a machine with 4GB of memory would end up with the normal
      IOMMU window from 0-2GB and the fixed mapping window from 2GB to 6GB. In
      this case a 64-bit device wishing to DMA to 1GB would be told to DMA to
      3GB, plus any offset required by firmware.  The firmware offset is encoded
      in the "dma-ranges" property.
      
      On machines with 30GB or more of memory, we are unable to place the fixed
      mapping above the normal IOMMU window as we would run out of address space.
      Instead we move the normal IOMMU window to coincide with the hash page
      table, this region does not need to be part of the fixed mapping as no
      device should ever be DMA'ing to it.  We then setup the fixed mapping
      from 0 to 32GB.
      Signed-off-by: NMichael Ellerman <michael@ellerman.id.au>
      Acked-by: NArnd Bergmann <arnd@arndb.de>
      Signed-off-by: NPaul Mackerras <paulus@samba.org>
      99e13912