From owner-svn-src-head@FreeBSD.ORG Tue Mar 26 23:04:07 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 033AFE58; Tue, 26 Mar 2013 23:04:07 +0000 (UTC) (envelope-from jimharris@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id EA20CB15; Tue, 26 Mar 2013 23:04:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2QN46XM049103; Tue, 26 Mar 2013 23:04:06 GMT (envelope-from jimharris@svn.freebsd.org) Received: (from jimharris@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2QN467c049101; Tue, 26 Mar 2013 23:04:06 GMT (envelope-from jimharris@svn.freebsd.org) Message-Id: <201303262304.r2QN467c049101@svn.freebsd.org> From: Jim Harris Date: Tue, 26 Mar 2013 23:04:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r248775 - head/sys/dev/isci X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Mar 2013 23:04:07 -0000 Author: jimharris Date: Tue Mar 26 23:04:06 2013 New Revision: 248775 URL: http://svnweb.freebsd.org/changeset/base/248775 Log: Report support for unmapped I/O by adding PIM_UNMAPPED flag. Submitted by: jhb, scottl Modified: head/sys/dev/isci/isci_controller.c head/sys/dev/isci/isci_io_request.c Modified: head/sys/dev/isci/isci_controller.c ============================================================================== --- head/sys/dev/isci/isci_controller.c Tue Mar 26 22:46:56 2013 (r248774) +++ head/sys/dev/isci/isci_controller.c Tue Mar 26 23:04:06 2013 (r248775) @@ -673,7 +673,8 @@ void isci_action(struct cam_sim *sim, un cpi->version_num = 1; cpi->hba_inquiry = PI_TAG_ABLE; cpi->target_sprt = 0; - cpi->hba_misc = PIM_NOBUSRESET | PIM_SEQSCAN; + cpi->hba_misc = PIM_NOBUSRESET | PIM_SEQSCAN | + PIM_UNMAPPED; cpi->hba_eng_cnt = 0; cpi->max_target = SCI_MAX_REMOTE_DEVICES - 1; cpi->max_lun = ISCI_MAX_LUN; Modified: head/sys/dev/isci/isci_io_request.c ============================================================================== --- head/sys/dev/isci/isci_io_request.c Tue Mar 26 22:46:56 2013 (r248774) +++ head/sys/dev/isci/isci_io_request.c Tue Mar 26 23:04:06 2013 (r248775) @@ -747,10 +747,6 @@ isci_io_request_execute_scsi_io(union cc io_request->current_sge_index = 0; io_request->parent.remote_device_handle = device->sci_object; - if ((ccb->ccb_h.flags & CAM_DATA_MASK) != CAM_DATA_VADDR) - panic("Unexpected cam data format! flags = 0x%x\n", - ccb->ccb_h.flags); - error = bus_dmamap_load_ccb(io_request->parent.dma_tag, io_request->parent.dma_map, ccb, isci_io_request_construct, io_request, 0x0);