Apply vendor fixes to the High Point drivers:
- Don't call xpt_free_path() in os_query_remove_device() and always return TRUE. - Update os_buildsgl() to support build logical SG table which will be used by lower RAID module. - Return CAM_SEL_TIMEOUTstatus for SCSIcommand failed as target missing. Many thanks to HighPoint for providing this driver update. Submitted by: Steve Chang Reviewed by: mav MFC after: 3 days
This commit is contained in:
parent
efc81e89ec
commit
7634a04b30
@ -324,21 +324,7 @@ int os_revalidate_device(void *osext, int id)
|
||||
|
||||
int os_query_remove_device(void *osext, int id)
|
||||
{
|
||||
PVBUS_EXT vbus_ext = (PVBUS_EXT)osext;
|
||||
struct cam_periph *periph = NULL;
|
||||
struct cam_path *path;
|
||||
int status,retval = 0;
|
||||
|
||||
status = xpt_create_path(&path, NULL, vbus_ext->sim->path_id, id, 0);
|
||||
if (status == CAM_REQ_CMP) {
|
||||
if((periph = cam_periph_find(path, "da")) != NULL){
|
||||
if(periph->refcount >= 1)
|
||||
retval = -1;
|
||||
}
|
||||
xpt_free_path(path);
|
||||
}
|
||||
|
||||
return retval;
|
||||
return 0;
|
||||
}
|
||||
|
||||
HPT_U8 os_get_vbus_seq(void *osext)
|
||||
|
@ -483,6 +483,16 @@ static void os_cmddone(PCOMMAND pCmd)
|
||||
|
||||
static int os_buildsgl(PCOMMAND pCmd, PSG pSg, int logical)
|
||||
{
|
||||
POS_CMDEXT ext = (POS_CMDEXT)pCmd->priv;
|
||||
union ccb *ccb = ext->ccb;
|
||||
|
||||
if (logical) {
|
||||
os_set_sgptr(pSg, (HPT_U8 *)ccb->csio.data_ptr);
|
||||
pSg->size = ccb->csio.dxfer_len;
|
||||
pSg->eot = 1;
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
/* since we have provided physical sg, nobody will ask us to build physical sg */
|
||||
HPT_ASSERT(0);
|
||||
return FALSE;
|
||||
@ -555,7 +565,7 @@ static void hpt_scsi_io(PVBUS_EXT vbus_ext, union ccb *ccb)
|
||||
vd = ldm_find_target(vbus, ccb->ccb_h.target_id);
|
||||
|
||||
if (!vd) {
|
||||
ccb->ccb_h.status = CAM_TID_INVALID;
|
||||
ccb->ccb_h.status = CAM_SEL_TIMEOUT;
|
||||
xpt_done(ccb);
|
||||
return;
|
||||
}
|
||||
|
@ -2016,7 +2016,7 @@ hpt_probe(device_t dev)
|
||||
{
|
||||
KdPrintI((CONTROLLER_NAME " found\n"));
|
||||
device_set_desc(dev, CONTROLLER_NAME);
|
||||
return 0;
|
||||
return (BUS_PROBE_DEFAULT);
|
||||
}
|
||||
else
|
||||
return(ENXIO);
|
||||
@ -2623,7 +2623,14 @@ launch_worker_thread(void)
|
||||
|
||||
int HPTLIBAPI fOsBuildSgl(_VBUS_ARG PCommand pCmd, FPSCAT_GATH pSg, int logical)
|
||||
{
|
||||
|
||||
union ccb *ccb = (union ccb *)pCmd->pOrgCommand;
|
||||
|
||||
if (logical) {
|
||||
pSg->dSgAddress = (ULONG_PTR)(UCHAR *)ccb->csio.data_ptr;
|
||||
pSg->wSgSize = ccb->csio.dxfer_len;
|
||||
pSg->wSgFlag = SG_FLAG_EOT;
|
||||
return TRUE;
|
||||
}
|
||||
/* since we have provided physical sg, nobody will ask us to build physical sg */
|
||||
HPT_ASSERT(0);
|
||||
return FALSE;
|
||||
|
@ -256,21 +256,7 @@ int os_revalidate_device(void *osext, int id)
|
||||
|
||||
int os_query_remove_device(void *osext, int id)
|
||||
{
|
||||
PVBUS_EXT vbus_ext = (PVBUS_EXT)osext;
|
||||
struct cam_periph *periph = NULL;
|
||||
struct cam_path *path;
|
||||
int status,retval = 0;
|
||||
|
||||
status = xpt_create_path(&path, NULL, vbus_ext->sim->path_id, id, 0);
|
||||
if (status == CAM_REQ_CMP) {
|
||||
if((periph = cam_periph_find(path, "da")) != NULL){
|
||||
if(periph->refcount >= 1)
|
||||
retval = -1;
|
||||
}
|
||||
xpt_free_path(path);
|
||||
}
|
||||
|
||||
return retval;
|
||||
return 0;
|
||||
}
|
||||
|
||||
HPT_U8 os_get_vbus_seq(void *osext)
|
||||
|
@ -61,7 +61,7 @@ static int hpt_probe(device_t dev)
|
||||
memset(hba, 0, sizeof(HBA));
|
||||
hba->ext_type = EXT_TYPE_HBA;
|
||||
hba->ldm_adapter.him = him;
|
||||
return 0;
|
||||
return (BUS_PROBE_DEFAULT);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -482,6 +482,15 @@ static void os_cmddone(PCOMMAND pCmd)
|
||||
|
||||
static int os_buildsgl(PCOMMAND pCmd, PSG pSg, int logical)
|
||||
{
|
||||
POS_CMDEXT ext = (POS_CMDEXT)pCmd->priv;
|
||||
union ccb *ccb = ext->ccb;
|
||||
|
||||
if (logical) {
|
||||
os_set_sgptr(pSg, (HPT_U8 *)ccb->csio.data_ptr);
|
||||
pSg->size = ccb->csio.dxfer_len;
|
||||
pSg->eot = 1;
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
/* since we have provided physical sg, nobody will ask us to build physical sg */
|
||||
HPT_ASSERT(0);
|
||||
@ -555,7 +564,7 @@ static void hpt_scsi_io(PVBUS_EXT vbus_ext, union ccb *ccb)
|
||||
vd = ldm_find_target(vbus, ccb->ccb_h.target_id);
|
||||
|
||||
if (!vd) {
|
||||
ccb->ccb_h.status = CAM_TID_INVALID;
|
||||
ccb->ccb_h.status = CAM_SEL_TIMEOUT;
|
||||
xpt_done(ccb);
|
||||
return;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user