mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2026-03-08 18:26:12 +01:00
5e5ea7f616
Commiteeb934137d("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:eeb934137d("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>
80 lines
2.0 KiB
C
80 lines
2.0 KiB
C
/* SPDX-License-Identifier: GPL-2.0-only */
|
|
/*
|
|
* Copyright (C) 2007-2010 Advanced Micro Devices, Inc.
|
|
* Author: Joerg Roedel <joerg.roedel@amd.com>
|
|
* Leo Duran <leo.duran@amd.com>
|
|
*/
|
|
|
|
#ifndef _ASM_X86_AMD_IOMMU_H
|
|
#define _ASM_X86_AMD_IOMMU_H
|
|
|
|
#include <linux/types.h>
|
|
|
|
struct amd_iommu;
|
|
|
|
#ifdef CONFIG_AMD_IOMMU
|
|
|
|
struct task_struct;
|
|
struct pci_dev;
|
|
|
|
extern void amd_iommu_detect(void);
|
|
|
|
#else /* CONFIG_AMD_IOMMU */
|
|
|
|
static inline void amd_iommu_detect(void) { }
|
|
|
|
#endif /* CONFIG_AMD_IOMMU */
|
|
|
|
#if defined(CONFIG_AMD_IOMMU) && defined(CONFIG_IRQ_REMAP)
|
|
|
|
/* IOMMU AVIC Function */
|
|
extern int amd_iommu_register_ga_log_notifier(int (*notifier)(u32));
|
|
|
|
extern int amd_iommu_update_ga(void *data, int cpu, bool ga_log_intr);
|
|
extern int amd_iommu_activate_guest_mode(void *data, int cpu, bool ga_log_intr);
|
|
extern int amd_iommu_deactivate_guest_mode(void *data);
|
|
|
|
#else /* defined(CONFIG_AMD_IOMMU) && defined(CONFIG_IRQ_REMAP) */
|
|
|
|
static inline int
|
|
amd_iommu_register_ga_log_notifier(int (*notifier)(u32))
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static inline int amd_iommu_update_ga(void *data, int cpu, bool ga_log_intr)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static inline int amd_iommu_activate_guest_mode(void *data, int cpu, bool ga_log_intr)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static inline int amd_iommu_deactivate_guest_mode(void *data)
|
|
{
|
|
return 0;
|
|
}
|
|
#endif /* defined(CONFIG_AMD_IOMMU) && defined(CONFIG_IRQ_REMAP) */
|
|
|
|
int amd_iommu_get_num_iommus(void);
|
|
bool amd_iommu_pc_supported(void);
|
|
u8 amd_iommu_pc_get_max_banks(unsigned int idx);
|
|
u8 amd_iommu_pc_get_max_counters(unsigned int idx);
|
|
int amd_iommu_pc_set_reg(struct amd_iommu *iommu, u8 bank, u8 cntr, u8 fxn,
|
|
u64 *value);
|
|
int amd_iommu_pc_get_reg(struct amd_iommu *iommu, u8 bank, u8 cntr, u8 fxn,
|
|
u64 *value);
|
|
struct amd_iommu *get_amd_iommu(unsigned int idx);
|
|
|
|
#ifdef CONFIG_KVM_AMD_SEV
|
|
int amd_iommu_snp_disable(void);
|
|
extern bool amd_iommu_sev_tio_supported(void);
|
|
#else
|
|
static inline int amd_iommu_snp_disable(void) { return 0; }
|
|
static inline bool amd_iommu_sev_tio_supported(void) { return false; }
|
|
#endif
|
|
|
|
#endif /* _ASM_X86_AMD_IOMMU_H */
|