From: Tom Lendacky <thomas.lendacky@amd.com>
To: Borislav Petkov <bp@alien8.de>,
Ashish Kalra <ashish.kalra@amd.com>,
Michael Roth <michael.roth@amd.com>
Cc: LKML <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] crypto: ccp - Have it depend on AMD_IOMMU
Date: Fri, 9 Feb 2024 11:51:37 -0600 [thread overview]
Message-ID: <5e4670e5-acc8-adf3-2a3d-eb02db7ed990@amd.com> (raw)
In-Reply-To: <20240207204721.6189-1-bp@alien8.de>
On 2/7/24 14:47, Borislav Petkov wrote:
> From: "Borislav Petkov (AMD)" <bp@alien8.de>
>
> sev-dev.c calls code in the AMD IOMMU now but that can't really work if
> latter is not enabled in Kconfig:
>
> ld: vmlinux.o: in function `__sev_firmware_shutdown.isra.0':
> sev-dev.c:(.text+0x2501f0e): undefined reference to `amd_iommu_snp_disable'
> ld: vmlinux.o: in function `snp_rmptable_init':
> sev.c:(.init.text+0x26260): undefined reference to `amd_iommu_snp_en'
> make[2]: *** [scripts/Makefile.vmlinux:37: vmlinux] Error 1
> make: *** [Makefile:240: __sub-make] Error 2
>
> Fix those deps.
>
> Fixes: f366a8dac1b8 ("iommu/amd: Clean up RMP entries for IOMMU pages during SNP shutdown")
> Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
> ---
> drivers/crypto/ccp/Kconfig | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/crypto/ccp/Kconfig b/drivers/crypto/ccp/Kconfig
> index 32268e239bf1..f394e45e11ab 100644
> --- a/drivers/crypto/ccp/Kconfig
> +++ b/drivers/crypto/ccp/Kconfig
> @@ -38,7 +38,7 @@ config CRYPTO_DEV_CCP_CRYPTO
> config CRYPTO_DEV_SP_PSP
> bool "Platform Security Processor (PSP) device"
> default y
> - depends on CRYPTO_DEV_CCP_DD && X86_64
> + depends on CRYPTO_DEV_CCP_DD && X86_64 && AMD_IOMMU
Or should the ifdef around amd_iommu_snp_disable() in
include/linux/amd-iommu.h instead be:
#if defined(CONFIG_AMD_IOMMU) && defined(CONFIG_KVM_AMD_SEV)
and amd_iommu_snp_en be protected in arch/x86/include/asm/iommu.h as:
#ifdef CONFIG_AMD_IOMMU
extern bool amd_iommu_snp_en;
#else
#define amd_iommu_snp_en false
#endif
I think this would be better in case these should be referenced elsewhere
in the future.
Thanks,
Tom
> help
> Provide support for the AMD Platform Security Processor (PSP).
> The PSP is a dedicated processor that provides support for key
next prev parent reply other threads:[~2024-02-09 17:51 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-07 20:47 [PATCH] crypto: ccp - Have it depend on AMD_IOMMU Borislav Petkov
2024-02-09 17:51 ` Tom Lendacky [this message]
2024-02-11 20:18 ` Borislav Petkov
2024-02-13 11:30 ` [tip: x86/sev] " tip-bot2 for Borislav Petkov (AMD)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5e4670e5-acc8-adf3-2a3d-eb02db7ed990@amd.com \
--to=thomas.lendacky@amd.com \
--cc=ashish.kalra@amd.com \
--cc=bp@alien8.de \
--cc=linux-kernel@vger.kernel.org \
--cc=michael.roth@amd.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.