From 9251418f56292507ae218f872416f16b11715412 Mon Sep 17 00:00:00 2001
From: Jarrod Johnson <jjohnson2@lenovo.com>
Date: Wed, 27 Jan 2021 13:15:33 -0500
Subject: [PATCH] Improve robustness of IPMI config for XMM/XCC

Request more forgiving timing for the write filehandle,
and also do not raise error on closing a purged filehandle.

Change-Id: I2a8274f5e2e5b651d8b062433030e75a2bd608eb
---
 pyghmi/ipmi/oem/lenovo/config.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pyghmi/ipmi/oem/lenovo/config.py b/pyghmi/ipmi/oem/lenovo/config.py
index a7b20dbb..9cd40d17 100644
--- a/pyghmi/ipmi/oem/lenovo/config.py
+++ b/pyghmi/ipmi/oem/lenovo/config.py
@@ -165,7 +165,7 @@ class LenovoFirmwareConfig(object):
             data.extend(OPEN_WO_COMMAND)
             hex_size = struct.pack("<I", size)
             data.extend(bytearray(hex_size[:4]))
-            data.extend([0x01, 0x10])
+            data.extend([0x01, 0x40])
         if not isinstance(filename, bytes):
             filename = filename.encode('utf-8')
         data.extend(filename)
@@ -192,7 +192,11 @@ class LenovoFirmwareConfig(object):
 
         hex_filehandle = struct.pack("<I", filehandle)
         data.extend(bytearray(hex_filehandle[:4]))
-        run_command_with_retry(self.connection, data=data)
+        try:
+            run_command_with_retry(self.connection, data=data)
+        except pygexc.IpmiException as e:
+            if e.ipmicode != 203:
+                raise
 
     def imm_write(self, filehandle, size, inputdata):
         blocksize = 0xc8