| Message ID | 151338026169.4485.17535956960021474462.stgit@djiang5-desk3.ch.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 12/15, Dave Jiang wrote: > Adding a unit test that will use nfit_test kernel module to test the > firmware update sequence. > > Signed-off-by: Dave Jiang <dave.jiang@intel.com> > --- > ndctl/update.c | 10 ---------- This diffstat is missing the new file? But my attention only went to that because.. > 1 file changed, 10 deletions(-) > > diff --git a/ndctl/update.c b/ndctl/update.c > index 8d33b6a..a9400d6 100644 > --- a/ndctl/update.c > +++ b/ndctl/update.c > @@ -73,8 +73,6 @@ struct fw_info { > uint32_t update_size; > uint32_t query_interval; > uint32_t max_query; > - uint32_t update_cap; > - uint32_t fis_version; > uint64_t run_version; > uint32_t context; > }; > @@ -158,14 +156,6 @@ static int submit_get_firmware_info(struct update_context *uctx) > if (fw->max_query == UINT_MAX) > return -ENXIO; > > - fw->update_cap = ndctl_cmd_fw_info_get_update_cap(cmd); > - if (fw->update_cap == UINT_MAX) > - return -ENXIO; > - > - fw->fis_version = ndctl_cmd_fw_info_get_fis_version(cmd); > - if (fw->fis_version == UINT_MAX) > - return -ENXIO; > - ..I think you applied the removal fixup for these two things to the wrong patch? i.e. they are being added in patch 3 but removed in 4. > fw->run_version = ndctl_cmd_fw_info_get_run_version(cmd); > if (fw->run_version == ULLONG_MAX) > return -ENXIO; > diff --git a/test/Makefile.am b/test/Makefile.am > index d4c2bd6..d5ef648 100644 > --- a/test/Makefile.am > +++ b/test/Makefile.am > @@ -16,7 +16,8 @@ TESTS =\ > blk-exhaust.sh \ > sector-mode.sh \ > inject-error.sh \ > - btt-errors.sh > + btt-errors.sh \ > + firmware-update.sh > > check_PROGRAMS =\ > libndctl \ > diff --git a/test/firmware-update.sh b/test/firmware-update.sh > new file mode 100755 > index 0000000..ff777b9 > --- /dev/null > +++ b/test/firmware-update.sh > @@ -0,0 +1,74 @@ > +#!/bin/bash -Ex > + > +# Copyright(c) 2017 Intel Corporation. All rights reserved. > +# > +# This program is free software; you can redistribute it and/or modify it > +# under the terms of version 2 of the GNU General Public License as > +# published by the Free Software Foundation. > +# > +# This program 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 > +# General Public License for more details. > + > +[ -f "../ndctl/ndctl" ] && [ -x "../ndctl/ndctl" ] && ndctl="../ndctl/ndctl" > +[ -f "./ndctl/ndctl" ] && [ -x "./ndctl/ndctl" ] && ndctl="./ndctl/ndctl" > +[ -z "$ndctl" ] && echo "Couldn't find an ndctl binary" && exit 1 > +bus="nfit_test.0" > +json2var="s/[{}\",]//g; s/:/=/g" > +rc=77 > +dev="" > +image="update-fw.img" > + > +trap 'err $LINENO' ERR > + > +# $1: Line number > +# $2: exit code > +err() > +{ > + [ -n "$2" ] && rc="$2" > + echo "test/firmware-update.sh: failed at line $1" > + exit "$rc" > +} > + > +check_min_kver() > +{ > + local ver="$1" > + : "${KVER:=$(uname -r)}" > + > + [ -n "$ver" ] || return 1 > + [[ "$ver" == "$(echo -e "$ver\n$KVER" | sort -V | head -1)" ]] > +} > + > +reset() > +{ > + $ndctl disable-region -b "$bus" all > + $ndctl zero-labels -b "$bus" all > + $ndctl enable-region -b "$bus" all > + if [ -f $image ]; then > + rm -f $image > + fi > +} > + > +detect() > +{ > + dev=$($ndctl list -b "$bus" -D | jq .[0].dev | tr -d '"') > + [ -n "$dev" ] || err "$LINENO" 2 > +} > + > +do_tests() > +{ > + fallocate -l 196608 $image > + $ndctl update-firmware -d $dev -f $image > +} > + > +check_min_kver "4.16" || { echo "kernel $KVER may lack firmware update test handling"; exit > +$rc; } > +modprobe nfit_test > +rc=1 > +reset > +detect > +do_tests > +reset > +exit 0 > + > > _______________________________________________ > Linux-nvdimm mailing list > Linux-nvdimm@lists.01.org > https://lists.01.org/mailman/listinfo/linux-nvdimm
diff --git a/ndctl/update.c b/ndctl/update.c index 8d33b6a..a9400d6 100644 --- a/ndctl/update.c +++ b/ndctl/update.c @@ -73,8 +73,6 @@ struct fw_info { uint32_t update_size; uint32_t query_interval; uint32_t max_query; - uint32_t update_cap; - uint32_t fis_version; uint64_t run_version; uint32_t context; }; @@ -158,14 +156,6 @@ static int submit_get_firmware_info(struct update_context *uctx) if (fw->max_query == UINT_MAX) return -ENXIO; - fw->update_cap = ndctl_cmd_fw_info_get_update_cap(cmd); - if (fw->update_cap == UINT_MAX) - return -ENXIO; - - fw->fis_version = ndctl_cmd_fw_info_get_fis_version(cmd); - if (fw->fis_version == UINT_MAX) - return -ENXIO; - fw->run_version = ndctl_cmd_fw_info_get_run_version(cmd); if (fw->run_version == ULLONG_MAX) return -ENXIO; diff --git a/test/Makefile.am b/test/Makefile.am index d4c2bd6..d5ef648 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -16,7 +16,8 @@ TESTS =\ blk-exhaust.sh \ sector-mode.sh \ inject-error.sh \ - btt-errors.sh + btt-errors.sh \ + firmware-update.sh check_PROGRAMS =\ libndctl \ diff --git a/test/firmware-update.sh b/test/firmware-update.sh new file mode 100755 index 0000000..ff777b9 --- /dev/null +++ b/test/firmware-update.sh @@ -0,0 +1,74 @@ +#!/bin/bash -Ex + +# Copyright(c) 2017 Intel Corporation. All rights reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as +# published by the Free Software Foundation. +# +# This program 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 +# General Public License for more details. + +[ -f "../ndctl/ndctl" ] && [ -x "../ndctl/ndctl" ] && ndctl="../ndctl/ndctl" +[ -f "./ndctl/ndctl" ] && [ -x "./ndctl/ndctl" ] && ndctl="./ndctl/ndctl" +[ -z "$ndctl" ] && echo "Couldn't find an ndctl binary" && exit 1 +bus="nfit_test.0" +json2var="s/[{}\",]//g; s/:/=/g" +rc=77 +dev="" +image="update-fw.img" + +trap 'err $LINENO' ERR + +# $1: Line number +# $2: exit code +err() +{ + [ -n "$2" ] && rc="$2" + echo "test/firmware-update.sh: failed at line $1" + exit "$rc" +} + +check_min_kver() +{ + local ver="$1" + : "${KVER:=$(uname -r)}" + + [ -n "$ver" ] || return 1 + [[ "$ver" == "$(echo -e "$ver\n$KVER" | sort -V | head -1)" ]] +} + +reset() +{ + $ndctl disable-region -b "$bus" all + $ndctl zero-labels -b "$bus" all + $ndctl enable-region -b "$bus" all + if [ -f $image ]; then + rm -f $image + fi +} + +detect() +{ + dev=$($ndctl list -b "$bus" -D | jq .[0].dev | tr -d '"') + [ -n "$dev" ] || err "$LINENO" 2 +} + +do_tests() +{ + fallocate -l 196608 $image + $ndctl update-firmware -d $dev -f $image +} + +check_min_kver "4.16" || { echo "kernel $KVER may lack firmware update test handling"; exit +$rc; } +modprobe nfit_test +rc=1 +reset +detect +do_tests +reset +exit 0 +
Adding a unit test that will use nfit_test kernel module to test the firmware update sequence. Signed-off-by: Dave Jiang <dave.jiang@intel.com> --- ndctl/update.c | 10 ---------- 1 file changed, 10 deletions(-)