From owner-p4-projects@FreeBSD.ORG Wed Apr 4 14:58:27 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EC9211065673; Wed, 4 Apr 2012 14:58:26 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AF2421065670 for ; Wed, 4 Apr 2012 14:58:26 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 96B838FC0C for ; Wed, 4 Apr 2012 14:58:26 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q34EwQQ4045946 for ; Wed, 4 Apr 2012 14:58:26 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q34EwQxH045943 for perforce@freebsd.org; Wed, 4 Apr 2012 14:58:26 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 4 Apr 2012 14:58:26 GMT Message-Id: <201204041458.q34EwQxH045943@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 209069 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Apr 2012 14:58:27 -0000 http://p4web.freebsd.org/@@209069?ac=10 Change 209069 by rwatson@rwatson_svr_ctsrd_mipsbuild on 2012/04/04 14:57:28 Fix two inverted assertions regarding block I/O sizes in the Altera SD Card IP Core driver. Fix an incorrect register offset that led commands to be written to the command argument register, causing block load/store operations to fail to occur. With these changes, it is now possibly to load blocks from FreeBSD on a CHERI MIPS processor using a 2G SD Card in the Terasic DE-4 board. I've not yet tried mounting a file system. Affected files ... .. //depot/projects/ctsrd/beribsd/src/sys/dev/altera/sdcard/altera_sdcard_io.c#6 edit Differences ... ==== //depot/projects/ctsrd/beribsd/src/sys/dev/altera/sdcard/altera_sdcard_io.c#6 (text+ko) ==== @@ -208,7 +208,7 @@ altera_sdcard_write_cmd(struct altera_sdcard_softc *sc, uint16_t cmd) { - bus_write_2(sc->as_res, ALTERA_SDCARD_OFF_CMD_ARG, htole16(cmd)); + bus_write_2(sc->as_res, ALTERA_SDCARD_OFF_CMD, htole16(cmd)); } static void @@ -216,7 +216,7 @@ size_t len) { - KASSERT(len > ALTERA_SDCARD_SECTORSIZE, + KASSERT(len <= ALTERA_SDCARD_SECTORSIZE, ("%s: invalid length %ju", __func__, len)); bus_read_region_1(sc->as_res, ALTERA_SDCARD_OFF_RXTX_BUFFER, data, @@ -228,7 +228,7 @@ size_t len) { - KASSERT(len > ALTERA_SDCARD_SECTORSIZE, + KASSERT(len <= ALTERA_SDCARD_SECTORSIZE, ("%s: invalid length %ju", __func__, len)); bus_write_region_1(sc->as_res, ALTERA_SDCARD_OFF_RXTX_BUFFER, data,