lkml.org 
[lkml]   [2020]   [Sep]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 04/13] iommu: amd: Convert to using amd_io_pgtable
    Date
    Make use of the new struct amd_io_pgtable in preparation to remove
    the struct domain_pgtable.

    Signed-off-by: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
    ---
    drivers/iommu/amd/amd_iommu.h | 1 +
    drivers/iommu/amd/iommu.c | 25 ++++++++++---------------
    2 files changed, 11 insertions(+), 15 deletions(-)

    diff --git a/drivers/iommu/amd/amd_iommu.h b/drivers/iommu/amd/amd_iommu.h
    index da6e09657e00..22ecacb71675 100644
    --- a/drivers/iommu/amd/amd_iommu.h
    +++ b/drivers/iommu/amd/amd_iommu.h
    @@ -47,6 +47,7 @@ extern void amd_iommu_domain_direct_map(struct iommu_domain *dom);
    extern int amd_iommu_domain_enable_v2(struct iommu_domain *dom, int pasids);
    extern int amd_iommu_flush_page(struct iommu_domain *dom, int pasid,
    u64 address);
    +extern void amd_iommu_update_and_flush_device_table(struct protection_domain *domain);
    extern int amd_iommu_flush_tlb(struct iommu_domain *dom, int pasid);
    extern int amd_iommu_domain_set_gcr3(struct iommu_domain *dom, int pasid,
    unsigned long cr3);
    diff --git a/drivers/iommu/amd/iommu.c b/drivers/iommu/amd/iommu.c
    index c8b8619cc744..09da37c4c9c4 100644
    --- a/drivers/iommu/amd/iommu.c
    +++ b/drivers/iommu/amd/iommu.c
    @@ -90,8 +90,6 @@ struct kmem_cache *amd_iommu_irq_cache;

    static void update_domain(struct protection_domain *domain);
    static void detach_device(struct device *dev);
    -static void update_and_flush_device_table(struct protection_domain *domain,
    - struct domain_pgtable *pgtable);

    /****************************************************************************
    *
    @@ -1482,7 +1480,7 @@ static bool increase_address_space(struct protection_domain *domain,

    pgtable.root = pte;
    pgtable.mode += 1;
    - update_and_flush_device_table(domain, &pgtable);
    + amd_iommu_update_and_flush_device_table(domain);
    domain_flush_complete(domain);

    /*
    @@ -1857,17 +1855,16 @@ static void free_gcr3_table(struct protection_domain *domain)
    }

    static void set_dte_entry(u16 devid, struct protection_domain *domain,
    - struct domain_pgtable *pgtable,
    bool ats, bool ppr)
    {
    u64 pte_root = 0;
    u64 flags = 0;
    u32 old_domid;

    - if (pgtable->mode != PAGE_MODE_NONE)
    - pte_root = iommu_virt_to_phys(pgtable->root);
    + if (domain->iop.mode != PAGE_MODE_NONE)
    + pte_root = iommu_virt_to_phys(domain->iop.root);

    - pte_root |= (pgtable->mode & DEV_ENTRY_MODE_MASK)
    + pte_root |= (domain->iop.mode & DEV_ENTRY_MODE_MASK)
    << DEV_ENTRY_MODE_SHIFT;
    pte_root |= DTE_FLAG_IR | DTE_FLAG_IW | DTE_FLAG_V | DTE_FLAG_TV;

    @@ -1957,7 +1954,7 @@ static void do_attach(struct iommu_dev_data *dev_data,

    /* Update device table */
    amd_iommu_domain_get_pgtable(domain, &pgtable);
    - set_dte_entry(dev_data->devid, domain, &pgtable,
    + set_dte_entry(dev_data->devid, domain,
    ats, dev_data->iommu_v2);
    clone_aliases(dev_data->pdev);

    @@ -2263,22 +2260,20 @@ static int amd_iommu_domain_get_attr(struct iommu_domain *domain,
    *
    *****************************************************************************/

    -static void update_device_table(struct protection_domain *domain,
    - struct domain_pgtable *pgtable)
    +static void update_device_table(struct protection_domain *domain)
    {
    struct iommu_dev_data *dev_data;

    list_for_each_entry(dev_data, &domain->dev_list, list) {
    - set_dte_entry(dev_data->devid, domain, pgtable,
    + set_dte_entry(dev_data->devid, domain,
    dev_data->ats.enabled, dev_data->iommu_v2);
    clone_aliases(dev_data->pdev);
    }
    }

    -static void update_and_flush_device_table(struct protection_domain *domain,
    - struct domain_pgtable *pgtable)
    +void amd_iommu_update_and_flush_device_table(struct protection_domain *domain)
    {
    - update_device_table(domain, pgtable);
    + update_device_table(domain);
    domain_flush_devices(domain);
    }

    @@ -2288,7 +2283,7 @@ static void update_domain(struct protection_domain *domain)

    /* Update device table */
    amd_iommu_domain_get_pgtable(domain, &pgtable);
    - update_and_flush_device_table(domain, &pgtable);
    + amd_iommu_update_and_flush_device_table(domain);

    /* Flush domain TLB(s) and wait for completion */
    domain_flush_tlb_pde(domain);
    --
    2.17.1
    \
     
     \ /
      Last update: 2020-09-23 12:12    [W:3.245 / U:0.068 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site