lkml.org 
[lkml]   [2009]   [Sep]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 01/14] x86/amd-iommu: Make fetch_pte aware of dynamic mapping levels
    Date
    This patch changes the fetch_pte function in the AMD IOMMU
    driver to support dynamic mapping levels.

    Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
    ---
    arch/x86/include/asm/amd_iommu_types.h | 9 +++++++++
    arch/x86/kernel/amd_iommu.c | 24 +++++++++++++-----------
    2 files changed, 22 insertions(+), 11 deletions(-)

    diff --git a/arch/x86/include/asm/amd_iommu_types.h b/arch/x86/include/asm/amd_iommu_types.h
    index 0c878ca..7fce4ef 100644
    --- a/arch/x86/include/asm/amd_iommu_types.h
    +++ b/arch/x86/include/asm/amd_iommu_types.h
    @@ -146,12 +146,21 @@
    #define PAGE_MODE_1_LEVEL 0x01
    #define PAGE_MODE_2_LEVEL 0x02
    #define PAGE_MODE_3_LEVEL 0x03
    +#define PAGE_MODE_4_LEVEL 0x04
    +#define PAGE_MODE_5_LEVEL 0x05
    +#define PAGE_MODE_6_LEVEL 0x06

    #define IOMMU_PDE_NL_0 0x000ULL
    #define IOMMU_PDE_NL_1 0x200ULL
    #define IOMMU_PDE_NL_2 0x400ULL
    #define IOMMU_PDE_NL_3 0x600ULL

    +#define PM_LEVEL_SHIFT(x) (12 + ((x) * 9))
    +#define PM_LEVEL_SIZE(x) (((x) < 6) ? \
    + ((1ULL << PM_LEVEL_SHIFT((x))) - 1): \
    + (0xffffffffffffffffULL))
    +#define PM_LEVEL_INDEX(x, a) (((a) >> PM_LEVEL_SHIFT((x))) & 0x1ffULL)
    +
    #define IOMMU_PTE_L2_INDEX(address) (((address) >> 30) & 0x1ffULL)
    #define IOMMU_PTE_L1_INDEX(address) (((address) >> 21) & 0x1ffULL)
    #define IOMMU_PTE_L0_INDEX(address) (((address) >> 12) & 0x1ffULL)
    diff --git a/arch/x86/kernel/amd_iommu.c b/arch/x86/kernel/amd_iommu.c
    index 6c99f50..29bcd35 100644
    --- a/arch/x86/kernel/amd_iommu.c
    +++ b/arch/x86/kernel/amd_iommu.c
    @@ -61,6 +61,8 @@ static u64* alloc_pte(struct protection_domain *dom,
    static void dma_ops_reserve_addresses(struct dma_ops_domain *dom,
    unsigned long start_page,
    unsigned int pages);
    +static u64 *fetch_pte(struct protection_domain *domain,
    + unsigned long address);

    #ifndef BUS_NOTIFY_UNBOUND_DRIVER
    #define BUS_NOTIFY_UNBOUND_DRIVER 0x0005
    @@ -670,24 +672,24 @@ static int init_unity_mappings_for_device(struct dma_ops_domain *dma_dom,
    * This function checks if there is a PTE for a given dma address. If
    * there is one, it returns the pointer to it.
    */
    -static u64* fetch_pte(struct protection_domain *domain,
    +static u64 *fetch_pte(struct protection_domain *domain,
    unsigned long address)
    {
    + int level;
    u64 *pte;

    - pte = &domain->pt_root[IOMMU_PTE_L2_INDEX(address)];
    + level = domain->mode - 1;
    + pte = &domain->pt_root[PM_LEVEL_INDEX(level, address)];

    - if (!IOMMU_PTE_PRESENT(*pte))
    - return NULL;
    + while (level > 0) {
    + if (!IOMMU_PTE_PRESENT(*pte))
    + return NULL;

    - pte = IOMMU_PTE_PAGE(*pte);
    - pte = &pte[IOMMU_PTE_L1_INDEX(address)];
    + level -= 1;

    - if (!IOMMU_PTE_PRESENT(*pte))
    - return NULL;
    -
    - pte = IOMMU_PTE_PAGE(*pte);
    - pte = &pte[IOMMU_PTE_L0_INDEX(address)];
    + pte = IOMMU_PTE_PAGE(*pte);
    + pte = &pte[PM_LEVEL_INDEX(level, address)];
    + }

    return pte;
    }
    --
    1.6.3.3



    \
     
     \ /
      Last update: 2009-09-04 11:45    [W:0.028 / U:29.236 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site