From owner-svn-src-head@FreeBSD.ORG Sat Aug 10 00:31:50 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 7AB98E3; Sat, 10 Aug 2013 00:31:50 +0000 (UTC) (envelope-from cognet@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6646A2CD7; Sat, 10 Aug 2013 00:31:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7A0VoUN006482; Sat, 10 Aug 2013 00:31:50 GMT (envelope-from cognet@svn.freebsd.org) Received: (from cognet@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7A0VoWd006481; Sat, 10 Aug 2013 00:31:50 GMT (envelope-from cognet@svn.freebsd.org) Message-Id: <201308100031.r7A0VoWd006481@svn.freebsd.org> From: Olivier Houchard Date: Sat, 10 Aug 2013 00:31:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r254171 - head/sys/arm/s3c2xx0 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: Sat, 10 Aug 2013 00:31:50 -0000 Author: cognet Date: Sat Aug 10 00:31:49 2013 New Revision: 254171 URL: http://svnweb.freebsd.org/changeset/base/254171 Log: - The address lies in the bus space handle, not in the cookie - Use the right address when calling kva_free() (Is there any reason why the s3c2xx0 comes with its own version of bs_map/ bs_unmap ? It seems to be just the same as in bus_space_generic.c) Modified: head/sys/arm/s3c2xx0/s3c2xx0_space.c Modified: head/sys/arm/s3c2xx0/s3c2xx0_space.c ============================================================================== --- head/sys/arm/s3c2xx0/s3c2xx0_space.c Sat Aug 10 00:06:56 2013 (r254170) +++ head/sys/arm/s3c2xx0/s3c2xx0_space.c Sat Aug 10 00:31:49 2013 (r254171) @@ -200,21 +200,21 @@ s3c2xx0_bs_map(void *t, bus_addr_t bpa, void s3c2xx0_bs_unmap(void *t, bus_space_handle_t h, bus_size_t size) { - vm_offset_t va, endva; + vm_offset_t va, endva, origva; - if (pmap_devmap_find_va((vm_offset_t)t, size) != NULL) { + if (pmap_devmap_find_va((vm_offset_t)h, size) != NULL) { /* Device was statically mapped; nothing to do. */ return; } - endva = round_page((vm_offset_t)t + size); - va = trunc_page((vm_offset_t)t); + endva = round_page((vm_offset_t)h + size); + origva = va = trunc_page((vm_offset_t)h); while (va < endva) { pmap_kremove(va); va += PAGE_SIZE; } - kva_free(va, endva - va); + kva_free(va, endva - origva); } int