CPU nominal TDP

Author: a1ive

libnw/cpu/amd_cpu.c

@@ -614,6 +614,25 @@ static int get_microcode_ver(struct msr_info_t* info)
 	return 0;
 }
 
+#define F17H_ZEN2_MCM_TDP        0x0005D2B8 // [11:3]
+
+static int get_tdp_nominal(struct msr_info_t* info)
+{
+#if 0
+	int ret = CPU_INVALID_VALUE;
+	WR0_WaitPciBus(10);
+	if (info->id->x86.ext_family < 0x17)
+		goto fail;
+	DWORD raw_tdp = WR0_RdAmdSmn(info->handle, WR0_SMN_AMD17H, F17H_ZEN2_MCM_TDP);
+	ret = (int)((raw_tdp >> 3) & 0x1FF);
+fail:
+	WR0_ReleasePciBus();
+	return ret;
+#else
+	return CPU_INVALID_VALUE;
+#endif
+}
+
 struct msr_fn_t msr_fn_amd =
 {
 	.get_min_multiplier = get_min_multiplier,
@@ -629,4 +648,5 @@ struct msr_fn_t msr_fn_amd =
 	.get_igpu_temperature = get_igpu_temperature,
 	.get_igpu_energy = get_igpu_energy,
 	.get_microcode_ver = get_microcode_ver,
+	.get_tdp_nominal = get_tdp_nominal,
 };

libnw/cpu/centaur_cpu.c

@@ -160,6 +160,11 @@ static int get_microcode_ver(struct msr_info_t* info)
 	return 0;
 }
 
+static int get_tdp_nominal(struct msr_info_t* info)
+{
+	return CPU_INVALID_VALUE;
+}
+
 struct msr_fn_t msr_fn_centaur =
 {
 	.get_min_multiplier = get_min_multiplier,
@@ -175,4 +180,5 @@ struct msr_fn_t msr_fn_centaur =
 	.get_igpu_temperature = get_igpu_temperature,
 	.get_igpu_energy = get_igpu_energy,
 	.get_microcode_ver = get_microcode_ver,
+	.get_tdp_nominal = get_tdp_nominal,
 };

libnw/cpu/intel_cpu.c

@@ -23,6 +23,8 @@
 #define MSR_IA32_BIOS_SIGN_ID  0x8B
 #define MSR_FSB_FREQ           0xCD
 
+#define MSR_PKG_POWER_INFO     0x614
+
 static inline int
 read_intel_msr(struct wr0_drv_t* handle, uint32_t msr_index, uint8_t highbit, uint8_t lowbit, uint64_t* result)
 {
@@ -271,6 +273,18 @@ static int get_microcode_ver(struct msr_info_t* info)
 	return 0;
 }
 
+static int get_tdp_nominal(struct msr_info_t* info)
+{
+	uint64_t raw_tdp, pu;
+	if (read_intel_msr(info->handle, MSR_PKG_POWER_INFO, 14, 0, &raw_tdp))
+		goto fail;
+	if (read_intel_msr(info->handle, MSR_RAPL_POWER_UNIT, 3, 0, &pu))
+		goto fail;
+	return (int)raw_tdp / (1ULL << pu);
+fail:
+	return CPU_INVALID_VALUE;
+}
+
 struct msr_fn_t msr_fn_intel =
 {
 	.get_min_multiplier = get_min_multiplier,
@@ -286,4 +300,5 @@ struct msr_fn_t msr_fn_intel =
 	.get_igpu_temperature = get_igpu_temperature,
 	.get_igpu_energy = get_igpu_energy,
 	.get_microcode_ver = get_microcode_ver,
+	.get_tdp_nominal = get_tdp_nominal,
 };

libnw/cpu/rdmsr.c

@@ -139,6 +139,9 @@ int cpu_msrinfo(struct wr0_drv_t* handle, logical_cpu_t cpu, cpu_msrinfo_request
 		case INFO_MICROCODE_VER:
 			ret = (int) (fn->get_microcode_ver(&info));
 			break;
+		case INFO_TDP_NOMINAL:
+			ret = (int) fn->get_tdp_nominal(&info);
+			break;
 	}
 	// Restore AffinityMask
 	SetThreadGroupAffinity(thread, &saved_aff, NULL);

libnw/cpu/rdmsr.h

@@ -40,6 +40,7 @@ typedef enum
 	INFO_IGPU_ENERGY,          /*!< The current integrated GPU energy consumption in Joules,
 									multiplied by 100. */
 	INFO_MICROCODE_VER,        /*!< The microcode revision number */
+	INFO_TDP_NOMINAL,          /*!< The TDP in Watts. */
 } cpu_msrinfo_request_t;
 
 /**
@@ -74,6 +75,7 @@ struct msr_fn_t
 	int (*get_igpu_temperature)(struct msr_info_t* info);
 	double (*get_igpu_energy)(struct msr_info_t* info);
 	int (*get_microcode_ver)(struct msr_info_t* info);
+	int (*get_tdp_nominal)(struct msr_info_t* info);
 };
 
 struct msr_info_t