mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-22 13:11:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Synchronize with Feral CVS repository:

Browse Source 
-revert the part of 1.174 that stopped complaining about not finding
 fast posting handles.
-pull REPORT LUNS (and LUN INVENTORY MAY HAVE CHANGE CA condition) from
 multi-channel branch


git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@256 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Stanislaw Gruszka
2008-02-12 08:58:04 +00:00
parent 284d07c718
commit bd61ebf496
2 changed files with 63 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
qla_isp/linux/isp_pci.c
View File

@@ -1,4 +1,4 @@
/* $Id: isp_pci.c,v 1.141 2007/11/13 20:20:04 mjacob Exp $ */
/* $Id: isp_pci.c,v 1.142 2007/11/14 18:19:36 mjacob Exp $ */
/*
* Copyright (c) 1997-2007 by Matthew Jacob
* All rights reserved.

63
qla_isp/linux/scsi_target.c
View File

@@ -1,4 +1,4 @@
/* $Id: scsi_target.c,v 1.72 2007/11/13 01:25:50 mjacob Exp $ */
/* $Id: scsi_target.c,v 1.73 2007/11/14 18:19:29 mjacob Exp $ */
/*
* Copyright (c) 1997-2007 by Matthew Jacob
* All rights reserved.
@@ -143,6 +143,9 @@
#ifndef REPORT_LUNS
#define REPORT_LUNS 0xa0
#endif
#ifndef REPORT_LUNS
#define REPORT_LUNS 0xa0
#endif
#define MODE_ALL_PAGES 0x3f
#define MODE_VU_PAGE 0x00
@@ -935,6 +938,64 @@ scsi_target_start_cmd(tmd_cmd_t *tmd, int from_intr)
goto doit;
}
if (tmd->cd_cdb[0] == REPORT_LUNS) {
struct scatterlist *dp = NULL;
if (tmd->cd_totlen != 0) {
if (from_intr) {
scsi_cmd_sched_restart(tmd, "REPORT_LUNS");
return;
}
addr = scsi_target_kzalloc(SGS_SIZE, GFP_KERNEL|GFP_ATOMIC);
if (addr == NULL) {
printk("scsi_target_alloc: out of memory for report luns\n");
tmd->cd_scsi_status = SCSI_BUSY;
xact->td_xfrlen = 0;
} else {
int i;
uint32_t lim, nluns;
uint8_t *rpa = addr;
lim = (tmd->cd_cdb[6] << 24) | (tmd->cd_cdb[7] << 16) | (tmd->cd_cdb[8] << 8) | tmd->cd_cdb[9];
spin_lock_irqsave(&scsi_target_lock, flags);
for (nluns = i = 0; i < MAX_LUN; i++) {
lun_t *lp = &bp->luns[i];
if (lp->enabled) {
uint8_t *ptr = &rpa[8 + (nluns << 3)];
if (i >= 256) {
ptr[0] = 0x40 | ((i >> 8) & 0x3f);
}
ptr[1] = i;
nluns++;
}
}
spin_unlock_irqrestore(&scsi_target_lock, flags);
/*
* Make sure we always have *one* (lun 0) enabled
*/
if (nluns == 0) {
nluns = 1;
}
rpa[0] = (nluns << 3) >> 24;
rpa[1] = (nluns << 3) >> 16;
rpa[2] = (nluns << 3) >> 8;
rpa[3] = (nluns << 3);
dp = SGS_SGP(addr);
lim = min(lim, tmd->cd_totlen);
lim = min(lim, (nluns << 3) + 8);
init_sg_elem(dp, NULL, 0, addr, lim);
xact->td_xfrlen = dp->length;
xact->td_data = dp;
xact->td_hflags |= TDFH_DATA_IN;
tmd->cd_flags |= CDF_PRIVATE_0;
}
}
xact->td_hflags |= TDFH_STSVALID;
goto doit;
}
/*
* Make sure we have a legal and open lun
*/