Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package rshim for openSUSE:Factory checked
in at 2023-04-28 16:23:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rshim (Old)
and /work/SRC/openSUSE:Factory/.rshim.new.1533 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rshim"
Fri Apr 28 16:23:51 2023 rev:11 rq:1083435 version:2.0.7.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/rshim/rshim.changes 2023-04-22
22:03:54.598453859 +0200
+++ /work/SRC/openSUSE:Factory/.rshim.new.1533/rshim.changes 2023-04-28
16:25:00.934587116 +0200
@@ -1,0 +2,8 @@
+Fri Apr 21 17:49:44 UTC 2023 - Matthias Brugger <mbrug...@suse.com>
+
+- Update service to new tag format
+- update to 2.0.7
+ * adjust reset delay
+ * avoid leak the file descriptor for /dev/uio
+
+-------------------------------------------------------------------
Old:
----
rshim-2.0.6.19.2.tar
New:
----
rshim-2.0.7.0.tar
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rshim.spec ++++++
--- /var/tmp/diff_new_pack.r7UpPc/_old 2023-04-28 16:25:03.710603319 +0200
+++ /var/tmp/diff_new_pack.r7UpPc/_new 2023-04-28 16:25:03.714603343 +0200
@@ -18,7 +18,7 @@
Name: rshim
-Version: 2.0.6.19.2
+Version: 2.0.7.0
Release: 0
Summary: User-space driver for Mellanox BlueField SoC
License: GPL-2.0 or BSD-3-Clause
++++++ _service ++++++
--- /var/tmp/diff_new_pack.r7UpPc/_old 2023-04-28 16:25:03.746603530 +0200
+++ /var/tmp/diff_new_pack.r7UpPc/_new 2023-04-28 16:25:03.750603553 +0200
@@ -6,8 +6,7 @@
<param name="scm">git</param>
<param
name="url">https://github.com/Mellanox/rshim-user-space.git</param>
<param name="filename">rshim</param>
- <param name="versionrewrite-pattern">rshim-(.*)-(.*)</param>
- <param name="versionrewrite-replacement">\1.\2</param>
+ <param name="versionrewrite-pattern">rshim-(.*)</param>
<param name="versionformat">@PARENT_TAG@.@TAG_OFFSET@</param>
</service>
<service mode="disabled" name="set_version" />
++++++ rshim-2.0.6.19.2.tar -> rshim-2.0.7.0.tar ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rshim-2.0.6.19.2/configure.ac
new/rshim-2.0.7.0/configure.ac
--- old/rshim-2.0.6.19.2/configure.ac 2023-02-16 21:59:38.000000000 +0100
+++ new/rshim-2.0.7.0/configure.ac 2023-03-30 18:24:11.000000000 +0200
@@ -2,7 +2,7 @@
# Copyright (C) 2019 Mellanox Technologies. All Rights Reserved.
#
-AC_INIT([rshim], [2.0.6])
+AC_INIT([rshim], [2.0.7])
AC_CONFIG_AUX_DIR(config)
AM_INIT_AUTOMAKE([-Wall -Werror foreign])
AC_LANG(C)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rshim-2.0.6.19.2/debian/changelog
new/rshim-2.0.7.0/debian/changelog
--- old/rshim-2.0.6.19.2/debian/changelog 2023-02-16 21:59:38.000000000
+0100
+++ new/rshim-2.0.7.0/debian/changelog 2023-03-30 18:24:11.000000000 +0200
@@ -1,3 +1,11 @@
+rshim (2.0.7) UNRELEASED; urgency=low
+
+ * Avoid opening /dev/uio multiple times
+ * Update common files to dual-license
+ * Adjust rshim reset delay
+
+ -- Liming Sun <limi...@nvidia.com> Thu, 30 Mar 2023 11:40:15 -0400
+
rshim (2.0.6-19) UNRELEASED; urgency=low
* BF3: Support 4B access for PCIe
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rshim-2.0.6.19.2/etc/rshim.conf
new/rshim-2.0.7.0/etc/rshim.conf
--- old/rshim-2.0.6.19.2/etc/rshim.conf 2023-02-16 21:59:38.000000000 +0100
+++ new/rshim-2.0.7.0/etc/rshim.conf 2023-03-30 18:24:11.000000000 +0200
@@ -3,15 +3,49 @@
#
#
-# Default configuration for a rshim device
+# Display level for the 'misc' file
#
#DISPLAY_LEVEL 0
+
+#
+# Timeout in seconds when pushing BFB while target side is not reading the
+# boot stream
+#
#BOOT_TIMEOUT 150
+
+#
+# Once set to 1, the driver will ignore all rshim writes and returns 0 for
+# rshim read. It could be used in certain cases, such as during FW_RESET or
+# bypassing the rshim PF to VM
+#
#DROP_MODE 0
+
+#
+# Delay in seconds for rshim over USB, which is added after chip reset and
+# before pushing the boot stream
+#
#USB_RESET_DELAY 1
+
+#
+# Delay in seconds for rshim over PCIe, which is added after chip reset and
+# before pushing the boot stream
+#
#PCIE_RESET_DELAY 5
+
+#
+# Interrupt polling interval in seconds when running rshim over direct memory
+# mapping
+#
#PCIE_INTR_POLL_INTERVAL 10
+
+#
+# Setting is to 0 will disallow rshim PCIe BAR mapping via VFIO
+#
#PCIE_HAS_VFIO 1
+
+#
+# Setting is to 0 will disallow rshim PCIe BAR mapping via UIO
+#
#PCIE_HAS_UIO 1
#
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rshim-2.0.6.19.2/rhel/rshim.spec.in
new/rshim-2.0.7.0/rhel/rshim.spec.in
--- old/rshim-2.0.6.19.2/rhel/rshim.spec.in 2023-02-16 21:59:38.000000000
+0100
+++ new/rshim-2.0.7.0/rhel/rshim.spec.in 2023-03-30 18:24:11.000000000
+0200
@@ -4,7 +4,7 @@
Name: rshim
Version: @VERSION@
-Release: 19%{?dist}
+Release: 0%{?dist}
Summary: User-space driver for Mellanox BlueField SoC
License: GPLv2
@@ -54,6 +54,11 @@
%{_mandir}/man8/rshim.8.gz
%changelog
+* Thu Mar 30 2023 Liming Sun <limi...@nvidia.com> - 2.0.7
+- Avoid opening /dev/uio multiple times
+- Update common files to dual-license
+- Adjust rshim reset delay
+
* Sun Nov 20 2022 Liming Sun <limi...@nvidia.com> - 2.0.6-19
- BF3: Support 4B access for PCIe
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rshim-2.0.6.19.2/rshim.spec.in
new/rshim-2.0.7.0/rshim.spec.in
--- old/rshim-2.0.6.19.2/rshim.spec.in 2023-02-16 21:59:38.000000000 +0100
+++ new/rshim-2.0.7.0/rshim.spec.in 2023-03-30 18:24:11.000000000 +0200
@@ -4,7 +4,7 @@
Name: rshim
Version: @VERSION@
-Release: 19%{?dist}
+Release: 0%{?dist}
Summary: User-space driver for Mellanox BlueField SoC
License: GPLv2
@@ -95,6 +95,11 @@
%{_mandir}/man8/bfb-install.8.gz
%changelog
+* Thu Mar 30 2023 Liming Sun <limi...@nvidia.com> - 2.0.7
+- Avoid opening /dev/uio multiple times
+- Update common files to dual-license
+- Adjust rshim reset delay
+
* Sun Nov 20 2022 Liming Sun <limi...@nvidia.com> - 2.0.6-19
- BF3: Support 4B access for PCIe
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rshim-2.0.6.19.2/src/rshim.c
new/rshim-2.0.7.0/src/rshim.c
--- old/rshim-2.0.6.19.2/src/rshim.c 2023-02-16 21:59:38.000000000 +0100
+++ new/rshim-2.0.7.0/src/rshim.c 2023-03-30 18:24:11.000000000 +0200
@@ -23,8 +23,6 @@
#include "rshim.h"
-#define REVISION "19"
-
/* Maximum number of devices supported (currently it's limited to 64). */
#define RSHIM_MAX_DEV 64
@@ -2937,7 +2935,7 @@
break;
case 'v':
#if defined(PACKAGE_NAME) && defined(VERSION)
- printf(PACKAGE_NAME " " VERSION "-" REVISION "\n");
+ printf(PACKAGE_NAME " " VERSION "\n");
#else
printf("Rshim Driver for BlueField SoC 2.0\n");
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rshim-2.0.6.19.2/src/rshim_pcie.c
new/rshim-2.0.7.0/src/rshim_pcie.c
--- old/rshim-2.0.6.19.2/src/rshim_pcie.c 2023-02-16 21:59:38.000000000
+0100
+++ new/rshim-2.0.7.0/src/rshim_pcie.c 2023-03-30 18:24:11.000000000 +0200
@@ -185,6 +185,7 @@
/* Interrupt handle and read length */
volatile int intr_fd;
+ volatile int intr_reset_seq;
uint32_t intr_len;
/* Interrupt thread */
@@ -718,6 +719,11 @@
/* Open the control fd to handle interrupt. */
uio_num = atoi(str);
snprintf(devname, sizeof(devname), "/dev/uio%u", uio_num);
+ if (dev->intr_fd >= 0) {
+ dev->intr_reset_seq++;
+ __sync_synchronize();
+ close(dev->intr_fd);
+ }
dev->intr_fd = open(devname, O_RDWR);
dev->intr_len = sizeof(uint32_t);
rshim_pcie_enable_irq(dev, true);
@@ -841,7 +847,9 @@
{
rshim_pcie_t *dev = arg;
uint8_t intr_buf[16];
- int rc;
+ int rc, reset_seq;
+
+ reset_seq = dev->intr_reset_seq;
while (rshim_run) {
if (dev->intr_fd < 0) {
@@ -861,6 +869,12 @@
continue;
}
+ __sync_synchronize();
+ if (reset_seq != dev->intr_reset_seq) {
+ reset_seq = dev->intr_reset_seq;
+ continue;
+ }
+
/* Interrupt handler. */
rshim_pcie_intr(dev);
}
