iommu/amd: Introduce per PCI segment rlookup table size

It will replace global "rlookup_table_size" variable.

Co-developed-by: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
Signed-off-by: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
Signed-off-by: Vasant Hegde <vasant.hegde@amd.com>
Link: https://lore.kernel.org/r/20220706113825.25582-14-vasant.hegde@amd.com
Signed-off-by: Joerg Roedel <jroedel@suse.de>

diff --git a/drivers/iommu/amd/amd_iommu_types.h b/drivers/iommu/amd/amd_iommu_types.h
index 8638b1107dd206097548f80274dda81685772433..8d2d5fbdb57f21332be02593b7d45d63c3675716 100644 (file)
--- a/drivers/iommu/amd/amd_iommu_types.h
+++ b/drivers/iommu/amd/amd_iommu_types.h
@@ -561,6 +561,9 @@ struct amd_iommu_pci_seg {
        /* Size of the alias table */
        u32 alias_table_size;
 
+       /* Size of the rlookup table */
+       u32 rlookup_table_size;
+
        /*
         * device table virtual address
         *

diff --git a/drivers/iommu/amd/init.c b/drivers/iommu/amd/init.c
index b878a50e856dab26286ee446f21010d4ef87b28f..2f1cdc8bd24cdacff499dc2de29076559a060bb1 100644 (file)
--- a/drivers/iommu/amd/init.c
+++ b/drivers/iommu/amd/init.c
@@ -672,7 +672,7 @@ static inline int __init alloc_rlookup_table(struct amd_iommu_pci_seg *pci_seg)
 {
        pci_seg->rlookup_table = (void *)__get_free_pages(
                                                GFP_KERNEL | __GFP_ZERO,
-                                               get_order(rlookup_table_size));
+                                               get_order(pci_seg->rlookup_table_size));
        if (pci_seg->rlookup_table == NULL)
                return -ENOMEM;
 
@@ -682,7 +682,7 @@ static inline int __init alloc_rlookup_table(struct amd_iommu_pci_seg *pci_seg)
 static inline void free_rlookup_table(struct amd_iommu_pci_seg *pci_seg)
 {
        free_pages((unsigned long)pci_seg->rlookup_table,
-                  get_order(rlookup_table_size));
+                  get_order(pci_seg->rlookup_table_size));
        pci_seg->rlookup_table = NULL;
 }
 
@@ -690,9 +690,9 @@ static inline int __init alloc_irq_lookup_table(struct amd_iommu_pci_seg *pci_se
 {
        pci_seg->irq_lookup_table = (void *)__get_free_pages(
                                             GFP_KERNEL | __GFP_ZERO,
-                                            get_order(rlookup_table_size));
+                                            get_order(pci_seg->rlookup_table_size));
        kmemleak_alloc(pci_seg->irq_lookup_table,
-                      rlookup_table_size, 1, GFP_KERNEL);
+                      pci_seg->rlookup_table_size, 1, GFP_KERNEL);
        if (pci_seg->irq_lookup_table == NULL)
                return -ENOMEM;
 
@@ -703,7 +703,7 @@ static inline void free_irq_lookup_table(struct amd_iommu_pci_seg *pci_seg)
 {
        kmemleak_free(pci_seg->irq_lookup_table);
        free_pages((unsigned long)pci_seg->irq_lookup_table,
-                  get_order(rlookup_table_size));
+                  get_order(pci_seg->rlookup_table_size));
        pci_seg->irq_lookup_table = NULL;
 }
 
@@ -1584,6 +1584,7 @@ static struct amd_iommu_pci_seg *__init alloc_pci_segment(u16 id,
        DUMP_printk("PCI segment : 0x%0x, last bdf : 0x%04x\n", id, last_bdf);
        pci_seg->dev_table_size     = tbl_size(DEV_TABLE_ENTRY_SIZE);
        pci_seg->alias_table_size   = tbl_size(ALIAS_TABLE_ENTRY_SIZE);
+       pci_seg->rlookup_table_size = tbl_size(RLOOKUP_TABLE_ENTRY_SIZE);
 
        pci_seg->id = id;
        init_llist_head(&pci_seg->dev_data_list);