From owner-svn-src-all@FreeBSD.ORG Tue Nov 10 00:46:09 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DC4AB106566B; Tue, 10 Nov 2009 00:46:08 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id C0A9B8FC1A; Tue, 10 Nov 2009 00:46:08 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nAA0k8Pg040293; Tue, 10 Nov 2009 00:46:08 GMT (envelope-from delphij@svn.freebsd.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAA0k8J8040290; Tue, 10 Nov 2009 00:46:08 GMT (envelope-from delphij@svn.freebsd.org) Message-Id: <200911100046.nAA0k8J8040290@svn.freebsd.org> From: Xin LI Date: Tue, 10 Nov 2009 00:46:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r199122 - releng/8.0/sys/dev/arcmsr X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Nov 2009 00:46:09 -0000 Author: delphij Date: Tue Nov 10 00:46:08 2009 New Revision: 199122 URL: http://svn.freebsd.org/changeset/base/199122 Log: MFC revision 199069 (MF8 199120): Initialize the whole message unit's DMA buffer to zero, this fixes a panic during boot when ARC1200 is being used with certain motherboard models. This commit brings the driver to the same state of vendor's 1.20.00.16 release. Many thanks to Areca for their continued support to FreeBSD. Reported by: Jirka Mikulas Submitted by: Erich Chen (Areca) Approved by: re (kensmith) Modified: releng/8.0/sys/dev/arcmsr/arcmsr.c releng/8.0/sys/dev/arcmsr/arcmsr.h Directory Properties: releng/8.0/sys/ (props changed) releng/8.0/sys/amd64/include/xen/ (props changed) releng/8.0/sys/cddl/contrib/opensolaris/ (props changed) releng/8.0/sys/contrib/dev/acpica/ (props changed) releng/8.0/sys/contrib/pf/ (props changed) releng/8.0/sys/dev/xen/xenpci/ (props changed) Modified: releng/8.0/sys/dev/arcmsr/arcmsr.c ============================================================================== --- releng/8.0/sys/dev/arcmsr/arcmsr.c Tue Nov 10 00:41:22 2009 (r199121) +++ releng/8.0/sys/dev/arcmsr/arcmsr.c Tue Nov 10 00:46:08 2009 (r199122) @@ -55,6 +55,8 @@ ** 1.20.00.14 02/05/2007 Erich Chen bug fix for incorrect ccb_h.status report ** and cause g_vfs_done() read write error ** 1.20.00.15 10/10/2007 Erich Chen support new RAID adapter type ARC120x +** 1.20.00.16 10/10/2009 Erich Chen Bug fix for RAID adapter type ARC120x +** bus_dmamem_alloc() with BUS_DMA_ZERO ****************************************************************************************** * $FreeBSD$ */ @@ -2903,7 +2905,7 @@ static u_int32_t arcmsr_initialize(devic } /* Allocation for our srbs */ if(bus_dmamem_alloc(acb->srb_dmat, (void **)&acb->uncacheptr - , BUS_DMA_WAITOK | BUS_DMA_COHERENT, &acb->srb_dmamap) != 0) { + , BUS_DMA_WAITOK | BUS_DMA_COHERENT | BUS_DMA_ZERO, &acb->srb_dmamap) != 0) { bus_dma_tag_destroy(acb->srb_dmat); bus_dma_tag_destroy(acb->dm_segs_dmat); bus_dma_tag_destroy(acb->parent_dmat); Modified: releng/8.0/sys/dev/arcmsr/arcmsr.h ============================================================================== --- releng/8.0/sys/dev/arcmsr/arcmsr.h Tue Nov 10 00:41:22 2009 (r199121) +++ releng/8.0/sys/dev/arcmsr/arcmsr.h Tue Nov 10 00:46:08 2009 (r199122) @@ -37,7 +37,7 @@ ************************************************************************** * $FreeBSD$ */ -#define ARCMSR_DRIVER_VERSION "Driver Version 1.20.00.15 2007-10-07" +#define ARCMSR_DRIVER_VERSION "Driver Version 1.20.00.16 2009-10-10" #define ARCMSR_SCSI_INITIATOR_ID 255 #define ARCMSR_DEV_SECTOR_SIZE 512 #define ARCMSR_MAX_XFER_SECTORS 4096