Attachment 209141 Details for Bug 309611 – Experimental fix for 3w-9xxx work under Xen

[patch] Experimental fix for 3w-9xxx work under Xen

linux-2.6-3w-9xxx-mem_len.patch (text/plain), 1.82 KB, created by Eduardo Habkost on 2007-09-27 22:23:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Eduardo Habkost

Created: 2007-09-27 22:23:44 UTC

Size: 1.82 KB

patch

obsolete

>From: Eduardo Habkost <ehabkost@redhat.com>
>Date: Thu, 27 Sep 2007 18:37:44 -0300
>Subject: 3w-9xxx: use PCI resource lenght correctly
>
>Trying to ioremap() a larger area than pci_resource_len()
>may fail (e.g. under Xen). Fixes 3w-9xxx to use pci_resource_len()
>as length parameter to ioremap() instead of PAGE_SIZE.
>
>Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
>---
>Index: linux-2.6.20.i386/drivers/scsi/3w-9xxx.c
>===================================================================
>--- linux-2.6.20.i386.orig/drivers/scsi/3w-9xxx.c
>+++ linux-2.6.20.i386/drivers/scsi/3w-9xxx.c
>@@ -2052,7 +2052,8 @@ static int __devinit twa_probe(struct pc
> {
> 	struct Scsi_Host *host = NULL;
> 	TW_Device_Extension *tw_dev;
>-	u32 mem_addr;
>+	int bar;
>+	unsigned long mem_addr, mem_len;
> 	int retval = -ENODEV;
> 
> 	retval = pci_enable_device(pdev);
>@@ -2096,12 +2097,15 @@ static int __devinit twa_probe(struct pc
> 	}
> 
> 	if (pdev->device == PCI_DEVICE_ID_3WARE_9000)
>-		mem_addr = pci_resource_start(pdev, 1);
>+		bar = 1;
> 	else
>-		mem_addr = pci_resource_start(pdev, 2);
>+		bar = 2;
>+
>+	mem_addr = pci_resource_start(pdev, bar);
>+	mem_len = pci_resource_len(pdev, bar);
> 
> 	/* Save base address */
>-	tw_dev->base_addr = ioremap(mem_addr, PAGE_SIZE);
>+	tw_dev->base_addr = ioremap(mem_addr, mem_len);
> 	if (!tw_dev->base_addr) {
> 		TW_PRINTK(tw_dev->host, TW_DRIVER, 0x35, "Failed to ioremap");
> 		goto out_release_mem_region;
>@@ -2135,7 +2139,7 @@ static int __devinit twa_probe(struct pc
> 
> 	pci_set_drvdata(pdev, host);
> 
>-	printk(KERN_WARNING "3w-9xxx: scsi%d: Found a 3ware 9000 Storage Controller at 0x%x, IRQ: %d.\n",
>+	printk(KERN_WARNING "3w-9xxx: scsi%d: Found a 3ware 9000 Storage Controller at 0x%lx, IRQ: %d.\n",
> 	       host->host_no, mem_addr, pdev->irq);
> 	printk(KERN_WARNING "3w-9xxx: scsi%d: Firmware %s, BIOS %s, Ports: %d.\n",
> 	       host->host_no,

Actions: View | Diff

Attachments on bug 309611: 209141