Commit be280ea7 authored by Joerg Roedel's avatar Joerg Roedel
Browse files

iommu/amd: Fix compile warning in init code 



A recent commit introduced these compile warnings:

  CC      drivers/iommu/amd/init.o
drivers/iommu/amd/init.c:938:12: error: ‘iommu_init_ga_log’ defined but not used [-Werror=unused-function]
  938 | static int iommu_init_ga_log(struct amd_iommu *iommu)
      |            ^~~~~~~~~~~~~~~~~
drivers/iommu/amd/init.c:902:12: error: ‘iommu_ga_log_enable’ defined but not used [-Werror=unused-function]
  902 | static int iommu_ga_log_enable(struct amd_iommu *iommu)
      |            ^~~~~~~~~~~~~~~~~~~

The warnings appear because both functions are defined when IRQ
remapping is not enabled, but only used when IRQ remapping is enabled.

Fix it by only defining the functions when IRQ remapping is enabled.

Fixes: c5e1a1eb ("iommu/amd: Simplify and Consolidate Virtual APIC (AVIC) Enablement")
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
Link: https://lore.kernel.org/r/20220729100432.22474-1-joro@8bytes.org
parent 432e5dfc

drivers/iommu/amd/init.c

+3 −6
Original line number Diff line number Diff line
@@ -899,9 +899,9 @@ static void free_ga_log(struct amd_iommu *iommu) 
#endif

}



#ifdef CONFIG_IRQ_REMAP

static int iommu_ga_log_enable(struct amd_iommu *iommu)

{

#ifdef CONFIG_IRQ_REMAP

	u32 status, i;

	u64 entry;
@@ -931,13 +931,12 @@ static int iommu_ga_log_enable(struct amd_iommu *iommu) 


	if (WARN_ON(i >= LOOP_TIMEOUT))

		return -EINVAL;

#endif /* CONFIG_IRQ_REMAP */



	return 0;

}



static int iommu_init_ga_log(struct amd_iommu *iommu)

{

#ifdef CONFIG_IRQ_REMAP

	if (!AMD_IOMMU_GUEST_IR_VAPIC(amd_iommu_guest_ir))

		return 0;
@@ -955,10 +954,8 @@ static int iommu_init_ga_log(struct amd_iommu *iommu) 
err_out:

	free_ga_log(iommu);

	return -EINVAL;

#else

	return 0;

#endif /* CONFIG_IRQ_REMAP */

}

#endif /* CONFIG_IRQ_REMAP */



static int __init alloc_cwwb_sem(struct amd_iommu *iommu)

{