| Message ID | 20240321125518.1675903-1-andersson@kernel.org (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [GIT,PULL] remoteproc updates for v6.9 | expand |
The pull request you sent on Thu, 21 Mar 2024 05:55:13 -0700:
> https://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git tags/rproc-v6.9
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/0e875ee5e897db13104faab93bb1ab2b95da9ab9
Thank you!
On Thu, 21 Mar 2024 at 11:03, Bjorn Andersson <andersson@kernel.org> wrote: > > I was further notified that this conflicts with your tree, Linus. Below > is the resolution for this conflict. Heh. This email came in after the pr-tracker-bot email notifying you that it's already done.. I think I got it all right, it didn't seem at all controversial, but maybe you should double-check. Linus
On Thu, Mar 21, 2024 at 05:55:13AM -0700, Bjorn Andersson wrote: > I'm sorry for the late pull request, I apparently had managed to get git > send-email to only deliver my mail to /dev/null on the machine where I prepared > this. > I was further notified that this conflicts with your tree, Linus. Below is the resolution for this conflict. Please let me know if you'd like me to create some form of merge commit for this. Regards, Bjorn diff --cc drivers/remoteproc/imx_dsp_rproc.c index d73727a5828a,56a799cb8b36..087506e21508 --- a/drivers/remoteproc/imx_dsp_rproc.c +++ b/drivers/remoteproc/imx_dsp_rproc.c @@@ -1090,9 -1154,7 +1090,7 @@@ static int imx_dsp_rproc_probe(struct p return 0; err_detach_domains: - imx_dsp_detach_pm_domains(priv); + dev_pm_domain_detach_list(priv->pd_list); - err_put_rproc: - rproc_free(rproc); return ret; } @@@ -1104,8 -1166,7 +1102,7 @@@ static void imx_dsp_rproc_remove(struc pm_runtime_disable(&pdev->dev); rproc_del(rproc); - imx_dsp_detach_pm_domains(priv); + dev_pm_domain_detach_list(priv->pd_list); - rproc_free(rproc); } /* pm runtime functions */ diff --cc drivers/remoteproc/qcom_q6v5_adsp.c index 93f9a1537ec6,34ac996a93b2..1d24c9b656a8 --- a/drivers/remoteproc/qcom_q6v5_adsp.c +++ b/drivers/remoteproc/qcom_q6v5_adsp.c @@@ -704,13 -713,15 +704,13 @@@ static int adsp_probe(struct platform_d ret = adsp_init_clock(adsp, desc->clk_ids); if (ret) - goto free_rproc; + return ret; - ret = qcom_rproc_pds_attach(adsp->dev, adsp, - desc->proxy_pd_names); + ret = qcom_rproc_pds_attach(adsp, desc->pd_names, desc->num_pds); if (ret < 0) { dev_err(&pdev->dev, "Failed to attach proxy power domains\n"); - goto free_rproc; + return ret; } - adsp->proxy_pd_count = ret; ret = adsp_init_reset(adsp); if (ret) @@@ -742,11 -753,8 +742,8 @@@ return 0; disable_pm: - qcom_rproc_pds_detach(adsp, adsp->proxy_pds, adsp->proxy_pd_count); + qcom_rproc_pds_detach(adsp); - free_rproc: - rproc_free(rproc); - return ret; } @@@ -760,8 -768,7 +757,7 @@@ static void adsp_remove(struct platform qcom_remove_glink_subdev(adsp->rproc, &adsp->glink_subdev); qcom_remove_sysmon_subdev(adsp->sysmon); qcom_remove_ssr_subdev(adsp->rproc, &adsp->ssr_subdev); - qcom_rproc_pds_detach(adsp, adsp->proxy_pds, adsp->proxy_pd_count); + qcom_rproc_pds_detach(adsp); - rproc_free(adsp->rproc); } static const struct adsp_pil_data adsp_resource_init = {
I'm sorry for the late pull request, I apparently had managed to get git send-email to only deliver my mail to /dev/null on the machine where I prepared this. Regards, Bjorn The following changes since commit 6613476e225e090cc9aad49be7fa504e290dd33d: Linux 6.8-rc1 (2024-01-21 14:11:32 -0800) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git tags/rproc-v6.9 for you to fetch changes up to 62210f7509e13a2caa7b080722a45229b8f17a0a: remoteproc: qcom_q6v5_pas: Unload lite firmware on ADSP (2024-03-05 20:02:07 -0800) ---------------------------------------------------------------- remoteproc updates for v6.9 Qualcomm SM8650 audio, compute and modem remoteproc are added. Qualcomm X1 Elite audio and compute remoteprocs are added, after support for shutting down the bootloader-loaded firmware loaded into the audio DSP.. A dozen drivers in the subsystem are transitioned to use devres helpers for remoteproc and memory allocations. It makes it possible to acquire in-kernel handle to individual remoteproc instances in a cluster. The release of DMA memory for remoteproc virtio is corrected to ensure that restarting due to a watchdog bite doesn't attempt to allocate the memory again without first freeing it. Last, but not least, a couple of DeviceTree binding cleanups. ---------------------------------------------------------------- Abel Vesa (1): dt-bindings: remoteproc: qcom,sm8550-pas: document the X1E80100 aDSP & cDSP Andrew Davis (17): remoteproc: k3-dsp: Use devm_rproc_alloc() helper remoteproc: k3-dsp: Add devm action to release reserved memory remoteproc: k3-dsp: Use devm_kcalloc() helper remoteproc: imx_dsp_rproc: Use devm_rproc_alloc() helper remoteproc: imx_rproc: Use devm_rproc_alloc() helper remoteproc: st: Use devm_rproc_alloc() helper remoteproc: stm32: Use devm_rproc_alloc() helper remoteproc: k3-dsp: Use devm_ti_sci_get_by_phandle() helper remoteproc: k3-dsp: Use devm_kzalloc() helper remoteproc: k3-dsp: Add devm action to release tsp remoteproc: k3-dsp: Use devm_ioremap_wc() helper remoteproc: k3-dsp: Use devm_rproc_add() helper remoteproc: qcom_q6v5_adsp: Use devm_rproc_alloc() helper remoteproc: qcom_q6v5_mss: Use devm_rproc_alloc() helper remoteproc: qcom_q6v5_pas: Use devm_rproc_alloc() helper remoteproc: qcom_q6v5_wcss: Use devm_rproc_alloc() helper remoteproc: qcom_wcnss: Use devm_rproc_alloc() helper Arnaud Pouliquen (2): remoteproc: stm32: Fix incorrect type in assignment for va remoteproc: stm32: Fix incorrect type assignment returned by stm32_rproc_get_loaded_rsc_tablef Dmitry Baryshkov (1): remoteproc: qcom: pas: correct data indentation Joakim Zhang (1): remoteproc: virtio: Fix wdg cannot recovery remote processor Krzysztof Kozlowski (2): dt-bindings: remoteproc: qcom,glink-rpm-edge: drop redundant type from label dt-bindings: remoteproc: do not override firmware-name $ref Mathieu Poirier (1): remoteproc: Make rproc_get_by_phandle() work for clusters Neil Armstrong (3): dt-bindings: remoteproc: qcom,sm8550-pas: document the SM8650 PAS remoteproc: qcom: pas: make region assign more generic remoteproc: qcom: pas: Add SM8650 remoteproc support Sibi Sankar (2): remoteproc: qcom_q6v5_pas: Add support for X1E80100 ADSP/CDSP remoteproc: qcom_q6v5_pas: Unload lite firmware on ADSP .../devicetree/bindings/remoteproc/mtk,scp.yaml | 4 +- .../bindings/remoteproc/qcom,glink-rpm-edge.yaml | 1 - .../bindings/remoteproc/qcom,qcs404-pas.yaml | 2 +- .../bindings/remoteproc/qcom,sc7180-pas.yaml | 2 +- .../bindings/remoteproc/qcom,sc7280-wpss-pil.yaml | 2 +- .../bindings/remoteproc/qcom,sc8180x-pas.yaml | 2 +- .../bindings/remoteproc/qcom,sm6115-pas.yaml | 2 +- .../bindings/remoteproc/qcom,sm6350-pas.yaml | 2 +- .../bindings/remoteproc/qcom,sm6375-pas.yaml | 2 +- .../bindings/remoteproc/qcom,sm8150-pas.yaml | 2 +- .../bindings/remoteproc/qcom,sm8350-pas.yaml | 2 +- .../bindings/remoteproc/qcom,sm8550-pas.yaml | 51 +++- .../bindings/remoteproc/qcom,wcnss-pil.yaml | 2 +- drivers/remoteproc/imx_dsp_rproc.c | 11 +- drivers/remoteproc/imx_rproc.c | 16 +- drivers/remoteproc/qcom_q6v5_adsp.c | 14 +- drivers/remoteproc/qcom_q6v5_mss.c | 28 +- drivers/remoteproc/qcom_q6v5_pas.c | 326 ++++++++++++++------- drivers/remoteproc/qcom_q6v5_wcss.c | 24 +- drivers/remoteproc/qcom_wcnss.c | 17 +- drivers/remoteproc/remoteproc_core.c | 29 +- drivers/remoteproc/remoteproc_virtio.c | 6 +- drivers/remoteproc/st_remoteproc.c | 15 +- drivers/remoteproc/stm32_rproc.c | 10 +- drivers/remoteproc/ti_k3_dsp_remoteproc.c | 156 ++++------ 25 files changed, 419 insertions(+), 309 deletions(-)