Re: [PATCH] floppy: Run floppy initialization asynchronous

From: Andi Kleen
Date: Wed Jul 04 2012 - 08:31:28 EST


On Wed, Jul 04, 2012 at 02:03:07PM +0200, Jiri Kosina wrote:
> On Mon, 2 Jul 2012, Andi Kleen wrote:
>
> > From: Andi Kleen <ak@xxxxxxxxxxxxxxx>
> >
> > floppy_init is quite slow, 3s on my test system to determine
> > that there is no floppy. Run it asynchronous to the other
> > init calls to improve boot time.
> >
> > Signed-off-by: Andi Kleen <ak@xxxxxxxxxxxxxxx>
> > ---
> > drivers/block/floppy.c | 21 ++++++++++++++++++++-
> > 1 files changed, 20 insertions(+), 1 deletions(-)
> >
> > diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
> > index cce7df3..8b5769b 100644
> > --- a/drivers/block/floppy.c
> > +++ b/drivers/block/floppy.c
> > @@ -191,6 +191,7 @@ static int print_unex = 1;
> > #include <linux/mutex.h>
> > #include <linux/io.h>
> > #include <linux/uaccess.h>
> > +#include <linux/async.h>
> >
> > /*
> > * PS/2 floppies have much slower step rates than regular floppies.
> > @@ -4122,7 +4123,7 @@ static struct kobject *floppy_find(dev_t dev, int *part, void *data)
> > return get_disk(disks[drive]);
> > }
> >
> > -static int __init floppy_init(void)
> > +static int __init do_floppy_init(void)
> > {
> > int i, unit, drive;
> > int err, dr;
> > @@ -4337,6 +4338,24 @@ out_put_disk:
> > return err;
> > }
> >
> > +#ifndef MODULE
> > +static __init void floppy_async_init(void *data, async_cookie_t cookie)
> > +{
> > + do_floppy_init();
> > +}
> > +#endif
> > +
> > +static int __init floppy_init(void)
> > +{
> > +#ifdef MODULE
> > + return do_floppy_init(void);
>
> This isn't really a valid C.
>
> I have fixed that and applied.

Thanks.

It would be also good to figure out how to move floppy_init
earlier in the init sequence. I think then you could hide more
of the 3s latency than just 1s.

-Andi

--
ak@xxxxxxxxxxxxxxx -- Speaking for myself only.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/