| Message ID | 20240321084614.45253-3-angelogioacchino.delregno@collabora.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | MediaTek SCP: Urgent fixes for all MTK SoCs | expand |
On Thu, Mar 21, 2024 at 09:46:14AM +0100, AngeloGioacchino Del Regno wrote: > When probing multi-core SCP, this driver is parsing all sub-nodes of > the scp-cluster node, but one of those could be not an actual SCP core > and that would make the entire SCP cluster to fail probing for no good > reason. > > To fix that, in scp_add_multi_core() treat a subnode as a SCP Core by > parsing only available subnodes having compatible "mediatek,scp-core". > > Fixes: 1fdbf0cdde98 ("remoteproc: mediatek: Probe SCP cluster on multi-core SCP") > Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> > --- > drivers/remoteproc/mtk_scp.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/drivers/remoteproc/mtk_scp.c b/drivers/remoteproc/mtk_scp.c > index 67518291a8ad..fbe1c232dae7 100644 > --- a/drivers/remoteproc/mtk_scp.c > +++ b/drivers/remoteproc/mtk_scp.c > @@ -1096,6 +1096,9 @@ static int scp_add_multi_core(struct platform_device *pdev, > cluster_of_data = (const struct mtk_scp_of_data **)of_device_get_match_data(dev); > > for_each_available_child_of_node(np, child) { > + if (!of_device_is_compatible(child, "mediatek,scp-core")) > + continue; > + Interesting - what else gets stashed under the remote processor node? I don't see anything specified in the bindings. Thanks, Mathieu > if (!cluster_of_data[core_id]) { > ret = -EINVAL; > dev_err(dev, "Not support core %d\n", core_id); > -- > 2.44.0 >
Il 21/03/24 16:27, Mathieu Poirier ha scritto: > On Thu, Mar 21, 2024 at 09:46:14AM +0100, AngeloGioacchino Del Regno wrote: >> When probing multi-core SCP, this driver is parsing all sub-nodes of >> the scp-cluster node, but one of those could be not an actual SCP core >> and that would make the entire SCP cluster to fail probing for no good >> reason. >> >> To fix that, in scp_add_multi_core() treat a subnode as a SCP Core by >> parsing only available subnodes having compatible "mediatek,scp-core". >> >> Fixes: 1fdbf0cdde98 ("remoteproc: mediatek: Probe SCP cluster on multi-core SCP") >> Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> >> --- >> drivers/remoteproc/mtk_scp.c | 3 +++ >> 1 file changed, 3 insertions(+) >> >> diff --git a/drivers/remoteproc/mtk_scp.c b/drivers/remoteproc/mtk_scp.c >> index 67518291a8ad..fbe1c232dae7 100644 >> --- a/drivers/remoteproc/mtk_scp.c >> +++ b/drivers/remoteproc/mtk_scp.c >> @@ -1096,6 +1096,9 @@ static int scp_add_multi_core(struct platform_device *pdev, >> cluster_of_data = (const struct mtk_scp_of_data **)of_device_get_match_data(dev); >> >> for_each_available_child_of_node(np, child) { >> + if (!of_device_is_compatible(child, "mediatek,scp-core")) >> + continue; >> + > > Interesting - what else gets stashed under the remote processor node? I don't > see anything specified in the bindings. > Sorry for the late reply - well, in this precise moment in time, upstream, nothing yet. I have noticed this while debugging some lockups and wanted to move the scp_adsp clock controller node as child of the SCP node (as some of those clocks are located *into the SCP's CFG register space*, and it's correct for that to be a child as one of those do depend on the SCP being up - and I'll spare you the rest) and noticed the unexpected behavior, as the SCP driver was treating those as an SCP core. There was no kernel panic, but the SCP would fail probing. This is anyway a missed requirement ... for platforms that want *both* two SCP cores *and* the AudioDSP, as that'd at least be two nodes with the same iostart (scp@1072000, clock-controller@1072000), other than the reasons I explained some lines back. ...and that's why this commit was sent :-) P.S.: The reason why platforms don't crash without the scp_adsp clock controller as a child of SCP is that the bootloader is actually doing basic init for the SCP, hence the block is powered on when booting ;-) Cheers, Angelo > Thanks, > Mathieu > >> if (!cluster_of_data[core_id]) { >> ret = -EINVAL; >> dev_err(dev, "Not support core %d\n", core_id); >> -- >> 2.44.0 >>
On Wed, Mar 27, 2024 at 01:49:58PM +0100, AngeloGioacchino Del Regno wrote: > Il 21/03/24 16:27, Mathieu Poirier ha scritto: > > On Thu, Mar 21, 2024 at 09:46:14AM +0100, AngeloGioacchino Del Regno wrote: > > > When probing multi-core SCP, this driver is parsing all sub-nodes of > > > the scp-cluster node, but one of those could be not an actual SCP core > > > and that would make the entire SCP cluster to fail probing for no good > > > reason. > > > > > > To fix that, in scp_add_multi_core() treat a subnode as a SCP Core by > > > parsing only available subnodes having compatible "mediatek,scp-core". > > > > > > Fixes: 1fdbf0cdde98 ("remoteproc: mediatek: Probe SCP cluster on multi-core SCP") > > > Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> > > > --- > > > drivers/remoteproc/mtk_scp.c | 3 +++ > > > 1 file changed, 3 insertions(+) > > > > > > diff --git a/drivers/remoteproc/mtk_scp.c b/drivers/remoteproc/mtk_scp.c > > > index 67518291a8ad..fbe1c232dae7 100644 > > > --- a/drivers/remoteproc/mtk_scp.c > > > +++ b/drivers/remoteproc/mtk_scp.c > > > @@ -1096,6 +1096,9 @@ static int scp_add_multi_core(struct platform_device *pdev, > > > cluster_of_data = (const struct mtk_scp_of_data **)of_device_get_match_data(dev); > > > for_each_available_child_of_node(np, child) { > > > + if (!of_device_is_compatible(child, "mediatek,scp-core")) > > > + continue; > > > + > > > > Interesting - what else gets stashed under the remote processor node? I don't > > see anything specified in the bindings. > > > > Sorry for the late reply - well, in this precise moment in time, upstream, > nothing yet. > > I have noticed this while debugging some lockups and wanted to move the scp_adsp > clock controller node as child of the SCP node (as some of those clocks are located > *into the SCP's CFG register space*, and it's correct for that to be a child as one > of those do depend on the SCP being up - and I'll spare you the rest) and noticed > the unexpected behavior, as the SCP driver was treating those as an SCP core. > > There was no kernel panic, but the SCP would fail probing. > > This is anyway a missed requirement ... for platforms that want *both* two SCP > cores *and* the AudioDSP, as that'd at least be two nodes with the same iostart > (scp@1072000, clock-controller@1072000), other than the reasons I explained some > lines back. > > ...and that's why this commit was sent :-) > Please update the bindings with the extra clock requirement in your next revision. > P.S.: The reason why platforms don't crash without the scp_adsp clock controller > as a child of SCP is that the bootloader is actually doing basic init for > the SCP, hence the block is powered on when booting ;-) > > Cheers, > Angelo > > > Thanks, > > Mathieu > > > > > if (!cluster_of_data[core_id]) { > > > ret = -EINVAL; > > > dev_err(dev, "Not support core %d\n", core_id); > > > -- > > > 2.44.0 > > > > >
Il 28/03/24 15:38, Mathieu Poirier ha scritto: > On Wed, Mar 27, 2024 at 01:49:58PM +0100, AngeloGioacchino Del Regno wrote: >> Il 21/03/24 16:27, Mathieu Poirier ha scritto: >>> On Thu, Mar 21, 2024 at 09:46:14AM +0100, AngeloGioacchino Del Regno wrote: >>>> When probing multi-core SCP, this driver is parsing all sub-nodes of >>>> the scp-cluster node, but one of those could be not an actual SCP core >>>> and that would make the entire SCP cluster to fail probing for no good >>>> reason. >>>> >>>> To fix that, in scp_add_multi_core() treat a subnode as a SCP Core by >>>> parsing only available subnodes having compatible "mediatek,scp-core". >>>> >>>> Fixes: 1fdbf0cdde98 ("remoteproc: mediatek: Probe SCP cluster on multi-core SCP") >>>> Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> >>>> --- >>>> drivers/remoteproc/mtk_scp.c | 3 +++ >>>> 1 file changed, 3 insertions(+) >>>> >>>> diff --git a/drivers/remoteproc/mtk_scp.c b/drivers/remoteproc/mtk_scp.c >>>> index 67518291a8ad..fbe1c232dae7 100644 >>>> --- a/drivers/remoteproc/mtk_scp.c >>>> +++ b/drivers/remoteproc/mtk_scp.c >>>> @@ -1096,6 +1096,9 @@ static int scp_add_multi_core(struct platform_device *pdev, >>>> cluster_of_data = (const struct mtk_scp_of_data **)of_device_get_match_data(dev); >>>> for_each_available_child_of_node(np, child) { >>>> + if (!of_device_is_compatible(child, "mediatek,scp-core")) >>>> + continue; >>>> + >>> >>> Interesting - what else gets stashed under the remote processor node? I don't >>> see anything specified in the bindings. >>> >> >> Sorry for the late reply - well, in this precise moment in time, upstream, >> nothing yet. >> >> I have noticed this while debugging some lockups and wanted to move the scp_adsp >> clock controller node as child of the SCP node (as some of those clocks are located >> *into the SCP's CFG register space*, and it's correct for that to be a child as one >> of those do depend on the SCP being up - and I'll spare you the rest) and noticed >> the unexpected behavior, as the SCP driver was treating those as an SCP core. >> >> There was no kernel panic, but the SCP would fail probing. >> >> This is anyway a missed requirement ... for platforms that want *both* two SCP >> cores *and* the AudioDSP, as that'd at least be two nodes with the same iostart >> (scp@1072000, clock-controller@1072000), other than the reasons I explained some >> lines back. >> >> ...and that's why this commit was sent :-) >> > > Please update the bindings with the extra clock requirement in your next > revision. > Ok. Can you please take only patch 1/2 of this series so that I can delay this one for a bit? I don't have time to work on that exactly right now. Thanks, Angelo
On Tue, 2 Apr 2024 at 03:56, AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> wrote: > > Il 28/03/24 15:38, Mathieu Poirier ha scritto: > > On Wed, Mar 27, 2024 at 01:49:58PM +0100, AngeloGioacchino Del Regno wrote: > >> Il 21/03/24 16:27, Mathieu Poirier ha scritto: > >>> On Thu, Mar 21, 2024 at 09:46:14AM +0100, AngeloGioacchino Del Regno wrote: > >>>> When probing multi-core SCP, this driver is parsing all sub-nodes of > >>>> the scp-cluster node, but one of those could be not an actual SCP core > >>>> and that would make the entire SCP cluster to fail probing for no good > >>>> reason. > >>>> > >>>> To fix that, in scp_add_multi_core() treat a subnode as a SCP Core by > >>>> parsing only available subnodes having compatible "mediatek,scp-core". > >>>> > >>>> Fixes: 1fdbf0cdde98 ("remoteproc: mediatek: Probe SCP cluster on multi-core SCP") > >>>> Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> > >>>> --- > >>>> drivers/remoteproc/mtk_scp.c | 3 +++ > >>>> 1 file changed, 3 insertions(+) > >>>> > >>>> diff --git a/drivers/remoteproc/mtk_scp.c b/drivers/remoteproc/mtk_scp.c > >>>> index 67518291a8ad..fbe1c232dae7 100644 > >>>> --- a/drivers/remoteproc/mtk_scp.c > >>>> +++ b/drivers/remoteproc/mtk_scp.c > >>>> @@ -1096,6 +1096,9 @@ static int scp_add_multi_core(struct platform_device *pdev, > >>>> cluster_of_data = (const struct mtk_scp_of_data **)of_device_get_match_data(dev); > >>>> for_each_available_child_of_node(np, child) { > >>>> + if (!of_device_is_compatible(child, "mediatek,scp-core")) > >>>> + continue; > >>>> + > >>> > >>> Interesting - what else gets stashed under the remote processor node? I don't > >>> see anything specified in the bindings. > >>> > >> > >> Sorry for the late reply - well, in this precise moment in time, upstream, > >> nothing yet. > >> > >> I have noticed this while debugging some lockups and wanted to move the scp_adsp > >> clock controller node as child of the SCP node (as some of those clocks are located > >> *into the SCP's CFG register space*, and it's correct for that to be a child as one > >> of those do depend on the SCP being up - and I'll spare you the rest) and noticed > >> the unexpected behavior, as the SCP driver was treating those as an SCP core. > >> > >> There was no kernel panic, but the SCP would fail probing. > >> > >> This is anyway a missed requirement ... for platforms that want *both* two SCP > >> cores *and* the AudioDSP, as that'd at least be two nodes with the same iostart > >> (scp@1072000, clock-controller@1072000), other than the reasons I explained some > >> lines back. > >> > >> ...and that's why this commit was sent :-) > >> > > > > Please update the bindings with the extra clock requirement in your next > > revision. > > > > Ok. > > Can you please take only patch 1/2 of this series so that I can delay this one > for a bit? I don't have time to work on that exactly right now. > It was added to rproc-next last week. > Thanks, > Angelo > >
Il 02/04/24 16:23, Mathieu Poirier ha scritto: > On Tue, 2 Apr 2024 at 03:56, AngeloGioacchino Del Regno > <angelogioacchino.delregno@collabora.com> wrote: >> >> Il 28/03/24 15:38, Mathieu Poirier ha scritto: >>> On Wed, Mar 27, 2024 at 01:49:58PM +0100, AngeloGioacchino Del Regno wrote: >>>> Il 21/03/24 16:27, Mathieu Poirier ha scritto: >>>>> On Thu, Mar 21, 2024 at 09:46:14AM +0100, AngeloGioacchino Del Regno wrote: >>>>>> When probing multi-core SCP, this driver is parsing all sub-nodes of >>>>>> the scp-cluster node, but one of those could be not an actual SCP core >>>>>> and that would make the entire SCP cluster to fail probing for no good >>>>>> reason. >>>>>> >>>>>> To fix that, in scp_add_multi_core() treat a subnode as a SCP Core by >>>>>> parsing only available subnodes having compatible "mediatek,scp-core". >>>>>> >>>>>> Fixes: 1fdbf0cdde98 ("remoteproc: mediatek: Probe SCP cluster on multi-core SCP") >>>>>> Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> >>>>>> --- >>>>>> drivers/remoteproc/mtk_scp.c | 3 +++ >>>>>> 1 file changed, 3 insertions(+) >>>>>> >>>>>> diff --git a/drivers/remoteproc/mtk_scp.c b/drivers/remoteproc/mtk_scp.c >>>>>> index 67518291a8ad..fbe1c232dae7 100644 >>>>>> --- a/drivers/remoteproc/mtk_scp.c >>>>>> +++ b/drivers/remoteproc/mtk_scp.c >>>>>> @@ -1096,6 +1096,9 @@ static int scp_add_multi_core(struct platform_device *pdev, >>>>>> cluster_of_data = (const struct mtk_scp_of_data **)of_device_get_match_data(dev); >>>>>> for_each_available_child_of_node(np, child) { >>>>>> + if (!of_device_is_compatible(child, "mediatek,scp-core")) >>>>>> + continue; >>>>>> + >>>>> >>>>> Interesting - what else gets stashed under the remote processor node? I don't >>>>> see anything specified in the bindings. >>>>> >>>> >>>> Sorry for the late reply - well, in this precise moment in time, upstream, >>>> nothing yet. >>>> >>>> I have noticed this while debugging some lockups and wanted to move the scp_adsp >>>> clock controller node as child of the SCP node (as some of those clocks are located >>>> *into the SCP's CFG register space*, and it's correct for that to be a child as one >>>> of those do depend on the SCP being up - and I'll spare you the rest) and noticed >>>> the unexpected behavior, as the SCP driver was treating those as an SCP core. >>>> >>>> There was no kernel panic, but the SCP would fail probing. >>>> >>>> This is anyway a missed requirement ... for platforms that want *both* two SCP >>>> cores *and* the AudioDSP, as that'd at least be two nodes with the same iostart >>>> (scp@1072000, clock-controller@1072000), other than the reasons I explained some >>>> lines back. >>>> >>>> ...and that's why this commit was sent :-) >>>> >>> >>> Please update the bindings with the extra clock requirement in your next >>> revision. >>> >> >> Ok. >> >> Can you please take only patch 1/2 of this series so that I can delay this one >> for a bit? I don't have time to work on that exactly right now. >> > > It was added to rproc-next last week. > Ah, sorry, didn't notice that. Thanks again!
diff --git a/drivers/remoteproc/mtk_scp.c b/drivers/remoteproc/mtk_scp.c index 67518291a8ad..fbe1c232dae7 100644 --- a/drivers/remoteproc/mtk_scp.c +++ b/drivers/remoteproc/mtk_scp.c @@ -1096,6 +1096,9 @@ static int scp_add_multi_core(struct platform_device *pdev, cluster_of_data = (const struct mtk_scp_of_data **)of_device_get_match_data(dev); for_each_available_child_of_node(np, child) { + if (!of_device_is_compatible(child, "mediatek,scp-core")) + continue; + if (!cluster_of_data[core_id]) { ret = -EINVAL; dev_err(dev, "Not support core %d\n", core_id);
When probing multi-core SCP, this driver is parsing all sub-nodes of the scp-cluster node, but one of those could be not an actual SCP core and that would make the entire SCP cluster to fail probing for no good reason. To fix that, in scp_add_multi_core() treat a subnode as a SCP Core by parsing only available subnodes having compatible "mediatek,scp-core". Fixes: 1fdbf0cdde98 ("remoteproc: mediatek: Probe SCP cluster on multi-core SCP") Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> --- drivers/remoteproc/mtk_scp.c | 3 +++ 1 file changed, 3 insertions(+)