Merge remote-tracking branch 'lib/master' into dev

# Conflicts:
#	Hardware/Controller/Razer/RazerGroup.cs
#	Hardware/Memory/MemoryGroup.cs
#	LibreHardwareMonitorLib.csproj
#	Hardware/Memory/DimmMemory.cs
#	Hardware/Memory/GenericLinuxMemory.cs
#	Hardware/Memory/MemoryLinux.cs
#	Hardware/Memory/MemoryWindows.cs
#	Hardware/Memory/Sensors/SpdThermalSensor.cs
#	Hardware/Memory/TotalMemory.cs
#	Hardware/Memory/VirtualMemory.cs
#	Hardware/RAMSPDToolkitDriver.cs
#	Hardware/Ring0.cs
#	Interop/Ring0.cs

Author: sergiye

OpenHardwareMonitorLib/Hardware/Memory/DimmMemory.cs

@@ -0,0 +1,58 @@
+using OpenHardwareMonitor.Hardware.Memory.Sensors;
+using RAMSPDToolkit.SPD;
+using RAMSPDToolkit.SPD.Enums;
+using RAMSPDToolkit.SPD.Interfaces;
+using RAMSPDToolkit.SPD.Interop.Shared;
+
+namespace OpenHardwareMonitor.Hardware.Memory;
+
+internal sealed class DimmMemory : Hardware
+{
+    private readonly SpdThermalSensor _thermalSensor;
+
+    public DimmMemory(SPDAccessor accessor, string name, Identifier identifier, ISettings settings)
+        : base(name, identifier, settings)
+    {
+        //Check which kind of RAM we have
+        switch (accessor.MemoryType())
+        {
+            case SPDMemoryType.SPD_DDR4_SDRAM:
+            case SPDMemoryType.SPD_DDR4E_SDRAM:
+            case SPDMemoryType.SPD_LPDDR4_SDRAM:
+            case SPDMemoryType.SPD_LPDDR4X_SDRAM:
+                _thermalSensor = new SpdThermalSensor($"DIMM #{accessor.Index}",
+                                                      accessor.Index,
+                                                      SensorType.Temperature,
+                                                      this,
+                                                      settings,
+                                                      accessor as IThermalSensor);
+
+                break;
+            case SPDMemoryType.SPD_DDR5_SDRAM:
+            case SPDMemoryType.SPD_LPDDR5_SDRAM:
+                //Check if we are on correct page or if write protection is not enabled
+                if (accessor.PageData.HasFlag(PageData.ThermalData) || !accessor.HasSPDWriteProtection)
+                {
+                    _thermalSensor = new SpdThermalSensor($"DIMM #{accessor.Index}",
+                                                          accessor.Index,
+                                                          SensorType.Temperature,
+                                                          this,
+                                                          settings,
+                                                          accessor as IThermalSensor);
+                }
+
+                break;
+        }
+
+        //Add thermal sensor
+        if (_thermalSensor != null)
+            ActivateSensor(_thermalSensor);
+    }
+
+    public override HardwareType HardwareType => HardwareType.Memory;
+
+    public override void Update()
+    {
+        _thermalSensor?.UpdateSensor();
+    }
+}

OpenHardwareMonitorLib/Hardware/Memory/GenericLinuxMemory.cs

@@ -1,14 +1,68 @@
 using System.Collections.Generic;
+using System.Timers;
+using RAMSPDToolkit.I2CSMBus;
+using RAMSPDToolkit.SPD;
+using RAMSPDToolkit.SPD.Enums;
+using RAMSPDToolkit.SPD.Interfaces;
+using RAMSPDToolkit.SPD.Interop.Shared;
+using RAMSPDToolkit.Windows.Driver;
 
 namespace OpenHardwareMonitor.Hardware.Memory;
 
 internal class MemoryGroup : IGroup
 {
-    private readonly Hardware[] _hardware;
+    //Retry 12x
+    private const int RetryCount = 12;
+
+    //Retry every 2.5 seconds
+    private const double RetryTime = 2500;
+    private static readonly object _lock = new();
+
+    private readonly List<Hardware> _hardware = [];
+    private int _elapsedCounter;
+
+    private Timer _timer;
+
+    static MemoryGroup()
+    {
+        if (Ring0.IsOpen)
+        {
+            //Assign implementation of IDriver
+            DriverManager.Driver = new RAMSPDToolkitDriver(Ring0.KernelDriver);
+            SMBusManager.UseWMI = false;
+        }
+    }
 
     public MemoryGroup(ISettings settings)
     {
-        _hardware = [OperatingSystemHelper.IsUnix ? new GenericLinuxMemory("Memory", settings) : new GenericWindowsMemory("Memory", settings)];
+        _hardware.Add(new VirtualMemory(settings));
+        _hardware.Add(new TotalMemory(settings));
+
+        //No RAM detected
+        if (!DetectThermalSensors(out List<SPDAccessor> accessors))
+        {
+            //Retry a couple of times
+            //SMBus might not be detected right after boot
+            _timer = new Timer(RetryTime);
+
+            _timer.Elapsed += (_, _) =>
+            {
+                if (_elapsedCounter++ >= RetryCount || DetectThermalSensors(out accessors))
+                {
+                    _timer.Stop();
+                    _timer = null;
+
+                    if (accessors != null)
+                        AddDimms(accessors, settings);
+                }
+            };
+
+            _timer.Start();
+        }
+        else
+        {
+            AddDimms(accessors, settings);
+        }
     }
 
     public string GetReport()
@@ -23,4 +77,59 @@ public void Close()
         foreach (Hardware ram in _hardware)
             ram.Close();
     }
+
+    private static bool DetectThermalSensors(out List<SPDAccessor> accessors)
+    {
+        lock (_lock)
+        {
+            var list = new List<SPDAccessor>();
+
+            bool ramDetected = false;
+
+            SMBusManager.DetectSMBuses();
+
+            //Go through detected SMBuses
+            foreach (var smbus in SMBusManager.RegisteredSMBuses)
+            {
+                //Go through possible RAM slots
+                for (byte i = SPDConstants.SPD_BEGIN; i <= SPDConstants.SPD_END; ++i)
+                {
+                    //Detect type of RAM, if available
+                    var detector = new SPDDetector(smbus, i);
+
+                    //RAM available and detected
+                    if (detector.Accessor != null)
+                    {
+                        //We are only interested in modules with thermal sensor
+                        if (detector.Accessor is IThermalSensor { HasThermalSensor: true })
+                            list.Add(detector.Accessor);
+
+                        ramDetected = true;
+                    }
+                }
+            }
+
+            accessors = list.Count > 0 ? list : [];
+            return ramDetected;
+        }
+    }
+
+    private void AddDimms(List<SPDAccessor> accessors, ISettings settings)
+    {
+        foreach (var ram in accessors)
+        {
+            //Default value
+            string name = $"DIMM #{ram.Index}";
+
+            //Check if we can switch to the correct page
+            if (ram.ChangePage(PageData.ModulePartNumber))
+            {
+                name = $"{ram.GetModuleManufacturerString()} - {ram.ModulePartNumber()} (#{ram.Index})";
+            }
+
+            var memory = new DimmMemory(ram, name, new Identifier("ram"), settings);
+
+            _hardware.Add(memory);
+        }
+    }
 }