mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-07-20 06:52:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Synchronize with Feral CVS repository:

Browse Source 
- Copyright Update
- Fix some fabric login bugs


git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@305 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Stanislaw Gruszka
2008-03-28 12:23:27 +00:00
parent 240d5511be
commit dc05d8b731
22 changed files with 60 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qla_isp/LICENSE
+2 -2
View File
@@ -1,4 +1,4 @@
Copyright (c) 1997-2007 by Matthew Jacob
Copyright (c) 1997-2008 by Matthew Jacob
All rights reserved.
Redistribution and use in source and binary forms, with or without
@@ -50,4 +50,4 @@ USA
gplbsd at feral com
$Id: LICENSE,v 1.9 2007/07/07 23:20:56 mjacob Exp $
$Id: LICENSE,v 1.10 2008/02/11 23:59:06 mjacob Exp $
qla_isp/common/isp.c
+5 -4
View File
@@ -1,6 +1,6 @@
/* $Id: isp.c,v 1.195 2008/01/25 22:20:15 mjacob Exp $ */
/* $Id: isp.c,v 1.197 2008/02/11 23:59:06 mjacob Exp $ */
/*-
* Copyright (c) 1997-2007 by Matthew Jacob
* Copyright (c) 1997-2008 by Matthew Jacob
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -2318,7 +2318,7 @@ isp_plogx(ispsoftc_t *isp, int chan, uint16_t handle, uint32_t portid,
SNPRINTF(buf, sizeof (buf),
"already logged in with N-Port handle 0x%x", parm1);
msg = buf;
rval = MBOX_PORT_ID_USED | (handle << 16);
rval = MBOX_PORT_ID_USED | (parm1 << 16);
break;
case PLOGX_IOCBERR_HNDLUSED:
lev = ISP_LOGSANCFG|ISP_LOGDEBUG0;
@@ -2437,7 +2437,7 @@ isp_getpdb(ispsoftc_t *isp, int chan, uint16_t id, isp_pdb_t *pdb, int dolock)
MEMZERO(&mbs, sizeof (mbs));
mbs.param[0] = MBOX_GET_PORT_DB;
if (IS_24XX(isp)) {
mbs.ibits = (1 << 9);
mbs.ibits = (1 << 9)|(1 << 10);
mbs.param[1] = id;
mbs.param[9] = chan;
} else if (ISP_CAP_2KLOGIN(isp)) {
@@ -6691,6 +6691,7 @@ isp_parse_status_24xx(ispsoftc_t *isp, isp24xx_statusreq_t *sp,
isp_prt(isp, ISP_LOGINFO, "Chan %d port %s for target %d",
chan, reason, XS_TGT(xs));
/*
* There is no MBOX_INIT_LIP for the 24XX.
*/
qla_isp/common/isp_library.c
+2 -2
View File
@@ -1,6 +1,6 @@
/* $Id: isp_library.c,v 1.49 2008/01/04 16:48:57 mjacob Exp $ */
/* $Id: isp_library.c,v 1.50 2008/02/11 23:59:06 mjacob Exp $ */
/*-
* Copyright (c) 1997-2007 by Matthew Jacob
* Copyright (c) 1997-2008 by Matthew Jacob
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
qla_isp/common/isp_library.h
+2 -2
View File
@@ -1,6 +1,6 @@
/* $Id: isp_library.h,v 1.27 2008/01/04 16:48:57 mjacob Exp $ */
/* $Id: isp_library.h,v 1.28 2008/02/11 23:59:06 mjacob Exp $ */
/*-
* Copyright (c) 1997-2007 by Matthew Jacob
* Copyright (c) 1997-2008 by Matthew Jacob
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
qla_isp/common/isp_stds.h
+2 -2
View File
@@ -1,6 +1,6 @@
/* $Id: isp_stds.h,v 1.13 2007/12/02 22:02:04 mjacob Exp $ */
/* $Id: isp_stds.h,v 1.14 2008/02/11 23:59:06 mjacob Exp $ */
/*-
* Copyright (c) 1997-2007 by Matthew Jacob
* Copyright (c) 1997-2008 by Matthew Jacob
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
qla_isp/common/isp_target.c
+2 -2
View File
@@ -1,6 +1,6 @@
/* $Id: isp_target.c,v 1.74 2008/01/04 16:47:18 mjacob Exp $ */
/* $Id: isp_target.c,v 1.75 2008/02/11 23:59:06 mjacob Exp $ */
/*-
* Copyright (c) 1997-2007 by Matthew Jacob
* Copyright (c) 1997-2008 by Matthew Jacob
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
qla_isp/common/isp_target.h
+2 -2
View File
@@ -1,6 +1,6 @@
/* $Id: isp_target.h,v 1.59 2008/01/04 16:47:18 mjacob Exp $ */
/* $Id: isp_target.h,v 1.60 2008/02/11 23:59:06 mjacob Exp $ */
/*-
* Copyright (c) 1997-2007 by Matthew Jacob
* Copyright (c) 1997-2008 by Matthew Jacob
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
qla_isp/common/isp_tpublic.h
+2 -2
View File
@@ -1,6 +1,6 @@
/* $Id: isp_tpublic.h,v 1.40 2007/12/20 18:27:06 mjacob Exp $ */
/* $Id: isp_tpublic.h,v 1.41 2008/02/11 23:59:06 mjacob Exp $ */
/*-
* Copyright (c) 1997-2007 by Matthew Jacob
* Copyright (c) 1997-2008 by Matthew Jacob
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
qla_isp/common/ispmbox.h
+2 -2
View File
@@ -1,6 +1,6 @@
/* $Id: ispmbox.h,v 1.70 2008/01/07 19:07:07 mjacob Exp $ */
/* $Id: ispmbox.h,v 1.71 2008/02/11 23:59:06 mjacob Exp $ */
/*-
* Copyright (c) 1997-2007 by Matthew Jacob
* Copyright (c) 1997-2008 by Matthew Jacob
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
qla_isp/common/ispreg.h
+2 -2
View File
@@ -1,6 +1,6 @@
/* $Id: ispreg.h,v 1.27 2007/12/02 22:02:04 mjacob Exp $ */
/* $Id: ispreg.h,v 1.28 2008/02/11 23:59:06 mjacob Exp $ */
/*-
* Copyright (c) 1997-2007 by Matthew Jacob
* Copyright (c) 1997-2008 by Matthew Jacob
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
qla_isp/common/ispvar.h
+2 -2
View File
@@ -1,6 +1,6 @@
/* $Id: ispvar.h,v 1.91 2008/01/08 20:40:22 mjacob Exp $ */
/* $Id: ispvar.h,v 1.92 2008/02/11 23:59:06 mjacob Exp $ */
/*-
* Copyright (c) 1997-2007 by Matthew Jacob
* Copyright (c) 1997-2008 by Matthew Jacob
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
qla_isp/doc/DriverManual.txt
+2 -2
View File
@@ -1,5 +1,5 @@
$Id: DriverManual.txt,v 1.6 2006/02/17 22:53:44 mjacob Exp $
Copyright (c) 1997-2004 by Matthew Jacob
$Id: DriverManual.txt,v 1.7 2008/02/11 23:59:06 mjacob Exp $
Copyright (c) 1997-2008 by Matthew Jacob
All rights reserved.
Driver Theory of Operation Manual
qla_isp/doc/Hardware.txt
+2 -2
View File
@@ -1,5 +1,5 @@
$Id: Hardware.txt,v 1.6 2006/02/17 22:53:44 mjacob Exp $
Copyright (c) 1997-2004 by Matthew Jacob
$Id: Hardware.txt,v 1.7 2008/02/11 23:59:06 mjacob Exp $
Copyright (c) 1997-2008 by Matthew Jacob
All rights reserved.
Hardware that is Known To or Should Work with This Driver
qla_isp/linux-2.6/Makefile
+2 -2
View File
@@ -1,8 +1,8 @@
# $Id: Makefile,v 1.9 2007/12/11 22:19:39 mjacob Exp $
# $Id: Makefile,v 1.10 2008/02/11 23:59:06 mjacob Exp $
#
# Makefile
#
# Copyright (c) 2006-2007 by Matthew Jacob
# Copyright (c) 2006-2008 by Matthew Jacob
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of The Version 2 GNU General Public License as published
qla_isp/linux/isp_cb_ops.c
+2 -2
View File
@@ -1,6 +1,6 @@
/* $Id: isp_cb_ops.c,v 1.85 2008/01/14 18:39:10 mjacob Exp $ */
/* $Id: isp_cb_ops.c,v 1.86 2008/02/11 23:59:06 mjacob Exp $ */
/*
* Copyright (c) 1997-2007 by Matthew Jacob
* Copyright (c) 1997-2008 by Matthew Jacob
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
qla_isp/linux/isp_ioctl.h
+2 -2
View File
@@ -1,6 +1,6 @@
/* $Id: isp_ioctl.h,v 1.27 2008/01/08 18:31:21 mjacob Exp $ */
/* $Id: isp_ioctl.h,v 1.28 2008/02/11 23:59:06 mjacob Exp $ */
/*
* Copyright (c) 1997-2007 by Matthew Jacob
* Copyright (c) 1997-2008 by Matthew Jacob
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
qla_isp/linux/isp_linux.c
+2 -3
View File
@@ -1,6 +1,6 @@
/* $Id: isp_linux.c,v 1.224 2008/01/25 22:22:47 mjacob Exp $ */
/* $Id: isp_linux.c,v 1.226 2008/02/12 00:40:51 mjacob Exp $ */
/*
* Copyright (c) 1997-2007 by Matthew Jacob
* Copyright (c) 1997-2008 by Matthew Jacob
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -1498,7 +1498,6 @@ isp_target_start_ctio(ispsoftc_t *isp, tmd_xact_t *xact)
*/
if (tmd->cd_lflags & CDFL_ABORTED) {
isp_prt(isp, ISP_LOGINFO, "[%llx] already ABORTED- not sending a CTIO", tmd->cd_tagval);
dump_stack();
xact->td_error = -ENXIO;
goto out;
}
qla_isp/linux/isp_linux.h
+2 -2
View File
@@ -1,6 +1,6 @@
/* $Id: isp_linux.h,v 1.153 2008/01/25 22:22:47 mjacob Exp $ */
/* $Id: isp_linux.h,v 1.154 2008/02/11 23:59:06 mjacob Exp $ */
/*
* Copyright (c) 1997-2007 by Matthew Jacob
* Copyright (c) 1997-2008 by Matthew Jacob
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
qla_isp/linux/isp_pci.c
+15 -8
View File
@@ -1,6 +1,6 @@
/* $Id: isp_pci.c,v 1.159 2008/01/27 01:10:42 mjacob Exp $ */
/* $Id: isp_pci.c,v 1.161 2008/02/12 00:40:51 mjacob Exp $ */
/*
* Copyright (c) 1997-2007 by Matthew Jacob
* Copyright (c) 1997-2008 by Matthew Jacob
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -74,7 +74,7 @@ static void isp_pci_wr_reg_1080(ispsoftc_t *, int, uint32_t);
defined(ISP_DISABLE_2100_SUPPORT) && defined(ISP_DISABLE_2200_SUPPORT))
static int isp_pci_rd_isr(ispsoftc_t *, uint32_t *, uint16_t *, uint16_t *);
#endif
#ifndef ISP_DISABLE_2300_SUPPORT
#if !(defined(ISP_DISABLE_2300_SUPPORT) && defined(ISP_DISABLE_2322_SUPPORT))
static int isp_pci_rd_isr_2300(ispsoftc_t *, uint32_t *, uint16_t *, uint16_t *);
#endif
#ifndef ISP_DISABLE_2400_SUPPORT
@@ -122,7 +122,8 @@ static int isplinux_pci_exclude(struct pci_dev *);
#define ISP_2322_RISC_CODE NULL
#define ISP_2400_RISC_CODE NULL
#if !(defined(CONFIG_FW_LOADER) || defined(CONFIG_FW_LOADER_MODULE))
#define DISABLE_FW_LOADER 1
#if defined(DISABLE_FW_LOADER) || !(defined(CONFIG_FW_LOADER) || defined(CONFIG_FW_LOADER_MODULE))
#ifndef ISP_DISABLE_1020_SUPPORT
#include "asm_1040.h"
#endif
@@ -141,7 +142,7 @@ static int isplinux_pci_exclude(struct pci_dev *);
#ifndef ISP_DISABLE_2300_SUPPORT
#include "asm_2300.h"
#endif
#ifndef ISP_DISABLE_2300_SUPPORT
#ifndef ISP_DISABLE_2322_SUPPORT
#include "asm_2322.h"
#endif
#ifndef ISP_DISABLE_2400_SUPPORT
@@ -240,6 +241,8 @@ static struct ispmdvec mdvec_2300 = {
isp_pci_dumpregs,
ISP_2300_RISC_CODE
};
#endif
#ifndef ISP_DISABLE_2322_SUPPORT
static struct ispmdvec mdvec_2322 = {
isp_pci_rd_isr_2300,
isp_pci_rd_reg,
@@ -787,6 +790,8 @@ isplinux_pci_init_one(struct Scsi_Host *host)
if (isp->isp_mdvec->dv_ispfw == NULL)
fwname = "ql2300_fw.bin";
}
#endif
#ifndef ISP_DISABLE_2322_SUPPORT
if (pdev->device == PCI_DEVICE_ID_QLOGIC_ISP2322) {
isp->isp_mdvec = &mdvec_2322;
isp->isp_type = ISP_HA_FC_2322;
@@ -1050,7 +1055,7 @@ isp_pci_rd_isr(ispsoftc_t *isp, uint32_t *isrp, uint16_t *semap, uint16_t *mbp)
}
#endif
#if !(defined(ISP_DISABLE_2300_SUPPORT) && defined(ISP_DISABLE_2400_SUPPORT))
#if !(defined(ISP_DISABLE_2300_SUPPORT) && defined(ISP_DISASBLE_2322_SUPPORT) && defined(ISP_DISABLE_2400_SUPPORT))
static __inline uint32_t
ispregrd32(struct isp_pcisoftc *pcs, vm_offset_t offset)
{
@@ -1066,7 +1071,7 @@ ispregrd32(struct isp_pcisoftc *pcs, vm_offset_t offset)
}
#endif
#ifndef ISP_DISABLE_2300_SUPPORT
#if !(defined(ISP_DISABLE_2300_SUPPORT) && defined(ISP_DISABLE_2322_SUPPORT))
static int
isp_pci_rd_isr_2300(ispsoftc_t *isp, uint32_t *isrp, uint16_t *semap, uint16_t *mbox0p)
{
@@ -3314,8 +3319,10 @@ static struct pci_device_id isp_pci_tbl[] __devinitdata = {
#ifndef ISP_DISABLE_2300_SUPPORT
{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2300) },
{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2312) },
{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2322) },
#endif
#ifndef ISP_DISABLE_2322_SUPPORT
{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP6312) },
{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2322) },
{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP6322) },
#endif
#ifndef ISP_DISABLE_2400_SUPPORT
qla_isp/linux/scsi_target.c
+2 -2
View File
@@ -1,6 +1,6 @@
/* $Id: scsi_target.c,v 1.80 2008/01/18 20:18:02 mjacob Exp $ */
/* $Id: scsi_target.c,v 1.81 2008/02/11 23:59:06 mjacob Exp $ */
/*
* Copyright (c) 1997-2007 by Matthew Jacob
* Copyright (c) 1997-2008 by Matthew Jacob
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
qla_isp/linux/scsi_target.h
+2 -2
View File
@@ -1,6 +1,6 @@
/* $Id: scsi_target.h,v 1.29 2007/12/11 22:16:09 mjacob Exp $ */
/* $Id: scsi_target.h,v 1.30 2008/02/11 23:59:06 mjacob Exp $ */
/*
* Copyright (c) 1997-2007 by Matthew Jacob
* Copyright (c) 1997-2008 by Matthew Jacob
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
qla_isp/linux/scsi_target_ctl.c
+2 -2
View File
@@ -1,6 +1,6 @@
/* $Id: scsi_target_ctl.c,v 1.21 2007/12/11 22:16:55 mjacob Exp $ */
/* $Id: scsi_target_ctl.c,v 1.22 2008/02/11 23:59:06 mjacob Exp $ */
/*
* Copyright (c) 1997-2007 by Matthew Jacob
* Copyright (c) 1997-2008 by Matthew Jacob
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without