d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a massive couple of botches here: the NVRAM settings

Browse Source 
read wasn't flagging the SYNC mode was enabled. The temp
values for offset and sync period were uint8_t, but were
being assigned and shifted from a uint32_t value.

This didn't show up in testing because a random number
of 1030 cards set a bit that says "honor BIOS negotiation",
which means this whole code path was skipped.

This should clear up at least some of the negotation
issues that have been seen.
This commit is contained in:
Matt Jacob 2006-12-03 07:59:12 +00:00
parent b61386a482
commit c5da377e0e
1 changed files with 15 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
sys/dev/mpt/mpt_cam.c
View File

@ -660,7 +660,7 @@ mpt_read_config_info_spi(struct mpt_softc *mpt)
if (rv) { if (rv) {
mpt_prt(mpt, "failed to read SPI Port Page 0\n"); mpt_prt(mpt, "failed to read SPI Port Page 0\n");
} else { } else {
mpt_lprt(mpt, MPT_PRT_DEBUG, mpt_lprt(mpt, MPT_PRT_NEGOTIATION,
"SPI Port Page 0: Capabilities %x PhysicalInterface %x\n", "SPI Port Page 0: Capabilities %x PhysicalInterface %x\n",
mpt->mpt_port_page0.Capabilities, mpt->mpt_port_page0.Capabilities,
mpt->mpt_port_page0.PhysicalInterface); mpt->mpt_port_page0.PhysicalInterface);
@ -3290,7 +3290,7 @@ mpt_get_spi_settings(struct mpt_softc *mpt, struct ccb_trans_settings *cts)
struct ccb_trans_settings_scsi *scsi = &cts->proto_specific.scsi; struct ccb_trans_settings_scsi *scsi = &cts->proto_specific.scsi;
struct ccb_trans_settings_spi *spi = &cts->xport_specific.spi; struct ccb_trans_settings_spi *spi = &cts->xport_specific.spi;
target_id_t tgt; target_id_t tgt;
uint8_t dval, pval, oval; uint32_t dval, pval, oval;
int rv; int rv;
cts->protocol = PROTO_SCSI; cts->protocol = PROTO_SCSI;
@ -3348,7 +3348,7 @@ mpt_get_spi_settings(struct mpt_softc *mpt, struct ccb_trans_settings *cts)
pval >>= MPI_SCSIDEVPAGE0_NP_SHIFT_SYNC_PERIOD; pval >>= MPI_SCSIDEVPAGE0_NP_SHIFT_SYNC_PERIOD;
mpt->mpt_dev_page0[tgt] = tmp; mpt->mpt_dev_page0[tgt] = tmp;
} else { } else {
dval = DP_WIDE|DP_DISC_ENABLE|DP_TQING_ENABLE; dval = DP_WIDE|DP_DISC_ENABLE|DP_TQING_ENABLE|DP_SYNC;
oval = mpt->mpt_port_page0.Capabilities; oval = mpt->mpt_port_page0.Capabilities;
oval = MPI_SCSIPORTPAGE0_CAP_GET_MAX_SYNC_OFFSET(oval); oval = MPI_SCSIPORTPAGE0_CAP_GET_MAX_SYNC_OFFSET(oval);
pval = mpt->mpt_port_page0.Capabilities; pval = mpt->mpt_port_page0.Capabilities;
@ -3359,37 +3359,29 @@ mpt_get_spi_settings(struct mpt_softc *mpt, struct ccb_trans_settings *cts)
scsi->valid = 0; scsi->valid = 0;
spi->flags = 0; spi->flags = 0;
scsi->flags = 0; scsi->flags = 0;
if (dval & DP_DISC_ENABLE) { spi->sync_offset = oval;
spi->flags |= CTS_SPI_FLAGS_DISC_ENB; spi->sync_period = pval;
} spi->valid |= CTS_SPI_VALID_SYNC_OFFSET;
if (oval) { spi->valid |= CTS_SPI_VALID_SYNC_RATE;
spi->sync_offset = oval;
spi->valid |= CTS_SPI_VALID_SYNC_OFFSET;
}
if (pval) {
spi->sync_period = pval;
spi->valid |= CTS_SPI_VALID_SYNC_RATE;
}
spi->valid |= CTS_SPI_VALID_BUS_WIDTH; spi->valid |= CTS_SPI_VALID_BUS_WIDTH;
if (dval & DP_WIDE) { if (dval & DP_WIDE) {
spi->bus_width = MSG_EXT_WDTR_BUS_16_BIT; spi->bus_width = MSG_EXT_WDTR_BUS_16_BIT;
} else { } else {
spi->bus_width = MSG_EXT_WDTR_BUS_8_BIT; spi->bus_width = MSG_EXT_WDTR_BUS_8_BIT;
} }
if (dval & DP_TQING_ENABLE) {
scsi->flags |= CTS_SCSI_FLAGS_TAG_ENB;
}
if (cts->ccb_h.target_lun != CAM_LUN_WILDCARD) { if (cts->ccb_h.target_lun != CAM_LUN_WILDCARD) {
scsi->valid = CTS_SCSI_VALID_TQ; scsi->valid = CTS_SCSI_VALID_TQ;
if (dval & DP_TQING_ENABLE) {
scsi->flags |= CTS_SCSI_FLAGS_TAG_ENB;
}
spi->valid |= CTS_SPI_VALID_DISC; spi->valid |= CTS_SPI_VALID_DISC;
} else { if (dval & DP_DISC_ENABLE) {
scsi->valid = 0; spi->flags |= CTS_SPI_FLAGS_DISC_ENB;
}
} }
mpt_lprt(mpt, MPT_PRT_NEGOTIATION, mpt_lprt(mpt, MPT_PRT_NEGOTIATION,
"mpt_get_spi_settings[%d]:%s per=%x off=%d SPF=%x SPV=%x SCF=%x SCV" "mpt_get_spi_settings[%d]: %s flags 0x%x per 0x%x off=%d\n", tgt,
"=%x bw=%x\n", IS_CURRENT_SETTINGS(cts)? "ACTIVE" : "NVRAM ", dval, pval, oval);
tgt, IS_CURRENT_SETTINGS(cts)? "ACTIVE" : "NVRAM ", pval, oval,
spi->flags, spi->valid, scsi->flags, scsi->valid, spi->bus_width);
return (0); return (0);
} }