OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[SCSI] mptfusion: misc fix's 

* removing obsolete 1066, 1066E from Kconfig
* initializing aen_event_read_flag after host reset
* remove oem references
* remove obsolete mpt_pq_filter command line option

Signed-off-by: Eric Moore <Eric.Moore@lsil.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
This commit is contained in:
Eric Moore 2006-07-11 17:34:01 -06:00 committed by James Bottomley
parent 0ccdb00759
commit ba856d32f2
9 changed files with 10 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/message/fusion/Kconfig
View File

@ -48,10 +48,8 @@ config FUSION_SAS
List of supported controllers: List of supported controllers:
LSISAS1064 LSISAS1064
LSISAS1066
LSISAS1068 LSISAS1068
LSISAS1064E LSISAS1064E
LSISAS1066E
LSISAS1068E LSISAS1068E
config FUSION_MAX_SGE config FUSION_MAX_SGE

1
drivers/message/fusion/Makefile
View File

@ -9,7 +9,6 @@
#EXTRA_CFLAGS += -DMPT_DEBUG_EXIT #EXTRA_CFLAGS += -DMPT_DEBUG_EXIT
#EXTRA_CFLAGS += -DMPT_DEBUG_FAIL #EXTRA_CFLAGS += -DMPT_DEBUG_FAIL
# #
# driver/module specifics... # driver/module specifics...
# #

7
drivers/message/fusion/mptbase.c
View File

@ -1054,9 +1054,8 @@ mpt_host_page_alloc(MPT_ADAPTER *ioc, pIOCInit_t ioc_init)
dinitprintk((MYIOC_s_INFO_FMT dinitprintk((MYIOC_s_INFO_FMT
"host_page_buffer @ %p, dma @ %x, sz=%d bytes\n", "host_page_buffer @ %p, dma @ %x, sz=%d bytes\n",
ioc->name, ioc->name, ioc->HostPageBuffer,
ioc->HostPageBuffer, (u32)ioc->HostPageBuffer_dma,
ioc->HostPageBuffer_dma,
host_page_buffer_sz)); host_page_buffer_sz));
ioc->alloc_total += host_page_buffer_sz; ioc->alloc_total += host_page_buffer_sz;
ioc->HostPageBuffer_sz = host_page_buffer_sz; ioc->HostPageBuffer_sz = host_page_buffer_sz;
@ -1378,6 +1377,7 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id)
printk(KERN_WARNING MYNAM printk(KERN_WARNING MYNAM
": WARNING - %s did not initialize properly! (%d)\n", ": WARNING - %s did not initialize properly! (%d)\n",
ioc->name, r); ioc->name, r);
list_del(&ioc->list); list_del(&ioc->list);
if (ioc->alt_ioc) if (ioc->alt_ioc)
ioc->alt_ioc->alt_ioc = NULL; ioc->alt_ioc->alt_ioc = NULL;
@ -2668,6 +2668,7 @@ SendIocInit(MPT_ADAPTER *ioc, int sleepFlag)
dinitprintk((MYIOC_s_INFO_FMT "INFO - Wait IOC_OPERATIONAL state (cnt=%d)\n", dinitprintk((MYIOC_s_INFO_FMT "INFO - Wait IOC_OPERATIONAL state (cnt=%d)\n",
ioc->name, count)); ioc->name, count));
ioc->aen_event_read_flag=0;
return r; return r;
} }

1
drivers/message/fusion/mptbase.h
View File

@ -981,7 +981,6 @@ typedef struct _MPT_SCSI_HOST {
wait_queue_head_t scandv_waitq; wait_queue_head_t scandv_waitq;
int scandv_wait_done; int scandv_wait_done;
long last_queue_full; long last_queue_full;
u8 mpt_pq_filter;
u16 tm_iocstatus; u16 tm_iocstatus;
} MPT_SCSI_HOST; } MPT_SCSI_HOST;

4
drivers/message/fusion/mptctl.c
View File

@ -2332,7 +2332,7 @@ done_free_mem:
} }
/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
/* Prototype Routine for the HP HOST INFO command. /* Prototype Routine for the HOST INFO command.
* *
* Outputs: None. * Outputs: None.
* Return: 0 if successful * Return: 0 if successful
@ -2568,7 +2568,7 @@ mptctl_hp_hostinfo(unsigned long arg, unsigned int data_size)
} }
/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
/* Prototype Routine for the HP TARGET INFO command. /* Prototype Routine for the TARGET INFO command.
* *
* Outputs: None. * Outputs: None.
* Return: 0 if successful * Return: 0 if successful

5
drivers/message/fusion/mptctl.h
View File

@ -354,9 +354,6 @@ struct mpt_ioctl_command32 {
/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
/*
* HP Specific IOCTL Defines and Structures
*/
#define CPQFCTS_IOC_MAGIC 'Z' #define CPQFCTS_IOC_MAGIC 'Z'
#define HP_IOC_MAGIC 'Z' #define HP_IOC_MAGIC 'Z'
@ -364,8 +361,6 @@ struct mpt_ioctl_command32 {
#define HP_GETHOSTINFO1 _IOR(HP_IOC_MAGIC, 20, hp_host_info_rev0_t) #define HP_GETHOSTINFO1 _IOR(HP_IOC_MAGIC, 20, hp_host_info_rev0_t)
#define HP_GETTARGETINFO _IOR(HP_IOC_MAGIC, 21, hp_target_info_t) #define HP_GETTARGETINFO _IOR(HP_IOC_MAGIC, 21, hp_target_info_t)
/* All HP IOCTLs must include this header
*/
typedef struct _hp_header { typedef struct _hp_header {
unsigned int iocnum; unsigned int iocnum;
unsigned int host; unsigned int host;

14
drivers/message/fusion/mptfc.c
View File

@ -77,10 +77,6 @@ MODULE_DESCRIPTION(my_NAME);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
/* Command line args */ /* Command line args */
static int mpt_pq_filter = 0;
module_param(mpt_pq_filter, int, 0);
MODULE_PARM_DESC(mpt_pq_filter, " Enable peripheral qualifier filter: enable=1 (default=0)");
#define MPTFC_DEV_LOSS_TMO (60) #define MPTFC_DEV_LOSS_TMO (60)
static int mptfc_dev_loss_tmo = MPTFC_DEV_LOSS_TMO; /* reasonable default */ static int mptfc_dev_loss_tmo = MPTFC_DEV_LOSS_TMO; /* reasonable default */
module_param(mptfc_dev_loss_tmo, int, 0); module_param(mptfc_dev_loss_tmo, int, 0);
@ -513,8 +509,7 @@ mptfc_slave_alloc(struct scsi_device *sdev)
if (vtarget->num_luns == 0) { if (vtarget->num_luns == 0) {
vtarget->ioc_id = hd->ioc->id; vtarget->ioc_id = hd->ioc->id;
vtarget->tflags = MPT_TARGET_FLAGS_Q_YES | vtarget->tflags = MPT_TARGET_FLAGS_Q_YES;
MPT_TARGET_FLAGS_VALID_INQUIRY;
hd->Targets[sdev->id] = vtarget; hd->Targets[sdev->id] = vtarget;
} }
@ -1129,13 +1124,6 @@ mptfc_probe(struct pci_dev *pdev, const struct pci_device_id *id)
hd->timer.data = (unsigned long) hd; hd->timer.data = (unsigned long) hd;
hd->timer.function = mptscsih_timer_expired; hd->timer.function = mptscsih_timer_expired;
hd->mpt_pq_filter = mpt_pq_filter;
ddvprintk((MYIOC_s_INFO_FMT
"mpt_pq_filter %x\n",
ioc->name,
mpt_pq_filter));
init_waitqueue_head(&hd->scandv_waitq); init_waitqueue_head(&hd->scandv_waitq);
hd->scandv_wait_done = 0; hd->scandv_wait_done = 0;
hd->last_queue_full = 0; hd->last_queue_full = 0;

15
drivers/message/fusion/mptsas.c
View File

@ -76,16 +76,10 @@ MODULE_AUTHOR(MODULEAUTHOR);
MODULE_DESCRIPTION(my_NAME); MODULE_DESCRIPTION(my_NAME);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
static int mpt_pq_filter;
module_param(mpt_pq_filter, int, 0);
MODULE_PARM_DESC(mpt_pq_filter,
"Enable peripheral qualifier filter: enable=1 "
"(default=0)");
static int mpt_pt_clear; static int mpt_pt_clear;
module_param(mpt_pt_clear, int, 0); module_param(mpt_pt_clear, int, 0);
MODULE_PARM_DESC(mpt_pt_clear, MODULE_PARM_DESC(mpt_pt_clear,
"Clear persistency table: enable=1 " " Clear persistency table: enable=1 "
"(default=MPTSCSIH_PT_CLEAR=0)"); "(default=MPTSCSIH_PT_CLEAR=0)");
static int mptsasDoneCtx = -1; static int mptsasDoneCtx = -1;
@ -2703,7 +2697,6 @@ mptsas_probe(struct pci_dev *pdev, const struct pci_device_id *id)
hd->timer.data = (unsigned long) hd; hd->timer.data = (unsigned long) hd;
hd->timer.function = mptscsih_timer_expired; hd->timer.function = mptscsih_timer_expired;
hd->mpt_pq_filter = mpt_pq_filter;
ioc->sas_data.ptClear = mpt_pt_clear; ioc->sas_data.ptClear = mpt_pt_clear;
if (ioc->sas_data.ptClear==1) { if (ioc->sas_data.ptClear==1) {
@ -2711,12 +2704,6 @@ mptsas_probe(struct pci_dev *pdev, const struct pci_device_id *id)
ioc, MPI_SAS_OP_CLEAR_ALL_PERSISTENT); ioc, MPI_SAS_OP_CLEAR_ALL_PERSISTENT);
} }
ddvprintk((MYIOC_s_INFO_FMT
"mpt_pq_filter %x mpt_pq_filter %x\n",
ioc->name,
mpt_pq_filter,
mpt_pq_filter));
init_waitqueue_head(&hd->scandv_waitq); init_waitqueue_head(&hd->scandv_waitq);
hd->scandv_wait_done = 0; hd->scandv_wait_done = 0;
hd->last_queue_full = 0; hd->last_queue_full = 0;

10
drivers/message/fusion/mptspi.c
View File

@ -83,10 +83,6 @@ static int mpt_saf_te = MPTSCSIH_SAF_TE;
module_param(mpt_saf_te, int, 0); module_param(mpt_saf_te, int, 0);
MODULE_PARM_DESC(mpt_saf_te, " Force enabling SEP Processor: enable=1 (default=MPTSCSIH_SAF_TE=0)"); MODULE_PARM_DESC(mpt_saf_te, " Force enabling SEP Processor: enable=1 (default=MPTSCSIH_SAF_TE=0)");
static int mpt_pq_filter = 0;
module_param(mpt_pq_filter, int, 0);
MODULE_PARM_DESC(mpt_pq_filter, " Enable peripheral qualifier filter: enable=1 (default=0)");
static void mptspi_write_offset(struct scsi_target *, int); static void mptspi_write_offset(struct scsi_target *, int);
static void mptspi_write_width(struct scsi_target *, int); static void mptspi_write_width(struct scsi_target *, int);
static int mptspi_write_spi_device_pg1(struct scsi_target *, static int mptspi_write_spi_device_pg1(struct scsi_target *,
@ -1047,14 +1043,12 @@ mptspi_probe(struct pci_dev *pdev, const struct pci_device_id *id)
hd->timer.function = mptscsih_timer_expired; hd->timer.function = mptscsih_timer_expired;
ioc->spi_data.Saf_Te = mpt_saf_te; ioc->spi_data.Saf_Te = mpt_saf_te;
hd->mpt_pq_filter = mpt_pq_filter;
hd->negoNvram = MPT_SCSICFG_USE_NVRAM; hd->negoNvram = MPT_SCSICFG_USE_NVRAM;
ddvprintk((MYIOC_s_INFO_FMT ddvprintk((MYIOC_s_INFO_FMT
"saf_te %x mpt_pq_filter %x\n", "saf_te %x\n",
ioc->name, ioc->name,
mpt_saf_te, mpt_saf_te));
mpt_pq_filter));
ioc->spi_data.noQas = 0; ioc->spi_data.noQas = 0;
init_waitqueue_head(&hd->scandv_waitq); init_waitqueue_head(&hd->scandv_waitq);