Commit 0e78d158 authored by adam radford's avatar adam radford Committed by James Bottomley
Browse files

[SCSI] 3w-9xxx: add support for 9690SA 



The attached patch updates the 3ware 9000 driver:

- Fix dma mask setting to fallback to 32-bit if 64-bit fails.
- Add support for 9690SA controllers.

Signed-off-by: default avatarAdam Radford <linuxraid@amcc.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 6826ee4f

drivers/scsi/3w-9xxx.c

+41 −26
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
   Written By: Adam Radford <linuxraid@amcc.com>

   Modifications By: Tom Couch <linuxraid@amcc.com>



   Copyright (C) 2004-2006 Applied Micro Circuits Corporation.

   Copyright (C) 2004-2007 Applied Micro Circuits Corporation.



   This program is free software; you can redistribute it and/or modify

   it under the terms of the GNU General Public License as published by
@@ -69,6 +69,8 @@ 
   2.26.02.008 - Free irq handler in __twa_shutdown().

                 Serialize reset code.

                 Add support for 9650SE controllers.

   2.26.02.009 - Fix dma mask setting to fallback to 32-bit if 64-bit fails.

   2.26.02.010 - Add support for 9690SA controllers.

*/



#include <linux/module.h>
@@ -92,7 +94,7 @@ 
#include "3w-9xxx.h"



/* Globals */

#define TW_DRIVER_VERSION "2.26.02.008"

#define TW_DRIVER_VERSION "2.26.02.010"

static TW_Device_Extension *twa_device_extension_list[TW_MAX_SLOT];

static unsigned int twa_device_extension_count;

static int twa_major = -1;
@@ -124,11 +126,11 @@ static int twa_initconnection(TW_Device_Extension *tw_dev, int message_credits, 
			      unsigned short *fw_on_ctlr_branch, 

			      unsigned short *fw_on_ctlr_build, 

			      u32 *init_connect_result);

static void twa_load_sgl(TW_Command_Full *full_command_packet, int request_id, dma_addr_t dma_handle, int length);

static void twa_load_sgl(TW_Device_Extension *tw_dev, TW_Command_Full *full_command_packet, int request_id, dma_addr_t dma_handle, int length);

static int twa_poll_response(TW_Device_Extension *tw_dev, int request_id, int seconds);

static int twa_poll_status_gone(TW_Device_Extension *tw_dev, u32 flag, int seconds);

static int twa_post_command_packet(TW_Device_Extension *tw_dev, int request_id, char internal);

static int twa_reset_device_extension(TW_Device_Extension *tw_dev, int ioctl_reset);

static int twa_reset_device_extension(TW_Device_Extension *tw_dev);

static int twa_reset_sequence(TW_Device_Extension *tw_dev, int soft_reset);

static int twa_scsiop_execute_scsi(TW_Device_Extension *tw_dev, int request_id, char *cdb, int use_sg, TW_SG_Entry *sglistarg);

static void twa_scsiop_execute_scsi_complete(TW_Device_Extension *tw_dev, int request_id);
@@ -683,7 +685,7 @@ static int twa_chrdev_ioctl(struct inode *inode, struct file *file, unsigned int 
		full_command_packet = &tw_ioctl->firmware_command;



		/* Load request id and sglist for both command types */

		twa_load_sgl(full_command_packet, request_id, dma_handle, data_buffer_length_adjusted);

		twa_load_sgl(tw_dev, full_command_packet, request_id, dma_handle, data_buffer_length_adjusted);



		memcpy(tw_dev->command_packet_virt[request_id], &(tw_ioctl->firmware_command), sizeof(TW_Command_Full));
@@ -700,10 +702,10 @@ static int twa_chrdev_ioctl(struct inode *inode, struct file *file, unsigned int 
		if (tw_dev->chrdev_request_id != TW_IOCTL_CHRDEV_FREE) {

			/* Now we need to reset the board */

			printk(KERN_WARNING "3w-9xxx: scsi%d: WARNING: (0x%02X:0x%04X): Character ioctl (0x%x) timed out, resetting card.\n",

			       tw_dev->host->host_no, TW_DRIVER, 0xc,

			       tw_dev->host->host_no, TW_DRIVER, 0x37,

			       cmd);

			retval = TW_IOCTL_ERROR_OS_EIO;

			twa_reset_device_extension(tw_dev, 1);

			twa_reset_device_extension(tw_dev);

			goto out3;

		}
@@ -890,7 +892,9 @@ static int twa_decode_bits(TW_Device_Extension *tw_dev, u32 status_reg_value) 
	}



	if (status_reg_value & TW_STATUS_QUEUE_ERROR) {

		if ((tw_dev->tw_pci_dev->device != PCI_DEVICE_ID_3WARE_9650SE) || (!test_bit(TW_IN_RESET, &tw_dev->flags)))

		if (((tw_dev->tw_pci_dev->device != PCI_DEVICE_ID_3WARE_9650SE) &&

		     (tw_dev->tw_pci_dev->device != PCI_DEVICE_ID_3WARE_9690SA)) ||

		    (!test_bit(TW_IN_RESET, &tw_dev->flags)))

			TW_PRINTK(tw_dev->host, TW_DRIVER, 0xe, "Controller Queue Error: clearing");

		writel(TW_CONTROL_CLEAR_QUEUE_ERROR, TW_CONTROL_REG_ADDR(tw_dev));

	}
@@ -935,8 +939,7 @@ static int twa_empty_response_queue_large(TW_Device_Extension *tw_dev) 
	unsigned long before;

	int retval = 1;



	if ((tw_dev->tw_pci_dev->device == PCI_DEVICE_ID_3WARE_9550SX) ||

	    (tw_dev->tw_pci_dev->device == PCI_DEVICE_ID_3WARE_9650SE)) {

	if (tw_dev->tw_pci_dev->device != PCI_DEVICE_ID_3WARE_9000) {

		before = jiffies;

		while ((response_que_value & TW_9550SX_DRAIN_COMPLETED) != TW_9550SX_DRAIN_COMPLETED) {

			response_que_value = readl(TW_RESPONSE_QUEUE_REG_ADDR_LARGE(tw_dev));
@@ -1196,7 +1199,6 @@ static irqreturn_t twa_interrupt(int irq, void *dev_instance) 
	u32 status_reg_value;

	TW_Response_Queue response_que;

	TW_Command_Full *full_command_packet;

	TW_Command *command_packet;

	TW_Device_Extension *tw_dev = (TW_Device_Extension *)dev_instance;

	int handled = 0;
@@ -1274,7 +1276,6 @@ static irqreturn_t twa_interrupt(int irq, void *dev_instance) 
			request_id = TW_RESID_OUT(response_que.response_id);

			full_command_packet = tw_dev->command_packet_virt[request_id];

			error = 0;

			command_packet = &full_command_packet->command.oldcommand;

			/* Check for command packet errors */

			if (full_command_packet->command.newcommand.status != 0) {

				if (tw_dev->srb[request_id] != 0) {
@@ -1353,11 +1354,15 @@ twa_interrupt_bail: 
} /* End twa_interrupt() */



/* This function will load the request id and various sgls for ioctls */

static void twa_load_sgl(TW_Command_Full *full_command_packet, int request_id, dma_addr_t dma_handle, int length)

static void twa_load_sgl(TW_Device_Extension *tw_dev, TW_Command_Full *full_command_packet, int request_id, dma_addr_t dma_handle, int length)

{

	TW_Command *oldcommand;

	TW_Command_Apache *newcommand;

	TW_SG_Entry *sgl;

	unsigned int pae = 0;



	if ((sizeof(long) < 8) && (sizeof(dma_addr_t) > 4))

		pae = 1;



	if (TW_OP_OUT(full_command_packet->command.newcommand.opcode__reserved) == TW_OP_EXECUTE_SCSI) {

		newcommand = &full_command_packet->command.newcommand;
@@ -1373,12 +1378,14 @@ static void twa_load_sgl(TW_Command_Full *full_command_packet, int request_id, d 


		if (TW_SGL_OUT(oldcommand->opcode__sgloffset)) {

			/* Load the sg list */

			if (tw_dev->tw_pci_dev->device == PCI_DEVICE_ID_3WARE_9690SA)

				sgl = (TW_SG_Entry *)((u32 *)oldcommand+oldcommand->size - (sizeof(TW_SG_Entry)/4) + pae);

			else

				sgl = (TW_SG_Entry *)((u32 *)oldcommand+TW_SGL_OUT(oldcommand->opcode__sgloffset));

			sgl->address = TW_CPU_TO_SGL(dma_handle + sizeof(TW_Ioctl_Buf_Apache) - 1);

			sgl->length = cpu_to_le32(length);



			if ((sizeof(long) < 8) && (sizeof(dma_addr_t) > 4))

				oldcommand->size += 1;

			oldcommand->size += pae;

		}

	}

} /* End twa_load_sgl() */
@@ -1507,7 +1514,8 @@ static int twa_post_command_packet(TW_Device_Extension *tw_dev, int request_id, 
	command_que_value = tw_dev->command_packet_phys[request_id];



	/* For 9650SE write low 4 bytes first */

	if (tw_dev->tw_pci_dev->device == PCI_DEVICE_ID_3WARE_9650SE) {

	if ((tw_dev->tw_pci_dev->device == PCI_DEVICE_ID_3WARE_9650SE) ||

	    (tw_dev->tw_pci_dev->device == PCI_DEVICE_ID_3WARE_9690SA)) {

		command_que_value += TW_COMMAND_OFFSET;

		writel((u32)command_que_value, TW_COMMAND_QUEUE_REG_ADDR_LARGE(tw_dev));

	}
@@ -1538,7 +1546,8 @@ static int twa_post_command_packet(TW_Device_Extension *tw_dev, int request_id, 
		TW_UNMASK_COMMAND_INTERRUPT(tw_dev);

		goto out;

	} else {

		if (tw_dev->tw_pci_dev->device == PCI_DEVICE_ID_3WARE_9650SE) {

		if ((tw_dev->tw_pci_dev->device == PCI_DEVICE_ID_3WARE_9650SE) ||

		    (tw_dev->tw_pci_dev->device == PCI_DEVICE_ID_3WARE_9690SA)) {

			/* Now write upper 4 bytes */

			writel((u32)((u64)command_que_value >> 32), TW_COMMAND_QUEUE_REG_ADDR_LARGE(tw_dev) + 0x4);

		} else {
@@ -1562,7 +1571,7 @@ out: 
} /* End twa_post_command_packet() */



/* This function will reset a device extension */

static int twa_reset_device_extension(TW_Device_Extension *tw_dev, int ioctl_reset)

static int twa_reset_device_extension(TW_Device_Extension *tw_dev)

{

	int i = 0;

	int retval = 1;
@@ -1720,7 +1729,7 @@ static int twa_scsi_eh_reset(struct scsi_cmnd *SCpnt) 
	mutex_lock(&tw_dev->ioctl_lock);



	/* Now reset the card and some of the device extension data */

	if (twa_reset_device_extension(tw_dev, 0)) {

	if (twa_reset_device_extension(tw_dev)) {

		TW_PRINTK(tw_dev->host, TW_DRIVER, 0x2b, "Controller reset failed during scsi host reset");

		goto out;

	}
@@ -2002,9 +2011,12 @@ static int __devinit twa_probe(struct pci_dev *pdev, const struct pci_device_id 


	pci_set_master(pdev);



	retval = pci_set_dma_mask(pdev, sizeof(dma_addr_t) > 4 ? DMA_64BIT_MASK : DMA_32BIT_MASK);

	if (retval) {

	if (pci_set_dma_mask(pdev, DMA_64BIT_MASK)

	    || pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK))

		if (pci_set_dma_mask(pdev, DMA_32BIT_MASK)

		    || pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK)) {

			TW_PRINTK(host, TW_DRIVER, 0x23, "Failed to set dma mask");

			retval = -ENODEV;

			goto out_disable_device;

		}
@@ -2054,7 +2066,8 @@ static int __devinit twa_probe(struct pci_dev *pdev, const struct pci_device_id 
		goto out_iounmap;



	/* Set host specific parameters */

	if (pdev->device == PCI_DEVICE_ID_3WARE_9650SE)

	if ((pdev->device == PCI_DEVICE_ID_3WARE_9650SE) ||

	    (pdev->device == PCI_DEVICE_ID_3WARE_9690SA))

		host->max_id = TW_MAX_UNITS_9650SE;

	else

		host->max_id = TW_MAX_UNITS;
@@ -2161,6 +2174,8 @@ static struct pci_device_id twa_pci_tbl[] __devinitdata = { 
	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},

	{ PCI_VENDOR_ID_3WARE, PCI_DEVICE_ID_3WARE_9650SE,

	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},

	{ PCI_VENDOR_ID_3WARE, PCI_DEVICE_ID_3WARE_9690SA,

	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},

	{ }

};

MODULE_DEVICE_TABLE(pci, twa_pci_tbl);

drivers/scsi/3w-9xxx.h

+4 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
   Written By: Adam Radford <linuxraid@amcc.com>

   Modifications By: Tom Couch <linuxraid@amcc.com>



   Copyright (C) 2004-2006 Applied Micro Circuits Corporation.

   Copyright (C) 2004-2007 Applied Micro Circuits Corporation.



   This program is free software; you can redistribute it and/or modify

   it under the terms of the GNU General Public License as published by
@@ -419,6 +419,9 @@ static twa_message_type twa_error_table[] = { 
#ifndef PCI_DEVICE_ID_3WARE_9650SE

#define PCI_DEVICE_ID_3WARE_9650SE 0x1004

#endif

#ifndef PCI_DEVICE_ID_3WARE_9690SA

#define PCI_DEVICE_ID_3WARE_9690SA 0x1005

#endif



/* Bitmask macros to eliminate bitfields */

CRA Git | Maintained and supported by SUSTech CRA and CCSE