Attachment 153855 Details for Bug 238410 – Proposed fix

[patch] Proposed fix

a1 (text/plain), 1.49 KB, created by Alan Cox on 2007-05-01 12:01:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alan Cox

Created: 2007-05-01 12:01:57 UTC

Size: 1.49 KB

patch

obsolete

>--- drivers/ata/libata-sff.c~	2007-05-01 12:03:39.634876384 +0100
>+++ drivers/ata/libata-sff.c	2007-05-01 12:03:39.634876384 +0100
>@@ -557,12 +557,30 @@
> 	int i, p = 0;
> 	void __iomem * const *iomap;
> 
>+	/* Discard disabled ports. Some controllers show their
>+	   unused channels this way */
>+	if (ata_resources_present(pdev, 0) == 0)
>+		ports &= ~ATA_PORT_PRIMARY;
>+	if (ata_resources_present(pdev, 1) == 0)
>+		ports &= ~ATA_PORT_SECONDARY;
>+
> 	/* iomap BARs */
>-	for (i = 0; i < 4; i++) {
>-		if (pcim_iomap(pdev, i, 0) == NULL) {
>-			dev_printk(KERN_ERR, &pdev->dev,
>-				   "failed to iomap PCI BAR %d\n", i);
>-			return NULL;
>+	if (ports & ATA_PORT_PRIMARY) {
>+		for (i = 0; i <= 1; i++) {
>+			if (pcim_iomap(pdev, i, 0) == NULL) {
>+				dev_printk(KERN_ERR, &pdev->dev,
>+					   "failed to iomap PCI BAR %d\n", i);
>+				return NULL;
>+			}
>+		}
>+	}
>+	if (ports & ATA_PORT_SECONDARY) {
>+		for (i = 2; i <= 3; i++) {
>+			if (pcim_iomap(pdev, i, 0) == NULL) {
>+				dev_printk(KERN_ERR, &pdev->dev,
>+					   "failed to iomap PCI BAR %d\n", i);
>+				return NULL;
>+			}
> 		}
> 	}
> 
>@@ -577,13 +595,6 @@
> 	probe_ent->irq = pdev->irq;
> 	probe_ent->irq_flags = IRQF_SHARED;
> 
>-	/* Discard disabled ports. Some controllers show their
>-	   unused channels this way */
>-	if (ata_resources_present(pdev, 0) == 0)
>-		ports &= ~ATA_PORT_PRIMARY;
>-	if (ata_resources_present(pdev, 1) == 0)
>-		ports &= ~ATA_PORT_SECONDARY;
>-
> 	if (ports & ATA_PORT_PRIMARY) {
> 		probe_ent->port[p].cmd_addr = iomap[0];
> 		probe_ent->port[p].altstatus_addr =

Actions: View | Diff

Attachments on bug 238410: 153782 | 153785 | 153787 | 153855