From owner-svn-soc-all@FreeBSD.ORG Wed Jun 17 12:51:38 2015 Return-Path: Delivered-To: svn-soc-all@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 09ADF671 for ; Wed, 17 Jun 2015 12:51:38 +0000 (UTC) (envelope-from pratiksinghal@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EBCAC95E for ; Wed, 17 Jun 2015 12:51:37 +0000 (UTC) (envelope-from pratiksinghal@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5H9tdWA034822 for ; Wed, 17 Jun 2015 09:55:39 GMT (envelope-from pratiksinghal@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id t5H9tcm8034818 for svn-soc-all@FreeBSD.org; Wed, 17 Jun 2015 09:55:38 GMT (envelope-from pratiksinghal@FreeBSD.org) Date: Wed, 17 Jun 2015 09:55:38 GMT Message-Id: <201506170955.t5H9tcm8034818@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to pratiksinghal@FreeBSD.org using -f From: pratiksinghal@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r287228 - soc2015/pratiksinghal/cubie-head/sys/arm/allwinner MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Jun 2015 12:51:38 -0000 Author: pratiksinghal Date: Wed Jun 17 09:55:38 2015 New Revision: 287228 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=287228 Log: Removed the geom panic message by correcting the buffer address, DMA working completely now Modified: soc2015/pratiksinghal/cubie-head/sys/arm/allwinner/a10_mmc.c Modified: soc2015/pratiksinghal/cubie-head/sys/arm/allwinner/a10_mmc.c ============================================================================== --- soc2015/pratiksinghal/cubie-head/sys/arm/allwinner/a10_mmc.c Wed Jun 17 07:43:20 2015 (r287227) +++ soc2015/pratiksinghal/cubie-head/sys/arm/allwinner/a10_mmc.c Wed Jun 17 09:55:38 2015 (r287228) @@ -304,11 +304,10 @@ int desc, rem ; uint32_t val; desc = 0 ; - bus_addr_t paddr = sc->a10_dma_buff_addr ; //bus_size_t len = (sc->a10_dma_cb_arg).segs[0].ds_len ; bus_size_t len = A10_MMC_DMA_MAXLEN ; rem = min(len,cmd->data->len) ; - + device_printf(sc->a10_dev, "%d bytes to be transferred\n", rem) ; uint32_t error = bus_dmamap_load(sc->a10_dma_buff_tag, sc->a10_dma_buff_map, cmd->data->data,rem,a10_dma_buff_cb, &sc->a10_dma_buff_addr,BUS_DMA_NOWAIT) ; @@ -317,6 +316,7 @@ return EIO ; } + bus_addr_t paddr = sc->a10_dma_buff_addr ; /* Program all the descriptors in this segment. */ while(rem > 0) { @@ -399,7 +399,7 @@ static int a10_mmc_can_do_dma(struct mmc_request* req) { - if(req->cmd->data->len > A10_MMC_DMA_MAXLEN) + if(req->cmd->data->len >= A10_MMC_DMA_MAXLEN) return (0) ; else return (1) ;