* [PATCH 0/6] Export platform features from ccp driver
@ 2023-02-09 22:38 Mario Limonciello
2023-02-09 22:38 ` [PATCH 2/6] crypto: ccp: Add a header for multiple drivers to use `__psp_pa` Mario Limonciello
0 siblings, 1 reply; 5+ messages in thread
From: Mario Limonciello @ 2023-02-09 22:38 UTC (permalink / raw)
To: Jan Dąbroś,
Grzegorz Bernacki, Thomas Rijo-john, Lendacky Thomas, herbert,
Andy Shevchenko, Mika Westerberg, kvm, linux-crypto, linux-i2c
Cc: linux-kernel, Mario Limonciello, H. Peter Anvin, Sumit Garg, op-tee
The i2c-designware-amdpsp driver communicates with a platform
features mailbox provided by the PSP. The address used for
communication is discovered via a non-architecturally
guaranteed mechanism.
To better scale, export a feature for communication with platform
features directly from the ccp driver.
Mario Limonciello (6):
crypto: ccp: Drop TEE support for IRQ handler
crypto: ccp: Add a header for multiple drivers to use `__psp_pa`
crypto: ccp: Move some PSP mailbox bit definitions into common header
crypto: ccp: Add support for an interface for platform features
crypto: ccp: Enable platform access interface on client PSP parts
i2c: designware: Use PCI PSP driver for communication
arch/x86/kvm/svm/sev.c | 1 +
drivers/crypto/ccp/Makefile | 3 +-
drivers/crypto/ccp/platform-access.c | 166 ++++++++++++++++++++
drivers/crypto/ccp/platform-access.h | 34 ++++
drivers/crypto/ccp/psp-dev.c | 32 ++--
drivers/crypto/ccp/psp-dev.h | 11 +-
drivers/crypto/ccp/sev-dev.c | 16 +-
drivers/crypto/ccp/sev-dev.h | 2 +-
drivers/crypto/ccp/sp-dev.h | 7 +
drivers/crypto/ccp/sp-pci.c | 7 +
drivers/crypto/ccp/tee-dev.c | 17 +-
drivers/i2c/busses/Kconfig | 2 +-
drivers/i2c/busses/i2c-designware-amdpsp.c | 149 +-----------------
drivers/i2c/busses/i2c-designware-core.h | 1 -
drivers/i2c/busses/i2c-designware-platdrv.c | 1 -
drivers/tee/amdtee/call.c | 2 +-
drivers/tee/amdtee/shm_pool.c | 2 +-
include/linux/psp-platform-access.h | 50 ++++++
include/linux/psp-sev.h | 8 -
include/linux/psp.h | 26 +++
20 files changed, 340 insertions(+), 197 deletions(-)
create mode 100644 drivers/crypto/ccp/platform-access.c
create mode 100644 drivers/crypto/ccp/platform-access.h
create mode 100644 include/linux/psp-platform-access.h
create mode 100644 include/linux/psp.h
base-commit: c7410b425de40e9b163eef781e1bdacf1bf2962e
--
2.34.1
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 2/6] crypto: ccp: Add a header for multiple drivers to use `__psp_pa`
2023-02-09 22:38 [PATCH 0/6] Export platform features from ccp driver Mario Limonciello
@ 2023-02-09 22:38 ` Mario Limonciello
2023-02-14 8:40 ` Jan Dąbroś
2023-02-15 11:13 ` Sumit Garg
0 siblings, 2 replies; 5+ messages in thread
From: Mario Limonciello @ 2023-02-09 22:38 UTC (permalink / raw)
To: Jan Dąbroś,
Grzegorz Bernacki, Thomas Rijo-john, Lendacky Thomas, herbert,
Sean Christopherson, Paolo Bonzini, Brijesh Singh, Tom Lendacky,
John Allen, Jarkko Nikula, Andy Shevchenko, Mika Westerberg
Cc: linux-i2c, linux-crypto, linux-kernel, Mario Limonciello,
Thomas Gleixner, Ingo Molnar, Borislav Petkov, Dave Hansen, x86,
H. Peter Anvin, David S. Miller, Jens Wiklander, Sumit Garg, kvm,
op-tee
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 2/6] crypto: ccp: Add a header for multiple drivers to use `__psp_pa`
2023-02-09 22:38 ` [PATCH 2/6] crypto: ccp: Add a header for multiple drivers to use `__psp_pa` Mario Limonciello
@ 2023-02-14 8:40 ` Jan Dąbroś
2023-02-15 11:13 ` Jarkko Nikula
2023-02-15 11:13 ` Sumit Garg
1 sibling, 1 reply; 5+ messages in thread
From: Jan Dąbroś @ 2023-02-14 8:40 UTC (permalink / raw)
To: Mario Limonciello
Cc: Grzegorz Bernacki, Thomas Rijo-john, Lendacky Thomas, herbert,
Sean Christopherson, Paolo Bonzini, Brijesh Singh, John Allen,
Jarkko Nikula, Andy Shevchenko, Mika Westerberg, linux-i2c,
linux-crypto, linux-kernel, Thomas Gleixner, Ingo Molnar,
Borislav Petkov, Dave Hansen, x86, H. Peter Anvin,
David S. Miller, Jens Wiklander, Sumit Garg, kvm, op-tee
> 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>
Reviewed-by: Jan Dabros <jsd@semihalf.com>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 2/6] crypto: ccp: Add a header for multiple drivers to use `__psp_pa`
2023-02-09 22:38 ` [PATCH 2/6] crypto: ccp: Add a header for multiple drivers to use `__psp_pa` Mario Limonciello
2023-02-14 8:40 ` Jan Dąbroś
@ 2023-02-15 11:13 ` Sumit Garg
1 sibling, 0 replies; 5+ messages in thread
From: Sumit Garg @ 2023-02-15 11:13 UTC (permalink / raw)
To: Mario Limonciello
Cc: Jan Dąbroś,
Grzegorz Bernacki, Thomas Rijo-john, Lendacky Thomas, herbert,
Sean Christopherson, Paolo Bonzini, Brijesh Singh, John Allen,
Jarkko Nikula, Andy Shevchenko, Mika Westerberg, linux-i2c,
linux-crypto, linux-kernel, Thomas Gleixner, Ingo Molnar,
Borislav Petkov, Dave Hansen, x86, H. Peter Anvin,
David S. Miller, Jens Wiklander, kvm, op-tee
On Fri, 10 Feb 2023 at 04:08, Mario Limonciello
<mario.limonciello@amd.com> wrote:
>
> 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 +-
For TEE subsystem bits:
Acked-by: Sumit Garg <sumit.garg@linaro.org>
-Sumit
> 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
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 2/6] crypto: ccp: Add a header for multiple drivers to use `__psp_pa`
2023-02-14 8:40 ` Jan Dąbroś
@ 2023-02-15 11:13 ` Jarkko Nikula
0 siblings, 0 replies; 5+ messages in thread
From: Jarkko Nikula @ 2023-02-15 11:13 UTC (permalink / raw)
To: Jan Dąbroś, Mario Limonciello
Cc: Grzegorz Bernacki, Thomas Rijo-john, Lendacky Thomas, herbert,
Sean Christopherson, Paolo Bonzini, Brijesh Singh, John Allen,
Andy Shevchenko, Mika Westerberg, linux-i2c, linux-crypto,
linux-kernel, Thomas Gleixner, Ingo Molnar, Borislav Petkov,
Dave Hansen, x86, H. Peter Anvin, David S. Miller,
Jens Wiklander, Sumit Garg, kvm, op-tee
On 2/14/23 10:40, Jan Dąbroś wrote:
>> 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>
>
> Reviewed-by: Jan Dabros <jsd@semihalf.com>
For the drivers/i2c/busses/i2c-designware-amdpsp.c:
Acked-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-02-15 11:14 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-02-09 22:38 [PATCH 0/6] Export platform features from ccp driver Mario Limonciello
2023-02-09 22:38 ` [PATCH 2/6] crypto: ccp: Add a header for multiple drivers to use `__psp_pa` Mario Limonciello
2023-02-14 8:40 ` Jan Dąbroś
2023-02-15 11:13 ` Jarkko Nikula
2023-02-15 11:13 ` Sumit Garg
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).