Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6 (7d6322b4) · Commits · e / devices / android_kernel_teracube_2e

drivers/scsi/3w-9xxx.c

+47 −8

Original line number	Diff line number	Diff line
		@@ -60,6 +60,7 @@
		Remove un-needed eh_abort handler.
		Add support for embedded firmware error strings.
		2.26.02.003 - Correctly handle single sgl's with use_sg=1.
		2.26.02.004 - Add support for 9550SX controllers.
		*/

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

		/* Globals */
		#define TW_DRIVER_VERSION "2.26.02.003"
		#define TW_DRIVER_VERSION "2.26.02.004"
		static TW_Device_Extension *twa_device_extension_list[TW_MAX_SLOT];
		static unsigned int twa_device_extension_count;
		static int twa_major = -1;
		@@ -892,11 +893,6 @@ static int twa_decode_bits(TW_Device_Extension *tw_dev, u32 status_reg_value)
		writel(TW_CONTROL_CLEAR_QUEUE_ERROR, TW_CONTROL_REG_ADDR(tw_dev));
		}

		if (status_reg_value & TW_STATUS_SBUF_WRITE_ERROR) {
		TW_PRINTK(tw_dev->host, TW_DRIVER, 0xf, "SBUF Write Error: clearing");
		writel(TW_CONTROL_CLEAR_SBUF_WRITE_ERROR, TW_CONTROL_REG_ADDR(tw_dev));
		}

		if (status_reg_value & TW_STATUS_MICROCONTROLLER_ERROR) {
		if (tw_dev->reset_print == 0) {
		TW_PRINTK(tw_dev->host, TW_DRIVER, 0x10, "Microcontroller Error: clearing");
		@@ -930,6 +926,36 @@ static int twa_empty_response_queue(TW_Device_Extension *tw_dev)
		return retval;
		} /* End twa_empty_response_queue() */

		/* This function will clear the pchip/response queue on 9550SX */
		static int twa_empty_response_queue_large(TW_Device_Extension *tw_dev)
		{
		u32 status_reg_value, response_que_value;
		int count = 0, retval = 1;

		if (tw_dev->tw_pci_dev->device == PCI_DEVICE_ID_3WARE_9550SX) {
		status_reg_value = readl(TW_STATUS_REG_ADDR(tw_dev));

		while (((status_reg_value & TW_STATUS_RESPONSE_QUEUE_EMPTY) == 0) && (count < TW_MAX_RESPONSE_DRAIN)) {
		response_que_value = readl(TW_RESPONSE_QUEUE_REG_ADDR_LARGE(tw_dev));
		if ((response_que_value & TW_9550SX_DRAIN_COMPLETED) == TW_9550SX_DRAIN_COMPLETED) {
		/* P-chip settle time */
		msleep(500);
		retval = 0;
		goto out;
		}
		status_reg_value = readl(TW_STATUS_REG_ADDR(tw_dev));
		count++;
		}
		if (count == TW_MAX_RESPONSE_DRAIN)
		goto out;

		retval = 0;
		} else
		retval = 0;
		out:
		return retval;
		} /* End twa_empty_response_queue_large() */

		/* This function passes sense keys from firmware to scsi layer */
		static int twa_fill_sense(TW_Device_Extension *tw_dev, int request_id, int copy_sense, int print_host)
		{
		@@ -1613,8 +1639,16 @@ static int twa_reset_sequence(TW_Device_Extension *tw_dev, int soft_reset)
		int tries = 0, retval = 1, flashed = 0, do_soft_reset = soft_reset;

		while (tries < TW_MAX_RESET_TRIES) {
		if (do_soft_reset)
		if (do_soft_reset) {
		TW_SOFT_RESET(tw_dev);
		/* Clear pchip/response queue on 9550SX */
		if (twa_empty_response_queue_large(tw_dev)) {
		TW_PRINTK(tw_dev->host, TW_DRIVER, 0x36, "Response queue (large) empty failed during reset sequence");
		do_soft_reset = 1;
		tries++;
		continue;
		}
		}

		/* Make sure controller is in a good state */
		if (twa_poll_status(tw_dev, TW_STATUS_MICROCONTROLLER_READY \| (do_soft_reset == 1 ? TW_STATUS_ATTENTION_INTERRUPT : 0), 60)) {
		@@ -2034,7 +2068,10 @@ static int __devinit twa_probe(struct pci_dev *pdev, const struct pci_device_id
		goto out_free_device_extension;
		}

		if (pdev->device == PCI_DEVICE_ID_3WARE_9000)
		mem_addr = pci_resource_start(pdev, 1);
		else
		mem_addr = pci_resource_start(pdev, 2);

		/* Save base address */
		tw_dev->base_addr = ioremap(mem_addr, PAGE_SIZE);
		@@ -2148,6 +2185,8 @@ static void twa_remove(struct pci_dev *pdev)
		static struct pci_device_id twa_pci_tbl[] __devinitdata = {
		{ PCI_VENDOR_ID_3WARE, PCI_DEVICE_ID_3WARE_9000,
		PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
		{ PCI_VENDOR_ID_3WARE, PCI_DEVICE_ID_3WARE_9550SX,
		PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
		{ }
		};
		MODULE_DEVICE_TABLE(pci, twa_pci_tbl);

drivers/scsi/3w-9xxx.h

+10 −7

Original line number	Diff line number	Diff line
		@@ -267,7 +267,6 @@ static twa_message_type twa_error_table[] = {
		#define TW_CONTROL_CLEAR_PARITY_ERROR 0x00800000
		#define TW_CONTROL_CLEAR_QUEUE_ERROR 0x00400000
		#define TW_CONTROL_CLEAR_PCI_ABORT 0x00100000
		#define TW_CONTROL_CLEAR_SBUF_WRITE_ERROR 0x00000008

		/* Status register bit definitions */
		#define TW_STATUS_MAJOR_VERSION_MASK 0xF0000000
		@@ -285,9 +284,8 @@ static twa_message_type twa_error_table[] = {
		#define TW_STATUS_MICROCONTROLLER_READY 0x00002000
		#define TW_STATUS_COMMAND_QUEUE_EMPTY 0x00001000
		#define TW_STATUS_EXPECTED_BITS 0x00002000
		#define TW_STATUS_UNEXPECTED_BITS 0x00F00008
		#define TW_STATUS_SBUF_WRITE_ERROR 0x00000008
		#define TW_STATUS_VALID_INTERRUPT 0x00DF0008
		#define TW_STATUS_UNEXPECTED_BITS 0x00F00000
		#define TW_STATUS_VALID_INTERRUPT 0x00DF0000

		/* RESPONSE QUEUE BIT DEFINITIONS */
		#define TW_RESPONSE_ID_MASK 0x00000FF0
		@@ -324,9 +322,9 @@ static twa_message_type twa_error_table[] = {

		/* Compatibility defines */
		#define TW_9000_ARCH_ID 0x5
		#define TW_CURRENT_DRIVER_SRL 28
		#define TW_CURRENT_DRIVER_BUILD 9
		#define TW_CURRENT_DRIVER_BRANCH 4
		#define TW_CURRENT_DRIVER_SRL 30
		#define TW_CURRENT_DRIVER_BUILD 80
		#define TW_CURRENT_DRIVER_BRANCH 0

		/* Phase defines */
		#define TW_PHASE_INITIAL 0
		@@ -334,6 +332,7 @@ static twa_message_type twa_error_table[] = {
		#define TW_PHASE_SGLIST 2

		/* Misc defines */
		#define TW_9550SX_DRAIN_COMPLETED 0xFFFF
		#define TW_SECTOR_SIZE 512
		#define TW_ALIGNMENT_9000 4 /* 4 bytes */
		#define TW_ALIGNMENT_9000_SGL 0x3
		@@ -417,6 +416,9 @@ static twa_message_type twa_error_table[] = {
		#ifndef PCI_DEVICE_ID_3WARE_9000
		#define PCI_DEVICE_ID_3WARE_9000 0x1002
		#endif
		#ifndef PCI_DEVICE_ID_3WARE_9550SX
		#define PCI_DEVICE_ID_3WARE_9550SX 0x1003
		#endif

		/* Bitmask macros to eliminate bitfields */

		@@ -443,6 +445,7 @@ static twa_message_type twa_error_table[] = {
		#define TW_STATUS_REG_ADDR(x) ((unsigned char __iomem *)x->base_addr + 0x4)
		#define TW_COMMAND_QUEUE_REG_ADDR(x) (sizeof(dma_addr_t) > 4 ? ((unsigned char __iomem )x->base_addr + 0x20) : ((unsigned char __iomem )x->base_addr + 0x8))
		#define TW_RESPONSE_QUEUE_REG_ADDR(x) ((unsigned char __iomem *)x->base_addr + 0xC)
		#define TW_RESPONSE_QUEUE_REG_ADDR_LARGE(x) ((unsigned char __iomem *)x->base_addr + 0x30)
		#define TW_CLEAR_ALL_INTERRUPTS(x) (writel(TW_STATUS_VALID_INTERRUPT, TW_CONTROL_REG_ADDR(x)))
		#define TW_CLEAR_ATTENTION_INTERRUPT(x) (writel(TW_CONTROL_CLEAR_ATTENTION_INTERRUPT, TW_CONTROL_REG_ADDR(x)))
		#define TW_CLEAR_HOST_INTERRUPT(x) (writel(TW_CONTROL_CLEAR_HOST_INTERRUPT, TW_CONTROL_REG_ADDR(x)))

drivers/scsi/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -99,6 +99,7 @@ obj-$(CONFIG_SCSI_DC395x) += dc395x.o
		obj-$(CONFIG_SCSI_DC390T) += tmscsim.o
		obj-$(CONFIG_MEGARAID_LEGACY) += megaraid.o
		obj-$(CONFIG_MEGARAID_NEWGEN) += megaraid/
		obj-$(CONFIG_MEGARAID_SAS) += megaraid/
		obj-$(CONFIG_SCSI_ACARD) += atp870u.o
		obj-$(CONFIG_SCSI_SUNESP) += esp.o
		obj-$(CONFIG_SCSI_GDTH) += gdth.o

drivers/scsi/aacraid/aachba.c

+245 −38

Original line number	Diff line number	Diff line
		@@ -313,18 +313,37 @@ int aac_get_containers(struct aac_dev *dev)
		}
		dresp = (struct aac_mount *)fib_data(fibptr);

		if ((le32_to_cpu(dresp->status) == ST_OK) &&
		(le32_to_cpu(dresp->mnt[0].vol) == CT_NONE)) {
		dinfo->command = cpu_to_le32(VM_NameServe64);
		dinfo->count = cpu_to_le32(index);
		dinfo->type = cpu_to_le32(FT_FILESYS);

		if (fib_send(ContainerCommand,
		fibptr,
		sizeof(struct aac_query_mount),
		FsaNormal,
		1, 1,
		NULL, NULL) < 0)
		continue;
		} else
		dresp->mnt[0].capacityhigh = 0;

		dprintk ((KERN_DEBUG
		"VM_NameServe cid=%d status=%d vol=%d state=%d cap=%u\n",
		"VM_NameServe cid=%d status=%d vol=%d state=%d cap=%llu\n",
		(int)index, (int)le32_to_cpu(dresp->status),
		(int)le32_to_cpu(dresp->mnt[0].vol),
		(int)le32_to_cpu(dresp->mnt[0].state),
		(unsigned)le32_to_cpu(dresp->mnt[0].capacity)));
		((u64)le32_to_cpu(dresp->mnt[0].capacity)) +
		(((u64)le32_to_cpu(dresp->mnt[0].capacityhigh)) << 32)));
		if ((le32_to_cpu(dresp->status) == ST_OK) &&
		(le32_to_cpu(dresp->mnt[0].vol) != CT_NONE) &&
		(le32_to_cpu(dresp->mnt[0].state) != FSCS_HIDDEN)) {
		fsa_dev_ptr[index].valid = 1;
		fsa_dev_ptr[index].type = le32_to_cpu(dresp->mnt[0].vol);
		fsa_dev_ptr[index].size = le32_to_cpu(dresp->mnt[0].capacity);
		fsa_dev_ptr[index].size
		= ((u64)le32_to_cpu(dresp->mnt[0].capacity)) +
		(((u64)le32_to_cpu(dresp->mnt[0].capacityhigh)) << 32);
		if (le32_to_cpu(dresp->mnt[0].state) & FSCS_READONLY)
		fsa_dev_ptr[index].ro = 1;
		}
		@@ -460,7 +479,7 @@ static int aac_get_container_name(struct scsi_cmnd * scsicmd, int cid)
		* is updated in the struct fsa_dev_info structure rather than returned.
		*/

		static int probe_container(struct aac_dev *dev, int cid)
		int probe_container(struct aac_dev *dev, int cid)
		{
		struct fsa_dev_info *fsa_dev_ptr;
		int status;
		@@ -496,12 +515,30 @@ static int probe_container(struct aac_dev *dev, int cid)

		dresp = (struct aac_mount *) fib_data(fibptr);

		if ((le32_to_cpu(dresp->status) == ST_OK) &&
		(le32_to_cpu(dresp->mnt[0].vol) == CT_NONE)) {
		dinfo->command = cpu_to_le32(VM_NameServe64);
		dinfo->count = cpu_to_le32(cid);
		dinfo->type = cpu_to_le32(FT_FILESYS);

		if (fib_send(ContainerCommand,
		fibptr,
		sizeof(struct aac_query_mount),
		FsaNormal,
		1, 1,
		NULL, NULL) < 0)
		goto error;
		} else
		dresp->mnt[0].capacityhigh = 0;

		if ((le32_to_cpu(dresp->status) == ST_OK) &&
		(le32_to_cpu(dresp->mnt[0].vol) != CT_NONE) &&
		(le32_to_cpu(dresp->mnt[0].state) != FSCS_HIDDEN)) {
		fsa_dev_ptr[cid].valid = 1;
		fsa_dev_ptr[cid].type = le32_to_cpu(dresp->mnt[0].vol);
		fsa_dev_ptr[cid].size = le32_to_cpu(dresp->mnt[0].capacity);
		fsa_dev_ptr[cid].size
		= ((u64)le32_to_cpu(dresp->mnt[0].capacity)) +
		(((u64)le32_to_cpu(dresp->mnt[0].capacityhigh)) << 32);
		if (le32_to_cpu(dresp->mnt[0].state) & FSCS_READONLY)
		fsa_dev_ptr[cid].ro = 1;
		}
		@@ -655,7 +692,7 @@ int aac_get_adapter_info(struct aac_dev* dev)
		fibptr,
		sizeof(*info),
		FsaNormal,
		1, 1,
		-1, 1, /* First `interrupt' command uses special wait */
		NULL,
		NULL);

		@@ -806,8 +843,8 @@ int aac_get_adapter_info(struct aac_dev* dev)
		if (!(dev->raw_io_interface)) {
		dev->scsi_host_ptr->sg_tablesize = (dev->max_fib_size -
		sizeof(struct aac_fibhdr) -
		sizeof(struct aac_write) + sizeof(struct sgmap)) /
		sizeof(struct sgmap);
		sizeof(struct aac_write) + sizeof(struct sgentry)) /
		sizeof(struct sgentry);
		if (dev->dac_support) {
		/*
		* 38 scatter gather elements
		@@ -816,8 +853,8 @@ int aac_get_adapter_info(struct aac_dev* dev)
		(dev->max_fib_size -
		sizeof(struct aac_fibhdr) -
		sizeof(struct aac_write64) +
		sizeof(struct sgmap64)) /
		sizeof(struct sgmap64);
		sizeof(struct sgentry64)) /
		sizeof(struct sgentry64);
		}
		dev->scsi_host_ptr->max_sectors = AAC_MAX_32BIT_SGBCOUNT;
		if(!(dev->adapter_info.options & AAC_OPT_NEW_COMM)) {
		@@ -854,7 +891,40 @@ static void io_callback(void context, struct fib fibptr)
		dev = (struct aac_dev *)scsicmd->device->host->hostdata;
		cid = ID_LUN_TO_CONTAINER(scsicmd->device->id, scsicmd->device->lun);

		dprintk((KERN_DEBUG "io_callback[cpu %d]: lba = %u, t = %ld.\n", smp_processor_id(), ((scsicmd->cmnd[1] & 0x1F) << 16) \| (scsicmd->cmnd[2] << 8) \| scsicmd->cmnd[3], jiffies));
		if (nblank(dprintk(x))) {
		u64 lba;
		switch (scsicmd->cmnd[0]) {
		case WRITE_6:
		case READ_6:
		lba = ((scsicmd->cmnd[1] & 0x1F) << 16) \|
		(scsicmd->cmnd[2] << 8) \| scsicmd->cmnd[3];
		break;
		case WRITE_16:
		case READ_16:
		lba = ((u64)scsicmd->cmnd[2] << 56) \|
		((u64)scsicmd->cmnd[3] << 48) \|
		((u64)scsicmd->cmnd[4] << 40) \|
		((u64)scsicmd->cmnd[5] << 32) \|
		((u64)scsicmd->cmnd[6] << 24) \|
		(scsicmd->cmnd[7] << 16) \|
		(scsicmd->cmnd[8] << 8) \| scsicmd->cmnd[9];
		break;
		case WRITE_12:
		case READ_12:
		lba = ((u64)scsicmd->cmnd[2] << 24) \|
		(scsicmd->cmnd[3] << 16) \|
		(scsicmd->cmnd[4] << 8) \| scsicmd->cmnd[5];
		break;
		default:
		lba = ((u64)scsicmd->cmnd[2] << 24) \|
		(scsicmd->cmnd[3] << 16) \|
		(scsicmd->cmnd[4] << 8) \| scsicmd->cmnd[5];
		break;
		}
		printk(KERN_DEBUG
		"io_callback[cpu %d]: lba = %llu, t = %ld.\n",
		smp_processor_id(), (unsigned long long)lba, jiffies);
		}

		if (fibptr == NULL)
		BUG();
		@@ -895,7 +965,7 @@ static void io_callback(void context, struct fib fibptr)

		static int aac_read(struct scsi_cmnd * scsicmd, int cid)
		{
		u32 lba;
		u64 lba;
		u32 count;
		int status;

		@@ -907,23 +977,69 @@ static int aac_read(struct scsi_cmnd * scsicmd, int cid)
		/*
		* Get block address and transfer length
		*/
		if (scsicmd->cmnd[0] == READ_6) /* 6 byte command */
		{
		switch (scsicmd->cmnd[0]) {
		case READ_6:
		dprintk((KERN_DEBUG "aachba: received a read(6) command on id %d.\n", cid));

		lba = ((scsicmd->cmnd[1] & 0x1F) << 16) \| (scsicmd->cmnd[2] << 8) \| scsicmd->cmnd[3];
		lba = ((scsicmd->cmnd[1] & 0x1F) << 16) \|
		(scsicmd->cmnd[2] << 8) \| scsicmd->cmnd[3];
		count = scsicmd->cmnd[4];

		if (count == 0)
		count = 256;
		} else {
		break;
		case READ_16:
		dprintk((KERN_DEBUG "aachba: received a read(16) command on id %d.\n", cid));

		lba = ((u64)scsicmd->cmnd[2] << 56) \|
		((u64)scsicmd->cmnd[3] << 48) \|
		((u64)scsicmd->cmnd[4] << 40) \|
		((u64)scsicmd->cmnd[5] << 32) \|
		((u64)scsicmd->cmnd[6] << 24) \|
		(scsicmd->cmnd[7] << 16) \|
		(scsicmd->cmnd[8] << 8) \| scsicmd->cmnd[9];
		count = (scsicmd->cmnd[10] << 24) \|
		(scsicmd->cmnd[11] << 16) \|
		(scsicmd->cmnd[12] << 8) \| scsicmd->cmnd[13];
		break;
		case READ_12:
		dprintk((KERN_DEBUG "aachba: received a read(12) command on id %d.\n", cid));

		lba = ((u64)scsicmd->cmnd[2] << 24) \|
		(scsicmd->cmnd[3] << 16) \|
		(scsicmd->cmnd[4] << 8) \| scsicmd->cmnd[5];
		count = (scsicmd->cmnd[6] << 24) \|
		(scsicmd->cmnd[7] << 16) \|
		(scsicmd->cmnd[8] << 8) \| scsicmd->cmnd[9];
		break;
		default:
		dprintk((KERN_DEBUG "aachba: received a read(10) command on id %d.\n", cid));

		lba = (scsicmd->cmnd[2] << 24) \| (scsicmd->cmnd[3] << 16) \| (scsicmd->cmnd[4] << 8) \| scsicmd->cmnd[5];
		lba = ((u64)scsicmd->cmnd[2] << 24) \|
		(scsicmd->cmnd[3] << 16) \|
		(scsicmd->cmnd[4] << 8) \| scsicmd->cmnd[5];
		count = (scsicmd->cmnd[7] << 8) \| scsicmd->cmnd[8];
		break;
		}
		dprintk((KERN_DEBUG "aac_read[cpu %d]: lba = %u, t = %ld.\n",
		dprintk((KERN_DEBUG "aac_read[cpu %d]: lba = %llu, t = %ld.\n",
		smp_processor_id(), (unsigned long long)lba, jiffies));
		if ((!(dev->raw_io_interface) \|\| !(dev->raw_io_64)) &&
		(lba & 0xffffffff00000000LL)) {
		dprintk((KERN_DEBUG "aac_read: Illegal lba\n"));
		scsicmd->result = DID_OK << 16 \| COMMAND_COMPLETE << 8 \|
		SAM_STAT_CHECK_CONDITION;
		set_sense((u8 *) &dev->fsa_dev[cid].sense_data,
		HARDWARE_ERROR,
		SENCODE_INTERNAL_TARGET_FAILURE,
		ASENCODE_INTERNAL_TARGET_FAILURE, 0, 0,
		0, 0);
		memcpy(scsicmd->sense_buffer, &dev->fsa_dev[cid].sense_data,
		(sizeof(dev->fsa_dev[cid].sense_data) > sizeof(scsicmd->sense_buffer))
		? sizeof(scsicmd->sense_buffer)
		: sizeof(dev->fsa_dev[cid].sense_data));
		scsicmd->scsi_done(scsicmd);
		return 0;
		}
		/*
		* Alocate and initialize a Fib
		*/
		@@ -936,8 +1052,8 @@ static int aac_read(struct scsi_cmnd * scsicmd, int cid)
		if (dev->raw_io_interface) {
		struct aac_raw_io *readcmd;
		readcmd = (struct aac_raw_io *) fib_data(cmd_fibcontext);
		readcmd->block[0] = cpu_to_le32(lba);
		readcmd->block[1] = 0;
		readcmd->block[0] = cpu_to_le32((u32)(lba&0xffffffff));
		readcmd->block[1] = cpu_to_le32((u32)((lba&0xffffffff00000000LL)>>32));
		readcmd->count = cpu_to_le32(count<<9);
		readcmd->cid = cpu_to_le16(cid);
		readcmd->flags = cpu_to_le16(1);
		@@ -964,7 +1080,7 @@ static int aac_read(struct scsi_cmnd * scsicmd, int cid)
		readcmd->command = cpu_to_le32(VM_CtHostRead64);
		readcmd->cid = cpu_to_le16(cid);
		readcmd->sector_count = cpu_to_le16(count);
		readcmd->block = cpu_to_le32(lba);
		readcmd->block = cpu_to_le32((u32)(lba&0xffffffff));
		readcmd->pad = 0;
		readcmd->flags = 0;

		@@ -989,7 +1105,7 @@ static int aac_read(struct scsi_cmnd * scsicmd, int cid)
		readcmd = (struct aac_read *) fib_data(cmd_fibcontext);
		readcmd->command = cpu_to_le32(VM_CtBlockRead);
		readcmd->cid = cpu_to_le32(cid);
		readcmd->block = cpu_to_le32(lba);
		readcmd->block = cpu_to_le32((u32)(lba&0xffffffff));
		readcmd->count = cpu_to_le32(count * 512);

		aac_build_sg(scsicmd, &readcmd->sg);
		@@ -1031,7 +1147,7 @@ static int aac_read(struct scsi_cmnd * scsicmd, int cid)

		static int aac_write(struct scsi_cmnd * scsicmd, int cid)
		{
		u32 lba;
		u64 lba;
		u32 count;
		int status;
		u16 fibsize;
		@@ -1048,13 +1164,48 @@ static int aac_write(struct scsi_cmnd * scsicmd, int cid)
		count = scsicmd->cmnd[4];
		if (count == 0)
		count = 256;
		} else if (scsicmd->cmnd[0] == WRITE_16) { /* 16 byte command */
		dprintk((KERN_DEBUG "aachba: received a write(16) command on id %d.\n", cid));

		lba = ((u64)scsicmd->cmnd[2] << 56) \|
		((u64)scsicmd->cmnd[3] << 48) \|
		((u64)scsicmd->cmnd[4] << 40) \|
		((u64)scsicmd->cmnd[5] << 32) \|
		((u64)scsicmd->cmnd[6] << 24) \|
		(scsicmd->cmnd[7] << 16) \|
		(scsicmd->cmnd[8] << 8) \| scsicmd->cmnd[9];
		count = (scsicmd->cmnd[10] << 24) \| (scsicmd->cmnd[11] << 16) \|
		(scsicmd->cmnd[12] << 8) \| scsicmd->cmnd[13];
		} else if (scsicmd->cmnd[0] == WRITE_12) { /* 12 byte command */
		dprintk((KERN_DEBUG "aachba: received a write(12) command on id %d.\n", cid));

		lba = ((u64)scsicmd->cmnd[2] << 24) \| (scsicmd->cmnd[3] << 16)
		\| (scsicmd->cmnd[4] << 8) \| scsicmd->cmnd[5];
		count = (scsicmd->cmnd[6] << 24) \| (scsicmd->cmnd[7] << 16)
		\| (scsicmd->cmnd[8] << 8) \| scsicmd->cmnd[9];
		} else {
		dprintk((KERN_DEBUG "aachba: received a write(10) command on id %d.\n", cid));
		lba = (scsicmd->cmnd[2] << 24) \| (scsicmd->cmnd[3] << 16) \| (scsicmd->cmnd[4] << 8) \| scsicmd->cmnd[5];
		lba = ((u64)scsicmd->cmnd[2] << 24) \| (scsicmd->cmnd[3] << 16) \| (scsicmd->cmnd[4] << 8) \| scsicmd->cmnd[5];
		count = (scsicmd->cmnd[7] << 8) \| scsicmd->cmnd[8];
		}
		dprintk((KERN_DEBUG "aac_write[cpu %d]: lba = %u, t = %ld.\n",
		dprintk((KERN_DEBUG "aac_write[cpu %d]: lba = %llu, t = %ld.\n",
		smp_processor_id(), (unsigned long long)lba, jiffies));
		if ((!(dev->raw_io_interface) \|\| !(dev->raw_io_64))
		&& (lba & 0xffffffff00000000LL)) {
		dprintk((KERN_DEBUG "aac_write: Illegal lba\n"));
		scsicmd->result = DID_OK << 16 \| COMMAND_COMPLETE << 8 \| SAM_STAT_CHECK_CONDITION;
		set_sense((u8 *) &dev->fsa_dev[cid].sense_data,
		HARDWARE_ERROR,
		SENCODE_INTERNAL_TARGET_FAILURE,
		ASENCODE_INTERNAL_TARGET_FAILURE, 0, 0,
		0, 0);
		memcpy(scsicmd->sense_buffer, &dev->fsa_dev[cid].sense_data,
		(sizeof(dev->fsa_dev[cid].sense_data) > sizeof(scsicmd->sense_buffer))
		? sizeof(scsicmd->sense_buffer)
		: sizeof(dev->fsa_dev[cid].sense_data));
		scsicmd->scsi_done(scsicmd);
		return 0;
		}
		/*
		* Allocate and initialize a Fib then setup a BlockWrite command
		*/
		@@ -1068,8 +1219,8 @@ static int aac_write(struct scsi_cmnd * scsicmd, int cid)
		if (dev->raw_io_interface) {
		struct aac_raw_io *writecmd;
		writecmd = (struct aac_raw_io *) fib_data(cmd_fibcontext);
		writecmd->block[0] = cpu_to_le32(lba);
		writecmd->block[1] = 0;
		writecmd->block[0] = cpu_to_le32((u32)(lba&0xffffffff));
		writecmd->block[1] = cpu_to_le32((u32)((lba&0xffffffff00000000LL)>>32));
		writecmd->count = cpu_to_le32(count<<9);
		writecmd->cid = cpu_to_le16(cid);
		writecmd->flags = 0;
		@@ -1096,7 +1247,7 @@ static int aac_write(struct scsi_cmnd * scsicmd, int cid)
		writecmd->command = cpu_to_le32(VM_CtHostWrite64);
		writecmd->cid = cpu_to_le16(cid);
		writecmd->sector_count = cpu_to_le16(count);
		writecmd->block = cpu_to_le32(lba);
		writecmd->block = cpu_to_le32((u32)(lba&0xffffffff));
		writecmd->pad = 0;
		writecmd->flags = 0;

		@@ -1121,7 +1272,7 @@ static int aac_write(struct scsi_cmnd * scsicmd, int cid)
		writecmd = (struct aac_write *) fib_data(cmd_fibcontext);
		writecmd->command = cpu_to_le32(VM_CtBlockWrite);
		writecmd->cid = cpu_to_le32(cid);
		writecmd->block = cpu_to_le32(lba);
		writecmd->block = cpu_to_le32((u32)(lba&0xffffffff));
		writecmd->count = cpu_to_le32(count * 512);
		writecmd->sg.count = cpu_to_le32(1);
		/* ->stable is not used - it did mean which type of write */
		@@ -1310,11 +1461,18 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd)
		*/
		if ((fsa_dev_ptr[cid].valid & 1) == 0) {
		switch (scsicmd->cmnd[0]) {
		case SERVICE_ACTION_IN:
		if (!(dev->raw_io_interface) \|\|
		!(dev->raw_io_64) \|\|
		((scsicmd->cmnd[1] & 0x1f) != SAI_READ_CAPACITY_16))
		break;
		case INQUIRY:
		case READ_CAPACITY:
		case TEST_UNIT_READY:
		spin_unlock_irq(host->host_lock);
		probe_container(dev, cid);
		if ((fsa_dev_ptr[cid].valid & 1) == 0)
		fsa_dev_ptr[cid].valid = 0;
		spin_lock_irq(host->host_lock);
		if (fsa_dev_ptr[cid].valid == 0) {
		scsicmd->result = DID_NO_CONNECT << 16;
		@@ -1375,7 +1533,6 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd)
		memset(&inq_data, 0, sizeof (struct inquiry_data));

		inq_data.inqd_ver = 2; /* claim compliance to SCSI-2 */
		inq_data.inqd_dtq = 0x80; /* set RMB bit to one indicating that the medium is removable */
		inq_data.inqd_rdf = 2; /* A response data format value of two indicates that the data shall be in the format specified in SCSI-2 */
		inq_data.inqd_len = 31;
		/Format for "pad2" is RelAdr \| WBus32 \| WBus16 \| Sync \| Linked \|Reserved\| CmdQue \| SftRe /
		@@ -1397,13 +1554,55 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd)
		aac_internal_transfer(scsicmd, &inq_data, 0, sizeof(inq_data));
		return aac_get_container_name(scsicmd, cid);
		}
		case SERVICE_ACTION_IN:
		if (!(dev->raw_io_interface) \|\|
		!(dev->raw_io_64) \|\|
		((scsicmd->cmnd[1] & 0x1f) != SAI_READ_CAPACITY_16))
		break;
		{
		u64 capacity;
		char cp[12];
		unsigned int offset = 0;

		dprintk((KERN_DEBUG "READ CAPACITY_16 command.\n"));
		capacity = fsa_dev_ptr[cid].size - 1;
		if (scsicmd->cmnd[13] > 12) {
		offset = scsicmd->cmnd[13] - 12;
		if (offset > sizeof(cp))
		break;
		memset(cp, 0, offset);
		aac_internal_transfer(scsicmd, cp, 0, offset);
		}
		cp[0] = (capacity >> 56) & 0xff;
		cp[1] = (capacity >> 48) & 0xff;
		cp[2] = (capacity >> 40) & 0xff;
		cp[3] = (capacity >> 32) & 0xff;
		cp[4] = (capacity >> 24) & 0xff;
		cp[5] = (capacity >> 16) & 0xff;
		cp[6] = (capacity >> 8) & 0xff;
		cp[7] = (capacity >> 0) & 0xff;
		cp[8] = 0;
		cp[9] = 0;
		cp[10] = 2;
		cp[11] = 0;
		aac_internal_transfer(scsicmd, cp, offset, sizeof(cp));

		/* Do not cache partition table for arrays */
		scsicmd->device->removable = 1;

		scsicmd->result = DID_OK << 16 \| COMMAND_COMPLETE << 8 \| SAM_STAT_GOOD;
		scsicmd->scsi_done(scsicmd);

		return 0;
		}

		case READ_CAPACITY:
		{
		u32 capacity;
		char cp[8];

		dprintk((KERN_DEBUG "READ CAPACITY command.\n"));
		if (fsa_dev_ptr[cid].size <= 0x100000000LL)
		if (fsa_dev_ptr[cid].size <= 0x100000000ULL)
		capacity = fsa_dev_ptr[cid].size - 1;
		else
		capacity = (u32)-1;
		@@ -1417,6 +1616,8 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd)
		cp[6] = 2;
		cp[7] = 0;
		aac_internal_transfer(scsicmd, cp, 0, sizeof(cp));
		/* Do not cache partition table for arrays */
		scsicmd->device->removable = 1;

		scsicmd->result = DID_OK << 16 \| COMMAND_COMPLETE << 8 \| SAM_STAT_GOOD;
		scsicmd->scsi_done(scsicmd);
		@@ -1497,6 +1698,8 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd)
		{
		case READ_6:
		case READ_10:
		case READ_12:
		case READ_16:
		/*
		* Hack to keep track of ordinal number of the device that
		* corresponds to a container. Needed to convert
		@@ -1505,16 +1708,18 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd)

		spin_unlock_irq(host->host_lock);
		if (scsicmd->request->rq_disk)
		memcpy(fsa_dev_ptr[cid].devname,
		strlcpy(fsa_dev_ptr[cid].devname,
		scsicmd->request->rq_disk->disk_name,
		8);

		min(sizeof(fsa_dev_ptr[cid].devname),
		sizeof(scsicmd->request->rq_disk->disk_name) + 1));
		ret = aac_read(scsicmd, cid);
		spin_lock_irq(host->host_lock);
		return ret;

		case WRITE_6:
		case WRITE_10:
		case WRITE_12:
		case WRITE_16:
		spin_unlock_irq(host->host_lock);
		ret = aac_write(scsicmd, cid);
		spin_lock_irq(host->host_lock);
		@@ -1745,6 +1950,8 @@ static void aac_srb_callback(void context, struct fib fibptr)
		case WRITE_10:
		case READ_12:
		case WRITE_12:
		case READ_16:
		case WRITE_16:
		if(le32_to_cpu(srbreply->data_xfer_length) < scsicmd->underflow ) {
		printk(KERN_WARNING"aacraid: SCSI CMD underflow\n");
		} else {
		@@ -1850,8 +2057,8 @@ static void aac_srb_callback(void context, struct fib fibptr)
		sizeof(scsicmd->sense_buffer) :
		le32_to_cpu(srbreply->sense_data_size);
		#ifdef AAC_DETAILED_STATUS_INFO
		dprintk((KERN_WARNING "aac_srb_callback: check condition, status = %d len=%d\n",
		le32_to_cpu(srbreply->status), len));
		printk(KERN_WARNING "aac_srb_callback: check condition, status = %d len=%d\n",
		le32_to_cpu(srbreply->status), len);
		#endif
		memcpy(scsicmd->sense_buffer, srbreply->sense_data, len);

drivers/scsi/aacraid/aacraid.h

+13 −4

Original line number	Diff line number	Diff line
		#if (!defined(dprintk))
		# define dprintk(x)
		#endif
		/* eg: if (nblank(dprintk(x))) */
		#define _nblank(x) #x
		#define nblank(x) _nblank(x)[0]


		/*------------------------------------------------------------------------------
		* D E F I N E S
		@@ -302,7 +306,6 @@ enum aac_queue_types {
		*/

		#define FsaNormal 1
		#define FsaHigh 2

		/*
		* Define the FIB. The FIB is the where all the requested data and
		@@ -546,8 +549,6 @@ struct aac_queue {
		/* This is only valid for adapter to host command queues. */
		spinlock_t lock; / Spinlock for this queue must take this lock before accessing the lock */
		spinlock_t lockdata; /* Actual lock (used only on one side of the lock) */
		unsigned long SavedIrql; /* Previous IRQL when the spin lock is taken */
		u32 padding; /* Padding - FIXME - can remove I believe */
		struct list_head cmdq; /* A queue of FIBs which need to be prcessed by the FS thread. This is */
		/* only valid for command queues which receive entries from the adapter. */
		struct list_head pendingq; /* A queue of outstanding fib's to the adapter. */
		@@ -776,7 +777,9 @@ struct fsa_dev_info {
		u64 last;
		u64 size;
		u32 type;
		u32 config_waiting_on;
		u16 queue_depth;
		u8 config_needed;
		u8 valid;
		u8 ro;
		u8 locked;
		@@ -1012,6 +1015,7 @@ struct aac_dev
		/* macro side-effects BEWARE */
		# define raw_io_interface \
		init->InitStructRevision==cpu_to_le32(ADAPTER_INIT_STRUCT_REVISION_4)
		u8 raw_io_64;
		u8 printf_enabled;
		};

		@@ -1362,8 +1366,10 @@ struct aac_srb_reply
		#define VM_CtBlockVerify64 18
		#define VM_CtHostRead64 19
		#define VM_CtHostWrite64 20
		#define VM_DrvErrTblLog 21
		#define VM_NameServe64 22

		#define MAX_VMCOMMAND_NUM 21 /* used for sizing stats array - leave last */
		#define MAX_VMCOMMAND_NUM 23 /* used for sizing stats array - leave last */

		/*
		* Descriptive information (eg, vital stats)
		@@ -1472,6 +1478,7 @@ struct aac_mntent {
		manager (eg, filesystem) */
		__le32 altoid; /* != oid <==> snapshot or
		broken mirror exists */
		__le32 capacityhigh;
		};

		#define FSCS_NOTCLEAN 0x0001 /* fsck is neccessary before mounting */
		@@ -1707,6 +1714,7 @@ extern struct aac_common aac_config;
		#define AifCmdJobProgress 2 /* Progress report */
		#define AifJobCtrZero 101 /* Array Zero progress */
		#define AifJobStsSuccess 1 /* Job completes */
		#define AifJobStsRunning 102 /* Job running */
		#define AifCmdAPIReport 3 /* Report from other user of API */
		#define AifCmdDriverNotify 4 /* Notify host driver of event */
		#define AifDenMorphComplete 200 /* A morph operation completed */
		@@ -1777,6 +1785,7 @@ int fib_adapter_complete(struct fib * fibptr, unsigned short size);
		struct aac_driver_ident* aac_get_driver_ident(int devtype);
		int aac_get_adapter_info(struct aac_dev* dev);
		int aac_send_shutdown(struct aac_dev *dev);
		int probe_container(struct aac_dev *dev, int cid);
		extern int numacb;
		extern int acbsize;
		extern char aac_driver_version[];