meta-dts-distro/recipes-dts/dts: Address review discussions

Signed-off-by: Michał Żygowski <[email protected]>

Author: miczyg1

meta-dts-distro/recipes-dts/dts/dasharo-deploy/dasharo-deploy

@@ -199,17 +199,20 @@ backup() {
 romhole_migration() {
     cbfstool $BIOS_UPDATE_FILE layout -w | grep -q "ROMHOLE" || return
 
-    echo "Beginning ROM hole migration process..."
     flashrom -p "$PROGRAMMER_BIOS" ${FLASH_CHIP_SELECT} -r /tmp/rom.bin --ifd -i bios >> $FLASHROM_LOG_FILE 2>> $ERR_LOG_FILE
-    error_check "Failed to read current firmware"
+    error_check "Failed to read current firmware ti migrate MSI ROMHOLE"
     if check_if_dasharo; then
       cbfstool /tmp/rom.bin layout -w | grep -q "ROMHOLE" || return
-      cbfstool /tmp/rom.bin read -r ROMHOLE -f /tmp/romhole.bin || return
+      # This one is rather unlikely to fail, but just in case print a warning
+      cbfstool /tmp/rom.bin read -r ROMHOLE -f /tmp/romhole.bin 2> /dev/null
+      if [ $? -ne 0 ]; then
+        print_warning "Failed to migrate MSI ROMHOLE, your platform's unique SMBIOS/DMI data may be lost"
+        return
+      else
     else
-      dd if=/tmp/rom.bin of=/tmp/romhole.bin skip=$((0x17C0000)) bs=128K count=1 iflag=skip_bytes
+      dd if=/tmp/rom.bin of=/tmp/romhole.bin skip=$((0x17C0000)) bs=128K count=1 iflag=skip_bytes > /dev/null 2>&1 
     fi
 
-    echo "Migrate to ROMHOLE section."
     cbfstool "$BIOS_UPDATE_FILE" write -r ROMHOLE -f /tmp/romhole.bin -u 2> /dev/null
 }
 
@@ -283,8 +286,7 @@ check_vboot_keys() {
     # No FMAP flashing? Also skip
     grep -q "\-\-fmap" <<< "$FLASHROM_ADD_OPT_UPDATE" || return
 
-    CBFSTOOL=$(which cbfstool)
-    BINARY_KEYS=$(futility show $BIOS_UPDATE_FILE| grep -i 'key sha1sum')
+    BINARY_KEYS=$(CBFSTOOL=$(which cbfstool) futility show $BIOS_UPDATE_FILE| grep -i 'key sha1sum')
 
     if [ $BOARD_HAS_FD_REGION -eq 0 ]; then
       FLASHROM_ADD_OPT_READ=""
@@ -294,7 +296,7 @@ check_vboot_keys() {
     echo "Checking vboot keys."
     flashrom -p "$PROGRAMMER_BIOS" ${FLASH_CHIP_SELECT} ${FLASHROM_ADD_OPT_READ} -r /tmp/bios.bin > /dev/null 2>/dev/null
     if [ $? -eq 0 ] && [ -f "/tmp/bios.bin" ]; then
-      FLASH_KEYS=$(futility show /tmp/bios.bin | grep -i 'key sha1sum')
+      FLASH_KEYS=$(CBFSTOOL=$(which cbfstool) futility show /tmp/bios.bin | grep -i 'key sha1sum')
       diff <(echo "$BINARY_KEYS") <(echo "$FLASH_KEYS") > /dev/null 2>&1
       # If keys are different we must additionally flash at least GBB region as well
       if [ $? -ne 0 ]; then
@@ -410,7 +412,7 @@ install() {
   fi
 
   echo "Installing Dasharo firmware..."
-  flashrom -p "$PROGRAMMER_BIOS" ${FLASH_CHIP_SELECT} ${FLASHROM_ADD_OPT_INTEL_REGIONS} -w "$BIOS_UPDATE_FILE" >> $FLASHROM_LOG_FILE 2>> $ERR_LOG_FILE
+  flashrom -p "$PROGRAMMER_BIOS" ${FLASH_CHIP_SELECT} ${FLASHROM_ADD_OPT_REGIONS} -w "$BIOS_UPDATE_FILE" >> $FLASHROM_LOG_FILE 2>> $ERR_LOG_FILE
   error_check "Failed to install Dasharo firmware"
 
   print_green "Successfully installed Dasharo firmware"

meta-dts-distro/recipes-dts/dts/dts/dts-functions.sh

@@ -180,6 +180,10 @@ board_config() {
           PROGRAMMER_EC="ite_ec"
           if check_if_dasharo; then
           # if v1.5.1 or older, flash the whole bios region
+          # TODO: Let DTS determine which parameters are suitable.
+          # FIXME: Can we ever get rid of that? We change so much in each release,
+          # that we almost always need to flash whole BIOS regions
+          # because of non-backward compatbile or breaking changes.
             compare_versions $DASHARO_VERSION 1.5.2
             if [ $? -eq 1 ]; then
               # For Dasharo version lesser than 1.5.2
@@ -208,7 +212,11 @@ board_config() {
           PROGRAMMER_BIOS="internal"
           PROGRAMMER_EC="ite_ec"
           if check_if_dasharo; then
-          # if v1.5.0 or older, flash the whole bios region
+          # if v1.5.1 or older, flash the whole bios region
+          # TODO: Let DTS determine which parameters are suitable.
+          # FIXME: Can we ever get rid of that? We change so much in each release,
+          # that we almost always need to flash whole BIOS regions
+          # because of non-backward compatbile or breaking changes.
             compare_versions $DASHARO_VERSION 1.5.1
             if [ $? -eq 1 ]; then
               # For Dasharo version lesser than 1.5.1
@@ -237,6 +245,10 @@ board_config() {
           PROGRAMMER_EC="ite_ec"
           if check_if_dasharo; then
           # if v1.7.2 or older, flash the whole bios region
+          # TODO: Let DTS determine which parameters are suitable.
+          # FIXME: Can we ever get rid of that? We change so much in each release,
+          # that we almost always need to flash whole BIOS regions
+          # because of non-backward compatbile or breaking changes.
             compare_versions $DASHARO_VERSION 1.7.2
             if [ $? -eq 1 ]; then
               # For Dasharo version lesser than 1.7.2
@@ -266,6 +278,10 @@ board_config() {
           PROGRAMMER_EC="ite_ec"
           if check_if_dasharo; then
           # if v1.7.2 or older, flash the whole bios region
+          # TODO: Let DTS determine which parameters are suitable.
+          # FIXME: Can we ever get rid of that? We change so much in each release,
+          # that we almost always need to flash whole BIOS regions
+          # because of non-backward compatbile or breaking changes.
             compare_versions $DASHARO_VERSION 1.7.2
             if [ $? -eq 1 ]; then
               # For Dasharo version lesser than 1.7.2
@@ -775,7 +791,7 @@ check_if_me_disabled() {
       echo "ME disabled by Security Override MEI Message/HMRFPO"  >> $ERR_LOG_FILE
       ME_DISABLED=1
       return
-    elif [ $ME_OPMODE == "5" ]; then
+    elif [ $ME_OPMODE == "6" ]; then
       echo "ME disabled by Security Override MEI Message/HMRFPO"  >> $ERR_LOG_FILE
       ME_DISABLED=1
       return
@@ -808,12 +824,12 @@ force_me_update() {
     print_warning "You have been warned."
   while : ; do
     echo
-    read -r -p "Force the flashing without updating ME? (Y|n) " OPTION
+    read -r -p "Skip ME flashing and proceed with BIOS/firmware flashing/udpating? (Y|n) " OPTION
     echo
 
     case ${OPTION} in
       yes|y|Y|Yes|YES)
-        print_warning "Proceeding without ME flashing, because we were forced to."
+        print_warning "Proceeding without ME flashing, because we were asked to."
         break
         ;;
       n|N)
@@ -887,7 +903,7 @@ set_intel_regions_update_params() {
         if [ $ME_DISABLED -eq 1 ]; then
           FLASHROM_ADD_OPT_REGIONS+=" -i me"
         else
-          echo "The firmware binary to be flashed  contains Management Engine (ME), but ME is not disabled!"  >> $ERR_LOG_FILE
+          echo "The firmware binary to be flashed contains Management Engine (ME), but ME is not disabled!"  >> $ERR_LOG_FILE
           print_error "The firmware binary contains Management Engine (ME), but ME is not disabled!"
           force_me_update
         fi