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-08-31 13:46:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rshim (Old) and /work/SRC/openSUSE:Factory/.rshim.new.1766 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rshim" Thu Aug 31 13:46:02 2023 rev:12 rq:1108149 version:2.0.9.0 Changes: -------- --- /work/SRC/openSUSE:Factory/rshim/rshim.changes 2023-04-28 16:25:00.934587116 +0200 +++ /work/SRC/openSUSE:Factory/.rshim.new.1766/rshim.changes 2023-08-31 13:52:09.590038093 +0200 @@ -1,0 +2,7 @@ +Wed Aug 30 15:00:03 UTC 2023 - Matthias Brugger <mbrug...@suse.com> + +- Update to 2.0.9 + * Fix fallback logic of direct mapping + * Make timeout configurable through /dev/rshimX/misc + +------------------------------------------------------------------- Old: ---- rshim-2.0.7.0.tar New: ---- rshim-2.0.9.0.tar ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rshim.spec ++++++ --- /var/tmp/diff_new_pack.PEfD1P/_old 2023-08-31 13:52:10.618074838 +0200 +++ /var/tmp/diff_new_pack.PEfD1P/_new 2023-08-31 13:52:10.622074980 +0200 @@ -18,7 +18,7 @@ Name: rshim -Version: 2.0.7.0 +Version: 2.0.9.0 Release: 0 Summary: User-space driver for Mellanox BlueField SoC License: GPL-2.0 or BSD-3-Clause ++++++ rshim-2.0.7.0.tar -> rshim-2.0.9.0.tar ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rshim-2.0.7.0/configure.ac new/rshim-2.0.9.0/configure.ac --- old/rshim-2.0.7.0/configure.ac 2023-03-30 18:24:11.000000000 +0200 +++ new/rshim-2.0.9.0/configure.ac 2023-06-17 19:58:49.000000000 +0200 @@ -2,7 +2,7 @@ # Copyright (C) 2019 Mellanox Technologies. All Rights Reserved. # -AC_INIT([rshim], [2.0.7]) +AC_INIT([rshim], [2.0.9]) 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.7.0/debian/changelog new/rshim-2.0.9.0/debian/changelog --- old/rshim-2.0.7.0/debian/changelog 2023-03-30 18:24:11.000000000 +0200 +++ new/rshim-2.0.9.0/debian/changelog 2023-06-17 19:58:49.000000000 +0200 @@ -1,3 +1,15 @@ +rshim (2.0.9) UNRELEASED; urgency=low + + * rshim/usb/bf3: fix timeout logic + + -- Liming Sun <limi...@nvidia.com> Sat, 17 Jun 2023 13:55:20 -0400 + +rshim (2.0.8) UNRELEASED; urgency=low + + * Fix the fall-back logic of direct-mapping + + -- Liming Sun <limi...@nvidia.com> Tue, 16 May 2023 11:40:25 -0400 + rshim (2.0.7) UNRELEASED; urgency=low * Avoid opening /dev/uio multiple times diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rshim-2.0.7.0/rhel/rshim.spec.in new/rshim-2.0.9.0/rhel/rshim.spec.in --- old/rshim-2.0.7.0/rhel/rshim.spec.in 2023-03-30 18:24:11.000000000 +0200 +++ new/rshim-2.0.9.0/rhel/rshim.spec.in 2023-06-17 19:58:49.000000000 +0200 @@ -54,6 +54,12 @@ %{_mandir}/man8/rshim.8.gz %changelog +* Sat Jun 17 2023 Liming Sun <limi...@nvidia.com> - 2.0.9 +- rshim/usb/bf3: fix timeout logic + +* Tue May 16 2023 Liming Sun <limi...@nvidia.com> - 2.0.8 +- Fix the fall-back logic of direct-mapping + * Thu Mar 30 2023 Liming Sun <limi...@nvidia.com> - 2.0.7 - Avoid opening /dev/uio multiple times - Update common files to dual-license diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rshim-2.0.7.0/rshim.spec.in new/rshim-2.0.9.0/rshim.spec.in --- old/rshim-2.0.7.0/rshim.spec.in 2023-03-30 18:24:11.000000000 +0200 +++ new/rshim-2.0.9.0/rshim.spec.in 2023-06-17 19:58:49.000000000 +0200 @@ -95,6 +95,12 @@ %{_mandir}/man8/bfb-install.8.gz %changelog +* Sat Jun 17 2023 Liming Sun <limi...@nvidia.com> - 2.0.9 +- rshim/usb/bf3: fix timeout logic + +* Tue May 16 2023 Liming Sun <limi...@nvidia.com> - 2.0.8 +- Fix the fall-back logic of direct-mapping + * Thu Mar 30 2023 Liming Sun <limi...@nvidia.com> - 2.0.7 - Avoid opening /dev/uio multiple times - Update common files to dual-license diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rshim-2.0.7.0/src/rshim_pcie.c new/rshim-2.0.9.0/src/rshim_pcie.c --- old/rshim-2.0.7.0/src/rshim_pcie.c 2023-03-30 18:24:11.000000000 +0200 +++ new/rshim-2.0.9.0/src/rshim_pcie.c 2023-06-17 19:58:49.000000000 +0200 @@ -1092,7 +1092,7 @@ } /* Fall-back to direct map if failed. */ - if (rc < 0 && dev->mmap_mode == RSHIM_PCIE_MMAP_UIO) { + if (rc < 0 && dev->mmap_mode != RSHIM_PCIE_MMAP_DIRECT) { RSHIM_INFO("Fall-back to direct io\n"); rshim_pcie_bind(dev, false); dev->pci_path = NULL; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rshim-2.0.7.0/src/rshim_usb.c new/rshim-2.0.9.0/src/rshim_usb.c --- old/rshim-2.0.7.0/src/rshim_usb.c 2023-03-30 18:24:11.000000000 +0200 +++ new/rshim-2.0.9.0/src/rshim_usb.c 2023-06-17 19:58:49.000000000 +0200 @@ -249,7 +249,7 @@ int rc, tmp_tsfr; int size_addr; uint64_t reg; - int retries = 60; + time_t t0, t1; int i = 0; size_addr = bd->regs->boot_fifo_count; @@ -257,12 +257,12 @@ temp_count = count; while (temp_count) { - /* Check whether the BOOT FIFO is full. If it is, poll, until * there is free space. The BOOT FIFO has a max size of * is 0x400 (lines) * 8 = 8192 (bytes). */ do { + time(&t0); rc = bd->read_rshim(bd, RSHIM_CHANNEL, size_addr, ®, RSHIM_REG_SIZE_8B); if (rc < 0) { @@ -274,10 +274,9 @@ if (avail_fifo_bytes > 0) break; - /* TODO: Make this delay smaller for real HW */ - sleep(1); - - } while(retries--); + usleep(50000); + time(&t1); + } while(difftime(t1, t0) < bd->boot_timeout); if (avail_fifo_bytes) { if (temp_count < avail_fifo_bytes) @@ -299,7 +298,7 @@ } else { RSHIM_ERR("Timeout boot fifo count\n"); - return -EBUSY; + return transferred; } }