| Message ID | 20221227145216.1524-3-devarsht@ti.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Add single core R5F IPC for AM62 SoC family | expand |
On Tue, Dec 27, 2022 at 08:22:16PM +0530, Devarsh Thakkar wrote: > AM62 and AM62A SoCs use single core R5F which is a new scenario > different than the one being used with CLUSTER_MODE_SINGLECPU > which is for utilizing a single core from a set of cores available > in R5F cluster present in the SoC. > > To support this single core scenario map it with > newly defined CLUSTER_MODE_NONE and use it when > compatible is set to ti,am62-r5fss. > > Signed-off-by: Devarsh Thakkar <devarsht@ti.com> > --- > V2: Fix indentation and ordering issues as per review comments > V3: Change CLUSTER_MODE_NONE value to -1 > V4: No change > V5: No change (fixing typo in email address) > --- > drivers/remoteproc/ti_k3_r5_remoteproc.c | 57 ++++++++++++++++++------ > 1 file changed, 44 insertions(+), 13 deletions(-) > > diff --git a/drivers/remoteproc/ti_k3_r5_remoteproc.c b/drivers/remoteproc/ti_k3_r5_remoteproc.c > index 0481926c6975..127f1f68e592 100644 > --- a/drivers/remoteproc/ti_k3_r5_remoteproc.c > +++ b/drivers/remoteproc/ti_k3_r5_remoteproc.c > @@ -74,9 +74,11 @@ struct k3_r5_mem { > * Split mode : AM65x, J721E, J7200 and AM64x SoCs > * LockStep mode : AM65x, J721E and J7200 SoCs > * Single-CPU mode : AM64x SoCs only > + * None : AM62x, AM62A SoCs > */ > enum cluster_mode { > - CLUSTER_MODE_SPLIT = 0, > + CLUSTER_MODE_NONE = -1, s/CLUSTER_MODE_NONE/CLUSTER_MODE_ONECORE And add it after CLUSTER_MODE_SINGLECPU > + CLUSTER_MODE_SPLIT, > CLUSTER_MODE_LOCKSTEP, > CLUSTER_MODE_SINGLECPU, > }; > @@ -86,11 +88,13 @@ enum cluster_mode { > * @tcm_is_double: flag to denote the larger unified TCMs in certain modes > * @tcm_ecc_autoinit: flag to denote the auto-initialization of TCMs for ECC > * @single_cpu_mode: flag to denote if SoC/IP supports Single-CPU mode > + * @is_single_core: flag to denote if SoC/IP has only single core R5 > */ > struct k3_r5_soc_data { > bool tcm_is_double; > bool tcm_ecc_autoinit; > bool single_cpu_mode; > + bool is_single_core; > }; > > /** > @@ -838,7 +842,8 @@ static int k3_r5_rproc_configure(struct k3_r5_rproc *kproc) > > core0 = list_first_entry(&cluster->cores, struct k3_r5_core, elem); > if (cluster->mode == CLUSTER_MODE_LOCKSTEP || > - cluster->mode == CLUSTER_MODE_SINGLECPU) { > + cluster->mode == CLUSTER_MODE_SINGLECPU || > + cluster->mode == CLUSTER_MODE_NONE) { > core = core0; > } else { > core = kproc->core; > @@ -853,7 +858,7 @@ static int k3_r5_rproc_configure(struct k3_r5_rproc *kproc) > boot_vec, cfg, ctrl, stat); > > /* check if only Single-CPU mode is supported on applicable SoCs */ > - if (cluster->soc_data->single_cpu_mode) { > + if (cluster->soc_data->single_cpu_mode || cluster->soc_data->is_single_core) { Everywhere other than k3_r5_probe(), cluster->mode should be used. Otherwise it is wildly confusing and error prone. Please resend this set with an extra preamble patch that fixes this. > single_cpu = > !!(stat & PROC_BOOT_STATUS_FLAG_R5_SINGLECORE_ONLY); > if (single_cpu && cluster->mode == CLUSTER_MODE_SPLIT) { > @@ -1074,6 +1079,7 @@ static void k3_r5_adjust_tcm_sizes(struct k3_r5_rproc *kproc) > > if (cluster->mode == CLUSTER_MODE_LOCKSTEP || > cluster->mode == CLUSTER_MODE_SINGLECPU || > + cluster->mode == CLUSTER_MODE_NONE || > !cluster->soc_data->tcm_is_double) > return; > > @@ -1147,7 +1153,9 @@ static int k3_r5_rproc_configure_mode(struct k3_r5_rproc *kproc) > atcm_enable = cfg & PROC_BOOT_CFG_FLAG_R5_ATCM_EN ? 1 : 0; > btcm_enable = cfg & PROC_BOOT_CFG_FLAG_R5_BTCM_EN ? 1 : 0; > loczrama = cfg & PROC_BOOT_CFG_FLAG_R5_TCM_RSTBASE ? 1 : 0; > - if (cluster->soc_data->single_cpu_mode) { > + if (cluster->soc_data->is_single_core) { > + mode = CLUSTER_MODE_NONE; > + } else if (cluster->soc_data->single_cpu_mode) { > mode = cfg & PROC_BOOT_CFG_FLAG_R5_SINGLE_CORE ? > CLUSTER_MODE_SINGLECPU : CLUSTER_MODE_SPLIT; Same comment as above. > } else { > @@ -1271,7 +1279,8 @@ static int k3_r5_cluster_rproc_init(struct platform_device *pdev) > > /* create only one rproc in lockstep mode or single-cpu mode */ > if (cluster->mode == CLUSTER_MODE_LOCKSTEP || > - cluster->mode == CLUSTER_MODE_SINGLECPU) > + cluster->mode == CLUSTER_MODE_SINGLECPU || > + cluster->mode == CLUSTER_MODE_NONE) > break; > } > > @@ -1704,21 +1713,32 @@ static int k3_r5_probe(struct platform_device *pdev) > * default to most common efuse configurations - Split-mode on AM64x > * and LockStep-mode on all others > */ The above comment needs to be adjusted. Thanks, Mathieu > - cluster->mode = data->single_cpu_mode ? > + if (!data->is_single_core) > + cluster->mode = data->single_cpu_mode ? > CLUSTER_MODE_SPLIT : CLUSTER_MODE_LOCKSTEP; > + else > + cluster->mode = CLUSTER_MODE_NONE; > + > cluster->soc_data = data; > INIT_LIST_HEAD(&cluster->cores); > > - ret = of_property_read_u32(np, "ti,cluster-mode", &cluster->mode); > - if (ret < 0 && ret != -EINVAL) { > - dev_err(dev, "invalid format for ti,cluster-mode, ret = %d\n", > - ret); > - return ret; > + if (!data->is_single_core) { > + ret = of_property_read_s32(np, "ti,cluster-mode", &cluster->mode); > + if (ret < 0 && ret != -EINVAL) { > + dev_err(dev, "invalid format for ti,cluster-mode, ret = %d\n", ret); > + return ret; > + } > } > > num_cores = of_get_available_child_count(np); > - if (num_cores != 2) { > - dev_err(dev, "MCU cluster requires both R5F cores to be enabled, num_cores = %d\n", > + if (num_cores != 2 && !data->is_single_core) { > + dev_err(dev, "MCU cluster requires both R5F cores to be enabled but num_cores is set to = %d\n", > + num_cores); > + return -ENODEV; > + } > + > + if (num_cores != 1 && data->is_single_core) { > + dev_err(dev, "SoC supports only single core R5 but num_cores is set to %d\n", > num_cores); > return -ENODEV; > } > @@ -1760,18 +1780,28 @@ static const struct k3_r5_soc_data am65_j721e_soc_data = { > .tcm_is_double = false, > .tcm_ecc_autoinit = false, > .single_cpu_mode = false, > + .is_single_core = false, > }; > > static const struct k3_r5_soc_data j7200_j721s2_soc_data = { > .tcm_is_double = true, > .tcm_ecc_autoinit = true, > .single_cpu_mode = false, > + .is_single_core = false, > }; > > static const struct k3_r5_soc_data am64_soc_data = { > .tcm_is_double = true, > .tcm_ecc_autoinit = true, > .single_cpu_mode = true, > + .is_single_core = false, > +}; > + > +static const struct k3_r5_soc_data am62_soc_data = { > + .tcm_is_double = false, > + .tcm_ecc_autoinit = true, > + .single_cpu_mode = false, > + .is_single_core = true, > }; > > static const struct of_device_id k3_r5_of_match[] = { > @@ -1779,6 +1809,7 @@ static const struct of_device_id k3_r5_of_match[] = { > { .compatible = "ti,j721e-r5fss", .data = &am65_j721e_soc_data, }, > { .compatible = "ti,j7200-r5fss", .data = &j7200_j721s2_soc_data, }, > { .compatible = "ti,am64-r5fss", .data = &am64_soc_data, }, > + { .compatible = "ti,am62-r5fss", .data = &am62_soc_data, }, > { .compatible = "ti,j721s2-r5fss", .data = &j7200_j721s2_soc_data, }, > { /* sentinel */ }, > }; > -- > 2.17.1 >
Hi Mathieu, Thanks for the review. On 11/01/23 00:05, Mathieu Poirier wrote: > On Tue, Dec 27, 2022 at 08:22:16PM +0530, Devarsh Thakkar wrote: >> AM62 and AM62A SoCs use single core R5F which is a new scenario >> different than the one being used with CLUSTER_MODE_SINGLECPU >> which is for utilizing a single core from a set of cores available >> in R5F cluster present in the SoC. >> >> To support this single core scenario map it with >> newly defined CLUSTER_MODE_NONE and use it when >> compatible is set to ti,am62-r5fss. >> >> Signed-off-by: Devarsh Thakkar <devarsht@ti.com> >> --- >> V2: Fix indentation and ordering issues as per review comments >> V3: Change CLUSTER_MODE_NONE value to -1 >> V4: No change >> V5: No change (fixing typo in email address) >> --- >> drivers/remoteproc/ti_k3_r5_remoteproc.c | 57 ++++++++++++++++++------ >> 1 file changed, 44 insertions(+), 13 deletions(-) >> >> diff --git a/drivers/remoteproc/ti_k3_r5_remoteproc.c b/drivers/remoteproc/ti_k3_r5_remoteproc.c >> index 0481926c6975..127f1f68e592 100644 >> --- a/drivers/remoteproc/ti_k3_r5_remoteproc.c >> +++ b/drivers/remoteproc/ti_k3_r5_remoteproc.c >> @@ -74,9 +74,11 @@ struct k3_r5_mem { >> * Split mode : AM65x, J721E, J7200 and AM64x SoCs >> * LockStep mode : AM65x, J721E and J7200 SoCs >> * Single-CPU mode : AM64x SoCs only >> + * None : AM62x, AM62A SoCs >> */ >> enum cluster_mode { >> - CLUSTER_MODE_SPLIT = 0, >> + CLUSTER_MODE_NONE = -1, > > s/CLUSTER_MODE_NONE/CLUSTER_MODE_ONECORE > > And add it after CLUSTER_MODE_SINGLECPU Ok, i will then add it in dt-bindings too. > >> + CLUSTER_MODE_SPLIT, >> CLUSTER_MODE_LOCKSTEP, >> CLUSTER_MODE_SINGLECPU, >> }; >> @@ -86,11 +88,13 @@ enum cluster_mode { >> * @tcm_is_double: flag to denote the larger unified TCMs in certain modes >> * @tcm_ecc_autoinit: flag to denote the auto-initialization of TCMs for ECC >> * @single_cpu_mode: flag to denote if SoC/IP supports Single-CPU mode >> + * @is_single_core: flag to denote if SoC/IP has only single core R5 >> */ >> struct k3_r5_soc_data { >> bool tcm_is_double; >> bool tcm_ecc_autoinit; >> bool single_cpu_mode; >> + bool is_single_core; >> }; >> >> /** >> @@ -838,7 +842,8 @@ static int k3_r5_rproc_configure(struct k3_r5_rproc *kproc) >> >> core0 = list_first_entry(&cluster->cores, struct k3_r5_core, elem); >> if (cluster->mode == CLUSTER_MODE_LOCKSTEP || >> - cluster->mode == CLUSTER_MODE_SINGLECPU) { >> + cluster->mode == CLUSTER_MODE_SINGLECPU || >> + cluster->mode == CLUSTER_MODE_NONE) { >> core = core0; >> } else { >> core = kproc->core; >> @@ -853,7 +858,7 @@ static int k3_r5_rproc_configure(struct k3_r5_rproc *kproc) >> boot_vec, cfg, ctrl, stat); >> >> /* check if only Single-CPU mode is supported on applicable SoCs */ >> - if (cluster->soc_data->single_cpu_mode) { >> + if (cluster->soc_data->single_cpu_mode || cluster->soc_data->is_single_core) { > > Everywhere other than k3_r5_probe(), cluster->mode should be used. Otherwise it > is wildly confusing and error prone. Please resend this set with an extra > preamble patch that fixes this. I agree wherever possible we should do that but some places in the code we are overriding and fine-tuning the cluster-mode value based on firmware configs For e.g. here we are overriding the user selected cluster mode from split mode to single cpu mode if firmware says so and SoC supports single cpu mode. > >> single_cpu = >> !!(stat & PROC_BOOT_STATUS_FLAG_R5_SINGLECORE_ONLY); >> if (single_cpu && cluster->mode == CLUSTER_MODE_SPLIT) { >> @@ -1074,6 +1079,7 @@ static void k3_r5_adjust_tcm_sizes(struct k3_r5_rproc *kproc) >> >> if (cluster->mode == CLUSTER_MODE_LOCKSTEP || >> cluster->mode == CLUSTER_MODE_SINGLECPU || >> + cluster->mode == CLUSTER_MODE_NONE || >> !cluster->soc_data->tcm_is_double) >> return; >> >> @@ -1147,7 +1153,9 @@ static int k3_r5_rproc_configure_mode(struct k3_r5_rproc *kproc) >> atcm_enable = cfg & PROC_BOOT_CFG_FLAG_R5_ATCM_EN ? 1 : 0; >> btcm_enable = cfg & PROC_BOOT_CFG_FLAG_R5_BTCM_EN ? 1 : 0; >> loczrama = cfg & PROC_BOOT_CFG_FLAG_R5_TCM_RSTBASE ? 1 : 0; >> - if (cluster->soc_data->single_cpu_mode) { >> + if (cluster->soc_data->is_single_core) { >> + mode = CLUSTER_MODE_NONE; >> + } else if (cluster->soc_data->single_cpu_mode) { >> mode = cfg & PROC_BOOT_CFG_FLAG_R5_SINGLE_CORE ? >> CLUSTER_MODE_SINGLECPU : CLUSTER_MODE_SPLIT; > > Same comment as above. Here also we are overriding user selected cluster mode based on firmware returned config value and soc data. > >> } else { >> @@ -1271,7 +1279,8 @@ static int k3_r5_cluster_rproc_init(struct platform_device *pdev) >> >> /* create only one rproc in lockstep mode or single-cpu mode */ >> if (cluster->mode == CLUSTER_MODE_LOCKSTEP || >> - cluster->mode == CLUSTER_MODE_SINGLECPU) >> + cluster->mode == CLUSTER_MODE_SINGLECPU || >> + cluster->mode == CLUSTER_MODE_NONE) >> break; >> } >> >> @@ -1704,21 +1713,32 @@ static int k3_r5_probe(struct platform_device *pdev) >> * default to most common efuse configurations - Split-mode on AM64x >> * and LockStep-mode on all others >> */ > > The above comment needs to be adjusted. Will do. Regards, Devarsh > > Thanks, > Mathieu > >> - cluster->mode = data->single_cpu_mode ? >> + if (!data->is_single_core) >> + cluster->mode = data->single_cpu_mode ? >> CLUSTER_MODE_SPLIT : CLUSTER_MODE_LOCKSTEP; >> + else >> + cluster->mode = CLUSTER_MODE_NONE; >> + >> cluster->soc_data = data; >> INIT_LIST_HEAD(&cluster->cores); >> >> - ret = of_property_read_u32(np, "ti,cluster-mode", &cluster->mode); >> - if (ret < 0 && ret != -EINVAL) { >> - dev_err(dev, "invalid format for ti,cluster-mode, ret = %d\n", >> - ret); >> - return ret; >> + if (!data->is_single_core) { >> + ret = of_property_read_s32(np, "ti,cluster-mode", &cluster->mode); >> + if (ret < 0 && ret != -EINVAL) { >> + dev_err(dev, "invalid format for ti,cluster-mode, ret = %d\n", ret); >> + return ret; >> + } >> } >> >> num_cores = of_get_available_child_count(np); >> - if (num_cores != 2) { >> - dev_err(dev, "MCU cluster requires both R5F cores to be enabled, num_cores = %d\n", >> + if (num_cores != 2 && !data->is_single_core) { >> + dev_err(dev, "MCU cluster requires both R5F cores to be enabled but num_cores is set to = %d\n", >> + num_cores); >> + return -ENODEV; >> + } >> + >> + if (num_cores != 1 && data->is_single_core) { >> + dev_err(dev, "SoC supports only single core R5 but num_cores is set to %d\n", >> num_cores); >> return -ENODEV; >> } >> @@ -1760,18 +1780,28 @@ static const struct k3_r5_soc_data am65_j721e_soc_data = { >> .tcm_is_double = false, >> .tcm_ecc_autoinit = false, >> .single_cpu_mode = false, >> + .is_single_core = false, >> }; >> >> static const struct k3_r5_soc_data j7200_j721s2_soc_data = { >> .tcm_is_double = true, >> .tcm_ecc_autoinit = true, >> .single_cpu_mode = false, >> + .is_single_core = false, >> }; >> >> static const struct k3_r5_soc_data am64_soc_data = { >> .tcm_is_double = true, >> .tcm_ecc_autoinit = true, >> .single_cpu_mode = true, >> + .is_single_core = false, >> +}; >> + >> +static const struct k3_r5_soc_data am62_soc_data = { >> + .tcm_is_double = false, >> + .tcm_ecc_autoinit = true, >> + .single_cpu_mode = false, >> + .is_single_core = true, >> }; >> >> static const struct of_device_id k3_r5_of_match[] = { >> @@ -1779,6 +1809,7 @@ static const struct of_device_id k3_r5_of_match[] = { >> { .compatible = "ti,j721e-r5fss", .data = &am65_j721e_soc_data, }, >> { .compatible = "ti,j7200-r5fss", .data = &j7200_j721s2_soc_data, }, >> { .compatible = "ti,am64-r5fss", .data = &am64_soc_data, }, >> + { .compatible = "ti,am62-r5fss", .data = &am62_soc_data, }, >> { .compatible = "ti,j721s2-r5fss", .data = &j7200_j721s2_soc_data, }, >> { /* sentinel */ }, >> }; >> -- >> 2.17.1 >>
On Mon, Jan 16, 2023 at 11:58:55AM +0530, Devarsh Thakkar wrote: > Hi Mathieu, > > Thanks for the review. > > On 11/01/23 00:05, Mathieu Poirier wrote: > > On Tue, Dec 27, 2022 at 08:22:16PM +0530, Devarsh Thakkar wrote: > >> AM62 and AM62A SoCs use single core R5F which is a new scenario > >> different than the one being used with CLUSTER_MODE_SINGLECPU > >> which is for utilizing a single core from a set of cores available > >> in R5F cluster present in the SoC. > >> > >> To support this single core scenario map it with > >> newly defined CLUSTER_MODE_NONE and use it when > >> compatible is set to ti,am62-r5fss. > >> > >> Signed-off-by: Devarsh Thakkar <devarsht@ti.com> > >> --- > >> V2: Fix indentation and ordering issues as per review comments > >> V3: Change CLUSTER_MODE_NONE value to -1 > >> V4: No change > >> V5: No change (fixing typo in email address) > >> --- > >> drivers/remoteproc/ti_k3_r5_remoteproc.c | 57 ++++++++++++++++++------ > >> 1 file changed, 44 insertions(+), 13 deletions(-) > >> > >> diff --git a/drivers/remoteproc/ti_k3_r5_remoteproc.c b/drivers/remoteproc/ti_k3_r5_remoteproc.c > >> index 0481926c6975..127f1f68e592 100644 > >> --- a/drivers/remoteproc/ti_k3_r5_remoteproc.c > >> +++ b/drivers/remoteproc/ti_k3_r5_remoteproc.c > >> @@ -74,9 +74,11 @@ struct k3_r5_mem { > >> * Split mode : AM65x, J721E, J7200 and AM64x SoCs > >> * LockStep mode : AM65x, J721E and J7200 SoCs > >> * Single-CPU mode : AM64x SoCs only > >> + * None : AM62x, AM62A SoCs > >> */ > >> enum cluster_mode { > >> - CLUSTER_MODE_SPLIT = 0, > >> + CLUSTER_MODE_NONE = -1, > > > > s/CLUSTER_MODE_NONE/CLUSTER_MODE_ONECORE > > > > And add it after CLUSTER_MODE_SINGLECPU > Ok, i will then add it in dt-bindings too. > > > >> + CLUSTER_MODE_SPLIT, > >> CLUSTER_MODE_LOCKSTEP, > >> CLUSTER_MODE_SINGLECPU, > >> }; > >> @@ -86,11 +88,13 @@ enum cluster_mode { > >> * @tcm_is_double: flag to denote the larger unified TCMs in certain modes > >> * @tcm_ecc_autoinit: flag to denote the auto-initialization of TCMs for ECC > >> * @single_cpu_mode: flag to denote if SoC/IP supports Single-CPU mode > >> + * @is_single_core: flag to denote if SoC/IP has only single core R5 > >> */ > >> struct k3_r5_soc_data { > >> bool tcm_is_double; > >> bool tcm_ecc_autoinit; > >> bool single_cpu_mode; > >> + bool is_single_core; > >> }; > >> > >> /** > >> @@ -838,7 +842,8 @@ static int k3_r5_rproc_configure(struct k3_r5_rproc *kproc) > >> > >> core0 = list_first_entry(&cluster->cores, struct k3_r5_core, elem); > >> if (cluster->mode == CLUSTER_MODE_LOCKSTEP || > >> - cluster->mode == CLUSTER_MODE_SINGLECPU) { > >> + cluster->mode == CLUSTER_MODE_SINGLECPU || > >> + cluster->mode == CLUSTER_MODE_NONE) { > >> core = core0; > >> } else { > >> core = kproc->core; > >> @@ -853,7 +858,7 @@ static int k3_r5_rproc_configure(struct k3_r5_rproc *kproc) > >> boot_vec, cfg, ctrl, stat); > >> > >> /* check if only Single-CPU mode is supported on applicable SoCs */ > >> - if (cluster->soc_data->single_cpu_mode) { > >> + if (cluster->soc_data->single_cpu_mode || cluster->soc_data->is_single_core) { > > > > Everywhere other than k3_r5_probe(), cluster->mode should be used. Otherwise it > > is wildly confusing and error prone. Please resend this set with an extra > > preamble patch that fixes this. > I agree wherever possible we should do that but some places in the code we are > overriding and fine-tuning the cluster-mode value based on firmware configs > For e.g. here we are overriding the user selected cluster mode from split mode > to single cpu mode if firmware says so and SoC supports single cpu mode. Overriding cluster->mode happens after this and as such, there is no reason why it can't be used in the if() clause. Moreover, reading your V6, this part is completely omitted. Omission? Bug? Feature? > > > >> single_cpu = > >> !!(stat & PROC_BOOT_STATUS_FLAG_R5_SINGLECORE_ONLY); > >> if (single_cpu && cluster->mode == CLUSTER_MODE_SPLIT) { > >> @@ -1074,6 +1079,7 @@ static void k3_r5_adjust_tcm_sizes(struct k3_r5_rproc *kproc) > >> > >> if (cluster->mode == CLUSTER_MODE_LOCKSTEP || > >> cluster->mode == CLUSTER_MODE_SINGLECPU || > >> + cluster->mode == CLUSTER_MODE_NONE || > >> !cluster->soc_data->tcm_is_double) > >> return; > >> > >> @@ -1147,7 +1153,9 @@ static int k3_r5_rproc_configure_mode(struct k3_r5_rproc *kproc) > >> atcm_enable = cfg & PROC_BOOT_CFG_FLAG_R5_ATCM_EN ? 1 : 0; > >> btcm_enable = cfg & PROC_BOOT_CFG_FLAG_R5_BTCM_EN ? 1 : 0; > >> loczrama = cfg & PROC_BOOT_CFG_FLAG_R5_TCM_RSTBASE ? 1 : 0; > >> - if (cluster->soc_data->single_cpu_mode) { > >> + if (cluster->soc_data->is_single_core) { > >> + mode = CLUSTER_MODE_NONE; > >> + } else if (cluster->soc_data->single_cpu_mode) { > >> mode = cfg & PROC_BOOT_CFG_FLAG_R5_SINGLE_CORE ? > >> CLUSTER_MODE_SINGLECPU : CLUSTER_MODE_SPLIT; > > > > Same comment as above. > Here also we are overriding user selected cluster mode based on firmware > returned config value and soc data. Same comment as above. > > > >> } else { > >> @@ -1271,7 +1279,8 @@ static int k3_r5_cluster_rproc_init(struct platform_device *pdev) > >> > >> /* create only one rproc in lockstep mode or single-cpu mode */ > >> if (cluster->mode == CLUSTER_MODE_LOCKSTEP || > >> - cluster->mode == CLUSTER_MODE_SINGLECPU) > >> + cluster->mode == CLUSTER_MODE_SINGLECPU || > >> + cluster->mode == CLUSTER_MODE_NONE) > >> break; > >> } > >> > >> @@ -1704,21 +1713,32 @@ static int k3_r5_probe(struct platform_device *pdev) > >> * default to most common efuse configurations - Split-mode on AM64x > >> * and LockStep-mode on all others > >> */ > > > > The above comment needs to be adjusted. > Will do. > > Regards, > Devarsh > > > > Thanks, > > Mathieu > > > >> - cluster->mode = data->single_cpu_mode ? > >> + if (!data->is_single_core) > >> + cluster->mode = data->single_cpu_mode ? > >> CLUSTER_MODE_SPLIT : CLUSTER_MODE_LOCKSTEP; > >> + else > >> + cluster->mode = CLUSTER_MODE_NONE; > >> + > >> cluster->soc_data = data; > >> INIT_LIST_HEAD(&cluster->cores); > >> > >> - ret = of_property_read_u32(np, "ti,cluster-mode", &cluster->mode); > >> - if (ret < 0 && ret != -EINVAL) { > >> - dev_err(dev, "invalid format for ti,cluster-mode, ret = %d\n", > >> - ret); > >> - return ret; > >> + if (!data->is_single_core) { > >> + ret = of_property_read_s32(np, "ti,cluster-mode", &cluster->mode); > >> + if (ret < 0 && ret != -EINVAL) { > >> + dev_err(dev, "invalid format for ti,cluster-mode, ret = %d\n", ret); > >> + return ret; > >> + } > >> } > >> > >> num_cores = of_get_available_child_count(np); > >> - if (num_cores != 2) { > >> - dev_err(dev, "MCU cluster requires both R5F cores to be enabled, num_cores = %d\n", > >> + if (num_cores != 2 && !data->is_single_core) { > >> + dev_err(dev, "MCU cluster requires both R5F cores to be enabled but num_cores is set to = %d\n", > >> + num_cores); > >> + return -ENODEV; > >> + } > >> + > >> + if (num_cores != 1 && data->is_single_core) { > >> + dev_err(dev, "SoC supports only single core R5 but num_cores is set to %d\n", > >> num_cores); > >> return -ENODEV; > >> } > >> @@ -1760,18 +1780,28 @@ static const struct k3_r5_soc_data am65_j721e_soc_data = { > >> .tcm_is_double = false, > >> .tcm_ecc_autoinit = false, > >> .single_cpu_mode = false, > >> + .is_single_core = false, > >> }; > >> > >> static const struct k3_r5_soc_data j7200_j721s2_soc_data = { > >> .tcm_is_double = true, > >> .tcm_ecc_autoinit = true, > >> .single_cpu_mode = false, > >> + .is_single_core = false, > >> }; > >> > >> static const struct k3_r5_soc_data am64_soc_data = { > >> .tcm_is_double = true, > >> .tcm_ecc_autoinit = true, > >> .single_cpu_mode = true, > >> + .is_single_core = false, > >> +}; > >> + > >> +static const struct k3_r5_soc_data am62_soc_data = { > >> + .tcm_is_double = false, > >> + .tcm_ecc_autoinit = true, > >> + .single_cpu_mode = false, > >> + .is_single_core = true, > >> }; > >> > >> static const struct of_device_id k3_r5_of_match[] = { > >> @@ -1779,6 +1809,7 @@ static const struct of_device_id k3_r5_of_match[] = { > >> { .compatible = "ti,j721e-r5fss", .data = &am65_j721e_soc_data, }, > >> { .compatible = "ti,j7200-r5fss", .data = &j7200_j721s2_soc_data, }, > >> { .compatible = "ti,am64-r5fss", .data = &am64_soc_data, }, > >> + { .compatible = "ti,am62-r5fss", .data = &am62_soc_data, }, > >> { .compatible = "ti,j721s2-r5fss", .data = &j7200_j721s2_soc_data, }, > >> { /* sentinel */ }, > >> }; > >> -- > >> 2.17.1 > >>
Hi Mathieu, On 16/01/23 22:11, Mathieu Poirier wrote: > On Mon, Jan 16, 2023 at 11:58:55AM +0530, Devarsh Thakkar wrote: >> Hi Mathieu, >> >> Thanks for the review. >> >> On 11/01/23 00:05, Mathieu Poirier wrote: >>> On Tue, Dec 27, 2022 at 08:22:16PM +0530, Devarsh Thakkar wrote: >>>> AM62 and AM62A SoCs use single core R5F which is a new scenario >>>> different than the one being used with CLUSTER_MODE_SINGLECPU >>>> which is for utilizing a single core from a set of cores available >>>> in R5F cluster present in the SoC. >>>> >>>> To support this single core scenario map it with >>>> newly defined CLUSTER_MODE_NONE and use it when >>>> compatible is set to ti,am62-r5fss. >>>> >>>> Signed-off-by: Devarsh Thakkar <devarsht@ti.com> >>>> --- >>>> V2: Fix indentation and ordering issues as per review comments >>>> V3: Change CLUSTER_MODE_NONE value to -1 >>>> V4: No change >>>> V5: No change (fixing typo in email address) >>>> --- >>>> drivers/remoteproc/ti_k3_r5_remoteproc.c | 57 ++++++++++++++++++------ >>>> 1 file changed, 44 insertions(+), 13 deletions(-) >>>> >>>> diff --git a/drivers/remoteproc/ti_k3_r5_remoteproc.c b/drivers/remoteproc/ti_k3_r5_remoteproc.c >>>> index 0481926c6975..127f1f68e592 100644 >>>> --- a/drivers/remoteproc/ti_k3_r5_remoteproc.c >>>> +++ b/drivers/remoteproc/ti_k3_r5_remoteproc.c >>>> @@ -74,9 +74,11 @@ struct k3_r5_mem { >>>> * Split mode : AM65x, J721E, J7200 and AM64x SoCs >>>> * LockStep mode : AM65x, J721E and J7200 SoCs >>>> * Single-CPU mode : AM64x SoCs only >>>> + * None : AM62x, AM62A SoCs >>>> */ >>>> enum cluster_mode { >>>> - CLUSTER_MODE_SPLIT = 0, >>>> + CLUSTER_MODE_NONE = -1, >>> >>> s/CLUSTER_MODE_NONE/CLUSTER_MODE_ONECORE >>> >>> And add it after CLUSTER_MODE_SINGLECPU >> Ok, i will then add it in dt-bindings too. >>> >>>> + CLUSTER_MODE_SPLIT, >>>> CLUSTER_MODE_LOCKSTEP, >>>> CLUSTER_MODE_SINGLECPU, >>>> }; >>>> @@ -86,11 +88,13 @@ enum cluster_mode { >>>> * @tcm_is_double: flag to denote the larger unified TCMs in certain modes >>>> * @tcm_ecc_autoinit: flag to denote the auto-initialization of TCMs for ECC >>>> * @single_cpu_mode: flag to denote if SoC/IP supports Single-CPU mode >>>> + * @is_single_core: flag to denote if SoC/IP has only single core R5 >>>> */ >>>> struct k3_r5_soc_data { >>>> bool tcm_is_double; >>>> bool tcm_ecc_autoinit; >>>> bool single_cpu_mode; >>>> + bool is_single_core; >>>> }; >>>> >>>> /** >>>> @@ -838,7 +842,8 @@ static int k3_r5_rproc_configure(struct k3_r5_rproc *kproc) >>>> >>>> core0 = list_first_entry(&cluster->cores, struct k3_r5_core, elem); >>>> if (cluster->mode == CLUSTER_MODE_LOCKSTEP || >>>> - cluster->mode == CLUSTER_MODE_SINGLECPU) { >>>> + cluster->mode == CLUSTER_MODE_SINGLECPU || >>>> + cluster->mode == CLUSTER_MODE_NONE) { >>>> core = core0; >>>> } else { >>>> core = kproc->core; >>>> @@ -853,7 +858,7 @@ static int k3_r5_rproc_configure(struct k3_r5_rproc *kproc) >>>> boot_vec, cfg, ctrl, stat); >>>> >>>> /* check if only Single-CPU mode is supported on applicable SoCs */ >>>> - if (cluster->soc_data->single_cpu_mode) { >>>> + if (cluster->soc_data->single_cpu_mode || cluster->soc_data->is_single_core) { >>> >>> Everywhere other than k3_r5_probe(), cluster->mode should be used. Otherwise it >>> is wildly confusing and error prone. Please resend this set with an extra >>> preamble patch that fixes this. >> I agree wherever possible we should do that but some places in the code we are >> overriding and fine-tuning the cluster-mode value based on firmware configs >> For e.g. here we are overriding the user selected cluster mode from split mode >> to single cpu mode if firmware says so and SoC supports single cpu mode. > > Overriding cluster->mode happens after this and as such, there is no reason why > it can't be used in the if() clause. Moreover, reading your V6, this part is > completely omitted. Omission? Bug? Feature? > I omitted this change after re-checking, since it was not required, I was using it to jump to config but it works fine even without this change since anyway the control reaches there as lockstep cluster mode is not set in this scenario. Best Regards Devarsh >>> >>>> single_cpu = >>>> !!(stat & PROC_BOOT_STATUS_FLAG_R5_SINGLECORE_ONLY); >>>> if (single_cpu && cluster->mode == CLUSTER_MODE_SPLIT) { >>>> @@ -1074,6 +1079,7 @@ static void k3_r5_adjust_tcm_sizes(struct k3_r5_rproc *kproc) >>>> >>>> if (cluster->mode == CLUSTER_MODE_LOCKSTEP || >>>> cluster->mode == CLUSTER_MODE_SINGLECPU || >>>> + cluster->mode == CLUSTER_MODE_NONE || >>>> !cluster->soc_data->tcm_is_double) >>>> return; >>>> >>>> @@ -1147,7 +1153,9 @@ static int k3_r5_rproc_configure_mode(struct k3_r5_rproc *kproc) >>>> atcm_enable = cfg & PROC_BOOT_CFG_FLAG_R5_ATCM_EN ? 1 : 0; >>>> btcm_enable = cfg & PROC_BOOT_CFG_FLAG_R5_BTCM_EN ? 1 : 0; >>>> loczrama = cfg & PROC_BOOT_CFG_FLAG_R5_TCM_RSTBASE ? 1 : 0; >>>> - if (cluster->soc_data->single_cpu_mode) { >>>> + if (cluster->soc_data->is_single_core) { >>>> + mode = CLUSTER_MODE_NONE; >>>> + } else if (cluster->soc_data->single_cpu_mode) { >>>> mode = cfg & PROC_BOOT_CFG_FLAG_R5_SINGLE_CORE ? >>>> CLUSTER_MODE_SINGLECPU : CLUSTER_MODE_SPLIT; >>> >>> Same comment as above. >> Here also we are overriding user selected cluster mode based on firmware >> returned config value and soc data. > > Same comment as above. > >>> >>>> } else { >>>> @@ -1271,7 +1279,8 @@ static int k3_r5_cluster_rproc_init(struct platform_device *pdev) >>>> >>>> /* create only one rproc in lockstep mode or single-cpu mode */ >>>> if (cluster->mode == CLUSTER_MODE_LOCKSTEP || >>>> - cluster->mode == CLUSTER_MODE_SINGLECPU) >>>> + cluster->mode == CLUSTER_MODE_SINGLECPU || >>>> + cluster->mode == CLUSTER_MODE_NONE) >>>> break; >>>> } >>>> >>>> @@ -1704,21 +1713,32 @@ static int k3_r5_probe(struct platform_device *pdev) >>>> * default to most common efuse configurations - Split-mode on AM64x >>>> * and LockStep-mode on all others >>>> */ >>> >>> The above comment needs to be adjusted. >> Will do. >> >> Regards, >> Devarsh >>> >>> Thanks, >>> Mathieu >>> >>>> - cluster->mode = data->single_cpu_mode ? >>>> + if (!data->is_single_core) >>>> + cluster->mode = data->single_cpu_mode ? >>>> CLUSTER_MODE_SPLIT : CLUSTER_MODE_LOCKSTEP; >>>> + else >>>> + cluster->mode = CLUSTER_MODE_NONE; >>>> + >>>> cluster->soc_data = data; >>>> INIT_LIST_HEAD(&cluster->cores); >>>> >>>> - ret = of_property_read_u32(np, "ti,cluster-mode", &cluster->mode); >>>> - if (ret < 0 && ret != -EINVAL) { >>>> - dev_err(dev, "invalid format for ti,cluster-mode, ret = %d\n", >>>> - ret); >>>> - return ret; >>>> + if (!data->is_single_core) { >>>> + ret = of_property_read_s32(np, "ti,cluster-mode", &cluster->mode); >>>> + if (ret < 0 && ret != -EINVAL) { >>>> + dev_err(dev, "invalid format for ti,cluster-mode, ret = %d\n", ret); >>>> + return ret; >>>> + } >>>> } >>>> >>>> num_cores = of_get_available_child_count(np); >>>> - if (num_cores != 2) { >>>> - dev_err(dev, "MCU cluster requires both R5F cores to be enabled, num_cores = %d\n", >>>> + if (num_cores != 2 && !data->is_single_core) { >>>> + dev_err(dev, "MCU cluster requires both R5F cores to be enabled but num_cores is set to = %d\n", >>>> + num_cores); >>>> + return -ENODEV; >>>> + } >>>> + >>>> + if (num_cores != 1 && data->is_single_core) { >>>> + dev_err(dev, "SoC supports only single core R5 but num_cores is set to %d\n", >>>> num_cores); >>>> return -ENODEV; >>>> } >>>> @@ -1760,18 +1780,28 @@ static const struct k3_r5_soc_data am65_j721e_soc_data = { >>>> .tcm_is_double = false, >>>> .tcm_ecc_autoinit = false, >>>> .single_cpu_mode = false, >>>> + .is_single_core = false, >>>> }; >>>> >>>> static const struct k3_r5_soc_data j7200_j721s2_soc_data = { >>>> .tcm_is_double = true, >>>> .tcm_ecc_autoinit = true, >>>> .single_cpu_mode = false, >>>> + .is_single_core = false, >>>> }; >>>> >>>> static const struct k3_r5_soc_data am64_soc_data = { >>>> .tcm_is_double = true, >>>> .tcm_ecc_autoinit = true, >>>> .single_cpu_mode = true, >>>> + .is_single_core = false, >>>> +}; >>>> + >>>> +static const struct k3_r5_soc_data am62_soc_data = { >>>> + .tcm_is_double = false, >>>> + .tcm_ecc_autoinit = true, >>>> + .single_cpu_mode = false, >>>> + .is_single_core = true, >>>> }; >>>> >>>> static const struct of_device_id k3_r5_of_match[] = { >>>> @@ -1779,6 +1809,7 @@ static const struct of_device_id k3_r5_of_match[] = { >>>> { .compatible = "ti,j721e-r5fss", .data = &am65_j721e_soc_data, }, >>>> { .compatible = "ti,j7200-r5fss", .data = &j7200_j721s2_soc_data, }, >>>> { .compatible = "ti,am64-r5fss", .data = &am64_soc_data, }, >>>> + { .compatible = "ti,am62-r5fss", .data = &am62_soc_data, }, >>>> { .compatible = "ti,j721s2-r5fss", .data = &j7200_j721s2_soc_data, }, >>>> { /* sentinel */ }, >>>> }; >>>> -- >>>> 2.17.1 >>>>
diff --git a/drivers/remoteproc/ti_k3_r5_remoteproc.c b/drivers/remoteproc/ti_k3_r5_remoteproc.c index 0481926c6975..127f1f68e592 100644 --- a/drivers/remoteproc/ti_k3_r5_remoteproc.c +++ b/drivers/remoteproc/ti_k3_r5_remoteproc.c @@ -74,9 +74,11 @@ struct k3_r5_mem { * Split mode : AM65x, J721E, J7200 and AM64x SoCs * LockStep mode : AM65x, J721E and J7200 SoCs * Single-CPU mode : AM64x SoCs only + * None : AM62x, AM62A SoCs */ enum cluster_mode { - CLUSTER_MODE_SPLIT = 0, + CLUSTER_MODE_NONE = -1, + CLUSTER_MODE_SPLIT, CLUSTER_MODE_LOCKSTEP, CLUSTER_MODE_SINGLECPU, }; @@ -86,11 +88,13 @@ enum cluster_mode { * @tcm_is_double: flag to denote the larger unified TCMs in certain modes * @tcm_ecc_autoinit: flag to denote the auto-initialization of TCMs for ECC * @single_cpu_mode: flag to denote if SoC/IP supports Single-CPU mode + * @is_single_core: flag to denote if SoC/IP has only single core R5 */ struct k3_r5_soc_data { bool tcm_is_double; bool tcm_ecc_autoinit; bool single_cpu_mode; + bool is_single_core; }; /** @@ -838,7 +842,8 @@ static int k3_r5_rproc_configure(struct k3_r5_rproc *kproc) core0 = list_first_entry(&cluster->cores, struct k3_r5_core, elem); if (cluster->mode == CLUSTER_MODE_LOCKSTEP || - cluster->mode == CLUSTER_MODE_SINGLECPU) { + cluster->mode == CLUSTER_MODE_SINGLECPU || + cluster->mode == CLUSTER_MODE_NONE) { core = core0; } else { core = kproc->core; @@ -853,7 +858,7 @@ static int k3_r5_rproc_configure(struct k3_r5_rproc *kproc) boot_vec, cfg, ctrl, stat); /* check if only Single-CPU mode is supported on applicable SoCs */ - if (cluster->soc_data->single_cpu_mode) { + if (cluster->soc_data->single_cpu_mode || cluster->soc_data->is_single_core) { single_cpu = !!(stat & PROC_BOOT_STATUS_FLAG_R5_SINGLECORE_ONLY); if (single_cpu && cluster->mode == CLUSTER_MODE_SPLIT) { @@ -1074,6 +1079,7 @@ static void k3_r5_adjust_tcm_sizes(struct k3_r5_rproc *kproc) if (cluster->mode == CLUSTER_MODE_LOCKSTEP || cluster->mode == CLUSTER_MODE_SINGLECPU || + cluster->mode == CLUSTER_MODE_NONE || !cluster->soc_data->tcm_is_double) return; @@ -1147,7 +1153,9 @@ static int k3_r5_rproc_configure_mode(struct k3_r5_rproc *kproc) atcm_enable = cfg & PROC_BOOT_CFG_FLAG_R5_ATCM_EN ? 1 : 0; btcm_enable = cfg & PROC_BOOT_CFG_FLAG_R5_BTCM_EN ? 1 : 0; loczrama = cfg & PROC_BOOT_CFG_FLAG_R5_TCM_RSTBASE ? 1 : 0; - if (cluster->soc_data->single_cpu_mode) { + if (cluster->soc_data->is_single_core) { + mode = CLUSTER_MODE_NONE; + } else if (cluster->soc_data->single_cpu_mode) { mode = cfg & PROC_BOOT_CFG_FLAG_R5_SINGLE_CORE ? CLUSTER_MODE_SINGLECPU : CLUSTER_MODE_SPLIT; } else { @@ -1271,7 +1279,8 @@ static int k3_r5_cluster_rproc_init(struct platform_device *pdev) /* create only one rproc in lockstep mode or single-cpu mode */ if (cluster->mode == CLUSTER_MODE_LOCKSTEP || - cluster->mode == CLUSTER_MODE_SINGLECPU) + cluster->mode == CLUSTER_MODE_SINGLECPU || + cluster->mode == CLUSTER_MODE_NONE) break; } @@ -1704,21 +1713,32 @@ static int k3_r5_probe(struct platform_device *pdev) * default to most common efuse configurations - Split-mode on AM64x * and LockStep-mode on all others */ - cluster->mode = data->single_cpu_mode ? + if (!data->is_single_core) + cluster->mode = data->single_cpu_mode ? CLUSTER_MODE_SPLIT : CLUSTER_MODE_LOCKSTEP; + else + cluster->mode = CLUSTER_MODE_NONE; + cluster->soc_data = data; INIT_LIST_HEAD(&cluster->cores); - ret = of_property_read_u32(np, "ti,cluster-mode", &cluster->mode); - if (ret < 0 && ret != -EINVAL) { - dev_err(dev, "invalid format for ti,cluster-mode, ret = %d\n", - ret); - return ret; + if (!data->is_single_core) { + ret = of_property_read_s32(np, "ti,cluster-mode", &cluster->mode); + if (ret < 0 && ret != -EINVAL) { + dev_err(dev, "invalid format for ti,cluster-mode, ret = %d\n", ret); + return ret; + } } num_cores = of_get_available_child_count(np); - if (num_cores != 2) { - dev_err(dev, "MCU cluster requires both R5F cores to be enabled, num_cores = %d\n", + if (num_cores != 2 && !data->is_single_core) { + dev_err(dev, "MCU cluster requires both R5F cores to be enabled but num_cores is set to = %d\n", + num_cores); + return -ENODEV; + } + + if (num_cores != 1 && data->is_single_core) { + dev_err(dev, "SoC supports only single core R5 but num_cores is set to %d\n", num_cores); return -ENODEV; } @@ -1760,18 +1780,28 @@ static const struct k3_r5_soc_data am65_j721e_soc_data = { .tcm_is_double = false, .tcm_ecc_autoinit = false, .single_cpu_mode = false, + .is_single_core = false, }; static const struct k3_r5_soc_data j7200_j721s2_soc_data = { .tcm_is_double = true, .tcm_ecc_autoinit = true, .single_cpu_mode = false, + .is_single_core = false, }; static const struct k3_r5_soc_data am64_soc_data = { .tcm_is_double = true, .tcm_ecc_autoinit = true, .single_cpu_mode = true, + .is_single_core = false, +}; + +static const struct k3_r5_soc_data am62_soc_data = { + .tcm_is_double = false, + .tcm_ecc_autoinit = true, + .single_cpu_mode = false, + .is_single_core = true, }; static const struct of_device_id k3_r5_of_match[] = { @@ -1779,6 +1809,7 @@ static const struct of_device_id k3_r5_of_match[] = { { .compatible = "ti,j721e-r5fss", .data = &am65_j721e_soc_data, }, { .compatible = "ti,j7200-r5fss", .data = &j7200_j721s2_soc_data, }, { .compatible = "ti,am64-r5fss", .data = &am64_soc_data, }, + { .compatible = "ti,am62-r5fss", .data = &am62_soc_data, }, { .compatible = "ti,j721s2-r5fss", .data = &j7200_j721s2_soc_data, }, { /* sentinel */ }, };
AM62 and AM62A SoCs use single core R5F which is a new scenario different than the one being used with CLUSTER_MODE_SINGLECPU which is for utilizing a single core from a set of cores available in R5F cluster present in the SoC. To support this single core scenario map it with newly defined CLUSTER_MODE_NONE and use it when compatible is set to ti,am62-r5fss. Signed-off-by: Devarsh Thakkar <devarsht@ti.com> --- V2: Fix indentation and ordering issues as per review comments V3: Change CLUSTER_MODE_NONE value to -1 V4: No change V5: No change (fixing typo in email address) --- drivers/remoteproc/ti_k3_r5_remoteproc.c | 57 ++++++++++++++++++------ 1 file changed, 44 insertions(+), 13 deletions(-)