Skip to content

Commit a6b974b

Browse files
tnmyshmathieupoirier
authored andcommitted
drivers: remoteproc: xlnx: Add Versal and Versal-NET support
AMD-Xilinx Versal platform is successor of ZynqMP platform. Real-time Processing Unit R5 cluster IP on Versal is same as of ZynqMP Platform. Power-domains ids for Versal platform is different than ZynqMP. AMD-Xilinx Versal-NET platform is successor of Versal platform. Versal-NET Real-Time Processing Unit has two clusters and each cluster contains dual core ARM Cortex-R52 processors. Each R52 core is assigned 128KB of TCM memory. Signed-off-by: Tanmay Shah <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Mathieu Poirier <[email protected]>
1 parent 72c350c commit a6b974b

File tree

1 file changed

+17
-36
lines changed

1 file changed

+17
-36
lines changed

drivers/remoteproc/xlnx_r5_remoteproc.c

Lines changed: 17 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -300,36 +300,6 @@ static void zynqmp_r5_rproc_kick(struct rproc *rproc, int vqid)
300300
dev_warn(dev, "failed to send message\n");
301301
}
302302

303-
/*
304-
* zynqmp_r5_set_mode()
305-
*
306-
* set RPU cluster and TCM operation mode
307-
*
308-
* @r5_core: pointer to zynqmp_r5_core type object
309-
* @fw_reg_val: value expected by firmware to configure RPU cluster mode
310-
* @tcm_mode: value expected by fw to configure TCM mode (lockstep or split)
311-
*
312-
* Return: 0 for success and < 0 for failure
313-
*/
314-
static int zynqmp_r5_set_mode(struct zynqmp_r5_core *r5_core,
315-
enum rpu_oper_mode fw_reg_val,
316-
enum rpu_tcm_comb tcm_mode)
317-
{
318-
int ret;
319-
320-
ret = zynqmp_pm_set_rpu_mode(r5_core->pm_domain_id, fw_reg_val);
321-
if (ret < 0) {
322-
dev_err(r5_core->dev, "failed to set RPU mode\n");
323-
return ret;
324-
}
325-
326-
ret = zynqmp_pm_set_tcm_config(r5_core->pm_domain_id, tcm_mode);
327-
if (ret < 0)
328-
dev_err(r5_core->dev, "failed to configure TCM\n");
329-
330-
return ret;
331-
}
332-
333303
/*
334304
* zynqmp_r5_rproc_start()
335305
* @rproc: single R5 core's corresponding rproc instance
@@ -941,7 +911,7 @@ static int zynqmp_r5_core_init(struct zynqmp_r5_cluster *cluster,
941911
/* Maintain backward compatibility for zynqmp by using hardcode TCM address. */
942912
if (of_find_property(r5_core->np, "reg", NULL))
943913
ret = zynqmp_r5_get_tcm_node_from_dt(cluster);
944-
else
914+
else if (device_is_compatible(dev, "xlnx,zynqmp-r5fss"))
945915
ret = zynqmp_r5_get_tcm_node(cluster);
946916

947917
if (ret) {
@@ -960,12 +930,21 @@ static int zynqmp_r5_core_init(struct zynqmp_r5_cluster *cluster,
960930
return ret;
961931
}
962932

963-
ret = zynqmp_r5_set_mode(r5_core, fw_reg_val, tcm_mode);
964-
if (ret) {
965-
dev_err(dev, "failed to set r5 cluster mode %d, err %d\n",
966-
cluster->mode, ret);
933+
ret = zynqmp_pm_set_rpu_mode(r5_core->pm_domain_id, fw_reg_val);
934+
if (ret < 0) {
935+
dev_err(r5_core->dev, "failed to set RPU mode\n");
967936
return ret;
968937
}
938+
939+
if (of_find_property(dev_of_node(dev), "xlnx,tcm-mode", NULL) ||
940+
device_is_compatible(dev, "xlnx,zynqmp-r5fss")) {
941+
ret = zynqmp_pm_set_tcm_config(r5_core->pm_domain_id,
942+
tcm_mode);
943+
if (ret < 0) {
944+
dev_err(r5_core->dev, "failed to configure TCM\n");
945+
return ret;
946+
}
947+
}
969948
}
970949

971950
return 0;
@@ -1022,7 +1001,7 @@ static int zynqmp_r5_cluster_init(struct zynqmp_r5_cluster *cluster)
10221001
ret = of_property_read_u32(dev_node, "xlnx,tcm-mode", (u32 *)&tcm_mode);
10231002
if (ret)
10241003
return ret;
1025-
} else {
1004+
} else if (device_is_compatible(dev, "xlnx,zynqmp-r5fss")) {
10261005
if (cluster_mode == LOCKSTEP_MODE)
10271006
tcm_mode = PM_RPU_TCM_COMB;
10281007
else
@@ -1212,6 +1191,8 @@ static int zynqmp_r5_remoteproc_probe(struct platform_device *pdev)
12121191

12131192
/* Match table for OF platform binding */
12141193
static const struct of_device_id zynqmp_r5_remoteproc_match[] = {
1194+
{ .compatible = "xlnx,versal-net-r52fss", },
1195+
{ .compatible = "xlnx,versal-r5fss", },
12151196
{ .compatible = "xlnx,zynqmp-r5fss", },
12161197
{ /* end of list */ },
12171198
};

0 commit comments

Comments
 (0)