On 11/12/24 17:22, Dionna Glaze wrote:

From: Alexey Kardashevskiy aik@amd.com

Additions to the error enum after the explicit 0x27 setting for SEV_RET_INVALID_KEY leads to incorrect value assignments.

Use explicit values to match the manufacturer specifications more clearly.

Fixes: 3a45dc2b419e ("crypto: ccp: Define the SEV-SNP commands")

CC: Sean Christopherson seanjc@google.com CC: Paolo Bonzini pbonzini@redhat.com CC: Thomas Gleixner tglx@linutronix.de CC: Ingo Molnar mingo@redhat.com CC: Borislav Petkov bp@alien8.de CC: Dave Hansen dave.hansen@linux.intel.com CC: Ashish Kalra ashish.kalra@amd.com CC: Tom Lendacky thomas.lendacky@amd.com CC: John Allen john.allen@amd.com CC: Herbert Xu herbert@gondor.apana.org.au CC: "David S. Miller" davem@davemloft.net CC: Michael Roth michael.roth@amd.com CC: Luis Chamberlain mcgrof@kernel.org CC: Russ Weight russ.weight@linux.dev CC: Danilo Krummrich dakr@redhat.com CC: Greg Kroah-Hartman gregkh@linuxfoundation.org CC: "Rafael J. Wysocki" rafael@kernel.org CC: Tianfei zhang tianfei.zhang@intel.com CC: Alexey Kardashevskiy aik@amd.com CC: stable@vger.kernel.org

Signed-off-by: Alexey Kardashevskiy aik@amd.com Signed-off-by: Dionna Glaze dionnaglaze@google.com

Reviewed-by: Tom Lendacky thomas.lendacky@amd.com

---

include/uapi/linux/psp-sev.h | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/include/uapi/linux/psp-sev.h b/include/uapi/linux/psp-sev.h index 832c15d9155bd..eeb20dfb1fdaa 100644 --- a/include/uapi/linux/psp-sev.h +++ b/include/uapi/linux/psp-sev.h @@ -73,13 +73,20 @@ typedef enum { SEV_RET_INVALID_PARAM, SEV_RET_RESOURCE_LIMIT, SEV_RET_SECURE_DATA_INVALID,

• SEV_RET_INVALID_KEY = 0x27,
• SEV_RET_INVALID_PAGE_SIZE,
• SEV_RET_INVALID_PAGE_STATE,
• SEV_RET_INVALID_MDATA_ENTRY,
• SEV_RET_INVALID_PAGE_OWNER,
• SEV_RET_INVALID_PAGE_AEAD_OFLOW,
• SEV_RET_RMP_INIT_REQUIRED,

• SEV_RET_INVALID_PAGE_SIZE = 0x0019,
• SEV_RET_INVALID_PAGE_STATE = 0x001A,
• SEV_RET_INVALID_MDATA_ENTRY = 0x001B,
• SEV_RET_INVALID_PAGE_OWNER = 0x001C,
• SEV_RET_AEAD_OFLOW = 0x001D,
• SEV_RET_EXIT_RING_BUFFER = 0x001F,
• SEV_RET_RMP_INIT_REQUIRED = 0x0020,
• SEV_RET_BAD_SVN = 0x0021,
• SEV_RET_BAD_VERSION = 0x0022,
• SEV_RET_SHUTDOWN_REQUIRED = 0x0023,
• SEV_RET_UPDATE_FAILED = 0x0024,
• SEV_RET_RESTORE_REQUIRED = 0x0025,
• SEV_RET_RMP_INITIALIZATION_FAILED = 0x0026,
• SEV_RET_INVALID_KEY = 0x0027, SEV_RET_MAX,

} sev_ret_code;