iommu/vt-d: Populate debugfs if IOMMUs are detected
PATCH v2 1/1 iommu/vt-d: Populate debugfs if IOMMUs are detected
From: Megha Dey <[email protected]>
Currently, the intel iommu debugfs directory(/sys/kernel/debug/iommu/intel) gets populated only when DMA remapping is enabled (dmar_disabled = 0) irrespective of whether interrupt remapping is enabled or not.
Instead, populate the intel iommu debugfs directory if any IOMMUs are detected.
--- drivers/iommu/intel-iommu-debugfs.c | 11 ++++++++++- drivers/iommu/intel-iommu.c | 4 +++- 2 files changed, 13 insertions(+), 2 deletions(-)
Change log:v1->v2:
- Fix lock issue reported by Dan Carpenter <[email protected]>
drivers/iommu/intel-iommu-debugfs.c +10 -1
@@ -282,9 +282,16 @@ static int dmar_translation_struct_show(struct seq_file *m, void *unused) {struct dmar_drhd_unit *drhd;struct intel_iommu *iommu; +u32 sts;rcu_read_lock ();for_each_active_iommu (iommu, drhd) { + sts =dmar_readl (iommu->reg +DMAR_GSTS_REG ); +if (!(sts &DMA_GSTS_TES )) { +seq_printf (m,"DMA Remapping is not enabled on %s\n" , + iommu->name); +continue ; + }root_tbl_walk (m, iommu);seq_putc (m,'\n' ); }
@@ -425,6 +432,7 @@ static int ir_translation_struct_show(struct seq_file *m, void *unused)struct dmar_drhd_unit *drhd;struct intel_iommu *iommu;u64 irta; +u32 sts;rcu_read_lock ();for_each_active_iommu (iommu, drhd) {
@@ -434,7 +442,8 @@ static int ir_translation_struct_show(struct seq_file *m, void *unused)seq_printf (m,"Remapped Interrupt supported on IOMMU: %s\n" , iommu->name); -if (iommu->ir_table) { + sts =dmar_readl (iommu->reg +DMAR_GSTS_REG ); +if (iommu->ir_table && (sts &DMA_GSTS_IRES )) { irta =virt_to_phys (iommu->ir_table->base);seq_printf (m," IR table address:%llx\n" , irta);ir_tbl_remap_entry_show (m, iommu);
drivers/iommu/intel-iommu.c +3 -1
@@ -5130,6 +5130,9 @@ int __init intel_iommu_init(void)down_write (&dmar_global_lock); +if (!no_iommu) +intel_iommu_debugfs_init (); +if (no_iommu || dmar_disabled) {/* * We exit the function here to ensure IOMMU's remapping and
@@ -5225,7 +5228,6 @@ int __init intel_iommu_init(void)pr_info ("Intel(R) Virtualization Technology for Directed I/O\n" ); intel_iommu_enabled =1 ; -intel_iommu_debugfs_init ();return 0 ;
Signature · 6 lines
2.17.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Joerg Roedel
maintainerQuoted 9 lines · Lu Baolu
From: Megha Dey <[email protected]>
Currently, the intel iommu debugfs directory(/sys/kernel/debug/iommu/intel) gets populated only when DMA remapping is enabled (
dmar_disabled= 0) irrespective of whether interrupt remapping is enabled or not.Instead, populate the intel iommu debugfs directory if any IOMMUs are detected.
Quoted 8 lines
Cc Dan Carpenter <[email protected]>Fixes ee2636b8670b1 ("iommu/vt-d: Enable base Intel IOMMU debugfs support")Signed-off-by Megha Dey <[email protected]>Signed-off-by Lu Baolu <[email protected]>--- drivers/iommu/intel-iommu-debugfs.c | 11 ++++++++++- drivers/iommu/intel-iommu.c | 4 +++- 2 files changed, 13 insertions(+), 2 deletions(-)
Applied, thanks.
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu