[aarch64] Improve detection of Mesh interconnect via DT/ACPI

aarch64/corefreq-api.h

@@ -318,6 +318,7 @@ typedef struct
 	struct {
 		CLUSTERCFR	ClusterCfg;
 		CLUSTERIDR	ClusterRev;
+		enum DSU_TYPE	DSU_Type;
 		enum CMN_TYPE	CMN_Type;
 
 		unsigned int	Boost[UNCORE_BOOST(SIZE)];

aarch64/corefreqd.c

@@ -683,8 +683,9 @@ void Technology_Update( RO(SHM_STRUCT) *RO(Shm),
 						RW(Proc)->VM,
 						RO(Proc)->CR_Mask) != 0;
 	/* If both cluster registers are implemented then DSU is present */
-	if (RO(Proc)->Uncore.ClusterCfg.value != 0
+	if ((RO(Proc)->Uncore.ClusterCfg.value != 0
-	 && RO(Proc)->Uncore.ClusterRev.value != 0) {
+	  && RO(Proc)->Uncore.ClusterRev.value != 0)
+	 || RO(Proc)->Uncore.DSU_Type != DSU_NONE) {
 		RO(Shm)->Proc.Technology.DSU = 1;
 	}
 	if (RO(Proc)->Uncore.CMN_Type != CMN_NONE) {

aarch64/corefreqk.c

@@ -2761,184 +2761,36 @@ static int CoreFreqK_ProbePCI(	struct pci_device_id PCI_ids[],
 }
 
 #if defined(CONFIG_OF)
-static const struct of_device_id CMN_of_match[] = {
+static uintptr_t Match_From_DeviceTree(const struct of_device_id of_match[])
-	{ .compatible = "arm,cmn-600",	.data = (void *) CMN_600	},
-	{ .compatible = "arm,cmn-650",	.data = (void *) CMN_650	},
-	{ .compatible = "arm,cmn-700",	.data = (void *) CMN_700	},
-	{ .compatible = "arm,cmn-s3",	.data = (void *) CMN_S3 	},
-	{ .compatible = "arm,ci-700",	.data = (void *) CMN_CI700	},
-	{ /* EOL */ }
-};
-
-static enum CMN_TYPE Detect_CMN_From_DeviceTree(void)
 {
 	struct device_node *node = of_find_all_nodes(NULL);
 	while (node != NULL) {
 		const struct of_device_id *match;
-		match = of_match_node(CMN_of_match, node);
+		match = of_match_node(of_match, node);
 		if (match) {
 			of_node_put(node);
-			return (enum CMN_TYPE) (uintptr_t) match->data;
+			return (uintptr_t) match->data;
 		}
 		node = of_find_all_nodes(node);
 	}
-	return CMN_NONE;
+	return 0;
 }
 #endif /* CONFIG_OF */
 
 #if defined(CONFIG_ACPI)
-/* Source: drivers/acpi/bus.c						*/
+static uintptr_t Match_From_ACPI(acpi_status(*Callback)(acpi_handle,u32,void*,void**))
-#define ACPI_DT_NAMESPACE_HID	"PRP0001"
-
-static bool Zacpi_of_match_device(struct acpi_device *adev,
-				 const struct of_device_id *of_match_table,
-				 const struct of_device_id **of_id)
-{
-	const union acpi_object *of_compatible, *obj;
-	int i, nval;
-
-	if (!adev)
-		return false;
-
-	of_compatible = adev->data.of_compatible;
-	if (!of_match_table || !of_compatible)
-		return false;
-
-	if (of_compatible->type == ACPI_TYPE_PACKAGE) {
-		nval = of_compatible->package.count;
-		obj = of_compatible->package.elements;
-	} else {
-		nval = 1;
-		obj = of_compatible;
-	}
-	for (i = 0; i < nval; i++, obj++) {
-		const struct of_device_id *id;
-
-		for (id = of_match_table; id->compatible[0]; id++)
-			if (!strcasecmp(obj->string.pointer, id->compatible)) {
-				if (of_id)
-					*of_id = id;
-				return true;
-			}
-	}
-	return false;
-}
-
-static bool Z__acpi_match_device_cls(const struct acpi_device_id *id,
-				    struct acpi_hardware_id *hwid)
-{
-	int i, msk, byte_shift;
-	char buf[3];
-
-	if (!id->cls)
-		return false;
-
-	for (i = 1; i <= 3; i++) {
-		byte_shift = 8 * (3 - i);
-		msk = (id->cls_msk >> byte_shift) & 0xFF;
-		if (!msk)
-			continue;
-
-		sprintf(buf, "%02x", (id->cls >> byte_shift) & msk);
-		if (strncmp(buf, &hwid->id[(i - 1) * 2], 2))
-			return false;
-	}
-	return true;
-}
-
-static bool Z__acpi_match_device(struct acpi_device *device,
-				const struct acpi_device_id *acpi_ids,
-				const struct of_device_id *of_ids,
-				const struct acpi_device_id **acpi_id,
-				const struct of_device_id **of_id)
-{
-	const struct acpi_device_id *id;
-	struct acpi_hardware_id *hwid;
-
-	if (!device || !device->status.present)
-		return false;
-
-    list_for_each_entry(hwid, &device->pnp.ids, list) {
-	if (acpi_ids) {
-		for (id = acpi_ids; id->id[0] || id->cls; id++) {
-			if (id->id[0] && !strcmp((char *)id->id, hwid->id))
-				goto out_acpi_match;
-			if (id->cls && Z__acpi_match_device_cls(id, hwid))
-				goto out_acpi_match;
-		}
-	}
-	if (!strcmp(ACPI_DT_NAMESPACE_HID, hwid->id))
-		return Zacpi_of_match_device(device, of_ids, of_id);
-    }
-	return false;
-
-out_acpi_match:
-	if (acpi_id)
-		*acpi_id = id;
-	return true;
-}
-
-static struct acpi_device_id CMN_ACPI_ID[] = {
-	{ "ARMHC600",	CMN_600 	},
-	{ "ARMHC650",	CMN_650 	},
-	{ "ARMHC700",	CMN_700 	},
-	{ "ARMHC003",	CMN_S3		},
-	{ "ARMHC701",	CMN_CI700	},
-	{ "",		0		}
-};
-
-static int CMN_Match(	struct acpi_device *adev,
-			const struct acpi_device_id *ids,
-			const struct acpi_device_id **id )
-{
-	int rc = Z__acpi_match_device(adev, ids, NULL, id, NULL) ? 0 : -ENOENT;
-	return rc;
-}
-
-static acpi_status CMN_Compare( acpi_handle handle,
-				u32 level,
-				void *data,
-				void **return_value )
-{
-	struct acpi_device_id *ids;
-	struct acpi_device *adev, **rdev;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 17, 0)
-	if ((adev = acpi_fetch_acpi_dev(handle)) == NULL) {
-		return AE_OK;
-	}
-#else
-	if (acpi_bus_get_device(handle, &adev)) {
-		return AE_OK;
-	}
-#endif
-	rdev = data;
-
-	for (ids = CMN_ACPI_ID; ids->id[0] || ids->cls; ids++) {
-		const struct acpi_device_id *id = NULL;
-		if (CMN_Match(adev, ids, &id) == 0) {
-			*rdev = adev;
-			(*rdev)->driver_data = (void*) id->driver_data;
-			break;
-		}
-	}
-	return AE_OK;
-}
-
-static enum CMN_TYPE Detect_CMN_From_ACPI(void)
 {
 	struct acpi_device *rdev = NULL;
 	acpi_status status;
 	status = acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
-			ACPI_UINT32_MAX, CMN_Compare, NULL, &rdev, NULL);
+			ACPI_UINT32_MAX, Callback, NULL, &rdev, NULL);
 
 	if (!ACPI_FAILURE(status) && (rdev != NULL)) {
-		return (enum CMN_TYPE) rdev->driver_data;
+		return (uintptr_t) rdev->driver_data;
 	} else {
-		return CMN_NONE;
+		return 0;
 	}
 }
-
-#undef ACPI_DT_NAMESPACE_HID
 #endif /* CONFIG_ACPI */
 
 static void Query_Same_Genuine_Features(void)
@@ -2978,6 +2830,43 @@ static void Query_GenericMachine(unsigned int cpu)
 	For_All_ACPI_CPPC(Read_ACPI_CPPC_Registers, NULL);
 }
 
+#if defined(CONFIG_OF)
+static const struct of_device_id DSU_of_match[] = DSU_DEVICE_TREE_LIST;
+#endif
+
+#if defined(CONFIG_ACPI)
+static struct acpi_device_id DSU_hid_match[] = DSU_ACPI_HID_LIST;
+
+static acpi_status DSU_Compare( acpi_handle handle,
+				u32 level,
+				void *data,
+				void **return_value )
+{
+	struct acpi_device_id *ids;
+	struct acpi_device *adev, **rdev;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 17, 0)
+	if ((adev = acpi_fetch_acpi_dev(handle)) == NULL) {
+		return AE_OK;
+	}
+#else
+	if (acpi_bus_get_device(handle, &adev)) {
+		return AE_OK;
+	}
+#endif
+	rdev = data;
+
+	for (ids = DSU_hid_match; ids->id[0] || ids->cls; ids++) {
+		const struct acpi_device_id *id = NULL;
+		if (ACPI_Match(adev, ids, &id) == 0) {
+			*rdev = adev;
+			(*rdev)->driver_data = (void*) id->driver_data;
+			break;
+		}
+	}
+	return AE_OK;
+}
+#endif /* CONFIG_ACPI */
+
 static void Query_DynamIQ(unsigned int cpu)
 {
 	Query_GenericMachine(cpu);
@@ -2986,19 +2875,69 @@ static void Query_DynamIQ(unsigned int cpu)
 	/* Query the Cluster Configuration on Bare Metal only		*/
 	PUBLIC(RO(Proc))->Uncore.ClusterCfg.value = SysRegRead(CLUSTERCFR_EL1);
 	PUBLIC(RO(Proc))->Uncore.ClusterRev.value = SysRegRead(CLUSTERIDR_EL1);
+
+	PUBLIC(RO(Proc))->Uncore.DSU_Type = DSU_100;
+    } else {
+	enum DSU_TYPE DSU_Type[2] = {DSU_NONE, DSU_NONE};
+
+#if defined(CONFIG_OF)
+	DSU_Type[0] = (enum DSU_TYPE) Match_From_DeviceTree(DSU_of_match);
+#endif
+#if defined(CONFIG_ACPI)
+	DSU_Type[1] = (enum DSU_TYPE) Match_From_ACPI(DSU_Compare);
+#endif
+	PUBLIC(RO(Proc))->Uncore.DSU_Type = \
+		DSU_Type[0] == DSU_NONE ? DSU_Type[1] : DSU_Type[0];
     }
 }
 
+#if defined(CONFIG_OF)
+static const struct of_device_id CMN_of_match[] = CMN_DEVICE_TREE_LIST;
+#endif
+
+#if defined(CONFIG_ACPI)
+static struct acpi_device_id CMN_hid_match[] = CMN_ACPI_HID_LIST;
+
+static acpi_status CMN_Compare( acpi_handle handle,
+				u32 level,
+				void *data,
+				void **return_value )
+{
+	struct acpi_device_id *ids;
+	struct acpi_device *adev, **rdev;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 17, 0)
+	if ((adev = acpi_fetch_acpi_dev(handle)) == NULL) {
+		return AE_OK;
+	}
+#else
+	if (acpi_bus_get_device(handle, &adev)) {
+		return AE_OK;
+	}
+#endif
+	rdev = data;
+
+	for (ids = CMN_hid_match; ids->id[0] || ids->cls; ids++) {
+		const struct acpi_device_id *id = NULL;
+		if (ACPI_Match(adev, ids, &id) == 0) {
+			*rdev = adev;
+			(*rdev)->driver_data = (void*) id->driver_data;
+			break;
+		}
+	}
+	return AE_OK;
+}
+#endif /* CONFIG_ACPI */
+
 static void Query_CMN(unsigned int cpu)
 {
 	enum CMN_TYPE CMN_Type[2] = {CMN_NONE, CMN_NONE};
 
 	Query_GenericMachine(cpu);
 #if defined(CONFIG_OF)
-	CMN_Type[0] = Detect_CMN_From_DeviceTree();
+	CMN_Type[0] = (enum CMN_TYPE) Match_From_DeviceTree(CMN_of_match);
 #endif
 #if defined(CONFIG_ACPI)
-	CMN_Type[1] = Detect_CMN_From_ACPI();
+	CMN_Type[1] = (enum CMN_TYPE) Match_From_ACPI(CMN_Compare);
 #endif
 	PUBLIC(RO(Proc))->Uncore.CMN_Type = \
 		CMN_Type[0] == CMN_NONE ? CMN_Type[1] : CMN_Type[0];

aarch64/corefreqk.h

@@ -4,6 +4,48 @@
  * Licenses: GPL2
  */
 
+#define DSU_DEVICE_TREE_LIST						\
+{									\
+	{ .compatible = "arm,dsu-pmu",	  .data = (void *) DSU_100 },	\
+	{ .compatible = "arm,dsu-110-pmu",.data = (void *) DSU_110 },	\
+	{ /* EOL */ }							\
+}
+
+#define DSU_ACPI_HID_LIST						\
+{									\
+	{ "ARMHD500",	DSU_100 	},				\
+	{ "ARMHD510",	DSU_110 	},				\
+	{ "",		0		}				\
+}
+
+#define CCN_DEVICE_TREE_LIST						\
+{									\
+	{ .compatible = "arm,ccn-502",	.data = (void *) CCN_502 },	\
+	{ .compatible = "arm,ccn-504",	.data = (void *) CCN_504 },	\
+	{ .compatible = "arm,ccn-512",	.data = (void *) CCN_512 },	\
+	{ /* EOL */ }							\
+}
+
+#define CMN_DEVICE_TREE_LIST						\
+{									\
+	{ .compatible = "arm,cmn-600",	.data = (void *) CMN_600  },	\
+	{ .compatible = "arm,cmn-650",	.data = (void *) CMN_650  },	\
+	{ .compatible = "arm,cmn-700",	.data = (void *) CMN_700  },	\
+	{ .compatible = "arm,cmn-s3",	.data = (void *) CMN_S3   },	\
+	{ .compatible = "arm,ci-700",	.data = (void *) CMN_CI700},	\
+	{ /* EOL */ }							\
+}
+
+#define CMN_ACPI_HID_LIST						\
+{									\
+	{ "ARMHC600",	CMN_600 	},				\
+	{ "ARMHC650",	CMN_650 	},				\
+	{ "ARMHC700",	CMN_700 	},				\
+	{ "ARMHC003",	CMN_S3		},				\
+	{ "ARMHC701",	CMN_CI700	},				\
+	{ "",		0		}				\
+}
+
 #if defined(CONFIG_OF) && LINUX_VERSION_CODE < KERNEL_VERSION(6, 4, 0)
 #define of_cpu_device_node_get(cpu)					\
 ({									\
@@ -37,6 +79,110 @@
 })
 #endif
 
+#if defined(CONFIG_ACPI)
+/* Kernel Source: drivers/acpi/bus.c					*/
+#define ACPI_DT_NAMESPACE_HID	"PRP0001"
+
+static bool Zacpi_of_match_device(struct acpi_device *adev,
+				 const struct of_device_id *of_match_table,
+				 const struct of_device_id **of_id)
+{
+	const union acpi_object *of_compatible, *obj;
+	int i, nval;
+
+	if (!adev)
+		return false;
+
+	of_compatible = adev->data.of_compatible;
+	if (!of_match_table || !of_compatible)
+		return false;
+
+	if (of_compatible->type == ACPI_TYPE_PACKAGE) {
+		nval = of_compatible->package.count;
+		obj = of_compatible->package.elements;
+	} else {
+		nval = 1;
+		obj = of_compatible;
+	}
+	for (i = 0; i < nval; i++, obj++) {
+		const struct of_device_id *id;
+
+		for (id = of_match_table; id->compatible[0]; id++)
+			if (!strcasecmp(obj->string.pointer, id->compatible)) {
+				if (of_id)
+					*of_id = id;
+				return true;
+			}
+	}
+	return false;
+}
+
+static bool Z__acpi_match_device_cls(const struct acpi_device_id *id,
+				    struct acpi_hardware_id *hwid)
+{
+	int i, msk, byte_shift;
+	char buf[3];
+
+	if (!id->cls)
+		return false;
+
+	for (i = 1; i <= 3; i++) {
+		byte_shift = 8 * (3 - i);
+		msk = (id->cls_msk >> byte_shift) & 0xFF;
+		if (!msk)
+			continue;
+
+		sprintf(buf, "%02x", (id->cls >> byte_shift) & msk);
+		if (strncmp(buf, &hwid->id[(i - 1) * 2], 2))
+			return false;
+	}
+	return true;
+}
+
+static bool Z__acpi_match_device(struct acpi_device *device,
+				const struct acpi_device_id *acpi_ids,
+				const struct of_device_id *of_ids,
+				const struct acpi_device_id **acpi_id,
+				const struct of_device_id **of_id)
+{
+	const struct acpi_device_id *id;
+	struct acpi_hardware_id *hwid;
+
+	if (!device || !device->status.present)
+		return false;
+
+    list_for_each_entry(hwid, &device->pnp.ids, list) {
+	if (acpi_ids) {
+		for (id = acpi_ids; id->id[0] || id->cls; id++) {
+			if (id->id[0] && !strcmp((char *)id->id, hwid->id))
+				goto out_acpi_match;
+			if (id->cls && Z__acpi_match_device_cls(id, hwid))
+				goto out_acpi_match;
+		}
+	}
+	if (!strcmp(ACPI_DT_NAMESPACE_HID, hwid->id))
+		return Zacpi_of_match_device(device, of_ids, of_id);
+    }
+	return false;
+
+out_acpi_match:
+	if (acpi_id)
+		*acpi_id = id;
+	return true;
+}
+
+#undef ACPI_DT_NAMESPACE_HID
+/* End of Kernel Source: drivers/acpi/bus.c				*/
+
+static int ACPI_Match(	struct acpi_device *adev,
+			const struct acpi_device_id *ids,
+			const struct acpi_device_id **id )
+{
+	int rc = Z__acpi_match_device(adev, ids, NULL, id, NULL) ? 0 : -ENOENT;
+	return rc;
+}
+#endif /* CONFIG_ACPI */
+
 #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0)
 	#define sys_reg(op0, op1, crn, crm, op2) ({	\
 		UNUSED(op0);				\
@@ -398,6 +544,7 @@ typedef struct
 
 static CLOCK BaseClock_GenericMachine(unsigned int ratio) ;
 static void Query_CMN(unsigned int cpu) ;
+#define     Query_CCN Query_GenericMachine
 static void Query_GenericMachine(unsigned int cpu) ;
 static void PerCore_GenericMachine(void *arg) ;
 static void Start_GenericMachine(void *arg) ;
@@ -620,7 +767,7 @@ static ARCH Arch[ARCHITECTURES] = {
 	},
 [Cortex_A510] = {
 	.Signature = _Cortex_A510,
-	.Query = Query_GenericMachine,
+	.Query = Query_DynamIQ,
 	.Update = PerCore_GenericMachine,
 	.Start = Start_GenericMachine,
 	.Stop = Stop_GenericMachine,
@@ -648,7 +795,7 @@ static ARCH Arch[ARCHITECTURES] = {
 	},
 [Cortex_A520] = {
 	.Signature = _Cortex_A520,
-	.Query = Query_GenericMachine,
+	.Query = Query_DynamIQ,
 	.Update = PerCore_GenericMachine,
 	.Start = Start_GenericMachine,
 	.Stop = Stop_GenericMachine,
@@ -760,7 +907,7 @@ static ARCH Arch[ARCHITECTURES] = {
 	},
 [Cortex_A65] = {
 	.Signature = _Cortex_A65,
-	.Query = Query_GenericMachine,
+	.Query = Query_DynamIQ,
 	.Update = PerCore_GenericMachine,
 	.Start = Start_GenericMachine,
 	.Stop = Stop_GenericMachine,
@@ -788,7 +935,7 @@ static ARCH Arch[ARCHITECTURES] = {
 	},
 [Cortex_A65AE] = {
 	.Signature = _Cortex_A65AE,
-	.Query = Query_GenericMachine,
+	.Query = Query_DynamIQ,
 	.Update = PerCore_GenericMachine,
 	.Start = Start_GenericMachine,
 	.Stop = Stop_GenericMachine,
@@ -816,7 +963,7 @@ static ARCH Arch[ARCHITECTURES] = {
 	},
 [Cortex_A710] = {
 	.Signature = _Cortex_A710,
-	.Query = Query_GenericMachine,
+	.Query = Query_DynamIQ,
 	.Update = PerCore_GenericMachine,
 	.Start = Start_GenericMachine,
 	.Stop = Stop_GenericMachine,
@@ -844,7 +991,7 @@ static ARCH Arch[ARCHITECTURES] = {
 	},
 [Cortex_A715] = {
 	.Signature = _Cortex_A715,
-	.Query = Query_GenericMachine,
+	.Query = Query_DynamIQ,
 	.Update = PerCore_GenericMachine,
 	.Start = Start_GenericMachine,
 	.Stop = Stop_GenericMachine,
@@ -872,7 +1019,7 @@ static ARCH Arch[ARCHITECTURES] = {
 	},
 [Cortex_A72] = {
 	.Signature = _Cortex_A72,
-	.Query = Query_GenericMachine,
+	.Query = Query_CCN,
 	.Update = PerCore_GenericMachine,
 	.Start = Start_GenericMachine,
 	.Stop = Stop_GenericMachine,
@@ -900,7 +1047,7 @@ static ARCH Arch[ARCHITECTURES] = {
 	},
 [Cortex_A720] = {
 	.Signature = _Cortex_A720,
-	.Query = Query_GenericMachine,
+	.Query = Query_DynamIQ,
 	.Update = PerCore_GenericMachine,
 	.Start = Start_GenericMachine,
 	.Stop = Stop_GenericMachine,
@@ -1236,7 +1383,7 @@ static ARCH Arch[ARCHITECTURES] = {
 	},
 [Cortex_X2] = {
 	.Signature = _Cortex_X2,
-	.Query = Query_GenericMachine,
+	.Query = Query_DynamIQ,
 	.Update = PerCore_GenericMachine,
 	.Start = Start_GenericMachine,
 	.Stop = Stop_GenericMachine,
@@ -1264,7 +1411,7 @@ static ARCH Arch[ARCHITECTURES] = {
 	},
 [Cortex_X3] = {
 	.Signature = _Cortex_X3,
-	.Query = Query_GenericMachine,
+	.Query = Query_DynamIQ,
 	.Update = PerCore_GenericMachine,
 	.Start = Start_GenericMachine,
 	.Stop = Stop_GenericMachine,
@@ -1292,7 +1439,7 @@ static ARCH Arch[ARCHITECTURES] = {
 	},
 [Cortex_X4] = {
 	.Signature = _Cortex_X4,
-	.Query = Query_GenericMachine,
+	.Query = Query_DynamIQ,
 	.Update = PerCore_GenericMachine,
 	.Start = Start_GenericMachine,
 	.Stop = Stop_GenericMachine,

aarch64/coretypes.h

@@ -103,6 +103,21 @@ enum MECH_CSV2 {
 	CSV2_3p0
 };
 
+enum DSU_TYPE {
+	DSU_NONE,
+	DSU_100,		/* X1, A78, A77, A76, A75, A65, A55	*/
+	DSU_AE, 		/* A78AE, A76AE, A65AE			*/
+	DSU_110,		/* X3, X2, A715, A710, A510		*/
+	DSU_120,		/* X925, X4, A725, A720, A520		*/
+	DSU_120AE		/* A720AE, A520AE			*/
+};
+
+enum CCN_TYPE {
+	CCN_502,		/* A72					*/
+	CCN_504,		/* A15 (32-bits), Freescale FSL-2080A	*/
+	CCN_512
+};
+
 enum CMN_TYPE {
 	CMN_NONE,
 	CMN_600,