[PATCH kernel] powerpc/ioda/iommu/debugfs: Generate unique debugfs entries

[PATCH kernel] powerpc/ioda/iommu/debugfs: Generate unique debugfs entries

[Alexey Kardashevskiy]

The iommu_table::it_index is a LIOBN which is not initialized on PowerNV
as it is not used except IOMMU debugfs where it is used for a node name.

This initializes it_index witn a unique number to avoid warnings and
have a node for every iommu_table.

This should not cause any behavioral change without CONFIG_IOMMU_DEBUGFS.

Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
---
 arch/powerpc/platforms/powernv/pci-ioda.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c
index c8cf2728031a..9de9b2fb163d 100644
--- a/arch/powerpc/platforms/powernv/pci-ioda.c
+++ b/arch/powerpc/platforms/powernv/pci-ioda.c
@@ -1609,6 +1609,7 @@ static void pnv_pci_ioda1_setup_dma_pe(struct pnv_phb *phb,
 	tbl->it_ops = &pnv_ioda1_iommu_ops;
 	pe->table_group.tce32_start = tbl->it_offset << tbl->it_page_shift;
 	pe->table_group.tce32_size = tbl->it_size << tbl->it_page_shift;
+	tbl->it_index = (phb->hose->global_number << 16) | pe->pe_number;
 	if (!iommu_init_table(tbl, phb->hose->node, 0, 0))
 		panic("Failed to initialize iommu table");
 
@@ -1779,6 +1780,7 @@ static long pnv_pci_ioda2_setup_default_config(struct pnv_ioda_pe *pe)
 		res_end = min(window_size, SZ_4G) >> tbl->it_page_shift;
 	}
 
+	tbl->it_index = (pe->phb->hose->global_number << 16) | pe->pe_number;
 	if (iommu_init_table(tbl, pe->phb->hose->node, res_start, res_end))
 		rc = pnv_pci_ioda2_set_window(&pe->table_group, 0, tbl);
 	else
-- 
2.30.2

Re: [PATCH kernel] powerpc/ioda/iommu/debugfs: Generate unique debugfs entries

[Michael Ellerman]

On Thu, 14 Jul 2022 18:08:00 +1000, Alexey Kardashevskiy wrote:
> The iommu_table::it_index is a LIOBN which is not initialized on PowerNV
> as it is not used except IOMMU debugfs where it is used for a node name.
> 
> This initializes it_index witn a unique number to avoid warnings and
> have a node for every iommu_table.
> 
> This should not cause any behavioral change without CONFIG_IOMMU_DEBUGFS.
> 
> [...]

Applied to powerpc/next.

[1/1] powerpc/ioda/iommu/debugfs: Generate unique debugfs entries
      https://git.kernel.org/powerpc/c/d73b46c3c1449bf27f793b9d9ee86ed70c7a7163

cheers