Merge branch 'master' into master

Author: Cozmonat

CPUSensors/CPUSensors.cpp

@@ -604,6 +604,7 @@ bool CPUSensors::start(IOService *provider)
 
                     case CPUID_MODEL_HASWELL_DT:
                     case CPUID_MODEL_BROADWELL_DT:
+                    case CPUID_MODEL_SKYLAKE_X:
                     case CPUID_MODEL_SKYLAKE_DT:
                     case CPUID_MODEL_KABYLAKE_S:
                         if (!platform) platform = OSData::withBytes("j45\0\0\0\0\0", 8); // TODO: got from macbookpro11,2 need to check for other platforms

Shared/cpuid.h

@@ -166,6 +166,7 @@
 #define CPUID_MODEL_BROADWELL_ULV   0x3D
 #define CPUID_MODEL_BROADWELL_MB    0x4f
 #define CPUID_MODEL_SKYLAKE_LT      0x4E
+#define CPUID_MODEL_SKYLAKE_X       0x55  /* Intel® Core™ X-series Processors */
 #define CPUID_MODEL_SKYLAKE_DT		0x5E
 #define CPUID_MODEL_KABYLAKE_U		0x8E
 #define CPUID_MODEL_KABYLAKE_S		0x9E
@@ -697,6 +698,7 @@ cpuid_set_cpufamily(i386_cpu_info_t *info_p)
                     cpufamily = CPUFAMILY_INTEL_BROADWELL;
                     break;
                 case CPUID_MODEL_SKYLAKE_LT:
+                case CPUID_MODEL_SKYLAKE_X:
                 case CPUID_MODEL_SKYLAKE_DT:
                     cpufamily = CPUFAMILY_INTEL_SKYLAKE;
                     break;

SuperIOSensors/LPCSensors-Info.plist

@@ -2979,6 +2979,7 @@
 				<string>Nuvoton,NCT6792D</string>
 				<string>Nuvoton,NCT6793D</string>
 				<string>Nuvoton,NCT6795D</string>
+				<string>Nuvoton,NCT6796D</string>
 			</array>
 			<key>IOProviderClass</key>
 			<string>SuperIODevice</string>

SuperIOSensors/NCT677xSensors.cpp

@@ -107,6 +107,7 @@ float NCT677xSensors::readTemperature(UInt32 index)
             case NCT6792D:
             case NCT6793D:
             case NCT6795D:
+            case NCT6796D:
                 value = readByte(NUVOTON_TEMPERATURE_REG_NEW[index]) << 1;
                 break;
         }
@@ -137,6 +138,7 @@ float NCT677xSensors::readVoltage(UInt32 index)
             case NCT6792D:
             case NCT6793D:
             case NCT6795D:
+            case NCT6796D:
                 value = readByte(NUVOTON_VOLTAGE_REG_NEW[index]) * NUVOTON_VOLTAGE_SCALE[index] * 0.001f;
                 break;
         }
@@ -269,6 +271,7 @@ bool NCT677xSensors::initialize()
         case NCT6792D:
         case NCT6793D:
         case NCT6795D:
+        case NCT6796D:
             fanLimit = 6;
             tempLimit = 7;
             voltLimit = 15;
@@ -292,7 +295,8 @@ void NCT677xSensors::hasPoweredOn()
         case NCT6791D:
         case NCT6792D:
         case NCT6793D:
-        case NCT6795D: {
+        case NCT6795D: 
+        case NCT6796D: {
             // disable the hardware monitor i/o space lock on NCT679xD chips
             winbond_family_enter(port);
 

SuperIOSensors/SuperIODevice.cpp

@@ -194,6 +194,16 @@ bool SuperIODevice::detectWinbondFamilyChip()
                                 vendor = "Nuvoton";
                                 break;
                         } break;
+                    
+                    case 0xD4:
+                        switch (id & 0xff) {
+                            case 0x23:
+                                model = NCT6796D;
+
+                                ldn = kWinbondHardwareMonitorLDN;
+                                vendor = "Nuvoton";
+                                break;
+                        } break;
 
                 } break;
         }

SuperIOSensors/SuperIODevice.h

@@ -81,7 +81,8 @@ enum SuperIOModel
     NCT6791D    = 0xC803,
     NCT6792D    = 0xC911,
     NCT6793D    = 0xD121,
-    NCT6795D    = 0xD352
+    NCT6795D    = 0xD352,
+    NCT6796D    = 0xD423,
 };
 
 inline UInt8 superio_listen_port_byte(i386_ioport_t port, UInt8 reg)
@@ -184,6 +185,7 @@ inline const char* superio_get_model_name(UInt16 model)
         case NCT6792D:      return "NCT6792D";
         case NCT6793D:      return "NCT6793D";
         case NCT6795D:      return "NCT6795D";
+        case NCT6796D:      return "NCT6796D";
     }
 
     return "unknown";