Commit 31364329 authored by Raghava Aditya Renukunta's avatar Raghava Aditya Renukunta Committed by Martin K. Petersen
Browse files

scsi: aacraid: Added new IWBR reset 



Added a new IWBR soft reset type, reworked the IOP reset interface for
a bit.

Signed-off-by: default avatarRaghava Aditya Renukunta <RaghavaAditya.Renukunta@microsemi.com>
Signed-off-by: default avatarDave Carroll <David.Carroll@microsemi.com>
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 999b3ffc

drivers/scsi/aacraid/aachba.c

+0 −2
Original line number Diff line number Diff line
@@ -4007,8 +4007,6 @@ static long aac_build_sghba(struct scsi_cmnd *scsicmd, 
	u32 cur_size;

	struct aac_hba_sgl *sge;







	nseg = scsi_dma_map(scsicmd);

	if (nseg <= 0) {

		byte_count = nseg;

drivers/scsi/aacraid/aacraid.h

+11 −4
Original line number Diff line number Diff line
@@ -878,7 +878,7 @@ struct adapter_ops 
	void (*adapter_enable_int)(struct aac_dev *dev);

	int  (*adapter_sync_cmd)(struct aac_dev *dev, u32 command, u32 p1, u32 p2, u32 p3, u32 p4, u32 p5, u32 p6, u32 *status, u32 *r1, u32 *r2, u32 *r3, u32 *r4);

	int  (*adapter_check_health)(struct aac_dev *dev);

	int  (*adapter_restart)(struct aac_dev *dev, int bled);

	int  (*adapter_restart)(struct aac_dev *dev, int bled, u8 reset_type);

	void (*adapter_start)(struct aac_dev *dev);

	/* Transport operations */

	int  (*adapter_ioremap)(struct aac_dev * dev, u32 size);
@@ -1657,8 +1657,8 @@ struct aac_dev 
#define aac_adapter_check_health(dev) \

	(dev)->a_ops.adapter_check_health(dev)



#define aac_adapter_restart(dev,bled) \

	(dev)->a_ops.adapter_restart(dev,bled)

#define aac_adapter_restart(dev, bled, reset_type) \

	((dev)->a_ops.adapter_restart(dev, bled, reset_type))



#define aac_adapter_start(dev) \

	((dev)->a_ops.adapter_start(dev))
@@ -2333,6 +2333,13 @@ struct revision 
#define FSACTL_FORCE_DELETE_DISK		CTL_CODE(2120, METHOD_NEITHER)

#define FSACTL_GET_CONTAINERS			2131

#define FSACTL_SEND_LARGE_FIB			CTL_CODE(2138, METHOD_BUFFERED)

/* flags defined for IOP & HW SOFT RESET */

#define HW_IOP_RESET				0x01

#define HW_SOFT_RESET				0x02

#define IOP_HWSOFT_RESET			(HW_IOP_RESET | HW_SOFT_RESET)

/* HW Soft Reset register offset */

#define IBW_SWR_OFFSET				0x4000

#define SOFT_RESET_TIME			60





struct aac_common
@@ -2569,7 +2576,7 @@ unsigned int aac_command_normal(struct aac_queue * q); 
unsigned int aac_intr_normal(struct aac_dev *dev, u32 Index,

			int isAif, int isFastResponse,

			struct hw_fib *aif_fib);

int aac_reset_adapter(struct aac_dev * dev, int forced);

int aac_reset_adapter(struct aac_dev *dev, int forced, u8 reset_type);

int aac_check_health(struct aac_dev * dev);

int aac_command_thread(void *data);

int aac_close_fib_context(struct aac_dev * dev, struct aac_fib_context *fibctx);

drivers/scsi/aacraid/commsup.c

+12 −5
Original line number Diff line number Diff line
@@ -1455,7 +1455,7 @@ retry_next: 
	}

}



static int _aac_reset_adapter(struct aac_dev *aac, int forced)

static int _aac_reset_adapter(struct aac_dev *aac, int forced, u8 reset_type)

{

	int index, quirks;

	int retval;
@@ -1464,6 +1464,7 @@ static int _aac_reset_adapter(struct aac_dev *aac, int forced) 
	struct scsi_cmnd *command;

	struct scsi_cmnd *command_list;

	int jafo = 0;

	int bled;



	/*

	 * Assumptions:
@@ -1488,7 +1489,8 @@ static int _aac_reset_adapter(struct aac_dev *aac, int forced) 
	 *	If a positive health, means in a known DEAD PANIC

	 * state and the adapter could be reset to `try again'.

	 */

	retval = aac_adapter_restart(aac, forced ? 0 : aac_adapter_check_health(aac));

	bled = forced ? 0 : aac_adapter_check_health(aac);

	retval = aac_adapter_restart(aac, bled, reset_type);



	if (retval)

		goto out;
@@ -1598,11 +1600,12 @@ out: 
	return retval;

}



int aac_reset_adapter(struct aac_dev * aac, int forced)

int aac_reset_adapter(struct aac_dev *aac, int forced, u8 reset_type)

{

	unsigned long flagv = 0;

	int retval;

	struct Scsi_Host * host;

	int bled;



	if (spin_trylock_irqsave(&aac->fib_lock, flagv) == 0)

		return -EBUSY;
@@ -1651,7 +1654,9 @@ int aac_reset_adapter(struct aac_dev * aac, int forced) 
	if (forced < 2)

		aac_send_shutdown(aac);

	spin_lock_irqsave(host->host_lock, flagv);

	retval = _aac_reset_adapter(aac, forced ? forced : ((aac_check_reset != 0) && (aac_check_reset != 1)));

	bled = forced ? forced :

			(aac_check_reset != 0 && aac_check_reset != 1);

	retval = _aac_reset_adapter(aac, bled, reset_type);

	spin_unlock_irqrestore(host->host_lock, flagv);



	if ((forced < 2) && (retval == -ENODEV)) {
@@ -1697,6 +1702,7 @@ int aac_check_health(struct aac_dev * aac) 
	unsigned long time_now, flagv = 0;

	struct list_head * entry;

	struct Scsi_Host * host;

	int bled;



	/* Extending the scope of fib_lock slightly to protect aac->in_reset */

	if (spin_trylock_irqsave(&aac->fib_lock, flagv) == 0)
@@ -1814,7 +1820,8 @@ int aac_check_health(struct aac_dev * aac) 
	host = aac->scsi_host_ptr;

	if (aac->thread->pid != current->pid)

		spin_lock_irqsave(host->host_lock, flagv);

	BlinkLED = _aac_reset_adapter(aac, aac_check_reset != 1);

	bled = aac_check_reset != 1 ? 1 : 0;

	_aac_reset_adapter(aac, bled, IOP_HWSOFT_RESET);

	if (aac->thread->pid != current->pid)

		spin_unlock_irqrestore(host->host_lock, flagv);

	return BlinkLED;

drivers/scsi/aacraid/linit.c

+9 −3
Original line number Diff line number Diff line
@@ -899,7 +899,7 @@ static int aac_eh_reset(struct scsi_cmnd* cmd) 
			   !(aac->supplement_adapter_info.SupportedOptions2 &

			    AAC_OPTION_IGNORE_RESET))) {

			/* Bypass wait for command quiesce */

			aac_reset_adapter(aac, 2);

			aac_reset_adapter(aac, 2, IOP_HWSOFT_RESET);

		}

		ret = SUCCESS;

	}
@@ -1167,10 +1167,16 @@ static ssize_t aac_store_reset_adapter(struct device *device, 
				       const char *buf, size_t count)

{

	int retval = -EACCES;

	int bled = 0;

	struct aac_dev *aac;





	if (!capable(CAP_SYS_ADMIN))

		return retval;

	retval = aac_reset_adapter((struct aac_dev*)class_to_shost(device)->hostdata, buf[0] == '!');



	aac = (struct aac_dev *)class_to_shost(device)->hostdata;

	bled = buf[0] == '!' ? 1:0;

	retval = aac_reset_adapter(aac, bled, IOP_HWSOFT_RESET);

	if (retval >= 0)

		retval = count;

	return retval;

drivers/scsi/aacraid/rx.c

+6 −4
Original line number Diff line number Diff line
@@ -470,7 +470,7 @@ static int aac_rx_ioremap(struct aac_dev * dev, u32 size) 
	return 0;

}



static int aac_rx_restart_adapter(struct aac_dev *dev, int bled)

static int aac_rx_restart_adapter(struct aac_dev *dev, int bled, u8 reset_type)

{

	u32 var = 0;
@@ -559,7 +559,7 @@ int _aac_rx_init(struct aac_dev *dev) 
	dev->a_ops.adapter_enable_int = aac_rx_disable_interrupt;

	dev->OIMR = status = rx_readb (dev, MUnit.OIMR);

	if ((((status & 0x0c) != 0x0c) || aac_reset_devices || reset_devices) &&

	  !aac_rx_restart_adapter(dev, 0))

	  !aac_rx_restart_adapter(dev, 0, IOP_HWSOFT_RESET))

		/* Make sure the Hardware FIFO is empty */

		while ((++restart < 512) &&

		  (rx_readl(dev, MUnit.OutboundQueue) != 0xFFFFFFFFL));
@@ -568,7 +568,8 @@ int _aac_rx_init(struct aac_dev *dev) 
	 */

	status = rx_readl(dev, MUnit.OMRx[0]);

	if (status & KERNEL_PANIC) {

		if (aac_rx_restart_adapter(dev, aac_rx_check_health(dev)))

		if (aac_rx_restart_adapter(dev,

			aac_rx_check_health(dev), IOP_HWSOFT_RESET))

			goto error_iounmap;

		++restart;

	}
@@ -606,7 +607,8 @@ int _aac_rx_init(struct aac_dev *dev) 
		  ((startup_timeout > 60)

		    ? (startup_timeout - 60)

		    : (startup_timeout / 2))))) {

			if (likely(!aac_rx_restart_adapter(dev, aac_rx_check_health(dev))))

			if (likely(!aac_rx_restart_adapter(dev,

				aac_rx_check_health(dev), IOP_HWSOFT_RESET)))

				start = jiffies;

			++restart;

		}

CRA Git | Maintained and supported by SUSTech CRA and CCSE