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

Commit a3144e0b authored by Joe Handzik's avatar Joe Handzik Committed by James Bottomley
Browse files

hpsa: use ioaccel2 path to submit IOs to physical drives in HBA mode. 



use ioaccel2 path to submit I/O to physical drives in HBA mode

Reviewed-by: default avatarScott Teel <scott.teel@pmcs.com>
Reviewed-by: default avatarKevin Barnett <kevin.barnett@pmcs.com>
Reviewed-by: default avatarTomas Henzl <thenzl@redhat.com>
Reviewed-by: default avatarHannes Reinecke <hare@Suse.de>
Signed-off-by: default avatarJoe Handzik <joseph.t.handzik@hp.com>
Signed-off-by: default avatarDon Brace <don.brace@pmcs.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJames Bottomley <JBottomley@Odin.com>
parent a473d86c

drivers/scsi/hpsa.c

+9 −1
Original line number Diff line number Diff line
@@ -1093,6 +1093,11 @@ static void hpsa_scsi_update_entry(struct ctlr_info *h, int hostno, 
		h->dev[entry]->raid_map = new_entry->raid_map;

		h->dev[entry]->ioaccel_handle = new_entry->ioaccel_handle;

	}

	if (new_entry->hba_ioaccel_enabled) {

		h->dev[entry]->ioaccel_handle = new_entry->ioaccel_handle;

		wmb(); /* set ioaccel_handle *before* hba_ioaccel_enabled */

	}

	h->dev[entry]->hba_ioaccel_enabled = new_entry->hba_ioaccel_enabled;

	h->dev[entry]->offload_config = new_entry->offload_config;

	h->dev[entry]->offload_to_mirror = new_entry->offload_to_mirror;

	h->dev[entry]->queue_depth = new_entry->queue_depth;
@@ -3006,6 +3011,7 @@ static int hpsa_update_device_info(struct ctlr_info *h, 
		this_device->offload_config = 0;

		this_device->offload_enabled = 0;

		this_device->offload_to_be_enabled = 0;

		this_device->hba_ioaccel_enabled = 0;

		this_device->volume_offline = 0;

		this_device->queue_depth = h->nr_cmds;

	}
@@ -3294,6 +3300,8 @@ static void hpsa_get_ioaccel_drive_info(struct ctlr_info *h, 
		(struct ext_report_lun_entry *) lunaddrbytes;



	dev->ioaccel_handle = rle->ioaccel_handle;

	if (PHYS_IOACCEL(lunaddrbytes) && dev->ioaccel_handle)

		dev->hba_ioaccel_enabled = 1;

	memset(id_phys, 0, sizeof(*id_phys));

	rc = hpsa_bmic_id_physical_device(h, lunaddrbytes,

			GET_BMIC_DRIVE_NUMBER(lunaddrbytes), id_phys,
@@ -4395,7 +4403,7 @@ static int hpsa_ioaccel_submit(struct ctlr_info *h, 
		rc = hpsa_scsi_ioaccel_raid_map(h, c);

		if (rc < 0)     /* scsi_dma_map failed. */

			rc = SCSI_MLQUEUE_HOST_BUSY;

	} else if (dev->ioaccel_handle) {

	} else if (dev->hba_ioaccel_enabled) {

		hpsa_cmd_init(h, c->cmdindex, c);

		c->cmd_type = CMD_SCSI;

		c->scsi_cmd = cmd;

drivers/scsi/hpsa.h

+1 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ struct hpsa_scsi_dev_t { 
	int offload_config;		/* I/O accel RAID offload configured */

	int offload_enabled;		/* I/O accel RAID offload enabled */

	int offload_to_be_enabled;

	int hba_ioaccel_enabled;

	int offload_to_mirror;		/* Send next I/O accelerator RAID

					 * offload request to mirror drive

					 */