From 1ea73eada3bbb653b176e541f13cb10099138f27 Mon Sep 17 00:00:00 2001
From: Byoungchan Lee <daniel.l@hpcnt.com>
Date: Tue, 8 Jul 2025 10:50:41 +0900
Subject: [PATCH 1/2] Fix Samsung Exynos 2000 series chipset detection

Add support for "s5e" prefix pattern matching in `ro.product.board`
property to correctly identify Samsung Exynos 2000 series chipsets.
These chipsets use generic identifiers (e.g., `s5e9925`) instead of
marketing names like "Exynos 2200", but can still be identified and
mapped to their corresponding models using external resources.

Implements `match_s5e()` function to parse the s5e<4-digit-model> format.
---
 src/arm/linux/chipset.c       | 61 +++++++++++++++++++++++++++++++++++
 test/name/ro-product-board.cc |  4 +++
 2 files changed, 65 insertions(+)

diff --git a/src/arm/linux/chipset.c b/src/arm/linux/chipset.c
index c4977c38..621afba8 100644
--- a/src/arm/linux/chipset.c
+++ b/src/arm/linux/chipset.c
@@ -468,6 +468,58 @@ static bool match_universal(const char* start, const char* end, struct cpuinfo_a
 	return true;
 }
 
+
+
+/**
+ * Tries to match /s5e\d{4}$/ signature for Samsung Exynos chipsets.
+ * If match successful, extracts model information into \p chipset argument.
+ *
+ * @param start - start of the platform identifier (ro.product.board or
+ * ro.board.platform) to match.
+ * @param end - end of the platform identifier (ro.product.board or
+ * ro.board.platform) to match.
+ * @param[out] chipset - location where chipset information will be stored upon
+ * a successful match.
+ *
+ * @returns true if signature matched, false otherwise.
+ */
+static bool match_s5e(const char* start, const char* end, struct cpuinfo_arm_chipset chipset[restrict static 1]) {
+	/* Expect exactly 7 symbols: "s5e" (3 symbols) + 4-digit model number */
+	if (start + 7 != end) {
+		return false;
+	}
+
+	/* Check that string starts with "s5e" */
+	if (start[0] != 's') {
+		return false;
+	}
+
+	/* Load next 2 bytes as little endian 16-bit word */
+	const uint16_t expected_5e = load_u16le(start + 1);
+	if (expected_5e != UINT16_C(0x6535) /* "e5" = reverse("5e") */) {
+		return false;
+	}
+
+	/* Check and parse 4-digit model number */
+	uint32_t model = 0;
+	for (uint32_t i = 3; i < 7; i++) {
+		const uint32_t digit = (uint32_t)(uint8_t)start[i] - '0';
+		if (digit >= 10) {
+			/* Not really a digit */
+			return false;
+		}
+		model = model * 10 + digit;
+	}
+
+	/* Return parsed chipset. */
+	*chipset = (struct cpuinfo_arm_chipset){
+		.vendor = cpuinfo_arm_chipset_vendor_samsung,
+		.series = cpuinfo_arm_chipset_series_samsung_exynos,
+		.model = model,
+	};
+	return true;
+}
+
 /**
  * Compares, case insensitively, a string to known values "SMDK4210" and
  * "SMDK4x12" for Samsung Exynos chipsets. If platform identifier matches one of
@@ -2837,6 +2889,15 @@ struct cpuinfo_arm_chipset cpuinfo_arm_android_decode_chipset_from_ro_product_bo
 		return chipset;
 	}
 
+	/* Check s5eXXXX (Samsung Exynos) signature */
+	if (match_s5e(board, board_end, &chipset)) {
+		cpuinfo_log_debug(
+			"matched S5E (Samsung Exynos) signature in ro.product.board string \"%.*s\"",
+			(int)board_length,
+			board);
+		return chipset;
+	}
+
 #if CPUINFO_ARCH_ARM
 	/* Check SMDK (Samsung Exynos) signature */
 	if (match_and_parse_smdk(board, board_end, cores, &chipset)) {
diff --git a/test/name/ro-product-board.cc b/test/name/ro-product-board.cc
index 5a4cc7b2..3959aebb 100644
--- a/test/name/ro-product-board.cc
+++ b/test/name/ro-product-board.cc
@@ -169,6 +169,10 @@ TEST(RO_PRODUCT_BOARD, samsung_universal) {
 	EXPECT_EQ("Samsung Exynos 8895", parse_ro_product_board("universal8895"));
 }
 
+TEST(PROC_CPUINFO_HARDWARE, samsung_s5e) {
+	EXPECT_EQ("Samsung Exynos 9925", parse_ro_product_board("s5e9925"));
+}
+
 #if CPUINFO_ARCH_ARM
 TEST(RO_PRODUCT_BOARD, samsung_smdk) {
 	EXPECT_EQ("Samsung Exynos 4212", parse_ro_product_board("smdk4x12", 2));

From f8ce43fd8373e2111070b9473b0fc0f616b609a8 Mon Sep 17 00:00:00 2001
From: Byoungchan Lee <byoungchan.lee@gmx.com>
Date: Wed, 13 Aug 2025 06:41:00 +0900
Subject: [PATCH 2/2] Clean up whitespace in chipset.c

---
 src/arm/linux/chipset.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/arm/linux/chipset.c b/src/arm/linux/chipset.c
index 621afba8..21663863 100644
--- a/src/arm/linux/chipset.c
+++ b/src/arm/linux/chipset.c
@@ -468,8 +468,6 @@ static bool match_universal(const char* start, const char* end, struct cpuinfo_a
 	return true;
 }
 
-
-
 /**
  * Tries to match /s5e\d{4}$/ signature for Samsung Exynos chipsets.
  * If match successful, extracts model information into \p chipset argument.