redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

ncr5380: Simplify bus reset handlers 

Make use of do_reset() in the bus reset handler in atari_NCR5380.c. The
version in NCR5380.c already does so. Keep them in sync.

Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Tested-by: Ondrej Zary <linux@rainbow-software.org>
Tested-by: Michael Schmitz <schmitzmic@gmail.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
hifive-unleashed-5.1
Finn Thain 2016-01-03 16:05:12 +11:00 committed by Martin K. Petersen
parent 9c3f0e2b52
commit 3be1b3ea6d
2 changed files with 25 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/scsi/NCR5380.c
View File

@ -668,7 +668,7 @@ static void prepare_info(struct Scsi_Host *instance)
* Locks: called functions disable irqs
*/
static void NCR5380_print_status(struct Scsi_Host *instance)
static void __maybe_unused NCR5380_print_status(struct Scsi_Host *instance)
{
NCR5380_dprint(NDEBUG_ANY, instance);
NCR5380_dprint_phase(NDEBUG_ANY, instance);
@ -2693,24 +2693,26 @@ static int NCR5380_abort(struct scsi_cmnd *cmd)
}
/*
* Function : int NCR5380_bus_reset (struct scsi_cmnd *cmd)
*
* Purpose : reset the SCSI bus.
/**
* NCR5380_bus_reset - reset the SCSI bus
* @cmd: SCSI command undergoing EH
*
* Returns : SUCCESS
*
* Locks: host lock taken by caller
* Returns SUCCESS
*/
static int NCR5380_bus_reset(struct scsi_cmnd *cmd)
{
struct Scsi_Host *instance = cmd->device->host;
NCR5380_print_status(instance);
spin_lock_irq(instance->host_lock);
#if (NDEBUG & NDEBUG_ANY)
scmd_printk(KERN_INFO, cmd, "performing bus reset\n");
NCR5380_print_status(instance);
#endif
do_reset(instance);
spin_unlock_irq(instance->host_lock);
return SUCCESS;

32
drivers/scsi/atari_NCR5380.c
View File

@ -719,7 +719,7 @@ static void lprint_Scsi_Cmnd(struct scsi_cmnd *cmd)
printk("\n");
}
static void NCR5380_print_status(struct Scsi_Host *instance)
static void __maybe_unused NCR5380_print_status(struct Scsi_Host *instance)
{
struct NCR5380_hostdata *hostdata;
struct scsi_cmnd *ptr;
@ -2982,13 +2982,11 @@ int NCR5380_abort(struct scsi_cmnd *cmd)
}
/*
* Function : int NCR5380_reset (struct scsi_cmnd *cmd)
*
* Purpose : reset the SCSI bus.
*
* Returns : SUCCESS or FAILURE
/**
* NCR5380_bus_reset - reset the SCSI bus
* @cmd: SCSI command undergoing EH
*
* Returns SUCCESS
*/
static int NCR5380_bus_reset(struct scsi_cmnd *cmd)
@ -2998,22 +2996,19 @@ static int NCR5380_bus_reset(struct scsi_cmnd *cmd)
int i;
unsigned long flags;
NCR5380_print_status(instance);
local_irq_save(flags);
#if (NDEBUG & NDEBUG_ANY)
scmd_printk(KERN_INFO, cmd, "performing bus reset\n");
NCR5380_print_status(instance);
#endif
do_reset(instance);
/* get in phase */
NCR5380_write(TARGET_COMMAND_REG,
PHASE_SR_TO_TCR(NCR5380_read(STATUS_REG)));
/* assert RST */
NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE | ICR_ASSERT_RST);
udelay(40);
/* reset NCR registers */
NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE);
NCR5380_write(MODE_REG, MR_BASE);
NCR5380_write(TARGET_COMMAND_REG, 0);
NCR5380_write(SELECT_ENABLE_REG, 0);
/* ++roman: reset interrupt condition! otherwise no interrupts don't get
* through anymore ... */
(void)NCR5380_read(RESET_PARITY_INTERRUPT_REG);
/* After the reset, there are no more connected or disconnected commands
* and no busy units; so clear the low-level status here to avoid
@ -3028,7 +3023,6 @@ static int NCR5380_bus_reset(struct scsi_cmnd *cmd)
if (hostdata->disconnected_queue)
dprintk(NDEBUG_ABORT, "scsi%d: reset aborted disconnected command(s)\n", H_NO(cmd));
local_irq_save(flags);
hostdata->issue_queue = NULL;
hostdata->connected = NULL;
hostdata->disconnected_queue = NULL;