The branch stable/14 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=3b4d16889be57f26d29e80a19c3ea81841cb5c68
commit 3b4d16889be57f26d29e80a19c3ea81841cb5c68 Author: Warner Losh <[email protected]> AuthorDate: 2023-11-29 01:49:56 +0000 Commit: Alexander Motin <[email protected]> CommitDate: 2024-01-19 17:16:50 +0000 mpi3mr: Trivial trailing white space reduction Sponsored by: Netflix (cherry picked from commit ee7c431c4991febefcd15f16caa0e2b17c73b7b6) --- sys/dev/mpi3mr/mpi3mr.c | 68 ++++++++++++++++++++++----------------------- sys/dev/mpi3mr/mpi3mr.h | 3 +- sys/dev/mpi3mr/mpi3mr_app.c | 4 +-- sys/dev/mpi3mr/mpi3mr_cam.c | 50 ++++++++++++++++----------------- sys/dev/mpi3mr/mpi3mr_pci.c | 2 +- 5 files changed, 64 insertions(+), 63 deletions(-) diff --git a/sys/dev/mpi3mr/mpi3mr.c b/sys/dev/mpi3mr/mpi3mr.c index 580f42ea0179..9bd6417d5345 100644 --- a/sys/dev/mpi3mr/mpi3mr.c +++ b/sys/dev/mpi3mr/mpi3mr.c @@ -604,8 +604,8 @@ static int mpi3mr_create_op_reply_queue(struct mpi3mr_softc *sc, U16 qid) if (bus_dma_tag_create(sc->mpi3mr_parent_dmat, /* parent */ 4, 0, /* algnmnt, boundary */ - BUS_SPACE_MAXADDR_32BIT,/* lowaddr */ - BUS_SPACE_MAXADDR, /* highaddr */ + sc->dma_loaddr, /* lowaddr */ + sc->dma_hiaddr, /* highaddr */ NULL, NULL, /* filter, filterarg */ op_reply_q->qsz, /* maxsize */ 1, /* nsegments */ @@ -619,7 +619,7 @@ static int mpi3mr_create_op_reply_queue(struct mpi3mr_softc *sc, U16 qid) if (bus_dmamem_alloc(op_reply_q->q_base_tag, (void **)&op_reply_q->q_base, BUS_DMA_NOWAIT, &op_reply_q->q_base_dmamap)) { - mpi3mr_dprint(sc, MPI3MR_ERROR, "Cannot allocate replies memory\n"); + mpi3mr_dprint(sc, MPI3MR_ERROR, "%s: Cannot allocate replies memory\n", __func__); return (ENOMEM); } bzero(op_reply_q->q_base, op_reply_q->qsz); @@ -750,8 +750,8 @@ static int mpi3mr_create_op_req_queue(struct mpi3mr_softc *sc, U16 req_qid, U8 r if (bus_dma_tag_create(sc->mpi3mr_parent_dmat, /* parent */ 4, 0, /* algnmnt, boundary */ - BUS_SPACE_MAXADDR_32BIT,/* lowaddr */ - BUS_SPACE_MAXADDR, /* highaddr */ + sc->dma_loaddr, /* lowaddr */ + sc->dma_hiaddr, /* highaddr */ NULL, NULL, /* filter, filterarg */ op_req_q->qsz, /* maxsize */ 1, /* nsegments */ @@ -765,7 +765,7 @@ static int mpi3mr_create_op_req_queue(struct mpi3mr_softc *sc, U16 req_qid, U8 r if (bus_dmamem_alloc(op_req_q->q_base_tag, (void **)&op_req_q->q_base, BUS_DMA_NOWAIT, &op_req_q->q_base_dmamap)) { - mpi3mr_dprint(sc, MPI3MR_ERROR, "Cannot allocate replies memory\n"); + mpi3mr_dprint(sc, MPI3MR_ERROR, "%s: Cannot allocate replies memory\n", __func__); return (ENOMEM); } @@ -1003,7 +1003,7 @@ static int mpi3mr_setup_admin_qpair(struct mpi3mr_softc *sc) if (bus_dmamem_alloc(sc->admin_req_tag, (void **)&sc->admin_req, BUS_DMA_NOWAIT, &sc->admin_req_dmamap)) { - mpi3mr_dprint(sc, MPI3MR_ERROR, "Cannot allocate replies memory\n"); + mpi3mr_dprint(sc, MPI3MR_ERROR, "%s: Cannot allocate replies memory\n", __func__); return (ENOMEM); } bzero(sc->admin_req, sc->admin_req_q_sz); @@ -1041,7 +1041,7 @@ static int mpi3mr_setup_admin_qpair(struct mpi3mr_softc *sc) if (bus_dmamem_alloc(sc->admin_reply_tag, (void **)&sc->admin_reply, BUS_DMA_NOWAIT, &sc->admin_reply_dmamap)) { - mpi3mr_dprint(sc, MPI3MR_ERROR, "Cannot allocate replies memory\n"); + mpi3mr_dprint(sc, MPI3MR_ERROR, "%s: Cannot allocate replies memory\n", __func__); return (ENOMEM); } bzero(sc->admin_reply, sc->admin_reply_q_sz); @@ -1731,8 +1731,8 @@ static int mpi3mr_reply_dma_alloc(struct mpi3mr_softc *sc) if (bus_dma_tag_create(sc->mpi3mr_parent_dmat, /* parent */ 16, 0, /* algnmnt, boundary */ - BUS_SPACE_MAXADDR_32BIT,/* lowaddr */ - BUS_SPACE_MAXADDR, /* highaddr */ + sc->dma_loaddr, /* lowaddr */ + sc->dma_hiaddr, /* highaddr */ NULL, NULL, /* filter, filterarg */ sz, /* maxsize */ 1, /* nsegments */ @@ -1767,8 +1767,8 @@ static int mpi3mr_reply_dma_alloc(struct mpi3mr_softc *sc) if (bus_dma_tag_create(sc->mpi3mr_parent_dmat, /* parent */ 8, 0, /* algnmnt, boundary */ - BUS_SPACE_MAXADDR_32BIT,/* lowaddr */ - BUS_SPACE_MAXADDR, /* highaddr */ + sc->dma_loaddr, /* lowaddr */ + sc->dma_hiaddr, /* highaddr */ NULL, NULL, /* filter, filterarg */ sz, /* maxsize */ 1, /* nsegments */ @@ -1801,8 +1801,8 @@ static int mpi3mr_reply_dma_alloc(struct mpi3mr_softc *sc) if (bus_dma_tag_create(sc->mpi3mr_parent_dmat, /* parent */ 4, 0, /* algnmnt, boundary */ - BUS_SPACE_MAXADDR_32BIT,/* lowaddr */ - BUS_SPACE_MAXADDR, /* highaddr */ + sc->dma_loaddr, /* lowaddr */ + sc->dma_hiaddr, /* highaddr */ NULL, NULL, /* filter, filterarg */ sz, /* maxsize */ 1, /* nsegments */ @@ -1835,8 +1835,8 @@ static int mpi3mr_reply_dma_alloc(struct mpi3mr_softc *sc) if (bus_dma_tag_create(sc->mpi3mr_parent_dmat, /* parent */ 8, 0, /* algnmnt, boundary */ - BUS_SPACE_MAXADDR_32BIT,/* lowaddr */ - BUS_SPACE_MAXADDR, /* highaddr */ + sc->dma_loaddr, /* lowaddr */ + sc->dma_hiaddr, /* highaddr */ NULL, NULL, /* filter, filterarg */ sz, /* maxsize */ 1, /* nsegments */ @@ -1972,8 +1972,8 @@ mpi3mr_print_fw_pkg_ver(struct mpi3mr_softc *sc) if (bus_dma_tag_create(sc->mpi3mr_parent_dmat, /* parent */ 4, 0, /* algnmnt, boundary */ - BUS_SPACE_MAXADDR_32BIT,/* lowaddr */ - BUS_SPACE_MAXADDR, /* highaddr */ + sc->dma_loaddr, /* lowaddr */ + sc->dma_hiaddr, /* highaddr */ NULL, NULL, /* filter, filterarg */ fw_pkg_ver_len, /* maxsize */ 1, /* nsegments */ @@ -2093,8 +2093,8 @@ static int mpi3mr_issue_iocinit(struct mpi3mr_softc *sc) if (bus_dma_tag_create(sc->mpi3mr_parent_dmat, /* parent */ 4, 0, /* algnmnt, boundary */ - BUS_SPACE_MAXADDR_32BIT,/* lowaddr */ - BUS_SPACE_MAXADDR, /* highaddr */ + sc->dma_loaddr, /* lowaddr */ + sc->dma_hiaddr, /* highaddr */ NULL, NULL, /* filter, filterarg */ drvr_info_len, /* maxsize */ 1, /* nsegments */ @@ -2509,8 +2509,8 @@ static int mpi3mr_alloc_chain_bufs(struct mpi3mr_softc *sc) if (bus_dma_tag_create(sc->mpi3mr_parent_dmat, /* parent */ 4096, 0, /* algnmnt, boundary */ - BUS_SPACE_MAXADDR_32BIT,/* lowaddr */ - BUS_SPACE_MAXADDR, /* highaddr */ + sc->dma_loaddr, /* lowaddr */ + sc->dma_hiaddr, /* highaddr */ NULL, NULL, /* filter, filterarg */ sz, /* maxsize */ 1, /* nsegments */ @@ -2585,8 +2585,8 @@ static int mpi3mr_pel_alloc(struct mpi3mr_softc *sc) sc->pel_seq_number_sz = sizeof(Mpi3PELSeq_t); if (bus_dma_tag_create(sc->mpi3mr_parent_dmat, /* parent */ 4, 0, /* alignment, boundary */ - BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ - BUS_SPACE_MAXADDR, /* highaddr */ + sc->dma_loaddr, /* lowaddr */ + sc->dma_hiaddr, /* highaddr */ NULL, NULL, /* filter, filterarg */ sc->pel_seq_number_sz, /* maxsize */ 1, /* nsegments */ @@ -4941,8 +4941,8 @@ mpi3mr_alloc_requests(struct mpi3mr_softc *sc) nsegs = MPI3MR_SG_DEPTH; ret = bus_dma_tag_create( sc->mpi3mr_parent_dmat, /* parent */ 1, 0, /* algnmnt, boundary */ - BUS_SPACE_MAXADDR, /* lowaddr */ - BUS_SPACE_MAXADDR, /* highaddr */ + sc->dma_loaddr, /* lowaddr */ + sc->dma_hiaddr, /* highaddr */ NULL, NULL, /* filter, filterarg */ MAXPHYS,/* maxsize */ nsegs, /* nsegments */ @@ -5115,8 +5115,8 @@ void mpi3mr_alloc_ioctl_dma_memory(struct mpi3mr_softc *sc) if (bus_dma_tag_create(sc->mpi3mr_parent_dmat, /* parent */ 4, 0, /* algnmnt, boundary */ - BUS_SPACE_MAXADDR_32BIT,/* lowaddr */ - BUS_SPACE_MAXADDR, /* highaddr */ + sc->dma_loaddr, /* lowaddr */ + sc->dma_hiaddr, /* highaddr */ NULL, NULL, /* filter, filterarg */ mem_desc->size, /* maxsize */ 1, /* nsegments */ @@ -5130,7 +5130,7 @@ void mpi3mr_alloc_ioctl_dma_memory(struct mpi3mr_softc *sc) if (bus_dmamem_alloc(mem_desc->tag, (void **)&mem_desc->addr, BUS_DMA_NOWAIT, &mem_desc->dmamap)) { - mpi3mr_dprint(sc, MPI3MR_ERROR, "Cannot allocate replies memory\n"); + mpi3mr_dprint(sc, MPI3MR_ERROR, "%s: Cannot allocate replies memory\n", __func__); goto out_failed; } bzero(mem_desc->addr, mem_desc->size); @@ -5145,8 +5145,8 @@ void mpi3mr_alloc_ioctl_dma_memory(struct mpi3mr_softc *sc) mem_desc->size = MPI3MR_4K_PGSZ; if (bus_dma_tag_create(sc->mpi3mr_parent_dmat, /* parent */ 4, 0, /* algnmnt, boundary */ - BUS_SPACE_MAXADDR_32BIT,/* lowaddr */ - BUS_SPACE_MAXADDR, /* highaddr */ + sc->dma_loaddr, /* lowaddr */ + sc->dma_hiaddr, /* highaddr */ NULL, NULL, /* filter, filterarg */ mem_desc->size, /* maxsize */ 1, /* nsegments */ @@ -5160,7 +5160,7 @@ void mpi3mr_alloc_ioctl_dma_memory(struct mpi3mr_softc *sc) if (bus_dmamem_alloc(mem_desc->tag, (void **)&mem_desc->addr, BUS_DMA_NOWAIT, &mem_desc->dmamap)) { - mpi3mr_dprint(sc, MPI3MR_ERROR, "Cannot allocate replies memory\n"); + mpi3mr_dprint(sc, MPI3MR_ERROR, "%s: Cannot allocate replies memory\n", __func__); goto out_failed; } bzero(mem_desc->addr, mem_desc->size); @@ -5174,8 +5174,8 @@ void mpi3mr_alloc_ioctl_dma_memory(struct mpi3mr_softc *sc) mem_desc->size = MPI3MR_4K_PGSZ; if (bus_dma_tag_create(sc->mpi3mr_parent_dmat, /* parent */ 4, 0, /* algnmnt, boundary */ - BUS_SPACE_MAXADDR_32BIT,/* lowaddr */ - BUS_SPACE_MAXADDR, /* highaddr */ + sc->dma_loaddr, /* lowaddr */ + sc->dma_hiaddr, /* highaddr */ NULL, NULL, /* filter, filterarg */ mem_desc->size, /* maxsize */ 1, /* nsegments */ diff --git a/sys/dev/mpi3mr/mpi3mr.h b/sys/dev/mpi3mr/mpi3mr.h index f1a2cbc0fd4c..8d92f8f80e57 100644 --- a/sys/dev/mpi3mr/mpi3mr.h +++ b/sys/dev/mpi3mr/mpi3mr.h @@ -544,7 +544,8 @@ struct mpi3mr_softc { char name[MPI3MR_NAME_LENGTH]; char driver_name[MPI3MR_NAME_LENGTH]; int bars; - int dma_mask; + bus_addr_t dma_loaddr; + bus_addr_t dma_hiaddr; u_int mpi3mr_debug; struct mpi3mr_reset reset; int max_msix_vectors; diff --git a/sys/dev/mpi3mr/mpi3mr_app.c b/sys/dev/mpi3mr/mpi3mr_app.c index cf3afc7bba95..5bd0ea4ed174 100644 --- a/sys/dev/mpi3mr/mpi3mr_app.c +++ b/sys/dev/mpi3mr/mpi3mr_app.c @@ -336,8 +336,8 @@ mpi3mr_app_build_nvme_prp(struct mpi3mr_softc *sc, sc->nvme_encap_prp_sz = 0; if (bus_dma_tag_create(sc->mpi3mr_parent_dmat, /* parent */ 4, 0, /* algnmnt, boundary */ - BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ - BUS_SPACE_MAXADDR, /* highaddr */ + sc->dma_loaddr, /* lowaddr */ + sc->dma_hiaddr, /* highaddr */ NULL, NULL, /* filter, filterarg */ dev_pgsz, /* maxsize */ 1, /* nsegments */ diff --git a/sys/dev/mpi3mr/mpi3mr_cam.c b/sys/dev/mpi3mr/mpi3mr_cam.c index 15ef2732ec56..ebbc67af78ba 100644 --- a/sys/dev/mpi3mr/mpi3mr_cam.c +++ b/sys/dev/mpi3mr/mpi3mr_cam.c @@ -389,7 +389,7 @@ static bool mpi3mr_allow_unmap_to_fw(struct mpi3mr_softc *sc, mpi3mr_dprint(sc, MPI3MR_INFO, "%s: Truncating param_list_len from (%d) to (%d)\n", __func__, param_list_len, trunc_param_len); - scsiio_cdb_ptr(csio)[7] = (param_list_len >> 8) | 0xff; + scsiio_cdb_ptr(csio)[7] = (param_list_len >> 8) | 0xff; scsiio_cdb_ptr(csio)[8] = param_list_len | 0xff; mpi3mr_print_cdb(ccb); } @@ -507,12 +507,12 @@ mpi3mr_issue_tm(struct mpi3mr_softc *sc, struct mpi3mr_cmd *cmd, if (sc->unrecoverable) { - mpi3mr_dprint(sc, MPI3MR_INFO, + mpi3mr_dprint(sc, MPI3MR_INFO, "Controller is in unrecoverable state!! TM not required\n"); return retval; } if (sc->reset_in_progress) { - mpi3mr_dprint(sc, MPI3MR_INFO, + mpi3mr_dprint(sc, MPI3MR_INFO, "controller reset in progress!! TM not required\n"); return retval; } @@ -554,7 +554,7 @@ mpi3mr_issue_tm(struct mpi3mr_softc *sc, struct mpi3mr_cmd *cmd, tm_req.TaskHostTag = htole16(cmd->hosttag); tm_req.TaskRequestQueueID = htole16(op_req_q->qid); } - } + } if (tgtdev) mpi3mr_atomic_inc(&tgtdev->block_io); @@ -570,14 +570,14 @@ mpi3mr_issue_tm(struct mpi3mr_softc *sc, struct mpi3mr_cmd *cmd, sc->tm_chan = (void *)&drv_cmd; - mpi3mr_dprint(sc, MPI3MR_DEBUG_TM, + mpi3mr_dprint(sc, MPI3MR_DEBUG_TM, "posting task management request: type(%d), handle(0x%04x)\n", tm_type, tgtdev->dev_handle); init_completion(&drv_cmd->completion); retval = mpi3mr_submit_admin_cmd(sc, &tm_req, sizeof(tm_req)); if (retval) { - mpi3mr_dprint(sc, MPI3MR_ERROR, + mpi3mr_dprint(sc, MPI3MR_ERROR, "posting task management request is failed\n"); retval = -1; goto out_unlock; @@ -588,20 +588,20 @@ mpi3mr_issue_tm(struct mpi3mr_softc *sc, struct mpi3mr_cmd *cmd, drv_cmd->is_waiting = 0; retval = -1; if (!(drv_cmd->state & MPI3MR_CMD_RESET)) { - mpi3mr_dprint(sc, MPI3MR_ERROR, + mpi3mr_dprint(sc, MPI3MR_ERROR, "task management request timed out after %ld seconds\n", timeout); if (sc->mpi3mr_debug & MPI3MR_DEBUG_TM) { mpi3mr_dprint(sc, MPI3MR_INFO, "tm_request dump\n"); mpi3mr_hexdump(&tm_req, sizeof(tm_req), 8); } - trigger_reset_from_watchdog(sc, MPI3MR_TRIGGER_SOFT_RESET, MPI3MR_RESET_FROM_TM_TIMEOUT); + trigger_reset_from_watchdog(sc, MPI3MR_TRIGGER_SOFT_RESET, MPI3MR_RESET_FROM_TM_TIMEOUT); retval = ETIMEDOUT; } goto out_unlock; } if (!(drv_cmd->state & MPI3MR_CMD_REPLYVALID)) { - mpi3mr_dprint(sc, MPI3MR_ERROR, + mpi3mr_dprint(sc, MPI3MR_ERROR, "invalid task management reply message\n"); retval = -1; goto out_unlock; @@ -616,7 +616,7 @@ mpi3mr_issue_tm(struct mpi3mr_softc *sc, struct mpi3mr_cmd *cmd, resp_code = MPI3_SCSITASKMGMT_RSPCODE_TM_COMPLETE; break; default: - mpi3mr_dprint(sc, MPI3MR_ERROR, + mpi3mr_dprint(sc, MPI3MR_ERROR, "task management request to handle(0x%04x) is failed with ioc_status(0x%04x) log_info(0x%08x)\n", tgtdev->dev_handle, drv_cmd->ioc_status, drv_cmd->ioc_loginfo); retval = -1; @@ -636,7 +636,7 @@ mpi3mr_issue_tm(struct mpi3mr_softc *sc, struct mpi3mr_cmd *cmd, break; } - mpi3mr_dprint(sc, MPI3MR_DEBUG_TM, + mpi3mr_dprint(sc, MPI3MR_DEBUG_TM, "task management request type(%d) completed for handle(0x%04x) with ioc_status(0x%04x), log_info(0x%08x)" "termination_count(%u), response:%s(0x%x)\n", tm_type, tgtdev->dev_handle, drv_cmd->ioc_status, drv_cmd->ioc_loginfo, tm_reply->TerminationCount, mpi3mr_tm_response_name(resp_code), resp_code); @@ -652,7 +652,7 @@ mpi3mr_issue_tm(struct mpi3mr_softc *sc, struct mpi3mr_cmd *cmd, switch (tm_type) { case MPI3_SCSITASKMGMT_TASKTYPE_ABORT_TASK: if (cmd->state == MPI3MR_CMD_STATE_IN_TM) { - mpi3mr_dprint(sc, MPI3MR_ERROR, + mpi3mr_dprint(sc, MPI3MR_ERROR, "%s: task abort returned success from firmware but corresponding CCB (%p) was not terminated" "marking task abort failed!\n", sc->name, cmd->ccb); retval = -1; @@ -660,7 +660,7 @@ mpi3mr_issue_tm(struct mpi3mr_softc *sc, struct mpi3mr_cmd *cmd, break; case MPI3_SCSITASKMGMT_TASKTYPE_TARGET_RESET: if (mpi3mr_atomic_read(&tgtdev->outstanding)) { - mpi3mr_dprint(sc, MPI3MR_ERROR, + mpi3mr_dprint(sc, MPI3MR_ERROR, "%s: target reset returned success from firmware but IOs are still pending on the target (%p)" "marking target reset failed!\n", sc->name, tgtdev); @@ -704,13 +704,13 @@ static int mpi3mr_task_abort(struct mpi3mr_cmd *cmd) } ccb = cmd->ccb; - mpi3mr_dprint(sc, MPI3MR_INFO, + mpi3mr_dprint(sc, MPI3MR_INFO, "attempting abort task for ccb(%p)\n", ccb); mpi3mr_print_cdb(ccb); if (cmd->state != MPI3MR_CMD_STATE_BUSY) { - mpi3mr_dprint(sc, MPI3MR_INFO, + mpi3mr_dprint(sc, MPI3MR_INFO, "%s: ccb is not in driver scope, abort task is not required\n", sc->name); return retval; @@ -719,7 +719,7 @@ static int mpi3mr_task_abort(struct mpi3mr_cmd *cmd) retval = mpi3mr_issue_tm(sc, cmd, MPI3_SCSITASKMGMT_TASKTYPE_ABORT_TASK, MPI3MR_ABORTTM_TIMEOUT); - mpi3mr_dprint(sc, MPI3MR_INFO, + mpi3mr_dprint(sc, MPI3MR_INFO, "abort task is %s for ccb(%p)\n", ((retval == 0) ? "SUCCESS" : "FAILED"), ccb); return retval; @@ -750,12 +750,12 @@ static int mpi3mr_target_reset(struct mpi3mr_cmd *cmd) return retval; } - mpi3mr_dprint(sc, MPI3MR_INFO, + mpi3mr_dprint(sc, MPI3MR_INFO, "attempting target reset on target(%d)\n", target->per_id); if (mpi3mr_atomic_read(&target->outstanding)) { - mpi3mr_dprint(sc, MPI3MR_INFO, + mpi3mr_dprint(sc, MPI3MR_INFO, "no outstanding IOs on the target(%d)," " target reset not required.\n", target->per_id); return retval; @@ -763,7 +763,7 @@ static int mpi3mr_target_reset(struct mpi3mr_cmd *cmd) retval = mpi3mr_issue_tm(sc, cmd, MPI3_SCSITASKMGMT_TASKTYPE_TARGET_RESET, MPI3MR_RESETTM_TIMEOUT); - mpi3mr_dprint(sc, MPI3MR_INFO, + mpi3mr_dprint(sc, MPI3MR_INFO, "target reset is %s for target(%d)\n", ((retval == 0) ? "SUCCESS" : "FAILED"), target->per_id); @@ -791,7 +791,7 @@ static inline int mpi3mr_get_fw_pending_ios(struct mpi3mr_softc *sc) * mpi3mr_wait_for_host_io - block for I/Os to complete * @sc: Adapter instance reference * @timeout: time out in seconds - * + * * Waits for pending I/Os for the given adapter to complete or * to hit the timeout. * @@ -860,7 +860,7 @@ mpi3mr_scsiio_timeout(void *data) * with max timeout for outstanding IOs to complete is 180sec. */ targ_dev = cmd->targ; - if (targ_dev && (targ_dev->dev_type == MPI3_DEVICE_DEVFORM_VD)) { + if (targ_dev && (targ_dev->dev_type == MPI3_DEVICE_DEVFORM_VD)) { if (mpi3mr_wait_for_host_io(sc, MPI3MR_RAID_ERRREC_RESET_TIMEOUT)) trigger_reset_from_watchdog(sc, MPI3MR_TRIGGER_SOFT_RESET, MPI3MR_RESET_FROM_SCSIIO_TIMEOUT); return; @@ -871,7 +871,7 @@ mpi3mr_scsiio_timeout(void *data) if (!retval || (retval == ETIMEDOUT)) return; - /* + /* * task abort has failed to recover the timed out IO, * try with the target reset */ @@ -879,7 +879,7 @@ mpi3mr_scsiio_timeout(void *data) if (!retval || (retval == ETIMEDOUT)) return; - /* + /* * task abort and target reset has failed. So issue Controller reset(soft reset) * through OCR thread context */ @@ -2107,7 +2107,7 @@ mpi3mr_cam_attach(struct mpi3mr_softc *sc) TASK_INIT(&cam_sc->ev_task, 0, mpi3mr_firmware_event_work, sc); cam_sc->ev_tq = taskqueue_create("mpi3mr_taskq", M_NOWAIT | M_ZERO, taskqueue_thread_enqueue, &cam_sc->ev_tq); - taskqueue_start_threads(&cam_sc->ev_tq, 1, PRIBIO, "%s taskq", + taskqueue_start_threads(&cam_sc->ev_tq, 1, PRIBIO, "%s taskq", device_get_nameunit(sc->mpi3mr_dev)); mtx_lock(&sc->mpi3mr_mtx); @@ -2219,7 +2219,7 @@ get_target: goto out_tgt_free; } mtx_unlock_spin(&sc->target_lock); -out_tgt_free: +out_tgt_free: if (target) { free(target, M_MPI3MR); target = NULL; diff --git a/sys/dev/mpi3mr/mpi3mr_pci.c b/sys/dev/mpi3mr/mpi3mr_pci.c index 11ec98882949..8a2c101e06c2 100644 --- a/sys/dev/mpi3mr/mpi3mr_pci.c +++ b/sys/dev/mpi3mr/mpi3mr_pci.c @@ -286,7 +286,7 @@ static int mpi3mr_setup_resources(struct mpi3mr_softc *sc) /* Allocate the parent DMA tag */ if (bus_dma_tag_create(bus_get_dma_tag(dev), /* parent */ 1, 0, /* algnmnt, boundary */ - BUS_SPACE_MAXADDR_32BIT,/* lowaddr */ + BUS_SPACE_MAXADDR, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ NULL, NULL, /* filter, filterarg */ BUS_SPACE_MAXSIZE_32BIT,/* maxsize */
