accel-config: Rebase to 4.1.6 release
Resolves: RHEL-29910 Signed-off-by: Jerry Snitselaar <jsnitsel@redhat.com>
This commit is contained in:
parent
f3d109ea1d
commit
03ab91e397
1
.gitignore
vendored
1
.gitignore
vendored
@ -7,3 +7,4 @@
|
|||||||
/accel-config-v3.5.0.tar.gz
|
/accel-config-v3.5.0.tar.gz
|
||||||
/accel-config-v3.5.3.tar.gz
|
/accel-config-v3.5.3.tar.gz
|
||||||
/accel-config-v4.1.3.tar.gz
|
/accel-config-v4.1.3.tar.gz
|
||||||
|
/accel-config-v4.1.6.tar.gz
|
||||||
|
@ -1,54 +0,0 @@
|
|||||||
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
|
|
||||||
|
|
@ -1,13 +1,12 @@
|
|||||||
%global project_name idxd-config
|
%global project_name idxd-config
|
||||||
|
|
||||||
Name: accel-config
|
Name: accel-config
|
||||||
Version: 4.1.3
|
Version: 4.1.6
|
||||||
Release: 2%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: Configure accelerator subsystem devices
|
Summary: Configure accelerator subsystem devices
|
||||||
License: GPL-2.0-only
|
License: GPL-2.0-only
|
||||||
URL: https://github.com/intel/%{project_name}
|
URL: https://github.com/intel/%{project_name}
|
||||||
Source0: %{URL}/archive/%{name}-v%{version}.tar.gz
|
Source0: %{URL}/archive/%{name}-v%{version}.tar.gz
|
||||||
Patch0: 0001-accel-config-test-only-configure-ats_disable-if-supp.patch
|
|
||||||
|
|
||||||
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
|
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
|
||||||
BuildRequires: gcc
|
BuildRequires: gcc
|
||||||
@ -100,6 +99,10 @@ make check
|
|||||||
%{_libexecdir}/accel-config/test/*
|
%{_libexecdir}/accel-config/test/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Mar 22 2024 Jerry Snitselaar <jsnitsel@redhat.com> - 4.1.6-1
|
||||||
|
- Rebase to 4.1.6 release
|
||||||
|
Resolves: RHEL-29910
|
||||||
|
|
||||||
* Wed Jan 17 2024 Jerry Snitselaar <jsnitsel@redhat.com> - 4.1.3-2
|
* Wed Jan 17 2024 Jerry Snitselaar <jsnitsel@redhat.com> - 4.1.3-2
|
||||||
- Fix SPDX tags
|
- Fix SPDX tags
|
||||||
Resolves: RHEL-15610
|
Resolves: RHEL-15610
|
||||||
|
2
sources
2
sources
@ -1 +1 @@
|
|||||||
SHA512 (accel-config-v4.1.3.tar.gz) = d3c56e14fe497558c4d593e99eee0da184131acdb86fd33be3ab7221985ce94194f4b80edc96b192a67063cb9e8e23480af6e02f46ff593c7d52f77d92508506
|
SHA512 (accel-config-v4.1.6.tar.gz) = 142c1a1d9e0b631023859410cdd31d6b076aed6cf01636b8f4d854854e517802572d33773c11106bd86746962d8fd6cc0e8c7106686b565980e0335fac5cac4e
|
||||||
|
Loading…
Reference in New Issue
Block a user