Updated show dimm cmd to show Non-functional when dimms are disabled

Signed-off-by: Daniel K Osawa <[email protected]>

Author: dkosawa

src/cli/features/core/ShowDeviceCommand.cpp

@@ -217,6 +217,7 @@ std::string ShowDeviceCommand::convertHealthState(NVM_UINT16 healthState)
 	map[DEVICE_HEALTH_CRITICAL] = TR("Critical Failure");
 	map[DEVICE_HEALTH_FATAL] = TR("Non-recoverable error");
 	map[DEVICE_HEALTH_UNMANAGEABLE] = TR("Unmanageable");
+	map[DEVICE_HEALTH_NONFUNCTIONAL] = TR("Non-functional");
 	return map[healthState];
 }
 
@@ -225,6 +226,7 @@ std::string ShowDeviceCommand::convertManageabilityState(manageability_state sta
 	std::map<NVM_UINT64, std::string> map;
 	map[MANAGEMENT_VALIDCONFIG] = TR("Manageable");
 	map[MANAGEMENT_INVALIDCONFIG] = TR("Unmanageable");
+	map[MANAGEMENT_NON_FUNCTIONAL] = TR("Non-functional");
 	map[MANAGEMENT_UNKNOWN] = TR("Unknown");
 	return map[state];
 }

src/core/device/Device.cpp

@@ -452,9 +452,20 @@ NVM_UINT32 Device::getSku()
 NVM_UINT16 Device::getHealthState()
 {
 	LogEnterExit logging(__FUNCTION__, __FILE__, __LINE__);
-	NVM_UINT16 healthState = isManageable() ? getDeviceStatusHealth()
-											: DEVICE_HEALTH_UNMANAGEABLE;
-	return healthState;
+	enum manageability_state manageableState = getManageabilityState();
+	if (MANAGEMENT_INVALIDCONFIG == manageableState)
+	{
+		return DEVICE_HEALTH_UNMANAGEABLE;
+	}
+	else if(MANAGEMENT_UNKNOWN == manageableState)
+	{
+		return DEVICE_HEALTH_UNMANAGEABLE;
+	}
+	else if (MANAGEMENT_NON_FUNCTIONAL == manageableState)
+	{
+		return DEVICE_HEALTH_NONFUNCTIONAL;
+	}
+	return getDeviceStatusHealth();
 }
 
 bool Device::isNew()

src/core/device/Device.h

@@ -52,6 +52,7 @@ static const NVM_UINT16 MEMORY_CAPABILITY_MEMORYMODE = 0;
 static const NVM_UINT16 MEMORYTYPE_CAPABILITY_APPDIRECTMODE = 2;
 
 static const NVM_UINT16 DEVICE_HEALTH_UNMANAGEABLE = 65534;
+static const NVM_UINT16 DEVICE_HEALTH_NONFUNCTIONAL = 65533;
 
 static const NVM_UINT16 DEVICE_LAST_SHUTDOWN_STATUS_UKNOWN = 0;
 static const NVM_UINT16 DEVICE_LAST_SHUTDOWN_STATUS_FW_FLUSH_COMPLETE = 1;

src/lib/device.c

@@ -268,6 +268,7 @@ int add_firmware_properties_to_device(struct device_discovery *p_device)
 		if ((rc = fw_get_identify_dimm(p_device->device_handle.handle,
 				&id_dimm)) != NVM_SUCCESS)
 		{
+			p_device->manageability = MANAGEMENT_NON_FUNCTIONAL;
 			COMMON_LOG_ERROR_F(
 					"Unable to get identify dimm information for handle: [%d]",
 					p_device->device_handle.handle);
@@ -284,16 +285,6 @@ int add_firmware_properties_to_device(struct device_discovery *p_device)
 		}
 		s_memset(&id_dimm, sizeof (id_dimm));
 	}
-	else
-	{
-		COMMON_LOG_WARN_F("Device with handle %u has a controller or programming interface "
-				"that is not supported."
-				"SubsystemVendorID=%hu, SubsystemDeviceID=%hu, "
-				"first Interface Format Code=%hu",
-				p_device->device_handle.handle,
-				p_device->subsystem_vendor_id, p_device->subsystem_device_id,
-				p_device->interface_format_codes[0]);
-	}
 
 	COMMON_LOG_EXIT_RETURN_I(rc);
 	return rc;
@@ -349,12 +340,31 @@ void add_smbios_properties_to_populated_devices(struct device_discovery *p_devic
 enum manageability_state get_manageability_from_topology(struct nvm_topology *p_topology)
 {
 	COMMON_LOG_ENTRY();
-	enum manageability_state result = MANAGEMENT_INVALIDCONFIG;
-	if (!NFIT_DIMM_STATE_IS_DISABLED(p_topology->state_flags) &&
-		is_device_interface_format_supported(p_topology) &&
-		is_device_subsystem_controller_supported(p_topology))
-	{
-		result = MANAGEMENT_VALIDCONFIG;
+	enum manageability_state result = MANAGEMENT_VALIDCONFIG;
+	if (NFIT_DIMM_STATE_IS_DISABLED(p_topology->state_flags))
+	{
+		result = MANAGEMENT_NON_FUNCTIONAL;
+		COMMON_LOG_WARN_F("NFIT declares device with handle %u is disabled. ",
+			p_topology->device_handle.handle);
+	}
+	else if (!is_device_interface_format_supported(p_topology))
+	{
+		result = MANAGEMENT_INVALIDCONFIG;
+		COMMON_LOG_WARN_F("Device with handle %u programming interface "
+			"that is not supported."
+			"first Interface Format Code=%hu",
+			p_topology->device_handle.handle,
+			p_topology->fmt_interface_codes[0]);
+	}
+	else if (!is_device_subsystem_controller_supported(p_topology))
+	{
+		result = MANAGEMENT_INVALIDCONFIG;
+		COMMON_LOG_WARN_F("Device with handle %u has a controller "
+			"that is not supported."
+			"SubsystemVendorID=%hu, SubsystemDeviceID=%hu, ",
+			p_topology->device_handle.handle,
+			p_topology->subsystem_vendor_id,
+			p_topology->subsystem_device_id);
 	}
 
 	COMMON_LOG_EXIT_RETURN_I(result);

src/lib/nvm_management.h

@@ -128,7 +128,8 @@ enum manageability_state
 {
 	MANAGEMENT_UNKNOWN = 0,  // Device is not recognized or manageability cannot be determined.
 	MANAGEMENT_VALIDCONFIG = 1, // Device is fully manageable.
-	MANAGEMENT_INVALIDCONFIG = 2 // Device is recognized but cannot be managed.
+	MANAGEMENT_INVALIDCONFIG = 2, // Device is recognized but cannot be managed.
+	MANAGEMENT_NON_FUNCTIONAL = 3 // Device is disabled per NFIT
 };
 
 /*