[efi] Provide VLAN configuration protocol

UEFI implements VLAN support within the Managed Network Protocol (MNP)
driver, which may create child VLAN devices automatically based on
stored UEFI variables.  These child devices do not themselves provide
a raw-packet interface via EFI_SIMPLE_NETWORK_PROTOCOL, and may be
consumed only via the EFI_MANAGED_NETWORK_PROTOCOL interface.

The device paths constructed for these child devices may conflict with
those for the EFI_SIMPLE_NETWORK_PROTOCOL instances that iPXE attempts
to install for its own VLAN devices.  The upshot is that creating an
iPXE VLAN device (e.g. via the "vcreate" command) will fail if the
UEFI Managed Network Protocol has already created a device for the
same VLAN tag.

Fix by providing our own EFI_VLAN_CONFIG_PROTOCOL instance on the same
device handle as EFI_SIMPLE_NETWORK_PROTOCOL.  This causes the MNP
driver to treat iPXE's device as supporting hardware VLAN offload, and
it will therefore not attempt to install its own instance of the
protocol.

Signed-off-by: Michael Brown <mcb30@ipxe.org>

.github/workflows/build.yml

@@ -4,45 +4,14 @@ on: push
 
 jobs:
 
-  cache:
-    name: Cache
-    runs-on: ubuntu-22.04
-    steps:
-      - name: Cache permissions
-        run: |
-          sudo chown $(id -un) /var/cache/apt/archives
-      - name: Cache packages
-        uses: actions/cache@v3
-        with:
-          path: /var/cache/apt/archives/*.deb
-          key: apt-cache-${{ github.run_id }}-${{ github.run_attempt }}
-          restore-keys: |
-            apt-cache-
-      - name: Download packages
-        run: |
-          sudo apt update
-          sudo apt install -y -d -o Acquire::Retries=50 \
-                           mtools syslinux isolinux \
-                           libc6-dev-i386 valgrind \
-                           gcc-arm-none-eabi gcc-aarch64-linux-gnu
-
   x86:
     name: x86
-    runs-on: ubuntu-22.04
-    needs: cache
+    runs-on: ubuntu-20.04
     steps:
       - name: Check out code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      - name: Cache permissions
-        run: |
-          sudo chown $(id -un) /var/cache/apt/archives
-      - name: Cache packages
-        uses: actions/cache/restore@v3
-        with:
-          path: /var/cache/apt/archives/*.deb
-          key: apt-cache-${{ github.run_id }}-${{ github.run_attempt }}
       - name: Install packages
         run: |
           sudo dpkg --add-architecture i386
@@ -63,21 +32,12 @@ jobs:
 
   arm32:
     name: ARM32
-    runs-on: ubuntu-22.04
-    needs: cache
+    runs-on: ubuntu-20.04
     steps:
       - name: Check out code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      - name: Cache permissions
-        run: |
-          sudo chown $(id -un) /var/cache/apt/archives
-      - name: Cache packages
-        uses: actions/cache/restore@v3
-        with:
-          path: /var/cache/apt/archives/*.deb
-          key: apt-cache-${{ github.run_id }}-${{ github.run_attempt }}
       - name: Install packages
         run: |
           sudo apt update
@@ -92,21 +52,12 @@ jobs:
 
   arm64:
     name: ARM64
-    runs-on: ubuntu-22.04
-    needs: cache
+    runs-on: ubuntu-20.04
     steps:
       - name: Check out code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      - name: Cache permissions
-        run: |
-          sudo chown $(id -un) /var/cache/apt/archives
-      - name: Cache packages
-        uses: actions/cache/restore@v3
-        with:
-          path: /var/cache/apt/archives/*.deb
-          key: apt-cache-${{ github.run_id }}-${{ github.run_attempt }}
       - name: Install packages
         run: |
           sudo apt update

.github/workflows/coverity.yml

@@ -8,10 +8,10 @@ on:
 jobs:
   submit:
     name: Submit
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     steps:
       - name: Check out code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
       - name: Download Coverity Scan
         run: |
           curl --form token=${{ secrets.COVERITY_SCAN_TOKEN }} \

src/Makefile.housekeeping

@@ -369,6 +369,7 @@ endif
 # Include architecture-specific include path
 ifdef ARCH
 INCDIRS		+= arch/$(ARCH)/include
+INCDIRS		+= arch/$(ARCH)/include/$(PLATFORM)
 endif
 
 ###############################################################################
@@ -461,9 +462,7 @@ ifeq ($(CCTYPE),gcc)
 CFLAGS		+= -ffreestanding
 CFLAGS		+= -fcommon
 CFLAGS		+= -Wall -W -Wformat-nonliteral
-CFLAGS		+= -Wno-array-bounds -Wno-dangling-pointer
 HOST_CFLAGS	+= -Wall -W -Wformat-nonliteral
-HOST_CFLAGS	+= -Wno-array-bounds -Wno-dangling-pointer
 endif
 CFLAGS		+= $(WORKAROUND_CFLAGS) $(EXTRA_CFLAGS)
 ASFLAGS		+= $(WORKAROUND_ASFLAGS) $(EXTRA_ASFLAGS)
@@ -511,10 +510,6 @@ CFLAGS		+= -include include/compiler.h
 #
 CFLAGS		+= -DASM_TCHAR='$(ASM_TCHAR)' -DASM_TCHAR_OPS='$(ASM_TCHAR_OPS)'
 
-# Inhibit the default -Dlinux
-#
-CFLAGS		+= -Ulinux
-
 # CFLAGS for specific object types
 #
 CFLAGS_c	+=

src/Makefile.linux

@@ -8,10 +8,6 @@ SYMBOL_PREFIX	= _ipxe__
 #
 CFLAGS		+= -UNVALGRIND
 
-# The Linux linker script
-#
-LDSCRIPT	= scripts/linux.lds
-
 # Use a two-stage link
 #
 LDFLAGS		+= -r -d

src/arch/arm/Makefile.linux

@@ -1,6 +0,0 @@
-# -*- makefile -*- : Force emacs to use Makefile mode
-
-# Include generic Linux Makefile
-#
-MAKEDEPS	+= Makefile.linux
-include Makefile.linux

src/arch/arm/include/bits/io.h

@@ -9,9 +9,6 @@
 
 FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
-/** Page shift */
-#define PAGE_SHIFT 12
-
 #include <ipxe/arm_io.h>
 
 #endif /* _BITS_IO_H */

src/arch/arm/include/ipxe/arm_io.h

@@ -20,6 +20,9 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
  *
  */
 
+/** Page shift */
+#define PAGE_SHIFT 12
+
 /*
  * Physical<->Bus address mappings
  *

src/arch/arm32/Makefile

@@ -5,7 +5,7 @@ SRCDIRS		+= arch/arm32/libgcc
 
 # ARM32-specific flags
 #
-CFLAGS		+= -mthumb -mcpu=cortex-a15 -mabi=aapcs
+CFLAGS		+= -mthumb -mcpu=cortex-a15 -mabi=aapcs -mfloat-abi=soft
 CFLAGS		+= -mword-relocations
 ASFLAGS		+= -mthumb -mcpu=cortex-a15
 
@@ -13,11 +13,6 @@ ASFLAGS		+= -mthumb -mcpu=cortex-a15
 #
 CFLAGS		+= -fshort-wchar
 
-# EFI requires that enums are always 32 bits, and nothing else
-# currently cares
-#
-CFLAGS		+= -fno-short-enums
-
 # Include common ARM Makefile
 MAKEDEPS	+= arch/arm/Makefile
 include arch/arm/Makefile

src/arch/arm32/Makefile.efi

@@ -1,8 +1,8 @@
 # -*- makefile -*- : Force emacs to use Makefile mode
 
-# EFI uses the soft float ABI
+# UEFI requires that enums are always 32 bits
 #
-CFLAGS		+= -mfloat-abi=soft
+CFLAGS		+= -fno-short-enums
 
 # Specify EFI image builder
 #

src/arch/arm32/core/setjmp.S

@@ -1,6 +1,5 @@
 FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL )
 
-	.section ".note.GNU-stack", "", %progbits
 	.text
 	.arm
 

src/arch/arm32/include/bits/compiler.h

@@ -8,9 +8,6 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #ifndef ASSEMBLY
 
-/** Unprefixed constant operand modifier */
-#define ASM_NO_PREFIX "c"
-
 #define __asmcall
 #define __libgcc
 

src/arch/arm32/include/efi/ipxe/dhcp_arch.h

@@ -1,10 +1,10 @@
 /*
- * Copyright (C) 2023 Michael Brown <mbrown@fensystems.co.uk>.
+ * Copyright (C) 2015 Michael Brown <mbrown@fensystems.co.uk>.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
  * published by the Free Software Foundation; either version 2 of the
- * License, or any later version.
+ * License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -21,33 +21,20 @@
  * COPYING.UBDL), provided that you have satisfied its requirements.
  */
 
-FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
+#ifndef _DHCP_ARCH_H
+#define _DHCP_ARCH_H
 
 /** @file
  *
- * CPU sleeping test
- *
+ * Architecture-specific DHCP options
  */
 
-/* Forcibly enable assertions */
-#undef NDEBUG
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
-#include <ipxe/nap.h>
-#include <ipxe/test.h>
+#include <ipxe/dhcp.h>
 
-/**
- * Perform CPU sleeping self-test
- *
- */
-static void nap_test_exec ( void ) {
+#define DHCP_ARCH_CLIENT_ARCHITECTURE DHCP_CLIENT_ARCHITECTURE_ARM32
 
-	/* Check that we can sleep without crashing or halting forever */
-	cpu_nap();
-	ok ( 1 );
-}
+#define DHCP_ARCH_CLIENT_NDI 1 /* UNDI */ , 3, 10 /* v3.10 */
 
-/** CPU sleeping self-test */
-struct self_test nap_test __self_test = {
-	.name = "nap",
-	.exec = nap_test_exec,
-};
+#endif

src/arch/arm32/include/ipxe/efi/dhcparch.h

@@ -1,20 +0,0 @@
-#ifndef _IPXE_EFI_DHCPARCH_H
-#define _IPXE_EFI_DHCPARCH_H
-
-/** @file
- *
- * DHCP client architecture definitions
- *
- */
-
-FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
-
-#include <ipxe/dhcp.h>
-
-/** DHCP client architecture */
-#define DHCP_ARCH_CLIENT_ARCHITECTURE DHCP_CLIENT_ARCHITECTURE_ARM32
-
-/** DHCP client network device interface */
-#define DHCP_ARCH_CLIENT_NDI 1 /* UNDI */ , 3, 10 /* v3.10 */
-
-#endif /* _IPXE_EFI_DHCPARCH_H */

src/arch/arm32/libgcc/lldivmod.S

@@ -1,6 +1,5 @@
 FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL )
 
-	.section ".note.GNU-stack", "", %progbits
 	.text
 	.thumb
 

src/arch/arm32/libgcc/llshift.S

@@ -1,6 +1,5 @@
 FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL )
 
-	.section ".note.GNU-stack", "", %progbits
 	.text
 	.arm
 

src/arch/arm64/Makefile.linux

@@ -1,10 +0,0 @@
-# -*- makefile -*- : Force emacs to use Makefile mode
-
-# Starting virtual address
-#
-LDFLAGS += -Ttext=0x400000
-
-# Include generic Linux Makefile
-#
-MAKEDEPS += arch/arm/Makefile.linux
-include arch/arm/Makefile.linux

src/arch/arm64/include/bits/compiler.h

@@ -8,9 +8,6 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #ifndef ASSEMBLY
 
-/** Unprefixed constant operand modifier */
-#define ASM_NO_PREFIX "c"
-
 #define __asmcall
 #define __libgcc
 

src/arch/arm64/include/efi/ipxe/dhcp_arch.h

@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2015 Michael Brown <mbrown@fensystems.co.uk>.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ *
+ * You can also choose to distribute this program under the terms of
+ * the Unmodified Binary Distribution Licence (as given in the file
+ * COPYING.UBDL), provided that you have satisfied its requirements.
+ */
+
+#ifndef _DHCP_ARCH_H
+#define _DHCP_ARCH_H
+
+/** @file
+ *
+ * Architecture-specific DHCP options
+ */
+
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
+
+#include <ipxe/dhcp.h>
+
+#define DHCP_ARCH_CLIENT_ARCHITECTURE DHCP_CLIENT_ARCHITECTURE_ARM64
+
+#define DHCP_ARCH_CLIENT_NDI 1 /* UNDI */ , 3, 10 /* v3.10 */
+
+#endif

src/arch/arm64/include/ipxe/efi/dhcparch.h

@@ -1,20 +0,0 @@
-#ifndef _IPXE_EFI_DHCPARCH_H
-#define _IPXE_EFI_DHCPARCH_H
-
-/** @file
- *
- * DHCP client architecture definitions
- *
- */
-
-FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
-
-#include <ipxe/dhcp.h>
-
-/** DHCP client architecture */
-#define DHCP_ARCH_CLIENT_ARCHITECTURE DHCP_CLIENT_ARCHITECTURE_ARM64
-
-/** DHCP client network device interface */
-#define DHCP_ARCH_CLIENT_NDI 1 /* UNDI */ , 3, 10 /* v3.10 */
-
-#endif /* _IPXE_EFI_DHCPARCH_H */

src/arch/i386/Makefile.linux

@@ -1,8 +1,8 @@
 # -*- makefile -*- : Force emacs to use Makefile mode
 
-# Starting virtual address
+# Linker script
 #
-LDFLAGS += -Ttext=0x08048000
+LDSCRIPT = arch/i386/scripts/linux.lds
 
 # Compiler flags for building host API wrapper
 #

src/arch/i386/include/bits/compiler.h

@@ -8,9 +8,6 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #ifndef ASSEMBLY
 
-/** Unprefixed constant operand modifier */
-#define ASM_NO_PREFIX "c"
-
 /** Declare a function with standard calling conventions */
 #define __asmcall __attribute__ (( cdecl, regparm(0) ))
 

src/arch/i386/include/efi/ipxe/dhcp_arch.h

@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2010 VMware, Inc.  All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ *
+ * You can also choose to distribute this program under the terms of
+ * the Unmodified Binary Distribution Licence (as given in the file
+ * COPYING.UBDL), provided that you have satisfied its requirements.
+ */
+
+#ifndef _DHCP_ARCH_H
+#define _DHCP_ARCH_H
+
+/** @file
+ *
+ * Architecture-specific DHCP options
+ */
+
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
+
+#include <ipxe/dhcp.h>
+
+#define DHCP_ARCH_CLIENT_ARCHITECTURE DHCP_CLIENT_ARCHITECTURE_IA32
+
+#define DHCP_ARCH_CLIENT_NDI 1 /* UNDI */ , 3, 10 /* v3.10 */
+
+#endif

src/arch/i386/include/ipxe/efi/dhcparch.h

@@ -1,20 +0,0 @@
-#ifndef _IPXE_EFI_DHCPARCH_H
-#define _IPXE_EFI_DHCPARCH_H
-
-/** @file
- *
- * DHCP client architecture definitions
- *
- */
-
-FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
-
-#include <ipxe/dhcp.h>
-
-/** DHCP client architecture */
-#define DHCP_ARCH_CLIENT_ARCHITECTURE DHCP_CLIENT_ARCHITECTURE_IA32
-
-/** DHCP client network device interface */
-#define DHCP_ARCH_CLIENT_NDI 1 /* UNDI */ , 3, 10 /* v3.10 */
-
-#endif /* _IPXE_EFI_DHCPARCH_H */

src/arch/i386/include/pcbios/ipxe/dhcp_arch.h

@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2010 VMware, Inc.  All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ *
+ * You can also choose to distribute this program under the terms of
+ * the Unmodified Binary Distribution Licence (as given in the file
+ * COPYING.UBDL), provided that you have satisfied its requirements.
+ */
+
+#ifndef _DHCP_ARCH_H
+#define _DHCP_ARCH_H
+
+/** @file
+ *
+ * Architecture-specific DHCP options
+ */
+
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
+
+#include <ipxe/dhcp.h>
+
+#define DHCP_ARCH_CLIENT_ARCHITECTURE DHCP_CLIENT_ARCHITECTURE_X86
+
+#define DHCP_ARCH_CLIENT_NDI 1 /* UNDI */ , 2, 1 /* v2.1 */
+
+#endif

src/arch/i386/scripts/linux.lds

@@ -1,13 +1,18 @@
 /* -*- sh -*- */
 
 /*
- * Linker script for Linux images
+ * Linker script for i386 Linux images
  *
  */
 
+OUTPUT_FORMAT ( "elf32-i386", "elf32-i386", "elf32-i386" )
+OUTPUT_ARCH ( i386 )
+
 SECTIONS {
 	_max_align = 32;
 
+	. = 0x08048000;
+
 	/*
 	 * The text section
 	 *
@@ -81,13 +86,16 @@ SECTIONS {
 	_assert = ASSERT ( ( _weak == _eweak ), ".weak is non-zero length" );
 
 	/*
-	 * Dispose of unwanted sections to make the link map easier to read
+	 * Dispose of the comment and note sections to make the link map
+	 * easier to read
 	 *
 	 */
 
 	/DISCARD/ : {
 		*(.comment)
 		*(.comment.*)
+		*(.note)
+		*(.note.*)
 		*(.rel)
 		*(.rel.*)
 		*(.discard)

src/arch/loong64/Makefile

@@ -1,26 +0,0 @@
-# Assembler section type character
-#
-ASM_TCHAR	:= @
-ASM_TCHAR_OPS	:= @
-
-# LoongArch64-specific flags
-#
-CFLAGS		+= -fstrength-reduce -fomit-frame-pointer
-CFLAGS		+= -falign-jumps=1 -falign-loops=1 -falign-functions=1
-
-# Check if -mno-explicit-relocs is valid
-ifeq ($(CCTYPE),gcc)
-MNER_TEST = $(CC) -mno-explicit-relocs -x c -c /dev/null -o /dev/null >/dev/null 2>&1
-MNER_FLAGS := $(shell $(MNER_TEST) && $(ECHO) '-mno-explicit-relocs')
-WORKAROUND_CFLAGS += $(MNER_FLAGS)
-endif
-
-# EFI requires -fshort-wchar, and nothing else currently uses wchar_t
-CFLAGS		+= -fshort-wchar
-
-# LoongArch64-specific directories containing source files
-SRCDIRS		+= arch/loong64/core
-
-# Include platform-specific Makefile
-MAKEDEPS	+= arch/loong64/Makefile.$(PLATFORM)
-include arch/loong64/Makefile.$(PLATFORM)

src/arch/loong64/Makefile.linux

@@ -1,10 +0,0 @@
-# -*- makefile -*- : Force emacs to use Makefile mode
-
-# Starting virtual address
-#
-LDFLAGS += -Ttext=0x120000000
-
-# Include generic Linux Makefile
-#
-MAKEDEPS += Makefile.linux
-include Makefile.linux

src/arch/loong64/core/loong64_bigint.c

@@ -1,120 +0,0 @@
-/*
- * Copyright (C) 2012 Michael Brown <mbrown@fensystems.co.uk>.
- * Copyright (c) 2023, Xiaotian Wu <wuxiaotian@loongson.cn>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- *
- * You can also choose to distribute this program under the terms of
- * the Unmodified Binary Distribution Licence (as given in the file
- * COPYING.UBDL), provided that you have satisfied its requirements.
- */
-
-FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
-
-#include <stdint.h>
-#include <string.h>
-#include <ipxe/bigint.h>
-
-/** @file
- *
- * Big integer support
- */
-
-/**
- * Multiply big integers
- *
- * @v multiplicand0	Element 0 of big integer to be multiplied
- * @v multiplier0	Element 0 of big integer to be multiplied
- * @v result0		Element 0 of big integer to hold result
- * @v size		Number of elements
- */
-void bigint_multiply_raw ( const uint64_t *multiplicand0,
-			   const uint64_t *multiplier0,
-			   uint64_t *result0, unsigned int size ) {
-	const bigint_t ( size ) __attribute__ (( may_alias )) *multiplicand =
-		( ( const void * ) multiplicand0 );
-	const bigint_t ( size ) __attribute__ (( may_alias )) *multiplier =
-		( ( const void * ) multiplier0 );
-	bigint_t ( size * 2 ) __attribute__ (( may_alias )) *result =
-		( ( void * ) result0 );
-	unsigned int i;
-	unsigned int j;
-	uint64_t multiplicand_element;
-	uint64_t multiplier_element;
-	uint64_t *result_elements;
-	uint64_t discard_low;
-	uint64_t discard_high;
-	uint64_t discard_temp_low;
-	uint64_t discard_temp_high;
-
-	/* Zero result */
-	memset ( result, 0, sizeof ( *result ) );
-
-	/* Multiply integers one element at a time */
-	for ( i = 0 ; i < size ; i++ ) {
-		multiplicand_element = multiplicand->element[i];
-		for ( j = 0 ; j < size ; j++ ) {
-			multiplier_element = multiplier->element[j];
-			result_elements = &result->element[ i + j ];
-			/* Perform a single multiply, and add the
-			 * resulting double-element into the result,
-			 * carrying as necessary.  The carry can
-			 * never overflow beyond the end of the
-			 * result, since:
-			 *
-			 *     a < 2^{n}, b < 2^{n} => ab < 2^{2n}
-			 */
-			__asm__ __volatile__ ( "mul.d   %1, %6, %7\n\t"
-					       "mulh.du %2, %6, %7\n\t"
-
-					       "ld.d    %3, %0, 0\n\t"
-					       "ld.d    %4, %0, 8\n\t"
-
-					       "add.d   %3, %3, %1\n\t"
-					       "sltu    $t0, %3, %1\n\t"
-
-					       "add.d   %4, %4, %2\n\t"
-					       "sltu    $t1, %4, %2\n\t"
-
-					       "add.d   %4, %4, $t0\n\t"
-					       "sltu    $t0, %4, $t0\n\t"
-					       "or      $t0, $t0, $t1\n\t"
-
-					       "st.d    %3,  %0, 0\n\t"
-					       "st.d    %4,  %0, 8\n\t"
-
-					       "addi.d  %0,  %0, 16\n\t"
-					       "beqz    $t0, 2f\n"
-					       "1:\n\t"
-					       "ld.d    %3,  %0, 0\n\t"
-					       "add.d   %3,  %3, $t0\n\t"
-					       "sltu    $t0, %3, $t0\n\t"
-					       "st.d    %3,  %0, 0\n\t"
-					       "addi.d  %0, %0, 8\n\t"
-					       "bnez    $t0, 1b\n"
-					       "2:"
-					       : "+r" ( result_elements ),
-						 "=&r" ( discard_low ),
-						 "=&r" ( discard_high ),
-						 "=r" ( discard_temp_low ),
-						 "=r" ( discard_temp_high ),
-						 "+m" ( *result )
-					       : "r" ( multiplicand_element ),
-						 "r" ( multiplier_element )
-					       : "t0", "t1" );
-		}
-	}
-}

src/arch/loong64/core/loong64_string.c

@@ -1,266 +0,0 @@
-/*
- * Copyright (C) 2016 Michael Brown <mbrown@fensystems.co.uk>.
- * Copyright (c) 2023, Xiaotian Wu <wuxiaotian@loongson.cn>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- *
- * You can also choose to distribute this program under the terms of
- * the Unmodified Binary Distribution Licence (as given in the file
- * COPYING.UBDL), provided that you have satisfied its requirements.
- */
-
-/** @file
- *
- * Optimised string operations
- *
- */
-
-FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
-
-#include <string.h>
-
-/**
- * Copy memory area
- *
- * @v dest		Destination address
- * @v src		Source address
- * @v len		Length
- * @ret dest		Destination address
- */
-void loong64_memcpy ( void *dest, const void *src, size_t len ) {
-	void *discard_dest;
-	void *discard_end;
-	const void *discard_src;
-	size_t discard_offset;
-	unsigned long discard_data;
-	unsigned long discard_low;
-	unsigned long discard_high;
-
-	/* If length is too short, then just copy individual bytes.
-	 */
-	if ( len < 16 ) {
-		__asm__ __volatile__ ( "beqz %0, 2f\n\t"
-				       "\n1:\n\t"
-				       "addi.d %0, %0, -1\n\t"
-				       "ldx.b %1, %3, %0\n\t"
-				       "stx.b %1, %2, %0\n\t"
-				       "bnez %0, 1b\n\t"
-				       "\n2:\n\t"
-				       : "=&r" ( discard_offset ),
-					 "=&r" ( discard_data )
-				       : "r" ( dest ), "r" ( src ), "0" ( len )
-				       : "memory", "t0" );
-		return;
-	}
-
-	/* Copy 16 bytes at a time: one initial
-	 * potentially unaligned access, multiple destination-aligned
-	 * accesses, one final potentially unaligned access.
-	 */
-	__asm__ __volatile__ ( "ld.d %3, %1, 0\n\t"
-			       "ld.d %4, %1, 8\n\t"
-			       "addi.d %1, %1, 16\n\t"
-			       "st.d %3, %0, 0\n\t"
-			       "st.d %4, %0, 8\n\t"
-			       "addi.d %0, %0, 16\n\t"
-			       "andi %3, %0, 15\n\t"
-			       "sub.d %0, %0, %3\n\t"
-			       "sub.d %1, %1, %3\n\t"
-			       "addi.d $t0, $zero, 0xf\n\t"
-			       "andn %2, %5, $t0\n\t"
-			       "b 2f\n\t"
-			       "\n1:\n\t"
-			       "ld.d %3, %1, 0\n\t"
-			       "ld.d %4, %1, 8\n\t"
-			       "addi.d %1, %1, 16\n\t"
-			       "st.d %3, %0, 0\n\t"
-			       "st.d %4, %0, 8\n\t"
-			       "addi.d %0, %0, 16\n\t"
-			       "\n2:\n\t"
-			       "bne %0, %2, 1b\n\t"
-			       "ld.d %3, %6, -16\n\t"
-			       "ld.d %4, %6, -8\n\t"
-			       "st.d %3, %5, -16\n\t"
-			       "st.d %4, %5, -8\n\t"
-			       : "=&r" ( discard_dest ),
-				 "=&r" ( discard_src ),
-				 "=&r" ( discard_end ),
-				 "=&r" ( discard_low ),
-				 "=&r" ( discard_high )
-			       : "r" ( dest + len ), "r" ( src + len ),
-				 "0" ( dest ), "1" ( src )
-			       : "memory", "t0" );
-}
-
-/**
- * Zero memory region
- *
- * @v dest		Destination region
- * @v len		Length
- */
-void loong64_bzero ( void *dest, size_t len ) {
-	size_t discard_offset;
-	void *discard_dest;
-	void *discard_end;
-
-	/* If length is too short, then just zero individual bytes.
-	 */
-	if ( len < 16 ) {
-		__asm__ __volatile__ ( "beqz %0, 2f\n\t"
-				       "\n1:\n\t"
-				       "addi.d %0, %0, -1\n\t"
-				       "stx.b $zero, %1, %0\n\t"
-				       "bnez %0, 1b\n\t"
-				       "\n2:\n\t"
-				       : "=&r" ( discard_offset )
-				       : "r" ( dest ), "0" ( len )
-				       : "memory" );
-		return;
-	}
-
-	/* To zero 16 bytes at a time: one initial
-	 * potentially unaligned access, multiple aligned accesses,
-	 * one final potentially unaligned access.
-	 */
-
-	__asm__ __volatile__ ( "st.d $zero, %0, 0\n\t"
-			       "st.d $zero, %0, 8\n\t"
-			       "addi.d %0, %0, 16\n\t"
-			       "addi.w $t0, $zero, 15\n\t"
-			       "andn %0, %0, $t0\n\t"
-			       "addi.w $t0, $zero, 15\n\t"
-			       "andn %1, %2, $t0\n\t"
-			       "b 2f\n\t"
-			       "\n1:\n\t"
-			       "st.d $zero, %0, 0\n\t"
-			       "st.d $zero, %0, 8\n\t"
-			       "addi.d %0, %0, 16\n\t"
-			       "\n2:\n\t"
-			       "bne %0, %1, 1b\n\t"
-			       "st.d $zero, %2, -16\n\t"
-			       "st.d $zero, %2, -8\n\t"
-			       : "=&r" ( discard_dest ),
-				 "=&r" ( discard_end )
-			       : "r" ( dest + len ), "0" ( dest )
-			       : "memory", "t0" );
-}
-
-/**
- * Fill memory region
- *
- * @v dest		Destination region
- * @v len		Length
- * @v character		Fill character
- *
- * The unusual parameter order is to allow for more efficient
- * tail-calling to loong64_memset() when zeroing a region.
- */
-void loong64_memset ( void *dest, size_t len, int character ) {
-	size_t discard_offset;
-
-	/* Use optimised zeroing code if applicable */
-	if ( character == 0 ) {
-		loong64_bzero ( dest, len );
-		return;
-	}
-
-	/* Fill one byte at a time.  Calling memset() with a non-zero
-	 * value is relatively rare and unlikely to be
-	 * performance-critical.
-	 */
-	__asm__ __volatile__ ( "beqz %0, 2f\n\t"
-			       "\n1:\n\t"
-			       "addi.d %0, %0, -1\n\t"
-			       "stx.b %2, %1, %0\n\t"
-			       "bnez %0, 1b\n\t"
-			       "\n2:\n\t"
-			       : "=&r" ( discard_offset )
-			       : "r" ( dest ), "r" ( character ), "0" ( len )
-			       : "memory" );
-}
-
-/**
- * Copy (possibly overlapping) memory region forwards
- *
- * @v dest		Destination region
- * @v src		Source region
- * @v len		Length
- */
-void loong64_memmove_forwards ( void *dest, const void *src, size_t len ) {
-	void *discard_dest;
-	const void *discard_src;
-	unsigned long discard_data;
-
-	/* Assume memmove() is not performance-critical, and perform a
-	 * bytewise copy for simplicity.
-	 */
-	__asm__ __volatile__ ( "b 2f\n\t"
-			       "\n1:\n\t"
-			       "ld.b %2, %1, 0\n\t"
-			       "addi.d %1, %1, 1\n\t"
-			       "st.b %2, %0, 0\n\t"
-			       "addi.d %0, %0, 1\n\t"
-			       "\n2:\n\t"
-			       "bne %0, %3, 1b\n\t"
-			       : "=&r" ( discard_dest ),
-				 "=&r" ( discard_src ),
-				 "=&r" ( discard_data )
-			       : "r" ( dest + len ), "0" ( dest ), "1" ( src )
-			       : "memory" );
-}
-
-/**
- * Copy (possibly overlapping) memory region backwards
- *
- * @v dest		Destination region
- * @v src		Source region
- * @v len		Length
- */
-void loong64_memmove_backwards ( void *dest, const void *src, size_t len ) {
-	size_t discard_offset;
-	unsigned long discard_data;
-
-	/* Assume memmove() is not performance-critical, and perform a
-	 * bytewise copy for simplicity.
-	 */
-	__asm__ __volatile__ ( "beqz %0, 2f\n\t"
-			       "\n1:\n\t"
-			       "addi.d %0, %0, -1\n\t"
-			       "ldx.b %1, %3, %0\n\t"
-			       "stx.b %1, %2, %0\n\t"
-			       "bnez %0, 1b\n\t"
-			       "\n2:\n\t"
-			       : "=&r" ( discard_offset ),
-				 "=&r" ( discard_data )
-			       : "r" ( dest ), "r" ( src ), "0" ( len )
-			       : "memory" );
-}
-
-/**
- * Copy (possibly overlapping) memory region
- *
- * @v dest		Destination region
- * @v src		Source region
- * @v len		Length
- */
-void loong64_memmove ( void *dest, const void *src, size_t len ) {
-
-	if ( dest <= src ) {
-		loong64_memmove_forwards ( dest, src, len );
-	} else {
-		loong64_memmove_backwards ( dest, src, len );
-	}
-}

src/arch/loong64/core/setjmp.S

@@ -1,53 +0,0 @@
-FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL )
-
-	.section ".note.GNU-stack", "", %progbits
-	.text
-/*
-   int setjmp(jmp_buf env);
-*/
-	.globl	setjmp
-	.type	setjmp, %function
-setjmp:
-	/* Store registers */
-	st.d	$s0, $a0, 0x0
-	st.d	$s1, $a0, 0x8
-	st.d	$s2, $a0, 0x10
-	st.d	$s3, $a0, 0x18
-	st.d	$s4, $a0, 0x20
-	st.d	$s5, $a0, 0x28
-	st.d	$s6, $a0, 0x30
-	st.d	$s7, $a0, 0x38
-	st.d	$s8, $a0, 0x40
-	st.d	$fp, $a0, 0x48
-	st.d	$sp, $a0, 0x50
-	st.d	$ra, $a0, 0x58
-
-	move	$a0, $zero
-	jirl	$zero, $ra, 0
-	.size	setjmp, . - setjmp
-
-/*
-   void longjmp(jmp_buf env, int val);
-*/
-	.globl	longjmp
-	.type	longjmp, %function
-longjmp:
-	/* Restore registers */
-	ld.d	$s0, $a0, 0x0
-	ld.d	$s1, $a0, 0x8
-	ld.d	$s2, $a0, 0x10
-	ld.d	$s3, $a0, 0x18
-	ld.d	$s4, $a0, 0x20
-	ld.d	$s5, $a0, 0x28
-	ld.d	$s6, $a0, 0x30
-	ld.d	$s7, $a0, 0x38
-	ld.d	$s8, $a0, 0x40
-	ld.d	$fp, $a0, 0x48
-	ld.d	$sp, $a0, 0x50
-	ld.d	$ra, $a0, 0x58
-	addi.d	$a0, $zero, 1    # a0 = 1
-	beqz	$a1, .exit       # if (a1 == 0); goto L0
-	move	$a0, $a1         # a0 = a1
-.exit:
-	jirl	$zero, $ra, 0
-	.size	longjmp, . - longjmp

src/arch/loong64/include/bits/acpi.h

@@ -1,12 +0,0 @@
-#ifndef _BITS_ACPI_H
-#define _BITS_ACPI_H
-
-/** @file
- *
- * LoongArch64-specific ACPI API implementations
- *
- */
-
-FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
-
-#endif /* _BITS_ACPI_H */

src/arch/loong64/include/bits/bigint.h

@@ -1,336 +0,0 @@
-#ifndef _BITS_BIGINT_H
-#define _BITS_BIGINT_H
-
-/** @file
- *
- * Big integer support
- */
-
-FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
-
-#include <stdint.h>
-#include <string.h>
-#include <strings.h>
-
-/** Element of a big integer */
-typedef uint64_t bigint_element_t;
-
-/**
- * Initialise big integer
- *
- * @v value0	Element 0 of big integer to initialise
- * @v size		Number of elements
- * @v data		Raw data
- * @v len		Length of raw data
- */
-static inline __attribute__ (( always_inline )) void
-bigint_init_raw ( uint64_t *value0, unsigned int size,
-		  const void *data, size_t len ) {
-	size_t pad_len = ( sizeof ( bigint_t ( size ) ) - len );
-	uint8_t *value_byte = ( ( void * ) value0 );
-	const uint8_t *data_byte = ( data + len );
-
-	/* Copy raw data in reverse order, padding with zeros */
-	while ( len-- )
-		*(value_byte++) = *(--data_byte);
-	while ( pad_len-- )
-		*(value_byte++) = 0;
-}
-
-/**
- * Add big integers
- *
- * @v addend0		Element 0 of big integer to add
- * @v value0		Element 0 of big integer to be added to
- * @v size		Number of elements
- */
-static inline __attribute__ (( always_inline )) void
-bigint_add_raw ( const uint64_t *addend0, uint64_t *value0,
-		 unsigned int size ) {
-	bigint_t ( size ) __attribute__ (( may_alias )) *value =
-		( ( void * ) value0 );
-	uint64_t *discard_addend;
-	uint64_t *discard_value;
-	uint64_t discard_addend_i;
-	uint64_t discard_value_i;
-	unsigned int discard_size;
-	__asm__ __volatile__ ( "move   $t0, $zero\n"
-			       "1:\n\t"
-			       "ld.d   %3, %0, 0\n\t"
-			       "addi.d %0, %0, 8\n\t"
-			       "ld.d   %4, %1, 0\n\t"
-
-			       "add.d  %4, %4, $t0\n\t"
-			       "sltu   $t0, %4, $t0\n\t"
-
-			       "add.d  %4, %4, %3\n\t"
-			       "sltu   $t1, %4, %3\n\t"
-
-			       "or     $t0, $t0, $t1\n\t"
-			       "st.d   %4,  %1, 0\n\t"
-			       "addi.d %1, %1, 8\n\t"
-			       "addi.w %2, %2, -1\n\t"
-			       "bnez   %2, 1b"
-			       : "=r" ( discard_addend ),
-				 "=r" ( discard_value ),
-				 "=r" ( discard_size ),
-				 "=r" ( discard_addend_i ),
-				 "=r" ( discard_value_i ),
-				 "+m" ( *value )
-			       : "0" ( addend0 ),
-				 "1" ( value0 ),
-				 "2" ( size )
-			       : "t0", "t1" );
-}
-
-/**
- * Subtract big integers
- *
- * @v subtrahend0	Element 0 of big integer to subtract
- * @v value0		Element 0 of big integer to be subtracted from
- * @v size		Number of elements
- */
-static inline __attribute__ (( always_inline )) void
-bigint_subtract_raw ( const uint64_t *subtrahend0, uint64_t *value0,
-		      unsigned int size ) {
-	uint64_t *discard_subtrahend;
-	uint64_t *discard_value;
-	uint64_t discard_subtrahend_i;
-	uint64_t discard_value_i;
-	unsigned int discard_size;
-	unsigned int flag = 0;
-
-	discard_subtrahend = (uint64_t*) subtrahend0;
-	discard_value = value0;
-	discard_size = size;
-
-	do {
-		discard_subtrahend_i = *discard_subtrahend;
-		discard_subtrahend++;
-		discard_value_i = *discard_value;
-
-		discard_value_i = discard_value_i - discard_subtrahend_i - flag;
-
-		if ( *discard_value < (discard_subtrahend_i + flag)) {
-			flag = 1;
-		} else {
-			flag = 0;
-		}
-
-		*discard_value = discard_value_i;
-
-		discard_value++;
-		discard_size -= 1;
-	} while (discard_size != 0);
-}
-
-/**
- * Rotate big integer left
- *
- * @v value0		Element 0 of big integer
- * @v size		Number of elements
- */
-static inline __attribute__ (( always_inline )) void
-bigint_rol_raw ( uint64_t *value0, unsigned int size ) {
-	uint64_t *discard_value;
-	uint64_t discard_value_i;
-	unsigned int discard_size;
-	uint64_t current_value_i;
-	unsigned int flag = 0;
-
-	discard_value = value0;
-	discard_size = size;
-	do {
-		discard_value_i = *discard_value;
-		current_value_i = discard_value_i;
-
-		discard_value_i += discard_value_i + flag;
-
-		if (discard_value_i < current_value_i) {
-			flag = 1;
-		} else {
-			flag = 0;
-		}
-
-		*discard_value = discard_value_i;
-		discard_value++;
-		discard_size -= 1;
-	} while ( discard_size != 0 );
-}
-
-/**
- * Rotate big integer right
- *
- * @v value0		Element 0 of big integer
- * @v size		Number of elements
- */
-static inline __attribute__ (( always_inline )) void
-bigint_ror_raw ( uint64_t *value0, unsigned int size ) {
-	uint64_t *discard_value;
-	uint64_t discard_value_i;
-	uint64_t discard_value_j;
-	unsigned int discard_size;
-
-	discard_value = value0;
-	discard_size = size;
-
-	discard_value_j = 0;
-
-	do {
-		discard_size -= 1;
-
-		discard_value_i = *(discard_value + discard_size);
-
-		discard_value_j = (discard_value_j << 63) | (discard_value_i >> 1);
-
-		*(discard_value + discard_size) = discard_value_j;
-
-		discard_value_j = discard_value_i;
-	} while ( discard_size > 0 );
-}
-
-/**
- * Test if big integer is equal to zero
- *
- * @v value0		Element 0 of big integer
- * @v size		Number of elements
- * @ret is_zero		Big integer is equal to zero
- */
-static inline __attribute__ (( always_inline, pure )) int
-bigint_is_zero_raw ( const uint64_t *value0, unsigned int size ) {
-	const uint64_t *value = value0;
-	uint64_t value_i;
-
-	do {
-		value_i = *(value++);
-		if ( value_i )
-			break;
-	} while ( --size );
-
-	return ( value_i == 0 );
-}
-
-/**
- * Compare big integers
- *
- * @v value0		Element 0 of big integer
- * @v reference0	Element 0 of reference big integer
- * @v size		Number of elements
- * @ret geq		Big integer is greater than or equal to the reference
- */
-static inline __attribute__ (( always_inline, pure )) int
-bigint_is_geq_raw ( const uint64_t *value0, const uint64_t *reference0,
-		    unsigned int size ) {
-	const uint64_t *value = ( value0 + size );
-	const uint64_t *reference = ( reference0 + size );
-	uint64_t value_i;
-	uint64_t reference_i;
-
-	do {
-		value_i = *(--value);
-		reference_i = *(--reference);
-		if ( value_i != reference_i )
-			break;
-	} while ( --size );
-
-	return ( value_i >= reference_i );
-}
-
-/**
- * Test if bit is set in big integer
- *
- * @v value0		Element 0 of big integer
- * @v size		Number of elements
- * @v bit		Bit to test
- * @ret is_set		Bit is set
- */
-static inline __attribute__ (( always_inline )) int
-bigint_bit_is_set_raw ( const uint64_t *value0, unsigned int size,
-			unsigned int bit ) {
-	const bigint_t ( size ) __attribute__ (( may_alias )) *value =
-		( ( const void * ) value0 );
-	unsigned int index = ( bit / ( 8 * sizeof ( value->element[0] ) ) );
-	unsigned int subindex = ( bit % ( 8 * sizeof ( value->element[0] ) ) );
-
-	return ( !! ( value->element[index] & ( 1UL << subindex ) ) );
-}
-
-/**
- * Find highest bit set in big integer
- *
- * @v value0		Element 0 of big integer
- * @v size		Number of elements
- * @ret max_bit		Highest bit set + 1 (or 0 if no bits set)
- */
-static inline __attribute__ (( always_inline )) int
-bigint_max_set_bit_raw ( const uint64_t *value0, unsigned int size ) {
-	const uint64_t *value = ( value0 + size );
-	int max_bit = ( 8 * sizeof ( bigint_t ( size ) ) );
-	uint64_t value_i;
-
-	do {
-		value_i = *(--value);
-		max_bit -= ( 64 - fls ( value_i ) );
-		if ( value_i )
-			break;
-	} while ( --size );
-
-	return max_bit;
-}
-
-/**
- * Grow big integer
- *
- * @v source0		Element 0 of source big integer
- * @v source_size	Number of elements in source big integer
- * @v dest0		Element 0 of destination big integer
- * @v dest_size		Number of elements in destination big integer
- */
-static inline __attribute__ (( always_inline )) void
-bigint_grow_raw ( const uint64_t *source0, unsigned int source_size,
-		  uint64_t *dest0, unsigned int dest_size ) {
-	unsigned int pad_size = ( dest_size - source_size );
-
-	memcpy ( dest0, source0, sizeof ( bigint_t ( source_size ) ) );
-	memset ( ( dest0 + source_size ), 0, sizeof ( bigint_t ( pad_size ) ) );
-}
-
-/**
- * Shrink big integer
- *
- * @v source0		Element 0 of source big integer
- * @v source_size	Number of elements in source big integer
- * @v dest0		Element 0 of destination big integer
- * @v dest_size		Number of elements in destination big integer
- */
-static inline __attribute__ (( always_inline )) void
-bigint_shrink_raw ( const uint64_t *source0, unsigned int source_size __unused,
-		    uint64_t *dest0, unsigned int dest_size ) {
-
-	memcpy ( dest0, source0, sizeof ( bigint_t ( dest_size ) ) );
-}
-
-/**
- * Finalise big integer
- *
- * @v value0		Element 0 of big integer to finalise
- * @v size		Number of elements
- * @v out		Output buffer
- * @v len		Length of output buffer
- */
-static inline __attribute__ (( always_inline )) void
-bigint_done_raw ( const uint64_t *value0, unsigned int size __unused,
-		  void *out, size_t len ) {
-	const uint8_t *value_byte = ( ( const void * ) value0 );
-	uint8_t *out_byte = ( out + len );
-
-	/* Copy raw data in reverse order */
-	while ( len-- )
-		*(--out_byte) = *(value_byte++);
-}
-
-extern void bigint_multiply_raw ( const uint64_t *multiplicand0,
-				  const uint64_t *multiplier0,
-				  uint64_t *value0, unsigned int size );
-
-#endif /* _BITS_BIGINT_H */

src/arch/loong64/include/bits/bitops.h

@@ -1,102 +0,0 @@
-#ifndef _BITS_BITOPS_H
-#define _BITS_BITOPS_H
-
-/** @file
- *
- * loongArch bit operations
- *
- * We perform atomic bit set and bit clear operations using "ll"
- * and "sc".  We use the output constraint to inform the
- * compiler that any memory from the start of the bit field up to and
- * including the byte containing the bit may be modified.  (This is
- * overkill but shouldn't matter in practice since we're unlikely to
- * subsequently read other bits from the same bit field.)
- */
-
-FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
-
-#include <stdint.h>
-
-/**
- * Test and set bit atomically
- *
- * @v bit		Bit to set
- * @v bits		Bit field
- * @ret old		Old value of bit (zero or non-zero)
- */
-static inline __attribute__ (( always_inline )) int
-test_and_set_bit ( unsigned int bit, volatile void *bits ) {
-	unsigned int index = ( bit / 64 );
-	unsigned int offset = ( bit % 64 );
-	volatile uint64_t *qword = ( ( ( volatile uint64_t * ) bits ) + index );
-	uint64_t mask = ( 1UL << offset );
-	uint64_t old;
-	uint64_t new;
-
-	__asm__ __volatile__ ( "1:				\n\t"
-			       "ll.d %[old], %[qword]		\n\t"
-			       "or   %[new], %[old], %[mask]	\n\t"
-			       "sc.d %[new], %[qword]		\n\t"
-			       "beqz %[new], 1b			\n\t"
-			       : [old] "=&r" ( old ),
-				 [new] "=&r" ( new ),
-				 [qword] "+m" ( *qword )
-			       : [mask] "r" ( mask )
-			       : "cc", "memory");
-	return ( !! ( old & mask ) );
-}
-
-/**
- * Test and clear bit atomically
- *
- * @v bit		Bit to set
- * @v bits		Bit field
- * @ret old		Old value of bit (zero or non-zero)
- */
-static inline __attribute__ (( always_inline )) int
-test_and_clear_bit ( unsigned int bit, volatile void *bits ) {
-	unsigned int index = ( bit / 64 );
-	unsigned int offset = ( bit % 64 );
-	volatile uint64_t *qword = ( ( ( volatile uint64_t * ) bits ) + index );
-	uint64_t mask = ( 1UL << offset );
-	uint64_t old;
-	uint64_t new;
-
-	__asm__ __volatile__ ( "1:				\n\t"
-			       "ll.d %[old], %[qword]		\n\t"
-			       "andn %[new], %[old], %[mask]	\n\t"
-			       "sc.d %[new], %[qword]		\n\t"
-			       "beqz %[new], 1b			\n\t"
-			       : [old] "=&r" ( old ),
-				 [new] "=&r" ( new ),
-				 [qword] "+m" ( *qword )
-			       : [mask] "r" ( mask )
-			       : "cc", "memory");
-	return ( !! ( old & mask ) );
-}
-
-/**
- * Set bit atomically
- *
- * @v bit		Bit to set
- * @v bits		Bit field
- */
-static inline __attribute__ (( always_inline )) void
-set_bit ( unsigned int bit, volatile void *bits ) {
-
-	test_and_set_bit ( bit, bits );
-}
-
-/**
- * Clear bit atomically
- *
- * @v bit		Bit to set
- * @v bits		Bit field
- */
-static inline __attribute__ (( always_inline )) void
-clear_bit ( unsigned int bit, volatile void *bits ) {
-
-	test_and_clear_bit ( bit, bits );
-}
-
-#endif /* _BITS_BITOPS_H */

src/arch/loong64/include/bits/byteswap.h

@@ -1,47 +0,0 @@
-#ifndef _BITS_BYTESWAP_H
-#define _BITS_BYTESWAP_H
-
-/** @file
- *
- * Byte-order swapping functions
- *
- */
-
-#include <stdint.h>
-
-FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
-
-static inline __attribute__ (( always_inline, const )) uint16_t
-__bswap_variable_16 ( uint16_t x ) {
-	__asm__ ( "revb.2h %0, %1" : "=r" ( x ) : "r" ( x ) );
-	return x;
-}
-
-static inline __attribute__ (( always_inline )) void
-__bswap_16s ( uint16_t *x ) {
-	*x = __bswap_variable_16 ( *x );
-}
-
-static inline __attribute__ (( always_inline, const )) uint32_t
-__bswap_variable_32 ( uint32_t x ) {
-	__asm__ ( "revb.2w %0, %1" : "=r" ( x ) : "r" ( x ) );
-	return x;
-}
-
-static inline __attribute__ (( always_inline )) void
-__bswap_32s ( uint32_t *x ) {
-	*x = __bswap_variable_32 ( *x );
-}
-
-static inline __attribute__ (( always_inline, const )) uint64_t
-__bswap_variable_64 ( uint64_t x ) {
-	__asm__ ( "revb.d %0, %1" : "=r" ( x ) : "r" ( x ) );
-	return x;
-}
-
-static inline __attribute__ (( always_inline )) void
-__bswap_64s ( uint64_t *x ) {
-	*x = __bswap_variable_64 ( *x );
-}
-
-#endif

src/arch/loong64/include/bits/compiler.h

@@ -1,19 +0,0 @@
-#ifndef _BITS_COMPILER_H
-#define _BITS_COMPILER_H
-
-FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
-
-/** Dummy relocation type */
-#define RELOC_TYPE_NONE R_LARCH_NONE
-
-#ifndef ASSEMBLY
-
-/** Unprefixed constant operand modifier */
-#define ASM_NO_PREFIX "a"
-
-#define __asmcall
-#define __libgcc
-
-#endif /* ASSEMBLY */
-
-#endif /*_BITS_COMPILER_H */

src/arch/loong64/include/bits/endian.h

@@ -1,8 +0,0 @@
-#ifndef _BITS_ENDIAN_H
-#define _BITS_ENDIAN_H
-
-FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
-
-#define __BYTE_ORDER __LITTLE_ENDIAN
-
-#endif /* _BITS_ENDIAN_H */

src/arch/loong64/include/bits/entropy.h

@@ -1,12 +0,0 @@
-#ifndef _BITS_ENTROPY_H
-#define _BITS_ENTROPY_H
-
-/** @file
- *
- * LoongArch64-specific entropy API implementations
- *
- */
-
-FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
-
-#endif /* _BITS_ENTROPY_H */

src/arch/loong64/include/bits/errfile.h

@@ -1,19 +0,0 @@
-#ifndef _BITS_ERRFILE_H
-#define _BITS_ERRFILE_H
-
-/** @file
- *
- * LoongArch64-specific error file identifiers
- *
- */
-
-FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
-
-/**
- * @addtogroup errfile Error file identifiers
- * @{
- */
-
-/** @} */
-
-#endif /* _BITS_ERRFILE_H */

src/arch/loong64/include/bits/hyperv.h

@@ -1,12 +0,0 @@
-#ifndef _BITS_HYPERV_H
-#define _BITS_HYPERV_H
-
-/** @file
- *
- * Hyper-V interface
- *
- */
-
-FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
-
-#endif /* _BITS_HYPERV_H */

src/arch/loong64/include/bits/io.h

@@ -1,15 +0,0 @@
-#ifndef _BITS_IO_H
-#define _BITS_IO_H
-
-/** @file
- *
- * LoongArch64-specific I/O API implementations
- *
- */
-
-FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
-
-/** Page shift */
-#define PAGE_SHIFT 12
-
-#endif /* _BITS_IO_H */

src/arch/loong64/include/bits/iomap.h

@@ -1,12 +0,0 @@
-#ifndef _BITS_IOMAP_H
-#define _BITS_IOMAP_H
-
-/** @file
- *
- * LoongArch64-specific I/O mapping API implementations
- *
- */
-
-FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
-
-#endif /* _BITS_IOMAP_H */

src/arch/loong64/include/bits/nap.h

@@ -1,12 +0,0 @@
-#ifndef _BITS_NAP_H
-#define _BITS_NAP_H
-
-/** @file
- *
- * LoongArch64-specific CPU sleeping API implementations
- *
- */
-
-FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
-
-#endif /* _BITS_MAP_H */

src/arch/loong64/include/bits/pci_io.h

@@ -1,12 +0,0 @@
-#ifndef _BITS_PCI_IO_H
-#define _BITS_PCI_IO_H
-
-/** @file
- *
- * LoongArch64-specific PCI I/O API implementations
- *
- */
-
-FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
-
-#endif /* _BITS_PCI_IO_H */

src/arch/loong64/include/bits/profile.h

@@ -1,28 +0,0 @@
-#ifndef _BITS_PROFILE_H
-#define _BITS_PROFILE_H
-
-/** @file
- *
- * Profiling
- *
- */
-
-FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
-
-#include <stdint.h>
-
-/**
- * Get profiling timestamp
- *
- * @ret timestamp	Timestamp
- */
-static inline __attribute__ (( always_inline )) uint64_t
-profile_timestamp ( void ) {
-	uint64_t cycles;
-
-	/* Read cycle counter */
-	__asm__ __volatile__ ( "rdtime.d %0, $zero\n\t" : "=r" ( cycles ) );
-	return cycles;
-}
-
-#endif /* _BITS_PROFILE_H */

src/arch/loong64/include/bits/reboot.h

@@ -1,12 +0,0 @@
-#ifndef _BITS_REBOOT_H
-#define _BITS_REBOOT_H
-
-/** @file
- *
- * LoongArch64-specific reboot API implementations
- *
- */
-
-FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
-
-#endif /* _BITS_REBOOT_H */

src/arch/loong64/include/bits/sanboot.h

@@ -1,12 +0,0 @@
-#ifndef _BITS_SANBOOT_H
-#define _BITS_SANBOOT_H
-
-/** @file
- *
- * LoongArch64-specific sanboot API implementations
- *
- */
-
-FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
-
-#endif /* _BITS_SANBOOT_H */

src/arch/loong64/include/bits/smbios.h

@@ -1,12 +0,0 @@
-#ifndef _BITS_SMBIOS_H
-#define _BITS_SMBIOS_H
-
-/** @file
- *
- * LoongArch64-specific SMBIOS API implementations
- *
- */
-
-FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
-
-#endif /* _BITS_SMBIOS_H */

src/arch/loong64/include/bits/stdint.h

@@ -1,23 +0,0 @@
-#ifndef _BITS_STDINT_H
-#define _BITS_STDINT_H
-
-FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
-
-typedef __SIZE_TYPE__		size_t;
-typedef signed long		ssize_t;
-typedef signed long		off_t;
-
-typedef unsigned char		uint8_t;
-typedef unsigned short		uint16_t;
-typedef unsigned int		uint32_t;
-typedef unsigned long long	uint64_t;
-
-typedef signed char		int8_t;
-typedef signed short		int16_t;
-typedef signed int		int32_t;
-typedef signed long long	int64_t;
-
-typedef unsigned long		physaddr_t;
-typedef unsigned long		intptr_t;
-
-#endif /* _BITS_STDINT_H */

src/arch/loong64/include/bits/string.h

@@ -1,61 +0,0 @@
-#ifndef _BITS_STRING_H
-#define _BITS_STRING_H
-
-FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
-
-/** @file
- *
- * String functions
- *
- */
-
-extern void loong64_bzero ( void *dest, size_t len );
-extern void loong64_memset ( void *dest, size_t len, int character );
-extern void loong64_memcpy ( void *dest, const void *src, size_t len );
-extern void loong64_memmove_forwards ( void *dest, const void *src, size_t len );
-extern void loong64_memmove_backwards ( void *dest, const void *src, size_t len );
-extern void loong64_memmove ( void *dest, const void *src, size_t len );
-
-/**
- * Fill memory region
- *
- * @v dest		Destination region
- * @v character		Fill character
- * @v len		Length
- * @ret dest		Destination region
- */
-static inline __attribute__ (( always_inline )) void *
-memset ( void *dest, int character, size_t len ) {
-	loong64_memset ( dest, len, character );
-	return dest;
-}
-
-/**
- * Copy memory region
- *
- * @v dest		Destination region
- * @v src		Source region
- * @v len		Length
- * @ret dest		Destination region
- */
-static inline __attribute__ (( always_inline )) void *
-memcpy ( void *dest, const void *src, size_t len ) {
-	loong64_memcpy ( dest, src, len );
-	return dest;
-}
-
-/**
- * Copy (possibly overlapping) memory region
- *
- * @v dest		Destination region
- * @v src		Source region
- * @v len		Length
- * @ret dest		Destination region
- */
-static inline __attribute__ (( always_inline )) void *
-memmove ( void *dest, const void *src, size_t len ) {
-	loong64_memmove ( dest, src, len );
-	return dest;
-}
-
-#endif /* _BITS_STRING_H */

src/arch/loong64/include/bits/strings.h

@@ -1,69 +0,0 @@
-#ifndef _BITS_STRINGS_H
-#define _BITS_STRINGS_H
-
-/** @file
- *
- * String functions
- *
- */
-
-FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
-
-/**
- * Find first (i.e. least significant) set bit
- *
- * @v value		Value
- * @ret lsb		Least significant bit set in value (LSB=1), or zero
- */
-static inline __attribute__ (( always_inline )) int __ffsll ( long long value ){
-	unsigned long long bits = value;
-	unsigned long long lsb;
-	unsigned int lz;
-
-	/* Extract least significant set bit */
-	lsb = ( bits & -bits );
-
-	/* Count number of leading zeroes before LSB */
-	__asm__ ( "clz.d %0, %1" : "=r" ( lz ) : "r" ( lsb ) );
-
-	return ( 64 - lz );
-}
-
-/**
- * Find first (i.e. least significant) set bit
- *
- * @v value		Value
- * @ret lsb		Least significant bit set in value (LSB=1), or zero
- */
-static inline __attribute__ (( always_inline )) int __ffsl ( long value ) {
-
-	return __ffsll ( value );
-}
-
-/**
- * Find last (i.e. most significant) set bit
- *
- * @v value		Value
- * @ret msb		Most significant bit set in value (LSB=1), or zero
- */
-static inline __attribute__ (( always_inline )) int __flsll ( long long value ){
-	unsigned int lz;
-
-	/* Count number of leading zeroes */
-	__asm__ ( "clz.d %0, %1" : "=r" ( lz ) : "r" ( value ) );
-
-	return ( 64 - lz );
-}
-
-/**
- * Find last (i.e. most significant) set bit
- *
- * @v value		Value
- * @ret msb		Most significant bit set in value (LSB=1), or zero
- */
-static inline __attribute__ (( always_inline )) int __flsl ( long value ) {
-
-	return __flsll ( value );
-}
-
-#endif /* _BITS_STRINGS_H */

src/arch/loong64/include/bits/tcpip.h

@@ -1,19 +0,0 @@
-#ifndef _BITS_TCPIP_H
-#define _BITS_TCPIP_H
-
-/** @file
- *
- * Transport-network layer interface
- *
- */
-
-FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
-
-static inline __attribute__ (( always_inline )) uint16_t
-tcpip_continue_chksum ( uint16_t partial, const void *data, size_t len ) {
-
-	/* Not yet optimised */
-	return generic_tcpip_continue_chksum ( partial, data, len );
-}
-
-#endif /* _BITS_TCPIP_H */

src/arch/loong64/include/bits/time.h

@@ -1,12 +0,0 @@
-#ifndef _BITS_TIME_H
-#define _BITS_TIME_H
-
-/** @file
- *
- * LoongArch64-specific time API implementations
- *
- */
-
-FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
-
-#endif /* _BITS_TIME_H */

src/arch/loong64/include/bits/uaccess.h

@@ -1,12 +0,0 @@
-#ifndef _BITS_UACCESS_H
-#define _BITS_UACCESS_H
-
-/** @file
- *
- * LoongArch64-specific user access API implementations
- *
- */
-
-FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
-
-#endif /* _BITS_UACCESS_H */

src/arch/loong64/include/bits/uart.h

@@ -1,12 +0,0 @@
-#ifndef _BITS_UART_H
-#define _BITS_UART_H
-
-/** @file
- *
- * 16550-compatible UART
- *
- */
-
-FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
-
-#endif /* _BITS_UART_H */

src/arch/loong64/include/bits/umalloc.h

@@ -1,12 +0,0 @@
-#ifndef _BITS_UMALLOC_H
-#define _BITS_UMALLOC_H
-
-/** @file
- *
- * LoongArch64-specific user memory allocation API implementations
- *
- */
-
-FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
-
-#endif /* _BITS_UMALLOC_H */

src/arch/loong64/include/bits/xen.h

@@ -1,13 +0,0 @@
-#ifndef _BITS_XEN_H
-#define _BITS_XEN_H
-
-/** @file
- *
- * Xen interface
- *
- */
-FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
-
-#include <ipxe/nonxen.h>
-
-#endif /* _BITS_XEN_H */

src/arch/loong64/include/gdbmach.h

@@ -1,45 +0,0 @@
-#ifndef GDBMACH_H
-#define GDBMACH_H
-
-/** @file
- *
- * GDB architecture specifics
- *
- * This file declares functions for manipulating the machine state and
- * debugging context.
- *
- */
-
-#include <stdint.h>
-
-typedef unsigned long gdbreg_t;
-
-/* Register snapshot */
-enum {
-	/* Not yet implemented */
-	GDBMACH_NREGS,
-};
-
-#define GDBMACH_SIZEOF_REGS ( GDBMACH_NREGS * sizeof ( gdbreg_t ) )
-
-static inline void gdbmach_set_pc ( gdbreg_t *regs, gdbreg_t pc ) {
-	/* Not yet implemented */
-	( void ) regs;
-	( void ) pc;
-}
-
-static inline void gdbmach_set_single_step ( gdbreg_t *regs, int step ) {
-	/* Not yet implemented */
-	( void ) regs;
-	( void ) step;
-}
-
-static inline void gdbmach_breakpoint ( void ) {
-	/* Not yet implemented */
-}
-
-extern int gdbmach_set_breakpoint ( int type, unsigned long addr, size_t len,
-				    int enable );
-extern void gdbmach_init ( void );
-
-#endif /* GDBMACH_H */

src/arch/loong64/include/ipxe/efi/dhcparch.h

@@ -1,20 +0,0 @@
-#ifndef _IPXE_EFI_DHCPARCH_H
-#define _IPXE_EFI_DHCPARCH_H
-
-/** @file
- *
- * DHCP client architecture definitions
- *
- */
-
-FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
-
-#include <ipxe/dhcp.h>
-
-/** DHCP client architecture */
-#define DHCP_ARCH_CLIENT_ARCHITECTURE DHCP_CLIENT_ARCHITECTURE_LOONG64
-
-/** DHCP client network device interface */
-#define DHCP_ARCH_CLIENT_NDI 1 /* UNDI */ , 3, 10 /* v3.10 */
-
-#endif /* _IPXE_EFI_DHCPARCH_H */

src/arch/loong64/include/limits.h

@@ -1,53 +0,0 @@
-#ifndef LIMITS_H
-#define LIMITS_H	1
-
-/* Number of bits in a `char' */
-#define CHAR_BIT	8
-
-/* Minimum and maximum values a `signed char' can hold */
-#define SCHAR_MIN	(-128)
-#define SCHAR_MAX	127
-
-/* Maximum value an `unsigned char' can hold. (Minimum is 0.) */
-#define UCHAR_MAX	255
-
-/* Minimum and maximum values a `char' can hold */
-#define CHAR_MIN	SCHAR_MIN
-#define CHAR_MAX	SCHAR_MAX
-
-/* Minimum and maximum values a `signed short int' can hold */
-#define SHRT_MIN	(-32768)
-#define SHRT_MAX	32767
-
-/* Maximum value an `unsigned short' can hold. (Minimum is 0.) */
-#define USHRT_MAX	65535
-
-/* Minimum and maximum values a `signed int' can hold */
-#define INT_MIN		(-INT_MAX - 1)
-#define INT_MAX		2147483647
-
-/* Maximum value an `unsigned int' can hold. (Minimum is 0.) */
-#define UINT_MAX	4294967295U
-
-/* Minimum and maximum values a `signed int' can hold */
-#define INT_MAX		2147483647
-#define INT_MIN		(-INT_MAX - 1)
-
-/* Maximum value an `unsigned int' can hold. (Minimum is 0.) */
-#define UINT_MAX	4294967295U
-
-/* Minimum and maximum values a `signed long' can hold */
-#define LONG_MAX	9223372036854775807L
-#define LONG_MIN	(-LONG_MAX - 1L)
-
-/* Maximum value an `unsigned long' can hold. (Minimum is 0.) */
-#define ULONG_MAX	18446744073709551615UL
-
-/* Minimum and maximum values a `signed long long' can hold */
-#define LLONG_MAX	9223372036854775807LL
-#define LLONG_MIN	(-LONG_MAX - 1LL)
-
-/* Maximum value an `unsigned long long' can hold. (Minimum is 0.) */
-#define ULLONG_MAX	18446744073709551615ULL
-
-#endif /* LIMITS_H */

src/arch/loong64/include/setjmp.h

@@ -1,31 +0,0 @@
-#ifndef _SETJMP_H
-#define _SETJMP_H
-
-FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
-
-#include <stdint.h>
-
-/** jump buffer env*/
-typedef struct {
-	uint64_t s0;
-	uint64_t s1;
-	uint64_t s2;
-	uint64_t s3;
-	uint64_t s4;
-	uint64_t s5;
-	uint64_t s6;
-	uint64_t s7;
-	uint64_t s8;
-
-	uint64_t fp;
-	uint64_t sp;
-	uint64_t ra;
-} jmp_buf[1];
-
-extern int __asmcall __attribute__ (( returns_twice ))
-setjmp ( jmp_buf env );
-
-extern void __asmcall __attribute__ (( noreturn ))
-longjmp ( jmp_buf env, int val );
-
-#endif /* _SETJMP_H */

src/arch/x86/Makefile

@@ -22,6 +22,9 @@ SRCDIRS		+= arch/x86/drivers/xen
 SRCDIRS		+= arch/x86/drivers/hyperv
 SRCDIRS		+= arch/x86/transitions
 
+# breaks building some of the linux-related objects
+CFLAGS		+= -Ulinux
+
 # disable valgrind
 CFLAGS		+= -DNVALGRIND
 

src/arch/x86/Makefile.linux

@@ -1,5 +1,9 @@
 # -*- makefile -*- : Force emacs to use Makefile mode
 
+# Include x86 Linux headers
+#
+INCDIRS += arch/x86/include/linux
+
 # Include generic Linux Makefile
 #
 MAKEDEPS	+= Makefile.linux

src/arch/x86/core/rdrand.c

@@ -1,99 +0,0 @@
-/*
- * Copyright (C) 2023 Michael Brown <mbrown@fensystems.co.uk>.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- *
- * You can also choose to distribute this program under the terms of
- * the Unmodified Binary Distribution Licence (as given in the file
- * COPYING.UBDL), provided that you have satisfied its requirements.
- */
-
-FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
-
-/** @file
- *
- * Hardware random number generator
- *
- */
-
-#include <errno.h>
-#include <ipxe/cpuid.h>
-#include <ipxe/entropy.h>
-
-/** Number of times to retry RDRAND instruction */
-#define RDRAND_RETRY_COUNT 16
-
-/** Colour for debug messages */
-#define colour CPUID_FEATURES_INTEL_ECX_RDRAND
-
-/**
- * Enable entropy gathering
- *
- * @ret rc		Return status code
- */
-static int rdrand_entropy_enable ( void ) {
-	struct x86_features features;
-
-	/* Check that RDRAND is supported */
-	x86_features ( &features );
-	if ( ! ( features.intel.ecx & CPUID_FEATURES_INTEL_ECX_RDRAND ) ) {
-		DBGC ( colour, "RDRAND not supported\n" );
-		return -ENOTSUP;
-	}
-
-	return 0;
-}
-
-/**
- * Disable entropy gathering
- *
- */
-static void rdrand_entropy_disable ( void ) {
-
-	/* Nothing to do */
-}
-
-/**
- * Get noise sample
- *
- * @ret noise		Noise sample
- * @ret rc		Return status code
- */
-static int rdrand_get_noise ( noise_sample_t *noise ) {
-	unsigned int result;
-	unsigned int discard_c;
-	unsigned int ok;
-
-	/* Issue RDRAND, retrying until CF is set */
-	__asm__ ( "\n1:\n\t"
-		  "rdrand %0\n\t"
-		  "sbb %1, %1\n\t"
-		  "loopz 1b\n\t"
-		  : "=r" ( result ), "=r" ( ok ), "=c" ( discard_c )
-		  : "2" ( RDRAND_RETRY_COUNT ) );
-	if ( ! ok ) {
-		DBGC ( colour, "RDRAND failed to become ready\n" );
-		return -EBUSY;
-	}
-
-	*noise = result;
-	return 0;
-}
-
-PROVIDE_ENTROPY_INLINE ( rdrand, min_entropy_per_sample );
-PROVIDE_ENTROPY ( rdrand, entropy_enable, rdrand_entropy_enable );
-PROVIDE_ENTROPY ( rdrand, entropy_disable, rdrand_entropy_disable );
-PROVIDE_ENTROPY ( rdrand, get_noise, rdrand_get_noise );

src/arch/x86/image/bzimage.c

@@ -247,17 +247,19 @@ static void bzimage_update_header ( struct image *image,
  *
  * @v image		bzImage file
  * @v bzimg		bzImage context
+ * @v cmdline		Kernel command line
  * @ret rc		Return status code
  */
 static int bzimage_parse_cmdline ( struct image *image,
-				   struct bzimage_context *bzimg ) {
-	const char *vga;
-	const char *mem;
+				   struct bzimage_context *bzimg,
+				   char *cmdline ) {
 	char *sep;
-	char *end;
+	char *vga;
+	char *mem;
 
 	/* Look for "vga=" */
-	if ( ( vga = image_argument ( image, "vga=" ) ) ) {
+	if ( ( vga = strstr ( cmdline, "vga=" ) ) ) {
+		vga += 4;
 		sep = strchr ( vga, ' ' );
 		if ( sep )
 			*sep = '\0';
@@ -268,10 +270,10 @@ static int bzimage_parse_cmdline ( struct image *image,
 		} else if ( strcmp ( vga, "ask" ) == 0 ) {
 			bzimg->vid_mode = BZI_VID_MODE_ASK;
 		} else {
-			bzimg->vid_mode = strtoul ( vga, &end, 0 );
-			if ( *end ) {
+			bzimg->vid_mode = strtoul ( vga, &vga, 0 );
+			if ( *vga ) {
 				DBGC ( image, "bzImage %p strange \"vga=\" "
-				       "terminator '%c'\n", image, *end );
+				       "terminator '%c'\n", image, *vga );
 			}
 		}
 		if ( sep )
@@ -279,9 +281,10 @@ static int bzimage_parse_cmdline ( struct image *image,
 	}
 
 	/* Look for "mem=" */
-	if ( ( mem = image_argument ( image, "mem=" ) ) ) {
-		bzimg->mem_limit = strtoul ( mem, &end, 0 );
-		switch ( *end ) {
+	if ( ( mem = strstr ( cmdline, "mem=" ) ) ) {
+		mem += 4;
+		bzimg->mem_limit = strtoul ( mem, &mem, 0 );
+		switch ( *mem ) {
 		case 'G':
 		case 'g':
 			bzimg->mem_limit <<= 10;
@@ -299,7 +302,7 @@ static int bzimage_parse_cmdline ( struct image *image,
 			break;
 		default:
 			DBGC ( image, "bzImage %p strange \"mem=\" "
-			       "terminator '%c'\n", image, *end );
+			       "terminator '%c'\n", image, *mem );
 			break;
 		}
 		bzimg->mem_limit -= 1;
@@ -313,10 +316,11 @@ static int bzimage_parse_cmdline ( struct image *image,
  *
  * @v image		bzImage image
  * @v bzimg		bzImage context
+ * @v cmdline		Kernel command line
  */
 static void bzimage_set_cmdline ( struct image *image,
-				  struct bzimage_context *bzimg ) {
-	const char *cmdline = ( image->cmdline ? image->cmdline : "" );
+				  struct bzimage_context *bzimg,
+				  const char *cmdline ) {
 	size_t cmdline_len;
 
 	/* Copy command line down to real-mode portion */
@@ -524,6 +528,7 @@ static void bzimage_load_initrds ( struct image *image,
  */
 static int bzimage_exec ( struct image *image ) {
 	struct bzimage_context bzimg;
+	char *cmdline = ( image->cmdline ? image->cmdline : "" );
 	int rc;
 
 	/* Read and parse header from image */
@@ -546,7 +551,7 @@ static int bzimage_exec ( struct image *image ) {
 	}
 
 	/* Parse command line for bootloader parameters */
-	if ( ( rc = bzimage_parse_cmdline ( image, &bzimg ) ) != 0)
+	if ( ( rc = bzimage_parse_cmdline ( image, &bzimg, cmdline ) ) != 0)
 		return rc;
 
 	/* Check that initrds can be loaded */
@@ -563,7 +568,7 @@ static int bzimage_exec ( struct image *image ) {
 		      bzimg.rm_filesz, bzimg.pm_sz );
 
 	/* Store command line */
-	bzimage_set_cmdline ( image, &bzimg );
+	bzimage_set_cmdline ( image, &bzimg, cmdline );
 
 	/* Prepare for exiting.  Must do this before loading initrds,
 	 * since loading the initrds will corrupt the external heap.

src/arch/x86/include/bits/entropy.h

@@ -10,6 +10,5 @@
 FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #include <ipxe/rtc_entropy.h>
-#include <ipxe/rdrand.h>
 
 #endif /* _BITS_ENTROPY_H */

src/arch/x86/include/bits/errfile.h

@@ -28,7 +28,6 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 #define ERRFILE_cpuid		( ERRFILE_ARCH | ERRFILE_CORE | 0x00110000 )
 #define ERRFILE_rdtsc_timer	( ERRFILE_ARCH | ERRFILE_CORE | 0x00120000 )
 #define ERRFILE_acpi_timer	( ERRFILE_ARCH | ERRFILE_CORE | 0x00130000 )
-#define ERRFILE_rdrand		( ERRFILE_ARCH | ERRFILE_CORE | 0x00140000 )
 
 #define ERRFILE_bootsector     ( ERRFILE_ARCH | ERRFILE_IMAGE | 0x00000000 )
 #define ERRFILE_bzimage	       ( ERRFILE_ARCH | ERRFILE_IMAGE | 0x00010000 )

src/arch/x86/include/bits/io.h

@@ -9,9 +9,6 @@
 
 FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
-/** Page shift */
-#define PAGE_SHIFT 12
-
 #include <ipxe/x86_io.h>
 
 #endif /* _BITS_IO_H */

src/arch/x86/include/ipxe/cpuid.h

@@ -39,9 +39,6 @@ struct x86_features {
 /** Get standard features */
 #define CPUID_FEATURES 0x00000001UL
 
-/** RDRAND instruction is supported */
-#define CPUID_FEATURES_INTEL_ECX_RDRAND 0x40000000UL
-
 /** Hypervisor is present */
 #define CPUID_FEATURES_INTEL_ECX_HYPERVISOR 0x80000000UL
 

src/arch/x86/include/ipxe/pcbios/dhcparch.h

@@ -1,20 +0,0 @@
-#ifndef _IPXE_PCBIOS_DHCPARCH_H
-#define _IPXE_PCBIOS_DHCPARCH_H
-
-/** @file
- *
- * DHCP client architecture definitions
- *
- */
-
-FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
-
-#include <ipxe/dhcp.h>
-
-/** DHCP client architecture */
-#define DHCP_ARCH_CLIENT_ARCHITECTURE DHCP_CLIENT_ARCHITECTURE_X86
-
-/** DHCP client network device interface */
-#define DHCP_ARCH_CLIENT_NDI 1 /* UNDI */ , 2, 1 /* v2.1 */
-
-#endif /* _IPXE_PCBIOS_DHCPARCH_H */

src/arch/x86/include/ipxe/rdrand.h

@@ -1,37 +0,0 @@
-#ifndef _IPXE_RDRAND_H
-#define _IPXE_RDRAND_H
-
-/** @file
- *
- * Hardware random number generator
- *
- */
-
-FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
-
-#include <stdint.h>
-#include <ipxe/drbg.h>
-
-#ifdef ENTROPY_RDRAND
-#define ENTROPY_PREFIX_rdrand
-#else
-#define ENTROPY_PREFIX_rdrand __rdrand_
-#endif
-
-/**
- * min-entropy per sample
- *
- * @ret min_entropy	min-entropy of each sample
- */
-static inline __always_inline min_entropy_t
-ENTROPY_INLINE ( rdrand, min_entropy_per_sample ) ( void ) {
-
-	/* Data returned by RDRAND is theoretically full entropy, up
-	 * to a security strength of 128 bits.
-	 */
-	if ( DRBG_SECURITY_STRENGTH > 128 )
-		return 0;
-	return MIN_ENTROPY ( 8 * sizeof ( noise_sample_t ) );
-}
-
-#endif /* _IPXE_RDRAND_H */

src/arch/x86/include/ipxe/x86_io.h

@@ -28,6 +28,9 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
  *
  */
 
+/** Page shift */
+#define PAGE_SHIFT 12
+
 /*
  * Physical<->Bus address mappings
  *

src/arch/x86/include/linux/ipxe/dhcp_arch.h

@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2010 Piotr Jaroszyński <p.jaroszynski@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ *
+ * You can also choose to distribute this program under the terms of
+ * the Unmodified Binary Distribution Licence (as given in the file
+ * COPYING.UBDL), provided that you have satisfied its requirements.
+ */
+
+#ifndef _LINUX_DHCP_ARCH_H
+#define _LINUX_DHCP_ARCH_H
+
+/** @file
+ *
+ * Architecture-specific DHCP options
+ */
+
+FILE_LICENCE(GPL2_OR_LATER_OR_UBDL);
+
+#include <ipxe/dhcp.h>
+
+// Emulate one of the supported arch-platforms
+#include <arch/i386/include/pcbios/ipxe/dhcp_arch.h>
+//#include <arch/i386/include/efi/ipxe/dhcp_arch.h>
+//#include <arch/x86_64/include/efi/ipxe/dhcp_arch.h>
+
+#endif

src/arch/x86/interface/pcbios/bios_cachedhcp.c

@@ -59,7 +59,7 @@ static void cachedhcp_init ( void ) {
 	}
 
 	/* Record cached DHCPACK */
-	if ( ( rc = cachedhcp_record ( &cached_dhcpack, 0,
+	if ( ( rc = cachedhcp_record ( &cached_dhcpack,
 				       phys_to_user ( cached_dhcpack_phys ),
 				       sizeof ( BOOTPLAYER_t ) ) ) != 0 ) {
 		DBGC ( colour, "CACHEDHCP could not record DHCPACK: %s\n",

src/arch/x86/interface/pcbios/rtc_entropy.c

@@ -42,9 +42,6 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 /** Maximum time to wait for an RTC interrupt, in milliseconds */
 #define RTC_MAX_WAIT_MS 100
 
-/** Number of RTC interrupts to check for */
-#define RTC_CHECK_COUNT 3
-
 /** RTC interrupt handler */
 extern void rtc_isr ( void );
 
@@ -148,7 +145,6 @@ static void rtc_disable_int ( void ) {
  * @ret rc		Return status code
  */
 static int rtc_entropy_check ( void ) {
-	unsigned int count = 0;
 	unsigned int i;
 
 	/* Check that RTC interrupts are working */
@@ -162,18 +158,14 @@ static int rtc_entropy_check ( void ) {
 				       "cli\n\t" );
 
 		/* Check for RTC interrupt flag */
-		if ( rtc_flag ) {
-			rtc_flag = 0;
-			if ( ++count >= RTC_CHECK_COUNT )
-				return 0;
-		}
+		if ( rtc_flag )
+			return 0;
 
 		/* Delay */
 		mdelay ( 1 );
 	}
 
-	DBGC ( &rtc_flag, "RTC timed out waiting for interrupt %d/%d\n",
-	       ( count + 1 ), RTC_CHECK_COUNT );
+	DBGC ( &rtc_flag, "RTC timed out waiting for interrupt\n" );
 	return -ETIMEDOUT;
 }
 

src/arch/x86/interface/pxe/pxe_udp.c

@@ -12,7 +12,6 @@
 #include <ipxe/uaccess.h>
 #include <ipxe/process.h>
 #include <ipxe/netdevice.h>
-#include <ipxe/malloc.h>
 #include <realmode.h>
 #include <pxe.h>
 
@@ -483,28 +482,3 @@ struct pxe_api_call pxe_udp_api[] __pxe_api_call = {
 	PXE_API_CALL ( PXENV_UDP_READ, pxenv_udp_read,
 		       struct s_PXENV_UDP_READ ),
 };
-
-/**
- * Discard some cached PXE UDP data
- *
- * @ret discarded	Number of cached items discarded
- */
-static unsigned int pxe_udp_discard ( void ) {
-	struct io_buffer *iobuf;
-	unsigned int discarded = 0;
-
-	/* Try to discard the oldest received UDP packet */
-	iobuf = list_first_entry ( &pxe_udp.list, struct io_buffer, list );
-	if ( iobuf ) {
-		list_del ( &iobuf->list );
-		free_iob ( iobuf );
-		discarded++;
-	}
-
-	return discarded;
-}
-
-/** PXE UDP cache discarder */
-struct cache_discarder pxe_udp_discarder __cache_discarder ( CACHE_NORMAL ) = {
-	.discard = pxe_udp_discard,
-};

src/arch/x86_64/Makefile.linux

@@ -1,8 +1,8 @@
 # -*- makefile -*- : Force emacs to use Makefile mode
 
-# Starting virtual address
+# Linker script
 #
-LDFLAGS += -Ttext=0x400000
+LDSCRIPT = arch/x86_64/scripts/linux.lds
 
 # Include generic Linux Makefile
 #

src/arch/x86_64/include/bits/compiler.h

@@ -8,9 +8,6 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #ifndef ASSEMBLY
 
-/** Unprefixed constant operand modifier */
-#define ASM_NO_PREFIX "c"
-
 /** Declare a function with standard calling conventions */
 #define __asmcall __attribute__ (( regparm(0) ))
 

src/arch/x86_64/include/efi/ipxe/dhcp_arch.h

@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2010 VMware, Inc.  All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ *
+ * You can also choose to distribute this program under the terms of
+ * the Unmodified Binary Distribution Licence (as given in the file
+ * COPYING.UBDL), provided that you have satisfied its requirements.
+ */
+
+#ifndef _DHCP_ARCH_H
+#define _DHCP_ARCH_H
+
+/** @file
+ *
+ * Architecture-specific DHCP options
+ */
+
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
+
+#include <ipxe/dhcp.h>
+
+#define DHCP_ARCH_CLIENT_ARCHITECTURE DHCP_CLIENT_ARCHITECTURE_X86_64
+
+#define DHCP_ARCH_CLIENT_NDI 1 /* UNDI */ , 3, 10 /* v3.10 */
+
+#endif

src/arch/x86_64/include/ipxe/efi/dhcparch.h

@@ -1,20 +0,0 @@
-#ifndef _IPXE_EFI_DHCPARCH_H
-#define _IPXE_EFI_DHCPARCH_H
-
-/** @file
- *
- * DHCP client architecture definitions
- *
- */
-
-FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
-
-#include <ipxe/dhcp.h>
-
-/** DHCP client architecture */
-#define DHCP_ARCH_CLIENT_ARCHITECTURE DHCP_CLIENT_ARCHITECTURE_X86_64
-
-/** DHCP client network device interface */
-#define DHCP_ARCH_CLIENT_NDI 1 /* UNDI */ , 3, 10 /* v3.10 */
-
-#endif /* _IPXE_EFI_DHCPARCH_H */

src/arch/x86_64/include/pcbios/ipxe/dhcp_arch.h

@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2010 VMware, Inc.  All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ *
+ * You can also choose to distribute this program under the terms of
+ * the Unmodified Binary Distribution Licence (as given in the file
+ * COPYING.UBDL), provided that you have satisfied its requirements.
+ */
+
+#ifndef _DHCP_ARCH_H
+#define _DHCP_ARCH_H
+
+/** @file
+ *
+ * Architecture-specific DHCP options
+ */
+
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
+
+#include <ipxe/dhcp.h>
+
+#define DHCP_ARCH_CLIENT_ARCHITECTURE DHCP_CLIENT_ARCHITECTURE_X86
+
+#define DHCP_ARCH_CLIENT_NDI 1 /* UNDI */ , 2, 1 /* v2.1 */
+
+#endif

src/arch/x86_64/scripts/linux.lds

@@ -0,0 +1,106 @@
+/* -*- sh -*- */
+
+/*
+ * Linker script for x86_64 Linux images
+ *
+ */
+
+OUTPUT_FORMAT ( "elf64-x86-64", "elf64-x86-64", "elf64-x86-64" )
+OUTPUT_ARCH ( i386:x86-64 )
+
+SECTIONS {
+	_max_align = 32;
+
+	. = 0x400000;
+
+	/*
+	 * The text section
+	 *
+	 */
+
+	. = ALIGN ( _max_align );
+	.text : {
+		_text = .;
+		*(.text)
+		*(.text.*)
+		_etext = .;
+	}
+
+	/*
+	 * The rodata section
+	 *
+	 */
+
+	. = ALIGN ( _max_align );
+	.rodata : {
+		_rodata = .;
+		*(.rodata)
+		*(.rodata.*)
+		_erodata = .;
+	}
+
+	/*
+	 * The data section
+	 *
+	 * Adjust the address for the data segment.  We want to adjust up to
+	 * the same address within the page on the next page up.
+	 */
+
+	. = ALIGN (CONSTANT (MAXPAGESIZE)) - ((CONSTANT (MAXPAGESIZE) - .) & (CONSTANT (MAXPAGESIZE) - 1));
+	. = DATA_SEGMENT_ALIGN (CONSTANT (MAXPAGESIZE), CONSTANT (COMMONPAGESIZE));
+	.data : {
+		_data = .;
+		*(.data)
+		*(.data.*)
+		KEEP(*(SORT(.tbl.*)))
+		KEEP(*(.provided))
+		KEEP(*(.provided.*))
+		_edata = .;
+	}
+
+	/*
+	 * The bss section
+	 *
+	 */
+
+	. = ALIGN ( _max_align );
+	.bss : {
+		_bss = .;
+		*(.bss)
+		*(.bss.*)
+		*(COMMON)
+		_ebss = .;
+	}
+
+	/*
+	 * Weak symbols that need zero values if not otherwise defined
+	 *
+	 */
+
+	.weak 0x0 : {
+		_weak = .;
+		*(.weak)
+		*(.weak.*)
+		_eweak = .;
+	}
+	_assert = ASSERT ( ( _weak == _eweak ), ".weak is non-zero length" );
+
+	/*
+	 * Dispose of the comment and note sections to make the link map
+	 * easier to read
+	 *
+	 */
+
+	/DISCARD/ : {
+		*(.comment)
+		*(.comment.*)
+		*(.note)
+		*(.note.*)
+		*(.rel)
+		*(.rel.*)
+		*(.discard)
+		*(.discard.*)
+		*(.sbat)
+		*(.sbat.*)
+	}
+}

src/config/config_ethernet.c

@@ -49,6 +49,3 @@ REQUIRE_OBJECT ( eth_slow );
 #ifdef NET_PROTO_EAPOL
 REQUIRE_OBJECT ( eapol );
 #endif
-#ifdef NET_PROTO_LLDP
-REQUIRE_OBJECT ( lldp );
-#endif

src/config/defaults/efi.h

@@ -26,7 +26,6 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 #define FDT_EFI
 
 #define	NET_PROTO_IPV6		/* IPv6 protocol */
-#define	NET_PROTO_LLDP		/* Link Layer Discovery protocol */
 
 #define DOWNLOAD_PROTO_FILE	/* Local filesystem access */
 

src/config/general.h

@@ -40,7 +40,6 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 #define	NET_PROTO_STP		/* Spanning Tree protocol */
 #define	NET_PROTO_LACP		/* Link Aggregation control protocol */
 #define	NET_PROTO_EAPOL		/* EAP over LAN protocol */
-//#define NET_PROTO_LLDP	/* Link Layer Discovery protocol */
 
 /*
  * PXE support

src/core/cachedhcp.c

@@ -29,7 +29,6 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 #include <ipxe/dhcppkt.h>
 #include <ipxe/init.h>
 #include <ipxe/netdevice.h>
-#include <ipxe/vlan.h>
 #include <ipxe/cachedhcp.h>
 
 /** @file
@@ -44,8 +43,6 @@ struct cached_dhcp_packet {
 	const char *name;
 	/** DHCP packet (if any) */
 	struct dhcp_packet *dhcppkt;
-	/** VLAN tag (if applicable) */
-	unsigned int vlan;
 };
 
 /** Cached DHCPACK */
@@ -139,26 +136,15 @@ static int cachedhcp_apply ( struct cached_dhcp_packet *cache,
 		 * matches this network device.
 		 */
 		if ( memcmp ( ll_addr, chaddr, ll_addr_len ) != 0 ) {
-			DBGC ( colour, "CACHEDHCP %s %s does not match %s\n",
-			       cache->name, ll_protocol->ntoa ( chaddr ),
-			       netdev->name );
-			return 0;
-		}
-
-		/* Do nothing unless cached packet's VLAN tag matches
-		 * this network device.
-		 */
-		if ( vlan_tag ( netdev ) != cache->vlan ) {
-			DBGC ( colour, "CACHEDHCP %s VLAN %d does not match "
-			       "%s\n", cache->name, cache->vlan,
-			       netdev->name );
+			DBGC ( colour, "CACHEDHCP %s does not match %s\n",
+			       cache->name, netdev->name );
 			return 0;
 		}
+		DBGC ( colour, "CACHEDHCP %s is for %s\n",
+		       cache->name, netdev->name );
 
 		/* Use network device's settings block */
 		settings = netdev_settings ( netdev );
-		DBGC ( colour, "CACHEDHCP %s is for %s\n",
-		       cache->name, netdev->name );
 	}
 
 	/* Register settings */
@@ -179,13 +165,12 @@ static int cachedhcp_apply ( struct cached_dhcp_packet *cache,
  * Record cached DHCP packet
  *
  * @v cache		Cached DHCP packet
- * @v vlan		VLAN tag, if any
  * @v data		DHCPACK packet buffer
  * @v max_len		Maximum possible length
  * @ret rc		Return status code
  */
-int cachedhcp_record ( struct cached_dhcp_packet *cache, unsigned int vlan,
-		       userptr_t data, size_t max_len ) {
+int cachedhcp_record ( struct cached_dhcp_packet *cache, userptr_t data,
+		       size_t max_len ) {
 	struct dhcp_packet *dhcppkt;
 	struct dhcp_packet *tmp;
 	struct dhcphdr *dhcphdr;
@@ -240,55 +225,36 @@ int cachedhcp_record ( struct cached_dhcp_packet *cache, unsigned int vlan,
 	DBGC ( colour, "CACHEDHCP %s at %#08lx+%#zx/%#zx\n", cache->name,
 	       user_to_phys ( data, 0 ), len, max_len );
 	cache->dhcppkt = dhcppkt;
-	cache->vlan = vlan;
 
 	return 0;
 }
 
 /**
- * Cached DHCP packet startup function
+ * Cached DHCPACK startup function
  *
  */
 static void cachedhcp_startup ( void ) {
 
 	/* Apply cached ProxyDHCPOFFER, if any */
 	cachedhcp_apply ( &cached_proxydhcp, NULL );
-	cachedhcp_free ( &cached_proxydhcp );
 
 	/* Apply cached PXEBSACK, if any */
 	cachedhcp_apply ( &cached_pxebs, NULL );
-	cachedhcp_free ( &cached_pxebs );
 
-	/* Report unclaimed DHCPACK, if any.  Do not free yet, since
-	 * it may still be claimed by a dynamically created device
-	 * such as a VLAN device.
-	 */
+	/* Free any remaining cached packets */
 	if ( cached_dhcpack.dhcppkt ) {
 		DBGC ( colour, "CACHEDHCP %s unclaimed\n",
 		       cached_dhcpack.name );
 	}
-}
-
-/**
- * Cached DHCP packet shutdown function
- *
- * @v booting		System is shutting down for OS boot
- */
-static void cachedhcp_shutdown ( int booting __unused ) {
-
-	/* Free cached DHCPACK, if any */
-	if ( cached_dhcpack.dhcppkt ) {
-		DBGC ( colour, "CACHEDHCP %s never claimed\n",
-		       cached_dhcpack.name );
-	}
 	cachedhcp_free ( &cached_dhcpack );
+	cachedhcp_free ( &cached_proxydhcp );
+	cachedhcp_free ( &cached_pxebs );
 }
 
 /** Cached DHCPACK startup function */
 struct startup_fn cachedhcp_startup_fn __startup_fn ( STARTUP_LATE ) = {
 	.name = "cachedhcp",
 	.startup = cachedhcp_startup,
-	.shutdown = cachedhcp_shutdown,
 };
 
 /**

src/core/cpio.c

@@ -77,12 +77,17 @@ size_t cpio_name_len ( struct image *image ) {
  */
 static void cpio_parse_cmdline ( struct image *image,
 				 struct cpio_header *cpio ) {
-	const char *arg;
+	const char *cmdline;
+	char *arg;
 	char *end;
 	unsigned int mode;
 
+	/* Skip image filename */
+	cmdline = ( cpio_name ( image ) + cpio_name_len ( image ) );
+
 	/* Look for "mode=" */
-	if ( ( arg = image_argument ( image, "mode=" ) ) ) {
+	if ( ( arg = strstr ( cmdline, "mode=" ) ) ) {
+		arg += 5;
 		mode = strtoul ( arg, &end, 8 /* Octal for file mode */ );
 		if ( *end && ( *end != ' ' ) ) {
 			DBGC ( image, "CPIO %p strange \"mode=\" "

src/core/image.c

@@ -27,7 +27,6 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <ctype.h>
 #include <errno.h>
 #include <assert.h>
 #include <libgen.h>
@@ -570,33 +569,3 @@ struct image * image_memory ( const char *name, userptr_t data, size_t len ) {
  err_alloc_image:
 	return NULL;
 }
-
-/**
- * Find argument within image command line
- *
- * @v image		Image
- * @v key		Argument search key (including trailing delimiter)
- * @ret value		Argument value, or NULL if not found
- */
-const char * image_argument ( struct image *image, const char *key ) {
-	const char *cmdline = image->cmdline;
-	const char *search;
-	const char *match;
-	const char *next;
-
-	/* Find argument */
-	for ( search = cmdline ; search ; search = next ) {
-
-		/* Find next occurrence, if any */
-		match = strstr ( search, key );
-		if ( ! match )
-			break;
-		next = ( match + strlen ( key ) );
-
-		/* Check preceding delimiter, if any */
-		if ( ( match == cmdline ) || isspace ( match[-1] ) )
-			return next;
-	}
-
-	return NULL;
-}

src/drivers/block/scsi.c

@@ -609,7 +609,6 @@ static void scsicmd_read_capacity_cmd ( struct scsi_command *scsicmd,
  */
 static void scsicmd_read_capacity_done ( struct scsi_command *scsicmd,
 					 int rc ) {
-	struct scsi_device *scsidev = scsicmd->scsidev;
 	struct scsi_read_capacity_private *priv = scsicmd_priv ( scsicmd );
 	struct scsi_capacity_16 *capacity16 = &priv->capacity.capacity16;
 	struct scsi_capacity_10 *capacity10 = &priv->capacity.capacity10;
@@ -646,9 +645,6 @@ static void scsicmd_read_capacity_done ( struct scsi_command *scsicmd,
 	}
 	capacity.max_count = -1U;
 
-	/* Allow transport layer to update capacity */
-	block_capacity ( &scsidev->scsi, &capacity );
-
 	/* Return capacity to caller */
 	block_capacity ( &scsicmd->block, &capacity );
 

src/drivers/bus/eisa.c

@@ -98,16 +98,8 @@ static void eisa_remove ( struct eisa_device *eisa ) {
 static int eisabus_probe ( struct root_device *rootdev ) {
 	struct eisa_device *eisa = NULL;
 	unsigned int slot;
-	uint8_t system;
 	int rc;
 
-	/* Check for EISA system board */
-	system = inb ( EISA_VENDOR_ID );
-	if ( system & 0x80 ) {
-		DBG ( "No EISA system board (read %02x)\n", system );
-		return -ENODEV;
-	}
-
 	for ( slot = EISA_MIN_SLOT ; slot <= EISA_MAX_SLOT ; slot++ ) {
 		/* Allocate struct eisa_device */
 		if ( ! eisa )

src/drivers/bus/pci.c

@@ -205,7 +205,6 @@ int pci_read_config ( struct pci_device *pci ) {
 	pci_read_config_dword ( pci, PCI_REVISION, &tmp );
 	pci->class = ( tmp >> 8 );
 	pci_read_config_byte ( pci, PCI_INTERRUPT_LINE, &pci->irq );
-	pci_read_config_byte ( pci, PCI_HEADER_TYPE, &pci->hdrtype );
 	pci_read_bases ( pci );
 
 	/* Initialise generic device component */

src/drivers/infiniband/golan.c

@@ -2647,7 +2647,6 @@ static struct pci_device_id golan_nics[] = {
 	PCI_ROM ( 0x15b3, 0x1021, "ConnectX-7", "ConnectX-7 HCA driver, DevID 4129", 0 ),
 	PCI_ROM ( 0x15b3, 0xa2d2, "BlueField", "BlueField integrated ConnectX-5 network controller HCA driver, DevID 41682", 0 ),
 	PCI_ROM ( 0x15b3, 0xa2d6, "BlueField-2", "BlueField-2 network controller HCA driver, DevID 41686", 0 ),
-	PCI_ROM ( 0x15b3, 0xa2dc, "BlueField-3", "BlueField-3 network controller HCA driver, DevID 41692", 0 ),
 };
 
 struct pci_driver golan_driver __pci_driver = {

src/drivers/net/ecm.c

@@ -121,9 +121,10 @@ int ecm_fetch_mac ( struct usb_function *func,
 	}
 
 	/* Apply system-specific MAC address as current link-layer
-	 * address, if present.
+	 * address, if present and not already used.
 	 */
-	if ( ( rc = acpi_mac ( amac ) ) == 0 ) {
+	if ( ( ( rc = acpi_mac ( amac ) ) == 0 ) &&
+	     ! find_netdev_by_ll_addr ( &ethernet_protocol, amac ) ) {
 		memcpy ( netdev->ll_addr, amac, ETH_ALEN );
 		DBGC ( usb, "USB %s using system-specific MAC %s\n",
 		       func->name, eth_ntoa ( netdev->ll_addr ) );

src/drivers/net/efi/nii.c

@@ -222,7 +222,7 @@ static int nii_pci_open ( struct nii_nic *nii ) {
 
 	/* Locate PCI I/O protocol */
 	if ( ( rc = efi_locate_device ( device, &efi_pci_io_protocol_guid,
-					&pci_device, 0 ) ) != 0 ) {
+					&pci_device ) ) != 0 ) {
 		DBGC ( nii, "NII %s could not locate PCI I/O protocol: %s\n",
 		       nii->dev.name, strerror ( rc ) );
 		goto err_locate;
@@ -921,17 +921,18 @@ static int nii_set_station_address ( struct nii_nic *nii,
  * Set receive filters
  *
  * @v nii		NII NIC
- * @v flags		Flags
  * @ret rc		Return status code
  */
-static int nii_set_rx_filters ( struct nii_nic *nii, unsigned int flags ) {
+static int nii_set_rx_filters ( struct nii_nic *nii ) {
 	uint32_t implementation = nii->undi->Implementation;
+	unsigned int flags;
 	unsigned int op;
 	int stat;
 	int rc;
 
 	/* Construct receive filter set */
-	flags |= PXE_OPFLAGS_RECEIVE_FILTER_UNICAST;
+	flags = ( PXE_OPFLAGS_RECEIVE_FILTER_ENABLE |
+		  PXE_OPFLAGS_RECEIVE_FILTER_UNICAST );
 	if ( implementation & PXE_ROMID_IMP_BROADCAST_RX_SUPPORTED )
 		flags |= PXE_OPFLAGS_RECEIVE_FILTER_BROADCAST;
 	if ( implementation & PXE_ROMID_IMP_PROMISCUOUS_RX_SUPPORTED )
@@ -943,40 +944,14 @@ static int nii_set_rx_filters ( struct nii_nic *nii, unsigned int flags ) {
 	op = NII_OP ( PXE_OPCODE_RECEIVE_FILTERS, flags );
 	if ( ( stat = nii_issue ( nii, op ) ) < 0 ) {
 		rc = -EIO_STAT ( stat );
-		DBGC ( nii, "NII %s could not %s%sable receive filters "
-		       "%#04x: %s\n", nii->dev.name,
-		       ( ( flags & PXE_OPFLAGS_RECEIVE_FILTER_ENABLE ) ?
-			 "en" : "" ),
-		       ( ( flags & PXE_OPFLAGS_RECEIVE_FILTER_DISABLE ) ?
-			 "dis" : "" ), flags, strerror ( rc ) );
+		DBGC ( nii, "NII %s could not set receive filters %#04x: %s\n",
+		       nii->dev.name, flags, strerror ( rc ) );
 		return rc;
 	}
 
 	return 0;
 }
 
-/**
- * Enable receive filters
- *
- * @v nii		NII NIC
- * @ret rc		Return status code
- */
-static int nii_enable_rx_filters ( struct nii_nic *nii ) {
-
-	return nii_set_rx_filters ( nii, PXE_OPFLAGS_RECEIVE_FILTER_ENABLE );
-}
-
-/**
- * Disable receive filters
- *
- * @v nii		NII NIC
- * @ret rc		Return status code
- */
-static int nii_disable_rx_filters ( struct nii_nic *nii ) {
-
-	return nii_set_rx_filters ( nii, PXE_OPFLAGS_RECEIVE_FILTER_DISABLE );
-}
-
 /**
  * Transmit packet
  *
@@ -1200,25 +1175,13 @@ static int nii_open ( struct net_device *netdev ) {
 		/* Treat as non-fatal */
 	}
 
-	/* Disable receive filters
-	 *
-	 * We have no reason to disable receive filters here (or
-	 * anywhere), but some NII drivers have a bug which prevents
-	 * packets from being received unless we attempt to disable
-	 * the receive filters.
-	 *
-	 * Ignore any failures, since we genuinely don't care if the
-	 * NII driver cannot disable the filters.
-	 */
-	nii_disable_rx_filters ( nii );
-
-	/* Enable receive filters */
-	if ( ( rc = nii_enable_rx_filters ( nii ) ) != 0 )
-		goto err_enable_rx_filters;
+	/* Set receive filters */
+	if ( ( rc = nii_set_rx_filters ( nii ) ) != 0 )
+		goto err_set_rx_filters;
 
 	return 0;
 
- err_enable_rx_filters:
+ err_set_rx_filters:
 	nii_shutdown ( nii );
  err_initialise:
 	return rc;

src/drivers/net/efi/snp.c

@@ -27,7 +27,6 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 #include <ipxe/efi/efi.h>
 #include <ipxe/efi/efi_driver.h>
 #include <ipxe/efi/efi_snp.h>
-#include <ipxe/efi/efi_utils.h>
 #include "snpnet.h"
 #include "nii.h"
 
@@ -41,60 +40,34 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
  * Check to see if driver supports a device
  *
  * @v device		EFI device handle
- * @v protocol		Protocol GUID
  * @ret rc		Return status code
  */
-static int snp_nii_supported ( EFI_HANDLE device, EFI_GUID *protocol ) {
+static int snp_supported ( EFI_HANDLE device ) {
 	EFI_BOOT_SERVICES *bs = efi_systab->BootServices;
-	EFI_HANDLE parent;
 	EFI_STATUS efirc;
-	int rc;
 
 	/* Check that this is not a device we are providing ourselves */
 	if ( find_snpdev ( device ) != NULL ) {
-		DBGCP ( device, "HANDLE %s is provided by this binary\n",
+		DBGCP ( device, "SNP %s is provided by this binary\n",
 			efi_handle_name ( device ) );
 		return -ENOTTY;
 	}
 
-	/* Test for presence of protocol */
-	if ( ( efirc = bs->OpenProtocol ( device, protocol,
+	/* Test for presence of simple network protocol */
+	if ( ( efirc = bs->OpenProtocol ( device,
+					  &efi_simple_network_protocol_guid,
 					  NULL, efi_image_handle, device,
 					  EFI_OPEN_PROTOCOL_TEST_PROTOCOL))!=0){
-		DBGCP ( device, "HANDLE %s is not a %s device\n",
-			efi_handle_name ( device ),
-			efi_guid_ntoa ( protocol ) );
+		DBGCP ( device, "SNP %s is not an SNP device\n",
+			efi_handle_name ( device ) );
 		return -EEFI ( efirc );
 	}
+	DBGC ( device, "SNP %s is an SNP device\n",
+	       efi_handle_name ( device ) );
 
-	/* Check that there are no instances of this protocol further
-	 * up this device path.
-	 */
-	if ( ( rc = efi_locate_device ( device, protocol,
-					&parent, 1 ) ) == 0 ) {
-		DBGC2 ( device, "HANDLE %s has %s-supporting parent ",
-			efi_handle_name ( device ),
-			efi_guid_ntoa ( protocol ) );
-		DBGC2 ( device, "%s\n", efi_handle_name ( parent ) );
-		return -ENOTTY;
-	}
-
-	DBGC ( device, "HANDLE %s is a %s device\n",
-	       efi_handle_name ( device ), efi_guid_ntoa ( protocol ) );
 	return 0;
 }
 
-/**
- * Check to see if driver supports a device
- *
- * @v device		EFI device handle
- * @ret rc		Return status code
- */
-static int snp_supported ( EFI_HANDLE device ) {
-
-	return snp_nii_supported ( device, &efi_simple_network_protocol_guid );
-}
-
 /**
  * Check to see if driver supports a device
  *
@@ -102,8 +75,29 @@ static int snp_supported ( EFI_HANDLE device ) {
  * @ret rc		Return status code
  */
 static int nii_supported ( EFI_HANDLE device ) {
+	EFI_BOOT_SERVICES *bs = efi_systab->BootServices;
+	EFI_STATUS efirc;
 
-	return snp_nii_supported ( device, &efi_nii31_protocol_guid );
+	/* Check that this is not a device we are providing ourselves */
+	if ( find_snpdev ( device ) != NULL ) {
+		DBGCP ( device, "NII %s is provided by this binary\n",
+			efi_handle_name ( device ) );
+		return -ENOTTY;
+	}
+
+	/* Test for presence of NII protocol */
+	if ( ( efirc = bs->OpenProtocol ( device,
+					  &efi_nii31_protocol_guid,
+					  NULL, efi_image_handle, device,
+					  EFI_OPEN_PROTOCOL_TEST_PROTOCOL))!=0){
+		DBGCP ( device, "NII %s is not an NII device\n",
+			efi_handle_name ( device ) );
+		return -EEFI ( efirc );
+	}
+	DBGC ( device, "NII %s is an NII device\n",
+	       efi_handle_name ( device ) );
+
+	return 0;
 }
 
 /** EFI SNP driver */

src/drivers/net/efi/snponly.c

@@ -80,7 +80,7 @@ static int chained_locate ( struct chained_protocol *chained ) {
 
 	/* Locate handle supporting this protocol */
 	if ( ( rc = efi_locate_device ( device, chained->protocol,
-					&parent, 0 ) ) != 0 ) {
+					&parent ) ) != 0 ) {
 		DBGC ( device, "CHAINED %s does not support %s: %s\n",
 		       efi_handle_name ( device ),
 		       efi_guid_ntoa ( chained->protocol ), strerror ( rc ) );

src/drivers/net/ena.c

@@ -350,90 +350,6 @@ static int ena_admin ( struct ena_nic *ena, union ena_aq_req *req,
 	return rc;
 }
 
-/**
- * Set async event notification queue config
- *
- * @v ena		ENA device
- * @v enabled		Bitmask of the groups to enable
- * @ret rc		Return status code
- */
-static int ena_set_aenq_config ( struct ena_nic *ena, uint32_t enabled ) {
-	union ena_aq_req *req;
-	union ena_acq_rsp *rsp;
-	union ena_feature *feature;
-	int rc;
-
-	/* Construct request */
-	req = ena_admin_req ( ena );
-	req->header.opcode = ENA_SET_FEATURE;
-	req->set_feature.id = ENA_AENQ_CONFIG;
-	feature = &req->set_feature.feature;
-	feature->aenq.enabled = cpu_to_le32 ( enabled );
-
-	/* Issue request */
-	if ( ( rc = ena_admin ( ena, req, &rsp ) ) != 0 )
-		return rc;
-
-	return 0;
-}
-
-/**
- * Create async event notification queue
- *
- * @v ena		ENA device
- * @ret rc		Return status code
- */
-static int ena_create_async ( struct ena_nic *ena ) {
-	size_t aenq_len = ( ENA_AENQ_COUNT * sizeof ( ena->aenq.evt[0] ) );
-	int rc;
-
-	/* Allocate async event notification queue */
-	ena->aenq.evt = malloc_phys ( aenq_len, aenq_len );
-	if ( ! ena->aenq.evt ) {
-		rc = -ENOMEM;
-		goto err_alloc_aenq;
-	}
-	memset ( ena->aenq.evt, 0, aenq_len );
-
-	/* Program queue address and capabilities */
-	ena_set_base ( ena, ENA_AENQ_BASE, ena->aenq.evt );
-	ena_set_caps ( ena, ENA_AENQ_CAPS, ENA_AENQ_COUNT,
-		       sizeof ( ena->aenq.evt[0] ) );
-
-	DBGC ( ena, "ENA %p AENQ [%08lx,%08lx)\n",
-	       ena, virt_to_phys ( ena->aenq.evt ),
-	       ( virt_to_phys ( ena->aenq.evt ) + aenq_len ) );
-
-	/* Disable all events */
-	if ( ( rc = ena_set_aenq_config ( ena, 0 ) ) != 0 )
-		goto err_set_aenq_config;
-
-	return 0;
-
- err_set_aenq_config:
-	ena_clear_caps ( ena, ENA_AENQ_CAPS );
-	free_phys ( ena->aenq.evt, aenq_len );
- err_alloc_aenq:
-	return rc;
-}
-
-/**
- * Destroy async event notification queue
- *
- * @v ena		ENA device
- */
-static void ena_destroy_async ( struct ena_nic *ena ) {
-	size_t aenq_len = ( ENA_AENQ_COUNT * sizeof ( ena->aenq.evt[0] ) );
-
-	/* Clear queue capabilities */
-	ena_clear_caps ( ena, ENA_AENQ_CAPS );
-	wmb();
-
-	/* Free queue */
-	free_phys ( ena->aenq.evt, aenq_len );
-	DBGC ( ena, "ENA %p AENQ destroyed\n", ena );
-}
-
 /**
  * Create submission queue
  *
@@ -1182,10 +1098,6 @@ static int ena_probe ( struct pci_device *pci ) {
 	if ( ( rc = ena_create_admin ( ena ) ) != 0 )
 		goto err_create_admin;
 
-	/* Create async event notification queue */
-	if ( ( rc = ena_create_async ( ena ) ) != 0 )
-		goto err_create_async;
-
 	/* Set host attributes */
 	if ( ( rc = ena_set_host_attributes ( ena ) ) != 0 )
 		goto err_set_host_attributes;
@@ -1209,8 +1121,6 @@ static int ena_probe ( struct pci_device *pci ) {
  err_register_netdev:
  err_get_device_attributes:
  err_set_host_attributes:
-	ena_destroy_async ( ena );
- err_create_async:
 	ena_destroy_admin ( ena );
  err_create_admin:
 	ena_reset ( ena );
@@ -1238,9 +1148,6 @@ static void ena_remove ( struct pci_device *pci ) {
 	/* Unregister network device */
 	unregister_netdev ( netdev );
 
-	/* Destroy async event notification queue */
-	ena_destroy_async ( ena );
-
 	/* Destroy admin queues */
 	ena_destroy_admin ( ena );
 

src/drivers/net/ena.h

@@ -24,9 +24,6 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 /** Number of admin completion queue entries */
 #define ENA_ACQ_COUNT 2
 
-/** Number of async event notification queue entries */
-#define ENA_AENQ_COUNT 2
-
 /** Number of transmit queue entries */
 #define ENA_TX_COUNT 16
 
@@ -63,12 +60,6 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 /** Maximum time to wait for admin requests */
 #define ENA_ADMIN_MAX_WAIT_MS 5000
 
-/** Async event notification queue capabilities register */
-#define ENA_AENQ_CAPS 0x34
-
-/** Async event notification queue base address register */
-#define ENA_AENQ_BASE 0x38
-
 /** Device control register */
 #define ENA_CTRL 0x54
 #define ENA_CTRL_RESET 0x00000001UL	/**< Reset */
@@ -139,17 +130,6 @@ struct ena_device_attributes {
 	uint32_t mtu;
 } __attribute__ (( packed ));
 
-/** Async event notification queue config */
-#define ENA_AENQ_CONFIG 26
-
-/** Async event notification queue config */
-struct ena_aenq_config {
-	/** Bitmask of supported AENQ groups (device -> host) */
-	uint32_t supported;
-	/** Bitmask of enabled AENQ groups (host -> device) */
-	uint32_t enabled;
-} __attribute__ (( packed ));
-
 /** Host attributes */
 #define ENA_HOST_ATTRIBUTES 28
 
@@ -228,8 +208,6 @@ struct ena_host_info {
 union ena_feature {
 	/** Device attributes */
 	struct ena_device_attributes device;
-	/** Async event notification queue config */
-	struct ena_aenq_config aenq;
 	/** Host attributes */
 	struct ena_host_attributes host;
 };
@@ -528,28 +506,6 @@ struct ena_acq {
 	unsigned int phase;
 };
 
-/** Async event notification queue event */
-struct ena_aenq_event {
-	/** Type of event */
-	uint16_t group;
-	/** ID of event */
-	uint16_t syndrome;
-	/** Phase */
-	uint8_t flags;
-	/** Reserved */
-	uint8_t reserved[3];
-	/** Timestamp */
-	uint64_t timestamp;
-	/** Additional event data */
-	uint8_t data[48];
-} __attribute__ (( packed ));
-
-/** Async event notification queue */
-struct ena_aenq {
-	/** Events */
-	struct ena_aenq_event *evt;
-};
-
 /** Transmit submission queue entry */
 struct ena_tx_sqe {
 	/** Length */
@@ -746,8 +702,6 @@ struct ena_nic {
 	struct ena_aq aq;
 	/** Admin completion queue */
 	struct ena_acq acq;
-	/** Async event notification queue */
-	struct ena_aenq aenq;
 	/** Transmit queue */
 	struct ena_qp tx;
 	/** Receive queue */

src/drivers/net/netfront.c

@@ -59,9 +59,6 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 	EUNIQ ( EINFO_EIO, ( -(status) & 0x1f ),			\
 		EIO_NETIF_RSP_ERROR, EIO_NETIF_RSP_DROPPED )
 
-/** List of netfront devices */
-static LIST_HEAD ( netfront_devices );
-
 /******************************************************************************
  *
  * XenStore interface
@@ -955,7 +952,6 @@ static int netfront_probe ( struct xen_device *xendev ) {
 	netdev->dev = &xendev->dev;
 	netfront = netdev->priv;
 	netfront->xendev = xendev;
-	netfront->netdev = netdev;
 	INIT_LIST_HEAD ( &netfront->rx_partial );
 	DBGC ( netfront, "NETFRONT %s backend=\"%s\" in domain %ld\n",
 	       xendev->key, xendev->backend, xendev->backend_id );
@@ -995,13 +991,9 @@ static int netfront_probe ( struct xen_device *xendev ) {
 	/* Set initial link state */
 	netdev_link_down ( netdev );
 
-	/* Add to list of netfront devices */
-	list_add_tail ( &netfront->list, &netfront_devices );
-
 	xen_set_drvdata ( xendev, netdev );
 	return 0;
 
-	list_del ( &netfront->list );
 	unregister_netdev ( netdev );
  err_register_netdev:
  err_read_mac:
@@ -1023,9 +1015,6 @@ static void netfront_remove ( struct xen_device *xendev ) {
 	struct netfront_nic *netfront = netdev->priv;
 	struct xen_hypervisor *xen = xendev->xen;
 
-	/* Remove from list of netfront devices */
-	list_del ( &netfront->list );
-
 	/* Unregister network device */
 	unregister_netdev ( netdev );
 
@@ -1044,41 +1033,3 @@ struct xen_driver netfront_driver __xen_driver = {
 	.probe = netfront_probe,
 	.remove = netfront_remove,
 };
-
-/******************************************************************************
- *
- * Emulated PCI device inhibitor
- *
- ******************************************************************************
- */
-
-/**
- * Inhibit emulated PCI devices
- *
- * @v netdev		Network device
- * @ret rc		Return status code
- */
-static int netfront_net_probe ( struct net_device *netdev ) {
-	struct netfront_nic *netfront;
-
-	/* Inhibit emulated PCI devices matching an existing netfront device */
-	list_for_each_entry ( netfront, &netfront_devices, list ) {
-		if ( ( netdev->dev != netfront->netdev->dev ) &&
-		     ( netdev->ll_protocol->ll_addr_len == ETH_ALEN ) &&
-		     ( memcmp ( netdev->hw_addr, netfront->netdev->hw_addr,
-				ETH_ALEN ) == 0 ) ) {
-			DBGC ( netfront, "NETFRONT %s inhibiting emulated %s "
-			       "%s\n", netfront->xendev->key,
-			       netdev->dev->driver_name, netdev->dev->name );
-			return -EEXIST;
-		}
-	}
-
-	return 0;
-}
-
-/** Emulated PCI device inhibitor driver */
-struct net_driver netfront_net_driver __net_driver = {
-	.name = "netfront",
-	.probe = netfront_net_probe,
-};

src/drivers/net/netfront.h

@@ -159,11 +159,6 @@ struct netfront_nic {
 	/** Grant references */
 	grant_ref_t refs[NETFRONT_REF_COUNT];
 
-	/** Network device */
-	struct net_device *netdev;
-	/** List of netfront NICs */
-	struct list_head list;
-
 	/** Transmit ring */
 	struct netfront_ring tx;
 	/** Transmit front ring */

src/drivers/net/realtek.c

@@ -1067,15 +1067,11 @@ static void realtek_detect ( struct realtek_nic *rtl ) {
 	 * Note that enabling DAC seems to cause bizarre behaviour
 	 * (lockups, garbage data on the wire) on some systems, even
 	 * if only 32-bit addresses are used.
-	 *
-	 * Disable VLAN offload, since some cards seem to have it
-	 * enabled by default.
 	 */
 	cpcr = readw ( rtl->regs + RTL_CPCR );
 	cpcr |= ( RTL_CPCR_MULRW | RTL_CPCR_CPRX | RTL_CPCR_CPTX );
 	if ( sizeof ( physaddr_t ) > sizeof ( uint32_t ) )
 		cpcr |= RTL_CPCR_DAC;
-	cpcr &= ~RTL_CPCR_VLAN;
 	writew ( cpcr, rtl->regs + RTL_CPCR );
 	check_cpcr = readw ( rtl->regs + RTL_CPCR );