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

Remove support for FreeBSD 8 systems. These workarounds and ways of rescanning

Browse Source 
devices are no longer done.
This commit is contained in:
imp 2020-03-01 17:27:35 +00:00
parent aca1244ab0
commit 6010b38061
3 changed files with 0 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/dev/isci/isci.h
View File

@ -303,10 +303,8 @@ void isci_request_construct(struct ISCI_REQUEST *request,
void isci_io_request_execute_scsi_io(union ccb *ccb,
struct ISCI_CONTROLLER *controller);
#if __FreeBSD_version >= 900026
void isci_io_request_execute_smp_io(
union ccb *ccb, struct ISCI_CONTROLLER *controller);
#endif
void isci_io_request_timeout(void *);

19
sys/dev/isci/isci_controller.c
View File

@ -583,21 +583,6 @@ void isci_controller_domain_discovery_complete(
/* Unfreeze simq to allow initial scan to proceed. */
xpt_release_simq(isci_controller->sim, TRUE);
#if __FreeBSD_version < 800000
/* When driver is loaded after boot, we need to
* explicitly rescan here for versions <8.0, because
* CAM only automatically scans new buses at boot
* time.
*/
union ccb *ccb = xpt_alloc_ccb_nowait();
xpt_create_path(&ccb->ccb_h.path, NULL,
cam_sim_path(isci_controller->sim),
CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD);
xpt_rescan(ccb);
#endif
if (next_index < driver->controller_count) {
/* There are more controllers that need to
* start. So start the next one.
@ -689,9 +674,7 @@ void isci_action(struct cam_sim *sim, union ccb *ccb)
cpi->hba_eng_cnt = 0;
cpi->max_target = SCI_MAX_REMOTE_DEVICES - 1;
cpi->max_lun = ISCI_MAX_LUN;
#if __FreeBSD_version >= 800102
cpi->maxio = isci_io_request_get_max_io_size();
#endif
cpi->unit_number = cam_sim_unit(sim);
cpi->bus_id = bus;
cpi->initiator_id = SCI_MAX_REMOTE_DEVICES;
@ -752,11 +735,9 @@ void isci_action(struct cam_sim *sim, union ccb *ccb)
}
isci_io_request_execute_scsi_io(ccb, controller);
break;
#if __FreeBSD_version >= 900026
case XPT_SMP_IO:
isci_io_request_execute_smp_io(ccb, controller);
break;
#endif
case XPT_SET_TRAN_SETTINGS:
ccb->ccb_h.status &= ~CAM_STATUS_MASK;
ccb->ccb_h.status |= CAM_REQ_CMP;

4
sys/dev/isci/isci_io_request.c
View File

@ -102,7 +102,6 @@ isci_io_request_complete(SCI_CONTROLLER_HANDLE_T scif_controller,
switch (completion_status) {
case SCI_IO_SUCCESS:
case SCI_IO_SUCCESS_COMPLETE_BEFORE_START:
#if __FreeBSD_version >= 900026
if (ccb->ccb_h.func_code == XPT_SMP_IO) {
void *smp_response =
scif_io_request_get_response_iu_address(
@ -111,7 +110,6 @@ isci_io_request_complete(SCI_CONTROLLER_HANDLE_T scif_controller,
memcpy(ccb->smpio.smp_response, smp_response,
ccb->smpio.smp_response_len);
}
#endif
ccb->ccb_h.status |= CAM_REQ_CMP;
break;
@ -802,7 +800,6 @@ isci_io_request_timeout(void *arg)
mtx_unlock(&controller->lock);
}
#if __FreeBSD_version >= 900026
/**
* @brief This callback method gets the size of and pointer to the buffer
* (if any) containing the request buffer for an SMP request.
@ -990,4 +987,3 @@ isci_io_request_execute_smp_io(union ccb *ccb,
SBT_1MS * ccb->ccb_h.timeout, 0, isci_io_request_timeout,
request, 0);
}
#endif