lkml.org 
[lkml]   [2018]   [Mar]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 08/10] iommu/amd: factor out setting the remap table for a devid
    Date
    Setting the IRQ remap table for a specific devid (or its alias devid)
    includes three steps. Those three steps are always repeated each time
    this is done.
    Introduce a new helper function, move those steps there and use that
    function instead. The compiler can still decide if it is worth to
    inline.

    Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
    ---
    drivers/iommu/amd_iommu.c | 23 ++++++++++++-----------
    1 file changed, 12 insertions(+), 11 deletions(-)

    diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
    index 6ee8ef22ad51..7dd4c27a941d 100644
    --- a/drivers/iommu/amd_iommu.c
    +++ b/drivers/iommu/amd_iommu.c
    @@ -3602,6 +3602,14 @@ static void set_dte_irq_entry(u16 devid, struct irq_remap_table *table)
    amd_iommu_dev_table[devid].data[2] = dte;
    }

    +static void set_remap_table_entry(struct amd_iommu *iommu, u16 devid,
    + struct irq_remap_table *table)
    +{
    + irq_lookup_table[devid] = table;
    + set_dte_irq_entry(devid, table);
    + iommu_flush_dte(iommu, devid);
    +}
    +
    static struct irq_remap_table *get_irq_table(u16 devid)
    {
    struct irq_remap_table *table = NULL;
    @@ -3622,9 +3630,7 @@ static struct irq_remap_table *get_irq_table(u16 devid)
    alias = amd_iommu_alias_table[devid];
    table = irq_lookup_table[alias];
    if (table) {
    - irq_lookup_table[devid] = table;
    - set_dte_irq_entry(devid, table);
    - iommu_flush_dte(iommu, devid);
    + set_remap_table_entry(iommu, devid, table);
    goto out;
    }

    @@ -3651,14 +3657,9 @@ static struct irq_remap_table *get_irq_table(u16 devid)
    (MAX_IRQS_PER_TABLE * (sizeof(u64) * 2)));


    - irq_lookup_table[devid] = table;
    - set_dte_irq_entry(devid, table);
    - iommu_flush_dte(iommu, devid);
    - if (devid != alias) {
    - irq_lookup_table[alias] = table;
    - set_dte_irq_entry(alias, table);
    - iommu_flush_dte(iommu, alias);
    - }
    + set_remap_table_entry(iommu, devid, table);
    + if (devid != alias)
    + set_remap_table_entry(iommu, alias, table);

    out:
    iommu_completion_wait(iommu);
    --
    2.16.2
    \
     
     \ /
      Last update: 2018-03-16 21:21    [W:4.044 / U:0.160 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site