diff --git a/0001-accel-config-test-Fix-drain-descriptor-readback-addr.patch b/0001-accel-config-test-Fix-drain-descriptor-readback-addr.patch new file mode 100644 index 0000000000000000000000000000000000000000..750cbf5914878359c76df3b8c34bdcb8a5a2d7c1 --- /dev/null +++ b/0001-accel-config-test-Fix-drain-descriptor-readback-addr.patch @@ -0,0 +1,32 @@ +From 4bafcd44652f95d22eb936d7b84f40392b0c022a Mon Sep 17 00:00:00 2001 +From: Tony Zhu +Date: Wed, 23 Nov 2022 15:36:11 +0800 +Subject: [PATCH] accel-config/test: Fix drain descriptor readback address + assignment + +Drain operation flag bit 16 and 17 are not set, so don't need to set the +valid source and destination address. + +Signed-off-by: Tony Zhu +--- + test/dsa_prep.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/test/dsa_prep.c b/test/dsa_prep.c +index d5e1ced..020ab1f 100644 +--- a/test/dsa_prep.c ++++ b/test/dsa_prep.c +@@ -29,8 +29,8 @@ void dsa_prep_drain(struct task *tsk) + if (tsk->opcode == DSA_OPCODE_MEMMOVE) + tsk->opcode = DSA_OPCODE_DRAIN; + +- acctest_prep_desc_common(tsk->desc, tsk->opcode, (uint64_t)(tsk->dst1), +- (uint64_t)(tsk->src1), 0, tsk->dflags); ++ acctest_prep_desc_common(tsk->desc, tsk->opcode, 0, ++ 0, 0, tsk->dflags); + tsk->desc->completion_addr = (uint64_t)(tsk->comp); + tsk->comp->status = 0; + } +-- +2.31.1 + diff --git a/accel-config-v3.4.6.4.tar.gz b/accel-config-v3.4.6.4.tar.gz deleted file mode 100644 index 60752f3d4b10980ca84a218f2ebf243f9f6c30b8..0000000000000000000000000000000000000000 Binary files a/accel-config-v3.4.6.4.tar.gz and /dev/null differ diff --git a/accel-config-v3.5.1.tar.gz b/accel-config-v3.5.1.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..9a7b185edf6d3e03ac6727845c3487b0dc937b35 Binary files /dev/null and b/accel-config-v3.5.1.tar.gz differ diff --git a/accel-config.spec b/accel-config.spec index 699c3f8f961a54cb6fd734a2f97a5a66d4b947eb..df5bf33efc51c6af32fefc2238cd504509e8644d 100644 --- a/accel-config.spec +++ b/accel-config.spec @@ -1,6 +1,6 @@ %define anolis_release 1 Name: accel-config -Version: 3.4.6.4 +Version: 3.5.1 Release: %{anolis_release}%{?dist} Summary: Configure accelerator subsystem devices # The entire source code is under GPLv2 except for accel-config @@ -10,6 +10,8 @@ License: GPLv2 and LGPLv2+ and MIT and CC0 Group: System Environment/Base Source0: https://github.com/intel/idxd-config/archive/refs/tags/%{name}-v%{version}.tar.gz +Patch1: 0001-accel-config-test-Fix-drain-descriptor-readback-addr.patch + Requires: %{name}-libs = %{version}-%{release} BuildRequires: autoconf BuildRequires: asciidoc @@ -20,6 +22,7 @@ BuildRequires: pkgconfig BuildRequires: pkgconfig(uuid) BuildRequires: pkgconfig(json-c) BuildRequires: systemd +ExclusiveArch: x86_64 %description Utility library for configuring the accelerator subsystem. @@ -46,8 +49,16 @@ Requires: %{name} = %{version}-%{release} %description libs Libraries for %{name}. +%package doc +Summary: Documentation files for %{name} +Requires: %{name} = %{version}-%{release} +BuildArch: noarch + +%description doc +The %{name}-doc package contains documentation files for %{name} + %prep -%setup -q -n idxd-config-%{name}-v%{version} +%autosetup -n idxd-config-%{name}-v%{version} -p1 %build echo %{version} > version @@ -59,6 +70,8 @@ echo %{version} > version %make_install find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' +%generate_compatibility_deps + %check make check @@ -66,14 +79,14 @@ make check %defattr(-,root,root) %license Documentation/COPYING licenses/BSD-MIT licenses/CC0 %license licenses/accel-config-licenses LICENSE_GPL_2_0 +%dir %{abidir} %{_bindir}/accel-config +%{abidir}/libaccel-config.dump %{_mandir}/man1/accel-config* -%{_sysconfdir}/accel-config/accel-config.conf.sample -%{_datadir}/accel-config/contrib/configs/* +%{_sysconfdir}/accel-config/contrib/configs/* %files libs %defattr(-,root,root) -%doc README.md %license Documentation/COPYING licenses/BSD-MIT licenses/CC0 %license licenses/libaccel-config-licenses accfg/lib/LICENSE_LGPL_2_1 %{_libdir}/libaccel-config.so.* @@ -85,6 +98,14 @@ make check %{_libdir}/libaccel-config.so %{_libdir}/pkgconfig/libaccel-config.pc +%files doc +%doc README.md +%doc Documentation/accfg/a* +%doc Documentation/manpage-base.xsl Documentation/manpage-normal.xsl + %changelog +* Fri Dec 09 2022 Xuchun Shang - 3.5.1-1 +- update to 3.5.1 and fix bug + * Tue May 10 2022 Chunmei Xu - 3.4.6.4-1 - init from upstream