diff --git a/arch/sandbox/Kconfig b/arch/sandbox/Kconfig index c20a917..6ec71a9 100644 --- a/arch/sandbox/Kconfig +++ b/arch/sandbox/Kconfig @@ -15,9 +15,6 @@ default y select GENERIC_FIND_NEXT_BIT -config ARCH_LINUX - bool - config SANDBOX_UNWIND bool default y diff --git a/arch/sandbox/Makefile b/arch/sandbox/Makefile index 52ad485..b127560 100644 --- a/arch/sandbox/Makefile +++ b/arch/sandbox/Makefile @@ -1,6 +1,7 @@ KBUILD_DEFCONFIG := sandbox_defconfig -CPPFLAGS += -D__SANDBOX__ -fno-strict-aliasing +CPPFLAGS += -D__SANDBOX__ -fno-strict-aliasing -fvisibility=hidden + machine-y := sandbox @@ -23,7 +24,8 @@ -Dglob=barebox_glob -Dglobfree=barebox_globfree \ -Dioctl=barebox_ioctl -Dfstat=barebox_fstat \ -Dopendir=barebox_opendir -Dreaddir=barebox_readdir \ - -Dclosedir=barebox_closedir + -Dclosedir=barebox_closedir \ + -Doptarg=barebox_optarg -Doptind=barebox_optind machdirs := $(patsubst %,arch/sandbox/mach-%/,$(machine-y)) diff --git a/arch/sandbox/board/Makefile b/arch/sandbox/board/Makefile index b6c271c..26f6cb1 100644 --- a/arch/sandbox/board/Makefile +++ b/arch/sandbox/board/Makefile @@ -5,5 +5,6 @@ obj-y += devices.o obj-y += dtb.o obj-y += poweroff.o +obj-y += dev-random.o extra-y += barebox.lds diff --git a/arch/sandbox/board/board.c b/arch/sandbox/board/board.c index 1f6392d..ad2bc91 100644 --- a/arch/sandbox/board/board.c +++ b/arch/sandbox/board/board.c @@ -42,6 +42,11 @@ .platform_data = &mode, }; +static struct device_d devrandom_device = { + .id = DEVICE_ID_DYNAMIC, + .name = "devrandom", +}; + static int devices_init(void) { platform_device_register(&tap_device); @@ -54,6 +59,8 @@ platform_device_register(&sdl_device); + platform_device_register(&devrandom_device); + return 0; } diff --git a/arch/sandbox/board/dev-random.c b/arch/sandbox/board/dev-random.c new file mode 100644 index 0000000..f65e5ef --- /dev/null +++ b/arch/sandbox/board/dev-random.c @@ -0,0 +1,24 @@ +#include +#include + +devrandom_t *devrandom_init(void) { + devrandom_t *fds = xzalloc(sizeof(*fds)); + + fds->randomfd = linux_open("/dev/random", false); + if (fds->randomfd < 0) + return ERR_PTR(-EPERM); + + fds->urandomfd = linux_open("/dev/urandom", false); + if (fds->urandomfd < 0) + return ERR_PTR(-EPERM); + + return fds; +} + +int devrandom_read(devrandom_t *devrandom, void *buf, size_t len, int wait) +{ + if (wait) + return linux_read(devrandom->randomfd, buf, len); + + return linux_read(devrandom->urandomfd, buf, len); +} diff --git a/arch/sandbox/board/devices.c b/arch/sandbox/board/devices.c index 242a0d7..72e6255 100644 --- a/arch/sandbox/board/devices.c +++ b/arch/sandbox/board/devices.c @@ -8,6 +8,7 @@ #include #include #include +#include static LIST_HEAD(sandbox_device_list); diff --git a/arch/sandbox/board/hostfile.c b/arch/sandbox/board/hostfile.c index 745f078..e5a7580 100644 --- a/arch/sandbox/board/hostfile.c +++ b/arch/sandbox/board/hostfile.c @@ -84,15 +84,16 @@ 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 @@ 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-example.dtsi b/arch/sandbox/dts/sandbox-state-example.dtsi new file mode 100644 index 0000000..fc17bd0 --- /dev/null +++ b/arch/sandbox/dts/sandbox-state-example.dtsi @@ -0,0 +1,50 @@ +/ { + aliases { + state = &state; + }; + + disk { + compatible = "barebox,hostfile"; + barebox,filename = "disk"; + reg = <0x0 0x0 0x100000>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + hostfile_state: state@0 { + reg = <0x0 0x1000>; + label = "state"; + }; + }; + }; + + state: state { + magic = <0xaa3b86a6>; + compatible = "barebox,state"; + backend-type = "raw"; + backend = <&hostfile_state>; + backend-storage-type = "direct"; + backend-stridesize = <64>; + + #address-cells = <1>; + #size-cells = <1>; + vars { + #address-cells = <1>; + #size-cells = <1>; + + x { + reg = <0x0 0x4>; + type = "uint32"; + default = <1>; + }; + + y { + reg = <0x4 0x4>; + type = "uint32"; + default = <3>; + }; + }; + }; +}; diff --git a/arch/sandbox/mach-sandbox/include/mach/linux.h b/arch/sandbox/mach-sandbox/include/mach/linux.h index 7d0ed55..1e64d41 100644 --- a/arch/sandbox/mach-sandbox/include/mach/linux.h +++ b/arch/sandbox/mach-sandbox/include/mach/linux.h @@ -10,6 +10,7 @@ int linux_register_device(const char *name, void *start, void *end); int tap_alloc(const char *dev); uint64_t linux_get_time(void); +int linux_open(const char *filename, int readwrite); int linux_read(int fd, void *buf, size_t count); int linux_read_nonblock(int fd, void *buf, size_t count); ssize_t linux_write(int fd, const void *buf, size_t count); @@ -50,4 +51,11 @@ int barebox_libftdi1_update(struct ft2232_bitbang *ftbb); void barebox_libftdi1_close(void); +typedef struct { + int randomfd; + int urandomfd; +} devrandom_t; +devrandom_t *devrandom_init(void); +int devrandom_read(devrandom_t *devrandom, void *buf, size_t len, int wait); + #endif /* __ASM_ARCH_LINUX_H */ diff --git a/arch/sandbox/os/common.c b/arch/sandbox/os/common.c index a7ea8f2..8611882 100644 --- a/arch/sandbox/os/common.c +++ b/arch/sandbox/os/common.c @@ -121,6 +121,11 @@ exit(0); } +int linux_open(const char *filename, int readwrite) +{ + return open(filename, readwrite ? O_RDWR : O_RDONLY); +} + int linux_read(int fd, void *buf, size_t count) { ssize_t ret; diff --git a/drivers/hw_random/Kconfig b/drivers/hw_random/Kconfig index d1297a4..c579282 100644 --- a/drivers/hw_random/Kconfig +++ b/drivers/hw_random/Kconfig @@ -14,4 +14,12 @@ This driver provides kernel-side support for the Random Number Generator hardware found on some Freescale i.MX processors. +config HWRNG_DEV_RANDOM + tristate "Linux /dev/random and /dev/urandom RNG" + depends on SANDBOX + default y + help + This driver allows use of the host provided /dev/random + and /dev/urandom as barebox HWRNGs. + endif diff --git a/drivers/hw_random/Makefile b/drivers/hw_random/Makefile index 79c238c..8be62f3 100644 --- a/drivers/hw_random/Makefile +++ b/drivers/hw_random/Makefile @@ -1,2 +1,3 @@ obj-$(CONFIG_HWRNG) += core.o obj-$(CONFIG_HWRNG_MXC_RNGC) += mxc-rngc.o +obj-$(CONFIG_HWRNG_DEV_RANDOM) += dev-random.o diff --git a/drivers/hw_random/dev-random.c b/drivers/hw_random/dev-random.c new file mode 100644 index 0000000..2170db7 --- /dev/null +++ b/drivers/hw_random/dev-random.c @@ -0,0 +1,63 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2019 Ahmad Fatoum, Pengutronix + */ + +#include +#include +#include +#include + +struct devrandom_rnd { + struct hwrng hwrng; + devrandom_t *priv; +}; + +static inline struct devrandom_rnd *to_rnd(struct hwrng *hwrng) +{ + return container_of(hwrng, struct devrandom_rnd, hwrng); +} + +static int devrandom_rnd_read(struct hwrng *hwrng, void *buf, size_t max, bool wait) +{ + return devrandom_read(to_rnd(hwrng)->priv, buf, max, wait); +} + +static int devrandom_rnd_init(struct hwrng *hwrng) +{ + devrandom_t *devrandom = devrandom_init(); + if (IS_ERR(devrandom)) + return PTR_ERR(devrandom); + + to_rnd(hwrng)->priv = devrandom; + return 0; +} + +static int devrandom_rnd_probe(struct device_d *dev) +{ + struct devrandom_rnd *rnd; + int ret; + + rnd = xzalloc(sizeof(*rnd)); + + rnd->hwrng.name = dev->name; + rnd->hwrng.read = devrandom_rnd_read; + rnd->hwrng.init = devrandom_rnd_init; + + ret = hwrng_register(dev, &rnd->hwrng); + if (ret) { + dev_err(dev, "failed to register: %s\n", strerror(-ret)); + + return ret; + } + + dev_info(dev, "Registered.\n"); + + return 0; +} + +static struct driver_d devrandom_rnd_driver = { + .name = "devrandom", + .probe = devrandom_rnd_probe, +}; +device_platform_driver(devrandom_rnd_driver);