Commit dc164bbb authored by Cyrill Gorcunov's avatar Cyrill Gorcunov Committed by David Woodhouse

[MTD] ESB2 check for closed ROM window

Add checking for closed ROM window on Intel ESB2 Southbridge.
Signed-off-by: default avatarCyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarDavid Woodhouse <dwmw2@infradead.org>
parent 180bfb31
...@@ -185,7 +185,7 @@ static int __devinit esb2rom_init_one(struct pci_dev *pdev, ...@@ -185,7 +185,7 @@ static int __devinit esb2rom_init_one(struct pci_dev *pdev,
/* Find a region continuous to the end of the ROM window */ /* Find a region continuous to the end of the ROM window */
window->phys = 0; window->phys = 0;
pci_read_config_word(pdev, FWH_DEC_EN1, &word); pci_read_config_word(pdev, FWH_DEC_EN1, &word);
printk(KERN_DEBUG "pci_read_config_byte : %x\n", word); printk(KERN_DEBUG "pci_read_config_word : %x\n", word);
if ((word & FWH_8MiB) == FWH_8MiB) if ((word & FWH_8MiB) == FWH_8MiB)
window->phys = 0xff400000; window->phys = 0xff400000;
...@@ -212,6 +212,11 @@ static int __devinit esb2rom_init_one(struct pci_dev *pdev, ...@@ -212,6 +212,11 @@ static int __devinit esb2rom_init_one(struct pci_dev *pdev,
else if ((word & FWH_0_5MiB) == FWH_0_5MiB) else if ((word & FWH_0_5MiB) == FWH_0_5MiB)
window->phys = 0xfff80000; window->phys = 0xfff80000;
if (window->phys == 0) {
printk(KERN_ERR MOD_NAME ": Rom window is closed\n");
goto out;
}
/* reserved 0x0020 and 0x0010 */ /* reserved 0x0020 and 0x0010 */
window->phys -= 0x400000UL; window->phys -= 0x400000UL;
window->size = (0xffffffffUL - window->phys) + 1UL; window->size = (0xffffffffUL - window->phys) + 1UL;
......
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