Update the version and change log

Signed-off-by: Liming Sun <[email protected]>
Mellanox · Apr 14, 2020 · 257a860 · 257a860
1 parent fce4871
commit 257a860
Show file tree

Hide file tree

Showing 8 changed files with 58 additions and 20 deletions.
diff --git a/configure.ac b/configure.ac
@@ -2,7 +2,7 @@
 # Copyright (C) 2019 Mellanox Technologies. All Rights Reserved.
 #
 
-AC_INIT([rshim], [2.0.2])
+AC_INIT([rshim], [2.0.3])
 AC_CONFIG_AUX_DIR(config)
 AM_INIT_AUTOMAKE([-Wall -Werror foreign])
 AC_LANG(C)

diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,22 @@
+rshim (2.0.3-1) UNRELEASED; urgency=low
+
+  * Enable pci device during probing
+  * Map the pci resource0 file instead of /dev/mem
+  * Add copyright header in bootstrap.sh
+  * Add 'Requires' tag check in the rpm .spec for kernel-modules-extra
+  * Fix the 'rshim --version' output
+
+ -- Liming Sun <[email protected]>  Tue, 14 Apr 2020 16:40:25 -0400
+
+rshim (2.0.2-1) UNRELEASED; urgency=low
+
+  * Remove unnecessary dependency in .spec and use make_build
+  * Add package build for debian/ubuntu
+  * Fix some format in the man page
+  * Add check for syslog headers
+
+ -- Liming Sun <[email protected]>  Thu, 09 Apr 2020 12:17:15 -0400
+
 rshim (2.0.1-1) UNRELEASED; urgency=low
 
   * Initial release.

diff --git a/debian/control b/debian/control
@@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 8.0.0), autotools-dev, bzip2, libpci-dev, libusb-1.
 Package: rshim
 Architecture: any
 Homepage: https://github.com/Mellanox/rshim-user-space
-Description: rshim driver for Mellanox BlueField SoC
-  This is the user-space driver to access the BlueField SoC via the rshim
-  interface. It provides ways to push boot stream, debug the target or login
-  via the virtual console or network interface.
+Description: driver for Mellanox BlueField SoC
+	This is the user-space driver to access the BlueField SoC via the rshim
+	interface. It provides ways to push boot stream, debug the target or
+	login via the virtual console or network interface.
diff --git a/rhel/rshim.spec.in b/rhel/rshim.spec.in
@@ -55,6 +55,13 @@ via the virtual console or network interface.
 %{_mandir}/man8/rshim.8.gz
 
 %changelog
+* Tue Apr 14 2020 Liming Sun <[email protected]> - 2.0.3-1
+- Enable pci device during probing
+- Map the pci resource0 file instead of /dev/mem
+- Add copyright header in bootstrap.sh
+- Add 'Requires' tag check in the rpm .spec for kernel-modules-extra
+- Fix the 'rshim --version' output
+
 * Thu Apr 09 2020 Liming Sun <[email protected]> - 2.0.2-1
 - Remove unnecessary dependency in .spec and use make_build
 - Add package build for debian/ubuntu

diff --git a/rshim.spec.in b/rshim.spec.in
@@ -73,6 +73,13 @@ tar -axf %{SOURCE0} -C %{name}-%{version} --strip-components 1
 %{_mandir}/man8/rshim.8.gz
 
 %changelog
+* Tue Apr 14 2020 Liming Sun <[email protected]> - 2.0.3-1
+- Enable pci device during probing
+- Map the pci resource0 file instead of /dev/mem
+- Add copyright header in bootstrap.sh
+- Add 'Requires' tag check in the rpm .spec for kernel-modules-extra
+- Fix the 'rshim --version' output
+
 * Thu Apr 09 2020 Liming Sun <[email protected]> - 2.0.2-1
 - Remove unnecessary dependency in .spec and use make_build
 - Add package build for debian/ubuntu

diff --git a/src/rshim.c b/src/rshim.c
@@ -2309,6 +2309,7 @@ int main(int argc, char *argv[])
     { "help", no_argument, NULL, 'h' },
     { "index", required_argument, NULL, 'i' },
     { "log-level", required_argument, NULL, 'l' },
+    { "version", no_argument, NULL, 'v' },
     { NULL, 0, NULL, 0 }
   };
   int c;

diff --git a/src/rshim.h b/src/rshim.h
@@ -471,7 +471,7 @@ static inline void rshim_usb_poll(void)
 #ifdef HAVE_RSHIM_PCIE
 int rshim_pcie_init(void);
 int rshim_pcie_lf_init(void);
-void rshim_pcie_enable(void *dev);
+int rshim_pcie_enable(void *dev);
 #else
 static inline int rshim_pcie_init(void)
 {

diff --git a/src/rshim_pcie.c b/src/rshim_pcie.c
@@ -350,7 +350,7 @@ static int rshim_pcie_probe(struct pci_dev *pci_dev)
     goto rshim_map_failed;
   }
   if (pci_dev->size[0] < PCI_RSHIM_WINDOW_SIZE) {
-    RSHIM_ERR("BAR[0] size 0x%x too small\n", pci_dev->size[0]);
+    RSHIM_ERR("BAR[0] size 0x%x too small\n", (int)pci_dev->size[0]);
     goto rshim_map_failed;
   }
 
@@ -440,21 +440,25 @@ static int rshim_pcie_probe(struct pci_dev *pci_dev)
    return ret;
 }
 
-void rshim_pcie_enable(void *dev)
+int rshim_pcie_enable(void *dev)
 {
 #ifdef __linux__
-    char name[256];
-    int fd;
-    struct pci_dev *pci_dev = (struct pci_dev *)dev;
-
-    snprintf(name, sizeof(name), "%s/%04x:%02x:%02x.%1u/enable",
-             SYS_BUS_PCI, pci_dev->domain, pci_dev->bus,
-             pci_dev->dev, pci_dev->func);
-    fd = open( name, O_RDWR | O_CLOEXEC);
-    if (fd == -1)
-       return;
-    write( fd, "1", 1 );
-    close(fd);
+  struct pci_dev *pci_dev = (struct pci_dev *)dev;
+  char name[256];
+  int fd, rc;
+
+  snprintf(name, sizeof(name), "%s/%04x:%02x:%02x.%1u/enable",
+           SYS_BUS_PCI, pci_dev->domain, pci_dev->bus,
+           pci_dev->dev, pci_dev->func);
+  fd = open(name, O_RDWR | O_CLOEXEC);
+  if (fd == -1)
+    return -errno;
+
+  if (write(fd, "1", 1) < 0)
+    rc = -errno;
+
+  close(fd);
+  return rc;
 #endif
 }