pci/dmar: remove the noisy print out about unmapping
PATCH 1/1 pci/dmar: remove the noisy print out about unmapping
it seems this one should be removed. because map page does have this annonyed print out.
Signed-off-by Yinghai Lu <[email protected]>
--- drivers/pci/intel-iommu.c | 3 --- 1 file changed, 3 deletions(-)
drivers/pci/intel-iommu.c +0 -3
@@ -2633,9 +2633,6 @@ static void intel_unmap_page(struct devi start_addr = iova->pfn_lo <<PAGE_SHIFT ; size =aligned_size ((u64 )dev_addr, size); -pr_debug ("Device %s unmapping: %zx@%llx\n" , -pci_name (pdev), size, (unsigned long long )start_addr); -/* clear the whole page */ dma_pte_clear_range (domain, start_addr, start_addr + size);/* free page tables */
PATCH 1/1 pci/dmar: don't complain IOPAIC is not supported
INTR_REMAP handle that type
[Impact: cleanup]
Signed-off-by Yinghai Lu <[email protected]>
--- drivers/pci/dmar.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/pci/dmar.c +7 -3
@@ -129,9 +129,13 @@ static int __init dmar_parse_dev_scope(vif (scope->entry_type ==ACPI_DMAR_SCOPE_TYPE_ENDPOINT || scope->entry_type ==ACPI_DMAR_SCOPE_TYPE_BRIDGE ) (*cnt)++; -else - printk(KERN_WARNING PREFIX -"Unsupported device scope\n" ); +else { +#ifdef CONFIG_INTR_REMAP +if (scope->entry_type !=ACPI_DMAR_SCOPE_TYPE_IOAPIC ) +#endif + printk(KERN_WARNING PREFIX + "Unsupported device scope\n"); + } start += scope->length; }if (*cnt ==0 )
PATCH 1/1 pci/dmar: print out iommu seq_id
In reply to Yinghai Lumore info on multi iommu system.
Signed-off-by Yinghai Lu <[email protected]>
--- drivers/pci/dmar.c | 3 ++- drivers/pci/intel-iommu.c | 9 ++++++--- drivers/pci/intr_remapping.c | 6 +++--- 3 files changed, 11 insertions(+), 7 deletions(-)
drivers/pci/dmar.c +2 -1
@@ -669,7 +669,8 @@ int alloc_iommu(struct dmar_drhd_unit *d } ver =readl (iommu->reg +DMAR_VER_REG ); - pr_debug("IOMMU %llx: ver %d:%d cap %llx ecap %llx\n", + pr_debug("IOMMU %d: reg_base_addr %llx ver %d:%d cap %llx ecap %llx\n", + iommu->seq_id, (unsigned long long)drhd->reg_base_addr, DMAR_VER_MAJOR(ver), DMAR_VER_MINOR(ver), (unsigned long long)iommu->cap,
drivers/pci/intel-iommu.c +6 -3
@@ -1117,7 +1117,8 @@ static int iommu_init_domains(struct intunsigned long nlongs; ndomains =cap_ndoms (iommu->cap); -pr_debug ("Number of Domains supportd <%ld>\n" , ndomains); +pr_debug ("IOMMU %d: Number of Domains supportd <%ld>\n" , iommu->seq_id, + ndomains); nlongs =BITS_TO_LONGS (ndomains);/* TBD: there might be 64K domains,
@@ -2230,14 +2231,16 @@ int __init init_dmars(void)*/ iommu->flush.flush_context = __iommu_flush_context; iommu->flush.flush_iotlb = __iommu_flush_iotlb; -printk (KERN_INFO "IOMMU 0x%Lx: using Register based " +printk (KERN_INFO "IOMMU %d 0x%Lx: using Register based " "invalidation\n" , + iommu->seq_id, (unsigned long long )drhd->reg_base_addr); }else { iommu->flush.flush_context = qi_flush_context; iommu->flush.flush_iotlb = qi_flush_iotlb; -printk (KERN_INFO "IOMMU 0x%Lx: using Queued " +printk (KERN_INFO "IOMMU %d 0x%Lx: using Queued " "invalidation\n" , + iommu->seq_id, (unsigned long long )drhd->reg_base_addr); } }
drivers/pci/intr_remapping.c +3 -3
@@ -760,9 +760,9 @@ static int ir_parse_ioapic_scope(structreturn -1 ; } -printk (KERN_INFO "IOAPIC id %d under DRHD base" -" 0x%Lx\n" , scope->enumeration_id, - drhd->address); +printk (KERN_INFO "IOAPIC id %d under DRHD base " +" 0x%Lx IOMMU %d\n" , scope->enumeration_id, + drhd->address, iommu->seq_id);ir_parse_one_ioapic_scope (scope, iommu); }