| Message ID | 1653398017-28426-2-git-send-email-quic_sibis@quicinc.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Miscellaneous PAS fixes | expand |
On 24/05/2022 15:13, Sibi Sankar wrote: > From: Yogesh Lal <quic_ylal@quicinc.com> > > The coredumps for the ADSP,CDSP and MPSS subsystems will be 64 bit from > SM8450 SoCs onward. Update the elf class as elf64 accordingly. Hi, the "will be" got me thinking, whether you meant that SM8450 is the first SoC that features 64-bit coredumps, or it is going to come in a firmware update, but it was 32-bit in an earlier version. If the latter is true, did the consumer-release BSP for hardware vendors include that change? Otherwise it may differ between devices, as some vendors are known not to update their firmwares very often if at all. Konrad > > Fixes: 5cef9b48458d ("remoteproc: qcom: pas: Add SM8450 remoteproc support") > Signed-off-by: Yogesh Lal <quic_ylal@quicinc.com> > Signed-off-by: Sibi Sankar <quic_sibis@quicinc.com> > --- > drivers/remoteproc/qcom_q6v5_pas.c | 68 +++++++++++++++++++++++++++++++++++--- > 1 file changed, 64 insertions(+), 4 deletions(-) > > diff --git a/drivers/remoteproc/qcom_q6v5_pas.c b/drivers/remoteproc/qcom_q6v5_pas.c > index 6ae39c5653b1..8ce68d0bb1bc 100644 > --- a/drivers/remoteproc/qcom_q6v5_pas.c > +++ b/drivers/remoteproc/qcom_q6v5_pas.c > @@ -34,6 +34,7 @@ struct adsp_data { > const char *firmware_name; > int pas_id; > unsigned int minidump_id; > + bool uses_elf64; > bool has_aggre2_clk; > bool auto_boot; > > @@ -450,7 +451,11 @@ static int adsp_probe(struct platform_device *pdev) > } > > rproc->auto_boot = desc->auto_boot; > - rproc_coredump_set_elf_info(rproc, ELFCLASS32, EM_NONE); > + > + if (desc->uses_elf64) > + rproc_coredump_set_elf_info(rproc, ELFCLASS64, EM_NONE); > + else > + rproc_coredump_set_elf_info(rproc, ELFCLASS32, EM_NONE); > > adsp = (struct qcom_adsp *)rproc->priv; > adsp->dev = &pdev->dev; > @@ -617,6 +622,24 @@ static const struct adsp_data sm8350_adsp_resource = { > .ssctl_id = 0x14, > }; > > +static const struct adsp_data sm8450_adsp_resource = { > + .crash_reason_smem = 423, > + .firmware_name = "adsp.mdt", > + .pas_id = 1, > + .uses_elf64 = true, > + .has_aggre2_clk = false, > + .auto_boot = true, > + .proxy_pd_names = (char*[]){ > + "lcx", > + "lmx", > + NULL > + }, > + .load_state = "adsp", > + .ssr_name = "lpass", > + .sysmon_name = "adsp", > + .ssctl_id = 0x14, > +}; > + > static const struct adsp_data msm8996_adsp_resource = { > .crash_reason_smem = 423, > .firmware_name = "adsp.mdt", > @@ -751,6 +774,24 @@ static const struct adsp_data sm8350_cdsp_resource = { > .ssctl_id = 0x17, > }; > > +static const struct adsp_data sm8450_cdsp_resource = { > + .crash_reason_smem = 601, > + .firmware_name = "cdsp.mdt", > + .pas_id = 18, > + .uses_elf64 = true, > + .has_aggre2_clk = false, > + .auto_boot = true, > + .proxy_pd_names = (char*[]){ > + "cx", > + "mxc", > + NULL > + }, > + .load_state = "cdsp", > + .ssr_name = "cdsp", > + .sysmon_name = "cdsp", > + .ssctl_id = 0x17, > +}; > + > static const struct adsp_data mpss_resource_init = { > .crash_reason_smem = 421, > .firmware_name = "modem.mdt", > @@ -785,6 +826,25 @@ static const struct adsp_data sc8180x_mpss_resource = { > .ssctl_id = 0x12, > }; > > +static const struct adsp_data sm8450_mpss_resource = { > + .crash_reason_smem = 421, > + .firmware_name = "modem.mdt", > + .pas_id = 4, > + .minidump_id = 3, > + .uses_elf64 = true, > + .has_aggre2_clk = false, > + .auto_boot = false, > + .proxy_pd_names = (char*[]){ > + "cx", > + "mss", > + NULL > + }, > + .load_state = "modem", > + .ssr_name = "mpss", > + .sysmon_name = "modem", > + .ssctl_id = 0x12, > +}; > + > static const struct adsp_data slpi_resource_init = { > .crash_reason_smem = 424, > .firmware_name = "slpi.mdt", > @@ -913,10 +973,10 @@ static const struct of_device_id adsp_of_match[] = { > { .compatible = "qcom,sm8350-cdsp-pas", .data = &sm8350_cdsp_resource}, > { .compatible = "qcom,sm8350-slpi-pas", .data = &sm8350_slpi_resource}, > { .compatible = "qcom,sm8350-mpss-pas", .data = &mpss_resource_init}, > - { .compatible = "qcom,sm8450-adsp-pas", .data = &sm8350_adsp_resource}, > - { .compatible = "qcom,sm8450-cdsp-pas", .data = &sm8350_cdsp_resource}, > + { .compatible = "qcom,sm8450-adsp-pas", .data = &sm8450_adsp_resource}, > + { .compatible = "qcom,sm8450-cdsp-pas", .data = &sm8450_cdsp_resource}, > { .compatible = "qcom,sm8450-slpi-pas", .data = &sm8350_slpi_resource}, > - { .compatible = "qcom,sm8450-mpss-pas", .data = &mpss_resource_init}, > + { .compatible = "qcom,sm8450-mpss-pas", .data = &sm8450_mpss_resource}, > { }, > }; > MODULE_DEVICE_TABLE(of, adsp_of_match); >
Hey Konrad, Thanks for taking time to review the patch. On 5/25/22 2:47 AM, Konrad Dybcio wrote: > > On 24/05/2022 15:13, Sibi Sankar wrote: >> From: Yogesh Lal <quic_ylal@quicinc.com> >> >> The coredumps for the ADSP,CDSP and MPSS subsystems will be 64 bit from >> SM8450 SoCs onward. Update the elf class as elf64 accordingly. > > Hi, > > > the "will be" got me thinking, whether you meant that SM8450 is the > first SoC that features 64-bit coredumps, or it is going to come in a > firmware update, but it was 32-bit in an earlier version. > > If the latter is true, did the consumer-release BSP for hardware vendors > include that change? Otherwise it may differ between devices, as some > vendors are known not to update their firmwares very often if at all. Given that you reported ^^ I found it odd that the firmware class would change mid-program. Since I picked up the patch from list I had to dig around for info internally. Looks like all the firmware released were just 32 bit and it's only the tooling that does the decryption of the dumps expects the coredumps elf to be 64 bit. Not sure why this happened though, probably tooling upgraded in anticipation of a future fw upgrade. Couldn't get the full history behind the decision. Anyway the commit message needs an update will fix that in the next re-spin. -Sibi > > > Konrad > >> >> Fixes: 5cef9b48458d ("remoteproc: qcom: pas: Add SM8450 remoteproc >> support") >> Signed-off-by: Yogesh Lal <quic_ylal@quicinc.com> >> Signed-off-by: Sibi Sankar <quic_sibis@quicinc.com> >> --- >> drivers/remoteproc/qcom_q6v5_pas.c | 68 >> +++++++++++++++++++++++++++++++++++--- >> 1 file changed, 64 insertions(+), 4 deletions(-) >> >> diff --git a/drivers/remoteproc/qcom_q6v5_pas.c >> b/drivers/remoteproc/qcom_q6v5_pas.c >> index 6ae39c5653b1..8ce68d0bb1bc 100644 >> --- a/drivers/remoteproc/qcom_q6v5_pas.c >> +++ b/drivers/remoteproc/qcom_q6v5_pas.c >> @@ -34,6 +34,7 @@ struct adsp_data { >> const char *firmware_name; >> int pas_id; >> unsigned int minidump_id; >> + bool uses_elf64; >> bool has_aggre2_clk; >> bool auto_boot; >> @@ -450,7 +451,11 @@ static int adsp_probe(struct platform_device *pdev) >> } >> rproc->auto_boot = desc->auto_boot; >> - rproc_coredump_set_elf_info(rproc, ELFCLASS32, EM_NONE); >> + >> + if (desc->uses_elf64) >> + rproc_coredump_set_elf_info(rproc, ELFCLASS64, EM_NONE); >> + else >> + rproc_coredump_set_elf_info(rproc, ELFCLASS32, EM_NONE); >> adsp = (struct qcom_adsp *)rproc->priv; >> adsp->dev = &pdev->dev; >> @@ -617,6 +622,24 @@ static const struct adsp_data >> sm8350_adsp_resource = { >> .ssctl_id = 0x14, >> }; >> +static const struct adsp_data sm8450_adsp_resource = { >> + .crash_reason_smem = 423, >> + .firmware_name = "adsp.mdt", >> + .pas_id = 1, >> + .uses_elf64 = true, >> + .has_aggre2_clk = false, >> + .auto_boot = true, >> + .proxy_pd_names = (char*[]){ >> + "lcx", >> + "lmx", >> + NULL >> + }, >> + .load_state = "adsp", >> + .ssr_name = "lpass", >> + .sysmon_name = "adsp", >> + .ssctl_id = 0x14, >> +}; >> + >> static const struct adsp_data msm8996_adsp_resource = { >> .crash_reason_smem = 423, >> .firmware_name = "adsp.mdt", >> @@ -751,6 +774,24 @@ static const struct adsp_data >> sm8350_cdsp_resource = { >> .ssctl_id = 0x17, >> }; >> +static const struct adsp_data sm8450_cdsp_resource = { >> + .crash_reason_smem = 601, >> + .firmware_name = "cdsp.mdt", >> + .pas_id = 18, >> + .uses_elf64 = true, >> + .has_aggre2_clk = false, >> + .auto_boot = true, >> + .proxy_pd_names = (char*[]){ >> + "cx", >> + "mxc", >> + NULL >> + }, >> + .load_state = "cdsp", >> + .ssr_name = "cdsp", >> + .sysmon_name = "cdsp", >> + .ssctl_id = 0x17, >> +}; >> + >> static const struct adsp_data mpss_resource_init = { >> .crash_reason_smem = 421, >> .firmware_name = "modem.mdt", >> @@ -785,6 +826,25 @@ static const struct adsp_data >> sc8180x_mpss_resource = { >> .ssctl_id = 0x12, >> }; >> +static const struct adsp_data sm8450_mpss_resource = { >> + .crash_reason_smem = 421, >> + .firmware_name = "modem.mdt", >> + .pas_id = 4, >> + .minidump_id = 3, >> + .uses_elf64 = true, >> + .has_aggre2_clk = false, >> + .auto_boot = false, >> + .proxy_pd_names = (char*[]){ >> + "cx", >> + "mss", >> + NULL >> + }, >> + .load_state = "modem", >> + .ssr_name = "mpss", >> + .sysmon_name = "modem", >> + .ssctl_id = 0x12, >> +}; >> + >> static const struct adsp_data slpi_resource_init = { >> .crash_reason_smem = 424, >> .firmware_name = "slpi.mdt", >> @@ -913,10 +973,10 @@ static const struct of_device_id adsp_of_match[] >> = { >> { .compatible = "qcom,sm8350-cdsp-pas", .data = >> &sm8350_cdsp_resource}, >> { .compatible = "qcom,sm8350-slpi-pas", .data = >> &sm8350_slpi_resource}, >> { .compatible = "qcom,sm8350-mpss-pas", .data = >> &mpss_resource_init}, >> - { .compatible = "qcom,sm8450-adsp-pas", .data = >> &sm8350_adsp_resource}, >> - { .compatible = "qcom,sm8450-cdsp-pas", .data = >> &sm8350_cdsp_resource}, >> + { .compatible = "qcom,sm8450-adsp-pas", .data = >> &sm8450_adsp_resource}, >> + { .compatible = "qcom,sm8450-cdsp-pas", .data = >> &sm8450_cdsp_resource}, >> { .compatible = "qcom,sm8450-slpi-pas", .data = >> &sm8350_slpi_resource}, >> - { .compatible = "qcom,sm8450-mpss-pas", .data = >> &mpss_resource_init}, >> + { .compatible = "qcom,sm8450-mpss-pas", .data = >> &sm8450_mpss_resource}, >> { }, >> }; >> MODULE_DEVICE_TABLE(of, adsp_of_match); >>
diff --git a/drivers/remoteproc/qcom_q6v5_pas.c b/drivers/remoteproc/qcom_q6v5_pas.c index 6ae39c5653b1..8ce68d0bb1bc 100644 --- a/drivers/remoteproc/qcom_q6v5_pas.c +++ b/drivers/remoteproc/qcom_q6v5_pas.c @@ -34,6 +34,7 @@ struct adsp_data { const char *firmware_name; int pas_id; unsigned int minidump_id; + bool uses_elf64; bool has_aggre2_clk; bool auto_boot; @@ -450,7 +451,11 @@ static int adsp_probe(struct platform_device *pdev) } rproc->auto_boot = desc->auto_boot; - rproc_coredump_set_elf_info(rproc, ELFCLASS32, EM_NONE); + + if (desc->uses_elf64) + rproc_coredump_set_elf_info(rproc, ELFCLASS64, EM_NONE); + else + rproc_coredump_set_elf_info(rproc, ELFCLASS32, EM_NONE); adsp = (struct qcom_adsp *)rproc->priv; adsp->dev = &pdev->dev; @@ -617,6 +622,24 @@ static const struct adsp_data sm8350_adsp_resource = { .ssctl_id = 0x14, }; +static const struct adsp_data sm8450_adsp_resource = { + .crash_reason_smem = 423, + .firmware_name = "adsp.mdt", + .pas_id = 1, + .uses_elf64 = true, + .has_aggre2_clk = false, + .auto_boot = true, + .proxy_pd_names = (char*[]){ + "lcx", + "lmx", + NULL + }, + .load_state = "adsp", + .ssr_name = "lpass", + .sysmon_name = "adsp", + .ssctl_id = 0x14, +}; + static const struct adsp_data msm8996_adsp_resource = { .crash_reason_smem = 423, .firmware_name = "adsp.mdt", @@ -751,6 +774,24 @@ static const struct adsp_data sm8350_cdsp_resource = { .ssctl_id = 0x17, }; +static const struct adsp_data sm8450_cdsp_resource = { + .crash_reason_smem = 601, + .firmware_name = "cdsp.mdt", + .pas_id = 18, + .uses_elf64 = true, + .has_aggre2_clk = false, + .auto_boot = true, + .proxy_pd_names = (char*[]){ + "cx", + "mxc", + NULL + }, + .load_state = "cdsp", + .ssr_name = "cdsp", + .sysmon_name = "cdsp", + .ssctl_id = 0x17, +}; + static const struct adsp_data mpss_resource_init = { .crash_reason_smem = 421, .firmware_name = "modem.mdt", @@ -785,6 +826,25 @@ static const struct adsp_data sc8180x_mpss_resource = { .ssctl_id = 0x12, }; +static const struct adsp_data sm8450_mpss_resource = { + .crash_reason_smem = 421, + .firmware_name = "modem.mdt", + .pas_id = 4, + .minidump_id = 3, + .uses_elf64 = true, + .has_aggre2_clk = false, + .auto_boot = false, + .proxy_pd_names = (char*[]){ + "cx", + "mss", + NULL + }, + .load_state = "modem", + .ssr_name = "mpss", + .sysmon_name = "modem", + .ssctl_id = 0x12, +}; + static const struct adsp_data slpi_resource_init = { .crash_reason_smem = 424, .firmware_name = "slpi.mdt", @@ -913,10 +973,10 @@ static const struct of_device_id adsp_of_match[] = { { .compatible = "qcom,sm8350-cdsp-pas", .data = &sm8350_cdsp_resource}, { .compatible = "qcom,sm8350-slpi-pas", .data = &sm8350_slpi_resource}, { .compatible = "qcom,sm8350-mpss-pas", .data = &mpss_resource_init}, - { .compatible = "qcom,sm8450-adsp-pas", .data = &sm8350_adsp_resource}, - { .compatible = "qcom,sm8450-cdsp-pas", .data = &sm8350_cdsp_resource}, + { .compatible = "qcom,sm8450-adsp-pas", .data = &sm8450_adsp_resource}, + { .compatible = "qcom,sm8450-cdsp-pas", .data = &sm8450_cdsp_resource}, { .compatible = "qcom,sm8450-slpi-pas", .data = &sm8350_slpi_resource}, - { .compatible = "qcom,sm8450-mpss-pas", .data = &mpss_resource_init}, + { .compatible = "qcom,sm8450-mpss-pas", .data = &sm8450_mpss_resource}, { }, }; MODULE_DEVICE_TABLE(of, adsp_of_match);