svn commit: r347894 - stable/11/sys/dev/isp
Kenneth D. Merry
ken at FreeBSD.org
Thu May 16 22:03:27 UTC 2019
Author: ken
Date: Thu May 16 22:03:25 2019
New Revision: 347894
URL: https://svnweb.freebsd.org/changeset/base/347894
Log:
MFC r345008:
------------------------------------------------------------------------
r345008 | ken | 2019-03-11 10:21:14 -0400 (Mon, 11 Mar 2019) | 59 lines
Fix CRN resets in the isp(4) driver in certain situations.
The Command Reference Number (CRN) is part of the FC-Tape features
that we enable when talking to tape drives. It starts at 1, and
goes to 255 and wraps around to 1. There are a number of reset
type conditions that result in the CRN getting reset to 1. These
are detailed in section 4.10 (table 8) of the FCP-4r02b specification.
One of the conditions is when a PRLI (Process Login) is sent by
the initiator, and the Establish Image Pair bit is set in Word 0
of the PRLI.
Previously, the isp(4) driver core sent a notification via
isp_async() that the target had changed or stayed in place, but
there was no indication of whether a PRLI was sent and whether the
Establish Image Pair bit was set.
The result of this was that in some situations, notably
switching back and forth between a direct connection and a switch
connection to a tape drive, the isp(4) driver would fail to reset
the CRN in situations that require it according to the spec. When
the CRN isn't reset in a situation that requires it, the tape drive
then rejects every subsequent command that is sent to the drive.
It is assuming that the commands are being sent out of order.
So, modify the isp(4) driver to include Word 0 of the PRLI command
when it sends isp_async() notifications of target changes. Look at
the Establish Image Pair bit, and reset the CRN if that bit is set.
With this change, I am able to switch a tape drive back and forth
between a direct connection and a switch connection, and the isp(4)
driver resets the CRN when it should.
sys/dev/isp_stds.h:
Add bit definitions for PRLI Word 0.
sys/dev/ispmbox.h:
Add PRLI Word 0 to the port database type, isp_pdb_t.
sys/dev/ispvar.h
Add PRLI Word 0 to fcportdb_t.
sys/dev/isp.c:
Populate the new prli_word0 parameter in the port database.
In isp_pdb_add_update(), add a check to see if the
Establish Image Pair bit is set in PRLI Word 0. If it is,
then that is an additional reason to create a change
notification.
sys/dev/isp_freebsd.c:
In isp_async(), if the device changed or stayed, look at
PRLI Word 0 to see if the Establish Image Pair bit is set.
If it is, reset the CRN if we haven't already.
Sponsored by: Spectra Logic
Differential Revision: https://reviews.freebsd.org/D19472
------------------------------------------------------------------------
Modified:
stable/11/sys/dev/isp/isp.c
stable/11/sys/dev/isp/isp_freebsd.c
stable/11/sys/dev/isp/isp_stds.h
stable/11/sys/dev/isp/ispmbox.h
stable/11/sys/dev/isp/ispvar.h
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/dev/isp/isp.c
==============================================================================
--- stable/11/sys/dev/isp/isp.c Thu May 16 21:50:12 2019 (r347893)
+++ stable/11/sys/dev/isp/isp.c Thu May 16 22:03:25 2019 (r347894)
@@ -2789,6 +2789,7 @@ isp_getpdb(ispsoftc_t *isp, int chan, uint16_t id, isp
if (IS_24XX(isp)) {
isp_get_pdb_24xx(isp, isp->isp_iocb, &un.bill);
pdb->handle = un.bill.pdb_handle;
+ pdb->prli_word0 = un.bill.pdb_prli_svc0;
pdb->prli_word3 = un.bill.pdb_prli_svc3;
pdb->portid = BITS2WORD_24XX(un.bill.pdb_portid_bits);
ISP_MEMCPY(pdb->portname, un.bill.pdb_portname, 8);
@@ -2805,6 +2806,7 @@ isp_getpdb(ispsoftc_t *isp, int chan, uint16_t id, isp
} else {
isp_get_pdb_21xx(isp, isp->isp_iocb, &un.fred);
pdb->handle = un.fred.pdb_loopid;
+ pdb->prli_word0 = un.fred.pdb_prli_svc0;
pdb->prli_word3 = un.fred.pdb_prli_svc3;
pdb->portid = BITS2WORD(un.fred.pdb_portid_bits);
ISP_MEMCPY(pdb->portname, un.fred.pdb_portname, 8);
@@ -3194,6 +3196,7 @@ isp_pdb_sync(ispsoftc_t *isp, int chan)
lp->state = FC_PORTDB_STATE_VALID;
isp_async(isp, ISPASYNC_DEV_CHANGED, chan, lp);
lp->portid = lp->new_portid;
+ lp->prli_word0 = lp->new_prli_word0;
lp->prli_word3 = lp->new_prli_word3;
break;
case FC_PORTDB_STATE_VALID:
@@ -3245,7 +3248,8 @@ isp_pdb_add_update(ispsoftc_t *isp, int chan, isp_pdb_
/* Old device, nothing new. */
if (lp->portid == pdb->portid &&
lp->handle == pdb->handle &&
- lp->prli_word3 == pdb->prli_word3) {
+ lp->prli_word3 == pdb->prli_word3 &&
+ ((pdb->prli_word0 & PRLI_WD0_EST_IMAGE_PAIR) == 0)) {
if (lp->state != FC_PORTDB_STATE_NEW)
lp->state = FC_PORTDB_STATE_VALID;
isp_prt(isp, ISP_LOG_SANCFG,
@@ -3258,6 +3262,7 @@ isp_pdb_add_update(ispsoftc_t *isp, int chan, isp_pdb_
lp->state = FC_PORTDB_STATE_CHANGED;
lp->handle = pdb->handle;
lp->new_portid = pdb->portid;
+ lp->new_prli_word0 = pdb->prli_word0;
lp->new_prli_word3 = pdb->prli_word3;
isp_prt(isp, ISP_LOG_SANCFG,
"Chan %d Port 0x%06x at 0x%04x is changed",
Modified: stable/11/sys/dev/isp/isp_freebsd.c
==============================================================================
--- stable/11/sys/dev/isp/isp_freebsd.c Thu May 16 21:50:12 2019 (r347893)
+++ stable/11/sys/dev/isp/isp_freebsd.c Thu May 16 22:03:25 2019 (r347894)
@@ -3740,6 +3740,10 @@ isp_async(ispsoftc_t *isp, ispasync_t cmd, ...)
break;
case ISPASYNC_DEV_CHANGED:
case ISPASYNC_DEV_STAYED:
+ {
+ int crn_reset_done;
+
+ crn_reset_done = 0;
va_start(ap, cmd);
bus = va_arg(ap, int);
lp = va_arg(ap, fcportdb_t *);
@@ -3757,13 +3761,17 @@ isp_async(ispsoftc_t *isp, ispasync_t cmd, ...)
(lp->new_prli_word3 & PRLI_WD3_TARGET_FUNCTION))) {
lp->is_target = !lp->is_target;
if (lp->is_target) {
- if (cmd == ISPASYNC_DEV_CHANGED)
+ if (cmd == ISPASYNC_DEV_CHANGED) {
isp_fcp_reset_crn(isp, bus, tgt, /*tgt_set*/ 1);
+ crn_reset_done = 1;
+ }
isp_make_here(isp, lp, bus, tgt);
} else {
isp_make_gone(isp, lp, bus, tgt);
- if (cmd == ISPASYNC_DEV_CHANGED)
+ if (cmd == ISPASYNC_DEV_CHANGED) {
isp_fcp_reset_crn(isp, bus, tgt, /*tgt_set*/ 1);
+ crn_reset_done = 1;
+ }
}
}
if (lp->is_initiator !=
@@ -3778,7 +3786,13 @@ isp_async(ispsoftc_t *isp, ispasync_t cmd, ...)
adc->arrived = lp->is_initiator;
xpt_async(AC_CONTRACT, fc->path, &ac);
}
+
+ if ((lp->new_prli_word0 & PRLI_WD0_EST_IMAGE_PAIR) &&
+ (crn_reset_done == 0))
+ isp_fcp_reset_crn(isp, bus, tgt, /*tgt_set*/ 1);
+
break;
+ }
case ISPASYNC_DEV_GONE:
va_start(ap, cmd);
bus = va_arg(ap, int);
Modified: stable/11/sys/dev/isp/isp_stds.h
==============================================================================
--- stable/11/sys/dev/isp/isp_stds.h Thu May 16 21:50:12 2019 (r347893)
+++ stable/11/sys/dev/isp/isp_stds.h Thu May 16 22:03:25 2019 (r347894)
@@ -282,6 +282,14 @@ typedef struct {
#define RNC 0x53
/*
+ * PRLI Word 0 definitions
+ * FPC4-r02b January, 2011
+ */
+#define PRLI_WD0_TYPE_MASK 0xff000000
+#define PRLI_WD0_TC_EXT_MASK 0x00ff0000
+#define PRLI_WD0_EST_IMAGE_PAIR (1 << 13)
+
+/*
* PRLI Word 3 definitions
* FPC4-r02b January, 2011
*/
Modified: stable/11/sys/dev/isp/ispmbox.h
==============================================================================
--- stable/11/sys/dev/isp/ispmbox.h Thu May 16 21:50:12 2019 (r347893)
+++ stable/11/sys/dev/isp/ispmbox.h Thu May 16 22:03:25 2019 (r347894)
@@ -1382,6 +1382,7 @@ typedef struct {
*/
typedef struct {
uint16_t handle;
+ uint16_t prli_word0;
uint16_t prli_word3;
uint32_t : 8,
portid : 24;
Modified: stable/11/sys/dev/isp/ispvar.h
==============================================================================
--- stable/11/sys/dev/isp/ispvar.h Thu May 16 21:50:12 2019 (r347893)
+++ stable/11/sys/dev/isp/ispvar.h Thu May 16 22:03:25 2019 (r347894)
@@ -379,6 +379,9 @@ typedef struct {
uint16_t handle;
/*
+ * PRLI word 0 contains the Establish Image Pair bit, which is
+ * important for knowing when to reset the CRN.
+ *
* PRLI word 3 parameters contains role as well as other things.
*
* The state is the current state of this entry.
@@ -390,7 +393,9 @@ typedef struct {
* Portid is obvious, as are node && port WWNs. The new_role and
* new_portid is for when we are pending a change.
*/
+ uint16_t prli_word0; /* PRLI parameters */
uint16_t prli_word3; /* PRLI parameters */
+ uint16_t new_prli_word0; /* Incoming new PRLI parameters */
uint16_t new_prli_word3; /* Incoming new PRLI parameters */
uint16_t : 12,
probational : 1,
More information about the svn-src-all
mailing list