rpms/accel-config
7
0
Fork 0
Code Issues Pull Requests Releases Activity

accel-config: Rebase to 3.4.6.3 release

Browse Source 
Resolves: rhbz#2040077

Signed-off-by: Jerry Snitselaar <jsnitsel@redhat.com>
This commit is contained in:
Jerry Snitselaar 2022-04-03 18:03:29 -07:00
parent 9e38ec8ce2
commit d0159bde16
5 changed files with 11 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1,3 +1,5 @@
/accel-config-v3.1.tar.gz
/accel-config-v3.2.tar.gz
/accel-config-v3.4.2.tar.gz
/accel-config-v3.4.6.2.tar.gz
/accel-config-v3.4.6.3.tar.gz

34
0001-accel-config-clean-up-double-frees-in-add_group.patch
View File

@ -1,34 +0,0 @@
From a073b40ea293dec87af5f887bb90744ed244e0c9 Mon Sep 17 00:00:00 2001
From: Jerry Snitselaar <jsnitsel@redhat.com>
Date: Mon, 18 Oct 2021 15:10:00 -0700
Subject: [PATCH 1/3] accel-config: clean up double frees in add_group
free(group) is called after jumping to the err_group label,
so don't call free(group) in paths jumping there.
Signed-off-by: Jerry Snitselaar <jsnitsel@redhat.com>
---
accfg/lib/libaccfg.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/accfg/lib/libaccfg.c b/accfg/lib/libaccfg.c
index f4fc17e5ca93..a13be34a7ef5 100644
--- a/accfg/lib/libaccfg.c
+++ b/accfg/lib/libaccfg.c
@@ -870,13 +870,11 @@ static void *add_group(void *parent, int id, const char *group_base,
group_base_string = strdup(group_base);
if (!group_base_string) {
err(ctx, "conversion of group_base_string failed\n");
- free(group);
close(dfd);
goto err_group;
}
if (sscanf(basename(group_base_string),
"group%" SCNu64 ".%" SCNu64, &device_id, &group_id) != 2) {
- free(group);
close(dfd);
goto err_group;
}
--
2.33.0

27
0003-accel-config-remove-redundant-assignment-in-umwait.patch
View File

@ -1,27 +0,0 @@
From dc03a40adfaaded6c3e2d9bb0bff2218b187daae Mon Sep 17 00:00:00 2001
From: Jerry Snitselaar <jsnitsel@redhat.com>
Date: Mon, 18 Oct 2021 15:47:27 -0700
Subject: [PATCH 3/3] accel-config: remove redundant assignment in umwait
Signed-off-by: Jerry Snitselaar <jsnitsel@redhat.com>
---
test/dsa.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/test/dsa.c b/test/dsa.c
index 5396b1b97d3a..961f5a73990e 100644
--- a/test/dsa.c
+++ b/test/dsa.c
@@ -393,9 +393,6 @@ static inline int umwait(unsigned long timeout, unsigned int state)
uint32_t timeout_low = (uint32_t)timeout;
uint32_t timeout_high = (uint32_t)(timeout >> 32);
- timeout_low = (uint32_t)timeout;
- timeout_high = (uint32_t)(timeout >> 32);
-
asm volatile(".byte 0xf2, 0x48, 0x0f, 0xae, 0xf1\t\n"
"setc %0\t\n"
: "=r"(r)
--
2.33.0

13
accel-config.spec
View File

@ -2,8 +2,8 @@
%global debug_package %{nil}
Name: accel-config
Version: 3.4.2
Release: 2%{?dist}
Version: 3.4.6.3
Release: 1%{?dist}
Summary: Configure accelerator subsystem devices
# The entire source code is under GPLv2 except for accel-config
# library which is mostly LGPLv2.1, ccan/list which is BSD-MIT and
@ -11,8 +11,6 @@ Summary: Configure accelerator subsystem devices
License: GPLv2 and LGPLv2+ and MIT and CC0
URL: https://github.com/intel/%{project_name}
Source0: %{URL}/archive/%{name}-v%{version}.tar.gz
Patch0: 0001-accel-config-clean-up-double-frees-in-add_group.patch
Patch1: 0003-accel-config-remove-redundant-assignment-in-umwait.patch
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
BuildRequires: gcc
@ -86,6 +84,7 @@ make check
%{_bindir}/%{name}
%{_mandir}/man1/%{name}*
%{_sysconfdir}/%{name}/%{name}.conf.sample
%{_datadir}/%{name}/contrib/*
%files libs
%doc README.md
@ -102,9 +101,13 @@ make check
%files test
%license Documentation/COPYING LICENSE_GPL_2_0
%doc test/README.md
%{_datadir}/accel-config/test/*
%{_datadir}/%{name}/test/*
%changelog
* Sun Apr 03 2022 Jerry Snitselaar <jsnitsel@redhat.com> - 3.4.6.3-1
- Rebase to 3.4.6.3 release.
Resolves: rhbz#2040077
* Fri Feb 11 2022 Jerry Snitselaar <jsnitsel@redhat.com> - 3.4.2-2
- Rebuild to clear osci test failure.
Resolves: rhbz#1999934

2
sources
View File

@ -1 +1 @@
SHA512 (accel-config-v3.4.2.tar.gz) = e1f4d5b43a28cf2f82b93665e126e1c02127ad78ac0ab78049f687bbcebec8866796adbd32e031dccbe48508bb0b96e5cc8de27ef891e121639bcb2fd498268e
SHA512 (accel-config-v3.4.6.3.tar.gz) = 703d70c309a06b0f0f90cc7434d43d7eaa067c10c79263778eeb50cfbbd0e540a3755ad3af6109900577e336f20d258f9381e1825807ed3e47fe80f322d6d8a3