Merge branch 'rosa2021.1' into rosa2023.1

0001-tpm-Don-t-make-vendor-check-required-for-probe.patch

@@ -0,0 +1,39 @@
+From 5470ef2eed8958f828d11047d958fd516e9dddc3 Mon Sep 17 00:00:00 2001
+From: Mario Limonciello <mario.limonciello@amd.com>
+Date: Fri, 18 Aug 2023 13:15:16 -0500
+Subject: [PATCH] tpm: Don't make vendor check required for probe
+
+The vendor check introduced by commit 554b841d4703 ("tpm: Disable RNG for
+all AMD fTPMs") doesn't work properly on Intel fTPM.  The TPM doesn't reply
+at bootup and returns back the command code.
+
+As this isn't crucial for anything but AMD fTPM and AMD fTPM works, throw
+away the error code to let Intel fTPM continue to work.
+
+Cc: stable@vger.kernel.org
+Fixes: 554b841d4703 ("tpm: Disable RNG for all AMD fTPMs")
+Reported-by: Todd Brandt <todd.e.brandt@intel.com>
+Closes: https://bugzilla.kernel.org/show_bug.cgi?id=217804
+Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
+Tested-by: Todd Brandt <todd.e.brandt@linux.intel.com>
+---
+ drivers/char/tpm/tpm_crb.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/drivers/char/tpm/tpm_crb.c b/drivers/char/tpm/tpm_crb.c
+index 7f7f3bded453..6e04bd73dc8f 100644
+--- a/drivers/char/tpm/tpm_crb.c
++++ b/drivers/char/tpm/tpm_crb.c
+@@ -472,8 +472,7 @@ static int crb_check_flags(struct tpm_chip *chip)
+ 	if (ret)
+ 		return ret;
+ 
+-	ret = tpm2_get_tpm_pt(chip, TPM2_PT_MANUFACTURER, &val, NULL);
+-	if (ret)
++	if (tpm2_get_tpm_pt(chip, TPM2_PT_MANUFACTURER, &val, NULL))
+ 		goto release;
+ 
+ 	if (val == 0x414D4400U /* AMD */)
+-- 
+2.40.1
+

kernel.spec

@@ -35,7 +35,7 @@
 %define sublevel 49
 
 # Release number. Increase this before a rebuild.
-%define rpmrel 1
+%define rpmrel 2
 %define fullrpmrel %{rpmrel}
 
 %define rpmtag %{disttag}
@@ -349,6 +349,9 @@ Patch201:	0001-altha.patch
 Patch302:	0001-sign-file-full-functionality-with-modern-LibreSSL.patch
 # Allow to off modules signature check dynamically
 Patch306:	0001-ROSA-ima-allow-to-off-modules-signature-check-dynami.patch
+# https://bugzilla.kernel.org/show_bug.cgi?id=217804#c52
+# https://bugzilla.rosalinux.ru/show_bug.cgi?id=13480#c7
+Patch307:	0001-tpm-Don-t-make-vendor-check-required-for-probe.patch
 
 # Support sound on notebook Aquarius NS685U R11 (https://linux-hardware.org/?probe=339dc3db60)
 Patch0401: 0401-ASoC-es8316-Use-increased-GPIO-debounce-time.patch