diff --git a/libvirt.spec b/libvirt.spec
index adceba73631c446158a5db0acded5c1214695391..b1493dc26277aae0676f23801c4b9a684d8ed1ba 100644
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -101,7 +101,7 @@
 Summary: Library providing a simple virtualization API
 Name: libvirt
 Version: 6.2.0
-Release: 58
+Release: 59
 License: LGPLv2+
 URL: https://libvirt.org/
 
@@ -489,6 +489,7 @@ Patch0376: selinux-adapt-to-libselinux.patch
 Patch0377: Revert-selinux-adapt-to-libselinux.patch
 Patch0378: selinux-Reflect-context_str-type-change.patch
 Patch0379: virnetsshsession-Adapt-to-change-libssh2-API.patch
+Patch0380: qemu-command-Use-correct-tpm-device-for-all-non-x86.patch
 
 Requires: libvirt-daemon = %{version}-%{release}
 Requires: libvirt-daemon-config-network = %{version}-%{release}
@@ -2225,6 +2226,9 @@ exit 0
 
 
 %changelog
+* Sat Aug 26 2023 lixianglai <lixianglai@loongson.cn> - 6.2.0-59
+- Synchronize upstream patches "Use correct tpm device for all non-x86"
+
 * Wed Aug 9 2023 Jiabo Feng <fengjiabo1@huawei.com> - 6.2.0-58
 - virnetsshsession: Adapt to change libssh2 API
 - selinux: Reflect context_str() type change
diff --git a/qemu-command-Use-correct-tpm-device-for-all-non-x86.patch b/qemu-command-Use-correct-tpm-device-for-all-non-x86.patch
new file mode 100644
index 0000000000000000000000000000000000000000..df4bd8b49ffe3efefcde69d41cedb247cdfbb170
--- /dev/null
+++ b/qemu-command-Use-correct-tpm-device-for-all-non-x86.patch
@@ -0,0 +1,32 @@
+From 4127f2c1599683af1de75574065f1942eea9ad88 Mon Sep 17 00:00:00 2001
+From: Cole Robinson <crobinso@redhat.com>
+Date: Sat, 18 Jun 2022 12:46:03 -0400
+Subject: [PATCH] qemu: command: Use correct tpm device for all non-x86
+
+The qemu `tpm-tis` device is an ISA device, so only really applicable
+to x86 archs. For all non-x86 archs we should use `tpm-tis-device`
+
+This fixes tpm-tis usage on armv7l and riscv
+
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+Signed-off-by: Cole Robinson <crobinso@redhat.com>
+---
+ src/qemu/qemu_command.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
+index dc7fb871e7..832c17b602 100644
+--- a/src/qemu/qemu_command.c
++++ b/src/qemu/qemu_command.c
+@@ -9311,7 +9311,7 @@ qemuBuildTPMDevStr(const virDomainDef *def,
+     virDomainTPMDef *tpm = def->tpm;
+     const char *model = virDomainTPMModelTypeToString(tpm->model);
+ 
+-    if (tpm->model == VIR_DOMAIN_TPM_MODEL_TIS && def->os.arch == VIR_ARCH_AARCH64)
++    if (tpm->model == VIR_DOMAIN_TPM_MODEL_TIS && !ARCH_IS_X86(def->os.arch))
+         model = "tpm-tis-device";
+ 
+     virBufferAsprintf(&buf, "%s,tpmdev=tpm-%s,id=%s",
+-- 
+2.27.0
+