diff --git a/drivers/virt/gunyah/gunyah_qcom.c b/drivers/virt/gunyah/gunyah_qcom.c
index bfce5249d00a..996688446b06 100644
--- a/drivers/virt/gunyah/gunyah_qcom.c
+++ b/drivers/virt/gunyah/gunyah_qcom.c
@@ -42,7 +42,7 @@ static int qcom_scm_gh_rm_pre_mem_share(void *rm, struct gh_rm_mem_parcel *mem_p
 
 	for (i = 0; i < mem_parcel->n_mem_entries; i++) {
 		src_cpy = src;
-		ret = qcom_scm_assign_mem(le64_to_cpu(mem_parcel->mem_entries[i].ipa_base),
+		ret = qcom_scm_assign_mem(le64_to_cpu(mem_parcel->mem_entries[i].phys_addr),
 						le64_to_cpu(mem_parcel->mem_entries[i].size),
 						&src_cpy, new_perms, mem_parcel->n_acl_entries);
 		if (ret) {
@@ -60,7 +60,7 @@ static int qcom_scm_gh_rm_pre_mem_share(void *rm, struct gh_rm_mem_parcel *mem_p
 			for (i--; i >= 0; i--) {
 				src_cpy = src;
 				WARN_ON_ONCE(qcom_scm_assign_mem(
-						le64_to_cpu(mem_parcel->mem_entries[i].ipa_base),
+						le64_to_cpu(mem_parcel->mem_entries[i].phys_addr),
 						le64_to_cpu(mem_parcel->mem_entries[i].size),
 						&src_cpy, new_perms, 1));
 			}
@@ -92,7 +92,7 @@ static int qcom_scm_gh_rm_post_mem_reclaim(void *rm, struct gh_rm_mem_parcel *me
 
 	for (i = 0; i < mem_parcel->n_mem_entries; i++) {
 		src_cpy = src;
-		ret = qcom_scm_assign_mem(le64_to_cpu(mem_parcel->mem_entries[i].ipa_base),
+		ret = qcom_scm_assign_mem(le64_to_cpu(mem_parcel->mem_entries[i].phys_addr),
 						le64_to_cpu(mem_parcel->mem_entries[i].size),
 						&src_cpy, &new_perms, 1);
 		WARN_ON_ONCE(ret);
diff --git a/drivers/virt/gunyah/rsc_mgr.c b/drivers/virt/gunyah/rsc_mgr.c
index 7183b7da223a..2df3283f0b45 100644
--- a/drivers/virt/gunyah/rsc_mgr.c
+++ b/drivers/virt/gunyah/rsc_mgr.c
@@ -631,7 +631,7 @@ out:
  * Context: Process context. Will sleep waiting for reply.
  * Return: 0 on success. <0 if error.
  */
-int gh_rm_call(void *_rm, u32 message_id, void *req_buf, size_t req_buf_size,
+int gh_rm_call(void *_rm, u32 message_id, const void *req_buf, size_t req_buf_size,
 		void **resp_buf, size_t *resp_buf_size)
 {
 	struct gh_rm *rm = _rm;
diff --git a/drivers/virt/gunyah/rsc_mgr.h b/drivers/virt/gunyah/rsc_mgr.h
index 7dca3f0af3ae..8d896a20ceb6 100644
--- a/drivers/virt/gunyah/rsc_mgr.h
+++ b/drivers/virt/gunyah/rsc_mgr.h
@@ -10,7 +10,7 @@
 #include <linux/types.h>
 
 struct gh_rm;
-int gh_rm_call(void *rsc_mgr, u32 message_id, void *req_buf, size_t req_buf_size,
+int gh_rm_call(void *rsc_mgr, u32 message_id, const void *req_buf, size_t req_buf_size,
 		void **resp_buf, size_t *resp_buf_size);
 
 int gh_rm_platform_pre_mem_share(struct gh_rm *rm, struct gh_rm_mem_parcel *mem_parcel);
diff --git a/drivers/virt/gunyah/vm_mgr_mm.c b/drivers/virt/gunyah/vm_mgr_mm.c
index 3157d5317843..627225ba4ca7 100644
--- a/drivers/virt/gunyah/vm_mgr_mm.c
+++ b/drivers/virt/gunyah/vm_mgr_mm.c
@@ -224,7 +224,7 @@ int gh_vm_mem_alloc(struct gh_vm *ghvm, struct gh_userspace_memory_region *regio
 
 	/* reduce number of entries by combining contiguous pages into single memory entry */
 	prev_page = mapping->pages[0];
-	parcel->mem_entries[0].ipa_base = cpu_to_le64(page_to_phys(prev_page));
+	parcel->mem_entries[0].phys_addr = cpu_to_le64(page_to_phys(prev_page));
 	entry_size = PAGE_SIZE;
 	for (i = 1, j = 0; i < mapping->npages; i++) {
 		curr_page = mapping->pages[i];
@@ -233,7 +233,7 @@ int gh_vm_mem_alloc(struct gh_vm *ghvm, struct gh_userspace_memory_region *regio
 		} else {
 			parcel->mem_entries[j].size = cpu_to_le64(entry_size);
 			j++;
-			parcel->mem_entries[j].ipa_base =
+			parcel->mem_entries[j].phys_addr =
 				cpu_to_le64(page_to_phys(curr_page));
 			entry_size = PAGE_SIZE;
 		}
diff --git a/include/linux/gunyah_rsc_mgr.h b/include/linux/gunyah_rsc_mgr.h
index f23e848794af..cb3bd292c2aa 100644
--- a/include/linux/gunyah_rsc_mgr.h
+++ b/include/linux/gunyah_rsc_mgr.h
@@ -14,7 +14,7 @@
 #define GH_MEM_HANDLE_INVAL	U32_MAX
 
 struct gh_rm;
-int gh_rm_call(void *rm, u32 message_id, void *req_buf, size_t req_buf_size,
+int gh_rm_call(void *rm, u32 message_id, const void *req_buf, size_t req_buf_size,
 		void **resp_buf, size_t *resp_buf_size);
 int gh_rm_notifier_register(void *rm, struct notifier_block *nb);
 int gh_rm_notifier_unregister(void *rm, struct notifier_block *nb);
@@ -65,7 +65,7 @@ struct gh_rm_mem_acl_entry {
 } __packed;
 
 struct gh_rm_mem_entry {
-	__le64 ipa_base;
+	__le64 phys_addr;
 	__le64 size;
 } __packed;