.accel-config.metadata

@@ -1 +1 @@
-c2571f89e855e1054a078a4dfee1d7d6feefb7e5 SOURCES/accel-config-v3.5.0.tar.gz
+786db2f554f1f092ababc722bfa5ffdec12ac15f SOURCES/accel-config-v4.1.3.tar.gz

.gitignore

@@ -1 +1 @@
-SOURCES/accel-config-v3.5.0.tar.gz
+SOURCES/accel-config-v4.1.3.tar.gz

SOURCES/0001-accel-config-test-only-configure-ats_disable-if-supp.patch

@@ -0,0 +1,54 @@
+From bcc6e90baa61434568e8225a7fcdc070610dae46 Mon Sep 17 00:00:00 2001
+From: Jerry Snitselaar <jsnitsel@redhat.com>
+Date: Thu, 30 Nov 2023 14:58:06 -0700
+Subject: [PATCH] accel-config/test: only configure ats_disable if supported
+'Content-type: text/plain'
+
+Upstream Status: RHEL-only
+
+Don't try to configure ats_disable if it isn't supported.
+Temporary work around until there is a complete upstream
+solution, and we don't ship the testing bits just use
+them for test.
+
+Signed-off-by: Jerry Snitselaar <jsnitsel@redhat.com>
+---
+ test/libaccfg.c | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/test/libaccfg.c b/test/libaccfg.c
+index bfe277b996cf..4a580b2bb02e 100644
+--- a/test/libaccfg.c
++++ b/test/libaccfg.c
+@@ -240,7 +240,9 @@ static int config_wq(struct accfg_ctx *ctx, struct accfg_device *device,
+ 	if (wq_param->threshold)
+ 		SET_ERR(rc, accfg_wq_set_threshold(wq, wq_param->threshold));
+ 
+-	SET_ERR(rc, accfg_wq_set_ats_disable(wq, wq_param->ats_disable));
++	if (accfg_wq_get_ats_disable(wq) >= 0) {
++		SET_ERR(rc, accfg_wq_set_ats_disable(wq, wq_param->ats_disable));
++	}
+ 	/* Don't fail test if per wq ats disable is not supported */
+ 	if (rc == -EOPNOTSUPP)
+ 		rc = 0;
+@@ -251,6 +253,7 @@ static int config_wq(struct accfg_ctx *ctx, struct accfg_device *device,
+ static int check_wq(struct accfg_ctx *ctx, struct accfg_device *device,
+ 		struct accfg_wq *wq, struct wq_parameters *wq_param)
+ {
++	int ats_disable = 0;
+ 
+ 	if (wq_param->wq_size != accfg_wq_get_size(wq)) {
+ 		fprintf(stderr, "%s failed on wq_size\n", __func__);
+@@ -290,7 +293,8 @@ static int check_wq(struct accfg_ctx *ctx, struct accfg_device *device,
+ 		fprintf(stderr, "%s failed on wq name\n", __func__);
+ 		return -EINVAL;
+ 	}
+-	if (wq_param->ats_disable != accfg_wq_get_ats_disable(wq)) {
++	ats_disable = accfg_wq_get_ats_disable(wq);
++	if (ats_disable >= 0 && (wq_param->ats_disable != ats_disable)) {
+ 		fprintf(stderr, "%s failed on ats_disable\n", __func__);
+ 		return -EINVAL;
+ 	}
+-- 
+2.41.0
+

SOURCES/0001-testing-vercheck.patch

@@ -1,36 +0,0 @@
-diff --color -ur idxd-config-accel-config-v3.4.8/test/dsa_user_test_runner.sh idxd-config-accel-config-v3.4.8-new/test/dsa_user_test_runner.sh
---- idxd-config-accel-config-v3.4.8/test/dsa_user_test_runner.sh	2022-09-21 14:16:06.000000000 -0700
-+++ idxd-config-accel-config-v3.4.8-new/test/dsa_user_test_runner.sh	2022-10-06 16:36:02.838178412 -0700
-@@ -14,7 +14,7 @@
- 
- [ ! -f "$DSATEST" ] && echo "fail: $LINENO" && exit 1
- 
--check_min_kver "5.6" || do_skip "kernel does not support idxd"
-+check_min_kver "4.18" || do_skip "kernel does not support idxd"
- 
- # skip if no pasid support as dsa_test does not support operation w/o pasid yet.
- [ ! -f "/sys/bus/dsa/devices/$DSA/pasid_enabled" ] && echo "No SVM support" && exit "$EXIT_SKIP"
-diff --color -ur idxd-config-accel-config-v3.4.8/test/iaa_user_test_runner.sh idxd-config-accel-config-v3.4.8-new/test/iaa_user_test_runner.sh
---- idxd-config-accel-config-v3.4.8/test/iaa_user_test_runner.sh	2022-09-21 14:16:06.000000000 -0700
-+++ idxd-config-accel-config-v3.4.8-new/test/iaa_user_test_runner.sh	2022-10-06 16:35:43.989998045 -0700
-@@ -14,7 +14,7 @@
- 
- [ ! -f "$IAATEST" ] && echo "fail: $LINENO" && exit 1
- 
--check_min_kver "5.6" || do_skip "kernel does not support idxd"
-+check_min_kver "4.18" || do_skip "kernel does not support idxd"
- 
- # skip if no pasid support as iaa_test does not support operation w/o pasid yet.
- [ ! -f "/sys/bus/dsa/devices/$IAA/pasid_enabled" ] && echo "No SVM support" && exit "$EXIT_SKIP"
-diff --color -ur idxd-config-accel-config-v3.4.8/test/libaccfg.c idxd-config-accel-config-v3.4.8-new/test/libaccfg.c
---- idxd-config-accel-config-v3.4.8/test/libaccfg.c	2022-09-21 14:16:06.000000000 -0700
-+++ idxd-config-accel-config-v3.4.8-new/test/libaccfg.c	2022-10-06 16:36:31.090448787 -0700
-@@ -966,7 +966,7 @@
- 	struct accfg_device *device;
- 	struct log_ctx log_ctx;
- 
--	if (!accfg_test_attempt(test, KERNEL_VERSION(5, 6, 0)))
-+	if (!accfg_test_attempt(test, KERNEL_VERSION(4, 18, 0)))
- 		return EXIT_SKIP;
- 
- 	accfg_set_log_priority(ctx, loglevel);

SPECS/accel-config.spec

@@ -1,16 +1,13 @@
 %global	project_name	idxd-config
 
 Name:		accel-config
-Version:	3.5.0
-Release:	1%{?dist}
+Version:	4.1.3
+Release:	2%{?dist}
 Summary:	Configure accelerator subsystem devices
-# The entire source code is under GPLv2 except for accel-config
-# library which is mostly LGPLv2, ccan/list which is BSD-MIT and
-# the rest of ccan which is CC0.
-License:	GPLv2 and LGPLv2+ and MIT and CC0
+License:	GPL-2.0-only
 URL:		https://github.com/intel/%{project_name}
 Source0:	%{URL}/archive/%{name}-v%{version}.tar.gz
-Patch0: 0001-testing-vercheck.patch
+Patch0:		0001-accel-config-test-only-configure-ats_disable-if-supp.patch
 
 Requires:	%{name}-libs%{?_isa} = %{version}-%{release}
 BuildRequires:	gcc
@@ -19,6 +16,7 @@ BuildRequires:	asciidoc
 BuildRequires:	xmlto
 BuildRequires:	automake
 BuildRequires:	libtool
+BuildRequires:  openssl-devel
 BuildRequires:	pkgconfig
 BuildRequires:	pkgconfig(libkmod)
 BuildRequires:	pkgconfig(uuid)
@@ -26,9 +24,10 @@ BuildRequires:	pkgconfig(json-c)
 BuildRequires:	pkgconfig(libudev)
 BuildRequires:	pkgconfig(zlib)
 BuildRequires:	systemd
+BuildRequires:	make
 
 # accel-config is for configuring Intel DSA (Data-Streaming
-# Accelerator) subsystem in the Linux kernel. It supports x86 only.
+# Accelerator) subsystem in the Linux kernel. It supports x86_64 only.
 ExclusiveArch:	%{ix86} x86_64
 
 %description
@@ -36,7 +35,7 @@ Utility library for configuring the accelerator subsystem.
 
 %package devel
 Summary:	Development files for libaccfg
-License:	LGPLv2+
+License:	LGPL-2.1-only
 Requires:	%{name}-libs%{?_isa} = %{version}-%{release}
 
 %description devel
@@ -46,9 +45,7 @@ developing applications that use %{name}.
 
 %package libs
 Summary:	Configuration library for accelerator subsystem devices
-# All source code of configuration library is LGPLv2, except
-# ccan/list which is BSD-MIT and the rest of ccan/ which is CC0.
-License:	LGPLv2+ and MIT and CC0
+License:	LGPL-2.1-only
 Requires:	%{name}%{?_isa} = %{version}-%{release}
 
 %description libs
@@ -56,7 +53,7 @@ Libraries for %{name}.
 
 %package test
 Summary:        Tests for accel-config
-License:        GPLv2
+License:        GPL-2.0-only
 Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 
 %description test
@@ -88,7 +85,7 @@ make check
 %files libs
 %doc README.md
 %license Documentation/COPYING licenses/BSD-MIT licenses/CC0
-%license licenses/libaccel-config-licenses accfg/lib/LICENSE_LGPL_2_1
+%license licenses/accel-config-licenses accfg/lib/LICENSE_LGPL_2_1
 %{_libdir}/lib%{name}.so.*
 
 %files devel
@@ -99,29 +96,68 @@ make check
 
 %files test
 %license Documentation/COPYING LICENSE_GPL_2_0
-#%doc test/README.md
-%{_prefix}/lib/accel-config/test/*
+%doc test/README.md
+%{_libexecdir}/accel-config/test/*
 
 %changelog
-* Sun Oct 16 2022 Jerry Snitselaar <jsnitsel@redhat.com> - 3.5.0-1
-- Rebase to the 3.5.0 release.
-resolves: rhbz#2101608
+* Wed Jan 17 2024 Jerry Snitselaar <jsnitsel@redhat.com> - 4.1.3-2
+- Fix SPDX tags
+Resolves: RHEL-15610
 
-* Thu Oct 06 2022 Jerry Snitselaar <jsnitsel@redhat.com> - 3.4.8-1
-- Rebase to 3.4.8 release.
-resolves: rhbz#2101608
+* Fri Dec 01 2023 Jerry Snitselaar <jsnitsel@redhat.com> - 4.1.3-1
+- Rebase to 4.1.3 release
+- Update License tags to SPDX identifiers
+Resolves: RHEL-15610
+
+* Tue Apr 18 2023 Jerry Snitselaar <jsnitsel@redhat.com> - 3.5.3-2
+- Remove spec file variable that blocked debuginfo build
+Resolves: rhz#2153899
+
+* Tue Apr 18 2023 Jerry Snitselaar <jsnitsel@redhat.com> - 3.5.3-1
+- Rebase to the 3.5.3 release.
+Resolves: rhbz#2153899
+
+* Tue Oct 04 2022 Jerry Snitselaar <jsnitsel@redhat.com> - 3.5.0-1
+- Rebase to 3.5.0 release.
+Resolves: rhbz#2101609
 
 * Sun Apr 03 2022 Jerry Snitselaar <jsnitsel@redhat.com> - 3.4.6.3-1
 - Rebase to 3.4.6.3 release.
-resolves: rhbz#2040076
+Resolves: rhbz#2040077
 
-* Thu Sep 09 2021 Jerry Snitselaar <jsnitsel@redhat.com> - 3.4.2-1
-- Rebase to 3.4.2 and add test subpackage.
-resolves: rhbz#1971910
+* Fri Feb 11 2022 Jerry Snitselaar <jsnitsel@redhat.com> - 3.4.2-2
+- Rebuild to clear osci test failure.
+Resolves: rhbz#1999934
 
-* Tue May 18 2021 Jerry Snitselaar <jsnitsel@redhat.com> - 3.1-1
-- Rebase to 3.1 release.
-resolves: rhbz#1920762
+* Tue Oct 05 2021 Jerry Snitselaar <jsnitsel@redhat.com> - 3.4.2-1
+- Rebase to 3.4.2 release and add test subpackage.
+Resolves: rhbz#1999934
+
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 3.2-3
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
+
+* Fri Jul 02 2021 Jerry Snitselaar <jsnitsel@redhat.com> - 3.2-2
+- Fix product version for gating.
+Resolves: rhbz#1921368
+
+* Mon Jun 21 2021 Jerry Snitselaar <jsnitsel@redhat.com> - 3.2-1
+- Rebase to 3.2 release. Related: rhbz#1921368
+
+* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 3.1-2
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+
+* Mon Mar 29 2021 Yunying Sun <yunying.sun@intel.com> - 3.1-1
+- Added ix86 support back as 3.1 release fixed it
+- Updated to 3.1 release
+
+* Thu Feb 18 2021 Yunying Sun <yunying.sun@intel.com> - 3.0.1-1
+- Updated to 3.0.1 release
+- Removed ix86 support as so far it supports x86_64 only
+- Updated licenses following upstream
+
+* Mon Jan 25 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.8-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
 * Fri Nov 6 2020 Yunying Sun <yunying.sun@intel.com> - 2.8-1
 - Initial Packaging