Skip to contentSkip to conversation

scsi: megaraid_{mm,mbox}: 64-bit DMA capability fix

PATCH In review Vasily Averin 2 participants 2 messages Oct 16, 2006

Subsystems (2)
SCSI Megaraid SCSI/SAS drivers
lore
Share & tools
lore

Vasily Averin

author
#0 lore raw

PATCH 1/1 scsi: megaraid_{mm,mbox}: 64-bit DMA capability fix

From: Andrey Mirkin ([email protected])

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 <[email protected]>
Ack-by Vasily Averin <[email protected]>

--- 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 &&

drivers/scsi/megaraid/megaraid_mbox.c renamed from drivers/scsi/megaraid/megaraid_mbox.c.mgst6 +1 -1
@@ -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 &&
#1 lore raw
Quoted 12 lines · Vasily Averin

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 <[email protected]>
Ack-by Vasily Averin <[email protected]>

--- 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

drivers/scsi/megaraid/megaraid_mbox.c megaraid_init_mbox(adapter_t *adapter) · line 890

Quoted 8 lines
drivers/scsi/megaraid/megaraid_mbox.c renamed from drivers/scsi/megaraid/megaraid_mbox.c.mgst6 +1 -1
@@ -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 &&

Er ... this patch would apply in reverse, but what's in the tree currently looks to be correct.

James