diff options
author | Charles Boyer <Charles.Boyer@fii-usa.com> | 2022-03-17 22:57:50 +0300 |
---|---|---|
committer | Charles Boyer <Charles.Boyer@fii-usa.com> | 2022-04-08 16:17:20 +0300 |
commit | 0dd80062dd4df56e72b76756e80cdc82cf36ce23 (patch) | |
tree | 63b9bb4107b58f89288f611b1e4eeb524417a7b1 /meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility | |
parent | 80384001af2851d11631091e57c728ab53d8a6c7 (diff) | |
download | openbmc-0dd80062dd4df56e72b76756e80cdc82cf36ce23.tar.xz |
meta-fii: meta-kudo: Fix shellcheck errors
Fixes bash shellcheck errors so that the exemptions in run-repotest
can be removed.
Signed-off-by: Charles Boyer <Charles.Boyer@fii-usa.com>
Change-Id: I6afb059cf1151c871ddfcaf67efc6a63183f7130
Diffstat (limited to 'meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility')
3 files changed, 58 insertions, 51 deletions
diff --git a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw/kudo-fw-ver.sh b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw/kudo-fw-ver.sh index 90ec84abab..23a65c1bd0 100644 --- a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw/kudo-fw-ver.sh +++ b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw/kudo-fw-ver.sh @@ -1,5 +1,8 @@ #!/bin/bash +# Disable check for splitting +# shellcheck disable=SC2207 + BMC_CPLD_VER_FILE="/run/cpld0.version" MB_CPLD_VER_FILE="/run/cpld1.version" ver='' @@ -8,12 +11,12 @@ function fw_rev() { case $1 in cpldb) rsp=($(i2cget -y -f -a 13 0x76 0x00 i 5)) - ver=$(printf '%d.%d.%d.%d' ${rsp[5]} ${rsp[4]} ${rsp[3]} ${rsp[2]}) + ver=$(printf '%d.%d.%d.%d' "${rsp[5]}" "${rsp[4]}" "${rsp[3]}" "${rsp[2]}") ;; cpldm) I2C_BUS_DEV=$(readlink "/sys/bus/i2c/devices/4-0077/channel-2" | cut -c 8-) - rsp=($(i2cget -y -f -a $I2C_BUS_DEV 0x76 0x00 i 5)) - ver=$(printf '%d.%d.%d.%d' ${rsp[5]} ${rsp[4]} ${rsp[3]} ${rsp[2]}) + rsp=($(i2cget -y -f -a "$I2C_BUS_DEV" 0x76 0x00 i 5)) + ver=$(printf '%d.%d.%d.%d' "${rsp[5]}" "${rsp[4]}" "${rsp[3]}" "${rsp[2]}") ;; *) ;; diff --git a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw/kudo-fw.sh b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw/kudo-fw.sh index 0f8868f073..6231aeb49f 100644 --- a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw/kudo-fw.sh +++ b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw/kudo-fw.sh @@ -1,9 +1,13 @@ #!/bin/bash -devpath="/sys/bus/i2c/devices/13-0077/driver" - +# Provide source directive to shellcheck. +# shellcheck source=meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw/kudo-lib.sh +# Disable check for globbing and word splitting within double quotes +# shellcheck disable=SC2086 source /usr/libexec/kudo-fw/kudo-lib.sh +devpath="/sys/bus/i2c/devices/13-0077/driver" + function fwbios() { KERNEL_FIU_ID="c0000000.spi" KERNEL_SYSFS_FIU="/sys/bus/platform/drivers/NPCM-FIU" @@ -19,16 +23,15 @@ function fwbios() { echo "${KERNEL_FIU_ID}" > "${KERNEL_SYSFS_FIU}"/bind # write to the mtd device - BIOS_MTD=$(cat /proc/mtd | grep "bios" | sed -n 's/^\(.*\):.*/\1/p') + BIOS_MTD=$(grep "bios" /proc/mtd | sed -n 's/^\(.*\):.*/\1/p') - if [ ! -f $1 ]; then - echo " Cannot find the" $1 "image file" + if [ ! -f "$1" ]; then + echo " Cannot find the" "$1" "image file" return 1 fi - echo "Flashing BIOS @/dev/$BIOS_MTD" - flashcp -v $1 /dev/$BIOS_MTD - if [ $? -ne 0 ]; then + echo "Flashing BIOS @/dev/${BIOS_MTD}" + if [ "$(flashcp -v $1 /dev/${BIOS_MTD})" -ne 0 ]; then echo "Flashing the bios failed " >&2 return 1 fi @@ -41,22 +44,26 @@ function fwbios() { i2cset -y -f -a 13 0x76 0x10 0x00 # Disable LPI mode NV_SI_CPU_LPI_FREQ_DISABLE for SCP 1.06 and older. - nvparm -s 0x1 -o 0x114090 + if [ "$(nvparm -s 0x1 -o 0x114090)" -ne 0 ]; then + echo "Setting LPI mode for SCP 1.06 and older failed " >&2 + return 1 + fi # Disable LPI mode NV_SI_CPU_LPI_FREQ_DISABLE for SCP 1.07 and newer - nvparm -s 0x1 -o 0x02A8 + if [ "$(nvparm -s 0x1 -o 0x02A8)" -ne 0 ]; then + echo "Setting LPI mode for SCP 1.07 and newer failed " >&2 + return 1 + fi # Disable toggling of SMPro heartbeat - nvparm -s 0x0 -o 0x5F0638 - - if [ $? -ne 0 ]; then - echo "Setting default nvparms failed " >&2 + if [ "$(nvparm -s 0x0 -o 0x5F0638)" -ne 0 ]; then + echo "Setting SMpro heartbeat failed " >&2 return 1 fi - if [[ $(find ${1} -type f -size +17156k 2>/dev/null) ]]; then + if [[ $(find "$1" -type f -size +17156k 2>/dev/null) ]]; then echo "Extracting the SCP from the image" - dd if=$1 bs=1024 skip=17156 count=256 of=/run/initramfs/myscp.img + dd if="$1" bs=1024 skip=17156 count=256 of=/run/initramfs/myscp.img # Update both primary and backup EEPROM fwscp /run/initramfs/myscp.img fwscpback /run/initramfs/myscp.img @@ -69,8 +76,7 @@ function fwbios() { function fwbmccpld() { # BMC_JTAG_MUX_1 #218 0:BMC 1:MB set_gpio_ctrl 218 out 0 - loadsvf -d /dev/jtag0 -s $1 -m 0 - if [ $? -ne 0 ]; then + if [ "$(loadsvf -d /dev/jtag0 -s $1 -m 0)" -ne 0 ]; then echo "BMC CPLD update failed" >&2 return 1 fi @@ -85,8 +91,7 @@ function fwmbcpld() { # BMC_JTAG_SEL #164 0:BMC 1:CPU set_gpio_ctrl 218 out 1 set_gpio_ctrl 164 out 1 - loadsvf -d /dev/jtag0 -s $1 -m 0 - if [ $? -ne 0 ]; then + if [ "$(loadsvf -d /dev/jtag0 -s $1 -m 0)" -ne 0 ]; then echo "Mobo CPLD update failed" >&2 return 1 fi @@ -98,18 +103,18 @@ function fwmbcpld() { function fwscp() { # BMC_I2C_BACKUP_SEL #168 0:failover, 1:main # BMC_CPU_EEPROM_I2C_SEL #85 0:BMC, 1:CPU - scp_eeprom_sel=`get_gpio_ctrl 168` + scp_eeprom_sel=$(get_gpio_ctrl 168) set_gpio_ctrl 168 out 1 set_gpio_ctrl 85 out 0 + #shellcheck disable=SC2010 I2C_BUS_DEV=$(ls -l $devpath/"13-0077/" | grep channel-0 | awk '{ print $11}' | cut -c 8-) - ampere_eeprom_prog -b $I2C_BUS_DEV -s 0x50 -p -f $1 - if [ $? -ne 0 ]; then + if [ "$(ampere_eeprom_prog -b $I2C_BUS_DEV -s 0x50 -p -f $1)" -ne 0 ]; then echo "SCP eeprom update failed" >&2 return 1 fi wait set_gpio_ctrl 85 out 1 - set_gpio_ctrl 168 out $scp_eeprom_sel + set_gpio_ctrl 168 out "$scp_eeprom_sel" return 0 } @@ -117,18 +122,18 @@ function fwscp() { function fwscpback() { # BMC_I2C_BACKUP_SEL #168 0:failover, 1:main # BMC_CPU_EEPROM_I2C_SEL #85 0:BMC, 1:CPU - scp_eeprom_sel=`get_gpio_ctrl 168` + scp_eeprom_sel=$(get_gpio_ctrl 168) set_gpio_ctrl 168 out 0 set_gpio_ctrl 85 out 0 + #shellcheck disable=SC2010 I2C_BUS_DEV=$(ls -l $devpath/"13-0077/" | grep channel-0 | awk '{ print $11}' | cut -c 8-) - ampere_eeprom_prog -b $I2C_BUS_DEV -s 0x50 -p -f $1 - if [ $? -ne 0 ]; then + if [ "$(ampere_eeprom_prog -b $I2C_BUS_DEV -s 0x50 -p -f $1)" -ne 0 ]; then echo "SCP BACKUP eeprom update failed" >&2 return 1 fi wait set_gpio_ctrl 85 out 1 - set_gpio_ctrl 168 out $scp_eeprom_sel + set_gpio_ctrl 168 out "$scp_eeprom_sel" return 0 } @@ -136,18 +141,17 @@ function fwscpback() { function fwmb_pwr_seq(){ #$1 0x40 seq config file #$2 0x41 seq config file - if [[ ! -e $1 ]]; then - echo "$1 file does not exist" + if [[ ! -e "$1" ]]; then + echo "The file $1 does not exist" return 1 fi - if [[ ! -e $2 ]]; then - echo "$2 file does not exist" + if [[ ! -e "$2" ]]; then + echo "The file $2 file does not exist" return 1 fi echo 32-0040 > /sys/bus/i2c/drivers/adm1266/unbind echo 32-0041 > /sys/bus/i2c/drivers/adm1266/unbind - adm1266_fw_fx $1 $2 - if [ $? -ne 0 ]; then + if [ "$(adm1266_fw_fx $1 $2)" -ne 0 ]; then echo "The power seq flash failed" >&2 return 1 fi @@ -176,28 +180,28 @@ fi case $1 in bios) - fwbios $2 + fwbios "$2" ;; bmccpld) - fwbmccpld $2 + fwbmccpld "$2" ;; mbcpld) - fwmbcpld $2 + fwmbcpld "$2" ;; scp) - fwscp $2 + fwscp "$2" ;; scpback) - fwscpback $2 + fwscpback "$2" ;; mbseq) - fwmb_pwr_seq $2 $3 + fwmb_pwr_seq "$2" "$3" ;; *) ;; esac ret=$? -rm -f $2 $3 +rm -f "$2" "$3" exit $ret diff --git a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw/kudo-lib.sh b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw/kudo-lib.sh index 377257eac3..503e413cef 100644 --- a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw/kudo-lib.sh +++ b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw/kudo-lib.sh @@ -3,17 +3,17 @@ # set_gpio_ctrl # pin #, direction, high(1)/low(0) function set_gpio_ctrl() { - echo $1 > /sys/class/gpio/export - echo $2 > /sys/class//gpio/gpio$1/direction - echo $3 > /sys/class/gpio/gpio$1/value - echo $1 > /sys/class/gpio/unexport + echo "$1" > /sys/class/gpio/export + echo "$2" > /sys/class//gpio/gpio"$1"/direction + echo "$3" > /sys/class/gpio/gpio"$1"/value + echo "$1" > /sys/class/gpio/unexport sleep 1 } # get_gpio_ctrl # pin # function get_gpio_ctrl() { - echo $1 > /sys/class/gpio/export - echo $(cat /sys/class/gpio/gpio$1/value) - echo $1 > /sys/class/gpio/unexport + echo "$1" > /sys/class/gpio/export + cat /sys/class/gpio/gpio"$1"/value + echo "$1" > /sys/class/gpio/unexport } |