lkml.org 
[lkml]   [2014]   [Jan]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[Patch Part1 V3 07/20] iommu/vt-d, trivial: check suitable flag in function detect_intel_iommu()
    Date
    Flag irq_remapping_enabled is only set by intel_enable_irq_remapping(),
    which is called after detect_intel_iommu(). So moving pr_info() from
    detect_intel_iommu() to intel_enable_irq_remapping(), which also
    slightly simplifies implementation.

    Reviewed-by: Yijing Wang <wangyijing@huawei.com>
    Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
    ---
    drivers/iommu/dmar.c | 8 --------
    drivers/iommu/intel_irq_remapping.c | 2 ++
    2 files changed, 2 insertions(+), 8 deletions(-)

    diff --git a/drivers/iommu/dmar.c b/drivers/iommu/dmar.c
    index c17dbf7..5e7ba3b 100644
    --- a/drivers/iommu/dmar.c
    +++ b/drivers/iommu/dmar.c
    @@ -556,14 +556,6 @@ int __init detect_intel_iommu(void)
    if (ret)
    ret = check_zero_address();
    {
    - struct acpi_table_dmar *dmar;
    -
    - dmar = (struct acpi_table_dmar *) dmar_tbl;
    -
    - if (ret && irq_remapping_enabled && cpu_has_x2apic &&
    - dmar->flags & 0x1)
    - pr_info("Queued invalidation will be enabled to support x2apic and Intr-remapping.\n");
    -
    if (ret && !no_iommu && !iommu_detected && !dmar_disabled) {
    iommu_detected = 1;
    /* Make sure ACS will be enabled */
    diff --git a/drivers/iommu/intel_irq_remapping.c b/drivers/iommu/intel_irq_remapping.c
    index deef3d4..2616e8a 100644
    --- a/drivers/iommu/intel_irq_remapping.c
    +++ b/drivers/iommu/intel_irq_remapping.c
    @@ -561,6 +561,8 @@ static int __init intel_enable_irq_remapping(void)
    }

    if (x2apic_present) {
    + pr_info("Queued invalidation will be enabled to support x2apic and Intr-remapping.\n");
    +
    eim = !dmar_x2apic_optout();
    if (!eim)
    printk(KERN_WARNING
    --
    1.7.10.4


    \
     
     \ /
      Last update: 2014-01-06 08:01    [W:4.246 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site