scsi: hpsa: update check for logical volume status (85b29008) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/scsi/hpsa.c

+16 −19

Original line number	Original line	Diff line number	Diff line
	@@ -3714,7 +3714,7 @@ static int hpsa_get_volume_status(struct ctlr_info *h,
	* # (integer code indicating one of several NOT READY states		* # (integer code indicating one of several NOT READY states
	* describing why a volume is to be kept offline)		* describing why a volume is to be kept offline)
	*/		*/
	static int hpsa_volume_offline(struct ctlr_info *h,		static unsigned char hpsa_volume_offline(struct ctlr_info *h,
	unsigned char scsi3addr[])		unsigned char scsi3addr[])
	{		{
	struct CommandList *c;		struct CommandList *c;
	@@ -3735,7 +3735,7 @@ static int hpsa_volume_offline(struct ctlr_info *h,
	DEFAULT_TIMEOUT);		DEFAULT_TIMEOUT);
	if (rc) {		if (rc) {
	cmd_free(h, c);		cmd_free(h, c);
	return 0;		return HPSA_VPD_LV_STATUS_UNSUPPORTED;
	}		}
	sense = c->err_info->SenseInfo;		sense = c->err_info->SenseInfo;
	if (c->err_info->SenseLen > sizeof(c->err_info->SenseInfo))		if (c->err_info->SenseLen > sizeof(c->err_info->SenseInfo))
	@@ -3746,19 +3746,13 @@ static int hpsa_volume_offline(struct ctlr_info *h,
	cmd_status = c->err_info->CommandStatus;		cmd_status = c->err_info->CommandStatus;
	scsi_status = c->err_info->ScsiStatus;		scsi_status = c->err_info->ScsiStatus;
	cmd_free(h, c);		cmd_free(h, c);
	/* Is the volume 'not ready'? */
	if (cmd_status != CMD_TARGET_STATUS \|\|
	scsi_status != SAM_STAT_CHECK_CONDITION \|\|
	sense_key != NOT_READY \|\|
	asc != ASC_LUN_NOT_READY) {
	return 0;
	}

	/* Determine the reason for not ready state */		/* Determine the reason for not ready state */
	ldstat = hpsa_get_volume_status(h, scsi3addr);		ldstat = hpsa_get_volume_status(h, scsi3addr);

	/* Keep volume offline in certain cases: */		/* Keep volume offline in certain cases: */
	switch (ldstat) {		switch (ldstat) {
			case HPSA_LV_FAILED:
	case HPSA_LV_UNDERGOING_ERASE:		case HPSA_LV_UNDERGOING_ERASE:
	case HPSA_LV_NOT_AVAILABLE:		case HPSA_LV_NOT_AVAILABLE:
	case HPSA_LV_UNDERGOING_RPI:		case HPSA_LV_UNDERGOING_RPI:
	@@ -3780,7 +3774,7 @@ static int hpsa_volume_offline(struct ctlr_info *h,
	default:		default:
	break;		break;
	}		}
	return 0;		return HPSA_LV_OK;
	}		}

	/*		/*
	@@ -3853,10 +3847,10 @@ static int hpsa_update_device_info(struct ctlr_info *h,
	/* Do an inquiry to the device to see what it is. */		/* Do an inquiry to the device to see what it is. */
	if (hpsa_scsi_do_inquiry(h, scsi3addr, 0, inq_buff,		if (hpsa_scsi_do_inquiry(h, scsi3addr, 0, inq_buff,
	(unsigned char) OBDR_TAPE_INQ_SIZE) != 0) {		(unsigned char) OBDR_TAPE_INQ_SIZE) != 0) {
	/* Inquiry failed (msg printed already) */
	dev_err(&h->pdev->dev,		dev_err(&h->pdev->dev,
	"hpsa_update_device_info: inquiry failed\n");		"%s: inquiry failed, device will be skipped.\n",
	rc = -EIO;		__func__);
			rc = HPSA_INQUIRY_FAILED;
	goto bail_out;		goto bail_out;
	}		}

	@@ -3885,15 +3879,19 @@ static int hpsa_update_device_info(struct ctlr_info *h,
	if ((this_device->devtype == TYPE_DISK \|\|		if ((this_device->devtype == TYPE_DISK \|\|
	this_device->devtype == TYPE_ZBC) &&		this_device->devtype == TYPE_ZBC) &&
	is_logical_dev_addr_mode(scsi3addr)) {		is_logical_dev_addr_mode(scsi3addr)) {
	int volume_offline;		unsigned char volume_offline;

	hpsa_get_raid_level(h, scsi3addr, &this_device->raid_level);		hpsa_get_raid_level(h, scsi3addr, &this_device->raid_level);
	if (h->fw_support & MISC_FW_RAID_OFFLOAD_BASIC)		if (h->fw_support & MISC_FW_RAID_OFFLOAD_BASIC)
	hpsa_get_ioaccel_status(h, scsi3addr, this_device);		hpsa_get_ioaccel_status(h, scsi3addr, this_device);
	volume_offline = hpsa_volume_offline(h, scsi3addr);		volume_offline = hpsa_volume_offline(h, scsi3addr);
	if (volume_offline < 0 \|\| volume_offline > 0xff)		if (volume_offline == HPSA_LV_FAILED) {
	volume_offline = HPSA_VPD_LV_STATUS_UNSUPPORTED;		rc = HPSA_LV_FAILED;
	this_device->volume_offline = volume_offline & 0xff;		dev_err(&h->pdev->dev,
			"%s: LV failed, device will be skipped.\n",
			__func__);
			goto bail_out;
			}
	} else {		} else {
	this_device->raid_level = RAID_UNKNOWN;		this_device->raid_level = RAID_UNKNOWN;
	this_device->offload_config = 0;		this_device->offload_config = 0;
	@@ -4379,8 +4377,7 @@ static void hpsa_update_scsi_devices(struct ctlr_info *h)
	goto out;		goto out;
	}		}
	if (rc) {		if (rc) {
	dev_warn(&h->pdev->dev,		h->drv_req_rescan = 1;
	"Inquiry failed, skipping device.\n");
	continue;		continue;
	}		}

drivers/scsi/hpsa_cmd.h

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -156,6 +156,7 @@
	#define CFGTBL_BusType_Fibre2G 0x00000200l		#define CFGTBL_BusType_Fibre2G 0x00000200l

	/* VPD Inquiry types */		/* VPD Inquiry types */
			#define HPSA_INQUIRY_FAILED 0x02
	#define HPSA_VPD_SUPPORTED_PAGES 0x00		#define HPSA_VPD_SUPPORTED_PAGES 0x00
	#define HPSA_VPD_LV_DEVICE_ID 0x83		#define HPSA_VPD_LV_DEVICE_ID 0x83
	#define HPSA_VPD_LV_DEVICE_GEOMETRY 0xC1		#define HPSA_VPD_LV_DEVICE_GEOMETRY 0xC1
	@@ -166,6 +167,7 @@
	/* Logical volume states */		/* Logical volume states */
	#define HPSA_VPD_LV_STATUS_UNSUPPORTED 0xff		#define HPSA_VPD_LV_STATUS_UNSUPPORTED 0xff
	#define HPSA_LV_OK 0x0		#define HPSA_LV_OK 0x0
			#define HPSA_LV_FAILED 0x01
	#define HPSA_LV_NOT_AVAILABLE 0x0b		#define HPSA_LV_NOT_AVAILABLE 0x0b
	#define HPSA_LV_UNDERGOING_ERASE 0x0F		#define HPSA_LV_UNDERGOING_ERASE 0x0F
	#define HPSA_LV_UNDERGOING_RPI 0x12		#define HPSA_LV_UNDERGOING_RPI 0x12