fix: booting stock kernel on moto sanders

Also adds ability to override dt matching algoirthm

Author: playday3008

lk2nd/device/2nd/gpl/motorola-unit-info.c

@@ -13,8 +13,8 @@
 #define SMEM_KERNEL_RESERVE		SMEM_ID_VENDOR0
 #define SMEM_KERNEL_RESERVE_SIZE	1024
 
-static uint32_t prod_id;
-static const struct mmi_unit_info *mmi_unit_info;
+uint32_t mmi_prod_id = 0;
+const struct mmi_unit_info *mmi_unit_info = NULL;
 
 static void readprop_u32(const void *dtb, int node, const char *name, uint32_t *val) {
 	int len;
@@ -30,7 +30,7 @@ static void print_unit_info(const struct mmi_unit_info *info)
 	dprintf(INFO, "Motorola unit info v%d: prod_id=%#04x, rev=%#04x, serial=%#08x%08x, "
 		"machine='%s', barcode='%s', carrier='%s', baseband='%s', device='%s', "
 		"radio='%s' (%#x), powerup_reason=%#08x\n",
-		info->version, prod_id, info->system_rev, info->system_serial_high, info->system_serial_low,
+		info->version, mmi_prod_id, info->system_rev, info->system_serial_high, info->system_serial_low,
 		info->machine, info->barcode, info->carrier, info->baseband, info->device,
 		info->radio_str, info->radio, info->powerup_reason);
 }
@@ -68,7 +68,7 @@ static int motorola_unit_info(const void *dtb, int node)
 	memset(info, 0, SMEM_KERNEL_RESERVE_SIZE);
 	info->version = MMI_UNIT_INFO_VER;
 
-	readprop_u32(dtb, chosen, "mmi,prod_id", &prod_id);
+	readprop_u32(dtb, chosen, "mmi,prod_id", &mmi_prod_id);
 	readprop_u32(dtb, chosen, "linux,hwrev", &info->system_rev);
 	readprop_u32(dtb, chosen, "linux,seriallow", &info->system_serial_low);
 	readprop_u32(dtb, chosen, "linux,serialhigh", &info->system_serial_high);

platform/msm_shared/dev_tree.c

@@ -50,6 +50,7 @@
 #endif
 #include <boot_stats.h>
 #include <verifiedboot.h>
+#include "../../lk2nd/device/2nd/gpl/motorola-unit-info.h"
 
 #define NODE_PROPERTY_MAX_LEN   64
 #define ADD_OF(a, b) (UINT_MAX - b > a) ? (a + b) : UINT_MAX
@@ -1452,6 +1453,25 @@ int dev_tree_validate(struct dt_table *table, unsigned int page_size, uint32_t *
 	return 0;
 }
 
+static bool is_stock_match(struct dt_entry *cur_dt_entry)
+{
+	// Stock Motorola devices use a different way to match the DTB.
+	{
+		extern const uint32_t mmi_prod_id;
+		extern const struct mmi_unit_info *mmi_unit_info;
+
+		if (mmi_unit_info != NULL && mmi_prod_id != 0) {
+			if (cur_dt_entry) {
+	            if (cur_dt_entry->variant_id == mmi_prod_id &&
+					cur_dt_entry->board_hw_subtype == mmi_unit_info->system_rev) {
+					return true;
+	            }
+	        }
+		}
+	}
+	return false;
+}
+
 static int platform_dt_absolute_match(struct dt_entry *cur_dt_entry, struct dt_entry_node *dt_list)
 {
 	uint32_t cur_dt_hlos_ddr;
@@ -1498,18 +1518,21 @@ static int platform_dt_absolute_match(struct dt_entry *cur_dt_entry, struct dt_e
 	*  2. find the matched DTB then return 1
 	*  3. otherwise return 0
 	*/
-	if(!((cur_dt_msm_id == (board_platform_id() & 0x0000ffff)) &&
+	if ((
+		!((cur_dt_msm_id == (board_platform_id() & 0x0000ffff)) &&
 		(cur_dt_hw_platform == board_hardware_id()) &&
 		(cur_dt_hw_subtype == board_hardware_subtype()) &&
 		(cur_dt_hlos_ddr == (target_get_hlos_subtype() & 0x700)) &&
-		((cur_dt_entry->variant_id & 0x00ffff00) <= (board_target_id() & 0x00ffff00))))
+		((cur_dt_entry->variant_id & 0x00ffff00) <= (board_target_id() & 0x00ffff00)))) &&
+	    !is_stock_match(cur_dt_entry))
 		return 0;
-	if (
+	if ((
 		(cur_dt_entry->soc_rev <= board_soc_version()) &&
 		((cur_dt_entry->pmic_rev[0] & 0x00ffff00) <= (board_pmic_target(0) & 0x00ffff00)) &&
 		((cur_dt_entry->pmic_rev[1] & 0x00ffff00) <= (board_pmic_target(1) & 0x00ffff00)) &&
 		((cur_dt_entry->pmic_rev[2] & 0x00ffff00) <= (board_pmic_target(2) & 0x00ffff00)) &&
-		((cur_dt_entry->pmic_rev[3] & 0x00ffff00) <= (board_pmic_target(3) & 0x00ffff00))) {
+		((cur_dt_entry->pmic_rev[3] & 0x00ffff00) <= (board_pmic_target(3) & 0x00ffff00))) ||
+	    is_stock_match(cur_dt_entry)) {
 
 #if WITH_LK2ND_DEVICE
 		if (!dt_list)