Author: kevans
Date: Thu Mar 15 20:09:24 2018
New Revision: 331023
URL: https://svnweb.freebsd.org/changeset/base/331023
Log:
Revert r331022: MFC of EFI Runtime Service support on aarch64
Apologies; this is NOT an MFC'able change. It requires a good number of pcb
changes that would break KBI.
Pointy hat to: me
Deleted:
stable/11/sys/arm64/arm64/efirt_machdep.c
Modified:
stable/11/sys/arm64/arm64/machdep.c
stable/11/sys/arm64/include/efi.h
stable/11/sys/conf/files.arm64
stable/11/sys/conf/options.arm64
stable/11/sys/modules/Makefile
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/arm64/arm64/machdep.c
==============================================================================
--- stable/11/sys/arm64/arm64/machdep.c Thu Mar 15 19:56:44 2018
(r331022)
+++ stable/11/sys/arm64/arm64/machdep.c Thu Mar 15 20:09:24 2018
(r331023)
@@ -111,12 +111,6 @@ int64_t idcache_line_size; /* The minimum cache line s
int64_t dczva_line_size; /* The size of cache line the dc zva zeroes */
int has_pan;
-/*
- * Physical address of the EFI System Table. Stashed from the metadata hints
- * passed into the kernel and used by the EFI code to call runtime services.
- */
-vm_paddr_t efi_systbl_phys;
-
/* pagezero_* implementations are provided in support.S */
void pagezero_simple(void *);
void pagezero_cache(void *);
@@ -916,8 +910,6 @@ initarm(struct arm64_bootparams *abp)
#ifdef FDT
try_load_dtb(kmdp);
#endif
-
- efi_systbl_phys = MD_FETCH(kmdp, MODINFOMD_FW_HANDLE, vm_paddr_t);
/* Find the address to start allocating from */
lastaddr = MD_FETCH(kmdp, MODINFOMD_KERNEND, vm_offset_t);
Modified: stable/11/sys/arm64/include/efi.h
==============================================================================
--- stable/11/sys/arm64/include/efi.h Thu Mar 15 19:56:44 2018
(r331022)
+++ stable/11/sys/arm64/include/efi.h Thu Mar 15 20:09:24 2018
(r331023)
@@ -1,32 +1,6 @@
/*-
- * Copyright (c) 2017 Andrew Turner
- * All rights reserved.
+ * This file is in the public domain since it's just boilerplate.
*
- * This software was developed by SRI International and the University of
- * Cambridge Computer Laboratory under DARPA/AFRL contract FA8750-10-C-0237
- * ("CTSRD"), as part of the DARPA CRASH research programme.
- *
- * 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 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 AUTHOR 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.
- *
* $FreeBSD$
*/
@@ -34,11 +8,5 @@
#define __ARM64_INCLUDE_EFI_H_
#define EFIABI_ATTR
-
-#ifdef _KERNEL
-#define EFI_TIME_LOCK()
-#define EFI_TIME_UNLOCK()
-#define EFI_TIME_OWNED()
-#endif
#endif /* __ARM64_INCLUDE_EFI_H_ */
Modified: stable/11/sys/conf/files.arm64
==============================================================================
--- stable/11/sys/conf/files.arm64 Thu Mar 15 19:56:44 2018
(r331022)
+++ stable/11/sys/conf/files.arm64 Thu Mar 15 20:09:24 2018
(r331023)
@@ -35,7 +35,6 @@ arm64/arm64/db_trace.c optional ddb
arm64/arm64/debug_monitor.c optional ddb
arm64/arm64/disassem.c optional ddb
arm64/arm64/dump_machdep.c standard
-arm64/arm64/efirt_machdep.c optional efirt
arm64/arm64/elf_machdep.c standard
arm64/arm64/exception.S standard
arm64/arm64/gicv3_its.c optional intrng
Modified: stable/11/sys/conf/options.arm64
==============================================================================
--- stable/11/sys/conf/options.arm64 Thu Mar 15 19:56:44 2018
(r331022)
+++ stable/11/sys/conf/options.arm64 Thu Mar 15 20:09:24 2018
(r331023)
@@ -7,10 +7,6 @@ SOCDEV_VA opt_global.h
THUNDERX_PASS_1_1_ERRATA opt_global.h
VFP opt_global.h
-# EFI Runtime services support
-EFIRT opt_efirt.h
-
-# Devices
DEV_PSCI opt_platform.h
# SoC Support
Modified: stable/11/sys/modules/Makefile
==============================================================================
--- stable/11/sys/modules/Makefile Thu Mar 15 19:56:44 2018
(r331022)
+++ stable/11/sys/modules/Makefile Thu Mar 15 20:09:24 2018
(r331023)
@@ -560,7 +560,6 @@ _cxgb= cxgb
.endif
.if ${MACHINE_CPUARCH} == "aarch64"
-_efirt= efirt
_em= em
_igb= igb
.endif
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
