From f52d662569f4f51a770b1ef0003575250e4ceb52 Mon Sep 17 00:00:00 2001 From: wxiat Date: Thu, 30 Nov 2023 15:53:29 +0800 Subject: [PATCH 1/2] sw-20231130 --- biosdevname.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/biosdevname.spec b/biosdevname.spec index 70890cc..f42616a 100644 --- a/biosdevname.spec +++ b/biosdevname.spec @@ -1,4 +1,4 @@ -%define anolis_release .0.1 +%define anolis_release .0.2 Name: biosdevname Version: 0.7.3 Release: 2%{anolis_release}%{?dist} @@ -10,7 +10,7 @@ URL: http://linux.dell.com/files/%{name} # SMBIOS only exists on these arches. It's also likely that other # arches don't expect the PCI bus to be sorted breadth-first, or of # so, there haven't been any comments about that on LKML. -ExclusiveArch: %{ix86} x86_64 +ExclusiveArch: %{ix86} x86_64 sw_64 Source0: http://linux.dell.com/files/%{name}/%{name}-%{version}/%{name}-%{version}.tar.gz BuildRequires: autoconf @@ -67,6 +67,9 @@ make install install-data DESTDIR=%{buildroot} %doc COPYING README %changelog +* Thu Nov 30 2023 wuxiat - 0.7.3-2.0.2 +- add sw patch + * Fri Jul 15 2022 mgb01105731 - 0.7.3-2.0.1 - Add doc sub package -- Gitee From 1f64f628809bb81024b7e31d33935d19f11a21e3 Mon Sep 17 00:00:00 2001 From: wxiat Date: Mon, 4 Dec 2023 16:00:31 +0800 Subject: [PATCH 2/2] add sw in bios_dev_name.c --- biosdevname-add-sw.patch | 44 ++++++++++++++++++++++++++++++++++++++++ biosdevname.spec | 6 +++++- 2 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 biosdevname-add-sw.patch diff --git a/biosdevname-add-sw.patch b/biosdevname-add-sw.patch new file mode 100644 index 0000000..dec9bd2 --- /dev/null +++ b/biosdevname-add-sw.patch @@ -0,0 +1,44 @@ +From 7afe3b24736b109b633096da822820360f2386e3 Mon Sep 17 00:00:00 2001 +From: wxiat +Date: Mon, 4 Dec 2023 15:15:07 +0800 +Subject: [PATCH] add sw + +--- + src/bios_dev_name.c | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +diff --git a/src/bios_dev_name.c b/src/bios_dev_name.c +index d0a917a..4683c9e 100644 +--- a/src/bios_dev_name.c ++++ b/src/bios_dev_name.c +@@ -110,6 +110,19 @@ parse_opts(int argc, char **argv) + opts.prefix = "em"; + } + ++#if defined(__sw_64__) ++static u_int32_t ++cpuid (u_int32_t eax, u_int32_t ecx) ++{ ++ int cpuid; ++asm ( ++ "rcid %0 \n" ++ : "=r"(cpuid) ++ :: "memory" ++ ); ++ return cpuid; ++} ++#else + static u_int32_t + cpuid (u_int32_t eax, u_int32_t ecx) + { +@@ -120,6 +133,7 @@ cpuid (u_int32_t eax, u_int32_t ecx) + : "%ebx", "%edx"); + return ecx; + } ++#endif + + /* + Algorithm suggested by: +-- +2.31.1 + diff --git a/biosdevname.spec b/biosdevname.spec index f42616a..ecf6f92 100644 --- a/biosdevname.spec +++ b/biosdevname.spec @@ -1,4 +1,4 @@ -%define anolis_release .0.2 +%define anolis_release .0.3 Name: biosdevname Version: 0.7.3 Release: 2%{anolis_release}%{?dist} @@ -28,6 +28,7 @@ Patch0003: 0003-Netronome-biosdevname-support-8.patch Patch0999: 0999-Place-udev-rules-to-usr-lib.patch Patch1000: 1000-rules-disable-pirq-and-force-minimal-smbios-version.patch Patch1001: 1001-rules-disable-biosdevname-by-default.patch +Patch1002: biosdevname-add-sw.patch %description biosdevname in its simplest form takes a kernel device name as an @@ -67,6 +68,9 @@ make install install-data DESTDIR=%{buildroot} %doc COPYING README %changelog +* Mon Dec 4 2023 wuxiat - 0.7.3-2.0.3 +- add sw patch + * Thu Nov 30 2023 wuxiat - 0.7.3-2.0.2 - add sw patch -- Gitee