Add NumBoostStates and NbPstate handling

Author: AYuusuke

amdctl.c

@@ -114,6 +114,10 @@ static unsigned char       COFVID_MAX_VID          =  1;
 static unsigned char       COFVID_MIN_VID          =  128;
 static signed short        MAIN_PLL_COFF           = -1;
 
+static char *CPU_NBPST_BITS = NULL;
+static char *CPBC_NUM_BOOST_STATES_BITS = NULL;
+static signed char nbPst = -1, maxNbPst = -1;
+
 static uint64_t buffer;
 static unsigned char currentOnly = 0, debug = 0, DIDS = 5, quiet = 0, PSTATES = 8, pvi = 0, testMode = 0;
 static signed char cpuDid = -1, togglePs = -1;
@@ -259,6 +263,28 @@ void checkFamily() {
 			fprintf(stderr, "Your CPU is not supported by amdctl (Family %xh ; Model %xh).\n", cpuFamily, cpuModel);
 			exit(EXIT_FAILURE);
 	}
+	switch (cpuFamily) {
+		case AMD10H:
+			CPBC_NUM_BOOST_STATES_BITS = "2:2";
+			break;
+		case AMD12H:
+		case AMD14H:
+		case AMD15H:
+		case AMD16H:
+			CPBC_NUM_BOOST_STATES_BITS = "4:2";
+			break;
+		default:
+			break;
+	}
+	switch (cpuFamily) {
+		case AMD15H:
+		case AMD16H:
+			CPU_NBPST_BITS = "22:22";
+			maxNbPst = 1;
+			break;
+		default:
+			break;
+	}
 }
 
 /**
@@ -315,7 +341,15 @@ void parseOpts(const int argc, char **argv) {
 			case 'm': // Kernel >= 5.9, check / set /sys/module/msr/parameters/allow_writes to on.
 				allowWrites = 1;
 				break;
-			case 'n': // Northbridge vid to set.
+			case 'n': // Northbridge vid/pstate to set.
+				if (CPU_NBPST_BITS) {
+					nbPst = atoi(optarg);
+					if (nbPst < 0 || nbPst > maxNbPst) {
+						fprintf(stderr, "ERROR: Option -n must be between 0 and %d.\n", maxNbPst);
+						exit(EXIT_FAILURE);
+					}
+					break;
+				}
 				if (cpuFamily > AMD11H) {
 					error("Currently amdctl can only change the NB vid on 10h and 11h CPU's.");
 				}
@@ -414,6 +448,8 @@ void usage() {
 	printf("    -v    Set CPU voltage id (vid).\n");
 	if (cpuFamily == AMD10H || cpuFamily == AMD11H) {
 		printf("    -n    Set north bridge voltage id (vid).\n");
+	} else if (CPU_NBPST_BITS) {
+		printf("    -n    Set north bridge P-State.\n");
 	}
 	if (cpuFamily == AMD14H) {
 		printf("    -d    Set the CPU divisor ID most significant digit (CpuDidMSD).\n");
@@ -460,6 +496,7 @@ void fieldDescriptions() {
 	printf("CpuVolt:     Core voltage, in millivolts.\n");
 	printf("NbVid:       North bridge voltage ID.\n");
 	printf("NbVolt:      North bridge voltage, in millivolts.\n");
+	printf("NbPst:       North bridge P-State. (lower numbers mean higher performance).\n");
 	printf("IddVal:      Core current (intensity) ID. Used to calculate cpu current draw and power draw.\n");
 	printf("IddDiv       Core current (intensity) dividor.\n");
 	printf("CpuCurr:     The cpu current draw, in amps.\n");
@@ -522,8 +559,7 @@ void uwmsrCheck(const unsigned char allowWrites) {
  */
 void wrCpuStates() {
 	uint32_t tmp_pstates[PSTATES];
-	unsigned char pstates_count = 0;
-	unsigned char extra = 1;
+	unsigned char pstates_count = 0, bstates = 0;
 	if (pstate == -1) {
 		for (; pstates_count < PSTATES; pstates_count++) {
 			tmp_pstates[pstates_count] = (MSR_PSTATE_BASE + pstates_count);
@@ -532,49 +568,28 @@ void wrCpuStates() {
 		tmp_pstates[0] = MSR_PSTATE_BASE + pstate;
 		pstates_count = 1;
 	}
+	if (CPBC_NUM_BOOST_STATES_BITS) {
+		rwPciReg("18.4", 0x15c, 1);
+		bstates = getDec(CPBC_NUM_BOOST_STATES_BITS);
+	}
 
 	for (; core < cores; core++) {
 		rwMsrReg(MSR_PSTATE_CURRENT_LIMIT, 1);
-		int i, curPstate = getDec(CUR_PSTATE_BITS), minPstate = getDec(PSTATE_MAX_VAL_BITS), maxPstate = getDec(CUR_PSTATE_LIMIT_BITS);
-		switch (cpuFamily) {
-			case AMD10H:
-				if (cpuModel == 0x05) {
-					extra = 0;
-				}
-				break;
-			case AMD14H:
-				if (cpuModel == 0x02) {
-					extra = 0;
-				}
-				break;
-			case AMD16H:
-				if (cpuModel == 0x30) {
-					extra = 2;
-				}
-				break;
-			case AMD17H:
-			case AMD19H:
-				extra = 0;
-				break;
-			default:
-				break;
-		}
-		curPstate += extra;
-		minPstate += extra;
-		maxPstate += extra;
+		int i, curPstate, minPstate = bstates + getDec(PSTATE_MAX_VAL_BITS), maxPstate = bstates + getDec(CUR_PSTATE_LIMIT_BITS);
 		rwMsrReg(MSR_PSTATE_STATUS, 1);
+		curPstate = bstates + getDec(CUR_PSTATE_BITS);
 		if (!quiet) {
 			printf("\nCore %d | P-State Limits (non-turbo): Highest: %d ; Lowest %d | Current P-State: %d\n", core, maxPstate, minPstate, curPstate);
 			printf(" Pstate Status CpuFid CpuDid CpuVid  CpuMult     CpuFreq CpuVolt IddVal IddDiv CpuCurr CpuPower");
-			printf("%s\n", (cpuFamily == AMD10H || cpuFamily == AMD11H) ? " NbVid NbVolt" : "");
+			printf("%s\n", (cpuFamily == AMD10H || cpuFamily == AMD11H) ? " NbVid NbVolt" : (CPU_NBPST_BITS ? " NbPst" : ""));
 		}
 		if (!currentOnly) {
 			for (i = 0; i < pstates_count; i++) {
 				if (!quiet) {
 					printf("%7d", (pstate >= 0 ? pstate : i));
 				}
 				rwMsrReg(tmp_pstates[i], 1);
-				if (nbVid > -1 || cpuVid > -1 || cpuFid > -1 || cpuDid > -1 || togglePs > -1) {
+				if (nbVid > -1 || cpuVid > -1 || cpuFid > -1 || cpuDid > -1 || togglePs > -1 || nbPst > -1) {
 					if (togglePs > -1) {
 						updateBuffer(PSTATE_EN_BITS, togglePs);
 					}
@@ -590,6 +605,9 @@ void wrCpuStates() {
 					if (cpuDid > -1) {
 						updateBuffer(CPU_DID_BITS, cpuDid);
 					}
+					if (nbPst > -1) {
+						updateBuffer(CPU_NBPST_BITS, nbPst);
+					}
 					rwMsrReg(tmp_pstates[i], 0);
 				}
 				printCpuPstate(1);
@@ -662,6 +680,13 @@ void printCpuPstate(const unsigned char idd) {
 				printf("%7s%7s%8s%9s", "", "", "", "");
 			}
 			printf("%6d%5dmV", NbVid, vidTomV(NbVid));
+		} else if (CPU_NBPST_BITS) {
+			if (!idd) {
+				printf("%7s%7s%8s%9s%6s", "", "", "", "", "");
+			} else {
+				const int NbPst = getDec(CPU_NBPST_BITS);
+				printf("%6d", NbPst);
+			}
 		}
 		printf("\n");
 	}
@@ -891,7 +916,7 @@ unsigned short vidTomV(const unsigned short vid) {
 
 	// https://github.com/mpollice/AmdMsrTweaker/blob/master/Info.cpp#L47
 	if ((cpuFamily == AMD15H && ((cpuModel > 0x0f && cpuModel < 0x20) || (cpuModel > 0x2f && cpuModel < 0x40))) ||
-		(cpuFamily == AMD16H && cpuModel == 0x30) ||
+		cpuFamily == AMD16H ||
 		cpuFamily == AMD17H ||
 		cpuFamily == AMD19H) {
 		return (MAX_VOLTAGE - (vid * VID_DIVIDOR3));