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

Commit c795505a authored by Kevin Barnett's avatar Kevin Barnett Committed by Martin K. Petersen
Browse files

hpsa: refactor hpsa_figure_bus_target_lun 



setup for sas transport. Need to set the
bus and target accordingly.

Reviewed-by: default avatarScott Teel <scott.teel@pmcs.com>
Reviewed-by: default avatarJustin Lindley <justin.lindley@pmcs.com>
Reviewed-by: default avatarKevin Barnett <kevin.barnett@pmcs.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Signed-off-by: default avatarDon Brace <don.brace@pmcs.com>
Reviewed-by: default avatarMatthew R. Ochs <mrochs@linux.vnet.ibm.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 75d23d89

drivers/scsi/hpsa.c

+12 −13
Original line number Diff line number Diff line
@@ -3512,9 +3512,8 @@ static int is_ext_target(struct ctlr_info *h, struct hpsa_scsi_dev_t *device) 
	return 0;

}



/* Helper function to assign bus, target, lun mapping of devices.

 * Puts non-external target logical volumes on bus 0, external target logical

 * volumes on bus 1, physical devices on bus 2. and the hba on bus 3.

/*

 * Helper function to assign bus, target, lun mapping of devices.

 * Logical drive target and lun are assigned at this time, but

 * physical device lun and target assignment are deferred (assigned

 * in hpsa_find_target_lun, called by hpsa_scsi_add_entry.)
@@ -3522,28 +3521,28 @@ static int is_ext_target(struct ctlr_info *h, struct hpsa_scsi_dev_t *device) 
static void figure_bus_target_lun(struct ctlr_info *h,

	u8 *lunaddrbytes, struct hpsa_scsi_dev_t *device)

{

	u32 lunid = le32_to_cpu(*((__le32 *) lunaddrbytes));

	u32 lunid = get_unaligned_le32(lunaddrbytes);



	if (!is_logical_dev_addr_mode(lunaddrbytes)) {

		/* physical device, target and lun filled in later */

		if (is_hba_lunid(lunaddrbytes))

			hpsa_set_bus_target_lun(device, 3, 0, lunid & 0x3fff);

			hpsa_set_bus_target_lun(device,

					HPSA_HBA_BUS, 0, lunid & 0x3fff);

		else

			/* defer target, lun assignment for physical devices */

			hpsa_set_bus_target_lun(device, 2, -1, -1);

			hpsa_set_bus_target_lun(device,

					HPSA_PHYSICAL_DEVICE_BUS, -1, -1);

		return;

	}

	/* It's a logical device */

	if (is_ext_target(h, device)) {

		/* external target way, put logicals on bus 1

		 * and match target/lun numbers box

		 * reports, other smart array, bus 0, target 0, match lunid

		 */

		hpsa_set_bus_target_lun(device,

			1, (lunid >> 16) & 0x3fff, lunid & 0x00ff);

			HPSA_EXTERNAL_RAID_VOLUME_BUS, (lunid >> 16) & 0x3fff,

			lunid & 0x00ff);

		return;

	}

	hpsa_set_bus_target_lun(device, 0, 0, lunid & 0x3fff);

	hpsa_set_bus_target_lun(device, HPSA_RAID_VOLUME_BUS,

				0, lunid & 0x3fff);

}



/*

drivers/scsi/hpsa.h

+5 −0
Original line number Diff line number Diff line
@@ -367,6 +367,11 @@ struct offline_device_entry { 
#define IOACCEL2_INBOUND_POSTQ_64_LOW	0xd0

#define IOACCEL2_INBOUND_POSTQ_64_HI	0xd4



#define HPSA_PHYSICAL_DEVICE_BUS	0

#define HPSA_RAID_VOLUME_BUS		1

#define HPSA_EXTERNAL_RAID_VOLUME_BUS	2

#define HPSA_HBA_BUS			3



/*

	Send the command to the hardware

*/