Skip to content

Commit 5e5ea7f

Browse files
committed
iommu/amd: fix SEV-TIO support reporting
Commit eeb9341 ("iommu/amd: Report SEV-TIO support") was confused about the config options that expose amd_iommu_sev_tio_supported(), and made the declaration (and alternative dummy function) conditional on the CONFIG_AMD_IOMMU config option. But the code is actually dependent on CONFIG_KVM_AMD_SEV, resulting in ERROR: modpost: "amd_iommu_sev_tio_supported" [drivers/crypto/ccp/ccp.ko] undefined! make[2]: *** [scripts/Makefile.modpost:147: Module.symvers] Error 1 if you have the AMD iommu enabled, but don't enable KVM_AMD_SEV support. Fix it by moving the declaration into the right #ifdef section in the header file. Fixes: eeb9341 ("iommu/amd: Report SEV-TIO support") Cc: Alexey Kardashevskiy <aik@amd.com> Cc: Joerg Roedel <joerg.roedel@amd.com> Cc: Vasant Hegde <vasant.hegde@amd.com> Cc: Tom Lendacky <thomas.lendacky@amd.com> Cc: Dan Williams <dan.j.williams@intel.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent b0319c4 commit 5e5ea7f

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

include/linux/amd-iommu.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,10 @@ struct task_struct;
1818
struct pci_dev;
1919

2020
extern void amd_iommu_detect(void);
21-
extern bool amd_iommu_sev_tio_supported(void);
2221

2322
#else /* CONFIG_AMD_IOMMU */
2423

2524
static inline void amd_iommu_detect(void) { }
26-
static inline bool amd_iommu_sev_tio_supported(void) { return false; }
2725

2826
#endif /* CONFIG_AMD_IOMMU */
2927

@@ -72,8 +70,10 @@ struct amd_iommu *get_amd_iommu(unsigned int idx);
7270

7371
#ifdef CONFIG_KVM_AMD_SEV
7472
int amd_iommu_snp_disable(void);
73+
extern bool amd_iommu_sev_tio_supported(void);
7574
#else
7675
static inline int amd_iommu_snp_disable(void) { return 0; }
76+
static inline bool amd_iommu_sev_tio_supported(void) { return false; }
7777
#endif
7878

7979
#endif /* _ASM_X86_AMD_IOMMU_H */

0 commit comments

Comments
 (0)