* [PATCH] ARM: i.MX: bbu-internal: call detect for mmc devices
@ 2016-02-25 11:15 Stefan Christ
2016-03-01 9:19 ` Stefan Christ
2016-03-01 9:22 ` Sascha Hauer
0 siblings, 2 replies; 6+ messages in thread
From: Stefan Christ @ 2016-02-25 11:15 UTC (permalink / raw)
To: barebox
For the MMC update_handler it makes sense to probe the device before
writing to it. If the device is not probed yet, you get errors like
$ barebox_update -y -t mmc0 /mnt/tftp/barebox.bin
barebox_update: Read-only file system
The code is nearly equivalent to
$ detect mmc0
$ barebox_update -y -t mmc0 /mnt/tftp/barebox.bin
The function device_detect_by_name also handles device names with
partition suffix like "/dev/mmc3.boot0".
While at it, use the macro BIT for the bit field.
Signed-off-by: Stefan Christ <s.christ@phytec.de>
---
arch/arm/mach-imx/imx-bbu-internal.c | 23 +++++++++++++++++++----
1 file changed, 19 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mach-imx/imx-bbu-internal.c b/arch/arm/mach-imx/imx-bbu-internal.c
index ac90c53..1ecc0d7 100644
--- a/arch/arm/mach-imx/imx-bbu-internal.c
+++ b/arch/arm/mach-imx/imx-bbu-internal.c
@@ -34,9 +34,10 @@
#define FLASH_HEADER_OFFSET_MMC 0x400
-#define IMX_INTERNAL_FLAG_NAND (1 << 0)
-#define IMX_INTERNAL_FLAG_KEEP_DOSPART (1 << 1)
-#define IMX_INTERNAL_FLAG_ERASE (1 << 2)
+#define IMX_INTERNAL_FLAG_NAND BIT(0)
+#define IMX_INTERNAL_FLAG_KEEP_DOSPART BIT(1)
+#define IMX_INTERNAL_FLAG_ERASE BIT(2)
+#define IMX_INTERNAL_FLAG_PROBE BIT(3)
struct imx_internal_bbu_handler {
struct bbu_handler handler;
@@ -52,8 +53,21 @@ struct imx_internal_bbu_handler {
static int imx_bbu_write_device(struct imx_internal_bbu_handler *imx_handler,
struct bbu_data *data, void *buf, int image_len)
{
+ const char *devname;
int fd, ret;
+ if (imx_handler->flags & IMX_INTERNAL_FLAG_PROBE) {
+ devname = data->devicefile;
+ if (!strncmp(devname, "/dev/", 5))
+ devname += 5;
+ ret = device_detect_by_name(devname);
+ if (ret) {
+ printf("Detecting device %s failed: %s\n", devname,
+ strerror(-ret));
+ return ret;
+ }
+ }
+
fd = open(data->devicefile, O_RDWR | O_CREAT);
if (fd < 0)
return fd;
@@ -487,7 +501,8 @@ int imx6_bbu_internal_mmc_register_handler(const char *name, char *devicefile,
imx_handler = __init_handler(name, devicefile, flags);
imx_handler->flash_header_offset = FLASH_HEADER_OFFSET_MMC;
- imx_handler->flags = IMX_INTERNAL_FLAG_KEEP_DOSPART;
+ imx_handler->flags = IMX_INTERNAL_FLAG_KEEP_DOSPART |
+ IMX_INTERNAL_FLAG_PROBE;
imx_handler->handler.handler = imx_bbu_internal_v2_update;
return __register_handler(imx_handler);
--
1.9.1
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] ARM: i.MX: bbu-internal: call detect for mmc devices 2016-02-25 11:15 [PATCH] ARM: i.MX: bbu-internal: call detect for mmc devices Stefan Christ @ 2016-03-01 9:19 ` Stefan Christ 2016-03-01 9:22 ` Sascha Hauer 1 sibling, 0 replies; 6+ messages in thread From: Stefan Christ @ 2016-03-01 9:19 UTC (permalink / raw) To: barebox *ping Mit freundlichen Grüßen / Kind regards, Stefan Christ On Thu, Feb 25, 2016 at 12:15:22PM +0100, Stefan Christ wrote: > For the MMC update_handler it makes sense to probe the device before > writing to it. If the device is not probed yet, you get errors like > > $ barebox_update -y -t mmc0 /mnt/tftp/barebox.bin > barebox_update: Read-only file system > > The code is nearly equivalent to > > $ detect mmc0 > $ barebox_update -y -t mmc0 /mnt/tftp/barebox.bin > > The function device_detect_by_name also handles device names with > partition suffix like "/dev/mmc3.boot0". > > While at it, use the macro BIT for the bit field. > > Signed-off-by: Stefan Christ <s.christ@phytec.de> > --- > arch/arm/mach-imx/imx-bbu-internal.c | 23 +++++++++++++++++++---- > 1 file changed, 19 insertions(+), 4 deletions(-) > > diff --git a/arch/arm/mach-imx/imx-bbu-internal.c b/arch/arm/mach-imx/imx-bbu-internal.c > index ac90c53..1ecc0d7 100644 > --- a/arch/arm/mach-imx/imx-bbu-internal.c > +++ b/arch/arm/mach-imx/imx-bbu-internal.c > @@ -34,9 +34,10 @@ > > #define FLASH_HEADER_OFFSET_MMC 0x400 > > -#define IMX_INTERNAL_FLAG_NAND (1 << 0) > -#define IMX_INTERNAL_FLAG_KEEP_DOSPART (1 << 1) > -#define IMX_INTERNAL_FLAG_ERASE (1 << 2) > +#define IMX_INTERNAL_FLAG_NAND BIT(0) > +#define IMX_INTERNAL_FLAG_KEEP_DOSPART BIT(1) > +#define IMX_INTERNAL_FLAG_ERASE BIT(2) > +#define IMX_INTERNAL_FLAG_PROBE BIT(3) > > struct imx_internal_bbu_handler { > struct bbu_handler handler; > @@ -52,8 +53,21 @@ struct imx_internal_bbu_handler { > static int imx_bbu_write_device(struct imx_internal_bbu_handler *imx_handler, > struct bbu_data *data, void *buf, int image_len) > { > + const char *devname; > int fd, ret; > > + if (imx_handler->flags & IMX_INTERNAL_FLAG_PROBE) { > + devname = data->devicefile; > + if (!strncmp(devname, "/dev/", 5)) > + devname += 5; > + ret = device_detect_by_name(devname); > + if (ret) { > + printf("Detecting device %s failed: %s\n", devname, > + strerror(-ret)); > + return ret; > + } > + } > + > fd = open(data->devicefile, O_RDWR | O_CREAT); > if (fd < 0) > return fd; > @@ -487,7 +501,8 @@ int imx6_bbu_internal_mmc_register_handler(const char *name, char *devicefile, > imx_handler = __init_handler(name, devicefile, flags); > imx_handler->flash_header_offset = FLASH_HEADER_OFFSET_MMC; > > - imx_handler->flags = IMX_INTERNAL_FLAG_KEEP_DOSPART; > + imx_handler->flags = IMX_INTERNAL_FLAG_KEEP_DOSPART | > + IMX_INTERNAL_FLAG_PROBE; > imx_handler->handler.handler = imx_bbu_internal_v2_update; > > return __register_handler(imx_handler); > -- > 1.9.1 > > > _______________________________________________ > 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 ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] ARM: i.MX: bbu-internal: call detect for mmc devices 2016-02-25 11:15 [PATCH] ARM: i.MX: bbu-internal: call detect for mmc devices Stefan Christ 2016-03-01 9:19 ` Stefan Christ @ 2016-03-01 9:22 ` Sascha Hauer 2016-03-01 10:56 ` Stefan Christ 1 sibling, 1 reply; 6+ messages in thread From: Sascha Hauer @ 2016-03-01 9:22 UTC (permalink / raw) To: Stefan Christ; +Cc: barebox Hi Stefan, On Thu, Feb 25, 2016 at 12:15:22PM +0100, Stefan Christ wrote: > For the MMC update_handler it makes sense to probe the device before > writing to it. If the device is not probed yet, you get errors like > > $ barebox_update -y -t mmc0 /mnt/tftp/barebox.bin > barebox_update: Read-only file system > > The code is nearly equivalent to > > $ detect mmc0 > $ barebox_update -y -t mmc0 /mnt/tftp/barebox.bin > > The function device_detect_by_name also handles device names with > partition suffix like "/dev/mmc3.boot0". > > While at it, use the macro BIT for the bit field. > > Signed-off-by: Stefan Christ <s.christ@phytec.de> > --- > arch/arm/mach-imx/imx-bbu-internal.c | 23 +++++++++++++++++++---- > 1 file changed, 19 insertions(+), 4 deletions(-) > > diff --git a/arch/arm/mach-imx/imx-bbu-internal.c b/arch/arm/mach-imx/imx-bbu-internal.c > index ac90c53..1ecc0d7 100644 > --- a/arch/arm/mach-imx/imx-bbu-internal.c > +++ b/arch/arm/mach-imx/imx-bbu-internal.c > @@ -34,9 +34,10 @@ > > #define FLASH_HEADER_OFFSET_MMC 0x400 > > -#define IMX_INTERNAL_FLAG_NAND (1 << 0) > -#define IMX_INTERNAL_FLAG_KEEP_DOSPART (1 << 1) > -#define IMX_INTERNAL_FLAG_ERASE (1 << 2) > +#define IMX_INTERNAL_FLAG_NAND BIT(0) > +#define IMX_INTERNAL_FLAG_KEEP_DOSPART BIT(1) > +#define IMX_INTERNAL_FLAG_ERASE BIT(2) > +#define IMX_INTERNAL_FLAG_PROBE BIT(3) > > struct imx_internal_bbu_handler { > struct bbu_handler handler; > @@ -52,8 +53,21 @@ struct imx_internal_bbu_handler { > static int imx_bbu_write_device(struct imx_internal_bbu_handler *imx_handler, > struct bbu_data *data, void *buf, int image_len) > { > + const char *devname; > int fd, ret; > > + if (imx_handler->flags & IMX_INTERNAL_FLAG_PROBE) { device_detect_by_name() should be safe to call, I don't think we need this additional flag. Just always call device_detect_by_name(). We have to drop the return value checking though. In fact we have the following patch in one of our internal customer trees, this should be suitable for your issue, right? Sascha -------------------------------8<----------------------------- From 5770640f4b06730bfd71eadce60bd411e437832b Mon Sep 17 00:00:00 2001 From: Sascha Hauer <s.hauer@pengutronix.de> Date: Fri, 26 Jul 2013 12:41:55 +0200 Subject: [PATCH] ARM: i.MX: bbu-internal: detect device before writing to it Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> --- arch/arm/mach-imx/imx-bbu-internal.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/arm/mach-imx/imx-bbu-internal.c b/arch/arm/mach-imx/imx-bbu-internal.c index ac90c53..821ce66 100644 --- a/arch/arm/mach-imx/imx-bbu-internal.c +++ b/arch/arm/mach-imx/imx-bbu-internal.c @@ -132,6 +132,9 @@ static int imx_bbu_check_prereq(struct bbu_data *data) if (ret) return ret; + if (!strncmp(data->devicefile, "/dev/", 5)) + device_detect_by_name(data->devicefile + 5); + return 0; } -- 2.7.0 -- 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 ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] ARM: i.MX: bbu-internal: call detect for mmc devices 2016-03-01 9:22 ` Sascha Hauer @ 2016-03-01 10:56 ` Stefan Christ 2016-03-02 18:54 ` Sascha Hauer 0 siblings, 1 reply; 6+ messages in thread From: Stefan Christ @ 2016-03-01 10:56 UTC (permalink / raw) To: Sascha Hauer; +Cc: barebox Hi Sascha, > device_detect_by_name() should be safe to call, I don't think we need > this additional flag. Just always call device_detect_by_name(). We have > to drop the return value checking though. > > In fact we have the following patch in one of our internal customer > trees, this should be suitable for your issue, right? Yep. These two lines of code are sufficent for our use case ;-) Here is my: Tested-by: Stefan Christ <s.christ@phytec.de> Will you apply that patch to master? Mit freundlichen Grüßen / Kind regards, Stefan Christ On Tue, Mar 01, 2016 at 10:22:32AM +0100, Sascha Hauer wrote: > Hi Stefan, > > On Thu, Feb 25, 2016 at 12:15:22PM +0100, Stefan Christ wrote: > > For the MMC update_handler it makes sense to probe the device before > > writing to it. If the device is not probed yet, you get errors like > > > > $ barebox_update -y -t mmc0 /mnt/tftp/barebox.bin > > barebox_update: Read-only file system > > > > The code is nearly equivalent to > > > > $ detect mmc0 > > $ barebox_update -y -t mmc0 /mnt/tftp/barebox.bin > > > > The function device_detect_by_name also handles device names with > > partition suffix like "/dev/mmc3.boot0". > > > > While at it, use the macro BIT for the bit field. > > > > Signed-off-by: Stefan Christ <s.christ@phytec.de> > > --- > > arch/arm/mach-imx/imx-bbu-internal.c | 23 +++++++++++++++++++---- > > 1 file changed, 19 insertions(+), 4 deletions(-) > > > > diff --git a/arch/arm/mach-imx/imx-bbu-internal.c b/arch/arm/mach-imx/imx-bbu-internal.c > > index ac90c53..1ecc0d7 100644 > > --- a/arch/arm/mach-imx/imx-bbu-internal.c > > +++ b/arch/arm/mach-imx/imx-bbu-internal.c > > @@ -34,9 +34,10 @@ > > > > #define FLASH_HEADER_OFFSET_MMC 0x400 > > > > -#define IMX_INTERNAL_FLAG_NAND (1 << 0) > > -#define IMX_INTERNAL_FLAG_KEEP_DOSPART (1 << 1) > > -#define IMX_INTERNAL_FLAG_ERASE (1 << 2) > > +#define IMX_INTERNAL_FLAG_NAND BIT(0) > > +#define IMX_INTERNAL_FLAG_KEEP_DOSPART BIT(1) > > +#define IMX_INTERNAL_FLAG_ERASE BIT(2) > > +#define IMX_INTERNAL_FLAG_PROBE BIT(3) > > > > struct imx_internal_bbu_handler { > > struct bbu_handler handler; > > @@ -52,8 +53,21 @@ struct imx_internal_bbu_handler { > > static int imx_bbu_write_device(struct imx_internal_bbu_handler *imx_handler, > > struct bbu_data *data, void *buf, int image_len) > > { > > + const char *devname; > > int fd, ret; > > > > + if (imx_handler->flags & IMX_INTERNAL_FLAG_PROBE) { > > device_detect_by_name() should be safe to call, I don't think we need > this additional flag. Just always call device_detect_by_name(). We have > to drop the return value checking though. > > In fact we have the following patch in one of our internal customer > trees, this should be suitable for your issue, right? > > Sascha > > -------------------------------8<----------------------------- > > From 5770640f4b06730bfd71eadce60bd411e437832b Mon Sep 17 00:00:00 2001 > From: Sascha Hauer <s.hauer@pengutronix.de> > Date: Fri, 26 Jul 2013 12:41:55 +0200 > Subject: [PATCH] ARM: i.MX: bbu-internal: detect device before writing to it > > Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> > --- > arch/arm/mach-imx/imx-bbu-internal.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/arch/arm/mach-imx/imx-bbu-internal.c b/arch/arm/mach-imx/imx-bbu-internal.c > index ac90c53..821ce66 100644 > --- a/arch/arm/mach-imx/imx-bbu-internal.c > +++ b/arch/arm/mach-imx/imx-bbu-internal.c > @@ -132,6 +132,9 @@ static int imx_bbu_check_prereq(struct bbu_data *data) > if (ret) > return ret; > > + if (!strncmp(data->devicefile, "/dev/", 5)) > + device_detect_by_name(data->devicefile + 5); > + > return 0; > } > > -- > 2.7.0 > > > -- > 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 ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] ARM: i.MX: bbu-internal: call detect for mmc devices 2016-03-01 10:56 ` Stefan Christ @ 2016-03-02 18:54 ` Sascha Hauer 2016-03-03 7:30 ` Stefan Christ 0 siblings, 1 reply; 6+ messages in thread From: Sascha Hauer @ 2016-03-02 18:54 UTC (permalink / raw) To: Stefan Christ; +Cc: barebox On Tue, Mar 01, 2016 at 11:56:05AM +0100, Stefan Christ wrote: > Hi Sascha, > > > device_detect_by_name() should be safe to call, I don't think we need > > this additional flag. Just always call device_detect_by_name(). We have > > to drop the return value checking though. > > > > In fact we have the following patch in one of our internal customer > > trees, this should be suitable for your issue, right? > > Yep. These two lines of code are sufficent for our use case ;-) Here is my: > > Tested-by: Stefan Christ <s.christ@phytec.de> > > Will you apply that patch to master? As it's not a regression or serious bug I applied it to next and not to master. 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 ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] ARM: i.MX: bbu-internal: call detect for mmc devices 2016-03-02 18:54 ` Sascha Hauer @ 2016-03-03 7:30 ` Stefan Christ 0 siblings, 0 replies; 6+ messages in thread From: Stefan Christ @ 2016-03-03 7:30 UTC (permalink / raw) To: Sascha Hauer; +Cc: barebox Hi Sascha, > As it's not a regression or serious bug I applied it to next and not to > master. Oh. yes of course. Sry my typing was faster than my thinking. The next branch is the correct place for it. Mit freundlichen Grüßen / Kind regards, Stefan Christ On Wed, Mar 02, 2016 at 07:54:22PM +0100, Sascha Hauer wrote: > On Tue, Mar 01, 2016 at 11:56:05AM +0100, Stefan Christ wrote: > > Hi Sascha, > > > > > device_detect_by_name() should be safe to call, I don't think we need > > > this additional flag. Just always call device_detect_by_name(). We have > > > to drop the return value checking though. > > > > > > In fact we have the following patch in one of our internal customer > > > trees, this should be suitable for your issue, right? > > > > Yep. These two lines of code are sufficent for our use case ;-) Here is my: > > > > Tested-by: Stefan Christ <s.christ@phytec.de> > > > > Will you apply that patch to master? > > As it's not a regression or serious bug I applied it to next and not to > master. > > 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 ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-03-03 7:30 UTC | newest] Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2016-02-25 11:15 [PATCH] ARM: i.MX: bbu-internal: call detect for mmc devices Stefan Christ 2016-03-01 9:19 ` Stefan Christ 2016-03-01 9:22 ` Sascha Hauer 2016-03-01 10:56 ` Stefan Christ 2016-03-02 18:54 ` Sascha Hauer 2016-03-03 7:30 ` Stefan Christ
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox