crypto: ccp - Move message about TSME being enabled later in init

JIRA: https://issues.redhat.com/browse/RHEL-85131
Upstream Status: merged into the linux.git

commit 059b135
Author: Mario Limonciello <[email protected]>
Date:   Tue May 28 16:07:12 2024 -0500

    crypto: ccp - Move message about TSME being enabled later in init

    Some of the security attributes data is now populated from an HSTI
    command on some processors, so show the message after it has been
    populated.

    Signed-off-by: Mario Limonciello <[email protected]>
    Acked-by: Tom Lendacky <[email protected]>
    Signed-off-by: Herbert Xu <[email protected]>

Signed-off-by: Vladis Dronov <[email protected]>

Author: nefigtut

drivers/crypto/ccp/hsti.c

@@ -119,5 +119,20 @@ int psp_init_hsti(struct psp_device *psp)
 			return ret;
 	}
 
+	/*
+	 * At this stage, if security information hasn't been populated by
+	 * either the PSP or by the driver through the platform command,
+	 * then there is nothing more to do.
+	 */
+	if (!psp->capability.security_reporting)
+		return 0;
+
+	if (psp->capability.tsme_status) {
+		if (cc_platform_has(CC_ATTR_HOST_MEM_ENCRYPT))
+			dev_notice(psp->dev, "psp: Both TSME and SME are active, SME is unnecessary when TSME is active.\n");
+		else
+			dev_notice(psp->dev, "psp: TSME enabled\n");
+	}
+
 	return 0;
 }

drivers/crypto/ccp/psp-dev.c

@@ -157,14 +157,6 @@ static unsigned int psp_get_capability(struct psp_device *psp)
 	}
 	psp->capability.raw = val;
 
-	/* Detect TSME and/or SME status */
-	if (psp->capability.security_reporting && psp->capability.tsme_status) {
-		if (cc_platform_has(CC_ATTR_HOST_MEM_ENCRYPT))
-			dev_notice(psp->dev, "psp: Both TSME and SME are active, SME is unnecessary when TSME is active.\n");
-		else
-			dev_notice(psp->dev, "psp: TSME enabled\n");
-	}
-
 	return 0;
 }