Hello community, here is the log from the commit of package libocrdma-rdmav2 for openSUSE:Factory checked in at 2016-04-28 16:56:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libocrdma-rdmav2 (Old) and /work/SRC/openSUSE:Factory/.libocrdma-rdmav2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libocrdma-rdmav2" Changes: -------- --- /work/SRC/openSUSE:Factory/libocrdma-rdmav2/libocrdma-rdmav2.changes 2015-02-14 13:57:07.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libocrdma-rdmav2.new/libocrdma-rdmav2.changes 2016-04-28 17:01:50.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Apr 25 08:49:22 UTC 2016 - [email protected] + +- Update to version 1.0.8 + * No changelog available + +------------------------------------------------------------------- Old: ---- libocrdma-1.0.5.tar.gz New: ---- libocrdma-1.0.8.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libocrdma-rdmav2.spec ++++++ --- /var/tmp/diff_new_pack.4qbOq4/_old 2016-04-28 17:01:53.000000000 +0200 +++ /var/tmp/diff_new_pack.4qbOq4/_new 2016-04-28 17:01:53.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libocrdma # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -18,7 +18,7 @@ Name: libocrdma-rdmav2 Summary: Userspace Library for Emulex ROCEE Device -Version: 1.0.5 +Version: 1.0.8 Release: 1 License: GPL-2.0 or BSD-2-Clause Group: System/Libraries ++++++ libocrdma-1.0.5.tar.gz -> libocrdma-1.0.8.tar.gz ++++++ ++++ 30151 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libocrdma-1.0.5/AUTHORS new/libocrdma-1.0.8/AUTHORS --- old/libocrdma-1.0.5/AUTHORS 2015-01-17 10:24:06.000000000 +0100 +++ new/libocrdma-1.0.8/AUTHORS 2016-04-14 08:33:45.000000000 +0200 @@ -1 +1 @@ -Emulex Corporation. +Broadcom Ltd diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libocrdma-1.0.5/COPYING new/libocrdma-1.0.8/COPYING --- old/libocrdma-1.0.5/COPYING 2015-01-17 10:24:06.000000000 +0100 +++ new/libocrdma-1.0.8/COPYING 2016-04-14 08:33:45.000000000 +0200 @@ -1,4 +1,39 @@ +This software is available to you under a choice of one of two +licenses. You may choose to be licensed under the terms of the the +OpenIB.org BSD license or the GNU General Public License (GPL) Version +2, both included below. +Copyright (c) 2016 Broadcom Ltd. All rights reserved. + +======================================================================= + BSD license + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + + - Redistributions of source code must retain the above + copyright notice, this list of conditions and the + following disclaimer. + - Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the + following disclaimer in the documentation and/or other + materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND +CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, +INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR +CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE +OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +======================================================================== GNU GENERAL PUBLIC LICENSE Version 2, June 1991 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libocrdma-1.0.5/config/missing new/libocrdma-1.0.8/config/missing --- old/libocrdma-1.0.5/config/missing 2015-01-17 11:11:26.000000000 +0100 +++ new/libocrdma-1.0.8/config/missing 2016-04-14 08:33:45.000000000 +0200 @@ -1,11 +1,10 @@ #! /bin/sh -# Common stub for a few missing GNU programs while installing. +# Common wrapper for a few potentially missing GNU programs. -scriptversion=2009-04-28.21; # UTC +scriptversion=2012-06-26.16; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009 Free Software Foundation, Inc. -# Originally by Fran,cois Pinard <[email protected]>, 1996. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Originally written by Fran,cois Pinard <[email protected]>, 1996. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -26,69 +25,40 @@ # the same distribution terms that you use for the rest of that program. if test $# -eq 0; then - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "Try '$0 --help' for more information" exit 1 fi -run=: -sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' -sed_minuso='s/.* -o \([^ ]*\).*/\1/p' - -# In the cases where this matters, `missing' is being run in the -# srcdir already. -if test -f configure.ac; then - configure_ac=configure.ac -else - configure_ac=configure.in -fi +case $1 in -msg="missing on your system" + --is-lightweight) + # Used by our autoconf macros to check whether the available missing + # script is modern enough. + exit 0 + ;; -case $1 in ---run) - # Try to run requested program, and just exit if it succeeds. - run= - shift - "$@" && exit 0 - # Exit code 63 means version mismatch. This often happens - # when the user try to use an ancient version of a tool on - # a file that requires a minimum version. In this case we - # we should proceed has if the program had been absent, or - # if --run hadn't been passed. - if test $? = 63; then - run=: - msg="probably too old" - fi - ;; + --run) + # Back-compat with the calling convention used by older automake. + shift + ;; -h|--h|--he|--hel|--help) echo "\ $0 [OPTION]... PROGRAM [ARGUMENT]... -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an -error status if there is no known handling for PROGRAM. +Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due +to PROGRAM being missing or too old. Options: -h, --help display this help and exit -v, --version output version information and exit - --run try to run the given command, and emulate it if it fails Supported PROGRAM values: - aclocal touch file \`aclocal.m4' - autoconf touch file \`configure' - autoheader touch file \`config.h.in' - autom4te touch the output file, or create a stub one - automake touch all \`Makefile.in' files - bison create \`y.tab.[ch]', if possible, from existing .[ch] - flex create \`lex.yy.c', if possible, from existing .c - help2man touch the output file - lex create \`lex.yy.c', if possible, from existing .c - makeinfo touch the output file - tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create \`y.tab.[ch]', if possible, from existing .[ch] + aclocal autoconf autoheader autom4te automake makeinfo + bison yacc flex lex help2man -Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and -\`g' are ignored when checking the name. +Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and +'g' are ignored when checking the name. Send bug reports to <[email protected]>." exit $? @@ -100,272 +70,141 @@ ;; -*) - echo 1>&2 "$0: Unknown \`$1' option" - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "$0: unknown '$1' option" + echo 1>&2 "Try '$0 --help' for more information" exit 1 ;; esac -# normalize program name to check for. -program=`echo "$1" | sed ' - s/^gnu-//; t - s/^gnu//; t - s/^g//; t'` - -# Now exit if we have it, but it failed. Also exit now if we -# don't have it and --version was passed (most likely to detect -# the program). This is about non-GNU programs, so use $1 not -# $program. -case $1 in - lex*|yacc*) - # Not GNU programs, they don't have --version. - ;; - - tar*) - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - exit 1 - fi - ;; +# Run the given program, remember its exit status. +"$@"; st=$? - *) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - # Could not run --version or --help. This is probably someone - # running `$TOOL --version' or `$TOOL --help' to check whether - # $TOOL exists and not knowing $TOOL uses missing. - exit 1 - fi - ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case $program in - aclocal*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acinclude.m4' or \`${configure_ac}'. You might want - to install the \`Automake' and \`Perl' packages. Grab them from - any GNU archive site." - touch aclocal.m4 - ;; - - autoconf*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`${configure_ac}'. You might want to install the - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU - archive site." - touch configure - ;; - - autoheader*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acconfig.h' or \`${configure_ac}'. You might want - to install the \`Autoconf' and \`GNU m4' packages. Grab them - from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` - test -z "$files" && files="config.h" - touch_files= - for f in $files; do - case $f in - *:*) touch_files="$touch_files "`echo "$f" | - sed -e 's/^[^:]*://' -e 's/:.*//'`;; - *) touch_files="$touch_files $f.in";; - esac - done - touch $touch_files - ;; - - automake*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. - You might want to install the \`Automake' and \`Perl' packages. - Grab them from any GNU archive site." - find . -type f -name Makefile.am -print | - sed 's/\.am$/.in/' | - while read f; do touch "$f"; done - ;; +# If it succeeded, we are done. +test $st -eq 0 && exit 0 - autom4te*) - echo 1>&2 "\ -WARNING: \`$1' is needed, but is $msg. - You might have modified some files without having the - proper tools for further handling them. - You can get \`$1' as part of \`Autoconf' from any GNU - archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo "#! /bin/sh" - echo "# Created by GNU Automake missing as a replacement of" - echo "# $ $@" - echo "exit 0" - chmod +x $file - exit 1 - fi - ;; - - bison*|yacc*) - echo 1>&2 "\ -WARNING: \`$1' $msg. You should only need it if - you modified a \`.y' file. You may need the \`Bison' package - in order for those modifications to take effect. You can get - \`Bison' from any GNU archive site." - rm -f y.tab.c y.tab.h - if test $# -ne 1; then - eval LASTARG="\${$#}" - case $LASTARG in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.c - fi - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.h - fi - ;; - esac - fi - if test ! -f y.tab.h; then - echo >y.tab.h - fi - if test ! -f y.tab.c; then - echo 'main() { return 0; }' >y.tab.c - fi - ;; - - lex*|flex*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.l' file. You may need the \`Flex' package - in order for those modifications to take effect. You can get - \`Flex' from any GNU archive site." - rm -f lex.yy.c - if test $# -ne 1; then - eval LASTARG="\${$#}" - case $LASTARG in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" lex.yy.c - fi - ;; - esac - fi - if test ! -f lex.yy.c; then - echo 'main() { return 0; }' >lex.yy.c - fi - ;; - - help2man*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a dependency of a manual page. You may need the - \`Help2man' package in order for those modifications to take - effect. You can get \`Help2man' from any GNU archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo ".ab help2man is required to generate this page" - exit $? - fi - ;; - - makeinfo*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.texi' or \`.texinfo' file, or any other file - indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy \`make' (AIX, - DU, IRIX). You might want to install the \`Texinfo' package or - the \`GNU make' package. Grab either from any GNU archive site." - # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -z "$file"; then - # ... or it is the one specified with @setfilename ... - infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n ' - /^@setfilename/{ - s/.* \([^ ]*\) *$/\1/ - p - q - }' $infile` - # ... or it is derived from the source name (dir/f.texi becomes f.info) - test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info - fi - # If the file does not exist, the user really needs makeinfo; - # let's fail without touching anything. - test -f $file || exit 1 - touch $file - ;; - - tar*) - shift - - # We have already tried tar in the generic part. - # Look for gnutar/gtar before invocation to avoid ugly error - # messages. - if (gnutar --version > /dev/null 2>&1); then - gnutar "$@" && exit 0 - fi - if (gtar --version > /dev/null 2>&1); then - gtar "$@" && exit 0 - fi - firstarg="$1" - if shift; then - case $firstarg in - *o*) - firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - case $firstarg in - *h*) - firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - fi - - echo 1>&2 "\ -WARNING: I can't seem to be able to run \`tar' with the given arguments. - You may want to install GNU tar or Free paxutils, or check the - command line arguments." - exit 1 - ;; - - *) - echo 1>&2 "\ -WARNING: \`$1' is needed, and is $msg. - You might have modified some files without having the - proper tools for further handling them. Check the \`README' file, - it often tells you about the needed prerequisites for installing - this package. You may also peek at any GNU archive site, in case - some other package would contain this missing \`$1' program." - exit 1 - ;; -esac +# Also exit now if we it failed (or wasn't found), and '--version' was +# passed; such an option is passed most likely to detect whether the +# program is present and works. +case $2 in --version|--help) exit $st;; esac + +# Exit code 63 means version mismatch. This often happens when the user +# tries to use an ancient version of a tool on a file that requires a +# minimum version. +if test $st -eq 63; then + msg="probably too old" +elif test $st -eq 127; then + # Program was missing. + msg="missing on your system" +else + # Program was found and executed, but failed. Give up. + exit $st +fi -exit 0 +perl_URL=http://www.perl.org/ +flex_URL=http://flex.sourceforge.net/ +gnu_software_URL=http://www.gnu.org/software + +program_details () +{ + case $1 in + aclocal|automake) + echo "The '$1' program is part of the GNU Automake package:" + echo "<$gnu_software_URL/automake>" + echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/autoconf>" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + autoconf|autom4te|autoheader) + echo "The '$1' program is part of the GNU Autoconf package:" + echo "<$gnu_software_URL/autoconf/>" + echo "It also requires GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + esac +} + +give_advice () +{ + # Normalize program name to check for. + normalized_program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + + printf '%s\n' "'$1' is $msg." + + configure_deps="'configure.ac' or m4 files included by 'configure.ac'" + case $normalized_program in + autoconf*) + echo "You should only need it if you modified 'configure.ac'," + echo "or m4 files included by it." + program_details 'autoconf' + ;; + autoheader*) + echo "You should only need it if you modified 'acconfig.h' or" + echo "$configure_deps." + program_details 'autoheader' + ;; + automake*) + echo "You should only need it if you modified 'Makefile.am' or" + echo "$configure_deps." + program_details 'automake' + ;; + aclocal*) + echo "You should only need it if you modified 'acinclude.m4' or" + echo "$configure_deps." + program_details 'aclocal' + ;; + autom4te*) + echo "You might have modified some maintainer files that require" + echo "the 'automa4te' program to be rebuilt." + program_details 'autom4te' + ;; + bison*|yacc*) + echo "You should only need it if you modified a '.y' file." + echo "You may want to install the GNU Bison package:" + echo "<$gnu_software_URL/bison/>" + ;; + lex*|flex*) + echo "You should only need it if you modified a '.l' file." + echo "You may want to install the Fast Lexical Analyzer package:" + echo "<$flex_URL>" + ;; + help2man*) + echo "You should only need it if you modified a dependency" \ + "of a man page." + echo "You may want to install the GNU Help2man package:" + echo "<$gnu_software_URL/help2man/>" + ;; + makeinfo*) + echo "You should only need it if you modified a '.texi' file, or" + echo "any other file indirectly affecting the aspect of the manual." + echo "You might want to install the Texinfo package:" + echo "<$gnu_software_URL/texinfo/>" + echo "The spurious makeinfo call might also be the consequence of" + echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" + echo "want to install GNU make:" + echo "<$gnu_software_URL/make/>" + ;; + *) + echo "You might have modified some files without having the proper" + echo "tools for further handling them. Check the 'README' file, it" + echo "often tells you about the needed prerequisites for installing" + echo "this package. You may also peek at any GNU archive site, in" + echo "case some other package contains this missing '$1' program." + ;; + esac +} + +give_advice "$1" | sed -e '1s/^/WARNING: /' \ + -e '2,$s/^/ /' >&2 + +# Propagate the correct exit status (expected to be 127 for a program +# not found, 63 for a program that failed due to version mismatch). +exit $st # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libocrdma-1.0.5/config.h.in new/libocrdma-1.0.8/config.h.in --- old/libocrdma-1.0.5/config.h.in 2015-01-17 11:11:25.000000000 +0100 +++ new/libocrdma-1.0.8/config.h.in 2016-04-14 08:33:45.000000000 +0200 @@ -61,6 +61,9 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME +/* Define to the home page for this package. */ +#undef PACKAGE_URL + /* Define to the version of this package. */ #undef PACKAGE_VERSION diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libocrdma-1.0.5/configure.in new/libocrdma-1.0.8/configure.in --- old/libocrdma-1.0.5/configure.in 2015-01-17 10:24:06.000000000 +0100 +++ new/libocrdma-1.0.8/configure.in 2016-04-14 08:33:45.000000000 +0200 @@ -1,11 +1,11 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.57) -AC_INIT(libocrdma, 1.0.5, [email protected]) +AC_INIT(libocrdma, 1.0.8, [email protected]) AC_CONFIG_SRCDIR([src/ocrdma_main.h]) AC_CONFIG_AUX_DIR(config) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(libocrdma, 1.0.5) +AM_INIT_AUTOMAKE(libocrdma, 1.0.8) AM_PROG_LIBTOOL AC_ARG_ENABLE(libcheck, [ --disable-libcheck do not test for the presence of ib libraries], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libocrdma-1.0.5/libocrdma.spec new/libocrdma-1.0.8/libocrdma.spec --- old/libocrdma-1.0.5/libocrdma.spec 2015-01-17 11:12:36.000000000 +0100 +++ new/libocrdma-1.0.8/libocrdma.spec 2016-04-14 08:33:45.000000000 +0200 @@ -1,18 +1,18 @@ Name: libocrdma -Version: 1.0.5 +Version: 1.0.8 Release: 1%{?dist} -Summary: Userspace Library for Emulex ROCEE Device. +Summary: User-space Library for Emulex ROCE Device Group: System Environment/Libraries -License: GPL/BSD -Url: http://www.openfabrics.org/ -Source: http://www.openfabrics.org/downloads/ocrdma/%{name}-%{version}.tar.gz +License: GPLv2 or BSD +Url: https://www.openfabrics.org/ +Source: http://www.openfabrics.org/downloads/%{name}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libibverbs-devel %description -libocrdma provides a device-specific userspace driver for Emulex One Command RoCE Adapters -for use with the libibverbs library. +libocrdma provides a device-specific user-space driver for Emulex +One Command RoCE Adapters for use with the libibverbs library. %package devel Summary: Development files for the libocrdma driver @@ -31,17 +31,18 @@ make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT -%makeinstall +make DESTDIR=%{buildroot} install # remove unpackaged files from the buildroot -rm -f $RPM_BUILD_ROOT%{_libdir}/*.la +rm -f $RPM_BUILD_ROOT%{_libdir}/*.la $RPM_BUILD_ROOT%{_libdir}/libocrdma.so %post /sbin/ldconfig if [ -e %{_sysconfdir}/dat.conf ]; then - sed -e '/ofa-v2-scm-roe-ocrdma.* u2/d' < %{_sysconfdir}/dat.conf > /tmp/$$ofadapl - mv /tmp/$$ofadapl %{_sysconfdir}/dat.conf - dapl_ver=`rpm -q dapl|cut -c6-8` + sed -e '/ofa-v2-scm-roe-ocrdma.* u2/d' -i %{_sysconfdir}/dat.conf + dapl_ver=`find %{_libdir} \! -type l|grep libdat2.so|awk -F'libdat2.so.' '{print $2}'|cut -c1-3|head -1` + if [ "${dapl_ver}" = "" ]; then + dapl_ver="2.0" + fi echo ofa-v2-scm-roe-ocrdma0-1 u${dapl_ver} nonthreadsafe default libdaploscm.so.2 dapl.${dapl_ver} '"ocrdma0 1" ""' >> %{_sysconfdir}/dat.conf echo ofa-v2-scm-roe-ocrdma1-1 u${dapl_ver} nonthreadsafe default libdaploscm.so.2 dapl.${dapl_ver} '"ocrdma1 1" ""' >> %{_sysconfdir}/dat.conf echo ofa-v2-scm-roe-ocrdma2-1 u${dapl_ver} nonthreadsafe default libdaploscm.so.2 dapl.${dapl_ver} '"ocrdma2 1" ""' >> %{_sysconfdir}/dat.conf @@ -51,8 +52,7 @@ %postun /sbin/ldconfig if [ -e %{_sysconfdir}/dat.conf ]; then - sed -e '/ofa-v2-scm-roe-ocrdma.* u2/d' < %{_sysconfdir}/dat.conf > /tmp/$$ofadapl - mv /tmp/$$ofadapl %{_sysconfdir}/dat.conf + sed -e '/ofa-v2-scm-roe-ocrdma.* u2/d' -i %{_sysconfdir}/dat.conf fi %clean @@ -60,9 +60,9 @@ %files %defattr(-,root,root,-) -%{_libdir}/libocrdma*.so -# %doc AUTHORS COPYING ChangeLog README -%config %{_sysconfdir}/libibverbs.d/ocrdma.driver +%{_libdir}/libocrdma-rdmav2.so +%doc AUTHORS README COPYING +%{_sysconfdir}/libibverbs.d/ocrdma.driver %files devel %defattr(-,root,root,-) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libocrdma-1.0.5/libocrdma.spec.in new/libocrdma-1.0.8/libocrdma.spec.in --- old/libocrdma-1.0.5/libocrdma.spec.in 2015-01-17 10:24:06.000000000 +0100 +++ new/libocrdma-1.0.8/libocrdma.spec.in 2016-04-14 08:33:45.000000000 +0200 @@ -1,18 +1,18 @@ Name: libocrdma Version: @VERSION@ Release: 1%{?dist} -Summary: Userspace Library for Emulex ROCEE Device. +Summary: User-space Library for Emulex ROCE Device Group: System Environment/Libraries -License: GPL/BSD -Url: http://www.openfabrics.org/ -Source: http://www.openfabrics.org/downloads/ocrdma/%{name}-%{version}.tar.gz +License: GPLv2 or BSD +Url: https://www.openfabrics.org/ +Source: http://www.openfabrics.org/downloads/%{name}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libibverbs-devel %description -libocrdma provides a device-specific userspace driver for Emulex One Command RoCE Adapters -for use with the libibverbs library. +libocrdma provides a device-specific user-space driver for Emulex +One Command RoCE Adapters for use with the libibverbs library. %package devel Summary: Development files for the libocrdma driver @@ -31,17 +31,18 @@ make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT -%makeinstall +make DESTDIR=%{buildroot} install # remove unpackaged files from the buildroot -rm -f $RPM_BUILD_ROOT%{_libdir}/*.la +rm -f $RPM_BUILD_ROOT%{_libdir}/*.la $RPM_BUILD_ROOT%{_libdir}/libocrdma.so %post /sbin/ldconfig if [ -e %{_sysconfdir}/dat.conf ]; then - sed -e '/ofa-v2-scm-roe-ocrdma.* u2/d' < %{_sysconfdir}/dat.conf > /tmp/$$ofadapl - mv /tmp/$$ofadapl %{_sysconfdir}/dat.conf - dapl_ver=`rpm -q dapl|cut -c6-8` + sed -e '/ofa-v2-scm-roe-ocrdma.* u2/d' -i %{_sysconfdir}/dat.conf + dapl_ver=`find %{_libdir} \! -type l|grep libdat2.so|awk -F'libdat2.so.' '{print $2}'|cut -c1-3|head -1` + if [ "${dapl_ver}" = "" ]; then + dapl_ver="2.0" + fi echo ofa-v2-scm-roe-ocrdma0-1 u${dapl_ver} nonthreadsafe default libdaploscm.so.2 dapl.${dapl_ver} '"ocrdma0 1" ""' >> %{_sysconfdir}/dat.conf echo ofa-v2-scm-roe-ocrdma1-1 u${dapl_ver} nonthreadsafe default libdaploscm.so.2 dapl.${dapl_ver} '"ocrdma1 1" ""' >> %{_sysconfdir}/dat.conf echo ofa-v2-scm-roe-ocrdma2-1 u${dapl_ver} nonthreadsafe default libdaploscm.so.2 dapl.${dapl_ver} '"ocrdma2 1" ""' >> %{_sysconfdir}/dat.conf @@ -51,8 +52,7 @@ %postun /sbin/ldconfig if [ -e %{_sysconfdir}/dat.conf ]; then - sed -e '/ofa-v2-scm-roe-ocrdma.* u2/d' < %{_sysconfdir}/dat.conf > /tmp/$$ofadapl - mv /tmp/$$ofadapl %{_sysconfdir}/dat.conf + sed -e '/ofa-v2-scm-roe-ocrdma.* u2/d' -i %{_sysconfdir}/dat.conf fi %clean @@ -60,9 +60,9 @@ %files %defattr(-,root,root,-) -%{_libdir}/libocrdma*.so -# %doc AUTHORS COPYING ChangeLog README -%config %{_sysconfdir}/libibverbs.d/ocrdma.driver +%{_libdir}/libocrdma-rdmav2.so +%doc AUTHORS README COPYING +%{_sysconfdir}/libibverbs.d/ocrdma.driver %files devel %defattr(-,root,root,-) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libocrdma-1.0.5/src/ocrdma_abi.h new/libocrdma-1.0.8/src/ocrdma_abi.h --- old/libocrdma-1.0.5/src/ocrdma_abi.h 2015-01-17 10:24:06.000000000 +0100 +++ new/libocrdma-1.0.8/src/ocrdma_abi.h 2016-04-14 08:33:45.000000000 +0200 @@ -51,14 +51,14 @@ }; #define OCRDMA_DB_CQ_RING_ID_MASK 0x3FF /* bits 0 - 9 */ -#define OCRDMA_DB_CQ_RING_ID_EXT_MASK 0x0C00 /* bits 10-11 of qid placing at 12-11 */ -#define OCRDMA_DB_CQ_RING_ID_EXT_MASK_SHIFT 0x1 /* qid #2 msbits placing at 12-11 */ +#define OCRDMA_DB_CQ_RING_ID_EXT_MASK 0x0C00 /* bits 10-11 of qid placing at 12-11 */ +#define OCRDMA_DB_CQ_RING_ID_EXT_MASK_SHIFT 0x1 /* qid #2 msbits placing at 12-11 */ #define OCRDMA_DB_CQ_NUM_POPPED_SHIFT (16) /* bits 16 - 28 */ /* Rearm bit */ #define OCRDMA_DB_CQ_REARM_SHIFT (29) /* bit 29 */ /* solicited bit */ -#define OCRDMA_DB_CQ_SOLICIT_SHIFT (31) /* bit 31 */ +#define OCRDMA_DB_CQ_SOLICIT_SHIFT (31) /* bit 31 */ struct ocrdma_get_context { struct ibv_get_context cmd; @@ -291,6 +291,7 @@ OCRDMA_FLAG_FENCE_R = 0x8, OCRDMA_FLAG_SOLICIT = 0x10, OCRDMA_FLAG_IMM = 0x20, + OCRDMA_FLAG_AH_VLAN_PR = 0x40, /* Stag flags */ OCRDMA_LKEY_FLAG_LOCAL_WR = 0x1, @@ -349,7 +350,7 @@ uint32_t rsvd_dest_qpn; uint32_t qkey; uint32_t rsvd_ahid; - uint32_t rsvd; + uint32_t hdr_type; } __attribute__ ((packed)); #endif /* __OCRDMA_ABI_H__ */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libocrdma-1.0.5/src/ocrdma_main.c new/libocrdma-1.0.8/src/ocrdma_main.c --- old/libocrdma-1.0.5/src/ocrdma_main.c 2015-01-17 10:24:06.000000000 +0100 +++ new/libocrdma-1.0.8/src/ocrdma_main.c 2016-04-14 08:33:45.000000000 +0200 @@ -94,7 +94,6 @@ .post_recv = ocrdma_post_recv, .create_ah = ocrdma_create_ah, .destroy_ah = ocrdma_destroy_ah, - .async_event = ocrdma_async_event, .create_srq = ocrdma_create_srq, .modify_srq = ocrdma_modify_srq, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libocrdma-1.0.5/src/ocrdma_main.h new/libocrdma-1.0.8/src/ocrdma_main.h --- old/libocrdma-1.0.5/src/ocrdma_main.h 2015-01-17 10:24:06.000000000 +0100 +++ new/libocrdma-1.0.8/src/ocrdma_main.h 2016-04-14 08:33:45.000000000 +0200 @@ -211,10 +211,20 @@ int signaled; /* signaled QP */ }; +enum { + OCRDMA_AH_ID_MASK = 0x3FF, + OCRDMA_AH_VLAN_VALID_MASK = 0x01, + OCRDMA_AH_VLAN_VALID_SHIFT = 0x1F, + OCRDMA_AH_L3_TYPE_MASK = 0x03, + OCRDMA_AH_L3_TYPE_SHIFT = 0x1D +}; + struct ocrdma_ah { struct ibv_ah ibv_ah; struct ocrdma_pd *pd; uint16_t id; + uint8_t isvlan; + uint8_t hdr_type; }; #define get_ocrdma_xxx(xxx, type) \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libocrdma-1.0.5/src/ocrdma_verbs.c new/libocrdma-1.0.8/src/ocrdma_verbs.c --- old/libocrdma-1.0.5/src/ocrdma_verbs.c 2015-01-17 10:24:06.000000000 +0100 +++ new/libocrdma-1.0.8/src/ocrdma_verbs.c 2016-04-14 08:33:45.000000000 +0200 @@ -453,41 +453,24 @@ int ocrdma_modify_srq(struct ibv_srq *ibsrq, struct ibv_srq_attr *attr, int attr_mask) { - int status; - struct ocrdma_device *dev; - struct ocrdma_srq *srq; struct ibv_modify_srq cmd; - srq = get_ocrdma_srq(ibsrq); - dev = srq->dev; - - status = ibv_cmd_modify_srq(ibsrq, attr, attr_mask, &cmd, sizeof cmd); - return status; + return ibv_cmd_modify_srq(ibsrq, attr, attr_mask, &cmd, sizeof cmd); } int ocrdma_query_srq(struct ibv_srq *ibsrq, struct ibv_srq_attr *attr) { - int status; struct ibv_query_srq cmd; - struct ocrdma_device *dev; - struct ocrdma_srq *srq; - srq = get_ocrdma_srq(ibsrq); - dev = srq->dev; - status = ibv_cmd_query_srq(ibsrq, attr, &cmd, sizeof cmd); - return status; + return ibv_cmd_query_srq(ibsrq, attr, &cmd, sizeof cmd); } int ocrdma_destroy_srq(struct ibv_srq *ibsrq) { int status; - int id; struct ocrdma_srq *srq; - struct ocrdma_device *dev; srq = get_ocrdma_srq(ibsrq); - dev = srq->dev; - id = dev->id; status = ibv_cmd_destroy_srq(ibsrq); if (status) return status; @@ -651,20 +634,6 @@ return NULL; } -/* - * ocrdma_query_qp - */ -int ocrdma_query_qp(struct ibv_qp *qp, struct ibv_qp_attr *attr, - int attr_mask, struct ibv_qp_init_attr *init_attr) -{ - struct ibv_query_qp cmd; - int status; - - status = - ibv_cmd_query_qp(qp, attr, attr_mask, init_attr, &cmd, sizeof(cmd)); - return status; -} - enum ocrdma_qp_state get_ocrdma_qp_state(enum ibv_qp_state qps) { switch (qps) { @@ -682,6 +651,10 @@ return OCRDMA_QPS_SQE; case IBV_QPS_ERR: return OCRDMA_QPS_ERR; + case IBV_QPS_UNKNOWN: + break; + default: + break; }; return OCRDMA_QPS_ERR; } @@ -896,6 +869,25 @@ return status; } +/* + * ocrdma_query_qp + */ +int ocrdma_query_qp(struct ibv_qp *ibqp, struct ibv_qp_attr *attr, + int attr_mask, struct ibv_qp_init_attr *init_attr) +{ + struct ibv_query_qp cmd; + struct ocrdma_qp *qp = get_ocrdma_qp(ibqp); + int status; + + status = ibv_cmd_query_qp(ibqp, attr, attr_mask, + init_attr, &cmd, sizeof(cmd)); + + if (!status) + ocrdma_qp_state_machine(qp, attr->qp_state); + + return status; +} + static void ocrdma_srq_toggle_bit(struct ocrdma_srq *srq, int idx) { int i = idx / 32; @@ -1091,10 +1083,9 @@ int status = 0; struct ocrdma_qp *qp; struct ocrdma_device *dev; - int id; + qp = get_ocrdma_qp(ibqp); dev = qp->dev; - id = dev->id; /* * acquire CQ lock while destroy is in progress, in order to * protect against proessing in-flight CQEs for this QP. @@ -1191,6 +1182,10 @@ ud_hdr->rsvd_dest_qpn = wr->wr.ud.remote_qpn; ud_hdr->qkey = wr->wr.ud.remote_qkey; ud_hdr->rsvd_ahid = ah->id; + if (ah->isvlan) + hdr->cw |= (OCRDMA_FLAG_AH_VLAN_PR << + OCRDMA_WQE_FLAGS_SHIFT); + ud_hdr->hdr_type = ah->hdr_type; } static void ocrdma_build_sges(struct ocrdma_hdr_wqe *hdr, @@ -1995,14 +1990,11 @@ } stop_cqe: cq->getp = cur_getp; - if (cq->deferred_arm) { - ocrdma_ring_cq_db(cq, 1, cq->deferred_sol, polled_hw_cqes); + if (cq->deferred_arm || polled_hw_cqes) { + ocrdma_ring_cq_db(cq, cq->deferred_arm, + cq->deferred_sol, polled_hw_cqes); cq->deferred_arm = 0; cq->deferred_sol = 0; - } else { - /* We need to pop the CQE. No need to arm */ - ocrdma_ring_cq_db(cq, 0, cq->deferred_sol, polled_hw_cqes); - cq->deferred_sol = 0; } return i; @@ -2151,9 +2143,13 @@ if (status) goto cmd_err; - ah->id = pd->uctx->ah_tbl[ahtbl_idx]; - return &ah->ibv_ah; + ah->id = pd->uctx->ah_tbl[ahtbl_idx] & OCRDMA_AH_ID_MASK; + ah->isvlan = (pd->uctx->ah_tbl[ahtbl_idx] >> + OCRDMA_AH_VLAN_VALID_SHIFT); + ah->hdr_type = ((pd->uctx->ah_tbl[ahtbl_idx] >> OCRDMA_AH_L3_TYPE_SHIFT) + & OCRDMA_AH_L3_TYPE_MASK); + return &ah->ibv_ah; cmd_err: ocrdma_free_ah_tbl_id(pd->uctx, ahtbl_idx); tbl_err: @@ -2168,9 +2164,9 @@ { int status; struct ocrdma_ah *ah; - struct ocrdma_device *dev; + ah = get_ocrdma_ah(ibah); - dev = ah->pd->dev; + status = ibv_cmd_destroy_ah(ibah); ocrdma_free_ah_tbl_id(ah->pd->uctx, ah->id); free(ah); @@ -2183,11 +2179,7 @@ int ocrdma_attach_mcast(struct ibv_qp *ibqp, const union ibv_gid *gid, uint16_t lid) { - int status; - struct ocrdma_qp *qp; - qp = get_ocrdma_qp(ibqp); - status = ibv_cmd_attach_mcast(ibqp, gid, lid); - return status; + return ibv_cmd_attach_mcast(ibqp, gid, lid); } /* @@ -2196,37 +2188,5 @@ int ocrdma_detach_mcast(struct ibv_qp *ibqp, const union ibv_gid *gid, uint16_t lid) { - int status; - struct ocrdma_qp *qp; - qp = get_ocrdma_qp(ibqp); - status = ibv_cmd_detach_mcast(ibqp, gid, lid); - return status; -} - -void ocrdma_async_event(struct ibv_async_event *event) -{ - struct ocrdma_cq *cq = NULL; - struct ocrdma_qp *qp = NULL; - switch (event->event_type) { - case IBV_EVENT_CQ_ERR: - cq = get_ocrdma_cq(event->element.cq); - break; - case IBV_EVENT_QP_FATAL: - case IBV_EVENT_QP_REQ_ERR: - case IBV_EVENT_QP_ACCESS_ERR: - case IBV_EVENT_PATH_MIG_ERR:{ - qp = get_ocrdma_qp(event->element.qp); - break; - } - case IBV_EVENT_SQ_DRAINED: - case IBV_EVENT_PATH_MIG: - case IBV_EVENT_COMM_EST: - case IBV_EVENT_QP_LAST_WQE_REACHED: - break; - case IBV_EVENT_PORT_ACTIVE: - case IBV_EVENT_PORT_ERR: - break; - default: - break; - } + return ibv_cmd_detach_mcast(ibqp, gid, lid); }
