[PATCH 2.6.19-rc2] scsi: megaraid_{mm,mbox}: 64-bit DMA capabilityfix

From: Vasily Averin
Date: Mon Oct 16 2006 - 04:09:20 EST


From: Andrey Mirkin (amirkin@xxxxx)

It is known that 2 LSI Logic MegaRAID SATA RAID Controllers (150-4 and 150-6)
don't support 64-bit DMA. Unfortunately currently this check is wrong and driver
sets 64-bit DMA mode for these devices.

Signed-off-by: Andrey Mirkin <amirkin@xxxxx>
Ack-by: Vasily Averin <vvs@xxxxx>

--- linux-2.6.19-rc2/drivers/scsi/megaraid/megaraid_mbox.c.mgst6 2006-10-16
10:26:50.000000000 +0400
+++ linux-2.6.19-rc2/drivers/scsi/megaraid/megaraid_mbox.c 2006-10-16
11:30:55.000000000 +0400
@@ -884,7 +884,7 @@ megaraid_init_mbox(adapter_t *adapter)

if (((magic64 == HBA_SIGNATURE_64_BIT) &&
((adapter->pdev->subsystem_device !=
- PCI_SUBSYS_ID_MEGARAID_SATA_150_6) ||
+ PCI_SUBSYS_ID_MEGARAID_SATA_150_6) &&
(adapter->pdev->subsystem_device !=
PCI_SUBSYS_ID_MEGARAID_SATA_150_4))) ||
(adapter->pdev->vendor == PCI_VENDOR_ID_LSI_LOGIC &&

--- linux-2.6.19-rc2/drivers/scsi/megaraid/megaraid_mbox.c.mgst6 2006-10-16 10:26:50.000000000 +0400
+++ linux-2.6.19-rc2/drivers/scsi/megaraid/megaraid_mbox.c 2006-10-16 11:30:55.000000000 +0400
@@ -884,7 +884,7 @@ megaraid_init_mbox(adapter_t *adapter)

if (((magic64 == HBA_SIGNATURE_64_BIT) &&
((adapter->pdev->subsystem_device !=
- PCI_SUBSYS_ID_MEGARAID_SATA_150_6) ||
+ PCI_SUBSYS_ID_MEGARAID_SATA_150_6) &&
(adapter->pdev->subsystem_device !=
PCI_SUBSYS_ID_MEGARAID_SATA_150_4))) ||
(adapter->pdev->vendor == PCI_VENDOR_ID_LSI_LOGIC &&