d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use newly added extended LUN support in CAM.

Browse Source 
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
trasz 2014-03-25 19:05:05 +00:00
parent ea00acab00
commit 76b454e307
1 changed files with 5 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
sys/dev/iscsi/iscsi.c
View File

@ -32,6 +32,7 @@
#include <sys/param.h> #include <sys/param.h>
#include <sys/condvar.h> #include <sys/condvar.h>
#include <sys/conf.h> #include <sys/conf.h>
#include <sys/endian.h>
#include <sys/eventhandler.h> #include <sys/eventhandler.h>
#include <sys/file.h> #include <sys/file.h>
#include <sys/kernel.h> #include <sys/kernel.h>
@ -1817,40 +1818,6 @@ iscsi_ioctl(struct cdev *dev, u_long cmd, caddr_t arg, int mode,
} }
} }
static uint64_t
iscsi_encode_lun(uint32_t lun)
{
uint8_t encoded[8];
uint64_t result;
memset(encoded, 0, sizeof(encoded));
if (lun < 256) {
/*
* Peripheral device addressing.
*/
encoded[1] = lun;
} else if (lun < 16384) {
/*
* Flat space addressing.
*/
encoded[0] = 0x40;
encoded[0] |= (lun >> 8) & 0x3f;
encoded[1] = lun & 0xff;
} else {
/*
* Extended flat space addressing.
*/
encoded[0] = 0xd2;
encoded[1] = lun >> 16;
encoded[2] = lun >> 8;
encoded[3] = lun;
}
memcpy(&result, encoded, sizeof(result));
return (result);
}
static struct iscsi_outstanding * static struct iscsi_outstanding *
iscsi_outstanding_find(struct iscsi_session *is, uint32_t initiator_task_tag) iscsi_outstanding_find(struct iscsi_session *is, uint32_t initiator_task_tag)
{ {
@ -1965,7 +1932,7 @@ iscsi_action_scsiio(struct iscsi_session *is, union ccb *ccb)
break; break;
} }
bhssc->bhssc_lun = iscsi_encode_lun(csio->ccb_h.target_lun); bhssc->bhssc_lun = htobe64(CAM_EXTLUN_BYTE_SWIZZLE(ccb->ccb_h.target_lun));
bhssc->bhssc_initiator_task_tag = is->is_initiator_task_tag; bhssc->bhssc_initiator_task_tag = is->is_initiator_task_tag;
is->is_initiator_task_tag++; is->is_initiator_task_tag++;
bhssc->bhssc_expected_data_transfer_length = htonl(csio->dxfer_len); bhssc->bhssc_expected_data_transfer_length = htonl(csio->dxfer_len);
@ -2037,13 +2004,11 @@ iscsi_action(struct cam_sim *sim, union ccb *ccb)
cpi->version_num = 1; cpi->version_num = 1;
cpi->hba_inquiry = PI_TAG_ABLE; cpi->hba_inquiry = PI_TAG_ABLE;
cpi->target_sprt = 0; cpi->target_sprt = 0;
//cpi->hba_misc = PIM_NOBUSRESET; cpi->hba_misc = PIM_EXTLUNS;
cpi->hba_misc = 0;
cpi->hba_eng_cnt = 0; cpi->hba_eng_cnt = 0;
cpi->max_target = 0; cpi->max_target = 0;
cpi->max_lun = 255; cpi->max_lun = 0;
//cpi->initiator_id = 0; /* XXX */ cpi->initiator_id = ~0;
cpi->initiator_id = 64; /* XXX */
strlcpy(cpi->sim_vid, "FreeBSD", SIM_IDLEN); strlcpy(cpi->sim_vid, "FreeBSD", SIM_IDLEN);
strlcpy(cpi->hba_vid, "iSCSI", HBA_IDLEN); strlcpy(cpi->hba_vid, "iSCSI", HBA_IDLEN);
strlcpy(cpi->dev_name, cam_sim_name(sim), DEV_IDLEN); strlcpy(cpi->dev_name, cam_sim_name(sim), DEV_IDLEN);