[AMD][Ryzen 5 6600H] Found voltage VID @ SMU 0x6f010 and 0x6f014

Author: cyring

amd_reg.h

@@ -1905,6 +1905,10 @@ typedef union
 	#define SMU_AMD_F17_60H_SVI(_plane)	(0x0006f038 + (_plane << 2))
 #endif
 
+#ifndef SMU_AMD_RMB_SVI
+	#define SMU_AMD_RMB_SVI(_plane) 	(0x0006f010 + (_plane << 2))
+#endif
+
 typedef union
 {/*		--- SMU SVI [ 0x5a00c ; 0x5a010 ; 0x5a014 ; 0x6f038] ---
  *				[ CPU addr]	[ SoC addr]
@@ -1926,6 +1930,21 @@ typedef union
 	};
 } AMD_17_SVI;
 
+typedef union
+{/*				--- SMU SVI [ Rembrandt ] ---
+ *				[ CPU addr]	[ SoC addr]
+ * ZEN3(+) [AF_44]		[ 0x6f010 ]	[ 0x6f014 ]
+ */
+	unsigned int		value;
+	struct {
+		unsigned int
+		SVI0		:  8-0,
+		SVI1		: 16-8,
+		SVI2		: 24-16,
+		SVI3		: 32-24;
+	};
+} AMD_RMB_SVI;
+
 #ifndef SMU_AMD_F17H_CORE_VID
 	#define SMU_AMD_F17H_CORE_VID(_mod)	(0x0005a04c + (_mod << 2))
 #endif

corefreqd.c

@@ -7454,6 +7454,17 @@ static void Pkg_ComputeVoltage_AMD_17h(struct PKG_FLIP_FLOP *PFlip)
 			PFlip->Voltage.VID.SOC);
 }
 
+static void Pkg_ComputeVoltage_AMD_RMB(struct PKG_FLIP_FLOP *PFlip)
+{
+	COMPUTE_VOLTAGE(AMD_RMB,
+			PFlip->Voltage.CPU,
+			PFlip->Voltage.VID.CPU);
+
+	COMPUTE_VOLTAGE(AMD_RMB,
+			PFlip->Voltage.SOC,
+			PFlip->Voltage.VID.SOC);
+}
+
 static void Pkg_ComputeVoltage_Winbond_IO(struct PKG_FLIP_FLOP *PFlip)
 {	/* Winbond W83627EHF/EF, W83627EHG,EG				*/
 	COMPUTE_VOLTAGE(WINBOND_IO,
@@ -7603,6 +7614,9 @@ REASON_CODE Core_Manager(REF *Ref)
 	case VOLTAGE_KIND_AMD_17h:
 		Pkg_ComputeVoltageFormula = Pkg_ComputeVoltage_AMD_17h;
 		break;
+	case VOLTAGE_KIND_AMD_RMB:
+		Pkg_ComputeVoltageFormula = Pkg_ComputeVoltage_AMD_RMB;
+		break;
 	case VOLTAGE_KIND_WINBOND_IO:
 		Pkg_ComputeVoltageFormula = Pkg_ComputeVoltage_Winbond_IO;
 		break;

corefreqk.c

@@ -17689,6 +17689,24 @@ static void Call_SVI_APU(const unsigned int plane0, const unsigned int plane1,
 	SoC_RAPL(SVI, factor);
 }
 
+static void Call_SVI_RMB(const unsigned int plane0, const unsigned int plane1,
+			const unsigned long long factor)
+{
+	AMD_RMB_SVI SVI = {.value = 0};
+
+	Core_AMD_SMN_Read(	SVI,
+				SMU_AMD_RMB_SVI(plane0),
+				PRIVATE(OF(Zen)).Device.DF );
+
+	PUBLIC(RO(Proc))->PowerThermal.VID.CPU = SVI.SVI1;
+
+	Core_AMD_SMN_Read(	SVI,
+				SMU_AMD_RMB_SVI(plane1),
+				PRIVATE(OF(Zen)).Device.DF );
+
+	PUBLIC(RO(Proc))->PowerThermal.VID.SOC = SVI.SVI1;
+}
+
 static void Call_DFLT(	const unsigned int plane0, const unsigned int plane1,
 			const unsigned long long factor )
 {
@@ -17741,6 +17759,10 @@ static enum hrtimer_restart Cycle_AMD_F17h_Zen2_APU(struct hrtimer *pTimer)
 {
 	return Entry_AMD_F17h(pTimer, Call_SVI_APU, 0, 1, 294300LLU);
 }
+static enum hrtimer_restart Cycle_AMD_Zen3Plus_RMB(struct hrtimer *pTimer)
+{
+	return Entry_AMD_F17h(pTimer, Call_SVI_RMB, 0, 1, 294300LLU);
+}
 static enum hrtimer_restart Cycle_AMD_F17h(struct hrtimer *pTimer)
 {
 	return Entry_AMD_F17h(pTimer, Call_DFLT, 0, 0, 0LLU);
@@ -17771,6 +17793,11 @@ static void InitTimer_AMD_F17h_Zen2_APU(unsigned int cpu)
 	smp_call_function_single(cpu, InitTimer, Cycle_AMD_F17h_Zen2_APU, 1);
 }
 
+static void InitTimer_AMD_Zen3Plus_RMB(unsigned int cpu)
+{
+	smp_call_function_single(cpu, InitTimer, Cycle_AMD_Zen3Plus_RMB, 1);
+}
+
 static void Start_AMD_Family_17h(void *arg)
 {
 	unsigned int cpu = smp_processor_id();

corefreqk.h

@@ -1661,6 +1661,7 @@ static void InitTimer_AMD_F17h_Zen(unsigned int cpu) ;
 static void InitTimer_AMD_F17h_Zen2_SP(unsigned int cpu) ;
 static void InitTimer_AMD_F17h_Zen2_MP(unsigned int cpu) ;
 static void InitTimer_AMD_F17h_Zen2_APU(unsigned int cpu) ;
+static void InitTimer_AMD_Zen3Plus_RMB(unsigned int cpu) ;
 static void Start_Uncore_AMD_Family_17h(void *arg) ;
 static void Stop_Uncore_AMD_Family_17h(void *arg) ;
 
@@ -9584,7 +9585,7 @@ static ARCH Arch[ARCHITECTURES] = {
 	.Start = Start_AMD_Family_19h,
 	.Stop = Stop_AMD_Family_19h,
 	.Exit = Exit_AMD_F19h,
-	.Timer = InitTimer_AMD_F19h_Zen3_APU,
+	.Timer = InitTimer_AMD_Zen3Plus_RMB,
 	.BaseClock = BaseClock_AMD_Family_19h,
 	.ClockMod = ClockMod_AMD_Zen,
 	.TurboClock = TurboClock_AMD_Zen,