diff -Nru cxlflash-5.0.2663/config.linux.mk cxlflash-5.0.2669/config.linux.mk --- cxlflash-5.0.2663/config.linux.mk 2018-03-29 21:52:48.000000000 +0000 +++ cxlflash-5.0.2669/config.linux.mk 2018-04-05 15:20:50.000000000 +0000 @@ -77,7 +77,6 @@ installsb: default ifneq ($(CXLFLASH_ALL),no) ${MAKE} -j10 test_pass - ${MAKE} install_image ${MAKE} install_test endif ${MAKE} install_code diff -Nru cxlflash-5.0.2663/debian/changelog cxlflash-5.0.2669/debian/changelog --- cxlflash-5.0.2663/debian/changelog 2018-04-05 10:01:50.000000000 +0000 +++ cxlflash-5.0.2669/debian/changelog 2018-04-06 11:17:37.000000000 +0000 @@ -1,6 +1,6 @@ -cxlflash (5.0.2663-0ubuntu1~test1) bionic; urgency=medium +cxlflash (5.0.2669-0ubuntu1~test1) bionic; urgency=medium [ Mike Vageline, Łukasz 'sil2100' Zemczak ] * Initial release. (LP: #1716924) - -- Łukasz 'sil2100' Zemczak Thu, 05 Apr 2018 12:01:50 +0200 + -- Łukasz 'sil2100' Zemczak Fri, 06 Apr 2018 13:17:37 +0200 diff -Nru cxlflash-5.0.2663/debian/copyright cxlflash-5.0.2669/debian/copyright --- cxlflash-5.0.2663/debian/copyright 2018-03-29 21:52:48.000000000 +0000 +++ cxlflash-5.0.2669/debian/copyright 2018-04-06 11:17:37.000000000 +0000 @@ -3,13 +3,16 @@ Source: https://github.com/open-power/capiflash.git Files: * -Author: International Business Machines Corp. -Copyright: Copyright IBM Corp. 2014-2017 +Copyright: 2014-2018 International Business Machines Corp. License: Apache-2.0 +Files: src/include/fuse* +Copyright: 2001-2007 Miklos Szeredi + 2014-2018 International Business Machines Corp. +License: LGPL-2 + Files: debian/* -Author: International Business Machines Corp. -Copyright: Copyright IBM Corp. 2014-2017 +Copyright: 2014-2018 International Business Machines Corp. License: GPL-2+ This package is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -27,8 +30,6 @@ On Debian systems, the complete text of the GNU General Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". - - License: Apache-2.0 Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may @@ -43,3 +44,21 @@ permissions and limitations under the License. . For a local copy of the license, see /usr/share/common-licenses/Apache-2.0 + +License: LGPL-2 + This package is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + . + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + . + You should have received a copy of the GNU Library General Public + License along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + . + On Debian systems, the complete text of the GNU Library General + Public License can be found in `/usr/share/common-licenses/LGPL-2'. diff -Nru cxlflash-5.0.2663/src/build/install/resources/cflash_mfg_init cxlflash-5.0.2669/src/build/install/resources/cflash_mfg_init --- cxlflash-5.0.2663/src/build/install/resources/cflash_mfg_init 2018-03-29 21:52:48.000000000 +0000 +++ cxlflash-5.0.2669/src/build/install/resources/cflash_mfg_init 2018-04-05 15:20:50.000000000 +0000 @@ -94,7 +94,7 @@ chomp $card; my $cardN=substr $card,-1; - if (defined $correct && $out =~ /0628/) + if ($correct == 1 && $out =~ /0628/) { my $opt=""; if (defined $serial) diff -Nru cxlflash-5.0.2663/src/cflash/test/cflash_test_error.c cxlflash-5.0.2669/src/cflash/test/cflash_test_error.c --- cxlflash-5.0.2663/src/cflash/test/cflash_test_error.c 2018-03-29 21:52:48.000000000 +0000 +++ cxlflash-5.0.2669/src/cflash/test/cflash_test_error.c 2018-04-05 15:20:50.000000000 +0000 @@ -995,7 +995,7 @@ char cmdToRun[MAXBUFF]; - __u64 stride= 0x100; + __u64 stride= 0x1000; pid = getpid(); diff -Nru cxlflash-5.0.2663/src/test/ioppt cxlflash-5.0.2669/src/test/ioppt --- cxlflash-5.0.2663/src/test/ioppt 2018-03-29 21:52:48.000000000 +0000 +++ cxlflash-5.0.2669/src/test/ioppt 2018-04-05 15:20:50.000000000 +0000 @@ -53,8 +53,11 @@ my @pids; my $pids_in=""; my $npid=0; +my $tmbps=0; my $iops=0; my $ioppt=0; +my $avglat=0; +my $tlat=0; my $tstart; my $tstop; my $tdiff; @@ -317,7 +320,18 @@ my @ss=split(/iops:/,$str); if ($verbose) {print "iops=$ss[1]\n";} $iops+=$ss[1]; - last; + } + if ($str =~ /lat/) + { + my @ss=split(/lat:/,$str); + if ($verbose) {print "lat=$ss[1]\n";} + $tlat+=$ss[1]; + } + if ($str =~ /mbps/) + { + my @ss=split(/mbps:/,$str); + if ($verbose) {print "mbps=$ss[1]\n";} + $tmbps+=$ss[1]; } } } @@ -371,8 +385,9 @@ # print results #------------------------------------------------------------------------------- if ($iops > 0) {$ioppt=$iops/$tps;} +if ($tlat > 0) {$avglat=$tlat/$ncmds;} -printf "usr:%4.1f%% ptps:%5d iops:%7d ioppt:%5d\n", - ($ut/$tt)*100, $tps, $iops, $ioppt; +printf "usr:%4.1f%% lat:%-4d mbps:%-5d ptps:%-5d iops:%-7d ioppt:%-5d\n", + ($ut/$tt)*100, $avglat, $tmbps, $tps, $iops, $ioppt; exit 0; diff -Nru cxlflash-5.0.2663/src/test/run_regression cxlflash-5.0.2669/src/test/run_regression --- cxlflash-5.0.2663/src/test/run_regression 2018-03-29 21:52:48.000000000 +0000 +++ cxlflash-5.0.2669/src/test/run_regression 2018-04-05 15:20:50.000000000 +0000 @@ -124,7 +124,7 @@ if [[ $gtp ]] then - parms="--gtest_filter=-*EEH*:*port_offonline_GT_plun:*spio_exit:*E_test_SPIO_RLS_DET" + parms="--gtest_filter=-*EEH*:*E_test_SPIO_RLS_DET:*ioarcb_ea_null" elif [[ $gt ]]; then