scsi: smartpqi: Add driver support for multi-LUN devices (904f2bfd) · Commits · jan.koester / Linux

drivers/scsi/smartpqi/smartpqi.h

+11 −4

Original line number	Original line	Diff line number	Diff line
	@@ -293,7 +293,8 @@ struct pqi_raid_path_request {
	u8 additional_cdb_bytes_usage : 3;		u8 additional_cdb_bytes_usage : 3;
	u8 reserved5 : 3;		u8 reserved5 : 3;
	u8 cdb[16];		u8 cdb[16];
	u8 reserved6[12];		u8 reserved6[11];
			u8 ml_device_lun_number;
	__le32 timeout;		__le32 timeout;
	struct pqi_sg_descriptor sg_descriptors[PQI_MAX_EMBEDDED_SG_DESCRIPTORS];		struct pqi_sg_descriptor sg_descriptors[PQI_MAX_EMBEDDED_SG_DESCRIPTORS];
	};		};
	@@ -467,7 +468,8 @@ struct pqi_task_management_request {
	struct pqi_iu_header header;		struct pqi_iu_header header;
	__le16 request_id;		__le16 request_id;
	__le16 nexus_id;		__le16 nexus_id;
	u8 reserved[2];		u8 reserved;
			u8 ml_device_lun_number;
	__le16 timeout;		__le16 timeout;
	u8 lun_number[8];		u8 lun_number[8];
	__le16 protocol_specific;		__le16 protocol_specific;
	@@ -864,7 +866,8 @@ struct pqi_config_table_firmware_features {
	#define PQI_FIRMWARE_FEATURE_UNIQUE_WWID_IN_REPORT_PHYS_LUN 16		#define PQI_FIRMWARE_FEATURE_UNIQUE_WWID_IN_REPORT_PHYS_LUN 16
	#define PQI_FIRMWARE_FEATURE_FW_TRIAGE 17		#define PQI_FIRMWARE_FEATURE_FW_TRIAGE 17
	#define PQI_FIRMWARE_FEATURE_RPL_EXTENDED_FORMAT_4_5 18		#define PQI_FIRMWARE_FEATURE_RPL_EXTENDED_FORMAT_4_5 18
	#define PQI_FIRMWARE_FEATURE_MAXIMUM 18		#define PQI_FIRMWARE_FEATURE_MULTI_LUN_DEVICE_SUPPORT 21
			#define PQI_FIRMWARE_FEATURE_MAXIMUM 21

	struct pqi_config_table_debug {		struct pqi_config_table_debug {
	struct pqi_config_table_section_header header;		struct pqi_config_table_section_header header;
	@@ -1082,6 +1085,8 @@ struct pqi_stream_data {
	u32 last_accessed;		u32 last_accessed;
	};		};

			#define PQI_MAX_LUNS_PER_DEVICE 256

	struct pqi_scsi_dev {		struct pqi_scsi_dev {
	int devtype; /* as reported by INQUIRY command */		int devtype; /* as reported by INQUIRY command */
	u8 device_type; /* as reported by */		u8 device_type; /* as reported by */
	@@ -1125,6 +1130,7 @@ struct pqi_scsi_dev {
	u8 phy_id;		u8 phy_id;
	u8 ncq_prio_enable;		u8 ncq_prio_enable;
	u8 ncq_prio_support;		u8 ncq_prio_support;
			u8 multi_lun_device_lun_count;
	bool raid_bypass_configured; /* RAID bypass configured */		bool raid_bypass_configured; /* RAID bypass configured */
	bool raid_bypass_enabled; /* RAID bypass enabled */		bool raid_bypass_enabled; /* RAID bypass enabled */
	u32 next_bypass_group[RAID_MAP_MAX_DATA_DISKS_PER_ROW];		u32 next_bypass_group[RAID_MAP_MAX_DATA_DISKS_PER_ROW];
	@@ -1140,7 +1146,7 @@ struct pqi_scsi_dev {
	struct list_head delete_list_entry;		struct list_head delete_list_entry;

	struct pqi_stream_data stream_data[NUM_STREAMS_PER_LUN];		struct pqi_stream_data stream_data[NUM_STREAMS_PER_LUN];
	atomic_t scsi_cmds_outstanding;		atomic_t scsi_cmds_outstanding[PQI_MAX_LUNS_PER_DEVICE];
	atomic_t raid_bypass_cnt;		atomic_t raid_bypass_cnt;
	};		};

	@@ -1333,6 +1339,7 @@ struct pqi_ctrl_info {
	u8 tmf_iu_timeout_supported : 1;		u8 tmf_iu_timeout_supported : 1;
	u8 firmware_triage_supported : 1;		u8 firmware_triage_supported : 1;
	u8 rpl_extended_format_4_5_supported : 1;		u8 rpl_extended_format_4_5_supported : 1;
			u8 multi_lun_device_supported : 1;
	u8 enable_r1_writes : 1;		u8 enable_r1_writes : 1;
	u8 enable_r5_writes : 1;		u8 enable_r5_writes : 1;
	u8 enable_r6_writes : 1;		u8 enable_r6_writes : 1;

drivers/scsi/smartpqi/smartpqi_init.c

+61 −31

Original line number	Original line	Diff line number	Diff line
	@@ -94,7 +94,7 @@ static void pqi_ofa_setup_host_buffer(struct pqi_ctrl_info *ctrl_info);
	static void pqi_ofa_free_host_buffer(struct pqi_ctrl_info *ctrl_info);		static void pqi_ofa_free_host_buffer(struct pqi_ctrl_info *ctrl_info);
	static int pqi_ofa_host_memory_update(struct pqi_ctrl_info *ctrl_info);		static int pqi_ofa_host_memory_update(struct pqi_ctrl_info *ctrl_info);
	static int pqi_device_wait_for_pending_io(struct pqi_ctrl_info *ctrl_info,		static int pqi_device_wait_for_pending_io(struct pqi_ctrl_info *ctrl_info,
	struct pqi_scsi_dev *device, unsigned long timeout_msecs);		struct pqi_scsi_dev *device, u8 lun, unsigned long timeout_msecs);

	/* for flags argument to pqi_submit_raid_request_synchronous() */		/* for flags argument to pqi_submit_raid_request_synchronous() */
	#define PQI_SYNC_FLAGS_INTERRUPTABLE 0x1		#define PQI_SYNC_FLAGS_INTERRUPTABLE 0x1
	@@ -1597,7 +1597,9 @@ static int pqi_get_physical_device_info(struct pqi_ctrl_info *ctrl_info,
	&id_phys->alternate_paths_phys_connector,		&id_phys->alternate_paths_phys_connector,
	sizeof(device->phys_connector));		sizeof(device->phys_connector));
	device->bay = id_phys->phys_bay_in_box;		device->bay = id_phys->phys_bay_in_box;
			device->multi_lun_device_lun_count = id_phys->multi_lun_device_lun_count;
			if (!device->multi_lun_device_lun_count)
			device->multi_lun_device_lun_count = 1;
	if ((id_phys->even_more_flags & PQI_DEVICE_PHY_MAP_SUPPORTED) &&		if ((id_phys->even_more_flags & PQI_DEVICE_PHY_MAP_SUPPORTED) &&
	id_phys->phy_count)		id_phys->phy_count)
	device->phy_id =		device->phy_id =
	@@ -1880,15 +1882,18 @@ static int pqi_add_device(struct pqi_ctrl_info *ctrl_info,
	static inline void pqi_remove_device(struct pqi_ctrl_info ctrl_info, struct pqi_scsi_dev device)		static inline void pqi_remove_device(struct pqi_ctrl_info ctrl_info, struct pqi_scsi_dev device)
	{		{
	int rc;		int rc;
			int lun;

	rc = pqi_device_wait_for_pending_io(ctrl_info, device,		for (lun = 0; lun < device->multi_lun_device_lun_count; lun++) {
			rc = pqi_device_wait_for_pending_io(ctrl_info, device, lun,
	PQI_REMOVE_DEVICE_PENDING_IO_TIMEOUT_MSECS);		PQI_REMOVE_DEVICE_PENDING_IO_TIMEOUT_MSECS);
	if (rc)		if (rc)
	dev_err(&ctrl_info->pci_dev->dev,		dev_err(&ctrl_info->pci_dev->dev,
	"scsi %d:%d:%d:%d removing device with %d outstanding command(s)\n",		"scsi %d:%d:%d:%d removing device with %d outstanding command(s)\n",
	ctrl_info->scsi_host->host_no, device->bus,		ctrl_info->scsi_host->host_no, device->bus,
	device->target, device->lun,		device->target, lun,
	atomic_read(&device->scsi_cmds_outstanding));		atomic_read(&device->scsi_cmds_outstanding[lun]));
			}

	if (pqi_is_logical_device(device))		if (pqi_is_logical_device(device))
	scsi_remove_device(device->sdev);		scsi_remove_device(device->sdev);
	@@ -2061,6 +2066,9 @@ static void pqi_scsi_update_device(struct pqi_ctrl_info *ctrl_info,
	existing_device->box_index = new_device->box_index;		existing_device->box_index = new_device->box_index;
	existing_device->phys_box_on_bus = new_device->phys_box_on_bus;		existing_device->phys_box_on_bus = new_device->phys_box_on_bus;
	existing_device->phy_connected_dev_type = new_device->phy_connected_dev_type;		existing_device->phy_connected_dev_type = new_device->phy_connected_dev_type;
			existing_device->multi_lun_device_lun_count = new_device->multi_lun_device_lun_count;
			if (!existing_device->multi_lun_device_lun_count)
			existing_device->multi_lun_device_lun_count = 1;
	memcpy(existing_device->box, new_device->box,		memcpy(existing_device->box, new_device->box,
	sizeof(existing_device->box));		sizeof(existing_device->box));
	memcpy(existing_device->phys_connector, new_device->phys_connector,		memcpy(existing_device->phys_connector, new_device->phys_connector,
	@@ -5463,6 +5471,7 @@ static int pqi_raid_submit_scsi_cmd_with_io_request(
	put_unaligned_le16(io_request->index, &request->request_id);		put_unaligned_le16(io_request->index, &request->request_id);
	request->error_index = request->request_id;		request->error_index = request->request_id;
	memcpy(request->lun_number, device->scsi3addr, sizeof(request->lun_number));		memcpy(request->lun_number, device->scsi3addr, sizeof(request->lun_number));
			request->ml_device_lun_number = (u8)scmd->device->lun;

	cdb_length = min_t(size_t, scmd->cmd_len, sizeof(request->cdb));		cdb_length = min_t(size_t, scmd->cmd_len, sizeof(request->cdb));
	memcpy(request->cdb, scmd->cmnd, cdb_length);		memcpy(request->cdb, scmd->cmnd, cdb_length);
	@@ -5627,7 +5636,9 @@ static int pqi_aio_submit_io(struct pqi_ctrl_info *ctrl_info,
	int rc;		int rc;
	struct pqi_io_request *io_request;		struct pqi_io_request *io_request;
	struct pqi_aio_path_request *request;		struct pqi_aio_path_request *request;
			struct pqi_scsi_dev *device;

			device = scmd->device->hostdata;
	io_request = pqi_alloc_io_request(ctrl_info);		io_request = pqi_alloc_io_request(ctrl_info);
	io_request->io_complete_callback = pqi_aio_io_complete;		io_request->io_complete_callback = pqi_aio_io_complete;
	io_request->scmd = scmd;		io_request->scmd = scmd;
	@@ -5643,6 +5654,8 @@ static int pqi_aio_submit_io(struct pqi_ctrl_info *ctrl_info,
	request->command_priority = io_high_prio;		request->command_priority = io_high_prio;
	put_unaligned_le16(io_request->index, &request->request_id);		put_unaligned_le16(io_request->index, &request->request_id);
	request->error_index = request->request_id;		request->error_index = request->request_id;
			if (!pqi_is_logical_device(device) && ctrl_info->multi_lun_device_supported)
			put_unaligned_le64(((scmd->device->lun) << 8), &request->lun_number);
	if (cdb_length > sizeof(request->cdb))		if (cdb_length > sizeof(request->cdb))
	cdb_length = sizeof(request->cdb);		cdb_length = sizeof(request->cdb);
	request->cdb_length = cdb_length;		request->cdb_length = cdb_length;
	@@ -5852,7 +5865,7 @@ void pqi_prep_for_scsi_done(struct scsi_cmnd *scmd)
	return;		return;
	}		}

	atomic_dec(&device->scsi_cmds_outstanding);		atomic_dec(&device->scsi_cmds_outstanding[scmd->device->lun]);
	}		}

	static bool pqi_is_parity_write_stream(struct pqi_ctrl_info *ctrl_info,		static bool pqi_is_parity_write_stream(struct pqi_ctrl_info *ctrl_info,
	@@ -5947,7 +5960,7 @@ static int pqi_scsi_queue_command(struct Scsi_Host shost, struct scsi_cmnd scm
	return 0;		return 0;
	}		}

	atomic_inc(&device->scsi_cmds_outstanding);		atomic_inc(&device->scsi_cmds_outstanding[scmd->device->lun]);

	ctrl_info = shost_to_hba(shost);		ctrl_info = shost_to_hba(shost);

	@@ -5993,7 +6006,7 @@ static int pqi_scsi_queue_command(struct Scsi_Host shost, struct scsi_cmnd scm

	out:		out:
	if (rc)		if (rc)
	atomic_dec(&device->scsi_cmds_outstanding);		atomic_dec(&device->scsi_cmds_outstanding[scmd->device->lun]);

	return rc;		return rc;
	}		}
	@@ -6133,7 +6146,7 @@ static void pqi_fail_io_queued_for_device(struct pqi_ctrl_info *ctrl_info,
	#define PQI_PENDING_IO_WARNING_TIMEOUT_SECS 10		#define PQI_PENDING_IO_WARNING_TIMEOUT_SECS 10

	static int pqi_device_wait_for_pending_io(struct pqi_ctrl_info *ctrl_info,		static int pqi_device_wait_for_pending_io(struct pqi_ctrl_info *ctrl_info,
	struct pqi_scsi_dev *device, unsigned long timeout_msecs)		struct pqi_scsi_dev *device, u8 lun, unsigned long timeout_msecs)
	{		{
	int cmds_outstanding;		int cmds_outstanding;
	unsigned long start_jiffies;		unsigned long start_jiffies;
	@@ -6143,7 +6156,7 @@ static int pqi_device_wait_for_pending_io(struct pqi_ctrl_info *ctrl_info,
	start_jiffies = jiffies;		start_jiffies = jiffies;
	warning_timeout = (PQI_PENDING_IO_WARNING_TIMEOUT_SECS * HZ) + start_jiffies;		warning_timeout = (PQI_PENDING_IO_WARNING_TIMEOUT_SECS * HZ) + start_jiffies;

	while ((cmds_outstanding = atomic_read(&device->scsi_cmds_outstanding)) > 0) {		while ((cmds_outstanding = atomic_read(&device->scsi_cmds_outstanding[lun])) > 0) {
	pqi_check_ctrl_health(ctrl_info);		pqi_check_ctrl_health(ctrl_info);
	if (pqi_ctrl_offline(ctrl_info))		if (pqi_ctrl_offline(ctrl_info))
	return -ENXIO;		return -ENXIO;
	@@ -6152,14 +6165,14 @@ static int pqi_device_wait_for_pending_io(struct pqi_ctrl_info *ctrl_info,
	dev_err(&ctrl_info->pci_dev->dev,		dev_err(&ctrl_info->pci_dev->dev,
	"scsi %d:%d:%d:%d: timed out after %lu seconds waiting for %d outstanding command(s)\n",		"scsi %d:%d:%d:%d: timed out after %lu seconds waiting for %d outstanding command(s)\n",
	ctrl_info->scsi_host->host_no, device->bus, device->target,		ctrl_info->scsi_host->host_no, device->bus, device->target,
	device->lun, msecs_waiting / 1000, cmds_outstanding);		lun, msecs_waiting / 1000, cmds_outstanding);
	return -ETIMEDOUT;		return -ETIMEDOUT;
	}		}
	if (time_after(jiffies, warning_timeout)) {		if (time_after(jiffies, warning_timeout)) {
	dev_warn(&ctrl_info->pci_dev->dev,		dev_warn(&ctrl_info->pci_dev->dev,
	"scsi %d:%d:%d:%d: waiting %lu seconds for %d outstanding command(s)\n",		"scsi %d:%d:%d:%d: waiting %lu seconds for %d outstanding command(s)\n",
	ctrl_info->scsi_host->host_no, device->bus, device->target,		ctrl_info->scsi_host->host_no, device->bus, device->target,
	device->lun, msecs_waiting / 1000, cmds_outstanding);		lun, msecs_waiting / 1000, cmds_outstanding);
	warning_timeout = (PQI_PENDING_IO_WARNING_TIMEOUT_SECS * HZ) + jiffies;		warning_timeout = (PQI_PENDING_IO_WARNING_TIMEOUT_SECS * HZ) + jiffies;
	}		}
	usleep_range(1000, 2000);		usleep_range(1000, 2000);
	@@ -6179,7 +6192,7 @@ static void pqi_lun_reset_complete(struct pqi_io_request *io_request,
	#define PQI_LUN_RESET_POLL_COMPLETION_SECS 10		#define PQI_LUN_RESET_POLL_COMPLETION_SECS 10

	static int pqi_wait_for_lun_reset_completion(struct pqi_ctrl_info *ctrl_info,		static int pqi_wait_for_lun_reset_completion(struct pqi_ctrl_info *ctrl_info,
	struct pqi_scsi_dev device, struct completion wait)		struct pqi_scsi_dev device, u8 lun, struct completion wait)
	{		{
	int rc;		int rc;
	unsigned int wait_secs;		unsigned int wait_secs;
	@@ -6201,10 +6214,10 @@ static int pqi_wait_for_lun_reset_completion(struct pqi_ctrl_info *ctrl_info,
	}		}

	wait_secs += PQI_LUN_RESET_POLL_COMPLETION_SECS;		wait_secs += PQI_LUN_RESET_POLL_COMPLETION_SECS;
	cmds_outstanding = atomic_read(&device->scsi_cmds_outstanding);		cmds_outstanding = atomic_read(&device->scsi_cmds_outstanding[lun]);
	dev_warn(&ctrl_info->pci_dev->dev,		dev_warn(&ctrl_info->pci_dev->dev,
	"scsi %d:%d:%d:%d: waiting %u seconds for LUN reset to complete (%d command(s) outstanding)\n",		"scsi %d:%d:%d:%d: waiting %u seconds for LUN reset to complete (%d command(s) outstanding)\n",
	ctrl_info->scsi_host->host_no, device->bus, device->target, device->lun, wait_secs, cmds_outstanding);		ctrl_info->scsi_host->host_no, device->bus, device->target, lun, wait_secs, cmds_outstanding);
	}		}

	return rc;		return rc;
	@@ -6212,13 +6225,15 @@ static int pqi_wait_for_lun_reset_completion(struct pqi_ctrl_info *ctrl_info,

	#define PQI_LUN_RESET_FIRMWARE_TIMEOUT_SECS 30		#define PQI_LUN_RESET_FIRMWARE_TIMEOUT_SECS 30

	static int pqi_lun_reset(struct pqi_ctrl_info ctrl_info, struct pqi_scsi_dev device)		static int pqi_lun_reset(struct pqi_ctrl_info ctrl_info, struct scsi_cmnd scmd)
	{		{
	int rc;		int rc;
	struct pqi_io_request *io_request;		struct pqi_io_request *io_request;
	DECLARE_COMPLETION_ONSTACK(wait);		DECLARE_COMPLETION_ONSTACK(wait);
	struct pqi_task_management_request *request;		struct pqi_task_management_request *request;
			struct pqi_scsi_dev *device;

			device = scmd->device->hostdata;
	io_request = pqi_alloc_io_request(ctrl_info);		io_request = pqi_alloc_io_request(ctrl_info);
	io_request->io_complete_callback = pqi_lun_reset_complete;		io_request->io_complete_callback = pqi_lun_reset_complete;
	io_request->context = &wait;		io_request->context = &wait;
	@@ -6232,6 +6247,8 @@ static int pqi_lun_reset(struct pqi_ctrl_info ctrl_info, struct pqi_scsi_dev d
	put_unaligned_le16(io_request->index, &request->request_id);		put_unaligned_le16(io_request->index, &request->request_id);
	memcpy(request->lun_number, device->scsi3addr,		memcpy(request->lun_number, device->scsi3addr,
	sizeof(request->lun_number));		sizeof(request->lun_number));
			if (!pqi_is_logical_device(device) && ctrl_info->multi_lun_device_supported)
			request->ml_device_lun_number = (u8)scmd->device->lun;
	request->task_management_function = SOP_TASK_MANAGEMENT_LUN_RESET;		request->task_management_function = SOP_TASK_MANAGEMENT_LUN_RESET;
	if (ctrl_info->tmf_iu_timeout_supported)		if (ctrl_info->tmf_iu_timeout_supported)
	put_unaligned_le16(PQI_LUN_RESET_FIRMWARE_TIMEOUT_SECS, &request->timeout);		put_unaligned_le16(PQI_LUN_RESET_FIRMWARE_TIMEOUT_SECS, &request->timeout);
	@@ -6239,7 +6256,7 @@ static int pqi_lun_reset(struct pqi_ctrl_info ctrl_info, struct pqi_scsi_dev d
	pqi_start_io(ctrl_info, &ctrl_info->queue_groups[PQI_DEFAULT_QUEUE_GROUP], RAID_PATH,		pqi_start_io(ctrl_info, &ctrl_info->queue_groups[PQI_DEFAULT_QUEUE_GROUP], RAID_PATH,
	io_request);		io_request);

	rc = pqi_wait_for_lun_reset_completion(ctrl_info, device, &wait);		rc = pqi_wait_for_lun_reset_completion(ctrl_info, device, (u8)scmd->device->lun, &wait);
	if (rc == 0)		if (rc == 0)
	rc = io_request->status;		rc = io_request->status;

	@@ -6253,15 +6270,17 @@ static int pqi_lun_reset(struct pqi_ctrl_info ctrl_info, struct pqi_scsi_dev d
	#define PQI_LUN_RESET_PENDING_IO_TIMEOUT_MSECS (10 * 60 * 1000)		#define PQI_LUN_RESET_PENDING_IO_TIMEOUT_MSECS (10 * 60 * 1000)
	#define PQI_LUN_RESET_FAILED_PENDING_IO_TIMEOUT_MSECS (2 * 60 * 1000)		#define PQI_LUN_RESET_FAILED_PENDING_IO_TIMEOUT_MSECS (2 * 60 * 1000)

	static int pqi_lun_reset_with_retries(struct pqi_ctrl_info ctrl_info, struct pqi_scsi_dev device)		static int pqi_lun_reset_with_retries(struct pqi_ctrl_info ctrl_info, struct scsi_cmnd scmd)
	{		{
	int reset_rc;		int reset_rc;
	int wait_rc;		int wait_rc;
	unsigned int retries;		unsigned int retries;
	unsigned long timeout_msecs;		unsigned long timeout_msecs;
			struct pqi_scsi_dev *device;

			device = scmd->device->hostdata;
	for (retries = 0;;) {		for (retries = 0;;) {
	reset_rc = pqi_lun_reset(ctrl_info, device);		reset_rc = pqi_lun_reset(ctrl_info, scmd);
	if (reset_rc == 0 \|\| reset_rc == -ENODEV \|\| ++retries > PQI_LUN_RESET_RETRIES)		if (reset_rc == 0 \|\| reset_rc == -ENODEV \|\| ++retries > PQI_LUN_RESET_RETRIES)
	break;		break;
	msleep(PQI_LUN_RESET_RETRY_INTERVAL_MSECS);		msleep(PQI_LUN_RESET_RETRY_INTERVAL_MSECS);
	@@ -6270,18 +6289,19 @@ static int pqi_lun_reset_with_retries(struct pqi_ctrl_info *ctrl_info, struct pq
	timeout_msecs = reset_rc ? PQI_LUN_RESET_FAILED_PENDING_IO_TIMEOUT_MSECS :		timeout_msecs = reset_rc ? PQI_LUN_RESET_FAILED_PENDING_IO_TIMEOUT_MSECS :
	PQI_LUN_RESET_PENDING_IO_TIMEOUT_MSECS;		PQI_LUN_RESET_PENDING_IO_TIMEOUT_MSECS;

	wait_rc = pqi_device_wait_for_pending_io(ctrl_info, device, timeout_msecs);		wait_rc = pqi_device_wait_for_pending_io(ctrl_info, device, scmd->device->lun, timeout_msecs);
	if (wait_rc && reset_rc == 0)		if (wait_rc && reset_rc == 0)
	reset_rc = wait_rc;		reset_rc = wait_rc;

	return reset_rc == 0 ? SUCCESS : FAILED;		return reset_rc == 0 ? SUCCESS : FAILED;
	}		}

	static int pqi_device_reset(struct pqi_ctrl_info *ctrl_info,		static int pqi_device_reset(struct pqi_ctrl_info ctrl_info, struct scsi_cmnd scmd)
	struct pqi_scsi_dev *device)
	{		{
	int rc;		int rc;
			struct pqi_scsi_dev *device;

			device = scmd->device->hostdata;
	pqi_ctrl_block_requests(ctrl_info);		pqi_ctrl_block_requests(ctrl_info);
	pqi_ctrl_wait_until_quiesced(ctrl_info);		pqi_ctrl_wait_until_quiesced(ctrl_info);
	pqi_fail_io_queued_for_device(ctrl_info, device);		pqi_fail_io_queued_for_device(ctrl_info, device);
	@@ -6289,7 +6309,7 @@ static int pqi_device_reset(struct pqi_ctrl_info *ctrl_info,
	if (rc)		if (rc)
	rc = FAILED;		rc = FAILED;
	else		else
	rc = pqi_lun_reset_with_retries(ctrl_info, device);		rc = pqi_lun_reset_with_retries(ctrl_info, scmd);
	pqi_ctrl_unblock_requests(ctrl_info);		pqi_ctrl_unblock_requests(ctrl_info);

	return rc;		return rc;
	@@ -6311,18 +6331,18 @@ static int pqi_eh_device_reset_handler(struct scsi_cmnd *scmd)
	dev_err(&ctrl_info->pci_dev->dev,		dev_err(&ctrl_info->pci_dev->dev,
	"resetting scsi %d:%d:%d:%d due to cmd 0x%02x\n",		"resetting scsi %d:%d:%d:%d due to cmd 0x%02x\n",
	shost->host_no,		shost->host_no,
	device->bus, device->target, device->lun,		device->bus, device->target, (u32)scmd->device->lun,
	scmd->cmd_len > 0 ? scmd->cmnd[0] : 0xff);		scmd->cmd_len > 0 ? scmd->cmnd[0] : 0xff);

	pqi_check_ctrl_health(ctrl_info);		pqi_check_ctrl_health(ctrl_info);
	if (pqi_ctrl_offline(ctrl_info))		if (pqi_ctrl_offline(ctrl_info))
	rc = FAILED;		rc = FAILED;
	else		else
	rc = pqi_device_reset(ctrl_info, device);		rc = pqi_device_reset(ctrl_info, scmd);

	dev_err(&ctrl_info->pci_dev->dev,		dev_err(&ctrl_info->pci_dev->dev,
	"reset of scsi %d:%d:%d:%d: %s\n",		"reset of scsi %d:%d:%d:%d: %s\n",
	shost->host_no, device->bus, device->target, device->lun,		shost->host_no, device->bus, device->target, (u32)scmd->device->lun,
	rc == SUCCESS ? "SUCCESS" : "FAILED");		rc == SUCCESS ? "SUCCESS" : "FAILED");

	mutex_unlock(&ctrl_info->lun_reset_mutex);		mutex_unlock(&ctrl_info->lun_reset_mutex);
	@@ -7296,6 +7316,7 @@ static int pqi_register_scsi(struct pqi_ctrl_info *ctrl_info)
	shost->this_id = -1;		shost->this_id = -1;
	shost->max_channel = PQI_MAX_BUS;		shost->max_channel = PQI_MAX_BUS;
	shost->max_cmd_len = MAX_COMMAND_SIZE;		shost->max_cmd_len = MAX_COMMAND_SIZE;
			shost->max_lun = PQI_MAX_LUNS_PER_DEVICE;
	shost->max_lun = ~0;		shost->max_lun = ~0;
	shost->max_id = ~0;		shost->max_id = ~0;
	shost->max_sectors = ctrl_info->max_sectors;		shost->max_sectors = ctrl_info->max_sectors;
	@@ -7643,6 +7664,9 @@ static void pqi_ctrl_update_feature_flags(struct pqi_ctrl_info *ctrl_info,
	case PQI_FIRMWARE_FEATURE_RPL_EXTENDED_FORMAT_4_5:		case PQI_FIRMWARE_FEATURE_RPL_EXTENDED_FORMAT_4_5:
	ctrl_info->rpl_extended_format_4_5_supported = firmware_feature->enabled;		ctrl_info->rpl_extended_format_4_5_supported = firmware_feature->enabled;
	break;		break;
			case PQI_FIRMWARE_FEATURE_MULTI_LUN_DEVICE_SUPPORT:
			ctrl_info->multi_lun_device_supported = firmware_feature->enabled;
			break;
	}		}

	pqi_firmware_feature_status(ctrl_info, firmware_feature);		pqi_firmware_feature_status(ctrl_info, firmware_feature);
	@@ -7743,6 +7767,11 @@ static struct pqi_firmware_feature pqi_firmware_features[] = {
	.feature_bit = PQI_FIRMWARE_FEATURE_RPL_EXTENDED_FORMAT_4_5,		.feature_bit = PQI_FIRMWARE_FEATURE_RPL_EXTENDED_FORMAT_4_5,
	.feature_status = pqi_ctrl_update_feature_flags,		.feature_status = pqi_ctrl_update_feature_flags,
	},		},
			{
			.feature_name = "Multi-LUN Target",
			.feature_bit = PQI_FIRMWARE_FEATURE_MULTI_LUN_DEVICE_SUPPORT,
			.feature_status = pqi_ctrl_update_feature_flags,
			},
	};		};

	static void pqi_process_firmware_features(		static void pqi_process_firmware_features(
	@@ -7844,6 +7873,7 @@ static void pqi_ctrl_reset_config(struct pqi_ctrl_info *ctrl_info)
	ctrl_info->tmf_iu_timeout_supported = false;		ctrl_info->tmf_iu_timeout_supported = false;
	ctrl_info->firmware_triage_supported = false;		ctrl_info->firmware_triage_supported = false;
	ctrl_info->rpl_extended_format_4_5_supported = false;		ctrl_info->rpl_extended_format_4_5_supported = false;
			ctrl_info->multi_lun_device_supported = false;
	}		}

	static int pqi_process_config_table(struct pqi_ctrl_info *ctrl_info)		static int pqi_process_config_table(struct pqi_ctrl_info *ctrl_info)