[AMD][EPYC][Rome] Attempt to detect unusual CCD topology

Author: cyring

x86_64/corefreqk.c

@@ -2344,7 +2344,18 @@ static void Map_AMD_Topology(void *arg)
 	      switch (PUBLIC(RO(Proc))->ArchID) {
 	      case AMD_EPYC_Rome_CPK:
 		switch (leaf80000008.ECX.NC) {
+		case 0x5f:
 		case 0x2f:
+		  if (!strncmp(PUBLIC(RO(Proc))->Architecture,
+		      Arch[PUBLIC(RO(Proc))->ArchID].Architecture[CN_ROME_75_2],
+			CODENAME_LEN)
+		   || !strncmp(PUBLIC(RO(Proc))->Architecture,
+		      Arch[PUBLIC(RO(Proc))->ArchID].Architecture[CN_ROME_7K_2],
+			CODENAME_LEN))
+		  {
+			ApicID_SHR = 5;
+		  }
+			fallthrough;
 		case 0x17: /* Type[4:EPYC Rome; 7:ThreadRipper Castle Peak] */
 		case 0x0b:
 		    ApicID_SHL = \

x86_64/corefreqk.h

@@ -3698,7 +3698,9 @@ enum {
 enum {
 	CN_ROME,
 	CN_CASTLE_PEAK,
-	CN_ROME_7F_2
+	CN_ROME_7F_2,
+	CN_ROME_75_2,
+	CN_ROME_7K_2
 };
 enum {
 	CN_RENOIR,
@@ -3836,7 +3838,9 @@ static char *Arch_AMD_Zen_Dali[] = ZLIST(
 static char *Arch_AMD_EPYC_Rome_CPK[] = ZLIST(
 		[CN_ROME]		=	"Zen2/EPYC/Rome",
 		[CN_CASTLE_PEAK]	=	"Zen2/Castle Peak",
-		[CN_ROME_7F_2]		=	"Zen2/EPYC/Rome/7Fx2"
+		[CN_ROME_7F_2]		=	"Zen2/EPYC/Rome/7Fx2",
+		[CN_ROME_75_2]		=	"Zen2/EPYC/Rome/75x2",
+		[CN_ROME_7K_2]		=	"Zen2/EPYC/Rome/7Kx2"
 );
 static char *Arch_AMD_Zen2_Renoir[] = ZLIST(
 		[CN_RENOIR]		=	"Zen2/Renoir",
@@ -6266,7 +6270,7 @@ static PROCESSOR_SPECIFIC AMD_EPYC_Rome_CPK_Specific[] = {
 			"AMD EPYC 7552" 		),
 	.Boost = {+11, 0},
 	.Param.Offset = {0, 0, 0},
-	.CodeNameIdx = CN_ROME,
+	.CodeNameIdx = CN_ROME_75_2,
 	.TgtRatioUnlocked = 1,
 	.ClkRatioUnlocked = 0b10,
 	.TurboUnlocked = 0,
@@ -6379,7 +6383,7 @@ static PROCESSOR_SPECIFIC AMD_EPYC_Rome_CPK_Specific[] = {
 	.Brand = ZLIST("AMD EPYC 7K62"),
 	.Boost = {+7, 0},
 	.Param.Offset = {0, 0, 0},
-	.CodeNameIdx = CN_ROME,
+	.CodeNameIdx = CN_ROME_7K_2,
 	.TgtRatioUnlocked = 1,
 	.ClkRatioUnlocked = 0b10,
 	.TurboUnlocked = 0,