Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a4576b5d authored by Mark Salyzyn's avatar Mark Salyzyn Committed by James Bottomley
Browse files

[SCSI] aacraid: Fix jbod operations scan issues 



As JBOD devices (really just Simple Single Drive Volumes exported to
the SCSI channel) are managed, they fail to update correctly when the
driver triggers a SCSI scan. In addition, the ability to change
multiple arrays or JBODs at the same time was resulting in dropped
scans, set up a mechanism to issue a list of single target scans on a
single configuration change notification from the Firmware.

Performed some additional sundry cosmetic code style cleanups.

Signed-off-by: default avatarMark Salyzyn <aacraid@adaptec.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent e2efe7aa

drivers/scsi/aacraid/commsup.c

+25 −7
Original line number Diff line number Diff line
@@ -906,15 +906,22 @@ static void aac_handle_aif(struct aac_dev * dev, struct fib * fibptr) 
		case AifEnAddJBOD:

		case AifEnDeleteJBOD:

			container = le32_to_cpu(((__le32 *)aifcmd->data)[1]);

			if ((container >> 28))

			if ((container >> 28)) {

				container = (u32)-1;

				break;

			}

			channel = (container >> 24) & 0xF;

			if (channel >= dev->maximum_num_channels)

			if (channel >= dev->maximum_num_channels) {

				container = (u32)-1;

				break;

			}

			id = container & 0xFFFF;

			if (id >= dev->maximum_num_physicals)

			if (id >= dev->maximum_num_physicals) {

				container = (u32)-1;

				break;

			}

			lun = (container >> 16) & 0xFF;

			container = (u32)-1;

			channel = aac_phys_to_logical(channel);

			device_config_needed =

			  (((__le32 *)aifcmd->data)[0] ==
@@ -933,13 +940,18 @@ static void aac_handle_aif(struct aac_dev * dev, struct fib * fibptr) 
			case EM_DRIVE_REMOVAL:

				container = le32_to_cpu(

					((__le32 *)aifcmd->data)[2]);

				if ((container >> 28))

				if ((container >> 28)) {

					container = (u32)-1;

					break;

				}

				channel = (container >> 24) & 0xF;

				if (channel >= dev->maximum_num_channels)

				if (channel >= dev->maximum_num_channels) {

					container = (u32)-1;

					break;

				}

				id = container & 0xFFFF;

				lun = (container >> 16) & 0xFF;

				container = (u32)-1;

				if (id >= dev->maximum_num_physicals) {

					/* legacy dev_t ? */

					if ((0x2000 <= id) || lun || channel ||
@@ -1025,9 +1037,10 @@ static void aac_handle_aif(struct aac_dev * dev, struct fib * fibptr) 
		break;

	}



	container = 0;

retry_next:

	if (device_config_needed == NOTHING)

	for (container = 0; container < dev->maximum_num_containers;

	    ++container) {

	for (; container < dev->maximum_num_containers; ++container) {

		if ((dev->fsa_dev[container].config_waiting_on == 0) &&

			(dev->fsa_dev[container].config_needed != NOTHING) &&

			time_before(jiffies, dev->fsa_dev[container].config_waiting_stamp + AIF_SNIFF_TIMEOUT)) {
@@ -1110,6 +1123,11 @@ static void aac_handle_aif(struct aac_dev * dev, struct fib * fibptr) 
	}

	if (device_config_needed == ADD)

		scsi_add_device(dev->scsi_host_ptr, channel, id, lun);

	if (channel == CONTAINER_CHANNEL) {

		container++;

		device_config_needed = NOTHING;

		goto retry_next;

	}

}



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

drivers/scsi/aacraid/linit.c

+9 −7
Original line number Diff line number Diff line
@@ -401,6 +401,8 @@ static int aac_biosparm(struct scsi_device *sdev, struct block_device *bdev, 
static int aac_slave_configure(struct scsi_device *sdev)

{

	struct aac_dev *aac = (struct aac_dev *)sdev->host->hostdata;

	if (aac->jbod && (sdev->type == TYPE_DISK))

		sdev->removable = 1;

	if ((sdev->type == TYPE_DISK) &&

			(sdev_channel(sdev) != CONTAINER_CHANNEL) &&

			(!aac->jbod || sdev->inq_periph_qual) &&