On Tue, Aug 27, 2019 at 04:32:38PM +0200, Ahmad Fatoum wrote:
> When testing things like barebox state in sandbox, it's nice to be able
> to refer to a partition on a hostfile by phandle. Support this by
> checking for reading the barebox,filename property.
>
> Signed-off-by: Ahmad Fatoum <ahmad@xxxxxx>
> ---
> arch/sandbox/board/hostfile.c | 16 ++++--
> arch/sandbox/dts/sandbox-state.dtsi | 50 +++++++++++++++++++
> .../sandbox/mach-sandbox/include/mach/linux.h | 1 +
> arch/sandbox/os/common.c | 5 ++
> 4 files changed, 68 insertions(+), 4 deletions(-)
> create mode 100644 arch/sandbox/dts/sandbox-state.dtsi
>
> diff --git a/arch/sandbox/board/hostfile.c b/arch/sandbox/board/hostfile.c
> index 745f078d1a79..e5a7580d0792 100644
> --- a/arch/sandbox/board/hostfile.c
> +++ b/arch/sandbox/board/hostfile.c
> @@ -84,15 +84,16 @@ static int hf_probe(struct device_d *dev)
> if (!dev->device_node)
> return -ENODEV;
>
> - err = of_property_read_u32(dev->device_node, "barebox,fd", &priv->fd);
> - if (err)
> - return err;
> + of_property_read_u32(dev->device_node, "barebox,fd", &priv->fd);
>
> err = of_property_read_string(dev->device_node, "barebox,filename",
> &priv->filename);
> if (err)
> return err;
>
> + if (!priv->fd)
> + priv->fd = linux_open(priv->filename, true);
> +
> priv->cdev.name = dev->device_node->name;
> priv->cdev.dev = dev;
> priv->cdev.ops = &hf_fops;
> @@ -101,7 +102,14 @@ static int hf_probe(struct device_d *dev)
> dev->info = hf_info;
> dev->priv = priv;
>
> - return devfs_create(&priv->cdev);
> + err = devfs_create(&priv->cdev);
> + if (err)
> + return err;
> +
> + of_parse_partitions(&priv->cdev, dev->device_node);
> + of_partitions_register_fixup(&priv->cdev);
> +
> + return 0;
> }
>
> static __maybe_unused struct of_device_id hostfile_dt_ids[] = {
> diff --git a/arch/sandbox/dts/sandbox-state.dtsi b/arch/sandbox/dts/sandbox-state.dtsi
> new file mode 100644
> index 000000000000..fc17bd078899
> --- /dev/null
> +++ b/arch/sandbox/dts/sandbox-state.dtsi
> @@ -0,0 +1,50 @@
This file doesn't belong into this patch.
Applied 1-4 for now.
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@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
