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

Commit e51c4d70 authored by Raghava Aditya Renukunta's avatar Raghava Aditya Renukunta Committed by Martin K. Petersen
Browse files

scsi: aacraid: Remove AAC_HIDE_DISK check in queue command 



Earlier driver would scan throgh all supported buses and targets and add
devices that responded. It would add devices that were _hidden_ by the fw.
Driver would invalidate commands sent to _hidden_ devices via the
AAC_HIDE_DISK check.

Since the driver now adds only the devices that are supposed to be
exposed, this code can be removed.

Signed-off-by: default avatarRaghava Aditya Renukunta <RaghavaAditya.Renukunta@microsemi.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 75be67cd

drivers/scsi/aacraid/aachba.c

+0 −10
Original line number Diff line number Diff line
@@ -1994,8 +1994,6 @@ static void aac_set_safw_attr_all_targets(struct aac_dev *dev) 
		if (bus >= AAC_MAX_BUSES || target >= AAC_MAX_TARGETS)

			continue;



		dev->hba_map[bus][target].expose = expose_flag;



		if (expose_flag != 0) {

			devtype = AAC_DEVTYPE_RAID_MEMBER;

			goto update_devtype;
@@ -2913,14 +2911,6 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd) 
			}

		} else {  /* check for physical non-dasd devices */

			bus = aac_logical_to_phys(scmd_channel(scsicmd));

			if (bus < AAC_MAX_BUSES && cid < AAC_MAX_TARGETS &&

				(dev->hba_map[bus][cid].expose

						== AAC_HIDE_DISK)){

				if (scsicmd->cmnd[0] == INQUIRY) {

					scsicmd->result = DID_NO_CONNECT << 16;

					goto scsi_done_ret;

				}

			}



			if (bus < AAC_MAX_BUSES && cid < AAC_MAX_TARGETS &&

				dev->hba_map[bus][cid].devtype

drivers/scsi/aacraid/aacraid.h

+0 −3
Original line number Diff line number Diff line
@@ -1339,8 +1339,6 @@ struct fib { 
#define AAC_DEVTYPE_RAID_MEMBER	1

#define AAC_DEVTYPE_ARC_RAW		2

#define AAC_DEVTYPE_NATIVE_RAW		3

#define AAC_EXPOSE_DISK		0

#define AAC_HIDE_DISK			3



#define AAC_SAFW_RESCAN_DELAY  10
@@ -1350,7 +1348,6 @@ struct aac_hba_map_info { 
	u8		reset_state;	/* 0 - no reset, 1..x - */

					/* after xth TM LUN reset */

	u16		qd_limit;

	u8		expose;		/*checks if to expose or not*/

	u32		scan_counter;

	struct aac_ciss_identify_pd  *safw_identify_resp;

};