Skip to content

Commit

Permalink
[SCSI] mptfusion: misc fix's
Browse files Browse the repository at this point in the history 
* 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>
  • Loading branch information
Eric Moore authored and James Bottomley committed Jul 13, 2006
1 parent 0ccdb00 commit ba856d3
Show file tree
Hide file tree
Showing 9 changed files with 10 additions and 49 deletions.
2 changes: 0 additions & 2 deletions drivers/message/fusion/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,8 @@ config FUSION_SAS
List of supported controllers:

LSISAS1064
LSISAS1066
LSISAS1068
LSISAS1064E
LSISAS1066E
LSISAS1068E

config FUSION_MAX_SGE
Expand Down
1 change: 0 additions & 1 deletion drivers/message/fusion/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
#EXTRA_CFLAGS += -DMPT_DEBUG_EXIT
#EXTRA_CFLAGS += -DMPT_DEBUG_FAIL


#
# driver/module specifics...
#
Expand Down
7 changes: 4 additions & 3 deletions drivers/message/fusion/mptbase.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1054,9 +1054,8 @@ mpt_host_page_alloc(MPT_ADAPTER *ioc, pIOCInit_t ioc_init)

dinitprintk((MYIOC_s_INFO_FMT
"host_page_buffer @ %p, dma @ %x, sz=%d bytes\n",
ioc->name,
ioc->HostPageBuffer,
ioc->HostPageBuffer_dma,
ioc->name, ioc->HostPageBuffer,
(u32)ioc->HostPageBuffer_dma,
host_page_buffer_sz));
ioc->alloc_total += host_page_buffer_sz;
ioc->HostPageBuffer_sz = host_page_buffer_sz;
Expand Down Expand Up @@ -1378,6 +1377,7 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id)
printk(KERN_WARNING MYNAM
": WARNING - %s did not initialize properly! (%d)\n",
ioc->name, r);

list_del(&ioc->list);
if (ioc->alt_ioc)
ioc->alt_ioc->alt_ioc = NULL;
Expand Down Expand Up @@ -2668,6 +2668,7 @@ SendIocInit(MPT_ADAPTER *ioc, int sleepFlag)
dinitprintk((MYIOC_s_INFO_FMT "INFO - Wait IOC_OPERATIONAL state (cnt=%d)\n",
ioc->name, count));

ioc->aen_event_read_flag=0;
return r;
}

Expand Down
1 change: 0 additions & 1 deletion drivers/message/fusion/mptbase.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -981,7 +981,6 @@ typedef struct _MPT_SCSI_HOST {
wait_queue_head_t scandv_waitq;
int scandv_wait_done;
long last_queue_full;
u8 mpt_pq_filter;
u16 tm_iocstatus;
} MPT_SCSI_HOST;

Expand Down
4 changes: 2 additions & 2 deletions drivers/message/fusion/mptctl.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2332,7 +2332,7 @@ mptctl_do_mpt_command (struct mpt_ioctl_command karg, void __user *mfPtr)
}

/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
/* Prototype Routine for the HP HOST INFO command.
/* Prototype Routine for the HOST INFO command.
*
* Outputs: None.
* Return: 0 if successful
Expand Down Expand Up @@ -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.
* Return: 0 if successful
Expand Down
5 changes: 0 additions & 5 deletions drivers/message/fusion/mptctl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -354,18 +354,13 @@ struct mpt_ioctl_command32 {


/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
/*
* HP Specific IOCTL Defines and Structures
*/

#define CPQFCTS_IOC_MAGIC 'Z'
#define HP_IOC_MAGIC 'Z'
#define HP_GETHOSTINFO _IOR(HP_IOC_MAGIC, 20, hp_host_info_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)

/* All HP IOCTLs must include this header
*/
typedef struct _hp_header {
unsigned int iocnum;
unsigned int host;
Expand Down
14 changes: 1 addition & 13 deletions drivers/message/fusion/mptfc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,6 @@ MODULE_DESCRIPTION(my_NAME);
MODULE_LICENSE("GPL");

/* 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)
static int mptfc_dev_loss_tmo = MPTFC_DEV_LOSS_TMO; /* reasonable default */
module_param(mptfc_dev_loss_tmo, int, 0);
Expand Down Expand Up @@ -513,8 +509,7 @@ mptfc_slave_alloc(struct scsi_device *sdev)

if (vtarget->num_luns == 0) {
vtarget->ioc_id = hd->ioc->id;
vtarget->tflags = MPT_TARGET_FLAGS_Q_YES |
MPT_TARGET_FLAGS_VALID_INQUIRY;
vtarget->tflags = MPT_TARGET_FLAGS_Q_YES;
hd->Targets[sdev->id] = vtarget;
}

Expand Down Expand Up @@ -1129,13 +1124,6 @@ mptfc_probe(struct pci_dev *pdev, const struct pci_device_id *id)
hd->timer.data = (unsigned long) hd;
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);
hd->scandv_wait_done = 0;
hd->last_queue_full = 0;
Expand Down
15 changes: 1 addition & 14 deletions drivers/message/fusion/mptsas.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,16 +76,10 @@ MODULE_AUTHOR(MODULEAUTHOR);
MODULE_DESCRIPTION(my_NAME);
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;
module_param(mpt_pt_clear, int, 0);
MODULE_PARM_DESC(mpt_pt_clear,
"Clear persistency table: enable=1 "
" Clear persistency table: enable=1 "
"(default=MPTSCSIH_PT_CLEAR=0)");

static int mptsasDoneCtx = -1;
Expand Down Expand Up @@ -2703,20 +2697,13 @@ mptsas_probe(struct pci_dev *pdev, const struct pci_device_id *id)
hd->timer.data = (unsigned long) hd;
hd->timer.function = mptscsih_timer_expired;

hd->mpt_pq_filter = mpt_pq_filter;
ioc->sas_data.ptClear = mpt_pt_clear;

if (ioc->sas_data.ptClear==1) {
mptbase_sas_persist_operation(
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);
hd->scandv_wait_done = 0;
hd->last_queue_full = 0;
Expand Down
10 changes: 2 additions & 8 deletions drivers/message/fusion/mptspi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,6 @@ static int mpt_saf_te = MPTSCSIH_SAF_TE;
module_param(mpt_saf_te, int, 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_width(struct scsi_target *, int);
static int mptspi_write_spi_device_pg1(struct scsi_target *,
Expand Down Expand Up @@ -1047,14 +1043,12 @@ mptspi_probe(struct pci_dev *pdev, const struct pci_device_id *id)
hd->timer.function = mptscsih_timer_expired;

ioc->spi_data.Saf_Te = mpt_saf_te;
hd->mpt_pq_filter = mpt_pq_filter;

hd->negoNvram = MPT_SCSICFG_USE_NVRAM;
ddvprintk((MYIOC_s_INFO_FMT
"saf_te %x mpt_pq_filter %x\n",
"saf_te %x\n",
ioc->name,
mpt_saf_te,
mpt_pq_filter));
mpt_saf_te));
ioc->spi_data.noQas = 0;

init_waitqueue_head(&hd->scandv_waitq);
Expand Down

0 comments on commit ba856d3

Please sign in to comment.