From owner-svn-src-stable-9@FreeBSD.ORG Wed May 16 22:19:22 2012 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EA6DB1065678; Wed, 16 May 2012 22:19:22 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id BADC58FC16; Wed, 16 May 2012 22:19:22 +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 q4GMJMhp064895; Wed, 16 May 2012 22:19:22 GMT (envelope-from sbruno@svn.freebsd.org) Received: (from sbruno@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q4GMJMEs064892; Wed, 16 May 2012 22:19:22 GMT (envelope-from sbruno@svn.freebsd.org) Message-Id: <201205162219.q4GMJMEs064892@svn.freebsd.org> From: Sean Bruno Date: Wed, 16 May 2012 22:19:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r235525 - stable/9/sys/dev/mfi X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 May 2012 22:19:23 -0000 Author: sbruno Date: Wed May 16 22:19:22 2012 New Revision: 235525 URL: http://svn.freebsd.org/changeset/base/235525 Log: MFC r235318, r235321 Fix inappropriate data type for two bus_dmamap_t variables that were causing PAE to insta-panic on startup. Remove one unused variable that was commented out. Modified: stable/9/sys/dev/mfi/mfi_cam.c stable/9/sys/dev/mfi/mfivar.h Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/sys/dev/mfi/mfi_cam.c ============================================================================== --- stable/9/sys/dev/mfi/mfi_cam.c Wed May 16 22:13:02 2012 (r235524) +++ stable/9/sys/dev/mfi/mfi_cam.c Wed May 16 22:19:22 2012 (r235525) @@ -293,8 +293,8 @@ mfip_start(void *data) pt->header.data_len = csio->dxfer_len; pt->header.sense_len = MFI_SENSE_LEN; pt->header.cdb_len = csio->cdb_len; - pt->sense_addr_lo = cm->cm_sense_busaddr; - pt->sense_addr_hi = 0; + pt->sense_addr_lo = (uint32_t)cm->cm_sense_busaddr; + pt->sense_addr_hi = (uint32_t)((uint64_t)cm->cm_sense_busaddr >> 32); if (ccbh->flags & CAM_CDB_POINTER) bcopy(csio->cdb_io.cdb_ptr, &pt->cdb[0], csio->cdb_len); else Modified: stable/9/sys/dev/mfi/mfivar.h ============================================================================== --- stable/9/sys/dev/mfi/mfivar.h Wed May 16 22:13:02 2012 (r235524) +++ stable/9/sys/dev/mfi/mfivar.h Wed May 16 22:19:22 2012 (r235525) @@ -176,7 +176,7 @@ struct mfi_softc { // Start: LSIP200113393 bus_dma_tag_t verbuf_h_dmat; bus_dmamap_t verbuf_h_dmamap; - uint32_t verbuf_h_busaddr; + bus_addr_t verbuf_h_busaddr; uint32_t *verbuf; void *kbuff_arr[MAX_IOCTL_SGE]; bus_dma_tag_t mfi_kbuff_arr_dmat[2]; @@ -232,7 +232,7 @@ struct mfi_softc { bus_dma_tag_t mfi_sense_dmat; bus_dmamap_t mfi_sense_dmamap; - uint32_t mfi_sense_busaddr; + bus_addr_t mfi_sense_busaddr; struct mfi_sense *mfi_sense; struct resource *mfi_irq; @@ -319,7 +319,6 @@ struct mfi_softc { uint8_t * request_message_pool; uint8_t * request_message_pool_align; uint8_t * request_desc_pool; - //uint32_t request_desc_busaddr; bus_addr_t request_msg_busaddr; bus_addr_t reply_frame_busaddr; bus_addr_t sg_frame_busaddr;