From: "Mario Limonciello (AMD)" <superm1@kernel.org>
To: "Tom Lendacky" <thomas.lendacky@amd.com>,
"Herbert Xu" <herbert@gondor.apana.org.au>,
"Shyam Sundar S K" <Shyam-sundar.S-k@amd.com>,
"Ilpo Järvinen" <ilpo.jarvinen@linux.intel.com>
Cc: John Allen <john.allen@amd.com>,
"David S . Miller" <davem@davemloft.net>,
Hans de Goede <hansg@kernel.org>,
linux-crypto@vger.kernel.org (open list:AMD CRYPTOGRAPHIC
COPROCESSOR (CCP) DRIVER),
platform-driver-x86@vger.kernel.org (open list:AMD PMF DRIVER),
"Mario Limonciello (AMD)" <superm1@kernel.org>
Subject: [PATCH 0/2] Fixes for PMF driver after S4
Date: Wed, 19 Nov 2025 14:59:40 -0600 [thread overview]
Message-ID: <20251119205942.3411155-1-superm1@kernel.org> (raw)
Lars Francke reported that the PMF driver fails to work afer S4 with:
ccp 0000:c3:00.2: tee: command 0x5 timed out, disabling PSP
This is because there is a TA loaded to the TEE environment that
is lost during S4. The TEE rings need to be reinitialized and the
TA needs to be reloaded.
This series adds those flows.
Note:
I validated this on top of 6.18-rc6. I could reproduce Lars'
original issue on a Strix laptop and then confirmed that after
applying these two patches that PMF continues to work after resume.
I ran a handful of S4 cycles, module unload tests and reboot tests.
Mario Limonciello (AMD) (1):
crypto: ccp - Add an S4 restore flow
Shyam Sundar S K (1):
platform/x86/amd/pmf: Prevent TEE errors after hibernate
drivers/crypto/ccp/sp-dev.c | 13 ++++++
drivers/crypto/ccp/sp-dev.h | 1 +
drivers/crypto/ccp/sp-pci.c | 16 ++++++-
drivers/crypto/ccp/tee-dev.c | 6 +++
drivers/crypto/ccp/tee-dev.h | 1 +
drivers/platform/x86/amd/pmf/core.c | 62 ++++++++++++++++++++++++++-
drivers/platform/x86/amd/pmf/pmf.h | 10 +++++
drivers/platform/x86/amd/pmf/tee-if.c | 12 ++----
8 files changed, 110 insertions(+), 11 deletions(-)
--
2.43.0
next reply other threads:[~2025-11-19 20:59 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-19 20:59 Mario Limonciello (AMD) [this message]
2025-11-19 20:59 ` [PATCH 1/2] platform/x86/amd/pmf: Prevent TEE errors after hibernate Mario Limonciello (AMD)
2025-11-19 20:59 ` [PATCH 2/2] crypto: ccp - Add an S4 restore flow Mario Limonciello (AMD)
2025-11-20 13:55 ` kernel test robot
2025-11-24 3:24 ` kernel test robot
2025-11-24 5:08 ` kernel test robot
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=20251119205942.3411155-1-superm1@kernel.org \
--to=superm1@kernel.org \
--cc=Shyam-sundar.S-k@amd.com \
--cc=davem@davemloft.net \
--cc=hansg@kernel.org \
--cc=herbert@gondor.apana.org.au \
--cc=ilpo.jarvinen@linux.intel.com \
--cc=john.allen@amd.com \
--cc=linux-crypto@vger.kernel.org \
--cc=platform-driver-x86@vger.kernel.org \
--cc=thomas.lendacky@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox