Author: ken
Date: Mon Feb 28 16:39:15 2011
New Revision: 219099
URL: http://svn.freebsd.org/changeset/base/219099
Log:
MFC: r219036
Silence 'out of chain frames' warnings and bump the number of frames.
mps.c: Hide the 'out of chain frames' warning behind MPS_INFO.
mps_sas.c: Hide the SIM queue freeze/unfreeze messages behind MPS_INFO.
mpsvar.h: Bump the number of chain frames from 1024 to 2048. From
testing, it looks like this makes it less likely that we'll
run out of chain frames, and it doesn't cost much memory
(32K).
Modified:
stable/8/sys/dev/mps/mps.c
stable/8/sys/dev/mps/mps_sas.c
stable/8/sys/dev/mps/mpsvar.h
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
Modified: stable/8/sys/dev/mps/mps.c
==============================================================================
--- stable/8/sys/dev/mps/mps.c Mon Feb 28 15:58:30 2011 (r219098)
+++ stable/8/sys/dev/mps/mps.c Mon Feb 28 16:39:15 2011 (r219099)
@@ -1705,7 +1705,7 @@ mps_data_cb(void *arg, bus_dma_segment_t
sflags, nsegs - i);
if (error != 0) {
/* Resource shortage, roll back! */
- mps_printf(sc, "out of chain frames\n");
+ mps_dprint(sc, MPS_INFO, "out of chain frames\n");
cm->cm_flags |= MPS_CM_FLAGS_CHAIN_FAILED;
mps_complete_command(cm);
return;
Modified: stable/8/sys/dev/mps/mps_sas.c
==============================================================================
--- stable/8/sys/dev/mps/mps_sas.c Mon Feb 28 15:58:30 2011
(r219098)
+++ stable/8/sys/dev/mps/mps_sas.c Mon Feb 28 16:39:15 2011
(r219099)
@@ -1542,8 +1542,8 @@ mpssas_scsiio_complete(struct mps_softc
if ((sassc->flags & MPSSAS_QUEUE_FROZEN) == 0) {
xpt_freeze_simq(sassc->sim, 1);
sassc->flags |= MPSSAS_QUEUE_FROZEN;
- mps_printf(sc, "Error sending command, freezing "
- "SIM queue\n");
+ mps_dprint(sc, MPS_INFO, "Error sending command, "
+ "freezing SIM queue\n");
}
}
@@ -1556,7 +1556,8 @@ mpssas_scsiio_complete(struct mps_softc
if (sassc->flags & MPSSAS_QUEUE_FROZEN) {
ccb->ccb_h.status |= CAM_RELEASE_SIMQ;
sassc->flags &= ~MPSSAS_QUEUE_FROZEN;
- mps_printf(sc, "Unfreezing SIM queue\n");
+ mps_dprint(sc, MPS_INFO,
+ "Unfreezing SIM queue\n");
}
} else {
ccb->ccb_h.status |= CAM_DEV_QFRZN;
Modified: stable/8/sys/dev/mps/mpsvar.h
==============================================================================
--- stable/8/sys/dev/mps/mpsvar.h Mon Feb 28 15:58:30 2011
(r219098)
+++ stable/8/sys/dev/mps/mpsvar.h Mon Feb 28 16:39:15 2011
(r219099)
@@ -34,7 +34,7 @@
#define MPS_REQ_FRAMES 1024
#define MPS_EVT_REPLY_FRAMES 32
#define MPS_REPLY_FRAMES MPS_REQ_FRAMES
-#define MPS_CHAIN_FRAMES 1024
+#define MPS_CHAIN_FRAMES 2048
#define MPS_SENSE_LEN SSD_FULL_SIZE
#define MPS_MSI_COUNT 1
#define MPS_SGE64_SIZE 12
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
