Merge "msm: smem: clarify SBL misconfiguration error messages"
diff --git a/arch/arm/mach-msm/smem.c b/arch/arm/mach-msm/smem.c
index 5a9b341..2684b19 100644
--- a/arch/arm/mach-msm/smem.c
+++ b/arch/arm/mach-msm/smem.c
@@ -923,8 +923,17 @@
true);
if (version_array == NULL)
goto failed;
- if (version_array[MODEM_SBL_VERSION_INDEX] != SMEM_VERSION << 16)
+
+ /*
+ * The Modem SBL is now the Master SBL version and is required to
+ * pre-initialize SMEM and fill in any necessary configuration
+ * structures. Without the extra configuration data, the SMEM driver
+ * cannot be properly initialized.
+ */
+ if (version_array[MODEM_SBL_VERSION_INDEX] != SMEM_VERSION << 16) {
+ pr_err("%s: SBL version not correct\n", __func__);
goto failed;
+ }
is_inited = 1;
checked = 1;
@@ -935,7 +944,8 @@
is_inited = 0;
checked = 1;
spin_unlock_irqrestore(&smem_init_check_lock, flags);
- LOG_ERR("%s: bootloader failure detected, shared memory not inited\n",
+ LOG_ERR(
+ "%s: shared memory needs to be initialized by SBL before booting\n",
__func__);
return is_inited;
}