Skip to content

L
linux
Commit eb021172 authored by David Jeffery's avatar David Jeffery Committed by James Bottomley
Browse files
Options

[PATCH] ips fix for large mem 64bit machines 

This patch fixes DMA bugs on x86-64 and ia64 machines.  The driver was
using commands that only support 32bit addresses in places that could
return 64bit addresses.  One place was DMAing off the stack.  The other
place was causing problems on x86-64 machines by calling pci_map()
functions on a region allocated by pci_alloc_consistent().
parent 0ff39cb7
Hide whitespace changes
Inline Side-by-side
Showing with 70 additions and 62 deletions
drivers/scsi/ips.c
View file @ eb021172
...@@ -131,6 +131,8 @@ ...@@ -131,6 +131,8 @@
/* 5.30.00 - use __devexit_p() */ /* 5.30.00 - use __devexit_p() */
/* 6.00.00 - Add 6x Adapters and Battery Flash */ /* 6.00.00 - Add 6x Adapters and Battery Flash */
/* 6.10.00 - Remove 1G Addressing Limitations */ /* 6.10.00 - Remove 1G Addressing Limitations */
/* 6.11.xx - Get VersionInfo buffer off the stack ! DDTS 60401 */
/* 6.11.xx - Make Logical Drive Info structure safe for DMA DDTS 60639 */
/*****************************************************************************/ /*****************************************************************************/
/* /*
...@@ -195,8 +197,8 @@ MODULE_PARM(ips, "s"); ...@@ -195,8 +197,8 @@ MODULE_PARM(ips, "s");
/* /*
* DRIVER_VER * DRIVER_VER
*/ */
#define IPS_VERSION_HIGH "6.10" #define IPS_VERSION_HIGH "7.00"
#define IPS_VERSION_LOW ".90-BETA" #define IPS_VERSION_LOW ".00 "
#if !defined(__i386__) && !defined(__ia64__) && !defined(__x86_64__) #if !defined(__i386__) && !defined(__ia64__) && !defined(__x86_64__)
#warning "This driver has only been tested on the x86/ia64/x86_64 platforms" #warning "This driver has only been tested on the x86/ia64/x86_64 platforms"
...@@ -497,8 +499,7 @@ int ips_proc_info(struct Scsi_Host *, char *, char **, off_t, int, int); ...@@ -497,8 +499,7 @@ int ips_proc_info(struct Scsi_Host *, char *, char **, off_t, int, int);
static int ips_host_info(ips_ha_t *, char *, off_t, int); static int ips_host_info(ips_ha_t *, char *, off_t, int);
static void copy_mem_info(IPS_INFOSTR *, char *, int); static void copy_mem_info(IPS_INFOSTR *, char *, int);
static int copy_info(IPS_INFOSTR *, char *, ...); static int copy_info(IPS_INFOSTR *, char *, ...);
static int ips_get_version_info(ips_ha_t * ha, IPS_VERSION_DATA * Buffer, static int ips_get_version_info(ips_ha_t * ha, dma_addr_t, int intr);
int intr);
static void ips_version_check(ips_ha_t * ha, int intr); static void ips_version_check(ips_ha_t * ha, int intr);
static int ips_abort_init(ips_ha_t * ha, int index); static int ips_abort_init(ips_ha_t * ha, int index);
static int ips_init_phase2(int index); static int ips_init_phase2(int index);
...@@ -3858,23 +3859,14 @@ ips_send_cmd(ips_ha_t * ha, ips_scb_t * scb) ...@@ -3858,23 +3859,14 @@ ips_send_cmd(ips_ha_t * ha, ips_scb_t * scb)
scb->scsi_cmd->result = DID_OK << 16; scb->scsi_cmd->result = DID_OK << 16;
} }
} else { } else {
scb->cmd.logical_info.op_code = scb->cmd.logical_info.op_code = IPS_CMD_GET_LD_INFO;
IPS_CMD_GET_LD_INFO; scb->cmd.logical_info.command_id = IPS_COMMAND_ID(ha, scb);
scb->cmd.logical_info.command_id =
IPS_COMMAND_ID(ha, scb);
scb->cmd.logical_info.reserved = 0; scb->cmd.logical_info.reserved = 0;
scb->cmd.logical_info.reserved2 = 0; scb->cmd.logical_info.reserved2 = 0;
scb->data_len = scb->data_len = sizeof (IPS_LD_INFO);
sizeof (ha->adapt->logical_drive_info); scb->data_busaddr = ha->logical_drive_info_dma_addr;
scb->data_busaddr = scb->flags = 0;
pci_map_single(ha->pcidev, scb->cmd.logical_info.buffer_addr = scb->data_busaddr;
&ha->adapt->
logical_drive_info,
scb->data_len,
IPS_DMA_DIR(scb));
scb->flags |= IPS_SCB_MAP_SINGLE;
scb->cmd.logical_info.buffer_addr =
scb->data_busaddr;
ret = IPS_SUCCESS; ret = IPS_SUCCESS;
} }
...@@ -4005,18 +3997,13 @@ ips_send_cmd(ips_ha_t * ha, ips_scb_t * scb) ...@@ -4005,18 +3997,13 @@ ips_send_cmd(ips_ha_t * ha, ips_scb_t * scb)
case READ_CAPACITY: case READ_CAPACITY:
scb->cmd.logical_info.op_code = IPS_CMD_GET_LD_INFO; scb->cmd.logical_info.op_code = IPS_CMD_GET_LD_INFO;
scb->cmd.logical_info.command_id = scb->cmd.logical_info.command_id = IPS_COMMAND_ID(ha, scb);
IPS_COMMAND_ID(ha, scb);
scb->cmd.logical_info.reserved = 0; scb->cmd.logical_info.reserved = 0;
scb->cmd.logical_info.reserved2 = 0; scb->cmd.logical_info.reserved2 = 0;
scb->cmd.logical_info.reserved3 = 0; scb->cmd.logical_info.reserved3 = 0;
scb->data_len = sizeof (ha->adapt->logical_drive_info); scb->data_len = sizeof (IPS_LD_INFO);
scb->data_busaddr = pci_map_single(ha->pcidev, scb->data_busaddr = ha->logical_drive_info_dma_addr;
&ha->adapt-> scb->flags = 0;
logical_drive_info,
scb->data_len,
IPS_DMA_DIR(scb));
scb->flags |= IPS_SCB_MAP_SINGLE;
scb->cmd.logical_info.buffer_addr = scb->data_busaddr; scb->cmd.logical_info.buffer_addr = scb->data_busaddr;
ret = IPS_SUCCESS; ret = IPS_SUCCESS;
break; break;
...@@ -4340,19 +4327,17 @@ ips_online(ips_ha_t * ha, ips_scb_t * scb) ...@@ -4340,19 +4327,17 @@ ips_online(ips_ha_t * ha, ips_scb_t * scb)
return (0); return (0);
if ((scb->basic_status & IPS_GSC_STATUS_MASK) > 1) { if ((scb->basic_status & IPS_GSC_STATUS_MASK) > 1) {
memset(&ha->adapt->logical_drive_info, 0, memset(ha->logical_drive_info, 0, sizeof (IPS_LD_INFO));
sizeof (ha->adapt->logical_drive_info));
return (0); return (0);
} }
if (ha->adapt->logical_drive_info.drive_info[scb->target_id].state != if (ha->logical_drive_info->drive_info[scb->target_id].state !=
IPS_LD_OFFLINE IPS_LD_OFFLINE
&& ha->adapt->logical_drive_info.drive_info[scb->target_id].state != && ha->logical_drive_info->drive_info[scb->target_id].state !=
IPS_LD_FREE IPS_LD_FREE
&& ha->adapt->logical_drive_info.drive_info[scb->target_id].state != && ha->logical_drive_info->drive_info[scb->target_id].state !=
IPS_LD_CRS IPS_LD_CRS
&& ha->adapt->logical_drive_info.drive_info[scb->target_id].state != && ha->logical_drive_info->drive_info[scb->target_id].state !=
IPS_LD_SYS) IPS_LD_SYS)
return (1); return (1);
else else
...@@ -4415,7 +4400,7 @@ ips_rdcap(ips_ha_t * ha, ips_scb_t * scb) ...@@ -4415,7 +4400,7 @@ ips_rdcap(ips_ha_t * ha, ips_scb_t * scb)
cap.lba = cap.lba =
cpu_to_be32(le32_to_cpu cpu_to_be32(le32_to_cpu
(ha->adapt->logical_drive_info. (ha->logical_drive_info->
drive_info[scb->target_id].sector_count) - 1); drive_info[scb->target_id].sector_count) - 1);
cap.len = cpu_to_be32((uint32_t) IPS_BLKSIZE); cap.len = cpu_to_be32((uint32_t) IPS_BLKSIZE);
...@@ -4579,6 +4564,14 @@ ips_free(ips_ha_t * ha) ...@@ -4579,6 +4564,14 @@ ips_free(ips_ha_t * ha)
ha->adapt = NULL; ha->adapt = NULL;
} }
if (ha->logical_drive_info) {
pci_free_consistent(ha->pcidev,
sizeof (IPS_LD_INFO),
ha->logical_drive_info,
ha->logical_drive_info_dma_addr);
ha->logical_drive_info = NULL;
}
if (ha->nvram) { if (ha->nvram) {
kfree(ha->nvram); kfree(ha->nvram);
ha->nvram = NULL; ha->nvram = NULL;
...@@ -4768,6 +4761,7 @@ ips_getscb(ips_ha_t * ha) ...@@ -4768,6 +4761,7 @@ ips_getscb(ips_ha_t * ha)
} }
ha->scb_freelist = scb->q_next; ha->scb_freelist = scb->q_next;
scb->flags = 0;
scb->q_next = NULL; scb->q_next = NULL;
ips_init_scb(ha, scb); ips_init_scb(ha, scb);
...@@ -6815,7 +6809,7 @@ ips_verify_bios_memio(ips_ha_t * ha, char *buffer, uint32_t buffersize, ...@@ -6815,7 +6809,7 @@ ips_verify_bios_memio(ips_ha_t * ha, char *buffer, uint32_t buffersize,
static void static void
ips_version_check(ips_ha_t * ha, int intr) ips_version_check(ips_ha_t * ha, int intr)
{ {
IPS_VERSION_DATA VersionInfo; IPS_VERSION_DATA *VersionInfo;
uint8_t FirmwareVersion[IPS_COMPAT_ID_LENGTH + 1]; uint8_t FirmwareVersion[IPS_COMPAT_ID_LENGTH + 1];
uint8_t BiosVersion[IPS_COMPAT_ID_LENGTH + 1]; uint8_t BiosVersion[IPS_COMPAT_ID_LENGTH + 1];
int MatchError; int MatchError;
...@@ -6825,6 +6819,8 @@ ips_version_check(ips_ha_t * ha, int intr) ...@@ -6825,6 +6819,8 @@ ips_version_check(ips_ha_t * ha, int intr)
METHOD_TRACE("ips_version_check", 1); METHOD_TRACE("ips_version_check", 1);
VersionInfo = ( IPS_VERSION_DATA * ) ha->ioctl_data;
memset(FirmwareVersion, 0, IPS_COMPAT_ID_LENGTH + 1); memset(FirmwareVersion, 0, IPS_COMPAT_ID_LENGTH + 1);
memset(BiosVersion, 0, IPS_COMPAT_ID_LENGTH + 1); memset(BiosVersion, 0, IPS_COMPAT_ID_LENGTH + 1);
...@@ -6835,9 +6831,10 @@ ips_version_check(ips_ha_t * ha, int intr) ...@@ -6835,9 +6831,10 @@ ips_version_check(ips_ha_t * ha, int intr)
rc = IPS_FAILURE; rc = IPS_FAILURE;
if (ha->subsys->param[4] & IPS_GET_VERSION_SUPPORT) { /* If Versioning is Supported */ if (ha->subsys->param[4] & IPS_GET_VERSION_SUPPORT) { /* If Versioning is Supported */
/* Get the Version Info with a Get Version Command */ /* Get the Version Info with a Get Version Command */
rc = ips_get_version_info(ha, &VersionInfo, intr); memset( VersionInfo, 0, sizeof (IPS_VERSION_DATA));
rc = ips_get_version_info(ha, ha->ioctl_busaddr, intr);
if (rc == IPS_SUCCESS) if (rc == IPS_SUCCESS)
memcpy(FirmwareVersion, VersionInfo.compatibilityId, memcpy(FirmwareVersion, VersionInfo->compatibilityId,
IPS_COMPAT_ID_LENGTH); IPS_COMPAT_ID_LENGTH);
} }
...@@ -6900,14 +6897,13 @@ ips_version_check(ips_ha_t * ha, int intr) ...@@ -6900,14 +6897,13 @@ ips_version_check(ips_ha_t * ha, int intr)
/* 0 if Successful, else non-zero */ /* 0 if Successful, else non-zero */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static int static int
ips_get_version_info(ips_ha_t * ha, IPS_VERSION_DATA * Buffer, int intr) ips_get_version_info(ips_ha_t * ha, dma_addr_t Buffer, int intr)
{ {
ips_scb_t *scb; ips_scb_t *scb;
int rc; int rc;
METHOD_TRACE("ips_get_version_info", 1); METHOD_TRACE("ips_get_version_info", 1);
memset(Buffer, 0, sizeof (IPS_VERSION_DATA));
scb = &ha->scbs[ha->max_cmds - 1]; scb = &ha->scbs[ha->max_cmds - 1];
ips_init_scb(ha, scb); ips_init_scb(ha, scb);
...@@ -6919,11 +6915,10 @@ ips_get_version_info(ips_ha_t * ha, IPS_VERSION_DATA * Buffer, int intr) ...@@ -6919,11 +6915,10 @@ ips_get_version_info(ips_ha_t * ha, IPS_VERSION_DATA * Buffer, int intr)
scb->cmd.version_info.reserved = 0; scb->cmd.version_info.reserved = 0;
scb->cmd.version_info.count = sizeof (IPS_VERSION_DATA); scb->cmd.version_info.count = sizeof (IPS_VERSION_DATA);
scb->cmd.version_info.reserved2 = 0; scb->cmd.version_info.reserved2 = 0;
scb->data_len = sizeof (*Buffer); scb->data_len = sizeof (IPS_VERSION_DATA);
scb->data_busaddr = pci_map_single(ha->pcidev, Buffer, scb->data_busaddr = Buffer;
scb->data_len, IPS_DMA_DIR(scb)); scb->cmd.version_info.buffer_addr = Buffer;
scb->cmd.version_info.buffer_addr = scb->data_busaddr; scb->flags = 0;
scb->flags |= IPS_SCB_MAP_SINGLE;
/* issue command */ /* issue command */
rc = ips_send_wait(ha, scb, ips_cmd_timeout, intr); rc = ips_send_wait(ha, scb, ips_cmd_timeout, intr);
...@@ -7394,6 +7389,17 @@ ips_init_phase1(struct pci_dev *pci_dev, int *indexPtr) ...@@ -7394,6 +7389,17 @@ ips_init_phase1(struct pci_dev *pci_dev, int *indexPtr)
ha->adapt->hw_status_start = dma_address; ha->adapt->hw_status_start = dma_address;
ha->dummy = (void *) (ha->adapt + 1); ha->dummy = (void *) (ha->adapt + 1);
ha->logical_drive_info = pci_alloc_consistent(pci_dev, sizeof (IPS_LD_INFO), &dma_address);
if (!ha->logical_drive_info) {
IPS_PRINTK(KERN_WARNING, pci_dev,
"Unable to allocate logical drive info structure\n");
return ips_abort_init(ha, index);
}
ha->logical_drive_info_dma_addr = dma_address;
ha->conf = kmalloc(sizeof (IPS_CONF), GFP_KERNEL); ha->conf = kmalloc(sizeof (IPS_CONF), GFP_KERNEL);
if (!ha->conf) { if (!ha->conf) {
......
drivers/scsi/ips.h
View file @ eb021172
...@@ -711,7 +711,6 @@ typedef struct { ...@@ -711,7 +711,6 @@ typedef struct {
volatile PIPS_STATUS p_status_tail; volatile PIPS_STATUS p_status_tail;
volatile uint32_t hw_status_start; volatile uint32_t hw_status_start;
volatile uint32_t hw_status_tail; volatile uint32_t hw_status_tail;
IPS_LD_INFO logical_drive_info;
} IPS_ADAPTER, *PIPS_ADAPTER; } IPS_ADAPTER, *PIPS_ADAPTER;
typedef struct { typedef struct {
...@@ -1084,6 +1083,8 @@ typedef struct ips_ha { ...@@ -1084,6 +1083,8 @@ typedef struct ips_ha {
ips_scb_queue_t scb_activelist; /* Active SCB list */ ips_scb_queue_t scb_activelist; /* Active SCB list */
IPS_IO_CMD *dummy; /* dummy command */ IPS_IO_CMD *dummy; /* dummy command */
IPS_ADAPTER *adapt; /* Adapter status area */ IPS_ADAPTER *adapt; /* Adapter status area */
IPS_LD_INFO *logical_drive_info; /* Adapter Logical Drive Info */
dma_addr_t logical_drive_info_dma_addr; /* Logical Drive Info DMA Address */
IPS_ENQ *enq; /* Adapter Enquiry data */ IPS_ENQ *enq; /* Adapter Enquiry data */
IPS_CONF *conf; /* Adapter config data */ IPS_CONF *conf; /* Adapter config data */
IPS_NVRAM_P5 *nvram; /* NVRAM page 5 data */ IPS_NVRAM_P5 *nvram; /* NVRAM page 5 data */
...@@ -1132,7 +1133,7 @@ typedef struct ips_scb { ...@@ -1132,7 +1133,7 @@ typedef struct ips_scb {
uint8_t lun; uint8_t lun;
uint8_t cdb[12]; uint8_t cdb[12];
uint32_t scb_busaddr; uint32_t scb_busaddr;
uint32_t data_busaddr; uint32_t old_data_busaddr; // Obsolete, but kept for old utility compatibility
uint32_t timeout; uint32_t timeout;
uint8_t basic_status; uint8_t basic_status;
uint8_t extended_status; uint8_t extended_status;
...@@ -1148,6 +1149,7 @@ typedef struct ips_scb { ...@@ -1148,6 +1149,7 @@ typedef struct ips_scb {
ips_scb_callback callback; ips_scb_callback callback;
uint32_t sg_busaddr; uint32_t sg_busaddr;
int sg_count; int sg_count;
dma_addr_t data_busaddr;
} ips_scb_t; } ips_scb_t;
typedef struct ips_scb_pt { typedef struct ips_scb_pt {
...@@ -1201,15 +1203,15 @@ typedef struct { ...@@ -1201,15 +1203,15 @@ typedef struct {
* *
*************************************************************************/ *************************************************************************/
#define IPS_VER_MAJOR 6 #define IPS_VER_MAJOR 7
#define IPS_VER_MAJOR_STRING "6" #define IPS_VER_MAJOR_STRING "7"
#define IPS_VER_MINOR 10 #define IPS_VER_MINOR 00
#define IPS_VER_MINOR_STRING "10" #define IPS_VER_MINOR_STRING "00"
#define IPS_VER_BUILD 90 #define IPS_VER_BUILD 00
#define IPS_VER_BUILD_STRING "90" #define IPS_VER_BUILD_STRING "00"
#define IPS_VER_STRING "6.10.90" #define IPS_VER_STRING "7.00.00"
#define IPS_RELEASE_ID 0x00010000 #define IPS_RELEASE_ID 0x00010001
#define IPS_BUILD_IDENT 364 #define IPS_BUILD_IDENT 475
#define IPS_LEGALCOPYRIGHT_STRING "(C) Copyright IBM Corp. 1994, 2003. All Rights Reserved." #define IPS_LEGALCOPYRIGHT_STRING "(C) Copyright IBM Corp. 1994, 2003. All Rights Reserved."
#define IPS_ADAPTECCOPYRIGHT_STRING "(c) Copyright Adaptec, Inc. 2002 to present. All Rights Reserved." #define IPS_ADAPTECCOPYRIGHT_STRING "(c) Copyright Adaptec, Inc. 2002 to present. All Rights Reserved."
#define IPS_NT_LEGALCOPYRIGHT_STRING "(C) Copyright IBM Corp. 1994, 2003." #define IPS_NT_LEGALCOPYRIGHT_STRING "(C) Copyright IBM Corp. 1994, 2003."
...@@ -1219,11 +1221,11 @@ typedef struct { ...@@ -1219,11 +1221,11 @@ typedef struct {
#define IPS_VER_SERVERAID2 "2.88.13" #define IPS_VER_SERVERAID2 "2.88.13"
#define IPS_VER_NAVAJO "2.88.13" #define IPS_VER_NAVAJO "2.88.13"
#define IPS_VER_SERVERAID3 "6.10.24" #define IPS_VER_SERVERAID3 "6.10.24"
#define IPS_VER_SERVERAID4H "6.10.24" #define IPS_VER_SERVERAID4H "6.11.07"
#define IPS_VER_SERVERAID4MLx "6.10.24" #define IPS_VER_SERVERAID4MLx "6.11.07"
#define IPS_VER_SARASOTA "6.10.24" #define IPS_VER_SARASOTA "6.11.07"
#define IPS_VER_MARCO "6.10.24" #define IPS_VER_MARCO "6.11.07"
#define IPS_VER_SEBRING "6.10.24" #define IPS_VER_SEBRING "6.11.07"
/* Compatability IDs for various adapters */ /* Compatability IDs for various adapters */
#define IPS_COMPAT_UNKNOWN "" #define IPS_COMPAT_UNKNOWN ""
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7