From owner-svn-src-stable-7@FreeBSD.ORG Sat Oct 29 23:51:23 2011 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A2152106564A; Sat, 29 Oct 2011 23:51:23 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 900218FC1A; Sat, 29 Oct 2011 23:51:23 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p9TNpNkk038433; Sat, 29 Oct 2011 23:51:23 GMT (envelope-from marius@svn.freebsd.org) Received: (from marius@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9TNpN40038428; Sat, 29 Oct 2011 23:51:23 GMT (envelope-from marius@svn.freebsd.org) Message-Id: <201110292351.p9TNpN40038428@svn.freebsd.org> From: Marius Strobl Date: Sat, 29 Oct 2011 23:51:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226916 - in stable/7/sys/dev: aac asr hptiop mfi X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Oct 2011 23:51:23 -0000 Author: marius Date: Sat Oct 29 23:51:23 2011 New Revision: 226916 URL: http://svn.freebsd.org/changeset/base/226916 Log: MFC: r226350 Merge from r225950: Set the sense residual properly. Reviewed by: ken Modified: stable/7/sys/dev/aac/aac_cam.c stable/7/sys/dev/asr/asr.c stable/7/sys/dev/hptiop/hptiop.c stable/7/sys/dev/mfi/mfi_cam.c Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/dev/aac/aac_cam.c ============================================================================== --- stable/7/sys/dev/aac/aac_cam.c Sat Oct 29 23:51:21 2011 (r226915) +++ stable/7/sys/dev/aac/aac_cam.c Sat Oct 29 23:51:23 2011 (r226916) @@ -484,6 +484,7 @@ aac_cam_complete(struct aac_command *cm) union ccb *ccb; struct aac_srb_response *srbr; struct aac_softc *sc; + int sense_returned; sc = cm->cm_sc; fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, ""); @@ -508,16 +509,17 @@ aac_cam_complete(struct aac_command *cm) /* Take care of autosense */ if (srbr->sense_len) { - int sense_len, scsi_sense_len; - - scsi_sense_len = sizeof(struct scsi_sense_data); - bzero(&ccb->csio.sense_data, scsi_sense_len); - sense_len = (srbr->sense_len > - scsi_sense_len) ? scsi_sense_len : - srbr->sense_len; + sense_returned = srbr->sense_len; + if (sense_returned < ccb->csio.sense_len) + ccb->csio.sense_resid = + ccb->csio.sense_len - + sense_returned; + else + ccb->csio.sense_resid = 0; + bzero(&ccb->csio.sense_data, + sizeof(struct scsi_sense_data)); bcopy(&srbr->sense[0], &ccb->csio.sense_data, - srbr->sense_len); - ccb->csio.sense_len = sense_len; + min(ccb->csio.sense_len, sense_returned)); ccb->ccb_h.status |= CAM_AUTOSNS_VALID; // scsi_sense_print(&ccb->csio); } Modified: stable/7/sys/dev/asr/asr.c ============================================================================== --- stable/7/sys/dev/asr/asr.c Sat Oct 29 23:51:21 2011 (r226915) +++ stable/7/sys/dev/asr/asr.c Sat Oct 29 23:51:23 2011 (r226916) @@ -3074,6 +3074,14 @@ asr_intr(Asr_softc_t *sc) && (size > ccb->csio.sense_len)) { size = ccb->csio.sense_len; } + if (size < ccb->csio.sense_len) { + ccb->csio.sense_resid = + ccb->csio.sense_len - size; + } else { + ccb->csio.sense_resid = 0; + } + bzero(&(ccb->csio.sense_data), + sizeof(ccb->csio.sense_data)); bcopy(Reply->SenseData, &(ccb->csio.sense_data), size); } @@ -3569,6 +3577,12 @@ ASR_queue_i(Asr_softc_t *sc, PI2O_MESSAG if (size > sizeof(ccb->csio.sense_data)) { size = sizeof(ccb->csio.sense_data); } + if (size < ccb->csio.sense_len) { + ccb->csio.sense_resid = ccb->csio.sense_len - size; + } else { + ccb->csio.sense_resid = 0; + } + bzero(&(ccb->csio.sense_data), sizeof(ccb->csio.sense_data)); bcopy(&(ccb->csio.sense_data), Reply_Ptr->SenseData, size); I2O_SCSI_ERROR_REPLY_MESSAGE_FRAME_setAutoSenseTransferCount( Reply_Ptr, size); Modified: stable/7/sys/dev/hptiop/hptiop.c ============================================================================== --- stable/7/sys/dev/hptiop/hptiop.c Sat Oct 29 23:51:21 2011 (r226915) +++ stable/7/sys/dev/hptiop/hptiop.c Sat Oct 29 23:51:23 2011 (r226916) @@ -426,6 +426,13 @@ srb_complete: ccb->ccb_h.status = CAM_BUSY; break; case IOP_RESULT_CHECK_CONDITION: + memset(&ccb->csio.sense_data, 0, + sizeof(ccb->csio.sense_data)); + if (dxfer < ccb->csio.sense_len) + ccb->csio.sense_resid = ccb->csio.sense_len - + dxfer; + else + ccb->csio.sense_resid = 0; if (srb->srb_flag & HPT_SRB_FLAG_HIGH_MEM_ACESS) {/*iop*/ bus_space_read_region_1(hba->bar0t, hba->bar0h, index + offsetof(struct hpt_iop_request_scsi_command, @@ -575,6 +582,13 @@ static void hptiop_request_callback_mv(s ccb->ccb_h.status = CAM_BUSY; break; case IOP_RESULT_CHECK_CONDITION: + memset(&ccb->csio.sense_data, 0, + sizeof(ccb->csio.sense_data)); + if (req->dataxfer_length < ccb->csio.sense_len) + ccb->csio.sense_resid = ccb->csio.sense_len - + req->dataxfer_length; + else + ccb->csio.sense_resid = 0; memcpy(&ccb->csio.sense_data, &req->sg_list, MIN(req->dataxfer_length, sizeof(ccb->csio.sense_data))); ccb->ccb_h.status = CAM_SCSI_STATUS_ERROR; Modified: stable/7/sys/dev/mfi/mfi_cam.c ============================================================================== --- stable/7/sys/dev/mfi/mfi_cam.c Sat Oct 29 23:51:21 2011 (r226915) +++ stable/7/sys/dev/mfi/mfi_cam.c Sat Oct 29 23:51:23 2011 (r226916) @@ -357,7 +357,13 @@ mfip_done(struct mfi_command *cm) ccbh->status = CAM_SCSI_STATUS_ERROR | CAM_AUTOSNS_VALID; csio->scsi_status = pt->header.scsi_status; - sense_len = min(pt->header.sense_len, sizeof(struct scsi_sense_data)); + if (pt->header.sense_len < csio->sense_len) + csio->sense_resid = csio->sense_len - + pt->header.sense_len; + else + csio->sense_resid = 0; + sense_len = min(pt->header.sense_len, + sizeof(struct scsi_sense_data)); bzero(&csio->sense_data, sizeof(struct scsi_sense_data)); bcopy(&cm->cm_sense->data[0], &csio->sense_data, sense_len); break;