diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2016-01-29 20:46:52 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2016-01-29 20:46:52 +0100 |
| commit | c29915fccda96258dbccf49b052ee4ddd7d51169 (patch) | |
| tree | 52fb418fe463804a9fc3cba1682300562ec2ef55 /linux/dev/drivers/block/ahci.c | |
| parent | 0191a6b08f1d0e023994a64079be2d3b764d6232 (diff) | |
Disable probing legacy IDE when AHCI driver works
* linux/src/drivers/block/ide.c (default_io_base): Do not qualify const.
(ide_disable_base): New function.
* linux/dev/include/linux/blk.h (ide_disable_base): New declaration.
* linux/dev/drivers/block/ahci.c (ahci_probe_dev): Call ide_disable_base
with each I/O BAR of the AHCI PCI card.
Diffstat (limited to 'linux/dev/drivers/block/ahci.c')
| -rw-r--r-- | linux/dev/drivers/block/ahci.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/linux/dev/drivers/block/ahci.c b/linux/dev/drivers/block/ahci.c index f67ba2fb..b60f1a19 100644 --- a/linux/dev/drivers/block/ahci.c +++ b/linux/dev/drivers/block/ahci.c @@ -861,6 +861,21 @@ static void ahci_probe_dev(unsigned char bus, unsigned char device) return; } +#ifdef CONFIG_BLK_DEV_IDE + /* OK, we will handle it. Disable probing on legacy IDE ports it may have. */ + for (i = 0; i < 6; i++) + { + unsigned mybar; + if (pcibios_read_config_dword(bus, device, PCI_BASE_ADDRESS_0 + i*4, &mybar) == PCIBIOS_SUCCESSFUL) { + if (!(bar & PCI_BASE_ADDRESS_SPACE_IO)) + /* Memory, don't care */ + continue; + /* printk("ahci: %02x:%02x.%x: BAR %d is %x\n", bus, dev, fun, i, mybar); */ + ide_disable_base(bar & PCI_BASE_ADDRESS_IO_MASK); + } + } +#endif + nports = (readl(&ahci_host->cap) & 0x1f) + 1; port_map = readl(&ahci_host->pi); |