diff --git a/src/soc/qualcomm/common/include/soc/symbols_common.h b/src/soc/qualcomm/common/include/soc/symbols_common.h
index 847225216a..5b2cc1be11 100644
--- a/src/soc/qualcomm/common/include/soc/symbols_common.h
+++ b/src/soc/qualcomm/common/include/soc/symbols_common.h
@@ -31,6 +31,7 @@ DECLARE_REGION(dram_modem_extra)
 DECLARE_REGION(dram_wlan)
 DECLARE_REGION(dram_wpss)
 DECLARE_REGION(shrm)
+DECLARE_REGION(cpucp)
 DECLARE_REGION(dram_cpucp_dtbs)
 DECLARE_REGION(dram_cpucp)
 DECLARE_REGION(dram_modem)
diff --git a/src/soc/qualcomm/x1p42100/cpucp_load_reset.c b/src/soc/qualcomm/x1p42100/cpucp_load_reset.c
index 804c992425..274c724724 100644
--- a/src/soc/qualcomm/x1p42100/cpucp_load_reset.c
+++ b/src/soc/qualcomm/x1p42100/cpucp_load_reset.c
@@ -1,13 +1,21 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
+#include <arch/cache.h>
+#include <arch/mmu.h>
 #include <console/console.h>
 #include <program_loading.h>
 #include <soc/cpucp.h>
 #include <device/mmio.h>
 #include <soc/addressmap.h>
+#include <soc/mmu_common.h>
+#include <soc/symbols_common.h>
+#include <symbols.h>
 
 void cpucp_fw_load_reset(void)
 {
+	/* map to cached region to force address to be 4 byte aligned */
+	mmu_config_range((void *)_cpucp, REGION_SIZE(cpucp), CACHED_RAM);
+
 	struct prog cpucp_dtbs_prog =
 		PROG_INIT(PROG_PAYLOAD, CONFIG_CBFS_PREFIX "/cpucp_dtbs");
 
@@ -22,6 +30,11 @@ void cpucp_fw_load_reset(void)
 	if (!selfload(&cpucp_fw_prog))
 		die("SOC image: CPUCP load failed");
 
+	/* flush cached region */
+	dcache_clean_by_mva(_cpucp, REGION_SIZE(cpucp));
+	/* remap back to device memory */
+	mmu_config_range((void *)_cpucp, REGION_SIZE(cpucp), DEV_MEM);
+
 	printk(BIOS_DEBUG, "SOC image: CPUCP image loaded successfully.\n");
 
 	write32((void *) HWIO_APSS_CPUCP_CPUCP_LPM_SEQ_WAIT_EVT_CTRL_MASK_ADDR, 0x0);
diff --git a/src/soc/qualcomm/x1p42100/memlayout.ld b/src/soc/qualcomm/x1p42100/memlayout.ld
index 20dc57dc53..460a0e87cf 100644
--- a/src/soc/qualcomm/x1p42100/memlayout.ld
+++ b/src/soc/qualcomm/x1p42100/memlayout.ld
@@ -98,6 +98,10 @@
  *               |                         shrm                             |    SHRM
  * 0x24040000    +----------------------------------------------------------+ <---------
  *               |         ... (Memory not mapped: Unavailable) ...         | XXXXXXXXX
+ * 0x1CB40000    +----------------------------------------------------------+ <---------
+ *               |                         CPUCP                            |
+ * 0x1CB00000    +----------------------------------------------------------+ <---------
+ *               |         ... (Memory not mapped: Unavailable) ...         | XXXXXXXXX
  * 0x14A80000    +----------------------------------------------------------+ <---------
  *               |                    auth_metadata                         |      ^
  * 0x14A7E000    +----------------------------------------------------------+      |
@@ -233,6 +237,8 @@ SECTIONS
 	REGION(auth_metadata, 0x14A7E000, 8K, 4K)
 	BSRAM_END(0x14A80000)
 
+	REGION(cpucp, 0x1CB00000, 256K , 4K)
+
 	REGION(shrm, 0x24040000, 128K , 4K)
 
 	DRAM_START(0x80000000)