diff --git a/drivers/remoteproc/qcom_q6v5.c b/drivers/remoteproc/qcom_q6v5.c
index 0e32f13c196d..e4a28bf25130 100644
--- a/drivers/remoteproc/qcom_q6v5.c
+++ b/drivers/remoteproc/qcom_q6v5.c
@@ -100,7 +100,7 @@ static irqreturn_t q6v5_wdog_interrupt(int irq, void *data)
 		return IRQ_HANDLED;
 	}
 
-	msg = qcom_smem_get(QCOM_SMEM_HOST_ANY, q6v5->crash_reason, &len);
+	msg = qcom_smem_get(q6v5->crash_reason_partition, q6v5->crash_reason_item, &len);
 	if (!IS_ERR(msg) && len > 0 && msg[0])
 		dev_err(q6v5->dev, "watchdog received: %s\n", msg);
 	else
@@ -121,7 +121,7 @@ irqreturn_t q6v5_fatal_interrupt(int irq, void *data)
 	if (!q6v5->running)
 		return IRQ_HANDLED;
 
-	msg = qcom_smem_get(QCOM_SMEM_HOST_ANY, q6v5->crash_reason, &len);
+	msg = qcom_smem_get(q6v5->crash_reason_partition, q6v5->crash_reason_item, &len);
 	if (!IS_ERR(msg) && len > 0 && msg[0])
 		dev_err(q6v5->dev, "fatal error received: %s\n", msg);
 	else
@@ -279,14 +279,16 @@ EXPORT_SYMBOL_GPL(qcom_q6v5_panic);
  * Return: 0 on success, negative errno on failure
  */
 int qcom_q6v5_init(struct qcom_q6v5 *q6v5, struct platform_device *pdev,
-		   struct rproc *rproc, int crash_reason, const char *load_state,
+		   struct rproc *rproc, int crash_reason_partition,
+		   int crash_reason_item, const char *load_state,
 		   void (*handover)(struct qcom_q6v5 *q6v5))
 {
 	int ret;
 
 	q6v5->rproc = rproc;
 	q6v5->dev = &pdev->dev;
-	q6v5->crash_reason = crash_reason;
+	q6v5->crash_reason_partition = crash_reason_partition;
+	q6v5->crash_reason_item = crash_reason_item;
 	q6v5->handover = handover;
 
 	init_completion(&q6v5->start_done);
diff --git a/drivers/remoteproc/qcom_q6v5.h b/drivers/remoteproc/qcom_q6v5.h
index 4e1bb1a68284..cd02372e9856 100644
--- a/drivers/remoteproc/qcom_q6v5.h
+++ b/drivers/remoteproc/qcom_q6v5.h
@@ -40,7 +40,8 @@ struct qcom_q6v5 {
 	struct completion stop_done;
 	struct completion spawn_done;
 
-	int crash_reason;
+	int crash_reason_partition;
+	int crash_reason_item;
 
 	bool running;
 
@@ -49,7 +50,8 @@ struct qcom_q6v5 {
 };
 
 int qcom_q6v5_init(struct qcom_q6v5 *q6v5, struct platform_device *pdev,
-		   struct rproc *rproc, int crash_reason, const char *load_state,
+		   struct rproc *rproc, int crash_reason_partition,
+		   int crash_reason_item, const char *load_state,
 		   void (*handover)(struct qcom_q6v5 *q6v5));
 void qcom_q6v5_deinit(struct qcom_q6v5 *q6v5);
 
diff --git a/drivers/remoteproc/qcom_q6v5_adsp.c b/drivers/remoteproc/qcom_q6v5_adsp.c
index 6c67514cc493..055764aa201c 100644
--- a/drivers/remoteproc/qcom_q6v5_adsp.c
+++ b/drivers/remoteproc/qcom_q6v5_adsp.c
@@ -62,7 +62,7 @@
 #define LPASS_EFUSE_Q6SS_EVB_SEL 0x0
 
 struct adsp_pil_data {
-	int crash_reason_smem;
+	int crash_reason_item;
 	const char *firmware_name;
 
 	const char *ssr_name;
@@ -98,7 +98,7 @@ struct qcom_adsp {
 	struct regmap *halt_map;
 	unsigned int halt_lpass;
 
-	int crash_reason_smem;
+	int crash_reason_item;
 	const char *info_name;
 
 	struct completion start_done;
@@ -731,8 +731,9 @@ static int adsp_probe(struct platform_device *pdev)
 	if (ret)
 		goto disable_pm;
 
-	ret = qcom_q6v5_init(&adsp->q6v5, pdev, rproc, desc->crash_reason_smem,
-			     desc->load_state, qcom_adsp_pil_handover);
+	ret = qcom_q6v5_init(&adsp->q6v5, pdev, rproc, QCOM_SMEM_HOST_ANY,
+			     desc->crash_reason_item, desc->load_state,
+			     qcom_adsp_pil_handover);
 	if (ret)
 		goto disable_pm;
 
@@ -776,7 +777,7 @@ static void adsp_remove(struct platform_device *pdev)
 }
 
 static const struct adsp_pil_data adsp_resource_init = {
-	.crash_reason_smem = 423,
+	.crash_reason_item = 423,
 	.firmware_name = "adsp.mdt",
 	.ssr_name = "lpass",
 	.sysmon_name = "adsp",
@@ -794,7 +795,7 @@ static const struct adsp_pil_data adsp_resource_init = {
 };
 
 static const struct adsp_pil_data adsp_sc7280_resource_init = {
-	.crash_reason_smem = 423,
+	.crash_reason_item = 423,
 	.firmware_name = "adsp.pbn",
 	.load_state = "adsp",
 	.ssr_name = "lpass",
@@ -809,7 +810,7 @@ static const struct adsp_pil_data adsp_sc7280_resource_init = {
 };
 
 static const struct adsp_pil_data cdsp_resource_init = {
-	.crash_reason_smem = 601,
+	.crash_reason_item = 601,
 	.firmware_name = "cdsp.mdt",
 	.ssr_name = "cdsp",
 	.sysmon_name = "cdsp",
@@ -827,7 +828,7 @@ static const struct adsp_pil_data cdsp_resource_init = {
 };
 
 static const struct adsp_pil_data wpss_resource_init = {
-	.crash_reason_smem = 626,
+	.crash_reason_item = 626,
 	.firmware_name = "wpss.mdt",
 	.ssr_name = "wpss",
 	.sysmon_name = "wpss",
diff --git a/drivers/remoteproc/qcom_q6v5_mpd.c b/drivers/remoteproc/qcom_q6v5_mpd.c
index b133285888c7..27c9f4317e98 100644
--- a/drivers/remoteproc/qcom_q6v5_mpd.c
+++ b/drivers/remoteproc/qcom_q6v5_mpd.c
@@ -555,9 +555,9 @@ static int q6_get_outbound_irq(struct qcom_q6v5 *q6,
 	return 0;
 }
 
-static int init_irq(struct qcom_q6v5 *q6,
-		    struct platform_device *pdev, struct rproc *rproc,
-		    int crash_reason, const char *load_state,
+static int init_irq(struct qcom_q6v5 *q6, struct platform_device *pdev,
+		    struct rproc *rproc, int crash_reason_partition,
+		    int crash_reason_item, const char *load_state,
 		    void (*handover)(struct qcom_q6v5 *q6))
 {
 	int ret;
@@ -565,7 +565,8 @@ static int init_irq(struct qcom_q6v5 *q6,
 
 	q6->rproc = rproc;
 	q6->dev = &pdev->dev;
-	q6->crash_reason = crash_reason;
+	q6->crash_reason_partition = crash_reason_partition;
+	q6->crash_reason_item = crash_reason_item;
 	q6->handover = handover;
 
 	init_completion(&q6->start_done);
@@ -666,7 +667,7 @@ static int q6_register_userpd(struct platform_device *pdev,
 	if (ret)
 		goto free_rproc;
 
-	ret = init_irq(&wcss->q6, userpd_pdev, rproc,
+	ret = init_irq(&wcss->q6, userpd_pdev, rproc, WCSS_SMEM_HOST,
 		       WCSS_CRASH_REASON, NULL, NULL);
 	if (ret)
 		goto free_rproc;
@@ -725,7 +726,7 @@ static int q6_wcss_probe(struct platform_device *pdev)
 	if (ret)
 		goto free_rproc;
 
-	ret = qcom_q6v5_init(&wcss->q6, pdev, rproc,
+	ret = qcom_q6v5_init(&wcss->q6, pdev, rproc, WCSS_SMEM_HOST,
 			     WCSS_CRASH_REASON, NULL, NULL);
 	if (ret)
 		goto free_rproc;
diff --git a/drivers/remoteproc/qcom_q6v5_mss.c b/drivers/remoteproc/qcom_q6v5_mss.c
index 394b2c1cb5e2..48f115f9337b 100644
--- a/drivers/remoteproc/qcom_q6v5_mss.c
+++ b/drivers/remoteproc/qcom_q6v5_mss.c
@@ -26,6 +26,7 @@
 #include <linux/remoteproc.h>
 #include <linux/reset.h>
 #include <linux/soc/qcom/mdt_loader.h>
+#include <linux/soc/qcom/smem.h>
 #include <linux/iopoll.h>
 #include <linux/slab.h>
 
@@ -2093,8 +2094,8 @@ static int q6v5_probe(struct platform_device *pdev)
 	qproc->need_mem_protection = desc->need_mem_protection;
 	qproc->has_mba_logs = desc->has_mba_logs;
 
-	ret = qcom_q6v5_init(&qproc->q6v5, pdev, rproc, MPSS_CRASH_REASON_SMEM, "modem",
-			     qcom_msa_handover);
+	ret = qcom_q6v5_init(&qproc->q6v5, pdev, rproc, QCOM_SMEM_HOST_ANY,
+			     MPSS_CRASH_REASON_SMEM, "modem", qcom_msa_handover);
 	if (ret)
 		goto detach_proxy_pds;
 
diff --git a/drivers/remoteproc/qcom_q6v5_pas.c b/drivers/remoteproc/qcom_q6v5_pas.c
index 913a5d2068e8..daca648d4ddb 100644
--- a/drivers/remoteproc/qcom_q6v5_pas.c
+++ b/drivers/remoteproc/qcom_q6v5_pas.c
@@ -34,7 +34,7 @@
 #define ADSP_DECRYPT_SHUTDOWN_DELAY_MS	100
 
 struct adsp_data {
-	int crash_reason_smem;
+	int crash_reason_item;
 	const char *firmware_name;
 	const char *dtb_firmware_name;
 	int pas_id;
@@ -73,7 +73,7 @@ struct qcom_adsp {
 	int pas_id;
 	int dtb_pas_id;
 	unsigned int minidump_id;
-	int crash_reason_smem;
+	int crash_reason_item;
 	bool decrypt_shutdown;
 	const char *info_name;
 
@@ -728,7 +728,8 @@ static int adsp_probe(struct platform_device *pdev)
 		goto free_rproc;
 	adsp->proxy_pd_count = ret;
 
-	ret = qcom_q6v5_init(&adsp->q6v5, pdev, rproc, desc->crash_reason_smem, desc->load_state,
+	ret = qcom_q6v5_init(&adsp->q6v5, pdev, rproc, QCOM_SMEM_HOST_ANY,
+			     desc->crash_reason_item, desc->load_state,
 			     qcom_pas_handover);
 	if (ret)
 		goto detach_proxy_pds;
@@ -777,7 +778,7 @@ static void adsp_remove(struct platform_device *pdev)
 }
 
 static const struct adsp_data adsp_resource_init = {
-		.crash_reason_smem = 423,
+		.crash_reason_item = 423,
 		.firmware_name = "adsp.mdt",
 		.pas_id = 1,
 		.auto_boot = true,
@@ -787,7 +788,7 @@ static const struct adsp_data adsp_resource_init = {
 };
 
 static const struct adsp_data sdm845_adsp_resource_init = {
-		.crash_reason_smem = 423,
+		.crash_reason_item = 423,
 		.firmware_name = "adsp.mdt",
 		.pas_id = 1,
 		.auto_boot = true,
@@ -798,7 +799,7 @@ static const struct adsp_data sdm845_adsp_resource_init = {
 };
 
 static const struct adsp_data sm6350_adsp_resource = {
-	.crash_reason_smem = 423,
+	.crash_reason_item = 423,
 	.firmware_name = "adsp.mdt",
 	.pas_id = 1,
 	.auto_boot = true,
@@ -814,7 +815,7 @@ static const struct adsp_data sm6350_adsp_resource = {
 };
 
 static const struct adsp_data sm6375_mpss_resource = {
-	.crash_reason_smem = 421,
+	.crash_reason_item = 421,
 	.firmware_name = "modem.mdt",
 	.pas_id = 4,
 	.minidump_id = 3,
@@ -829,7 +830,7 @@ static const struct adsp_data sm6375_mpss_resource = {
 };
 
 static const struct adsp_data sm8150_adsp_resource = {
-		.crash_reason_smem = 423,
+		.crash_reason_item = 423,
 		.firmware_name = "adsp.mdt",
 		.pas_id = 1,
 		.auto_boot = true,
@@ -844,7 +845,7 @@ static const struct adsp_data sm8150_adsp_resource = {
 };
 
 static const struct adsp_data sm8250_adsp_resource = {
-	.crash_reason_smem = 423,
+	.crash_reason_item = 423,
 	.firmware_name = "adsp.mdt",
 	.pas_id = 1,
 	.auto_boot = true,
@@ -860,7 +861,7 @@ static const struct adsp_data sm8250_adsp_resource = {
 };
 
 static const struct adsp_data sm8350_adsp_resource = {
-	.crash_reason_smem = 423,
+	.crash_reason_item = 423,
 	.firmware_name = "adsp.mdt",
 	.pas_id = 1,
 	.auto_boot = true,
@@ -876,7 +877,7 @@ static const struct adsp_data sm8350_adsp_resource = {
 };
 
 static const struct adsp_data msm8996_adsp_resource = {
-		.crash_reason_smem = 423,
+		.crash_reason_item = 423,
 		.firmware_name = "adsp.mdt",
 		.pas_id = 1,
 		.auto_boot = true,
@@ -890,7 +891,7 @@ static const struct adsp_data msm8996_adsp_resource = {
 };
 
 static const struct adsp_data cdsp_resource_init = {
-	.crash_reason_smem = 601,
+	.crash_reason_item = 601,
 	.firmware_name = "cdsp.mdt",
 	.pas_id = 18,
 	.auto_boot = true,
@@ -900,7 +901,7 @@ static const struct adsp_data cdsp_resource_init = {
 };
 
 static const struct adsp_data sdm845_cdsp_resource_init = {
-	.crash_reason_smem = 601,
+	.crash_reason_item = 601,
 	.firmware_name = "cdsp.mdt",
 	.pas_id = 18,
 	.auto_boot = true,
@@ -911,7 +912,7 @@ static const struct adsp_data sdm845_cdsp_resource_init = {
 };
 
 static const struct adsp_data sm6350_cdsp_resource = {
-	.crash_reason_smem = 601,
+	.crash_reason_item = 601,
 	.firmware_name = "cdsp.mdt",
 	.pas_id = 18,
 	.auto_boot = true,
@@ -927,7 +928,7 @@ static const struct adsp_data sm6350_cdsp_resource = {
 };
 
 static const struct adsp_data sm8150_cdsp_resource = {
-	.crash_reason_smem = 601,
+	.crash_reason_item = 601,
 	.firmware_name = "cdsp.mdt",
 	.pas_id = 18,
 	.auto_boot = true,
@@ -942,7 +943,7 @@ static const struct adsp_data sm8150_cdsp_resource = {
 };
 
 static const struct adsp_data sm8250_cdsp_resource = {
-	.crash_reason_smem = 601,
+	.crash_reason_item = 601,
 	.firmware_name = "cdsp.mdt",
 	.pas_id = 18,
 	.auto_boot = true,
@@ -957,7 +958,7 @@ static const struct adsp_data sm8250_cdsp_resource = {
 };
 
 static const struct adsp_data sc8280xp_nsp0_resource = {
-	.crash_reason_smem = 601,
+	.crash_reason_item = 601,
 	.firmware_name = "cdsp.mdt",
 	.pas_id = 18,
 	.auto_boot = true,
@@ -971,7 +972,7 @@ static const struct adsp_data sc8280xp_nsp0_resource = {
 };
 
 static const struct adsp_data sc8280xp_nsp1_resource = {
-	.crash_reason_smem = 633,
+	.crash_reason_item = 633,
 	.firmware_name = "cdsp.mdt",
 	.pas_id = 30,
 	.auto_boot = true,
@@ -985,7 +986,7 @@ static const struct adsp_data sc8280xp_nsp1_resource = {
 };
 
 static const struct adsp_data sm8350_cdsp_resource = {
-	.crash_reason_smem = 601,
+	.crash_reason_item = 601,
 	.firmware_name = "cdsp.mdt",
 	.pas_id = 18,
 	.auto_boot = true,
@@ -1001,7 +1002,7 @@ static const struct adsp_data sm8350_cdsp_resource = {
 };
 
 static const struct adsp_data mpss_resource_init = {
-	.crash_reason_smem = 421,
+	.crash_reason_item = 421,
 	.firmware_name = "modem.mdt",
 	.pas_id = 4,
 	.minidump_id = 3,
@@ -1018,7 +1019,7 @@ static const struct adsp_data mpss_resource_init = {
 };
 
 static const struct adsp_data sc8180x_mpss_resource = {
-	.crash_reason_smem = 421,
+	.crash_reason_item = 421,
 	.firmware_name = "modem.mdt",
 	.pas_id = 4,
 	.auto_boot = false,
@@ -1033,7 +1034,7 @@ static const struct adsp_data sc8180x_mpss_resource = {
 };
 
 static const struct adsp_data msm8996_slpi_resource_init = {
-		.crash_reason_smem = 424,
+		.crash_reason_item = 424,
 		.firmware_name = "slpi.mdt",
 		.pas_id = 12,
 		.auto_boot = true,
@@ -1047,7 +1048,7 @@ static const struct adsp_data msm8996_slpi_resource_init = {
 };
 
 static const struct adsp_data sdm845_slpi_resource_init = {
-		.crash_reason_smem = 424,
+		.crash_reason_item = 424,
 		.firmware_name = "slpi.mdt",
 		.pas_id = 12,
 		.auto_boot = true,
@@ -1063,7 +1064,7 @@ static const struct adsp_data sdm845_slpi_resource_init = {
 };
 
 static const struct adsp_data wcss_resource_init = {
-	.crash_reason_smem = 421,
+	.crash_reason_item = 421,
 	.firmware_name = "wcnss.mdt",
 	.pas_id = 6,
 	.auto_boot = true,
@@ -1073,7 +1074,7 @@ static const struct adsp_data wcss_resource_init = {
 };
 
 static const struct adsp_data sdx55_mpss_resource = {
-	.crash_reason_smem = 421,
+	.crash_reason_item = 421,
 	.firmware_name = "modem.mdt",
 	.pas_id = 4,
 	.auto_boot = true,
@@ -1088,7 +1089,7 @@ static const struct adsp_data sdx55_mpss_resource = {
 };
 
 static const struct adsp_data sm8450_mpss_resource = {
-	.crash_reason_smem = 421,
+	.crash_reason_item = 421,
 	.firmware_name = "modem.mdt",
 	.pas_id = 4,
 	.minidump_id = 3,
@@ -1106,7 +1107,7 @@ static const struct adsp_data sm8450_mpss_resource = {
 };
 
 static const struct adsp_data sm8550_adsp_resource = {
-	.crash_reason_smem = 423,
+	.crash_reason_item = 423,
 	.firmware_name = "adsp.mdt",
 	.dtb_firmware_name = "adsp_dtb.mdt",
 	.pas_id = 1,
@@ -1125,7 +1126,7 @@ static const struct adsp_data sm8550_adsp_resource = {
 };
 
 static const struct adsp_data sm8550_cdsp_resource = {
-	.crash_reason_smem = 601,
+	.crash_reason_item = 601,
 	.firmware_name = "cdsp.mdt",
 	.dtb_firmware_name = "cdsp_dtb.mdt",
 	.pas_id = 18,
@@ -1145,7 +1146,7 @@ static const struct adsp_data sm8550_cdsp_resource = {
 };
 
 static const struct adsp_data sm8550_mpss_resource = {
-	.crash_reason_smem = 421,
+	.crash_reason_item = 421,
 	.firmware_name = "modem.mdt",
 	.dtb_firmware_name = "modem_dtb.mdt",
 	.pas_id = 4,
diff --git a/drivers/remoteproc/qcom_q6v5_wcss.c b/drivers/remoteproc/qcom_q6v5_wcss.c
index cff1fa07d1de..f6b6ec10d21b 100644
--- a/drivers/remoteproc/qcom_q6v5_wcss.c
+++ b/drivers/remoteproc/qcom_q6v5_wcss.c
@@ -18,6 +18,7 @@
 #include <linux/regulator/consumer.h>
 #include <linux/reset.h>
 #include <linux/soc/qcom/mdt_loader.h>
+#include <linux/soc/qcom/smem.h>
 #include "qcom_common.h"
 #include "qcom_pil_info.h"
 #include "qcom_q6v5.h"
@@ -93,7 +94,7 @@ enum {
 
 struct wcss_data {
 	const char *firmware_name;
-	unsigned int crash_reason_smem;
+	unsigned int crash_reason_item;
 	u32 version;
 	bool aon_reset_required;
 	bool wcss_q6_reset_required;
@@ -143,7 +144,7 @@ struct q6v5_wcss {
 	void *mem_region;
 	size_t mem_size;
 
-	unsigned int crash_reason_smem;
+	unsigned int crash_reason_item;
 	u32 version;
 	bool requires_force_stop;
 
@@ -1047,7 +1048,8 @@ static int q6v5_wcss_probe(struct platform_device *pdev)
 	if (ret)
 		goto free_rproc;
 
-	ret = qcom_q6v5_init(&wcss->q6v5, pdev, rproc, desc->crash_reason_smem, NULL, NULL);
+	ret = qcom_q6v5_init(&wcss->q6v5, pdev, rproc, QCOM_SMEM_HOST_ANY,
+			     desc->crash_reason_item, NULL, NULL);
 	if (ret)
 		goto free_rproc;
 
@@ -1085,7 +1087,7 @@ static void q6v5_wcss_remove(struct platform_device *pdev)
 
 static const struct wcss_data wcss_ipq8074_res_init = {
 	.firmware_name = "IPQ8074/q6_fw.mdt",
-	.crash_reason_smem = WCSS_CRASH_REASON,
+	.crash_reason_item = WCSS_CRASH_REASON,
 	.aon_reset_required = true,
 	.wcss_q6_reset_required = true,
 	.ops = &q6v5_wcss_ipq8074_ops,
@@ -1093,7 +1095,7 @@ static const struct wcss_data wcss_ipq8074_res_init = {
 };
 
 static const struct wcss_data wcss_qcs404_res_init = {
-	.crash_reason_smem = WCSS_CRASH_REASON,
+	.crash_reason_item = WCSS_CRASH_REASON,
 	.firmware_name = "wcnss.mdt",
 	.version = WCSS_QCS404,
 	.aon_reset_required = false,
