From c29915fccda96258dbccf49b052ee4ddd7d51169 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Fri, 29 Jan 2016 20:46:52 +0100 Subject: 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. --- linux/dev/drivers/block/ahci.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'linux/dev/drivers/block') diff --git a/linux/dev/drivers/block/ahci.c b/linux/dev/drivers/block/ahci.c index f67ba2f..b60f1a1 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); -- cgit v1.2.3