From owner-svn-src-all@FreeBSD.ORG Sat Jul 16 19:56:07 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C8E51106564A; Sat, 16 Jul 2011 19:56:07 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 9F4548FC14; Sat, 16 Jul 2011 19:56:07 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p6GJu7El042017; Sat, 16 Jul 2011 19:56:07 GMT (envelope-from marcel@svn.freebsd.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p6GJu7Ci042014; Sat, 16 Jul 2011 19:56:07 GMT (envelope-from marcel@svn.freebsd.org) Message-Id: <201107161956.p6GJu7Ci042014@svn.freebsd.org> From: Marcel Moolenaar Date: Sat, 16 Jul 2011 19:56:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r224112 - in head/sys/ia64: ia64 include X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Jul 2011 19:56:07 -0000 Author: marcel Date: Sat Jul 16 19:56:07 2011 New Revision: 224112 URL: http://svn.freebsd.org/changeset/base/224112 Log: Add a few more helper functions for working with memory descriptors: o efi_md_find() - returns the md that covers the given address o efi_md_last() - returns the last md in the list o efi_md_prev() - returns the md that preceeds the given md. Modified: head/sys/ia64/ia64/efi.c head/sys/ia64/include/efi.h Modified: head/sys/ia64/ia64/efi.c ============================================================================== --- head/sys/ia64/ia64/efi.c Sat Jul 16 19:38:08 2011 (r224111) +++ head/sys/ia64/ia64/efi.c Sat Jul 16 19:56:07 2011 (r224112) @@ -161,20 +161,67 @@ efi_get_time(struct efi_tm *tm) struct efi_md * efi_md_first(void) { + struct efi_md *md; if (bootinfo->bi_memmap == 0) return (NULL); - return ((struct efi_md *)bootinfo->bi_memmap); + md = (struct efi_md *)bootinfo->bi_memmap; + return (md); +} + +struct efi_md * +efi_md_last(void) +{ + struct efi_md *md; + + if (bootinfo->bi_memmap == 0) + return (NULL); + md = (struct efi_md *)(bootinfo->bi_memmap + bootinfo->bi_memmap_size - + bootinfo->bi_memdesc_size); + return (md); } struct efi_md * efi_md_next(struct efi_md *md) { - uint64_t plim; + struct efi_md *lim; - plim = bootinfo->bi_memmap + bootinfo->bi_memmap_size; + lim = efi_md_last(); md = (struct efi_md *)((uintptr_t)md + bootinfo->bi_memdesc_size); - return ((md >= (struct efi_md *)plim) ? NULL : md); + return ((md > lim) ? NULL : md); +} + +struct efi_md * +efi_md_prev(struct efi_md *md) +{ + struct efi_md *lim; + + lim = efi_md_first(); + md = (struct efi_md *)((uintptr_t)md - bootinfo->bi_memdesc_size); + return ((md < lim) ? NULL : md); +} + +struct efi_md * +efi_md_find(vm_paddr_t pa) +{ + static struct efi_md *last = NULL; + struct efi_md *md, *p0, *p1; + + md = (last != NULL) ? last : efi_md_first(); + p1 = p0 = NULL; + while (md != NULL && md != p1) { + if (pa >= md->md_phys && + pa < md->md_phys + md->md_pages * EFI_PAGE_SIZE) { + last = md; + return (md); + } + + p1 = p0; + p0 = md; + md = (pa < md->md_phys) ? efi_md_prev(md) : efi_md_next(md); + } + + return (NULL); } void Modified: head/sys/ia64/include/efi.h ============================================================================== --- head/sys/ia64/include/efi.h Sat Jul 16 19:38:08 2011 (r224111) +++ head/sys/ia64/include/efi.h Sat Jul 16 19:56:07 2011 (r224112) @@ -161,8 +161,11 @@ void efi_boot_finish(void); int efi_boot_minimal(uint64_t); void *efi_get_table(struct uuid *); void efi_get_time(struct efi_tm *); +struct efi_md *efi_md_find(vm_paddr_t); struct efi_md *efi_md_first(void); +struct efi_md *efi_md_last(void); struct efi_md *efi_md_next(struct efi_md *); +struct efi_md *efi_md_prev(struct efi_md *); void efi_reset_system(void); int efi_set_time(struct efi_tm *); int efi_var_get(efi_char *, struct uuid *, uint32_t *, size_t *, void *);