From owner-p4-projects@FreeBSD.ORG Mon May 29 08:57:35 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CBD0916A42A; Mon, 29 May 2006 08:57:35 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 87FAC16A420 for ; Mon, 29 May 2006 08:57:35 +0000 (UTC) (envelope-from kevlo@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 39EFA43D46 for ; Mon, 29 May 2006 08:57:35 +0000 (GMT) (envelope-from kevlo@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4T8uMg6076525 for ; Mon, 29 May 2006 08:56:22 GMT (envelope-from kevlo@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4T8uMUx076522 for perforce@freebsd.org; Mon, 29 May 2006 08:56:22 GMT (envelope-from kevlo@freebsd.org) Date: Mon, 29 May 2006 08:56:22 GMT Message-Id: <200605290856.k4T8uMUx076522@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kevlo@freebsd.org using -f From: Kevin Lo To: Perforce Change Reviews Cc: Subject: PERFORCE change 98054 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 May 2006 08:57:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=98054 Change 98054 by kevlo@kevlo_rtsl on 2006/05/29 08:55:21 Implement s3c2xx0_bs_unmap. Affected files ... .. //depot/projects/arm/src/sys/arm/s3c2xx0/s3c2xx0_space.c#2 edit Differences ... ==== //depot/projects/arm/src/sys/arm/s3c2xx0/s3c2xx0_space.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $NetBSD: s3c2xx0_space.c,v 1.3 2003/09/03 03:15:02 mycroft Exp $ */ +/* $NetBSD: s3c2xx0_space.c,v 1.7 2005/11/24 13:08:32 yamt Exp $ */ /* * Copyright (c) 2002 Fujitsu Component Limited @@ -74,29 +74,24 @@ */ #include +__FBSDID("$FreeBSD$"); #include #include -#include -#include -#include -#include +#include #include +#include #include +#include #include -#include -#include #include -#include -#include /* Prototypes for all the bus_space structure functions */ bs_protos(s3c2xx0); bs_protos(generic); bs_protos(generic_armv4); -bs_protos(bs_notimpl); struct bus_space s3c2xx0_bs_tag = { /* cookie */ @@ -176,13 +171,14 @@ u_long startpa, endpa, pa; vm_offset_t va; pt_entry_t *pte; + const struct pmap_devmap *pd; - if ((u_long) bpa > (u_long) KERNBASE) { - /* Some IO registers (ex. UART ports for console) are mapped - * to fixed address by board specific routine. */ - *bshp = bpa; - return (0); + if ((pd = pmap_devmap_find_pa(bpa, size)) != NULL) { + /* Device was statically mapped. */ + *bshp = pd->pd_va + (bpa - pd->pd_pa); + return 0; } + startpa = trunc_page(bpa); endpa = round_page(bpa + size); @@ -200,18 +196,29 @@ if ((flag & BUS_SPACE_MAP_CACHEABLE) == 0) *pte &= ~L2_S_CACHE_MASK; } - return (0); } void s3c2xx0_bs_unmap(void *t, bus_size_t size) { + vm_offset_t va, endva; + + if (pmap_devmap_find_va((vm_offset_t)t, size) != NULL) { + /* Device was statically mapped; nothing to do. */ + return; + } - /* Nothing to do. */ + endva = round_page((vm_offset_t)t + size); + va = trunc_page((vm_offset_t)t); + + while (va < endva) { + pmap_kremove(va); + va += PAGE_SIZE; + } + kmem_free(kernel_map, va, endva - va); } - int s3c2xx0_bs_subregion(void *t, bus_space_handle_t bsh, bus_size_t offset, bus_size_t size, bus_space_handle_t * nbshp) @@ -241,6 +248,5 @@ void s3c2xx0_bs_free(void *t, bus_space_handle_t bsh, bus_size_t size) { - panic("s3c2xx0_io_bs_free(): not implemented\n"); }