iommu/amd: Introduce per PCI segment alias table size

It will replace global "alias_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-13-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 1dbe9c7f973d2fccc2ea299e92c33718dcedf519..8638b1107dd206097548f80274dda81685772433 100644 (file)
--- a/drivers/iommu/amd/amd_iommu_types.h
+++ b/drivers/iommu/amd/amd_iommu_types.h
@@ -558,6 +558,9 @@ struct amd_iommu_pci_seg {
        /* Size of the device table */
        u32 dev_table_size;
 
+       /* Size of the alias table */
+       u32 alias_table_size;
+
        /*
         * device table virtual address
         *

diff --git a/drivers/iommu/amd/init.c b/drivers/iommu/amd/init.c
index 2950184d5540d59e7cafd9167c6fc8e74802e9a7..b878a50e856dab26286ee446f21010d4ef87b28f 100644 (file)
--- a/drivers/iommu/amd/init.c
+++ b/drivers/iommu/amd/init.c
@@ -712,7 +712,7 @@ static int __init alloc_alias_table(struct amd_iommu_pci_seg *pci_seg)
        int i;
 
        pci_seg->alias_table = (void *)__get_free_pages(GFP_KERNEL,
-                                                   get_order(alias_table_size));
+                                       get_order(pci_seg->alias_table_size));
        if (!pci_seg->alias_table)
                return -ENOMEM;
 
@@ -728,7 +728,7 @@ static int __init alloc_alias_table(struct amd_iommu_pci_seg *pci_seg)
 static void __init free_alias_table(struct amd_iommu_pci_seg *pci_seg)
 {
        free_pages((unsigned long)pci_seg->alias_table,
-                  get_order(alias_table_size));
+                  get_order(pci_seg->alias_table_size));
        pci_seg->alias_table = NULL;
 }
 
@@ -1583,6 +1583,7 @@ static struct amd_iommu_pci_seg *__init alloc_pci_segment(u16 id,
        pci_seg->last_bdf = last_bdf;
        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->id = id;
        init_llist_head(&pci_seg->dev_data_list);