Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-8]: src/sys/arch/i386/stand Pull up following revision(s) (reques...
details: https://anonhg.NetBSD.org/src/rev/ea35c6c3070f
branches: netbsd-8
changeset: 453048:ea35c6c3070f
user: martin <martin%NetBSD.org@localhost>
date: Thu Aug 01 13:22:48 2019 +0000
description:
Pull up following revision(s) (requested by nonaka in ticket #1309):
sys/arch/i386/stand/lib/exec.c: revision 1.73
sys/arch/i386/stand/efiboot/efiboot.c: revision 1.10
sys/arch/i386/stand/lib/libi386.h: revision 1.44
sys/arch/i386/stand/efiboot/efimemory.c: revision 1.6
sys/arch/i386/stand/efiboot/efimemory.c: revision 1.7
sys/arch/i386/stand/efiboot/efimemory.c: revision 1.8
sys/arch/i386/stand/efiboot/efiboot.c: revision 1.9
sys/arch/i386/stand/efiboot/boot.c: revision 1.12
sys/arch/i386/stand/efiboot/boot.c: revision 1.13
sys/arch/i386/stand/efiboot/efiboot.h: revision 1.9
sys/arch/i386/stand/efiboot/Makefile.efiboot: revision 1.15
sys/arch/i386/stand/efiboot/dev_net.c: revision 1.2
Added tftp support to x86 efiboot.
Pre-allocate memory for the kernel space at startup.
Added BTINFO_EFIMEMMAP compaction support to x86 efiboot.
Sync the output of memmap command to the output of stand/efiboot mem command.
Added missing efi_memory_probe() call.
diffstat:
sys/arch/i386/stand/efiboot/Makefile.efiboot | 9 +-
sys/arch/i386/stand/efiboot/boot.c | 37 +---
sys/arch/i386/stand/efiboot/dev_net.c | 257 ++++++++++++++++++++++++++-
sys/arch/i386/stand/efiboot/efiboot.c | 4 +-
sys/arch/i386/stand/efiboot/efiboot.h | 6 +-
sys/arch/i386/stand/efiboot/efimemory.c | 174 ++++++++++++-----
sys/arch/i386/stand/lib/exec.c | 51 +-----
sys/arch/i386/stand/lib/libi386.h | 3 +-
8 files changed, 401 insertions(+), 140 deletions(-)
diffs (truncated from 765 to 300 lines):
diff -r 7b1573bac376 -r ea35c6c3070f sys/arch/i386/stand/efiboot/Makefile.efiboot
--- a/sys/arch/i386/stand/efiboot/Makefile.efiboot Sat Jul 27 17:11:56 2019 +0000
+++ b/sys/arch/i386/stand/efiboot/Makefile.efiboot Thu Aug 01 13:22:48 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.efiboot,v 1.9.2.3 2018/04/11 14:51:43 martin Exp $
+# $NetBSD: Makefile.efiboot,v 1.9.2.4 2019/08/01 13:22:48 martin Exp $
S= ${.CURDIR}/../../../../..
@@ -14,7 +14,9 @@
SOURCES+= efinet.c efipxe.c
LIBI386SRCS= biosdisk.c bootinfo.c bootinfo_biosgeom.c bootmenu.c
LIBI386SRCS+= diskbuf.c exec.c menuutils.c parseutils.c pread.c
-SRCS= ${SOURCES} ${EXTRA_SOURCES} ${LIBI386SRCS}
+# use our own nfs implementation
+LIBSASRCS+= nfs.c
+SRCS= ${SOURCES} ${EXTRA_SOURCES} ${LIBI386SRCS} ${LIBSASRCS}
PIE_CFLAGS=
PIE_LDFLAGS=
@@ -35,6 +37,7 @@
.PATH: ${.CURDIR} ${.CURDIR}/..
.PATH: ${.CURDIR}/../../lib
+.PATH: ${.CURDIR}/../../libsa
LDSCRIPT?= ${.CURDIR}/ldscript
LDFLAGS+= -nostdlib -T${LDSCRIPT} -Bsymbolic -shared -nocombreloc
@@ -60,7 +63,7 @@
CPPFLAGS+= -DSUPPORT_BOOTP
CPPFLAGS+= -DSUPPORT_DHCP
CPPFLAGS+= -DSUPPORT_NFS
-#CPPFLAGS+= -DSUPPORT_TFTP
+CPPFLAGS+= -DSUPPORT_TFTP
CPPFLAGS+= -DPASS_BIOSGEOM
CPPFLAGS+= -DBIOSDISK_DEFAULT_SECSIZE=2048 # for bootinfo_biosgeom.c
CPPFLAGS+= -DLIBSA_ENABLE_LS_OP
diff -r 7b1573bac376 -r ea35c6c3070f sys/arch/i386/stand/efiboot/boot.c
--- a/sys/arch/i386/stand/efiboot/boot.c Sat Jul 27 17:11:56 2019 +0000
+++ b/sys/arch/i386/stand/efiboot/boot.c Thu Aug 01 13:22:48 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: boot.c,v 1.5.2.5 2018/04/11 14:51:43 martin Exp $ */
+/* $NetBSD: boot.c,v 1.5.2.6 2019/08/01 13:22:48 martin Exp $ */
/*-
* Copyright (c) 2016 Kimihiro Nonaka <nonaka%netbsd.org@localhost>
@@ -224,40 +224,16 @@
static void
bootit(const char *filename, int howto)
{
- EFI_STATUS status;
- EFI_PHYSICAL_ADDRESS bouncebuf;
- UINTN npages;
- u_long allocsz;
if (howto & AB_VERBOSE)
printf("booting %s (howto 0x%x)\n", sprint_bootsel(filename),
howto);
- if (count_netbsd(filename, &allocsz) < 0) {
- printf("boot: %s: %s\n", sprint_bootsel(filename),
- strerror(errno));
- return;
- }
-
- bouncebuf = EFI_ALLOCATE_MAX_ADDRESS;
- npages = EFI_SIZE_TO_PAGES(allocsz);
- status = uefi_call_wrapper(BS->AllocatePages, 4, AllocateMaxAddress,
- EfiLoaderData, npages, &bouncebuf);
- if (EFI_ERROR(status)) {
- printf("boot: %s: %s\n", sprint_bootsel(filename),
- strerror(ENOMEM));
- return;
- }
-
- efi_loadaddr = bouncebuf;
- if (exec_netbsd(filename, bouncebuf, howto, 0, efi_cleanup) < 0)
+ if (exec_netbsd(filename, efi_loadaddr, howto, 0, efi_cleanup) < 0)
printf("boot: %s: %s\n", sprint_bootsel(filename),
strerror(errno));
else
printf("boot returned\n");
-
- (void) uefi_call_wrapper(BS->FreePages, 2, bouncebuf, npages);
- efi_loadaddr = 0;
}
void
@@ -372,7 +348,7 @@
#if LIBSA_ENABLE_LS_OP
"ls [path]\n"
#endif
- "memmap [{sorted|unsorted}]\n"
+ "memmap [{sorted|unsorted|compact}]\n"
#ifndef SMALL
"menu (reenters boot menu, if defined in boot.cfg)\n"
#endif
@@ -625,18 +601,21 @@
command_memmap(char *arg)
{
bool sorted = true;
+ bool compact = false;
if (*arg == '\0' || strcmp(arg, "sorted") == 0)
/* Already sorted is true. */;
else if (strcmp(arg, "unsorted") == 0)
sorted = false;
+ else if (strcmp(arg, "compact") == 0)
+ compact = true;
else {
printf("invalid flag, "
- "must be 'sorted' or 'unsorted'.\n");
+ "must be 'sorted', 'unsorted' or 'compact'.\n");
return;
}
- efi_memory_show_map(sorted);
+ efi_memory_show_map(sorted, compact);
}
void
diff -r 7b1573bac376 -r ea35c6c3070f sys/arch/i386/stand/efiboot/dev_net.c
--- a/sys/arch/i386/stand/efiboot/dev_net.c Sat Jul 27 17:11:56 2019 +0000
+++ b/sys/arch/i386/stand/efiboot/dev_net.c Thu Aug 01 13:22:48 2019 +0000
@@ -1,3 +1,256 @@
-/* $NetBSD: dev_net.c,v 1.1.2.2 2018/04/11 14:51:43 martin Exp $ */
+/* $NetBSD: dev_net.c,v 1.1.2.3 2019/08/01 13:22:48 martin Exp $ */
+
+/*-
+ * Copyright (c) 1997 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Gordon W. Ross.
+ *
+ * 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.
+ */
+
+/*
+ * This module implements a "raw device" interface suitable for
+ * use by the stand-alone I/O library NFS code. This interface
+ * does not support any "block" access, and exists only for the
+ * purpose of initializing the network interface, getting boot
+ * parameters, and performing the NFS mount.
+ *
+ * At open time, this does:
+ *
+ * find interface - netif_open()
+ * RARP for IP address - rarp_getipaddress()
+ * RPC/bootparams - callrpc(d, RPC_BOOTPARAMS, ...)
+ * RPC/mountd - nfs_mount(sock, ip, path)
+ */
+
+#include <sys/param.h>
+#include <sys/socket.h>
+#include <net/if.h>
+#include <netinet/in.h>
+#include <netinet/in_systm.h>
+
+#include <lib/libkern/libkern.h>
+
+#include "stand.h"
+#include "net.h"
+#include "netif.h"
+#include "nfs.h"
+#include "bootparam.h"
+#include "dev_net.h"
+#ifdef SUPPORT_BOOTP
+#include "bootp.h"
+#endif
+
+static int netdev_sock = -1;
+static int netdev_opens;
+
+static int net_getparams(int);
+
+/*
+ * Called by devopen after it sets f->f_dev to our devsw entry.
+ * This opens the low-level device and sets f->f_devdata.
+ * This is declared with variable arguments...
+ */
+int
+net_open(struct open_file *f, ...)
+{
+ va_list ap;
+ char *devname; /* Device part of file name (or NULL). */
+ int error = 0;
+
+ va_start(ap, f);
+ devname = va_arg(ap, char *);
+ va_end(ap);
+
+#ifdef NETIF_DEBUG
+ if (debug)
+ printf("%s\n", devname);
+#endif
+
+ /* On first open, do netif open, mount, etc. */
+ if (netdev_opens == 0) {
+ /* Find network interface. */
+ if (netdev_sock < 0) {
+ netdev_sock = netif_open(devname);
+ if (netdev_sock < 0) {
+ printf("netif_open() failed\n");
+ return ENXIO;
+ }
+#ifdef NETIF_DEBUG
+ if (debug)
+ printf("netif_open() succeeded\n");
+#endif
+ }
+ if (rootip.s_addr == 0) {
+ /* Get root IP address, and path, etc. */
+ error = net_getparams(netdev_sock);
+ if (error) {
+ /* getparams makes its own noise */
+ netif_close(netdev_sock);
+ netdev_sock = -1;
+ return error;
+ }
+ }
+ }
+ netdev_opens++;
+ f->f_devdata = &netdev_sock;
+ return error;
+}
+
+int
+net_close(struct open_file *f)
+{
-#include <lib/libsa/dev_net.c>
+#ifdef NETIF_DEBUG
+ if (debug)
+ printf("net_close: opens=%d\n", netdev_opens);
+#endif
+
+ /* On last close, do netif close, etc. */
+ f->f_devdata = NULL;
+ /* Extra close call? */
+ if (netdev_opens <= 0)
+ return 0;
+ netdev_opens--;
+ /* Not last close? */
+ if (netdev_opens > 0)
+ return 0;
+ rootip.s_addr = 0;
+ if (netdev_sock >= 0) {
+#ifdef NETIF_DEBUG
+ if (debug)
+ printf("%s: calling netif_close()\n", __func__);
+#endif
+ netif_close(netdev_sock);
+ netdev_sock = -1;
+ }
+ return 0;
+}
+
+int
+net_ioctl(struct open_file *f, u_long cmd, void *data)
+{
+
+ return EIO;
+}
+
+int
+net_strategy(void *devdata, int rw, daddr_t blk, size_t size, void *buf,
+ size_t *rsize)
+{
+
+ return EIO;
+}
+
+
+#ifdef SUPPORT_BOOTP
+int try_bootp;
+#endif
+
+static int
+net_getparams(int sock)
+{
Home |
Main Index |
Thread Index |
Old Index