* linux-next: manual merge of the remoteproc tree with Linus' tree
@ 2012-06-20 6:31 Stephen Rothwell
2012-06-20 6:43 ` Ohad Ben-Cohen
0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2012-06-20 6:31 UTC (permalink / raw)
To: Ohad Ben-Cohen; +Cc: linux-next, linux-kernel, "Sjur Brændeland"
[-- Attachment #1: Type: text/plain, Size: 1952 bytes --]
Hi Ohad,
Today's linux-next merge of the remoteproc tree got conflicts in
drivers/remoteproc/remoteproc_core.c between commits e981f6d41acd
("remoteproc: fix print format warnings") and 30338cf09f82 ("remoteproc:
fix missing fault indication in error-path") from Linus' tree and commits
7826bf782364 ("remoteproc: Pass struct fw to load_segments and
find_rsc_table"), a933c9f8ef8a ("remoteproc: Add function
rproc_get_boot_addr") and 32d46fe7f468 ("remoteproc: Move Elf related
functions to separate file") from the remoteproc tree.
I fixed them up (see below) and can carry the fixes as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/remoteproc/remoteproc_core.c
index 66324ee,6779c2a..0000000
--- a/drivers/remoteproc/remoteproc_core.c
+++ b/drivers/remoteproc/remoteproc_core.c
@@@ -1018,9 -789,7 +789,7 @@@ static int rproc_fw_boot(struct rproc *
if (ret)
return ret;
- ehdr = (struct elf32_hdr *)fw->data;
-
- dev_info(dev, "Booting fw image %s, size %d\n", name, fw->size);
+ dev_info(dev, "Booting fw image %s, size %zd\n", name, fw->size);
/*
* if enabling an IOMMU isn't relevant for this rproc, this is
@@@ -1032,19 -801,12 +801,14 @@@
return ret;
}
- /*
- * The ELF entry point is the rproc's boot addr (though this is not
- * a configurable property of all remote processors: some will always
- * boot at a specific hardcoded address).
- */
- rproc->bootaddr = ehdr->e_entry;
+ rproc->bootaddr = rproc_get_boot_addr(rproc, fw);
/* look for the resource table */
- table = rproc_find_rsc_table(rproc, fw->data, fw->size, &tablesz);
+ table = rproc_find_rsc_table(rproc, fw, &tablesz);
- if (!table)
+ if (!table) {
+ ret = -EINVAL;
goto clean_up;
+ }
/* handle fw resources which are required to boot rproc */
ret = rproc_handle_boot_rsc(rproc, table, tablesz);
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: linux-next: manual merge of the remoteproc tree with Linus' tree
2012-06-20 6:31 linux-next: manual merge of the remoteproc tree with Linus' tree Stephen Rothwell
@ 2012-06-20 6:43 ` Ohad Ben-Cohen
0 siblings, 0 replies; 4+ messages in thread
From: Ohad Ben-Cohen @ 2012-06-20 6:43 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, "Sjur Brændeland"
Hi Stephen,
On Wed, Jun 20, 2012 at 9:31 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Ohad,
>
> Today's linux-next merge of the remoteproc tree got conflicts in
> drivers/remoteproc/remoteproc_core.c between commits e981f6d41acd
> ("remoteproc: fix print format warnings") and 30338cf09f82 ("remoteproc:
> fix missing fault indication in error-path") from Linus' tree and commits
> 7826bf782364 ("remoteproc: Pass struct fw to load_segments and
> find_rsc_table"), a933c9f8ef8a ("remoteproc: Add function
> rproc_get_boot_addr") and 32d46fe7f468 ("remoteproc: Move Elf related
> functions to separate file") from the remoteproc tree.
>
> I fixed them up (see below) and can carry the fixes as necessary.
Looks good, thanks!
Ohad.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: linux-next: manual merge of the remoteproc tree with Linus' tree
2012-07-16 6:03 Stephen Rothwell
@ 2012-07-16 6:12 ` Ohad Ben-Cohen
0 siblings, 0 replies; 4+ messages in thread
From: Ohad Ben-Cohen @ 2012-07-16 6:12 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, "Sjur Brændeland"
Hi Stephen,
On Mon, Jul 16, 2012 at 9:03 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Ohad,
>
> Today's linux-next merge of the remoteproc tree got a conflict in
> drivers/remoteproc/remoteproc_core.c between commits e981f6d41acd
> ("remoteproc: fix print format warnings") and 30338cf09f82 ("remoteproc:
> fix missing fault indication in error-path") from Linus' tree and commits
> bd4849848773 ("remoteproc: Pass struct fw to load_segments and
> find_rsc_table") and 72854fb042b1 ("remoteproc: Move Elf related
> functions to separate file") from the remoteproc tree.
>
> I fixed them up (see below) and can carry the fixes as necessary.
Looks great, thanks a lot!
Ohad.
^ permalink raw reply [flat|nested] 4+ messages in thread
* linux-next: manual merge of the remoteproc tree with Linus' tree
@ 2012-07-16 6:03 Stephen Rothwell
2012-07-16 6:12 ` Ohad Ben-Cohen
0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2012-07-16 6:03 UTC (permalink / raw)
To: Ohad Ben-Cohen; +Cc: linux-next, linux-kernel, "Sjur Brændeland"
[-- Attachment #1: Type: text/plain, Size: 1889 bytes --]
Hi Ohad,
Today's linux-next merge of the remoteproc tree got a conflict in
drivers/remoteproc/remoteproc_core.c between commits e981f6d41acd
("remoteproc: fix print format warnings") and 30338cf09f82 ("remoteproc:
fix missing fault indication in error-path") from Linus' tree and commits
bd4849848773 ("remoteproc: Pass struct fw to load_segments and
find_rsc_table") and 72854fb042b1 ("remoteproc: Move Elf related
functions to separate file") from the remoteproc tree.
I fixed them up (see below) and can carry the fixes as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/remoteproc/remoteproc_core.c
index 66324ee,f4d6f7b..0000000
--- a/drivers/remoteproc/remoteproc_core.c
+++ b/drivers/remoteproc/remoteproc_core.c
@@@ -1018,9 -784,7 +784,7 @@@ static int rproc_fw_boot(struct rproc *
if (ret)
return ret;
- ehdr = (struct elf32_hdr *)fw->data;
-
- dev_info(dev, "Booting fw image %s, size %d\n", name, fw->size);
+ dev_info(dev, "Booting fw image %s, size %zd\n", name, fw->size);
/*
* if enabling an IOMMU isn't relevant for this rproc, this is
@@@ -1032,19 -796,12 +796,14 @@@
return ret;
}
- /*
- * The ELF entry point is the rproc's boot addr (though this is not
- * a configurable property of all remote processors: some will always
- * boot at a specific hardcoded address).
- */
- rproc->bootaddr = ehdr->e_entry;
+ rproc->bootaddr = rproc_get_boot_addr(rproc, fw);
/* look for the resource table */
- table = rproc_find_rsc_table(rproc, fw->data, fw->size, &tablesz);
+ table = rproc_find_rsc_table(rproc, fw, &tablesz);
- if (!table)
+ if (!table) {
+ ret = -EINVAL;
goto clean_up;
+ }
/* handle fw resources which are required to boot rproc */
ret = rproc_handle_boot_rsc(rproc, table, tablesz);
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-07-16 6:13 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-06-20 6:31 linux-next: manual merge of the remoteproc tree with Linus' tree Stephen Rothwell
2012-06-20 6:43 ` Ohad Ben-Cohen
2012-07-16 6:03 Stephen Rothwell
2012-07-16 6:12 ` Ohad Ben-Cohen
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).