[PATCH 0/3] sandbox cleanups

[PATCH 0/3] sandbox cleanups

[Marc Kleine-Budde]

Hey Sascha,

three patches for next, please fixup into the for-next/sandbox-of banch.

Two patches cleanup the hostfile handling, while the third one will generate a
device tree of the fly, if no one is specified on the sandbox command line.

Marc

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 1/3] fixup! sandbox: hostfile: completely switch to OF based probing

[Marc Kleine-Budde]

It makes no sense to put an address-cells and size-cells property in the
hostfile, as it will only affect sub-nodes.

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
 arch/sandbox/board/hostfile.c | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/arch/sandbox/board/hostfile.c b/arch/sandbox/board/hostfile.c
index c6fd80fd8761..41ded73a3a21 100644
--- a/arch/sandbox/board/hostfile.c
+++ b/arch/sandbox/board/hostfile.c
@@ -140,14 +140,6 @@ static int of_hostfile_fixup(struct device_node *root, void *ctx)
 	if (ret)
 		return ret;
 
-	ret = of_property_write_u32(node, "#address-cells", 2);
-	if (ret)
-		return ret;
-
-	ret = of_property_write_u32(node, "#size-cells", 1);
-	if (ret)
-		return ret;
-
 	ret = of_set_property(node, "compatible", hostfile_dt_ids->compatible,
 			      strlen(hostfile_dt_ids->compatible) + 1, 1);
 	if (ret)
-- 
2.1.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 2/3] fixup! sandbox: hostfile: completely switch to OF based probing

[Marc Kleine-Budde]

hostfile: add "barebox" prefix to properties

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
 arch/sandbox/board/hostfile.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/arch/sandbox/board/hostfile.c b/arch/sandbox/board/hostfile.c
index 41ded73a3a21..c1a2643bc7ff 100644
--- a/arch/sandbox/board/hostfile.c
+++ b/arch/sandbox/board/hostfile.c
@@ -85,11 +85,12 @@ static int hf_probe(struct device_d *dev)
 	if (!dev->device_node)
 		return -ENODEV;
 
-	err = of_property_read_u32(dev->device_node, "fd", &priv->fd);
+	err = of_property_read_u32(dev->device_node, "barebox,fd", &priv->fd);
 	if (err)
 		return err;
 
-	err = of_property_read_string(dev->device_node, "filename", &priv->filename);
+	err = of_property_read_string(dev->device_node, "barebox,filename",
+				      &priv->filename);
 	if (err)
 		return err;
 
@@ -132,7 +133,8 @@ static int of_hostfile_fixup(struct device_node *root, void *ctx)
 
 	node = of_new_node(root, hf->devname);
 
-	ret = of_property_write_u32(node, "fd", hf->fd);
+	ret = of_set_property(node, "compatible", hostfile_dt_ids->compatible,
+			      strlen(hostfile_dt_ids->compatible) + 1, 1);
 	if (ret)
 		return ret;
 
@@ -140,12 +142,11 @@ static int of_hostfile_fixup(struct device_node *root, void *ctx)
 	if (ret)
 		return ret;
 
-	ret = of_set_property(node, "compatible", hostfile_dt_ids->compatible,
-			      strlen(hostfile_dt_ids->compatible) + 1, 1);
+	ret = of_property_write_u32(node, "barebox,fd", hf->fd);
 	if (ret)
 		return ret;
 
-	ret = of_set_property(node, "filename", hf->filename,
+	ret = of_set_property(node, "barebox,filename", hf->filename,
 			      strlen(hf->filename) + 1, 1);
 
 	return ret;
-- 
2.1.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 3/3] fixup! sandbox: add support to pass dtb to barebox

[Marc Kleine-Budde]

This patch will generate a oftree on the fly, if no dtb is specified on the cmd
line.

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
 arch/sandbox/board/dtb.c | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/arch/sandbox/board/dtb.c b/arch/sandbox/board/dtb.c
index 9d4210164e01..708eca903a38 100644
--- a/arch/sandbox/board/dtb.c
+++ b/arch/sandbox/board/dtb.c
@@ -38,15 +38,25 @@ int barebox_register_dtb(const void *new_dtb)
 static int of_sandbox_init(void)
 {
 	struct device_node *root;
+	int ret;
 
-	if (!dtb)
-		return 0;
+	if (dtb) {
+		root = of_unflatten_dtb(dtb);
+	} else {
+		root = of_new_node(NULL, NULL);
+				
+		ret = of_property_write_u32(root, "#address-cells", 2);
+		if (ret)
+			return ret;
 
-	root = of_unflatten_dtb(dtb);
-	if (IS_ERR(root)) {
-		return PTR_ERR(root);
+		ret = of_property_write_u32(root, "#size-cells", 1);
+		if (ret)
+			return ret;
 	}
 
+	if (IS_ERR(root))
+		return PTR_ERR(root);
+
 	of_set_root_node(root);
 	of_fix_tree(root);
 	if (IS_ENABLED(CONFIG_OFDEVICE))
-- 
2.1.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 0/3] sandbox cleanups

[Sascha Hauer]

On Thu, Mar 05, 2015 at 03:36:38PM +0100, Marc Kleine-Budde wrote:
> Hey Sascha,
> 
> three patches for next, please fixup into the for-next/sandbox-of banch.
> 
> Two patches cleanup the hostfile handling, while the third one will generate a
> device tree of the fly, if no one is specified on the sandbox command line.

Applied, thanks

Sascha

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 0/3] sandbox cleanups

[Jean-Christophe PLAGNIOL-VILLARD]

On 15:36 Thu 05 Mar     , Marc Kleine-Budde wrote:
> Hey Sascha,
> 
> three patches for next, please fixup into the for-next/sandbox-of banch.

I test the new sanbox on next

when you pass -i the file is not present in the /dev now

I'm working on secure boot and I use sandbox & qemu to test it

can we fix it asap please TOO busy to dig into it

Best Regards,
J.
> 
> Two patches cleanup the hostfile handling, while the third one will generate a
> device tree of the fly, if no one is specified on the sandbox command line.
> 
> Marc
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 0/3] sandbox cleanups

[Marc Kleine-Budde]

[-- Attachment #1.1: Type: text/plain, Size: 802 bytes --]

On 03/10/2015 03:24 PM, Jean-Christophe PLAGNIOL-VILLARD wrote:
> On 15:36 Thu 05 Mar     , Marc Kleine-Budde wrote:
>> Hey Sascha,
>>
>> three patches for next, please fixup into the for-next/sandbox-of banch.
> 
> I test the new sanbox on next
> 
> when you pass -i the file is not present in the /dev now
> 
> I'm working on secure boot and I use sandbox & qemu to test it
> 
> can we fix it asap please TOO busy to dig into it

Can you apply there three patches and check if the problem is solved?

Marc

-- 
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |


[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

[-- Attachment #2: Type: text/plain, Size: 149 bytes --]

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 0/3] sandbox cleanups

[Marc Kleine-Budde]

[-- Attachment #1.1: Type: text/plain, Size: 483 bytes --]

On 03/10/2015 03:24 PM, Jean-Christophe PLAGNIOL-VILLARD wrote:
> I'm working on secure boot and I use sandbox & qemu to test it

BTW: what's your target ARCH, as I'm working on secure boot, too.

Marc
-- 
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |


[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

[-- Attachment #2: Type: text/plain, Size: 149 bytes --]

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 0/3] sandbox cleanups

[Marc Kleine-Budde]

[-- Attachment #1.1: Type: text/plain, Size: 498 bytes --]

On 03/10/2015 03:26 PM, Marc Kleine-Budde wrote:
>> can we fix it asap please TOO busy to dig into it
> 
> Can you apply there three patches and check if the problem is solved?

Should be fixed on next now.

Marc

-- 
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |


[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

[-- Attachment #2: Type: text/plain, Size: 149 bytes --]

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 0/3] sandbox cleanups

[Jean-Christophe PLAGNIOL-VILLARD]

> On Mar 10, 2015, at 10:32 PM, Marc Kleine-Budde <mkl@pengutronix.de> wrote:
> 
> On 03/10/2015 03:24 PM, Jean-Christophe PLAGNIOL-VILLARD wrote:
>> I'm working on secure boot and I use sandbox & qemu to test it
> 
> BTW: what's your target ARCH, as I'm working on secure boot, too.

6 different one

IMX6 is one of them

HAB4

I’m sending patch I need one or 2 weeks more and I’ll have a first full implenentation

Best Regards,
J.
> 
> Marc
> -- 
> Pengutronix e.K.                  | Marc Kleine-Budde           |
> Industrial Linux Solutions        | Phone: +49-231-2826-924     |
> Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
> Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |
> 


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 0/3] sandbox cleanups

[Marc Kleine-Budde]

[-- Attachment #1.1: Type: text/plain, Size: 493 bytes --]

On 03/10/2015 03:59 PM, Jean-Christophe PLAGNIOL-VILLARD wrote:
> IMX6 is one of them
> 
> HAB4

/me, too

> I’m sending patch I need one or 2 weeks more and I’ll have a first full implenentation

Marc

-- 
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |


[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

[-- Attachment #2: Type: text/plain, Size: 149 bytes --]

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 0/3] sandbox cleanups

[Marc Kleine-Budde]

[-- Attachment #1.1: Type: text/plain, Size: 999 bytes --]

On 03/10/2015 03:52 PM, Marc Kleine-Budde wrote:
> On 03/10/2015 03:26 PM, Marc Kleine-Budde wrote:
>>> can we fix it asap please TOO busy to dig into it
>>
>> Can you apply there three patches and check if the problem is solved?
> 
> Should be fixed on next now.

Works here as I expect it:

> ➜ (pts/2) frogger@hardanger:betuta/barebox (state) ./barebox -e env0
> add env0 backed by file env0
[...]
> barebox@barebox sandbox:/ ls -l /dev/env0 
> crw-------      16384 /dev/env0

> ➜ (pts/2) frogger@hardanger:betuta/barebox (state) ./barebox -i env0
> add fd0 backed by file env0
[...]
> barebox@barebox sandbox:/ ls -l /dev/fd0
> crw-------      16384 /dev/fd0

Tested on amd64 host.

Marc

-- 
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |


[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

[-- Attachment #2: Type: text/plain, Size: 149 bytes --]

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox