[Mellanox] Add ONIE and SSD platform components

platform/mellanox/mlnx-onie-fw-update.sh

@@ -1,120 +1,205 @@
-#!/bin/sh
+#!/bin/bash
 
 # Copyright (C) 2019 Mellanox Technologies Ltd.
 # Copyright (C) 2019 Michael Shych <[email protected]>
 #
 # SPDX-License-Identifier:     GPL-2.0
 
-this_script=${ONIE_FWPKG_PROGRAM_NAME:-$(basename $(realpath $0))}
+this_script="$(basename $(realpath ${0}))"
+lock_file="/var/run/${this_script%.*}.lock"
 
 onie_mount=/mnt/onie-boot
+onie_lib=/lib/onie
 os_boot=/host
-onie_partition=
 
-export ONIE_FWPKG_PROGRAM_NAME=$(basename $(realpath $0))
-
-usage()
-{
+print_help() {
 cat <<EOF
   update
     The 'update' command will reboot system to ONIE update mode
-    and ONIE will perform automatically update of previously 
+    and ONIE will perform automatically update of previously
     added (i.e. pending) FW (ONIE itself, BIOS or CPLD) image.
 
 EOF
 }
 
-enable_onie_access()
-{
-	onie_partition=$(fdisk -l | grep "ONIE boot" | awk '{print $1}')
-	if [ ! -d $onie_mount ]; then
-		mkdir /mnt/onie-boot
-	fi
-	mount $onie_partition /mnt/onie-boot
-	if [ ! -e /lib/onie ]; then
-		ln -s /mnt/onie-boot/onie/tools/lib/onie /lib/onie
-	fi
-	PATH=/sbin:/usr/sbin:/bin:/usr/bin:$onie_mount/onie/tools/bin/
-	export PATH
+enable_onie_access() {
+    if [[ ! -d "${onie_mount}" ]]; then
+        mkdir ${onie_mount}
+    fi
+
+    if ! mountpoint -q "${onie_mount}"; then
+        mount LABEL="ONIE-BOOT" ${onie_mount}
+    fi
+
+    if [[ ! -e "${onie_lib}" ]]; then
+        ln -s ${onie_mount}/onie/tools/lib/onie ${onie_lib}
+    fi
+}
+
+disable_onie_access() {
+    if [[ -e "${onie_lib}" ]]; then
+        unlink ${onie_lib}
+    fi
+
+    if mountpoint -q "${onie_mount}"; then
+        umount -rf ${onie_mount}
+    fi
+
+    if [[ -d "${onie_mount}" ]]; then
+        rmdir ${onie_mount}
+    fi
+}
+
+enable_onie_fw_update_mode() {
+    if [[ ! -f ${os_boot}/grub/grubenv || ! -f ${onie_mount}/grub/grubenv ]]; then
+        return 1
+    fi
+
+    register_terminate_handler
+
+    grub-editenv ${os_boot}/grub/grubenv set onie_entry="ONIE" || return $?
+    grub-editenv ${onie_mount}/grub/grubenv set onie_mode="update" || return $?
+
+    return 0
+}
+
+disable_onie_fw_update_mode() {
+    if [[ ! -f ${os_boot}/grub/grubenv || ! -f ${onie_mount}/grub/grubenv ]]; then
+        return 1
+    fi
+
+    grub-editenv ${os_boot}/grub/grubenv unset onie_entry || return $?
+    grub-editenv ${onie_mount}/grub/grubenv set onie_mode="install" || return $?
+
+    return 0
+}
+
+show_pending() {
+    if [[ ! -d ${onie_mount}/onie/update/pending ]]; then
+        return 0
+    fi
+
+    num=$(find ${onie_mount}/onie/update/pending -type f | wc -l)
+    if [[ ${num} -ge 1 ]]; then
+        ${onie_mount}/onie/tools/bin/onie-fwpkg show-pending
+    fi
+
+    return ${num}
+}
+
+system_reboot() {
+    echo "INFO: Rebooting in 5 sec..."
+
+    # Give user some time to cancel the update
+    sleep 5s
+
+    # Use SONiC reboot scenario
+    /usr/bin/reboot
+}
+
+terminate_handler() {
+    local -r _rc="$?"
+    local -r _sig="${1}"
+
+    echo
+    echo "WARNING: Interrupted by ${_sig}: disable ONIE firmware update mode"
+    echo
+
+    enable_onie_access
+    disable_onie_fw_update_mode
+    rc=$?
+    disable_onie_access
+
+    if [[ ${rc} -ne 0 ]]; then
+        echo "ERROR: failed to disable ONIE firmware update mode"
+        exit ${rc}
+    fi
+
+    exit ${_rc}
+}
+
+register_terminate_handler() {
+    trap "terminate_handler SIGHUP" SIGHUP
+    trap "terminate_handler SIGINT" SIGINT
+    trap "terminate_handler SIGQUIT" SIGQUIT
+    trap "terminate_handler SIGTERM" SIGTERM
 }
 
-clean_onie_access()
-{
-	rm -f /lib/onie
-	umount $onie_partition
+unlock_handler() {
+    /usr/bin/flock -u ${1}
 }
 
-change_grub_boot_order()
-{
-	grub-editenv $os_boot/grub/grubenv set onie_entry=ONIE
-	grub-editenv $onie_mount/grub/grubenv set onie_mode=update
-	return 0
+register_unlock_handler() {
+    trap "unlock_handler ${1}" EXIT
 }
 
-show_pending()
-{
-	curr_dir=$(pwd)
-	cd $onie_mount/onie/update/pending || return 0
-	num=$(find . -type f | wc -l)
-	if [ $num -ge 1 ]; then
-		echo "Number of FW update pending files are: "$num
-		ls -l * | awk {'print $9"  "$5"  "$7"-"$6" "$8'}
-	else
-		echo "There is no pending files for FW update."
-	fi
-	cd $curr_dir
-
-	return $num
+unlock_script_state_change() {
+    /usr/bin/flock -u ${lock_fd}
 }
 
+lock_script_state_change(){
+    exec {lock_fd}>${lock_file}
+    /usr/bin/flock -x ${lock_fd}
+    register_unlock_handler ${lock_fd}
+}
+
+# Multiprocessing synchronization
+lock_script_state_change
+
 # Process command arguments
-cmd=$1
-# optional argument
-name="$2"
+cmd="${1}"
+
+# Optional argument
+arg="${2}"
 
-if [ -z "$cmd" ] ; then
-	# Default to 'show' if no command is specified.
-	cmd="show"
+if [[ -z "${cmd}" ]]; then
+    # Default to 'show' if no command is specified.
+    cmd="show"
 fi
 
-case "$cmd" in
-	add | remove)
-		[ -z "$name" ] && {
-			echo "ERROR: This command requires a firmware update file name."
-			echo "Run '$this_script help' for complete details."
-			exit 1
-		}
-		;;
-	update)
-		enable_onie_access
-		show_pending
-		rc=$?
-		if [ $rc -ne 0 ]; then
-			change_grub_boot_order
-			rc=$?
-			clean_onie_access
-			exit $rc
-		else
-			echo "ERROR: NO FW images for update."
-			echo "Run: $this_script add <image>  before update."
-			clean_onie_access
-			exit 1
-		fi
-		;;
-	purge | show | show-results | show-log | show-pending | help)
-		;;
-	*)
-		echo "Unknown command: $cmd"
-		exit 1
-	;;
+case "${cmd}" in
+    add|remove)
+        if [[ -z "${arg}" ]]; then
+            echo "ERROR: This command requires a firmware update file name"
+            echo "Run: '${this_script} help' for complete details"
+            exit 1
+        fi
+        ;;
+    update)
+        enable_onie_access
+        show_pending
+        rc=$?
+        if [[ ${rc} -ne 0 ]]; then
+            enable_onie_fw_update_mode
+            rc=$?
+            disable_onie_access
+            if [[ ${rc} -eq 0 ]]; then
+                system_reboot
+            else
+                echo "ERROR: failed to enable ONIE firmware update mode"
+                exit ${rc}
+            fi
+        else
+            echo "ERROR: No firmware images for update"
+            echo "Run: '${this_script} add <image>' before update"
+            disable_onie_access
+            exit 1
+        fi
+        ;;
+    purge|show-pending|show-results|show|show-log|help)
+        ;;
+    *)
+        echo "ERROR: Unknown command: ${cmd}"
+        exit 1
+        ;;
 esac
 
 enable_onie_access
-$onie_mount/onie/tools/bin/onie-fwpkg "$@"
+${onie_mount}/onie/tools/bin/onie-fwpkg "$@"
 rc=$?
-if [ $cmd = "help" ]; then
-	usage
+if [[ "${cmd}" = "help" ]]; then
+    print_help
 fi
-clean_onie_access
+disable_onie_access
 
-exit $rc
+exit ${rc}

platform/mellanox/mlnx-platform-api/sonic_platform/chassis.py

@@ -154,7 +154,9 @@ def initialize_eeprom(self):
 
     def initialize_components(self):
         # Initialize component list
-        from sonic_platform.component import ComponentBIOS, ComponentCPLD
+        from sonic_platform.component import ComponentONIE, ComponentSSD, ComponentBIOS, ComponentCPLD
+        self._component_list.append(ComponentONIE())
+        self._component_list.append(ComponentSSD())
         self._component_list.append(ComponentBIOS())
         self._component_list.extend(ComponentCPLD.get_component_list())