Improve unisoc vendor detection, re-enable neon dot on unknown chipsets

Author: GregoryComer

src/arm/linux/aarch32-isa.c

@@ -145,12 +145,8 @@ void cpuinfo_arm_linux_decode_isa_from_proc_cpuinfo(
 		if (chipset->series == cpuinfo_arm_chipset_series_spreadtrum_sc && chipset->model == 9863) {
 			cpuinfo_log_warning(
 				"VDOT instructions disabled: cause occasional SIGILL on Spreadtrum SC9863A");
-		} else if (chipset->series == cpuinfo_arm_chipset_series_unisoc_t && chipset->model == 310) {
-			cpuinfo_log_warning("VDOT instructions disabled: cause occasional SIGILL on Unisoc T310");
-		} else if (chipset->series == cpuinfo_arm_chipset_series_unisoc_ums && chipset->model == 312) {
-			cpuinfo_log_warning("VDOT instructions disabled: cause occasional SIGILL on Unisoc UMS312");
-		} else if (chipset->vendor == cpuinfo_arm_chipset_vendor_unknown) {
-			cpuinfo_log_warning("VDOT instructions disabled: unknown chipset");
+		} else if (chipset->vendor == cpuinfo_arm_chipset_vendor_unisoc) {
+			cpuinfo_log_warning("VDOT instructions disabled: occasional SIGILL on Unisoc chips");
 		} else {
 			switch (midr & (CPUINFO_ARM_MIDR_IMPLEMENTER_MASK | CPUINFO_ARM_MIDR_PART_MASK)) {
 				case UINT32_C(0x4100D0B0): /* Cortex-A76 */

src/arm/linux/chipset.c

@@ -4068,10 +4068,19 @@ struct cpuinfo_arm_chipset cpuinfo_arm_android_decode_chipset(
 			} else if (vendor != decoded_vendor) {
 				/* Parsing different system properties produces
 				 * different chipset vendors. This situation is
-				 * rare. */
-				cpuinfo_log_error(
-					"chipset detection failed: different chipset vendors reported in different system properties");
-				goto finish;
+				 * rare. Try to disambiguate for known cases,
+				 * otherwise treat as unknown. */
+
+				cpuinfo_arm_chipset_vendor disambiguated_vendor =
+					disambiguate_chipset_vendor(vendor, decoded_vendor);
+
+				if (disambiguated_vendor != cpuinfo_arm_chipset_vendor_unknown) {
+					vendor = disambiguated_vendor;
+				} else {
+					cpuinfo_log_error(
+						"chipset detection failed: different chipset vendors reported in different system properties");
+					goto finish;
+				}
 			}
 		}
 	}
@@ -4291,4 +4300,18 @@ struct cpuinfo_arm_chipset cpuinfo_arm_linux_decode_chipset(
 	return chipset;
 }
 
+static struct cpuinfo_arm_chipset_vendor disambiguate_chipset_vendor(
+	cpuinfo_arm_chipset_vendor vendor_a,
+	cpuinfo_arm_chipset_vendor vendor_b) {
+	/* Some UNISOC-based platforms reporting conflicting vendor names depending
+	 * on the source. For phones that report both UNISOC and Spreadtrum, treat it
+	 * as UNISOC. */
+	if (vendor_a == cpuinfo_arm_chipset_vendor_unisoc && vendor_b == cpuinfo_arm_chipset_vendor_spreadtrum ||
+	    vendor_a == cpuinfo_arm_chipset_vendor_spreadtrum && vendor_b == cpuinfo_arm_chipset_vendor_unisoc) {
+		return cpuinfo_arm_chipset_vendor_unisoc;
+	}
+
+	return cpuinfo_arm_chipset_vendor_unknown;
+}
+
 #endif