CR-1076408 P2P buffer allocation failing while running Bytecopy on Ra… (Xilinx#4088)

Author: houlz0507

src/runtime_src/core/pcie/driver/linux/xocl/userpf/xocl_drv.c

@@ -798,6 +798,12 @@ int xocl_refresh_subdevs(struct xocl_dev *xdev)
 		userpf_err(xdev, "create subdev failed %d", ret);
 		goto failed;
 	}
+	ret = xocl_p2p_init(xdev);
+	if (ret) {
+		userpf_err(xdev, "failed to init p2p memory");
+		goto failed;
+	}
+
 	(void) xocl_peer_listen(xdev, xocl_mailbox_srv, (void *)xdev);
 
 	ret = xocl_init_sysfs(xdev);
@@ -841,26 +847,15 @@ void user_pci_reset_done(struct pci_dev *pdev)
 }
 #endif
 
-void xocl_p2p_fini(struct xocl_dev *xdev)
-{
-	if (xocl_subdev_is_vsec(xdev))
-		return;
-
-	xocl_subdev_destroy_by_id(xdev, XOCL_SUBDEV_P2P);
-}
-
 int xocl_p2p_init(struct xocl_dev *xdev)
 {
 	struct xocl_subdev_info subdev_info = XOCL_DEVINFO_P2P;
 	int ret;
 
-	if (xocl_subdev_is_vsec(xdev))
-		return 0;
-
 	/* create p2p subdev for legacy platform */
 	ret = xocl_subdev_create(xdev, &subdev_info);
-	if (ret) {
-		xocl_xdev_info(xdev, "create p2p subdev failed. ret %d", ret);
+	if (ret && ret != -EEXIST) {
+		xocl_xdev_err(xdev, "create p2p subdev failed. ret %d", ret);
 		return ret;
 	}
 
@@ -924,7 +919,6 @@ void xocl_userpf_remove(struct pci_dev *pdev)
 		xdev->core.drm = NULL;
 	}
 
-	xocl_p2p_fini(xdev);
 	xocl_fini_persist_sysfs(xdev);
 	xocl_fini_sysfs(xdev);