b2a53bc636
On Tuesday 05 February 2008, Linus Torvalds wrote:
>
> On Sat, 2 Feb 2008, Bartlomiej Zolnierkiewicz wrote:
> >
> > * next part of IDE probing code re-organization saga
> > (that would be me)
>
> This seems to cause very irritating and bogus messages for me:
>
> Probing IDE interface ide0...
> Probing IDE interface ide1...
> ide2: I/O resource 0x0-0x7 not free.
> ide2: ports already in use, skipping probe
> ide3: I/O resource 0x0-0x7 not free.
> ide3: ports already in use, skipping probe
> ide4: I/O resource 0x0-0x7 not free.
> ide4: ports already in use, skipping probe
> ide5: I/O resource 0x0-0x7 not free.
> ide5: ports already in use, skipping probe
> ide6: I/O resource 0x0-0x7 not free.
> ide6: ports already in use, skipping probe
> ide7: I/O resource 0x0-0x7 not free.
> ide7: ports already in use, skipping probe
> ide8: I/O resource 0x0-0x7 not free.
> ide8: ports already in use, skipping probe
> ide9: I/O resource 0x0-0x7 not free.
> ide9: ports already in use, skipping probe
>
> and that's just totally bogus. It shouldn't even request that region,
> since it's not been allocated!
The commit 139ddfcab5 ("ide: move handling of
I/O resources out of ide_probe_port()") changed the ordering of hwif->noprobe
check vs ide_hwif_request_regions() call (so that we now reserve I/O regions
before checking for hwif->noprobe). However ide-generic host driver depended
on hwif->noprobe to be set for skipping probing of empty ide_hwifs[] slots.
Fix it by passing only indexes of non-empty slots to ide_device_add_all()
from ide_generic_init().
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
42 lines
880 B
C
42 lines
880 B
C
/*
|
|
* generic/default IDE host driver
|
|
*
|
|
* Copyright (C) 2004 Bartlomiej Zolnierkiewicz
|
|
* This code was split off from ide.c. See it for original copyrights.
|
|
*
|
|
* May be copied or modified under the terms of the GNU General Public License.
|
|
*/
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/init.h>
|
|
#include <linux/module.h>
|
|
#include <linux/ide.h>
|
|
|
|
static int __init ide_generic_init(void)
|
|
{
|
|
u8 idx[MAX_HWIFS];
|
|
int i;
|
|
|
|
if (ide_hwifs[0].io_ports[IDE_DATA_OFFSET])
|
|
ide_get_lock(NULL, NULL); /* for atari only */
|
|
|
|
for (i = 0; i < MAX_HWIFS; i++) {
|
|
ide_hwif_t *hwif = &ide_hwifs[i];
|
|
|
|
if (hwif->io_ports[IDE_DATA_OFFSET] && !hwif->present)
|
|
idx[i] = i;
|
|
else
|
|
idx[i] = 0xff;
|
|
}
|
|
|
|
ide_device_add_all(idx, NULL);
|
|
|
|
if (ide_hwifs[0].io_ports[IDE_DATA_OFFSET])
|
|
ide_release_lock(); /* for atari only */
|
|
|
|
return 0;
|
|
}
|
|
|
|
module_init(ide_generic_init);
|
|
|
|
MODULE_LICENSE("GPL");
|