Hello community,
here is the log from the commit of package libusnic_verbs-rdmav2 for
openSUSE:Factory checked in at 2015-02-27 11:09:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libusnic_verbs-rdmav2 (Old)
and /work/SRC/openSUSE:Factory/.libusnic_verbs-rdmav2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libusnic_verbs-rdmav2"
Changes:
--------
---
/work/SRC/openSUSE:Factory/libusnic_verbs-rdmav2/libusnic_verbs-rdmav2.changes
2014-07-23 22:06:40.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.libusnic_verbs-rdmav2.new/libusnic_verbs-rdmav2.changes
2015-02-27 11:09:59.000000000 +0100
@@ -1,0 +2,12 @@
+Wed Feb 25 22:01:50 UTC 2015 - mgo...@suse.com
+
+- Update to latest version 1.1.0.237:
+ * Added vendor field in usNIC RPM metadata
+ * Added capability reporting function.
+ * The alloc_context routine will now return a structure specifying the
+ capabilities of the device and driver. This is important so that Intel MPI
+ can detect whether the driver supports CQ sharing.
+ * move usnic_ib_abi.h from libusnic_verbs to common directory so other
+ libraries may access it
+
+-------------------------------------------------------------------
Old:
----
libusnic_verbs-1.1.0.222.sles12sp0.src.tar.gz
New:
----
libusnic_verbs-1.1.0.237.sles12sp0.src.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libusnic_verbs-rdmav2.spec ++++++
--- /var/tmp/diff_new_pack.UQg4l7/_old 2015-02-27 11:10:00.000000000 +0100
+++ /var/tmp/diff_new_pack.UQg4l7/_new 2015-02-27 11:10:00.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package libusnic_verbs-rdmav2 (Version 1.0.2)
+# spec file for package libusnic_verbs-rdmav2
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,6 +15,7 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+
# Version magic
%{!?usnic_release: %define usnic_release SUSE_%{expand:%(date +%Y%m%d_%H%M)}}
@@ -22,16 +23,19 @@
Name: libusnic_verbs-rdmav2
Summary: Cisco UCS InfiniBand HCA Userspace Driver
-Version: 1.1.0.222
-Release: 1
-Group: System/Libraries
License: BSD-2-Clause
+Group: System/Libraries
+Version: 1.1.0.237
+Release: 0
Url: http://cisco.com/
Source: libusnic_verbs-%{version}%{extra_version}.src.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}}
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: autoconf
+BuildRequires: automake
BuildRequires: libibverbs-devel >= 1.1.5
BuildRequires: libnl3-devel
-BuildRequires: automake autoconf libtool pkgconfig
+BuildRequires: libtool
+BuildRequires: pkgconfig
# Enable valgrind?
%define config_valgrind --without-valgrind
@@ -45,6 +49,7 @@
%package -n usnic_udp_pingpong
Summary: Small usnic program
+Group: System/Libraries
Provides: %{name}-pingpong = %{version}
Obsoletes: %{name}-pingpong < %{version}
++++++ libusnic_verbs-1.1.0.222.sles12sp0.src.tar.gz ->
libusnic_verbs-1.1.0.237.sles12sp0.src.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libusnic_verbs-1.1.0.222.sles12sp0/ChangeLog
new/libusnic_verbs-1.1.0.237.sles12sp0/ChangeLog
--- old/libusnic_verbs-1.1.0.222.sles12sp0/ChangeLog 2014-07-12
10:59:07.000000000 +0200
+++ new/libusnic_verbs-1.1.0.237.sles12sp0/ChangeLog 2014-08-14
10:58:17.000000000 +0200
@@ -1,4 +1,21 @@
--------------- Version 1.1.0 ---------------
+Aug 05 2014
+ Added vendor field in usNIC RPM metadata
+
+Jul 24 2014
+ Added capability reporting function.
+
+ The alloc_context routine will now return a structure specifying the
+ capabilities of the device and driver. This is important so that Intel MPI
+ can detect whether the driver supports CQ sharing.
+
+Jul 23 2014
+ move usnic_ib_abi.h from libusnic_verbs to common directory so other
+ libraries may access it
+
+Jul 11 2014
+ Move license insertion routine into libusnic_verbs top level Makefile
+
Jul 08 2014
Print local and remote addresses as IP instead of GIDs.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libusnic_verbs-1.1.0.222.sles12sp0/RELEASE_VERSION
new/libusnic_verbs-1.1.0.237.sles12sp0/RELEASE_VERSION
--- old/libusnic_verbs-1.1.0.222.sles12sp0/RELEASE_VERSION 2014-07-12
10:59:07.000000000 +0200
+++ new/libusnic_verbs-1.1.0.237.sles12sp0/RELEASE_VERSION 2014-08-14
10:58:17.000000000 +0200
@@ -1,6 +1,6 @@
#Auto Generated - Do not edit
USNIC_VERSION=1.1.0
-USNIC_REL_DATE=07/12/14
+USNIC_REL_DATE=08/14/14
USNIC_SVN_BRANCH=https://savbu-sjc-svn.cisco.com/svnrepos/ca/branches/palo_drivers/palo_enic_linux_esx_main
-USNIC_SVN_REV=181798
+USNIC_SVN_REV=185830
RPM_RELEASE=1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libusnic_verbs-1.1.0.222.sles12sp0/configure
new/libusnic_verbs-1.1.0.237.sles12sp0/configure
--- old/libusnic_verbs-1.1.0.222.sles12sp0/configure 2014-07-12
10:59:07.000000000 +0200
+++ new/libusnic_verbs-1.1.0.237.sles12sp0/configure 2014-08-14
10:58:17.000000000 +0200
@@ -6443,7 +6443,7 @@
rm -rf conftest*
;;
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -6461,7 +6461,10 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_i386"
;;
- ppc64-*linux*|powerpc64-*linux*)
+ powerpc64le-*linux*)
+ LD="${LD-ld} -m elf32lppclinux"
+ ;;
+ powerpc64-*linux*)
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
@@ -6480,7 +6483,10 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
;;
- ppc*-*linux*|powerpc*-*linux*)
+ powerpcle-*linux*)
+ LD="${LD-ld} -m elf64lppc"
+ ;;
+ powerpc-*linux*)
LD="${LD-ld} -m elf64ppc"
;;
s390*-*linux*|s390*-*tpf*)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libusnic_verbs-1.1.0.222.sles12sp0/libusnic_verbs.spec.in
new/libusnic_verbs-1.1.0.237.sles12sp0/libusnic_verbs.spec.in
--- old/libusnic_verbs-1.1.0.222.sles12sp0/libusnic_verbs.spec.in
2014-07-12 10:59:07.000000000 +0200
+++ new/libusnic_verbs-1.1.0.237.sles12sp0/libusnic_verbs.spec.in
2014-08-14 10:58:17.000000000 +0200
@@ -41,6 +41,7 @@
Version: %{version_b}
Release: @RPM_RELEASE@
+Vendor: Cisco Systems, Inc.
Summary: Cisco Virtual NIC OpenFabrics Userspace Driver
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libusnic_verbs-1.1.0.222.sles12sp0/m4/libtool.m4
new/libusnic_verbs-1.1.0.237.sles12sp0/m4/libtool.m4
--- old/libusnic_verbs-1.1.0.222.sles12sp0/m4/libtool.m4 2014-07-12
10:59:06.000000000 +0200
+++ new/libusnic_verbs-1.1.0.237.sles12sp0/m4/libtool.m4 2014-08-14
10:58:17.000000000 +0200
@@ -1312,7 +1312,7 @@
rm -rf conftest*
;;
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -1326,7 +1326,10 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_i386"
;;
- ppc64-*linux*|powerpc64-*linux*)
+ powerpc64le-*linux*)
+ LD="${LD-ld} -m elf32lppclinux"
+ ;;
+ powerpc64-*linux*)
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
@@ -1345,7 +1348,10 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
;;
- ppc*-*linux*|powerpc*-*linux*)
+ powerpcle-*linux*)
+ LD="${LD-ld} -m elf64lppc"
+ ;;
+ powerpc-*linux*)
LD="${LD-ld} -m elf64ppc"
;;
s390*-*linux*|s390*-*tpf*)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libusnic_verbs-1.1.0.222.sles12sp0/src/usnic.h
new/libusnic_verbs-1.1.0.237.sles12sp0/src/usnic.h
--- old/libusnic_verbs-1.1.0.222.sles12sp0/src/usnic.h 2014-07-12
10:59:06.000000000 +0200
+++ new/libusnic_verbs-1.1.0.237.sles12sp0/src/usnic.h 2014-08-14
10:58:17.000000000 +0200
@@ -148,6 +148,8 @@
struct vnic_cq vnic_cq;
struct usnic_qp *qp;
uint32_t cqn;
+ uint32_t max_shared_qps;
+ uint32_t num_shared_qps;
};
struct usnic_qp {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libusnic_verbs-1.1.0.222.sles12sp0/src/usnic_abi.h
new/libusnic_verbs-1.1.0.237.sles12sp0/src/usnic_abi.h
--- old/libusnic_verbs-1.1.0.222.sles12sp0/src/usnic_abi.h 2014-07-12
10:59:06.000000000 +0200
+++ new/libusnic_verbs-1.1.0.237.sles12sp0/src/usnic_abi.h 2014-08-14
10:58:17.000000000 +0200
@@ -79,4 +79,36 @@
u32 reserved[9];
};
+struct usnic_ib_create_cq_cmd {
+ u32 cq_group_id;
+ u32 num_qps_in_group;
+};
+
+#define USNIC_CTX_RESP_VERSION 1
+
+struct usnic_ib_get_context_cmd {
+ u32 resp_version; /* response version requested */
+ u32 num_caps; /* number of capabilities requested */
+};
+
+/*
+ * Note that this enum must never have members removed or re-ordered in order
+ * to retain backwards compatability
+ */
+enum usnic_capability {
+ USNIC_CAP_CQ_SHARING, /* CQ sharing version */
+ USNIC_CAP_CNT
+};
+
+/*
+ * If and when there become multiple versions of this struct, it will
+ * become a union for cross-version compatability to make sure there is always
+ * space for older and larger versions of the contents.
+ */
+struct usnic_ib_get_context_resp {
+ u32 resp_version; /* response version returned */
+ u32 num_caps; /* number of capabilities returned */
+ u32 cap_info[USNIC_CAP_CNT];
+};
+
#endif /* USNIC_ABI_H */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libusnic_verbs-1.1.0.222.sles12sp0/src/usnic_ib_abi.h
new/libusnic_verbs-1.1.0.237.sles12sp0/src/usnic_ib_abi.h
--- old/libusnic_verbs-1.1.0.222.sles12sp0/src/usnic_ib_abi.h 2014-07-12
10:59:06.000000000 +0200
+++ new/libusnic_verbs-1.1.0.237.sles12sp0/src/usnic_ib_abi.h 2014-08-14
10:58:17.000000000 +0200
@@ -43,11 +43,13 @@
struct usnic_get_context {
struct ibv_get_context ibv_cmd;
+ struct usnic_ib_get_context_cmd usnic_cmd;
__u64 reserved;
};
struct usnic_get_context_resp {
struct ibv_get_context_resp ibv_resp;
+ struct usnic_ib_get_context_resp usnic_resp;
__u64 reserved;
};
@@ -73,6 +75,7 @@
struct usnic_create_cq {
struct ibv_create_cq ibv_cmd;
+ struct usnic_ib_create_cq_cmd usnic_cmd;
__u64 reserved;
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libusnic_verbs-1.1.0.222.sles12sp0/src/vnic_dev.c
new/libusnic_verbs-1.1.0.237.sles12sp0/src/vnic_dev.c
--- old/libusnic_verbs-1.1.0.222.sles12sp0/src/vnic_dev.c 2014-07-12
10:59:06.000000000 +0200
+++ new/libusnic_verbs-1.1.0.237.sles12sp0/src/vnic_dev.c 2014-08-14
10:58:17.000000000 +0200
@@ -25,7 +25,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*
*/
-#ident "$Id: vnic_dev.c 178965 2014-06-24 17:35:38Z xuywang $"
+#ident "$Id: vnic_dev.c 183023 2014-07-22 23:47:25Z xuywang $"
#include <linux/kernel.h>
#include <linux/errno.h>
@@ -43,17 +43,6 @@
#include "vnic_stats.h"
#include "vnic_wq.h"
-struct devcmd2_controller {
- struct vnic_wq_ctrl *wq_ctrl;
- struct vnic_dev_ring results_ring;
- struct vnic_wq wq;
- struct vnic_devcmd2 *cmd_ring;
- struct devcmd2_result *result;
- u16 next_result;
- u16 result_size;
- int color;
-};
-
enum vnic_proxy_type {
PROXY_NONE,
PROXY_BY_BDF,
@@ -91,7 +80,6 @@
u32 proxy_index;
u64 args[VNIC_DEVCMD_NARGS];
struct vnic_intr_coal_timer_info intr_coal_timer_info;
- struct devcmd2_controller *devcmd2;
int (*devcmd_rtn)(struct vnic_dev *vdev, enum vnic_devcmd_cmd cmd, int
wait);
};
@@ -417,66 +405,6 @@
return -ETIMEDOUT;
#endif
}
-static int _vnic_dev_cmd2(struct vnic_dev *vdev, enum vnic_devcmd_cmd cmd,
- int wait)
-{
-#if defined(CONFIG_MIPS) || defined(MGMT_VNIC)
- return 0;
-#else
- struct devcmd2_controller *dc2c = vdev->devcmd2;
- struct devcmd2_result *result = dc2c->result + dc2c->next_result;
- unsigned int i;
- int delay;
- int err;
- u32 posted;
- u32 new_posted;
-
- posted = ioread32(&dc2c->wq_ctrl->posted_index);
- new_posted = (posted + 1) % DEVCMD2_RING_SIZE;
- dc2c->cmd_ring[posted].cmd = cmd;
- dc2c->cmd_ring[posted].flags = 0;
-
- if ((_CMD_FLAGS(cmd) & _CMD_FLAGS_NOWAIT))
- dc2c->cmd_ring[posted].flags |= DEVCMD2_FNORESULT;
- if (_CMD_DIR(cmd) & _CMD_DIR_WRITE) {
- for (i = 0; i < VNIC_DEVCMD_NARGS; i++)
- dc2c->cmd_ring[posted].args[i] = vdev->args[i];
- }
-
- iowrite32(new_posted, &dc2c->wq_ctrl->posted_index);
-
- if (dc2c->cmd_ring[posted].flags & DEVCMD2_FNORESULT)
- return 0;
-
- for (delay = 0; delay < wait; delay++) {
- udelay(100);
- if (result->color == dc2c->color) {
- dc2c->next_result++;
- if (dc2c->next_result == dc2c->result_size) {
- dc2c->next_result = 0;
- dc2c->color = dc2c->color ? 0 : 1;
- }
- if (result->error) {
- err = (int) result->error;
- if (err != ERR_ECMDUNKNOWN ||cmd !=
CMD_CAPABILITY)
- pr_err("Error %d devcmd %d\n",
- err, _CMD_N(cmd));
- return err;
- }
- if (_CMD_DIR(cmd) & _CMD_DIR_READ) {
- rmb();
- for (i = 0; i < VNIC_DEVCMD_NARGS; i++)
- vdev->args[i] = result->results[i];
- }
- return 0;
- }
- }
-
- pr_err("Timed out devcmd %d\n", _CMD_N(cmd));
-
- return -ETIMEDOUT;
-#endif
-}
static int vnic_dev_init_devcmdorig(struct vnic_dev *vdev)
{
@@ -492,86 +420,6 @@
#endif
}
-static int vnic_dev_init_devcmd2(struct vnic_dev *vdev)
-{
-#if !defined(CONFIG_MIPS) && !defined(MGMT_VNIC)
- int err;
- unsigned int fetch_index;
-
- if (vdev->devcmd2)
- return 0;
-
- vdev->devcmd2 = kzalloc(sizeof(*vdev->devcmd2), GFP_ATOMIC);
- if (!vdev->devcmd2)
- return -ENOMEM;
-
- vdev->devcmd2->color = 1;
- vdev->devcmd2->result_size = DEVCMD2_RING_SIZE;
- err = vnic_wq_devcmd2_alloc(vdev, &vdev->devcmd2->wq,
- DEVCMD2_RING_SIZE, DEVCMD2_DESC_SIZE);
-
- if (err)
- goto err_free_devcmd2;
-
- fetch_index = ioread32(&vdev->devcmd2->wq.ctrl->fetch_index);
-
- /*
- * Don't change fetch_index ever and
- * set posted_index same as fetch_index
- * when setting up the WQ for devmcd2.
- */
- vnic_wq_init_start(&vdev->devcmd2->wq, 0, fetch_index, fetch_index, 0,
0);
- vnic_wq_enable(&vdev->devcmd2->wq);
-
- err = vnic_dev_alloc_desc_ring(vdev, &vdev->devcmd2->results_ring,
- DEVCMD2_RING_SIZE, DEVCMD2_DESC_SIZE);
- if (err)
- goto err_free_wq;
-
- vdev->devcmd2->result =
- (struct devcmd2_result *) vdev->devcmd2->results_ring.descs;
- vdev->devcmd2->cmd_ring =
- (struct vnic_devcmd2 *) vdev->devcmd2->wq.ring.descs;
- vdev->devcmd2->wq_ctrl = vdev->devcmd2->wq.ctrl;
- vdev->args[0] = (u64) vdev->devcmd2->results_ring.base_addr |
- VNIC_PADDR_TARGET;
- vdev->args[1] = DEVCMD2_RING_SIZE;
-
- err = _vnic_dev_cmd2(vdev, CMD_INITIALIZE_DEVCMD2, 1000);
- if (err < 0)
- goto err_free_desc_ring;
-
- vdev->devcmd_rtn = &_vnic_dev_cmd2;
-
- return 0;
-
-err_free_desc_ring:
- vnic_dev_free_desc_ring(vdev, &vdev->devcmd2->results_ring);
-err_free_wq:
- vnic_wq_disable(&vdev->devcmd2->wq);
- vnic_wq_free(&vdev->devcmd2->wq);
-err_free_devcmd2:
- kfree(vdev->devcmd2);
- vdev->devcmd2 = NULL;
-
- return err;
-#else
- return 0;
-#endif
-}
-
-static void vnic_dev_deinit_devcmd2(struct vnic_dev *vdev)
-{
-#if !defined(CONFIG_MIPS) && !defined(MGMT_VNIC)
- vnic_dev_free_desc_ring(vdev, &vdev->devcmd2->results_ring);
- vnic_wq_disable(&vdev->devcmd2->wq);
- vnic_wq_free(&vdev->devcmd2->wq);
- kfree(vdev->devcmd2);
- vdev->devcmd2 = NULL;
- vdev->devcmd_rtn = &_vnic_dev_cmd;
-#endif
-}
-
static int vnic_dev_cmd_proxy(struct vnic_dev *vdev,
enum vnic_devcmd_cmd proxy_cmd, enum vnic_devcmd_cmd cmd,
u64 *a0, u64 *a1, int wait)
@@ -1412,8 +1260,6 @@
pci_free_consistent(vdev->pdev,
sizeof(struct vnic_devcmd_fw_info),
vdev->fw_info, vdev->fw_info_pa);
- if (vdev->devcmd2)
- vnic_dev_deinit_devcmd2(vdev);
kfree(vdev);
}
@@ -1478,25 +1324,10 @@
EXPORT_SYMBOL(vnic_dev_get_pdev);
#endif
-int vnic_dev_cmd_init(struct vnic_dev *vdev, int fallback)
+int vnic_dev_cmd_init(struct vnic_dev *vdev, int UNUSED(fallback))
{
#if !defined(CONFIG_MIPS) && !defined(MGMT_VNIC)
- int err;
- void *p;
-
- p = vnic_dev_get_res(vdev, RES_TYPE_DEVCMD2, 0);
- if (p)
- err = vnic_dev_init_devcmd2(vdev);
- else if (fallback) {
- pr_warning("DEVCMD2 resource not found, fall back to devcmd\n");
- err = vnic_dev_init_devcmdorig(vdev);
- }
- else {
- pr_err("DEVCMD2 resource not found, no fall back to devcmd
allowed\n");
- err = -ENODEV;
- }
-
- return err;
+ return vnic_dev_init_devcmdorig(vdev);
#else
return 0;
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libusnic_verbs-1.1.0.222.sles12sp0/src/vnic_wq.c
new/libusnic_verbs-1.1.0.237.sles12sp0/src/vnic_wq.c
--- old/libusnic_verbs-1.1.0.222.sles12sp0/src/vnic_wq.c 2014-07-12
10:59:06.000000000 +0200
+++ new/libusnic_verbs-1.1.0.237.sles12sp0/src/vnic_wq.c 2014-08-14
10:58:17.000000000 +0200
@@ -25,7 +25,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*
*/
-#ident "$Id: vnic_wq.c 179023 2014-06-24 23:39:40Z rfaucett $"
+#ident "$Id: vnic_wq.c 183023 2014-07-22 23:47:25Z xuywang $"
#ifndef ENIC_PMD
#include <linux/kernel.h>
@@ -166,29 +166,6 @@
return 0;
}
-
-int vnic_wq_devcmd2_alloc(struct vnic_dev *vdev, struct vnic_wq *wq,
- unsigned int desc_count, unsigned int desc_size)
-{
- int err;
-
- wq->index = 0;
- wq->vdev = vdev;
-
- err = vnic_wq_get_ctrl(vdev, wq, 0, RES_TYPE_DEVCMD2);
- if (err) {
- pr_err("Failed to get devcmd2 resource\n");
- return err;
- }
-
- vnic_wq_disable(wq);
-
- err = vnic_wq_alloc_ring(vdev, wq, desc_count, desc_size);
- if (err)
- return err;
-
- return 0;
-}
#ifdef FOR_UPSTREAM_KERNEL
static void vnic_wq_init_start(struct vnic_wq *wq, unsigned int cq_index,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libusnic_verbs-1.1.0.222.sles12sp0/src/vnic_wq.h
new/libusnic_verbs-1.1.0.237.sles12sp0/src/vnic_wq.h
--- old/libusnic_verbs-1.1.0.222.sles12sp0/src/vnic_wq.h 2014-07-12
10:59:06.000000000 +0200
+++ new/libusnic_verbs-1.1.0.237.sles12sp0/src/vnic_wq.h 2014-08-14
10:58:17.000000000 +0200
@@ -25,7 +25,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*
*/
-#ident "$Id: vnic_wq.h 176301 2014-06-06 21:39:04Z xuywang $"
+#ident "$Id: vnic_wq.h 183023 2014-07-22 23:47:25Z xuywang $"
#ifndef _VNIC_WQ_H_
#define _VNIC_WQ_H_
@@ -276,8 +276,6 @@
void vnic_wq_free(struct vnic_wq *wq);
int vnic_wq_alloc(struct vnic_dev *vdev, struct vnic_wq *wq, unsigned int
index,
unsigned int desc_count, unsigned int desc_size);
-int vnic_wq_devcmd2_alloc(struct vnic_dev *vdev, struct vnic_wq *wq,
- unsigned int desc_count, unsigned int desc_size);
#ifndef FOR_UPSTREAM_KERNEL
void vnic_wq_init_start(struct vnic_wq *wq, unsigned int cq_index,
unsigned int fetch_index, unsigned int posted_index,
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
