From: Mario Limonciello <mario.limonciello@amd.com>
To: "Jan Dąbroś" <jsd@semihalf.com>,
"Grzegorz Bernacki" <gjb@semihalf.com>,
"Thomas Rijo-john" <Rijo-john.Thomas@amd.com>,
"Lendacky Thomas" <Thomas.Lendacky@amd.com>,
herbert@gondor.apana.org.au,
"Sean Christopherson" <seanjc@google.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Brijesh Singh" <brijesh.singh@amd.com>,
"Tom Lendacky" <thomas.lendacky@amd.com>,
"John Allen" <john.allen@amd.com>,
"Jarkko Nikula" <jarkko.nikula@linux.intel.com>,
"Andy Shevchenko" <andriy.shevchenko@linux.intel.com>,
"Mika Westerberg" <mika.westerberg@linux.intel.com>
Cc: <linux-i2c@vger.kernel.org>, <linux-crypto@vger.kernel.org>,
<linux-kernel@vger.kernel.org>,
Mario Limonciello <mario.limonciello@amd.com>,
Thomas Gleixner <tglx@linutronix.de>,
"Ingo Molnar" <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
Dave Hansen <dave.hansen@linux.intel.com>, <x86@kernel.org>,
"H. Peter Anvin" <hpa@zytor.com>,
"David S. Miller" <davem@davemloft.net>,
Jens Wiklander <jens.wiklander@linaro.org>,
Sumit Garg <sumit.garg@linaro.org>, <kvm@vger.kernel.org>,
<op-tee@lists.trustedfirmware.org>
Subject: [PATCH 2/6] crypto: ccp: Add a header for multiple drivers to use `__psp_pa`
Date: Thu, 9 Feb 2023 16:38:04 -0600 [thread overview]
Message-ID: <20230209223811.4993-3-mario.limonciello@amd.com> (raw)
In-Reply-To: <20230209223811.4993-1-mario.limonciello@amd.com>
The TEE subdriver for CCP, the amdtee driver and the i2c-designware-amdpsp
drivers all include `psp-sev.h` even though they don't use SEV
functionality.
Move the definition of `__psp_pa` into a common header to be included
by all of these drivers.
Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
---
arch/x86/kvm/svm/sev.c | 1 +
drivers/crypto/ccp/sev-dev.c | 1 +
drivers/crypto/ccp/tee-dev.c | 2 +-
drivers/i2c/busses/i2c-designware-amdpsp.c | 2 +-
drivers/tee/amdtee/call.c | 2 +-
drivers/tee/amdtee/shm_pool.c | 2 +-
include/linux/psp-sev.h | 8 --------
include/linux/psp.h | 14 ++++++++++++++
8 files changed, 20 insertions(+), 12 deletions(-)
create mode 100644 include/linux/psp.h
diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c
index 86d6897f48068..ee8e9053f4468 100644
--- a/arch/x86/kvm/svm/sev.c
+++ b/arch/x86/kvm/svm/sev.c
@@ -11,6 +11,7 @@
#include <linux/kvm_host.h>
#include <linux/kernel.h>
#include <linux/highmem.h>
+#include <linux/psp.h>
#include <linux/psp-sev.h>
#include <linux/pagemap.h>
#include <linux/swap.h>
diff --git a/drivers/crypto/ccp/sev-dev.c b/drivers/crypto/ccp/sev-dev.c
index e2f25926eb514..28945ca7c8563 100644
--- a/drivers/crypto/ccp/sev-dev.c
+++ b/drivers/crypto/ccp/sev-dev.c
@@ -24,6 +24,7 @@
#include <linux/cpufeature.h>
#include <linux/fs.h>
#include <linux/fs_struct.h>
+#include <linux/psp.h>
#include <asm/smp.h>
#include <asm/cacheflush.h>
diff --git a/drivers/crypto/ccp/tee-dev.c b/drivers/crypto/ccp/tee-dev.c
index 5c9d47f3be375..f24fc953718a0 100644
--- a/drivers/crypto/ccp/tee-dev.c
+++ b/drivers/crypto/ccp/tee-dev.c
@@ -13,7 +13,7 @@
#include <linux/delay.h>
#include <linux/slab.h>
#include <linux/gfp.h>
-#include <linux/psp-sev.h>
+#include <linux/psp.h>
#include <linux/psp-tee.h>
#include "psp-dev.h"
diff --git a/drivers/i2c/busses/i2c-designware-amdpsp.c b/drivers/i2c/busses/i2c-designware-amdpsp.c
index 8f36167bce624..80f28a1bbbef6 100644
--- a/drivers/i2c/busses/i2c-designware-amdpsp.c
+++ b/drivers/i2c/busses/i2c-designware-amdpsp.c
@@ -4,7 +4,7 @@
#include <linux/bits.h>
#include <linux/i2c.h>
#include <linux/io-64-nonatomic-lo-hi.h>
-#include <linux/psp-sev.h>
+#include <linux/psp.h>
#include <linux/types.h>
#include <linux/workqueue.h>
diff --git a/drivers/tee/amdtee/call.c b/drivers/tee/amdtee/call.c
index cec6e70f0ac92..e8cd9aaa34675 100644
--- a/drivers/tee/amdtee/call.c
+++ b/drivers/tee/amdtee/call.c
@@ -8,7 +8,7 @@
#include <linux/tee_drv.h>
#include <linux/psp-tee.h>
#include <linux/slab.h>
-#include <linux/psp-sev.h>
+#include <linux/psp.h>
#include "amdtee_if.h"
#include "amdtee_private.h"
diff --git a/drivers/tee/amdtee/shm_pool.c b/drivers/tee/amdtee/shm_pool.c
index f87f96a291c99..f0303126f199d 100644
--- a/drivers/tee/amdtee/shm_pool.c
+++ b/drivers/tee/amdtee/shm_pool.c
@@ -5,7 +5,7 @@
#include <linux/slab.h>
#include <linux/tee_drv.h>
-#include <linux/psp-sev.h>
+#include <linux/psp.h>
#include "amdtee_private.h"
static int pool_op_alloc(struct tee_shm_pool *pool, struct tee_shm *shm,
diff --git a/include/linux/psp-sev.h b/include/linux/psp-sev.h
index 1595088c428b4..7fd17e82bab43 100644
--- a/include/linux/psp-sev.h
+++ b/include/linux/psp-sev.h
@@ -14,14 +14,6 @@
#include <uapi/linux/psp-sev.h>
-#ifdef CONFIG_X86
-#include <linux/mem_encrypt.h>
-
-#define __psp_pa(x) __sme_pa(x)
-#else
-#define __psp_pa(x) __pa(x)
-#endif
-
#define SEV_FW_BLOB_MAX_SIZE 0x4000 /* 16KB */
/**
diff --git a/include/linux/psp.h b/include/linux/psp.h
new file mode 100644
index 0000000000000..202162487ec3b
--- /dev/null
+++ b/include/linux/psp.h
@@ -0,0 +1,14 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#ifndef __PSP_H
+#define __PSP_H
+
+#ifdef CONFIG_X86
+#include <linux/mem_encrypt.h>
+
+#define __psp_pa(x) __sme_pa(x)
+#else
+#define __psp_pa(x) __pa(x)
+#endif
+
+#endif /* __PSP_H */
--
2.34.1
next prev parent reply other threads:[~2023-02-09 22:38 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-09 22:38 [PATCH 0/6] Export platform features from ccp driver Mario Limonciello
2023-02-09 22:38 ` [PATCH 1/6] crypto: ccp: Drop TEE support for IRQ handler Mario Limonciello
2023-02-09 22:38 ` Mario Limonciello [this message]
2023-02-14 8:40 ` [PATCH 2/6] crypto: ccp: Add a header for multiple drivers to use `__psp_pa` Jan Dąbroś
2023-02-15 11:13 ` Jarkko Nikula
2023-02-15 11:13 ` Sumit Garg
2023-02-09 22:38 ` [PATCH 3/6] crypto: ccp: Move some PSP mailbox bit definitions into common header Mario Limonciello
2023-02-14 9:04 ` Jan Dąbroś
2023-02-14 22:05 ` Limonciello, Mario
2023-02-16 14:23 ` Tom Lendacky
2023-02-09 22:38 ` [PATCH 4/6] crypto: ccp: Add support for an interface for platform features Mario Limonciello
2023-02-09 22:38 ` [PATCH 5/6] crypto: ccp: Enable platform access interface on client PSP parts Mario Limonciello
2023-02-09 22:38 ` [PATCH 6/6] i2c: designware: Use PCI PSP driver for communication Mario Limonciello
2023-02-10 10:43 ` Andy Shevchenko
2023-02-16 13:27 ` Jarkko Nikula
2023-02-16 13:29 ` Mario Limonciello
2023-02-16 14:56 ` Andy Shevchenko
2023-02-16 20:55 ` Limonciello, Mario
2023-02-16 20:59 ` Andy Shevchenko
2023-02-16 21:01 ` Limonciello, Mario
2023-02-16 21:16 ` Andy Shevchenko
2023-02-16 21:27 ` Limonciello, Mario
2023-02-17 11:05 ` Andy Shevchenko
2023-02-17 11:05 ` Andy Shevchenko
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=20230209223811.4993-3-mario.limonciello@amd.com \
--to=mario.limonciello@amd.com \
--cc=Rijo-john.Thomas@amd.com \
--cc=Thomas.Lendacky@amd.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=bp@alien8.de \
--cc=brijesh.singh@amd.com \
--cc=dave.hansen@linux.intel.com \
--cc=davem@davemloft.net \
--cc=gjb@semihalf.com \
--cc=herbert@gondor.apana.org.au \
--cc=hpa@zytor.com \
--cc=jarkko.nikula@linux.intel.com \
--cc=jens.wiklander@linaro.org \
--cc=john.allen@amd.com \
--cc=jsd@semihalf.com \
--cc=kvm@vger.kernel.org \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mika.westerberg@linux.intel.com \
--cc=mingo@redhat.com \
--cc=op-tee@lists.trustedfirmware.org \
--cc=pbonzini@redhat.com \
--cc=seanjc@google.com \
--cc=sumit.garg@linaro.org \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox