diff --git a/sys/arch/x86/acpi/acpi_machdep.c b/sys/arch/x86/acpi/acpi_machdep.c index f8ab695d92a6..c313d78c537e 100644 --- a/sys/arch/x86/acpi/acpi_machdep.c +++ b/sys/arch/x86/acpi/acpi_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: acpi_machdep.c,v 1.10 2015/10/06 15:06:05 christos Exp $ */ +/* $NetBSD: acpi_machdep.c,v 1.11 2016/01/28 01:09:56 christos Exp $ */ /* * Copyright 2001 Wasabi Systems, Inc. @@ -40,7 +40,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: acpi_machdep.c,v 1.10 2015/10/06 15:06:05 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: acpi_machdep.c,v 1.11 2016/01/28 01:09:56 christos Exp $"); #include #include @@ -64,6 +64,8 @@ __KERNEL_RCSID(0, "$NetBSD: acpi_machdep.c,v 1.10 2015/10/06 15:06:05 christos E #include #include +#include + #include #include @@ -87,8 +89,16 @@ acpi_md_OsGetRootPointer(void) ACPI_PHYSICAL_ADDRESS PhysicalAddress; ACPI_STATUS Status; - Status = AcpiFindRootPointer(&PhysicalAddress); + /* If EFI is available, attempt to use it to locate the ACPI table. */ + if (efi_probe()) { + PhysicalAddress = efi_getcfgtblpa(&EFI_UUID_ACPI20); + if (!PhysicalAddress) + PhysicalAddress = efi_getcfgtblpa(&EFI_UUID_ACPI10); + if (PhysicalAddress) + return PhysicalAddress; + } + Status = AcpiFindRootPointer(&PhysicalAddress); if (ACPI_FAILURE(Status)) PhysicalAddress = 0; diff --git a/sys/arch/x86/conf/files.x86 b/sys/arch/x86/conf/files.x86 index 2edb65fb566e..95f12d0e1806 100644 --- a/sys/arch/x86/conf/files.x86 +++ b/sys/arch/x86/conf/files.x86 @@ -1,4 +1,4 @@ -# $NetBSD: files.x86,v 1.85 2015/11/11 08:20:22 skrll Exp $ +# $NetBSD: files.x86,v 1.86 2016/01/28 01:09:56 christos Exp $ # options for MP configuration through the MP spec defflag opt_mpbios.h MPBIOS MPVERBOSE MPDEBUG MPBIOS_SCANPCI @@ -73,6 +73,7 @@ file arch/x86/x86/core_machdep.c coredump file arch/x86/x86/cpu_topology.c machdep file arch/x86/x86/db_memrw.c ddb | kgdb file arch/x86/x86/db_trace.c ddb +file arch/x86/x86/efi.c machdep file arch/x86/x86/errata.c machdep file arch/x86/x86/genfb_machdep.c machdep file arch/x86/x86/identcpu.c machdep diff --git a/sys/arch/x86/include/bootinfo.h b/sys/arch/x86/include/bootinfo.h index d79eb5f24cc7..a31b4f373549 100644 --- a/sys/arch/x86/include/bootinfo.h +++ b/sys/arch/x86/include/bootinfo.h @@ -1,4 +1,4 @@ -/* $NetBSD: bootinfo.h,v 1.23 2013/08/30 16:42:17 jmcneill Exp $ */ +/* $NetBSD: bootinfo.h,v 1.24 2016/01/28 01:09:56 christos Exp $ */ /* * Copyright (c) 1997 @@ -38,6 +38,11 @@ #define BTINFO_MODULELIST 11 #define BTINFO_FRAMEBUFFER 12 #define BTINFO_USERCONFCOMMANDS 13 +#define BTINFO_EFI 14 + +#define BTINFO_STR "bootpath", "rootdevice", "bootdisk", "netif", \ + "console", "biosgeom", "symtab", "memmap", "bootwedge", "modulelist", \ + "framebuffer", "userconfcommands", "efi", #ifndef _LOCORE @@ -213,6 +218,12 @@ struct btinfo_userconfcommands { /* bi_userconfcommand list follows */ }; +/* EFI Information */ +struct btinfo_efi { + struct btinfo_common common; + paddr_t bi_systbl; /* Physical address of the EFI System Table */ +}; + #endif /* _LOCORE */ #ifdef _KERNEL @@ -237,6 +248,7 @@ struct bootinfo { extern struct bootinfo bootinfo; void *lookup_bootinfo(int); +void aprint_bootinfo(void); #endif /* _LOCORE */ #endif /* _KERNEL */ diff --git a/sys/arch/x86/include/efi.h b/sys/arch/x86/include/efi.h new file mode 100644 index 000000000000..572c844609f3 --- /dev/null +++ b/sys/arch/x86/include/efi.h @@ -0,0 +1,175 @@ +/* $NetBSD: efi.h,v 1.1 2016/01/28 01:09:56 christos Exp $ */ + +/*- + * Copyright (c) 2004 Marcel Moolenaar + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * $FreeBSD$ + */ + +/* This file is mainly ia64/include/efi.h with little modifications. */ + +#ifndef _X86_EFI_H_ +#define _X86_EFI_H_ + +#include + +#define EFI_PAGE_SHIFT 12 +#define EFI_PAGE_SIZE (1 << EFI_PAGE_SHIFT) +#define EFI_PAGE_MASK (EFI_PAGE_SIZE - 1) + +extern const struct uuid EFI_UUID_ACPI20; +extern const struct uuid EFI_UUID_ACPI10; + +#define EFI_TABLE_SAL \ + {0xeb9d2d32,0x2d88,0x11d3,0x9a,0x16,{0x00,0x90,0x27,0x3f,0xc1,0x4d}} + +enum efi_reset { + EFI_RESET_COLD, + EFI_RESET_WARM +}; + +typedef uint16_t efi_char; +typedef unsigned long efi_status; + + +struct efi_cfgtbl { + struct uuid ct_uuid; + uint64_t ct_data; +}; +struct efi_md { + uint32_t md_type; +#define EFI_MD_TYPE_NULL 0 +#define EFI_MD_TYPE_CODE 1 /* Loader text. */ +#define EFI_MD_TYPE_DATA 2 /* Loader data. */ +#define EFI_MD_TYPE_BS_CODE 3 /* Boot services text. */ +#define EFI_MD_TYPE_BS_DATA 4 /* Boot services data. */ +#define EFI_MD_TYPE_RT_CODE 5 /* Runtime services text. */ +#define EFI_MD_TYPE_RT_DATA 6 /* Runtime services data. */ +#define EFI_MD_TYPE_FREE 7 /* Unused/free memory. */ +#define EFI_MD_TYPE_BAD 8 /* Bad memory */ +#define EFI_MD_TYPE_RECLAIM 9 /* ACPI reclaimable memory. */ +#define EFI_MD_TYPE_FIRMWARE 10 /* ACPI NV memory */ +#define EFI_MD_TYPE_IOMEM 11 /* Memory-mapped I/O. */ +#define EFI_MD_TYPE_IOPORT 12 /* I/O port space. */ +#define EFI_MD_TYPE_PALCODE 13 /* PAL */ + uint32_t __pad; + uint64_t md_phys; + void *md_virt; + uint64_t md_pages; + uint64_t md_attr; +#define EFI_MD_ATTR_UC 0x0000000000000001UL +#define EFI_MD_ATTR_WC 0x0000000000000002UL +#define EFI_MD_ATTR_WT 0x0000000000000004UL +#define EFI_MD_ATTR_WB 0x0000000000000008UL +#define EFI_MD_ATTR_UCE 0x0000000000000010UL +#define EFI_MD_ATTR_WP 0x0000000000001000UL +#define EFI_MD_ATTR_RP 0x0000000000002000UL +#define EFI_MD_ATTR_XP 0x0000000000004000UL +#define EFI_MD_ATTR_RT 0x8000000000000000UL +}; + +struct efi_tm { + uint16_t tm_year; /* 1998 - 20XX */ + uint8_t tm_mon; /* 1 - 12 */ + uint8_t tm_mday; /* 1 - 31 */ + uint8_t tm_hour; /* 0 - 23 */ + uint8_t tm_min; /* 0 - 59 */ + uint8_t tm_sec; /* 0 - 59 */ + uint8_t __pad1; + uint32_t tm_nsec; /* 0 - 999,999,999 */ + int16_t tm_tz; /* -1440 to 1440 or 2047 */ + uint8_t tm_dst; + uint8_t __pad2; +}; + +struct efi_tmcap { + uint32_t tc_res; /* 1e-6 parts per million */ + uint32_t tc_prec; /* hertz */ + uint8_t tc_stz; /* Set clears sub-second time */ +}; + +struct efi_tblhdr { + uint64_t th_sig; + uint32_t th_rev; + uint32_t th_hdrsz; + uint32_t th_crc32; + uint32_t __res; +}; + +struct efi_rt { + struct efi_tblhdr rt_hdr; + efi_status (*rt_gettime)(struct efi_tm *, struct efi_tmcap *); + efi_status (*rt_settime)(struct efi_tm *); + efi_status (*rt_getwaketime)(uint8_t *, uint8_t *, + struct efi_tm *); + efi_status (*rt_setwaketime)(uint8_t, struct efi_tm *); + efi_status (*rt_setvirtual)(u_long, u_long, uint32_t, + struct efi_md *); + efi_status (*rt_cvtptr)(u_long, void **); + efi_status (*rt_getvar)(efi_char *, struct uuid *, uint32_t *, + u_long *, void *); + efi_status (*rt_scanvar)(u_long *, efi_char *, struct uuid *); + efi_status (*rt_setvar)(efi_char *, struct uuid *, uint32_t, + u_long, void *); + efi_status (*rt_gethicnt)(uint32_t *); + efi_status (*rt_reset)(enum efi_reset, efi_status, u_long, + efi_char *); +}; + +struct efi_systbl { + struct efi_tblhdr st_hdr; +#define EFI_SYSTBL_SIG 0x5453595320494249UL + efi_char *st_fwvendor; + uint32_t st_fwrev; + uint32_t __pad; + void *st_cin; + void *st_cinif; + void *st_cout; + void *st_coutif; + void *st_cerr; + void *st_cerrif; + uint64_t st_rt; + void *st_bs; + u_long st_entries; + uint64_t st_cfgtbl; +}; + +bool efi_probe(void); +paddr_t efi_getsystblpa(void); +struct efi_systbl *efi_getsystbl(void); +paddr_t efi_getcfgtblpa(const struct uuid*); +void *efi_getcfgtbl(const struct uuid*); +/* +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_first(void); +struct efi_md *efi_md_next(struct efi_md *); +void efi_reset_system(void); +efi_status efi_set_time(struct efi_tm *); +*/ + +#endif /* _X86_EFI_H_ */ diff --git a/sys/arch/x86/x86/efi.c b/sys/arch/x86/x86/efi.c new file mode 100644 index 000000000000..6a810b9a49d8 --- /dev/null +++ b/sys/arch/x86/x86/efi.c @@ -0,0 +1,287 @@ +/* $NetBSD: efi.c,v 1.1 2016/01/28 01:09:56 christos Exp $ */ +/*- + * Copyright (c) 2016 The NetBSD Foundation, Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ +#include +__KERNEL_RCSID(0, "$NetBSD: efi.c,v 1.1 2016/01/28 01:09:56 christos Exp $"); +#include +#include +#include +#include + +#include + +#include +#include + +#include + +const struct uuid EFI_UUID_ACPI20 = { + .time_low = 0x8868e871, + .time_mid = 0xe4f1, + .time_hi_and_version = 0x11d3, + .clock_seq_hi_and_reserved = 0xbc, + .clock_seq_low = 0x22, + .node = {0x0, 0x80, 0xc7, 0x3c, 0x88, 0x81} +}; +const struct uuid EFI_UUID_ACPI10 = { + .time_low = 0xeb9d2d30, + .time_mid = 0x2d88, + .time_hi_and_version = 0x11d3, + .clock_seq_hi_and_reserved = 0x9a, + .clock_seq_low = 0x16, + .node = {0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d} +}; + +vaddr_t efi_getva(paddr_t); +void efi_relva(vaddr_t); +struct efi_cfgtbl *efi_getcfgtblhead(void); +void efi_aprintcfgtbl(void); +void efi_aprintuuid(const struct uuid *); +bool efi_uuideq(const struct uuid *, const struct uuid *); + +static struct efi_systbl *efi_systbl_va = NULL; +static struct efi_cfgtbl *efi_cfgtblhead_va = NULL; + +/* + * Map a physical address (PA) to a newly allocated virtual address (VA). + * The VA must be freed using efi_relva(). + */ +vaddr_t +efi_getva(paddr_t pa) +{ + vaddr_t va; + +#ifdef __HAVE_MM_MD_DIRECT_MAPPED_PHYS + mm_md_direct_mapped_phys(pa, &va); +#else + /* XXX This code path is not tested. */ + va = uvm_km_alloc(kernel_map, PAGE_SIZE, 0, + UVM_KMF_VAONLY | UVM_KMF_WAITVA); + if (va == 0) { + aprint_debug("efi: unable to allocate va\n"); + return NULL; + } + pmap_kenter_pa(va, pa, VM_PROT_READ, 0); + pmap_update(pmap_kernel()); +#endif + return va; +} + +/* + * Free a virtual address (VA) allocated using efi_getva(). + */ +void +efi_relva(vaddr_t va) +{ +#ifdef __HAVE_MM_MD_DIRECT_MAPPED_PHYS + /* XXX Should we free the va? */ +#else + /* XXX This code path is not tested. */ + uvm_km_free(kernel_map, va, PAGE_SIZE, UVM_KMF_VAONLY); +#endif +} + +/* + * Test if 2 UUIDs matches. + */ +bool +efi_uuideq(const struct uuid * a, const struct uuid * b) +{ + return !memcmp(a, b, sizeof(struct uuid)); +} + +/* + * Print an UUID in a human-readable manner. + */ +void +efi_aprintuuid(const struct uuid * uuid) +{ + int i; + + aprint_debug(" %08" PRIx32 "", uuid->time_low); + aprint_debug("-%04" PRIx16 "", uuid->time_mid); + aprint_debug("-%04" PRIx16 "", uuid->time_hi_and_version); + aprint_debug("-%02" PRIx8 "", uuid->clock_seq_hi_and_reserved); + aprint_debug("-%02" PRIx8 "", uuid->clock_seq_low); + aprint_debug("-"); + for (i = 0; i < _UUID_NODE_LEN; i++) { + aprint_debug("%02" PRIx8 "", uuid->node[i]); + } + /* If known, also print the human-readable name */ + if (efi_uuideq(uuid, &EFI_UUID_ACPI20)) { + aprint_debug(" ACPI 2.0"); + } else if (efi_uuideq(uuid, &EFI_UUID_ACPI10)) { + aprint_debug(" ACPI 1.0"); + } +} + +/* + * Return the VA of the cfgtbl. Must be freed using efi_relva(). + */ +struct efi_cfgtbl * +efi_getcfgtblhead(void) +{ + paddr_t pa; + vaddr_t va; + + if (efi_cfgtblhead_va == NULL) + return NULL; + + pa = (paddr_t) efi_systbl_va->st_cfgtbl; + aprint_debug("efi: cfgtbl at pa %" PRIx64 "\n", pa); + va = efi_getva(pa); + aprint_debug("efi: cfgtbl mapped at va %" PRIx64 "\n", va); + efi_cfgtblhead_va = (struct efi_cfgtbl *) va; + efi_aprintcfgtbl(); + + return efi_cfgtblhead_va; +} + +/* + * Print the config tables. + */ +void +efi_aprintcfgtbl(void) +{ + struct efi_cfgtbl *ct; + unsigned long count; + + ct = efi_cfgtblhead_va; + count = efi_systbl_va->st_entries; + aprint_debug("efi: %lu cfgtbl entries:\n", count); + for (; count; count--, ct++) { + aprint_debug("efi: %16" PRIx64 "", ct->ct_data); + efi_aprintuuid(&ct->ct_uuid); + aprint_debug("\n"); + } +} + +/* + * Return the VA of the config table with the given UUID if found. + * The VA must be freed using efi_relva(). + */ +void * +efi_getcfgtbl(const struct uuid * uuid) +{ + paddr_t pa; + vaddr_t va; + + pa = efi_getcfgtblpa(uuid); + if (pa == 0) + return NULL; + va = efi_getva(pa); + return (void *) va; +} + +/* + * Return the PA of the first config table. + */ +paddr_t +efi_getcfgtblpa(const struct uuid * uuid) +{ + struct efi_cfgtbl *ct; + unsigned long count; + + ct = efi_cfgtblhead_va; + count = efi_systbl_va->st_entries; + for (; count; count--, ct++) + if (efi_uuideq(&ct->ct_uuid, uuid)) + return (paddr_t) ct->ct_data; + + return 0; /* Not found. */ +} + +/* Return the PA of the EFI System Table. */ +paddr_t +efi_getsystblpa(void) +{ + struct btinfo_efi *bi; + paddr_t pa; + + bi = lookup_bootinfo(BTINFO_EFI); + if (bi == NULL) { + /* Unable to locate the EFI System Table. */ + return 0; + } + pa = bi->bi_systbl; + return pa; +} + +/* + * Return a pointer to the EFI System Table. The pointer must be freed using + * efi_relva(). + */ +struct efi_systbl * +efi_getsystbl(void) +{ + if (!efi_systbl_va) { + paddr_t pa; + vaddr_t va; + struct efi_systbl *systbl; + + pa = efi_getsystblpa(); + if (pa == 0) + return NULL; + aprint_normal("efi: systbl at pa %" PRIx64 "\n", pa); + va = efi_getva(pa); + aprint_debug("efi: systbl mapped at va %" PRIx64 "\n", va); + systbl = (struct efi_systbl *) va; + /* XXX Check the signature and the CRC32 */ + aprint_debug("efi: signature %" PRIx64 " revision %" PRIx32 + " crc32 %" PRIx32 "\n", systbl->st_hdr.th_sig, + systbl->st_hdr.th_rev, systbl->st_hdr.th_crc32); + aprint_debug("efi: firmware revision %" PRIx32 "\n", + systbl->st_fwrev); + /* + * XXX Also print fwvendor, which is an UCS-2 string (use + * some UTF-16 routine?) + */ + aprint_debug("efi: runtime services at pa %" PRIx64 "\n", + systbl->st_rt); + aprint_debug("efi: boot services at pa %" PRIx64 "\n", + (uint64_t) systbl->st_bs); + efi_systbl_va = systbl; + } + return efi_systbl_va; +} + +/* + * EFI is available if we are able to locate the EFI System Table. + */ +bool +efi_probe(void) +{ + if (efi_getsystbl() == 0) { + aprint_debug("efi: missing or invalid systbl"); + return false; + } + if (efi_getcfgtblhead() == 0) { + aprint_debug("efi: missing or invalid cfgtbl"); + efi_relva((vaddr_t) efi_systbl_va); + return false; + } + return true; +}