From owner-svn-src-projects@FreeBSD.ORG Fri Aug 1 13:44:34 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5450556F; Fri, 1 Aug 2014 13:44:34 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2823421A1; Fri, 1 Aug 2014 13:44:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s71DiYbp001672; Fri, 1 Aug 2014 13:44:34 GMT (envelope-from andrew@svn.freebsd.org) Received: (from andrew@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s71DiX4B001671; Fri, 1 Aug 2014 13:44:33 GMT (envelope-from andrew@svn.freebsd.org) Message-Id: <201408011344.s71DiX4B001671@svn.freebsd.org> From: Andrew Turner Date: Fri, 1 Aug 2014 13:44:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r269380 - projects/arm64/sys/arm64/arm64 X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Aug 2014 13:44:34 -0000 Author: andrew Date: Fri Aug 1 13:44:33 2014 New Revision: 269380 URL: http://svnweb.freebsd.org/changeset/base/269380 Log: Use the memmap_bus tag in nexus Modified: projects/arm64/sys/arm64/arm64/nexus.c Modified: projects/arm64/sys/arm64/arm64/nexus.c ============================================================================== --- projects/arm64/sys/arm64/arm64/nexus.c Fri Aug 1 13:39:49 2014 (r269379) +++ projects/arm64/sys/arm64/arm64/nexus.c Fri Aug 1 13:44:33 2014 (r269380) @@ -67,6 +67,8 @@ __FBSDID("$FreeBSD$"); #include "ofw_bus_if.h" #endif +extern struct bus_space memmap_bus; + static MALLOC_DEFINE(M_NEXUSDEV, "nexusdev", "Nexus device"); struct nexus_device { @@ -273,7 +275,6 @@ nexus_teardown_intr(device_t dev, device panic("nexus_teardown_intr"); } - static int nexus_activate_resource(device_t bus, device_t child, int type, int rid, struct resource *r) @@ -292,25 +293,12 @@ nexus_activate_resource(device_t bus, de if (type == SYS_RES_MEMORY || type == SYS_RES_IOPORT) { paddr = (bus_addr_t)rman_get_start(r); psize = (bus_size_t)rman_get_size(r); -#if 0 -#ifdef FDT - err = bus_space_map(fdtbus_bs_tag, paddr, psize, 0, &vaddr); + err = bus_space_map(&memmap_bus, paddr, psize, 0, &vaddr); if (err != 0) { rman_deactivate_resource(r); return (err); } - rman_set_bustag(r, fdtbus_bs_tag); -#else - vaddr = (bus_space_handle_t)pmap_mapdev((vm_offset_t)paddr, - (vm_size_t)psize); - if (vaddr == 0) { - rman_deactivate_resource(r); - return (ENOMEM); - } - rman_set_bustag(r, (void *)1); -#endif -#endif - panic("nexus_activate_resource"); + rman_set_bustag(r, &memmap_bus); rman_set_virtual(r, (void *)vaddr); rman_set_bushandle(r, vaddr); } @@ -328,14 +316,7 @@ nexus_deactivate_resource(device_t bus, vaddr = rman_get_bushandle(r); if (vaddr != 0) { -#if 0 -#ifdef FDT - bus_space_unmap(fdtbus_bs_tag, vaddr, psize); -#else - pmap_unmapdev((vm_offset_t)vaddr, (vm_size_t)psize); -#endif -#endif - panic("nexus_deactivate_resource"); + bus_space_unmap(&memmap_bus, vaddr, psize); rman_set_virtual(r, NULL); rman_set_bushandle(r, 0); }