renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-11-19 08:05:27 +08:00
Code

Fix DAC960 driver on machines which don't support 64-bit DMA

Browse Source 
Addresses http://bugzilla.kernel.org/show_bug.cgi?id=8942

Use PCI_DMA_* constants instead of own private definitions Fall back to
32-bit DMA mask if a 64-bit one fails

Signed-off-by: Matthew Wilcox <matthew@wil.cx>
Acked-by: Jeff Garzik <jeff@garzik.org>
Tested-by: Lars <polynomial-c@gmx.de>
Cc: Alessandro Polverini <alex@nibbles.it>
Cc: <dac@conglom-o.org>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Matthew Wilcox 2007-09-11 15:23:38 -07:00 committed by Linus Torvalds
parent 1a1a1a758b
commit 868047fcbb
2 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/block/DAC960.c
View File

@ -17,8 +17,8 @@
*/ */
#define DAC960_DriverVersion "2.5.48" #define DAC960_DriverVersion "2.5.49"
#define DAC960_DriverDate "14 May 2006" #define DAC960_DriverDate "21 Aug 2007"
#include <linux/module.h> #include <linux/module.h>
@ -1165,9 +1165,9 @@ static bool DAC960_V1_EnableMemoryMailboxInterface(DAC960_Controller_T
int i; int i;
if (pci_set_dma_mask(Controller->PCIDevice, DAC690_V1_PciDmaMask)) if (pci_set_dma_mask(Controller->PCIDevice, DMA_32BIT_MASK))
return DAC960_Failure(Controller, "DMA mask out of range"); return DAC960_Failure(Controller, "DMA mask out of range");
Controller->BounceBufferLimit = DAC690_V1_PciDmaMask; Controller->BounceBufferLimit = DMA_32BIT_MASK;
if ((hw_type == DAC960_PD_Controller) || (hw_type == DAC960_P_Controller)) { if ((hw_type == DAC960_PD_Controller) || (hw_type == DAC960_P_Controller)) {
CommandMailboxesSize = 0; CommandMailboxesSize = 0;
@ -1368,9 +1368,12 @@ static bool DAC960_V2_EnableMemoryMailboxInterface(DAC960_Controller_T
dma_addr_t CommandMailboxDMA; dma_addr_t CommandMailboxDMA;
DAC960_V2_CommandStatus_T CommandStatus; DAC960_V2_CommandStatus_T CommandStatus;
if (pci_set_dma_mask(Controller->PCIDevice, DAC690_V2_PciDmaMask)) if (!pci_set_dma_mask(Controller->PCIDevice, DMA_64BIT_MASK))
return DAC960_Failure(Controller, "DMA mask out of range"); Controller->BounceBufferLimit = DMA_64BIT_MASK;
Controller->BounceBufferLimit = DAC690_V2_PciDmaMask; else if (!pci_set_dma_mask(Controller->PCIDevice, DMA_32BIT_MASK))
Controller->BounceBufferLimit = DMA_32BIT_MASK;
else
return DAC960_Failure(Controller, "DMA mask out of range");
/* This is a temporary dma mapping, used only in the scope of this function */ /* This is a temporary dma mapping, used only in the scope of this function */
CommandMailbox = pci_alloc_consistent(PCI_Device, CommandMailbox = pci_alloc_consistent(PCI_Device,

7
drivers/block/DAC960.h
View File

@ -60,13 +60,6 @@
#define DAC960_V1_MaxPhysicalDevices 45 #define DAC960_V1_MaxPhysicalDevices 45
#define DAC960_V2_MaxPhysicalDevices 272 #define DAC960_V2_MaxPhysicalDevices 272
/*
Define the pci dma mask supported by DAC960 V1 and V2 Firmware Controlers
*/
#define DAC690_V1_PciDmaMask 0xffffffff
#define DAC690_V2_PciDmaMask 0xffffffffffffffffULL
/* /*
Define a 32/64 bit I/O Address data type. Define a 32/64 bit I/O Address data type.
*/ */