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

advansys: use host_reset 

The advansys_reset() function is actually a host reset, not a
bus reset. And there is no need to have a 'last_reset'
value; the same value exists in struct Scsi_Host.

Signed-off-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: James Bottomley <JBottomley@Odin.com>
This commit is contained in:
Hannes Reinecke 2015-04-24 13:18:20 +02:00 committed by James Bottomley
parent c5c2567fd3
commit eac0b0c76f
1 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/scsi/advansys.c
View File

@ -2366,7 +2366,6 @@ struct asc_board {
ADVEEP_38C0800_CONFIG adv_38C0800_eep; /* 38C0800 EEPROM config. */ ADVEEP_38C0800_CONFIG adv_38C0800_eep; /* 38C0800 EEPROM config. */
ADVEEP_38C1600_CONFIG adv_38C1600_eep; /* 38C1600 EEPROM config. */ ADVEEP_38C1600_CONFIG adv_38C1600_eep; /* 38C1600 EEPROM config. */
} eep_config; } eep_config;
ulong last_reset; /* Saved last reset time */
/* /proc/scsi/advansys/[0...] */ /* /proc/scsi/advansys/[0...] */
#ifdef ADVANSYS_STATS #ifdef ADVANSYS_STATS
struct asc_stats asc_stats; /* Board statistics */ struct asc_stats asc_stats; /* Board statistics */
@ -3350,7 +3349,7 @@ static void asc_prt_driver_conf(struct seq_file *m, struct Scsi_Host *shost)
seq_printf(m, seq_printf(m,
" flags 0x%x, last_reset 0x%lx, jiffies 0x%lx, asc_n_io_port 0x%x\n", " flags 0x%x, last_reset 0x%lx, jiffies 0x%lx, asc_n_io_port 0x%x\n",
boardp->flags, boardp->last_reset, jiffies, boardp->flags, shost->last_reset, jiffies,
boardp->asc_n_io_port); boardp->asc_n_io_port);
seq_printf(m, " io_port 0x%lx\n", shost->io_port); seq_printf(m, " io_port 0x%lx\n", shost->io_port);
@ -7453,7 +7452,7 @@ static int AscISR(ASC_DVC_VAR *asc_dvc)
/* /*
* advansys_reset() * advansys_reset()
* *
* Reset the bus associated with the command 'scp'. * Reset the host associated with the command 'scp'.
* *
* This function runs its own thread. Interrupts must be blocked but * This function runs its own thread. Interrupts must be blocked but
* sleeping is allowed and no locking other than for host structures is * sleeping is allowed and no locking other than for host structures is
@ -7471,7 +7470,7 @@ static int advansys_reset(struct scsi_cmnd *scp)
ASC_STATS(shost, reset); ASC_STATS(shost, reset);
scmd_printk(KERN_INFO, scp, "SCSI bus reset started...\n"); scmd_printk(KERN_INFO, scp, "SCSI host reset started...\n");
if (ASC_NARROW_BOARD(boardp)) { if (ASC_NARROW_BOARD(boardp)) {
ASC_DVC_VAR *asc_dvc = &boardp->dvc_var.asc_dvc_var; ASC_DVC_VAR *asc_dvc = &boardp->dvc_var.asc_dvc_var;
@ -7482,20 +7481,19 @@ static int advansys_reset(struct scsi_cmnd *scp)
/* Refer to ASC_IERR_* definitions for meaning of 'err_code'. */ /* Refer to ASC_IERR_* definitions for meaning of 'err_code'. */
if (asc_dvc->err_code || !asc_dvc->overrun_dma) { if (asc_dvc->err_code || !asc_dvc->overrun_dma) {
scmd_printk(KERN_INFO, scp, "SCSI bus reset error: " scmd_printk(KERN_INFO, scp, "SCSI host reset error: "
"0x%x, status: 0x%x\n", asc_dvc->err_code, "0x%x, status: 0x%x\n", asc_dvc->err_code,
status); status);
ret = FAILED; ret = FAILED;
} else if (status) { } else if (status) {
scmd_printk(KERN_INFO, scp, "SCSI bus reset warning: " scmd_printk(KERN_INFO, scp, "SCSI host reset warning: "
"0x%x\n", status); "0x%x\n", status);
} else { } else {
scmd_printk(KERN_INFO, scp, "SCSI bus reset " scmd_printk(KERN_INFO, scp, "SCSI host reset "
"successful\n"); "successful\n");
} }
ASC_DBG(1, "after AscInitAsc1000Driver()\n"); ASC_DBG(1, "after AscInitAsc1000Driver()\n");
spin_lock_irqsave(shost->host_lock, flags);
} else { } else {
/* /*
* If the suggest reset bus flags are set, then reset the bus. * If the suggest reset bus flags are set, then reset the bus.
@ -7504,28 +7502,25 @@ static int advansys_reset(struct scsi_cmnd *scp)
ADV_DVC_VAR *adv_dvc = &boardp->dvc_var.adv_dvc_var; ADV_DVC_VAR *adv_dvc = &boardp->dvc_var.adv_dvc_var;
/* /*
* Reset the target's SCSI bus. * Reset the chip and SCSI bus.
*/ */
ASC_DBG(1, "before AdvResetChipAndSB()\n"); ASC_DBG(1, "before AdvResetChipAndSB()\n");
switch (AdvResetChipAndSB(adv_dvc)) { switch (AdvResetChipAndSB(adv_dvc)) {
case ASC_TRUE: case ASC_TRUE:
scmd_printk(KERN_INFO, scp, "SCSI bus reset " scmd_printk(KERN_INFO, scp, "SCSI host reset "
"successful\n"); "successful\n");
break; break;
case ASC_FALSE: case ASC_FALSE:
default: default:
scmd_printk(KERN_INFO, scp, "SCSI bus reset error\n"); scmd_printk(KERN_INFO, scp, "SCSI host reset error\n");
ret = FAILED; ret = FAILED;
break; break;
} }
spin_lock_irqsave(shost->host_lock, flags); spin_lock_irqsave(shost->host_lock, flags);
AdvISR(adv_dvc); AdvISR(adv_dvc);
spin_unlock_irqrestore(shost->host_lock, flags);
} }
/* Save the time of the most recently completed reset. */
boardp->last_reset = jiffies;
spin_unlock_irqrestore(shost->host_lock, flags);
ASC_DBG(1, "ret %d\n", ret); ASC_DBG(1, "ret %d\n", ret);
return ret; return ret;
@ -11232,7 +11227,7 @@ static struct scsi_host_template advansys_template = {
.name = DRV_NAME, .name = DRV_NAME,
.info = advansys_info, .info = advansys_info,
.queuecommand = advansys_queuecommand, .queuecommand = advansys_queuecommand,
.eh_bus_reset_handler = advansys_reset, .eh_host_reset_handler = advansys_reset,
.bios_param = advansys_biosparam, .bios_param = advansys_biosparam,
.slave_configure = advansys_slave_configure, .slave_configure = advansys_slave_configure,
/* /*