[ide] propagation of error code in PCI IDE setup

- Change the return value and the prototype of do_ide_setup_pci_device
  Due to lack of appropriate return status code, the current clients of
  do_ide_setup_pci_device() can not distinguish a failing invocation
  from a successfull one. The patch modify do_ide_setup_pci_device() so
  that it can propagate some of the errors from the lower layers.

- Make ide_setup_pci_device() aware of the change and propagate the news
  itself. I only gave a quick sight to create_proc_ide_interfaces() (and
  ide_remove_proc_entries()) but they do seem sane and it should not matter
  if it fails or not.

- ide_setup_pci_devices(): mostly the same thing than ide_setup_pci_device().
  do not look trivially suspect.
Signed-off-by: default avatarFrancois Romieu <romieu@fr.zoreil.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 205a0365
...@@ -643,14 +643,16 @@ EXPORT_SYMBOL_GPL(ide_pci_setup_ports); ...@@ -643,14 +643,16 @@ EXPORT_SYMBOL_GPL(ide_pci_setup_ports);
* we "know" about, this information is in the ide_pci_device_t struct; * we "know" about, this information is in the ide_pci_device_t struct;
* for all other chipsets, we just assume both interfaces are enabled. * for all other chipsets, we just assume both interfaces are enabled.
*/ */
static ata_index_t do_ide_setup_pci_device (struct pci_dev *dev, ide_pci_device_t *d, u8 noisy) static int do_ide_setup_pci_device(struct pci_dev *dev, ide_pci_device_t *d,
ata_index_t *index, u8 noisy)
{ {
int pciirq = 0; static ata_index_t ata_index = { .b = { .low = 0xff, .high = 0xff } };
int tried_config = 0; int tried_config = 0;
ata_index_t index = { .b = { .low = 0xff, .high = 0xff } }; int pciirq, ret;
if (ide_setup_pci_controller(dev, d, noisy, &tried_config) < 0) ret = ide_setup_pci_controller(dev, d, noisy, &tried_config);
return index; if (ret < 0)
goto out;
/* /*
* Can we trust the reported IRQ? * Can we trust the reported IRQ?
...@@ -668,7 +670,10 @@ static ata_index_t do_ide_setup_pci_device (struct pci_dev *dev, ide_pci_device_ ...@@ -668,7 +670,10 @@ static ata_index_t do_ide_setup_pci_device (struct pci_dev *dev, ide_pci_device_
* space, place chipset into init-mode, and/or preserve * space, place chipset into init-mode, and/or preserve
* an interrupt if the card is not native ide support. * an interrupt if the card is not native ide support.
*/ */
pciirq = (d->init_chipset) ? d->init_chipset(dev, d->name) : 0; ret = d->init_chipset ? d->init_chipset(dev, d->name) : 0;
if (ret < 0)
goto out;
pciirq = ret;
} else if (tried_config) { } else if (tried_config) {
if (noisy) if (noisy)
printk(KERN_INFO "%s: will probe irqs later\n", d->name); printk(KERN_INFO "%s: will probe irqs later\n", d->name);
...@@ -679,10 +684,10 @@ static ata_index_t do_ide_setup_pci_device (struct pci_dev *dev, ide_pci_device_ ...@@ -679,10 +684,10 @@ static ata_index_t do_ide_setup_pci_device (struct pci_dev *dev, ide_pci_device_
d->name, pciirq); d->name, pciirq);
pciirq = 0; pciirq = 0;
} else { } else {
if (d->init_chipset) if (d->init_chipset) {
{ ret = d->init_chipset(dev, d->name);
if(d->init_chipset(dev, d->name) < 0) if (ret < 0)
return index; goto out;
} }
if (noisy) if (noisy)
#ifdef __sparc__ #ifdef __sparc__
...@@ -693,18 +698,23 @@ static ata_index_t do_ide_setup_pci_device (struct pci_dev *dev, ide_pci_device_ ...@@ -693,18 +698,23 @@ static ata_index_t do_ide_setup_pci_device (struct pci_dev *dev, ide_pci_device_
d->name, pciirq); d->name, pciirq);
#endif #endif
} }
if(pciirq < 0) /* Error not an IRQ */
return index;
ide_pci_setup_ports(dev, d, pciirq, &index); /* FIXME: silent failure can happen */
return index; *index = ata_index;
ide_pci_setup_ports(dev, d, pciirq, index);
out:
return ret;
} }
void ide_setup_pci_device (struct pci_dev *dev, ide_pci_device_t *d) int ide_setup_pci_device(struct pci_dev *dev, ide_pci_device_t *d)
{ {
ata_index_t index_list = do_ide_setup_pci_device(dev, d, 1); ata_index_t index_list;
int ret;
ret = do_ide_setup_pci_device(dev, d, &index_list, 1);
if (ret < 0)
goto out;
if ((index_list.b.low & 0xf0) != 0xf0) if ((index_list.b.low & 0xf0) != 0xf0)
probe_hwif_init_with_fixup(&ide_hwifs[index_list.b.low], d->fixup); probe_hwif_init_with_fixup(&ide_hwifs[index_list.b.low], d->fixup);
...@@ -712,25 +722,42 @@ void ide_setup_pci_device (struct pci_dev *dev, ide_pci_device_t *d) ...@@ -712,25 +722,42 @@ void ide_setup_pci_device (struct pci_dev *dev, ide_pci_device_t *d)
probe_hwif_init_with_fixup(&ide_hwifs[index_list.b.high], d->fixup); probe_hwif_init_with_fixup(&ide_hwifs[index_list.b.high], d->fixup);
create_proc_ide_interfaces(); create_proc_ide_interfaces();
out:
return ret;
} }
EXPORT_SYMBOL_GPL(ide_setup_pci_device); EXPORT_SYMBOL_GPL(ide_setup_pci_device);
void ide_setup_pci_devices (struct pci_dev *dev, struct pci_dev *dev2, ide_pci_device_t *d) int ide_setup_pci_devices(struct pci_dev *dev1, struct pci_dev *dev2,
ide_pci_device_t *d)
{ {
ata_index_t index_list = do_ide_setup_pci_device(dev, d, 1); struct pci_dev *pdev[] = { dev1, dev2 };
ata_index_t index_list2 = do_ide_setup_pci_device(dev2, d, 0); ata_index_t index_list[2];
int ret, i;
if ((index_list.b.low & 0xf0) != 0xf0) for (i = 0; i < 2; i++) {
probe_hwif_init(&ide_hwifs[index_list.b.low]); ret = do_ide_setup_pci_device(pdev[i], d, index_list + i, !i);
if ((index_list.b.high & 0xf0) != 0xf0) /*
probe_hwif_init(&ide_hwifs[index_list.b.high]); * FIXME: Mom, mom, they stole me the helper function to undo
if ((index_list2.b.low & 0xf0) != 0xf0) * do_ide_setup_pci_device() on the first device!
probe_hwif_init(&ide_hwifs[index_list2.b.low]); */
if ((index_list2.b.high & 0xf0) != 0xf0) if (ret < 0)
probe_hwif_init(&ide_hwifs[index_list2.b.high]); goto out;
}
for (i = 0; i < 2; i++) {
u8 idx[2] = { index_list[i].b.low, index_list[i].b.high };
int j;
for (j = 0; j < 2; j++) {
if ((idx[j] & 0xf0) != 0xf0)
probe_hwif_init(ide_hwifs + idx[j]);
}
}
create_proc_ide_interfaces(); create_proc_ide_interfaces();
out:
return ret;
} }
EXPORT_SYMBOL_GPL(ide_setup_pci_devices); EXPORT_SYMBOL_GPL(ide_setup_pci_devices);
......
...@@ -1438,8 +1438,8 @@ typedef struct ide_pci_device_s { ...@@ -1438,8 +1438,8 @@ typedef struct ide_pci_device_s {
u8 flags; u8 flags;
} ide_pci_device_t; } ide_pci_device_t;
extern void ide_setup_pci_device(struct pci_dev *, ide_pci_device_t *); extern int ide_setup_pci_device(struct pci_dev *, ide_pci_device_t *);
extern void ide_setup_pci_devices(struct pci_dev *, struct pci_dev *, ide_pci_device_t *); extern int ide_setup_pci_devices(struct pci_dev *, struct pci_dev *, ide_pci_device_t *);
void ide_map_sg(ide_drive_t *, struct request *); void ide_map_sg(ide_drive_t *, struct request *);
void ide_init_sg_cmd(ide_drive_t *, struct request *); void ide_init_sg_cmd(ide_drive_t *, struct request *);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment