svn commit: r246152 - stable/9/sys/dev/ciss
Sean Bruno
sbruno at FreeBSD.org
Thu Jan 31 19:24:34 UTC 2013
Author: sbruno
Date: Thu Jan 31 19:24:33 2013
New Revision: 246152
URL: http://svnweb.freebsd.org/changeset/base/246152
Log:
MFC r245459
Satisfy the intent of kern/151564: [ciss] ciss(4) should increase
CISS_MAX_LOGICAL to 107
Submitter wanted to increase the number of logical disks supported by ciss(4)
by simply raising the CISS_MAX_LOGICAL value even higher. Instead, consult
the documentation for the raid controller (OPENCISS) and poke the controller
bits to ask it for how many logical/physical disks it can handle.
Revert svn R242089 that raised CISS_MAX_LOGICAL to 64 for all controllers.
For older controllers that don't support this mechanism, fallback to the old
value of 16 logical disks. Tested on P420, P410, P400 and 6i model ciss(4)
controllers.
This should will be MFC'd back to stable/9 stable/8 and stable/7 after the MFC
period.
Modified:
stable/9/sys/dev/ciss/ciss.c
stable/9/sys/dev/ciss/cissreg.h
stable/9/sys/dev/ciss/cissvar.h
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/dev/ (props changed)
Modified: stable/9/sys/dev/ciss/ciss.c
==============================================================================
--- stable/9/sys/dev/ciss/ciss.c Thu Jan 31 18:56:58 2013 (r246151)
+++ stable/9/sys/dev/ciss/ciss.c Thu Jan 31 19:24:33 2013 (r246152)
@@ -1202,13 +1202,21 @@ ciss_identify_adapter(struct ciss_softc
/* XXX only really required for old 5300 adapters? */
sc->ciss_flags |= CISS_FLAG_BMIC_ABORT;
+ /*
+ * Earlier controller specs do not contain these config
+ * entries, so assume that a 0 means its old and assign
+ * these values to the defaults that were established
+ * when this driver was developed for them
+ */
+ if (sc->ciss_cfg->max_logical_supported == 0)
+ sc->ciss_cfg->max_logical_supported = CISS_MAX_LOGICAL;
+ if (sc->ciss_cfg->max_physical_supported == 0)
+ sc->ciss_cfg->max_physical_supported = CISS_MAX_PHYSICAL;
/* print information */
if (bootverbose) {
-#if 0 /* XXX proxy volumes??? */
ciss_printf(sc, " %d logical drive%s configured\n",
sc->ciss_id->configured_logical_drives,
(sc->ciss_id->configured_logical_drives == 1) ? "" : "s");
-#endif
ciss_printf(sc, " firmware %4.4s\n", sc->ciss_id->running_firmware_revision);
ciss_printf(sc, " %d SCSI channels\n", sc->ciss_id->scsi_bus_count);
@@ -1231,6 +1239,9 @@ ciss_identify_adapter(struct ciss_softc
"\20\1ultra2\2ultra3\10fibre1\11fibre2\n");
ciss_printf(sc, " server name '%.16s'\n", sc->ciss_cfg->server_name);
ciss_printf(sc, " heartbeat 0x%x\n", sc->ciss_cfg->heartbeat);
+ ciss_printf(sc, " max logical logical volumes: %d\n", sc->ciss_cfg->max_logical_supported);
+ ciss_printf(sc, " max physical disks supported: %d\n", sc->ciss_cfg->max_physical_supported);
+ ciss_printf(sc, " max physical disks per logical volume: %d\n", sc->ciss_cfg->max_physical_per_logical);
}
out:
@@ -1318,7 +1329,7 @@ ciss_report_luns(struct ciss_softc *sc,
break;
case CISS_CMD_STATUS_DATA_OVERRUN:
ciss_printf(sc, "WARNING: more units than driver limit (%d)\n",
- CISS_MAX_LOGICAL);
+ sc->ciss_cfg->max_logical_supported);
break;
default:
ciss_printf(sc, "error detecting logical drive configuration (%s)\n",
@@ -1352,7 +1363,7 @@ ciss_init_logical(struct ciss_softc *sc)
debug_called(1);
cll = ciss_report_luns(sc, CISS_OPCODE_REPORT_LOGICAL_LUNS,
- CISS_MAX_LOGICAL);
+ sc->ciss_cfg->max_logical_supported);
if (cll == NULL) {
error = ENXIO;
goto out;
@@ -1360,9 +1371,9 @@ ciss_init_logical(struct ciss_softc *sc)
/* sanity-check reply */
ndrives = (ntohl(cll->list_size) / sizeof(union ciss_device_address));
- if ((ndrives < 0) || (ndrives > CISS_MAX_LOGICAL)) {
+ if ((ndrives < 0) || (ndrives > sc->ciss_cfg->max_logical_supported)) {
ciss_printf(sc, "adapter claims to report absurd number of logical drives (%d > %d)\n",
- ndrives, CISS_MAX_LOGICAL);
+ ndrives, sc->ciss_cfg->max_logical_supported);
error = ENXIO;
goto out;
}
@@ -1385,19 +1396,20 @@ ciss_init_logical(struct ciss_softc *sc)
for (i = 0; i <= sc->ciss_max_logical_bus; i++) {
sc->ciss_logical[i] =
- malloc(CISS_MAX_LOGICAL * sizeof(struct ciss_ldrive),
+ malloc(sc->ciss_cfg->max_logical_supported *
+ sizeof(struct ciss_ldrive),
CISS_MALLOC_CLASS, M_NOWAIT | M_ZERO);
if (sc->ciss_logical[i] == NULL) {
error = ENXIO;
goto out;
}
- for (j = 0; j < CISS_MAX_LOGICAL; j++)
+ for (j = 0; j < sc->ciss_cfg->max_logical_supported; j++)
sc->ciss_logical[i][j].cl_status = CISS_LD_NONEXISTENT;
}
- for (i = 0; i < CISS_MAX_LOGICAL; i++) {
+ for (i = 0; i < sc->ciss_cfg->max_logical_supported; i++) {
if (i < ndrives) {
struct ciss_ldrive *ld;
int bus, target;
@@ -1439,7 +1451,7 @@ ciss_init_physical(struct ciss_softc *sc
target = 0;
cll = ciss_report_luns(sc, CISS_OPCODE_REPORT_PHYSICAL_LUNS,
- CISS_MAX_PHYSICAL);
+ sc->ciss_cfg->max_physical_supported);
if (cll == NULL) {
error = ENXIO;
goto out;
@@ -1982,7 +1994,7 @@ ciss_free(struct ciss_softc *sc)
bus_dma_tag_destroy(sc->ciss_parent_dmat);
if (sc->ciss_logical) {
for (i = 0; i <= sc->ciss_max_logical_bus; i++) {
- for (j = 0; j < CISS_MAX_LOGICAL; j++) {
+ for (j = 0; j < sc->ciss_cfg->max_logical_supported; j++) {
if (sc->ciss_logical[i][j].cl_ldrive)
free(sc->ciss_logical[i][j].cl_ldrive, CISS_MALLOC_CLASS);
if (sc->ciss_logical[i][j].cl_lstatus)
@@ -2965,9 +2977,9 @@ ciss_cam_action(struct cam_sim *sim, uni
cpi->hba_inquiry = PI_TAG_ABLE; /* XXX is this correct? */
cpi->target_sprt = 0;
cpi->hba_misc = 0;
- cpi->max_target = CISS_MAX_LOGICAL;
+ cpi->max_target = sc->ciss_cfg->max_logical_supported;
cpi->max_lun = 0; /* 'logical drive' channel only */
- cpi->initiator_id = CISS_MAX_LOGICAL;
+ cpi->initiator_id = sc->ciss_cfg->max_logical_supported;
strncpy(cpi->sim_vid, "FreeBSD", SIM_IDLEN);
strncpy(cpi->hba_vid, "msmith at freebsd.org", HBA_IDLEN);
strncpy(cpi->dev_name, cam_sim_name(sim), DEV_IDLEN);
@@ -3878,7 +3890,7 @@ ciss_notify_rescan_logical(struct ciss_s
* drive address.
*/
cll = ciss_report_luns(sc, CISS_OPCODE_REPORT_LOGICAL_LUNS,
- CISS_MAX_LOGICAL);
+ sc->ciss_cfg->max_logical_supported);
if (cll == NULL)
return;
@@ -3889,7 +3901,7 @@ ciss_notify_rescan_logical(struct ciss_s
* firmware.
*/
for (i = 0; i < sc->ciss_max_logical_bus; i++) {
- for (j = 0; j < CISS_MAX_LOGICAL; j++) {
+ for (j = 0; j < sc->ciss_cfg->max_logical_supported; j++) {
ld = &sc->ciss_logical[i][j];
if (ld->cl_update == 0)
@@ -4058,7 +4070,7 @@ ciss_notify_hotplug(struct ciss_softc *s
* Rescan the physical lun list for new items
*/
cll = ciss_report_luns(sc, CISS_OPCODE_REPORT_PHYSICAL_LUNS,
- CISS_MAX_PHYSICAL);
+ sc->ciss_cfg->max_physical_supported);
if (cll == NULL) {
ciss_printf(sc, "Warning, cannot get physical lun list\n");
break;
@@ -4306,7 +4318,7 @@ ciss_print_adapter(struct ciss_softc *sc
"\20\1notify_ok\2control_open\3aborting\4running\21fake_synch\22bmic_abort\n");
for (i = 0; i < sc->ciss_max_logical_bus; i++) {
- for (j = 0; j < CISS_MAX_LOGICAL; j++) {
+ for (j = 0; j < sc->ciss_cfg->max_logical_supported; j++) {
ciss_printf(sc, "LOGICAL DRIVE %d: ", i);
ciss_print_ldrive(sc, &sc->ciss_logical[i][j]);
}
Modified: stable/9/sys/dev/ciss/cissreg.h
==============================================================================
--- stable/9/sys/dev/ciss/cissreg.h Thu Jan 31 18:56:58 2013 (r246151)
+++ stable/9/sys/dev/ciss/cissreg.h Thu Jan 31 19:24:33 2013 (r246152)
@@ -425,6 +425,15 @@ struct ciss_config_table
#define CISS_DRIVER_DAUGHTER_ATTACHED (1<<8)
#define CISS_DRIVER_SCSI_PREFETCH (1<<9)
u_int32_t max_sg_length; /* 31 in older firmware */
+/*
+ * these fields appear in OpenCISS Spec 1.06
+ * http://cciss.sourceforge.net/#docs
+ */
+ u_int32_t max_logical_supported;
+ u_int32_t max_physical_supported;
+ u_int32_t max_physical_per_logical;
+ u_int32_t max_perfomant_mode_cmds;
+ u_int32_t max_block_fetch_count;
} __packed;
/*
Modified: stable/9/sys/dev/ciss/cissvar.h
==============================================================================
--- stable/9/sys/dev/ciss/cissvar.h Thu Jan 31 18:56:58 2013 (r246151)
+++ stable/9/sys/dev/ciss/cissvar.h Thu Jan 31 19:24:33 2013 (r246152)
@@ -45,8 +45,11 @@ typedef STAILQ_HEAD(, ciss_request) cr_q
/*
* Maximum number of logical drives we support.
+ * If the controller does not indicate a maximum
+ * value. This is a compatibiliy value to support
+ * older ciss controllers (e.g. model 6i)
*/
-#define CISS_MAX_LOGICAL 63
+#define CISS_MAX_LOGICAL 16
/*
* Maximum number of physical devices we support.
More information about the svn-src-stable-9
mailing list