Page MenuHomeFreeBSD
Files F148513875

D49090.id151514.diff
No OneTemporary
Actions

D49090.id151514.diff
View Options

diff --git a/sys/dev/mpi3mr/mpi3mr.h b/sys/dev/mpi3mr/mpi3mr.h
--- a/sys/dev/mpi3mr/mpi3mr.h
+++ b/sys/dev/mpi3mr/mpi3mr.h
@@ -95,10 +95,11 @@
#define MPI3MR_NAME_LENGTH 32
#define IOCNAME "%s: "
+#define MPI3MR_DEFAULT_MAX_IO_SIZE (1 * 1024 * 1024)
+
#define SAS4116_CHIP_REV_A0 0
#define SAS4116_CHIP_REV_B0 1
-#define MPI3MR_SG_DEPTH (MPI3MR_4K_PGSZ/sizeof(Mpi3SGESimple_t))
#define MPI3MR_MAX_SECTORS 2048
#define MPI3MR_MAX_CMDS_LUN 7
#define MPI3MR_MAX_CDB_LENGTH 16
@@ -109,7 +110,12 @@
#define MPI3MR_RAID_QDEPTH 128
#define MPI3MR_NVME_QDEPTH 128
+/* Definitions for internal SGL and Chain SGL buffers */
#define MPI3MR_4K_PGSZ 4096
+#define MPI3MR_PAGE_SIZE_4K 4096
+#define MPI3MR_DEFAULT_SGL_ENTRIES 256
+#define MPI3MR_MAX_SGL_ENTRIES 2048
+
#define MPI3MR_AREQQ_SIZE (2 * MPI3MR_4K_PGSZ)
#define MPI3MR_AREPQ_SIZE (4 * MPI3MR_4K_PGSZ)
#define MPI3MR_AREQ_FRAME_SZ 128
@@ -125,8 +131,6 @@
#define MPI3MR_THRESHOLD_REPLY_COUNT 100
-#define MPI3MR_CHAINSGE_SIZE MPI3MR_4K_PGSZ
-
#define MPI3MR_SGEFLAGS_SYSTEM_SIMPLE_END_OF_LIST \
(MPI3_SGE_FLAGS_ELEMENT_TYPE_SIMPLE | MPI3_SGE_FLAGS_DLAS_SYSTEM | \
MPI3_SGE_FLAGS_END_OF_LIST)
@@ -335,6 +339,7 @@
U16 max_perids;
U16 max_pds;
U16 max_sasexpanders;
+ U32 max_data_length;
U16 max_sasinitiators;
U16 max_enclosures;
U16 max_pcieswitches;
@@ -671,6 +676,7 @@
struct mtx target_lock;
U16 max_host_ios;
+ U32 max_sgl_entries;
bus_dma_tag_t chain_sgl_list_tag;
struct mpi3mr_chain *chain_sgl_list;
U16 chain_bitmap_sz;
diff --git a/sys/dev/mpi3mr/mpi3mr.c b/sys/dev/mpi3mr/mpi3mr.c
--- a/sys/dev/mpi3mr/mpi3mr.c
+++ b/sys/dev/mpi3mr/mpi3mr.c
@@ -1617,6 +1617,7 @@
(facts_data->MaxPCIeSwitches);
sc->facts.max_sasexpanders =
(facts_data->MaxSASExpanders);
+ sc->facts.max_data_length = facts_data->MaxDataLength;
sc->facts.max_sasinitiators =
(facts_data->MaxSASInitiators);
sc->facts.max_enclosures = (facts_data->MaxEnclosures);
@@ -1651,6 +1652,10 @@
sc->facts.io_throttle_low = facts_data->IOThrottleLow;
sc->facts.io_throttle_high = facts_data->IOThrottleHigh;
+ if (sc->facts.max_data_length == MPI3_IOCFACTS_MAX_DATA_LENGTH_NOT_REPORTED)
+ sc->facts.max_data_length = MPI3MR_DEFAULT_MAX_IO_SIZE;
+ else
+ sc->facts.max_data_length *= MPI3MR_PAGE_SIZE_4K;
/*Store in 512b block count*/
if (sc->facts.io_throttle_data_length)
sc->io_throttle_data_length =
@@ -2511,7 +2516,9 @@
goto out_failed;
}
- sz = MPI3MR_CHAINSGE_SIZE;
+ if (sc->max_sgl_entries > sc->facts.max_data_length / PAGE_SIZE)
+ sc->max_sgl_entries = sc->facts.max_data_length / PAGE_SIZE;
+ sz = sc->max_sgl_entries * sizeof(Mpi3SGESimple_t);
if (bus_dma_tag_create(sc->mpi3mr_parent_dmat, /* parent */
4096, 0, /* algnmnt, boundary */
@@ -4961,7 +4968,7 @@
struct mpi3mr_cmd *cmd;
int i, j, nsegs, ret;
- nsegs = MPI3MR_SG_DEPTH;
+ nsegs = sc->max_sgl_entries;
ret = bus_dma_tag_create( sc->mpi3mr_parent_dmat, /* parent */
1, 0, /* algnmnt, boundary */
sc->dma_loaddr, /* lowaddr */
diff --git a/sys/dev/mpi3mr/mpi3mr_cam.c b/sys/dev/mpi3mr/mpi3mr_cam.c
--- a/sys/dev/mpi3mr/mpi3mr_cam.c
+++ b/sys/dev/mpi3mr/mpi3mr_cam.c
@@ -176,7 +176,7 @@
bus_dmamap_sync(sc->buffer_dmat, cm->dmamap,
BUS_DMASYNC_PREWRITE);
- KASSERT(nsegs <= MPI3MR_SG_DEPTH && nsegs > 0,
+ KASSERT(nsegs <= sc->max_sgl_entries && nsegs > 0,
("%s: bad SGE count: %d\n", device_get_nameunit(sc->mpi3mr_dev), nsegs));
KASSERT(scsiio_req->DataLength != 0,
("%s: Data segments (%d), but DataLength == 0\n",
@@ -218,7 +218,7 @@
chain = chain_req->buf;
chain_dma = chain_req->buf_phys;
- memset(chain_req->buf, 0, PAGE_SIZE);
+ memset(chain_req->buf, 0, sc->max_sgl_entries * sizeof(Mpi3SGESimple_t));
sges_in_segment = sges_left;
chain_length = sges_in_segment * sizeof(Mpi3SGESimple_t);
@@ -1154,7 +1154,7 @@
return;
case CAM_DATA_VADDR:
case CAM_DATA_BIO:
- if (csio->dxfer_len > (MPI3MR_SG_DEPTH * MPI3MR_4K_PGSZ)) {
+ if (csio->dxfer_len > (sc->max_sgl_entries * PAGE_SIZE)) {
mpi3mr_set_ccbstatus(ccb, CAM_REQ_TOO_BIG);
mpi3mr_release_command(cm);
xpt_done(ccb);
@@ -1305,8 +1305,10 @@
{
struct mpi3mr_cam_softc *cam_sc;
struct mpi3mr_target *targ;
+ struct mpi3mr_softc *sc;
cam_sc = cam_sim_softc(sim);
+ sc = cam_sc->sc;
mpi3mr_dprint(cam_sc->sc, MPI3MR_TRACE, "ccb func_code 0x%x target id: 0x%x\n",
ccb->ccb_h.func_code, ccb->ccb_h.target_id);
@@ -1357,7 +1359,7 @@
"PCI device target_id: %u max io size: %u\n",
ccb->ccb_h.target_id, cpi->maxio);
} else {
- cpi->maxio = PAGE_SIZE * (MPI3MR_SG_DEPTH - 1);
+ cpi->maxio = PAGE_SIZE * sc->max_sgl_entries;
}
mpi3mr_set_ccbstatus(ccb, CAM_REQ_CMP);
break;
diff --git a/sys/dev/mpi3mr/mpi3mr_pci.c b/sys/dev/mpi3mr/mpi3mr_pci.c
--- a/sys/dev/mpi3mr/mpi3mr_pci.c
+++ b/sys/dev/mpi3mr/mpi3mr_pci.c
@@ -178,12 +178,15 @@
sc->reset_in_progress = 0;
sc->reset.type = 0;
sc->iot_enable = 1;
+ sc->max_sgl_entries = maxphys / PAGE_SIZE;
+
/*
* Grab the global variables.
*/
TUNABLE_INT_FETCH("hw.mpi3mr.debug_level", &sc->mpi3mr_debug);
TUNABLE_INT_FETCH("hw.mpi3mr.ctrl_reset", &sc->reset.type);
TUNABLE_INT_FETCH("hw.mpi3mr.iot_enable", &sc->iot_enable);
+ TUNABLE_INT_FETCH("hw.mpi3mr.max_sgl_entries", &sc->max_sgl_entries);
/* Grab the unit-instance variables */
snprintf(tmpstr, sizeof(tmpstr), "dev.mpi3mr.%d.debug_level",
@@ -197,6 +200,10 @@
snprintf(tmpstr, sizeof(tmpstr), "dev.mpi3mr.%d.iot_enable",
device_get_unit(sc->mpi3mr_dev));
TUNABLE_INT_FETCH(tmpstr, &sc->iot_enable);
+
+ snprintf(tmpstr, sizeof(tmpstr), "dev.mpi3mr.%d.max_sgl_entries",
+ device_get_unit(sc->mpi3mr_dev));
+ TUNABLE_INT_FETCH(tmpstr, &sc->max_sgl_entries);
}
static struct mpi3mr_ident *
@@ -443,7 +450,16 @@
sc->mpi3mr_dev = dev;
mpi3mr_get_tunables(sc);
-
+
+ if (sc->max_sgl_entries > MPI3MR_MAX_SGL_ENTRIES)
+ sc->max_sgl_entries = MPI3MR_MAX_SGL_ENTRIES;
+ else if (sc->max_sgl_entries < MPI3MR_DEFAULT_SGL_ENTRIES)
+ sc->max_sgl_entries = MPI3MR_DEFAULT_SGL_ENTRIES;
+ else {
+ sc->max_sgl_entries /= MPI3MR_DEFAULT_SGL_ENTRIES;
+ sc->max_sgl_entries *= MPI3MR_DEFAULT_SGL_ENTRIES;
+ }
+
if ((error = mpi3mr_initialize_ioc(sc, MPI3MR_INIT_TYPE_INIT)) != 0) {
mpi3mr_dprint(sc, MPI3MR_ERROR, "FW initialization failed\n");
goto load_failed;

File Metadata

Mime Type
text/plain
Expires
Thu, Mar 19, 9:24 AM (4 h, 1 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29958462
Default Alt Text
D49090.id151514.diff (6 KB)

Event Timeline