From cd4eb5b5948e4a455b3255aa28f91aef3533b05f Mon Sep 17 00:00:00 2001
From: Nigel Stewart <nigels@nigels.com>
Date: Sat, 17 May 2025 17:38:49 +1000
Subject: [PATCH] KingstonFuryDRAMControllerDetect: Additional logging
 information and refinements

---
 .../KingstonFuryDRAMControllerDetect.cpp      | 44 ++++++++++++++++---
 1 file changed, 37 insertions(+), 7 deletions(-)

diff --git a/Controllers/KingstonFuryDRAMController/KingstonFuryDRAMControllerDetect.cpp b/Controllers/KingstonFuryDRAMController/KingstonFuryDRAMControllerDetect.cpp
index 28545c1cc..1c5ef6ba0 100644
--- a/Controllers/KingstonFuryDRAMController/KingstonFuryDRAMControllerDetect.cpp
+++ b/Controllers/KingstonFuryDRAMController/KingstonFuryDRAMControllerDetect.cpp
@@ -47,8 +47,8 @@ TestResult TestForFurySignature(i2c_smbus_interface *bus, unsigned int slot_addr
     char test_str[] = "FURY";
     int res;
 
-    LOG_DEBUG("[%s] looking at 0x%02X",
-              FURY_CONTROLLER_NAME, slot_addr);
+    LOG_DEBUG("[%s] looking at bus %d address 0x%02X",
+              FURY_CONTROLLER_NAME, bus->bus_id, slot_addr);
 
     // Start transaction
     res = bus->i2c_smbus_write_byte_data(slot_addr, FURY_REG_APPLY, FURY_BEGIN_TRNSFER);
@@ -60,7 +60,7 @@ TestResult TestForFurySignature(i2c_smbus_interface *bus, unsigned int slot_addr
     }
 
     std::this_thread::sleep_for(FURY_DELAY);
-    LOG_DEBUG("[%s] %02X beginning transaction; res=%02X",
+    LOG_DEBUG("[%s] 0x%02X beginning transaction; res=0x%02X",
               FURY_CONTROLLER_NAME, slot_addr, res);
 
     // Read and check the signature
@@ -70,7 +70,7 @@ TestResult TestForFurySignature(i2c_smbus_interface *bus, unsigned int slot_addr
         {
             res = bus->i2c_smbus_read_word_data(slot_addr, i);
             std::this_thread::sleep_for(FURY_DELAY);
-            LOG_DEBUG("[%s] Testing address %02X register %02X, res=%04X",
+            LOG_DEBUG("[%s] Testing address 0x%02X register 0x%02X, res=0x%04X",
                       FURY_CONTROLLER_NAME, slot_addr, i, res);
             // retry when there is an error or the returned value is 0xFFFF
             if((res >= 0) && (res < 0xFFFF))
@@ -84,6 +84,8 @@ TestResult TestForFurySignature(i2c_smbus_interface *bus, unsigned int slot_addr
         }
 
         char shifted = (res >> 8) & 0xFF;
+        LOG_DEBUG("[%s] Matching 0x%02X to 0x%02X: %c",
+                  FURY_CONTROLLER_NAME, shifted, test_str[i-1], test_str[i-1]);
         if(shifted != test_str[i-1])
         {
             passed = false;
@@ -97,7 +99,7 @@ TestResult TestForFurySignature(i2c_smbus_interface *bus, unsigned int slot_addr
         res = bus->i2c_smbus_read_word_data(slot_addr, FURY_REG_MODEL);
         int model_code = res >> 8;
         std::this_thread::sleep_for(FURY_DELAY);
-        LOG_DEBUG("[%s] Reading model code at address %02X register %02X, res=%02X",
+        LOG_DEBUG("[%s] Reading model code at address 0x%02X register 0x%02X, res=0x%02X",
                   FURY_CONTROLLER_NAME, slot_addr, FURY_REG_MODEL, res);
 
         if(!modelChecker(model_code))
@@ -105,6 +107,29 @@ TestResult TestForFurySignature(i2c_smbus_interface *bus, unsigned int slot_addr
             LOG_INFO("[%s] Unknown model code 0x%02X", FURY_CONTROLLER_NAME, model_code);
             passed = false;
         }
+        else
+        {
+            switch(model_code)
+            {
+                case FURY_MODEL_BEAST_DDR5:
+                    LOG_INFO("[%s] Recognized FURY_MODEL_BEAST_DDR5 at address 0x%02X", FURY_CONTROLLER_NAME, slot_addr);
+                    break;
+                case FURY_MODEL_RENEGADE_DDR5:
+                    LOG_INFO("[%s] Recognized FURY_MODEL_RENEGADE_DDR5 at address 0x%02X", FURY_CONTROLLER_NAME, slot_addr);
+                    break;
+                case FURY_MODEL_BEAST_RGB_WHITE_DDR5:
+                    LOG_INFO("[%s] Recognized FURY_MODEL_BEAST_RGB_WHITE_DDR5 at address 0x%02X", FURY_CONTROLLER_NAME, slot_addr);
+                    break;
+                case FURY_MODEL_BEAST_WHITE_DDR4:
+                    LOG_INFO("[%s] Recognized FURY_MODEL_BEAST_WHITE_DDR4 at address 0x%02X", FURY_CONTROLLER_NAME, slot_addr);
+                    break;
+                case FURY_MODEL_BEAST_DDR4:
+                    LOG_INFO("[%s] Recognized FURY_MODEL_BEAST_DDR4 at address 0x%02X", FURY_CONTROLLER_NAME, slot_addr);
+                    break;
+                default:
+                    break;
+            }
+        }
     }
 
     // Close transaction
@@ -114,7 +139,7 @@ TestResult TestForFurySignature(i2c_smbus_interface *bus, unsigned int slot_addr
         return RESULT_ERROR;
     }
     std::this_thread::sleep_for(FURY_DELAY);
-    LOG_DEBUG("[%s] %02X ending transaction; res=%02X",
+    LOG_DEBUG("[%s] 0x%02X ending transaction; res=0x%02X",
               FURY_CONTROLLER_NAME, slot_addr, res);
 
     return passed ? RESULT_PASS : RESULT_FAIL;
@@ -148,10 +173,15 @@ void DetectKingstonFuryDRAMControllers(i2c_smbus_interface* bus, std::vector<SPD
         // RAM module successfully detected in the slot 'slot_index'
         if(result == RESULT_PASS)
         {
-            LOG_DEBUG("[%s] detected at slot index %d",
+            LOG_DEBUG("[%s] detected at slot index 0x%02x",
                       FURY_CONTROLLER_NAME, slot->index());
             fury_slots.push_back(slot->index());
         }
+        else
+        {
+            LOG_DEBUG("[%s] not detected at slot index 0x%02x",
+                      FURY_CONTROLLER_NAME, slot->index());
+        }
     }
 }