From: Bjorn Andersson <bjorn.andersson@linaro.org>
To: Cl?ment Leger <cleger@kalrayinc.com>
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>,
Andy Gross <agross@kernel.org>, Ohad Ben-Cohen <ohad@wizery.com>,
Maxime Coquelin <mcoquelin.stm32@gmail.com>,
Alexandre Torgue <alexandre.torgue@st.com>,
linux-arm-msm <linux-arm-msm@vger.kernel.org>,
linux-remoteproc <linux-remoteproc@vger.kernel.org>,
linux-kernel <linux-kernel@vger.kernel.org>,
linux-stm32 <linux-stm32@st-md-mailman.stormreply.com>,
linux-arm-kernel <linux-arm-kernel@lists.infradead.org>
Subject: Re: [PATCH 1/2] remoteproc: add rproc_coredump_set_elf_info
Date: Sun, 19 Apr 2020 22:57:46 -0700 [thread overview]
Message-ID: <20200420055746.GJ1516868@builder.lan> (raw)
In-Reply-To: <1280711269.16158926.1587152627279.JavaMail.zimbra@kalray.eu>
On Fri 17 Apr 12:43 PDT 2020, Cl?ment Leger wrote:
> ----- On 17 Apr, 2020, at 21:38, Mathieu Poirier mathieu.poirier@linaro.org wrote:
>
> > On Fri, Apr 10, 2020 at 12:24:32PM +0200, Clement Leger wrote:
> >> This function allows drivers to correctly setup the coredump output
> >> elf information.
> >>
> >> Signed-off-by: Clement Leger <cleger@kalray.eu>
> >> ---
> >> drivers/remoteproc/remoteproc_core.c | 32 ++++++++++++++++++++--
> >> drivers/remoteproc/remoteproc_elf_loader.c | 3 --
> >> include/linux/remoteproc.h | 2 ++
> >> 3 files changed, 32 insertions(+), 5 deletions(-)
> >>
> >> diff --git a/drivers/remoteproc/remoteproc_core.c
> >> b/drivers/remoteproc/remoteproc_core.c
> >> index a9ac1d01e09b..382443bab583 100644
> >> --- a/drivers/remoteproc/remoteproc_core.c
> >> +++ b/drivers/remoteproc/remoteproc_core.c
> >> @@ -1562,6 +1562,28 @@ int rproc_coredump_add_custom_segment(struct rproc
> >> *rproc,
> >> }
> >> EXPORT_SYMBOL(rproc_coredump_add_custom_segment);
> >>
> >> +/**
> >> + * rproc_coredump_set_elf_info() - set coredump elf information
> >> + * @rproc: handle of a remote processor
> >> + * @class: elf class for coredump elf file
> >> + * @size: elf machine for coredump elf file
>
> I just noticed that there is a typo, this should be "machine" and not "size".
> Let me know if you'll fix it when applying.
>
Thanks for noticing, I fixed this up and applied the two patches.
Thanks,
Bjorn
> Thanks,
>
> Clément
>
> >> + *
> >> + * Set elf information which will be used for coredump elf file.
> >> + *
> >> + * Return: 0 on success, negative errno on error.
> >> + */
> >> +int rproc_coredump_set_elf_info(struct rproc *rproc, u8 class, u16 machine)
> >> +{
> >> + if (class != ELFCLASS64 && class != ELFCLASS32)
> >> + return -EINVAL;
> >> +
> >> + rproc->elf_class = class;
> >> + rproc->elf_machine = machine;
> >> +
> >> + return 0;
> >> +}
> >> +EXPORT_SYMBOL(rproc_coredump_set_elf_info);
> >> +
> >> /**
> >> * rproc_coredump() - perform coredump
> >> * @rproc: rproc handle
> >> @@ -1584,6 +1606,11 @@ static void rproc_coredump(struct rproc *rproc)
> >> if (list_empty(&rproc->dump_segments))
> >> return;
> >>
> >> + if (class == ELFCLASSNONE) {
> >> + dev_err(&rproc->dev, "Elf class is not set\n");
> >> + return;
> >> + }
> >> +
> >> data_size = elf_size_of_hdr(class);
> >> list_for_each_entry(segment, &rproc->dump_segments, node) {
> >> data_size += elf_size_of_phdr(class) + segment->size;
> >> @@ -1602,7 +1629,7 @@ static void rproc_coredump(struct rproc *rproc)
> >> elf_hdr_init_ident(ehdr, class);
> >>
> >> elf_hdr_set_e_type(class, ehdr, ET_CORE);
> >> - elf_hdr_set_e_machine(class, ehdr, EM_NONE);
> >> + elf_hdr_set_e_machine(class, ehdr, rproc->elf_machine);
> >> elf_hdr_set_e_version(class, ehdr, EV_CURRENT);
> >> elf_hdr_set_e_entry(class, ehdr, rproc->bootaddr);
> >> elf_hdr_set_e_phoff(class, ehdr, elf_size_of_hdr(class));
> >> @@ -2043,7 +2070,8 @@ struct rproc *rproc_alloc(struct device *dev, const char
> >> *name,
> >> rproc->name = name;
> >> rproc->priv = &rproc[1];
> >> rproc->auto_boot = true;
> >> - rproc->elf_class = ELFCLASS32;
> >> + rproc->elf_class = ELFCLASSNONE;
> >> + rproc->elf_machine = EM_NONE;
> >>
> >> device_initialize(&rproc->dev);
> >> rproc->dev.parent = dev;
> >> diff --git a/drivers/remoteproc/remoteproc_elf_loader.c
> >> b/drivers/remoteproc/remoteproc_elf_loader.c
> >> index 16e2c496fd45..4869fb7d8fe4 100644
> >> --- a/drivers/remoteproc/remoteproc_elf_loader.c
> >> +++ b/drivers/remoteproc/remoteproc_elf_loader.c
> >> @@ -248,9 +248,6 @@ int rproc_elf_load_segments(struct rproc *rproc, const
> >> struct firmware *fw)
> >> memset(ptr + filesz, 0, memsz - filesz);
> >> }
> >>
> >> - if (ret == 0)
> >> - rproc->elf_class = class;
> >> -
> >> return ret;
> >> }
> >> EXPORT_SYMBOL(rproc_elf_load_segments);
> >> diff --git a/include/linux/remoteproc.h b/include/linux/remoteproc.h
> >> index ed127b2d35ca..d67eb5a40476 100644
> >> --- a/include/linux/remoteproc.h
> >> +++ b/include/linux/remoteproc.h
> >> @@ -515,6 +515,7 @@ struct rproc {
> >> struct list_head dump_segments;
> >> int nb_vdev;
> >> u8 elf_class;
> >> + u16 elf_machine;
> >> };
> >
> > Reviewed-by: Mathieu Poirier <mathieu.poirier@linaro.org>
> >
> >>
> >> /**
> >> @@ -619,6 +620,7 @@ int rproc_coredump_add_custom_segment(struct rproc *rproc,
> >> struct rproc_dump_segment *segment,
> >> void *dest),
> >> void *priv);
> >> +int rproc_coredump_set_elf_info(struct rproc *rproc, u8 class, u16 machine);
> >>
> >> static inline struct rproc_vdev *vdev_to_rvdev(struct virtio_device *vdev)
> >> {
> >> --
> >> 2.17.1
next prev parent reply other threads:[~2020-04-20 5:57 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-10 10:24 [PATCH 0/2] remoteproc: add rproc_coredump_set_elf_info Clement Leger
2020-04-10 10:24 ` [PATCH 1/2] " Clement Leger
2020-04-11 1:29 ` Bjorn Andersson
2020-04-17 19:38 ` Mathieu Poirier
2020-04-17 19:43 ` Clément Leger
2020-04-20 5:57 ` Bjorn Andersson [this message]
2020-04-10 10:24 ` [PATCH 2/2] remoteproc: use rproc_coredump_set_elf_info in drivers Clement Leger
2020-04-11 1:30 ` Bjorn Andersson
2020-04-17 19:39 ` Mathieu Poirier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200420055746.GJ1516868@builder.lan \
--to=bjorn.andersson@linaro.org \
--cc=agross@kernel.org \
--cc=alexandre.torgue@st.com \
--cc=cleger@kalrayinc.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-remoteproc@vger.kernel.org \
--cc=linux-stm32@st-md-mailman.stormreply.com \
--cc=mathieu.poirier@linaro.org \
--cc=mcoquelin.stm32@gmail.com \
--cc=ohad@wizery.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).