!168 scripts: Do msr existence check only on x86_64 machines
From: @cenhuilin Reviewed-by: @swf504 Signed-off-by: @swf504
This commit is contained in:
commit
5718e73c11
@ -0,0 +1,36 @@
|
||||
From 686dcd88c2e4147ec5731647c569d8ef4c7064b5 Mon Sep 17 00:00:00 2001
|
||||
From: Gal Hammer <gal.hammer@huawei.com>
|
||||
Date: Tue, 2 Jul 2024 14:28:06 +0800
|
||||
Subject: [PATCH] scripts: Do msr existence check only on x86_64 machines
|
||||
|
||||
aarch64 doesn't have a msr module (DPDK acquires the TSR rate elsewhere).
|
||||
|
||||
Signed-off-by: Gal Hammer <gal.hammer@huawei.com>
|
||||
Signed-off-by: Shai Fultheim <shai.fultheim@huawei.com>
|
||||
Change-Id: Ib9795141a78436959853ab5548ae49f024344b25
|
||||
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/12354
|
||||
Reviewed-by: Jim Harris <james.r.harris@intel.com>
|
||||
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
|
||||
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
|
||||
Community-CI: Mellanox Build Bot
|
||||
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
|
||||
---
|
||||
scripts/setup.sh | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/scripts/setup.sh b/scripts/setup.sh
|
||||
index 1c5024a..e753cb1 100755
|
||||
--- a/scripts/setup.sh
|
||||
+++ b/scripts/setup.sh
|
||||
@@ -507,7 +507,7 @@ function configure_linux() {
|
||||
fi
|
||||
fi
|
||||
|
||||
- if [ ! -f /dev/cpu/0/msr ]; then
|
||||
+ if [ $(uname -i) == "x86_64" ] && [ ! -e /dev/cpu/0/msr ]; then
|
||||
# Some distros build msr as a module. Make sure it's loaded to ensure
|
||||
# DPDK can easily figure out the TSC rate rather than relying on 100ms
|
||||
# sleeps.
|
||||
--
|
||||
2.33.0
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
|
||||
Name: spdk
|
||||
Version: 21.01
|
||||
Release: 9
|
||||
Release: 10
|
||||
Summary: Set of libraries and utilities for high performance user-mode storage
|
||||
License: BSD and MIT
|
||||
URL: http://spdk.io
|
||||
@ -40,6 +40,7 @@ Patch28: 0028-uring-set-fd-to-1-after-close-fd-in-uring_sock_creat.patch
|
||||
Patch29: 0029-Fix-build-warning.patch
|
||||
Patch30: 0030-ut-rdma-Fix-GCC-10.2.0-warning.patch
|
||||
Patch31: 0031-backport-Add-ctrlr_lock-for-cuse-register-and-unregister.patch
|
||||
Patch32: 0032-scripts-Do-msr-existence-check-only-on-x86_64-machin.patch
|
||||
|
||||
%define package_version %{version}-%{release}
|
||||
|
||||
@ -213,6 +214,9 @@ mv doc/output/html/ %{install_docdir}
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon Jul 8 2024 cenhuilin <cenhuilin@kylinos.cn> - 21.01-10
|
||||
- scripts: Do msr existence check only on x86_64 machines
|
||||
|
||||
* Thu Jul 4 2024 kouwenqi <kouwenqi@kylinos.cn> - 21.01-9
|
||||
- Add ctrlr_lock for cuse register and unregister
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user