leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "EISA: Initialize device before its resources"

Browse Source 
This reverts commit 26abfeed43.

In the eisa_probe() force_probe path, if we were unable to request slot
resources (e.g., [io 0x800-0x8ff]), we skipped the slot with "Cannot
allocate resource for EISA slot %d" before reading the EISA signature in
eisa_init_device().

Commit 26abfeed43 moved eisa_init_device() earlier, so we tried to read
the EISA signature before requesting the slot resources, and this caused
hangs during boot.

Link: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1251816
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
CC: stable@vger.kernel.org	# v3.10+ a2080d0c56: Revert "EISA: Log device resources in dmesg"
This commit is contained in:
Bjorn Helgaas 2014-01-17 14:57:29 -07:00
parent bea1b0b384
commit 765ee51f9a
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/eisa/eisa-bus.c
View File

@ -277,11 +277,13 @@ static int __init eisa_request_resources(struct eisa_root_device *root,
} }
if (slot) { if (slot) {
edev->res[i].name = NULL;
edev->res[i].start = SLOT_ADDRESS(root, slot) edev->res[i].start = SLOT_ADDRESS(root, slot)
+ (i * 0x400); + (i * 0x400);
edev->res[i].end = edev->res[i].start + 0xff; edev->res[i].end = edev->res[i].start + 0xff;
edev->res[i].flags = IORESOURCE_IO; edev->res[i].flags = IORESOURCE_IO;
} else { } else {
edev->res[i].name = NULL;
edev->res[i].start = SLOT_ADDRESS(root, slot) edev->res[i].start = SLOT_ADDRESS(root, slot)
+ EISA_VENDOR_ID_OFFSET; + EISA_VENDOR_ID_OFFSET;
edev->res[i].end = edev->res[i].start + 3; edev->res[i].end = edev->res[i].start + 3;
@ -327,13 +329,6 @@ static int __init eisa_probe(struct eisa_root_device *root)
return -ENOMEM; return -ENOMEM;
} }
if (eisa_init_device(root, edev, 0)) {
kfree(edev);
if (!root->force_probe)
return -ENODEV;
goto force_probe;
}
if (eisa_request_resources(root, edev, 0)) { if (eisa_request_resources(root, edev, 0)) {
dev_warn(root->dev, dev_warn(root->dev,
"EISA: Cannot allocate resource for mainboard\n"); "EISA: Cannot allocate resource for mainboard\n");
@ -343,6 +338,14 @@ static int __init eisa_probe(struct eisa_root_device *root)
goto force_probe; goto force_probe;
} }
if (eisa_init_device(root, edev, 0)) {
eisa_release_resources(edev);
kfree(edev);
if (!root->force_probe)
return -ENODEV;
goto force_probe;
}
dev_info(&edev->dev, "EISA: Mainboard %s detected\n", edev->id.sig); dev_info(&edev->dev, "EISA: Mainboard %s detected\n", edev->id.sig);
if (eisa_register_device(edev)) { if (eisa_register_device(edev)) {
@ -362,11 +365,6 @@ static int __init eisa_probe(struct eisa_root_device *root)
continue; continue;
} }
if (eisa_init_device(root, edev, i)) {
kfree(edev);
continue;
}
if (eisa_request_resources(root, edev, i)) { if (eisa_request_resources(root, edev, i)) {
dev_warn(root->dev, dev_warn(root->dev,
"Cannot allocate resource for EISA slot %d\n", "Cannot allocate resource for EISA slot %d\n",
@ -375,6 +373,12 @@ static int __init eisa_probe(struct eisa_root_device *root)
continue; continue;
} }
if (eisa_init_device(root, edev, i)) {
eisa_release_resources(edev);
kfree(edev);
continue;
}
if (edev->state == (EISA_CONFIG_ENABLED | EISA_CONFIG_FORCED)) if (edev->state == (EISA_CONFIG_ENABLED | EISA_CONFIG_FORCED))
enabled_str = " (forced enabled)"; enabled_str = " (forced enabled)";
else if (edev->state == EISA_CONFIG_FORCED) else if (edev->state == EISA_CONFIG_FORCED)