aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorArjan van de Ven <arjan@linux.intel.com>2009-01-09 18:54:07 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2009-01-10 18:06:52 -0500
commit886ad09fc83342aa1c5a02a0b6d3298b78a8067f (patch)
tree82a7818829b25db9c67f95c315521dac3da47fc6 /drivers
parent3d14bdad40315b54470cb7812293d14c8af2bf7d (diff)
libata: Add a per-host flag to opt-in into parallel port probes
This patch adds a per host flag that allows drivers to opt in into having its busses scanned in parallel. Drivers that do not set this flag get their ports scanned in the "original" sequence. Signed-off-by: Arjan van de Ven <arjan@linux.intel.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/ata/ahci.c3
-rw-r--r--drivers/ata/libata-core.c9
2 files changed, 12 insertions, 0 deletions
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index 7f701cbe14ab..96039671e3b9 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -2660,6 +2660,9 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
2660 host->iomap = pcim_iomap_table(pdev); 2660 host->iomap = pcim_iomap_table(pdev);
2661 host->private_data = hpriv; 2661 host->private_data = hpriv;
2662 2662
2663 if (!(hpriv->cap & HOST_CAP_SSS))
2664 host->flags |= ATA_HOST_PARALLEL_SCAN;
2665
2663 if (pi.flags & ATA_FLAG_EM) 2666 if (pi.flags & ATA_FLAG_EM)
2664 ahci_reset_em(host); 2667 ahci_reset_em(host);
2665 2668
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index c507a9ac78f4..f810078fafcc 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -5920,6 +5920,15 @@ static void async_port_probe(void *data, async_cookie_t cookie)
5920{ 5920{
5921 int rc; 5921 int rc;
5922 struct ata_port *ap = data; 5922 struct ata_port *ap = data;
5923
5924 /*
5925 * If we're not allowed to scan this host in parallel,
5926 * we need to wait until all previous scans have completed
5927 * before going further.
5928 */
5929 if (!(ap->host->flags & ATA_HOST_PARALLEL_SCAN))
5930 async_synchronize_cookie(cookie);
5931
5923 /* probe */ 5932 /* probe */
5924 if (ap->ops->error_handler) { 5933 if (ap->ops->error_handler) {
5925 struct ata_eh_info *ehi = &ap->link.eh_info; 5934 struct ata_eh_info *ehi = &ap->link.eh_info;