diff mbox

[1/4] Add ps3_storage module alias

Message ID 20100205134235.GG12001@hansolo.jdub.homelinux.org (mailing list archive)
State Rejected
Headers show

Commit Message

Josh Boyer Feb. 5, 2010, 1:42 p.m. UTC
This allows the upgrade path from older kernel releases to work
with the Fedora mkinitrd tool.

---

Comments

Geert Uytterhoeven Feb. 5, 2010, 1:49 p.m. UTC | #1
On Fri, 5 Feb 2010, Josh Boyer wrote:
> This allows the upgrade path from older kernel releases to work
> with the Fedora mkinitrd tool.
> 
> ---
> 
> --- linux-2.6.22.ppc64/drivers/block/ps3disk.c~	2007-07-25 16:06:16.000000000 +0100
> +++ linux-2.6.22.ppc64/drivers/block/ps3disk.c	2007-07-26 08:49:44.000000000 +0100
> @@ -628,3 +628,4 @@ MODULE_LICENSE("GPL");
>  MODULE_DESCRIPTION("PS3 Disk Storage Driver");
>  MODULE_AUTHOR("Sony Corporation");
>  MODULE_ALIAS(PS3_MODULE_ALIAS_STOR_DISK);
> +MODULE_ALIAS("ps3_storage");

NAKed-by: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>

ps3_storage was replaced by 3 drivers: ps3disk, ps3rom, and ps3flash. These are
automatically loaded by udev.

How does mkinitrd determine the driver for the root file system on other
systems? Does it really contain a big list of e.g. all SCSI drivers?

With kind regards,

Geert Uytterhoeven
Software Architect
Techsoft Centre

Technology and Software Centre Europe
The Corporate Village · Da Vincilaan 7-D1 · B-1935 Zaventem · Belgium

Phone:    +32 (0)2 700 8453
Fax:      +32 (0)2 700 8622
E-mail:   Geert.Uytterhoeven@sonycom.com
Internet: http://www.sony-europe.com/

A division of Sony Europe (Belgium) N.V.
VAT BE 0413.825.160 · RPR Brussels
Fortis · BIC GEBABEBB · IBAN BE41293037680010
Josh Boyer Feb. 5, 2010, 2:03 p.m. UTC | #2
On Fri, Feb 05, 2010 at 02:49:14PM +0100, Geert Uytterhoeven wrote:
>On Fri, 5 Feb 2010, Josh Boyer wrote:
>> This allows the upgrade path from older kernel releases to work
>> with the Fedora mkinitrd tool.
>> 
>> ---
>> 
>> --- linux-2.6.22.ppc64/drivers/block/ps3disk.c~	2007-07-25 16:06:16.000000000 +0100
>> +++ linux-2.6.22.ppc64/drivers/block/ps3disk.c	2007-07-26 08:49:44.000000000 +0100
>> @@ -628,3 +628,4 @@ MODULE_LICENSE("GPL");
>>  MODULE_DESCRIPTION("PS3 Disk Storage Driver");
>>  MODULE_AUTHOR("Sony Corporation");
>>  MODULE_ALIAS(PS3_MODULE_ALIAS_STOR_DISK);
>> +MODULE_ALIAS("ps3_storage");
>
>NAKed-by: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
>
>ps3_storage was replaced by 3 drivers: ps3disk, ps3rom, and ps3flash. These are
>automatically loaded by udev.
>
>How does mkinitrd determine the driver for the root file system on other
>systems? Does it really contain a big list of e.g. all SCSI drivers?

At one time I believe it did have a list of "odd" drivers to explicitly
include.  Anaconda didn't (doesn't?) use udev to determine which drivers
to include in the initrd since the install image is most likely not composed
on a machine that includes those drivers.  If the install initrd didn't have
the drivers loaded, it wouldn't install on PS3.

This is highlighted as a Fedora local change, probably for the reasons you
state.  We might have already moved past the point where this is needed,
so I'm fine with it being NAKed.  I'll probably just drop it from the Fedora
kernel builds.

josh
Geert Uytterhoeven Feb. 5, 2010, 2:39 p.m. UTC | #3
On Fri, 5 Feb 2010, Josh Boyer wrote:
> On Fri, Feb 05, 2010 at 02:49:14PM +0100, Geert Uytterhoeven wrote:
> >On Fri, 5 Feb 2010, Josh Boyer wrote:
> >> This allows the upgrade path from older kernel releases to work
> >> with the Fedora mkinitrd tool.
> >> 
> >> ---
> >> 
> >> --- linux-2.6.22.ppc64/drivers/block/ps3disk.c~	2007-07-25 16:06:16.000000000 +0100
> >> +++ linux-2.6.22.ppc64/drivers/block/ps3disk.c	2007-07-26 08:49:44.000000000 +0100
> >> @@ -628,3 +628,4 @@ MODULE_LICENSE("GPL");
> >>  MODULE_DESCRIPTION("PS3 Disk Storage Driver");
> >>  MODULE_AUTHOR("Sony Corporation");
> >>  MODULE_ALIAS(PS3_MODULE_ALIAS_STOR_DISK);
> >> +MODULE_ALIAS("ps3_storage");
> >
> >NAKed-by: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
> >
> >ps3_storage was replaced by 3 drivers: ps3disk, ps3rom, and ps3flash. These are
> >automatically loaded by udev.
> >
> >How does mkinitrd determine the driver for the root file system on other
> >systems? Does it really contain a big list of e.g. all SCSI drivers?
> 
> At one time I believe it did have a list of "odd" drivers to explicitly
> include.  Anaconda didn't (doesn't?) use udev to determine which drivers
> to include in the initrd since the install image is most likely not composed
> on a machine that includes those drivers.  If the install initrd didn't have
> the drivers loaded, it wouldn't install on PS3.
> 
> This is highlighted as a Fedora local change, probably for the reasons you
> state.  We might have already moved past the point where this is needed,
> so I'm fine with it being NAKed.  I'll probably just drop it from the Fedora
> kernel builds.

It's possible it's (still) needed on Fedora, though (Geoff, do you know?).
But it's definitely not something we want in mainline.

With kind regards,

Geert Uytterhoeven
Software Architect
Techsoft Centre

Technology and Software Centre Europe
The Corporate Village · Da Vincilaan 7-D1 · B-1935 Zaventem · Belgium

Phone:    +32 (0)2 700 8453
Fax:      +32 (0)2 700 8622
E-mail:   Geert.Uytterhoeven@sonycom.com
Internet: http://www.sony-europe.com/

A division of Sony Europe (Belgium) N.V.
VAT BE 0413.825.160 · RPR Brussels
Fortis · BIC GEBABEBB · IBAN BE41293037680010
David Woodhouse Feb. 23, 2010, 12:47 p.m. UTC | #4
On Fri, 2010-02-05 at 14:49 +0100, Geert Uytterhoeven wrote:
> On Fri, 5 Feb 2010, Josh Boyer wrote:
> > This allows the upgrade path from older kernel releases to work
> > with the Fedora mkinitrd tool.
> > 
> > ---
> > 
> > --- linux-2.6.22.ppc64/drivers/block/ps3disk.c~       2007-07-25 16:06:16.000000000 +0100
> > +++ linux-2.6.22.ppc64/drivers/block/ps3disk.c        2007-07-26 08:49:44.000000000 +0100
> > @@ -628,3 +628,4 @@ MODULE_LICENSE("GPL");
> >  MODULE_DESCRIPTION("PS3 Disk Storage Driver");
> >  MODULE_AUTHOR("Sony Corporation");
> >  MODULE_ALIAS(PS3_MODULE_ALIAS_STOR_DISK);
> > +MODULE_ALIAS("ps3_storage");
> 
> NAKed-by: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
> 
> ps3_storage was replaced by 3 drivers: ps3disk, ps3rom, and ps3flash. These are
> automatically loaded by udev.
> 
> How does mkinitrd determine the driver for the root file system on other
> systems? Does it really contain a big list of e.g. all SCSI drivers?

It pokes about in sysfs and works out the driver which is used for the
current root devices.

This hack was only needed for the upgrade -- when you were running a
kernel with the ps3_storage kernel and you first installed a kernel with
the new ps3disk driver, you needed it to find the right module.

I think we can drop it now.
diff mbox

Patch

--- linux-2.6.22.ppc64/drivers/block/ps3disk.c~	2007-07-25 16:06:16.000000000 +0100
+++ linux-2.6.22.ppc64/drivers/block/ps3disk.c	2007-07-26 08:49:44.000000000 +0100
@@ -628,3 +628,4 @@  MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("PS3 Disk Storage Driver");
 MODULE_AUTHOR("Sony Corporation");
 MODULE_ALIAS(PS3_MODULE_ALIAS_STOR_DISK);
+MODULE_ALIAS("ps3_storage");