AMD/IOMMU: pass IOMMU to amd_iommu_alloc_intremap_table()

The function will want to know IOMMU properties (specifically the IRTE
size) subsequently.

Correct indentation of one of the call sites at this occasion.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>
Acked-by: Brian Woods <brian.woods@amd.com>
This commit is contained in:
Jan Beulich committed 2019-07-22 12:06:10 +02:00
1 parent 4e8e987562
commit 01dc6aa942
3 files changed
+8 -4

No files matched your search

+4 -2
View File
@@ -74,12 +74,14 @@ static void __init add_ivrs_mapping_entry(
/* allocate per-device interrupt remapping table */
if ( amd_iommu_perdev_intremap )
ivrs_mappings[alias_id].intremap_table =
amd_iommu_alloc_intremap_table(
&ivrs_mappings[alias_id].intremap_inuse);
amd_iommu_alloc_intremap_table(
iommu,
&ivrs_mappings[alias_id].intremap_inuse);
else
{
if ( shared_intremap_table == NULL )
shared_intremap_table = amd_iommu_alloc_intremap_table(
iommu,
&shared_intremap_inuse);
ivrs_mappings[alias_id].intremap_table = shared_intremap_table;
ivrs_mappings[alias_id].intremap_inuse = shared_intremap_inuse;
+2 -1
View File
@@ -622,7 +622,8 @@ int __init amd_iommu_free_intremap_table(
return 0;
}
void* __init amd_iommu_alloc_intremap_table(unsigned long **inuse_map)
void *__init amd_iommu_alloc_intremap_table(
const struct amd_iommu *iommu, unsigned long **inuse_map)
{
void *tb;
tb = __alloc_amd_iommu_tables(INTREMAP_TABLE_ORDER);
@@ -97,7 +97,8 @@ struct amd_iommu *find_iommu_for_device(int seg, int bdf);
/* interrupt remapping */
int amd_iommu_setup_ioapic_remapping(void);
void *amd_iommu_alloc_intremap_table(unsigned long **);
void *amd_iommu_alloc_intremap_table(
const struct amd_iommu *, unsigned long **);
int amd_iommu_free_intremap_table(
const struct amd_iommu *, struct ivrs_mappings *);
void amd_iommu_ioapic_update_ire(
Reference in new issue
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.