Add Virtual LAN support

This patch adds support for virtual LAN (VLAN) tagging. VLAN tagging
allows multiple VLANs in a bridged network to share the same physical
network link but maintain isolation:

http://en.wikipedia.org/wiki/IEEE_802.1Q

* grub-core/net/ethernet.c: Add check, get, and set vlan tag id.
* grub-core/net/drivers/ieee1275/ofnet.c: Get vlan tag id from bootargs.
* grub-core/net/arp.c: Add check.
* grub-core/net/ip.c: Likewise.
* include/grub/net/arp.h: Add vlantag attribute.
* include/grub/net/ip.h: Likewise.

ChangeLog

@@ -168,6 +168,25 @@
 2015-01-19  Kris Moore <kris@pcbsd.org>
 
 	* grub-core/disk/geli.c: Support GELI v6 and v7.
+=======
+2015-01-23  Paulo Flabiano Smorigo  <pfsmorigo@br.ibm.com>
+
+	Add Virtual LAN support.
+
+	This patch adds support for virtual LAN (VLAN) tagging. VLAN tagging
+	allows multiple VLANs in a bridged network to share the same physical
+	network link but maintain isolation:
+
+	http://en.wikipedia.org/wiki/IEEE_802.1Q
+
+	* grub-core/net/ethernet.c: Add check, get, and set vlan tag id.
+	* grub-core/net/drivers/ieee1275/ofnet.c: Get vlan tag id from
+	bootargs.
+	* grub-core/net/arp.c: Add check.
+	* grub-core/net/ip.c: Likewise.
+	* include/grub/net/arp.h: Add vlantag attribute.
+	* include/grub/net/ip.h: Likewise.
+>>>>>>> Add Virtual LAN support
 
 2014-12-09  Andrei Borzenkov  <arvidjaar@gmail.com>
 

configure.ac

@@ -119,7 +119,6 @@ if test "x$with_platform" = x; then
     x86_64-*) platform=pc ;;
     powerpc-*) platform=ieee1275 ;;
     powerpc64-*) platform=ieee1275 ;;
-    powerpc64le-*) platform=ieee1275 ;;
     sparc64-*) platform=ieee1275 ;;
     mipsel-*) platform=loongson ;;
     mips-*) platform=arc ;;
@@ -142,7 +141,6 @@ case "$target_cpu"-"$platform" in
   x86_64-none) ;;
   x86_64-*) target_cpu=i386 ;;
   powerpc64-ieee1275) target_cpu=powerpc ;;
-  powerpc64le-ieee1275) target_cpu=powerpc ;;
 esac
 
 # Check if the platform is supported, make final adjustments.
@@ -596,12 +594,6 @@ if test "x$target_cpu" = xi386 && test "x$platform" != xemu; then
   TARGET_CFLAGS="$TARGET_CFLAGS -march=i386"
 fi
 
-if test x$target_cpu = xpowerpc && test x$ac_cv_c_bigendian = xno; then
-  TARGET_CFLAGS="$TARGET_CFLAGS -mbig-endian"
-  TARGET_CCASFLAGS="$TARGET_CCASFLAGS -mbig-endian"
-  TARGET_LDFLAGS="$TARGET_LDFLAGS -static -mbig-endian"
-fi
-
 if test "x$target_m32" = x1; then
   # Force 32-bit mode.
   TARGET_CFLAGS="$TARGET_CFLAGS -m32"
@@ -1045,7 +1037,7 @@ else
 CFLAGS="$TARGET_CFLAGS -nostdlib -Wno-error"
 fi
 CPPFLAGS="$TARGET_CPPFLAGS"
-if test x$target_cpu = xi386 || test x$target_cpu = xx86_64 || test x$target_cpu = xpowerpc || test "x$grub_cv_cc_target_clang" = xyes; then
+if test x$target_cpu = xi386 || test x$target_cpu = xx86_64 || test "x$grub_cv_cc_target_clang" = xyes ; then
 TARGET_LIBGCC=
 else
 TARGET_LIBGCC=-lgcc
@@ -1063,10 +1055,8 @@ fi
 CFLAGS="$TARGET_CFLAGS -nostdlib $DEFSYM"
 fi
 
-if ! test x$target_cpu = xpowerpc; then
-  # Check for libgcc symbols
-  AC_CHECK_FUNCS(__bswapsi2 __bswapdi2 __ashldi3 __ashrdi3 __lshrdi3 __ucmpdi2 _restgpr_14_x)
-fi
+# Check for libgcc symbols
+AC_CHECK_FUNCS(__bswapsi2 __bswapdi2 __ashldi3 __ashrdi3 __lshrdi3 __ucmpdi2 _restgpr_14_x)
 
 if test "x$TARGET_APPLE_LINKER" = x1 ; then
 CFLAGS="$TARGET_CFLAGS -nostdlib -static"
@@ -1631,7 +1621,7 @@ if test x"$enable_werror" != xno ; then
   HOST_CFLAGS="$HOST_CFLAGS -Werror"
 fi
 
-if test "x$grub_cv_cc_target_clang" = xno && test x$target_cpu != xpowerpc; then
+if test "x$grub_cv_cc_target_clang" = xno; then
    TARGET_LDFLAGS_STATIC_LIBGCC="-static-libgcc"
 else
    TARGET_LDFLAGS_STATIC_LIBGCC=

grub-core/Makefile.am

@@ -76,7 +76,6 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i18n.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/kernel.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/list.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/misc.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/compiler-rt.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/mm.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/parser.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/partition.h

grub-core/Makefile.core.def

@@ -132,7 +132,6 @@ kernel = {
   common = kern/rescue_reader.c;
   common = kern/term.c;
 
-  noemu = kern/compiler-rt.c;
   noemu = kern/mm.c;
   noemu = kern/time.c;
   noemu = kern/generic/millisleep.c;
@@ -253,7 +252,6 @@ kernel = {
 
   powerpc_ieee1275 = kern/powerpc/cache.S;
   powerpc_ieee1275 = kern/powerpc/dl.c;
-  powerpc_ieee1275 = kern/powerpc/compiler-rt.S;
 
   sparc64_ieee1275 = kern/sparc64/cache.S;
   sparc64_ieee1275 = kern/sparc64/dl.c;

grub-core/kern/compiler-rt.c

@@ -1,166 +0,0 @@
-/* compiler-rt.c - compiler helpers. */
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010-2014  Free Software Foundation, Inc.
- *
- *  GRUB 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 3 of the License, or
- *  (at your option) any later version.
- *
- *  GRUB 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 GRUB.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <grub/misc.h>
-#include <grub/compiler-rt.h>
-
-#if defined (__powerpc__)
-
-union component64
-{
-  grub_uint64_t full;
-  struct
-  {
-#ifdef GRUB_CPU_WORDS_BIGENDIAN
-    grub_uint32_t high;
-    grub_uint32_t low;
-#else
-    grub_uint32_t low;
-    grub_uint32_t high;
-#endif
-  };
-};
-
-/* Based on libgcc2.c from gcc suite.  */
-grub_uint64_t
-__lshrdi3 (grub_uint64_t u, int b)
-{
-  if (b == 0)
-    return u;
-
-  const union component64 uu = {.full = u};
-  const int bm = 32 - b;
-  union component64 w;
-
-  if (bm <= 0)
-    {
-      w.high = 0;
-      w.low = (grub_uint32_t) uu.high >> -bm;
-    }
-  else
-    {
-      const grub_uint32_t carries = (grub_uint32_t) uu.high << bm;
-
-      w.high = (grub_uint32_t) uu.high >> b;
-      w.low = ((grub_uint32_t) uu.low >> b) | carries;
-    }
-
-  return w.full;
-}
-
-/* Based on libgcc2.c from gcc suite.  */
-grub_uint64_t
-__ashrdi3 (grub_uint64_t u, int b)
-{
-  if (b == 0)
-    return u;
-
-  const union component64 uu = {.full = u};
-  const int bm = 32 - b;
-  union component64 w;
-
-  if (bm <= 0)
-    {
-      /* w.high = 1..1 or 0..0 */
-      w.high = uu.high >> (32 - 1);
-      w.low = uu.high >> -bm;
-    }
-  else
-    {
-      const grub_uint32_t carries = (grub_uint32_t) uu.high << bm;
-
-      w.high = uu.high >> b;
-      w.low = ((grub_uint32_t) uu.low >> b) | carries;
-    }
-
-  return w.full;
-}
-
-/* Based on libgcc2.c from gcc suite.  */
-grub_uint64_t
-__ashldi3 (grub_uint64_t u, int b)
-{
-  if (b == 0)
-    return u;
-
-  const union component64 uu = {.full = u};
-  const int bm = 32 - b;
-  union component64 w;
-
-  if (bm <= 0)
-    {
-      w.low = 0;
-      w.high = (grub_uint32_t) uu.low << -bm;
-    }
-  else
-    {
-      const grub_uint32_t carries = (grub_uint32_t) uu.low >> bm;
-
-      w.low = (grub_uint32_t) uu.low << b;
-      w.high = ((grub_uint32_t) uu.high << b) | carries;
-    }
-
-  return w.full;
-}
-
-/* Based on libgcc2.c from gcc suite.  */
-int
-__ucmpdi2 (grub_uint64_t a, grub_uint64_t b)
-{
-  union component64 ac, bc;
-  ac.full = a;
-  bc.full = b;
-
-  if (ac.high < bc.high)
-    return 0;
-  else if (ac.high > bc.high)
-    return 2;
-
-  if (ac.low < bc.low)
-    return 0;
-  else if (ac.low > bc.low)
-    return 2;
-  return 1;
-}
-
-/* Based on libgcc2.c from gcc suite.  */
-grub_uint32_t
-__bswapsi2 (grub_uint32_t u)
-{
-  return ((((u) & 0xff000000) >> 24)
-	  | (((u) & 0x00ff0000) >>  8)
-	  | (((u) & 0x0000ff00) <<  8)
-	  | (((u) & 0x000000ff) << 24));
-}
-
-/* Based on libgcc2.c from gcc suite.  */
-grub_uint64_t
-__bswapdi2 (grub_uint64_t u)
-{
-  return ((((u) & 0xff00000000000000ull) >> 56)
-	  | (((u) & 0x00ff000000000000ull) >> 40)
-	  | (((u) & 0x0000ff0000000000ull) >> 24)
-	  | (((u) & 0x000000ff00000000ull) >>  8)
-	  | (((u) & 0x00000000ff000000ull) <<  8)
-	  | (((u) & 0x0000000000ff0000ull) << 24)
-	  | (((u) & 0x000000000000ff00ull) << 40)
-	  | (((u) & 0x00000000000000ffull) << 56));
-}
-
-#endif

grub-core/kern/elf.c

@@ -28,11 +28,6 @@
 
 GRUB_MOD_LICENSE ("GPLv3+");
 
-void grub_elf32_check_endianess (grub_elf_t elf);
-void grub_elf64_check_endianess (grub_elf_t elf);
-grub_err_t grub_elf32_check_version (grub_elf_t elf);
-grub_err_t grub_elf64_check_version (grub_elf_t elf);
-
 /* Check if EHDR is a valid ELF header.  */
 static grub_err_t
 grub_elf_check_header (grub_elf_t elf)
@@ -43,22 +38,10 @@ grub_elf_check_header (grub_elf_t elf)
       || e->e_ident[EI_MAG1] != ELFMAG1
       || e->e_ident[EI_MAG2] != ELFMAG2
       || e->e_ident[EI_MAG3] != ELFMAG3
-      || e->e_ident[EI_VERSION] != EV_CURRENT)
+      || e->e_ident[EI_VERSION] != EV_CURRENT
+      || e->e_version != EV_CURRENT)
     return grub_error (GRUB_ERR_BAD_OS, N_("invalid arch-independent ELF magic"));
 
-  if (grub_elf_is_elf32 (elf))
-    {
-      grub_elf32_check_endianess (elf);
-      grub_elf32_check_version (elf);
-    }
-  else if (grub_elf_is_elf64 (elf))
-    {
-      grub_elf64_check_endianess (elf);
-      grub_elf64_check_version (elf);
-    }
-  else
-    return grub_error (GRUB_ERR_BAD_OS, N_("invalid arch-dependent ELF magic"));
-
   return GRUB_ERR_NONE;
 }
 
@@ -144,20 +127,7 @@ grub_elf_open (const char *name)
 #define grub_elf_is_elfXX grub_elf_is_elf32
 #define grub_elfXX_load_phdrs grub_elf32_load_phdrs
 #define ElfXX_Phdr Elf32_Phdr
-#define ElfXX_Ehdr Elf32_Ehdr
 #define grub_uintXX_t grub_uint32_t
-#define grub_be_to_halfXX grub_be_to_cpu16
-#define grub_be_to_wordXX grub_be_to_cpu32
-#define grub_be_to_addrXX grub_be_to_cpu32
-#define grub_be_to_offXX grub_be_to_cpu32
-#define grub_be_to_XwordXX grub_be_to_wordXX
-#define grub_le_to_halfXX grub_le_to_cpu16
-#define grub_le_to_wordXX grub_le_to_cpu32
-#define grub_le_to_addrXX grub_le_to_cpu32
-#define grub_le_to_offXX grub_le_to_cpu32
-#define grub_le_to_XwordXX grub_le_to_wordXX
-#define grub_elfXX_check_endianess grub_elf32_check_endianess
-#define grub_elfXX_check_version grub_elf32_check_version
 
 #include "elfXX.c"
 
@@ -170,20 +140,7 @@ grub_elf_open (const char *name)
 #undef grub_elf_is_elfXX
 #undef grub_elfXX_load_phdrs
 #undef ElfXX_Phdr
-#undef ElfXX_Ehdr
 #undef grub_uintXX_t
-#undef grub_be_to_halfXX
-#undef grub_be_to_wordXX
-#undef grub_be_to_addrXX
-#undef grub_be_to_offXX
-#undef grub_be_to_XwordXX
-#undef grub_le_to_halfXX
-#undef grub_le_to_wordXX
-#undef grub_le_to_addrXX
-#undef grub_le_to_offXX
-#undef grub_le_to_XwordXX
-#undef grub_elfXX_check_endianess
-#undef grub_elfXX_check_version
 
 
 /* 64-bit */
@@ -196,19 +153,6 @@ grub_elf_open (const char *name)
 #define grub_elf_is_elfXX grub_elf_is_elf64
 #define grub_elfXX_load_phdrs grub_elf64_load_phdrs
 #define ElfXX_Phdr Elf64_Phdr
-#define ElfXX_Ehdr Elf64_Ehdr
 #define grub_uintXX_t grub_uint64_t
-#define grub_be_to_halfXX grub_be_to_cpu16
-#define grub_be_to_wordXX grub_be_to_cpu32
-#define grub_be_to_addrXX grub_be_to_cpu64
-#define grub_be_to_offXX grub_be_to_cpu64
-#define grub_be_to_XwordXX grub_be_to_cpu64
-#define grub_le_to_halfXX grub_le_to_cpu16
-#define grub_le_to_wordXX grub_le_to_cpu32
-#define grub_le_to_addrXX grub_le_to_cpu64
-#define grub_le_to_offXX grub_le_to_cpu64
-#define grub_le_to_XwordXX grub_le_to_cpu64
-#define grub_elfXX_check_endianess grub_elf64_check_endianess
-#define grub_elfXX_check_version grub_elf64_check_version
 
 #include "elfXX.c"

grub-core/kern/elfXX.c

@@ -154,76 +154,3 @@ grub_elfXX_load (grub_elf_t elf, const char *filename,
 
   return grub_errno;
 }
-
-void
-grub_elfXX_check_endianess (grub_elf_t elf)
-{
-  ElfXX_Ehdr *e = &(elf->ehdr.ehdrXX);
-  ElfXX_Phdr *phdr;
-
-  if (e->e_ident[EI_DATA] == ELFDATA2MSB)
-    {
-      e->e_type = grub_be_to_halfXX (e->e_type);
-      e->e_machine = grub_be_to_halfXX (e->e_machine);
-      e->e_version = grub_be_to_wordXX (e->e_version);
-      e->e_entry = grub_be_to_addrXX (e->e_entry);
-      e->e_phoff = grub_be_to_offXX (e->e_phoff);
-      e->e_shoff = grub_be_to_offXX (e->e_shoff);
-      e->e_flags = grub_be_to_wordXX (e->e_flags);
-      e->e_ehsize = grub_be_to_halfXX (e->e_ehsize);
-      e->e_phentsize = grub_be_to_halfXX (e->e_phentsize);
-      e->e_phnum = grub_be_to_halfXX (e->e_phnum);
-      e->e_shentsize = grub_be_to_halfXX (e->e_shentsize);
-      e->e_shnum = grub_be_to_halfXX (e->e_shnum);
-      e->e_shstrndx = grub_be_to_halfXX (e->e_shstrndx);
-
-      FOR_ELFXX_PHDRS (elf,phdr)
-        {
-          phdr->p_type = grub_be_to_wordXX (phdr->p_type);
-          phdr->p_flags = grub_be_to_wordXX (phdr->p_flags);
-          phdr->p_offset = grub_be_to_offXX (phdr->p_offset);
-          phdr->p_vaddr = grub_be_to_addrXX (phdr->p_vaddr);
-          phdr->p_paddr = grub_be_to_addrXX (phdr->p_paddr);
-          phdr->p_filesz = grub_be_to_XwordXX (phdr->p_filesz);
-          phdr->p_memsz = grub_be_to_XwordXX (phdr->p_memsz);
-          phdr->p_align = grub_be_to_XwordXX (phdr->p_align);
-        }
-    }
-  else if (e->e_ident[EI_DATA] == ELFDATA2LSB)
-    {
-      e->e_type = grub_le_to_halfXX (e->e_type);
-      e->e_machine = grub_le_to_halfXX (e->e_machine);
-      e->e_version = grub_le_to_wordXX (e->e_version);
-      e->e_entry = grub_le_to_addrXX (e->e_entry);
-      e->e_phoff = grub_le_to_offXX (e->e_phoff);
-      e->e_shoff = grub_le_to_offXX (e->e_shoff);
-      e->e_flags = grub_le_to_wordXX (e->e_flags);
-      e->e_ehsize = grub_le_to_halfXX (e->e_ehsize);
-      e->e_phentsize = grub_le_to_halfXX (e->e_phentsize);
-      e->e_phnum = grub_le_to_halfXX (e->e_phnum);
-      e->e_shentsize = grub_le_to_halfXX (e->e_shentsize);
-      e->e_shnum = grub_le_to_halfXX (e->e_shnum);
-      e->e_shstrndx = grub_le_to_halfXX (e->e_shstrndx);
-
-      FOR_ELFXX_PHDRS (elf,phdr)
-        {
-          phdr->p_type = grub_le_to_wordXX (phdr->p_type);
-          phdr->p_flags = grub_le_to_wordXX (phdr->p_flags);
-          phdr->p_offset = grub_le_to_offXX (phdr->p_offset);
-          phdr->p_vaddr = grub_le_to_addrXX (phdr->p_vaddr);
-          phdr->p_paddr = grub_le_to_addrXX (phdr->p_paddr);
-          phdr->p_filesz = grub_le_to_XwordXX (phdr->p_filesz);
-          phdr->p_memsz = grub_le_to_XwordXX (phdr->p_memsz);
-          phdr->p_align = grub_le_to_XwordXX (phdr->p_align);
-        }
-    }
-}
-
-grub_err_t
-grub_elfXX_check_version (grub_elf_t elf)
-{
-  if (elf->ehdr.ehdrXX.e_version != EV_CURRENT)
-    return grub_error (GRUB_ERR_BAD_OS, N_("invalid arch-independent ELF magic"));
-
-  return GRUB_ERR_NONE;
-}

grub-core/kern/powerpc/compiler-rt.S

@@ -1,130 +0,0 @@
-/*
- * Special support for eabi and SVR4
- *
- *   Copyright (C) 1995-2014 Free Software Foundation, Inc.
- *   Written By Michael Meissner
- *   64-bit support written by David Edelsohn
- *
- * This file 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 3, or (at your option) any
- * later version.
- *
- * This file 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.
- *
- * Under Section 7 of GPL version 3, you are granted additional
- * permissions described in the GCC Runtime Library Exception, version
- * 3.1, as published by the Free Software Foundation.
- *
- * You should have received a copy of the GNU General Public License and
- * a copy of the GCC Runtime Library Exception along with this program;
- * see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
- * <http://www.gnu.org/licenses/>.
- */
-
-/* Do any initializations needed for the eabi environment */
-
-#include <grub/symbol.h>
-#include <grub/dl.h>
-
-	.section ".text"
-
-#define CFI_RESTORE(reg)		.cfi_restore reg
-#define CFI_OFFSET(reg, off)		.cfi_offset reg, off
-#define CFI_DEF_CFA_REGISTER(reg)	.cfi_def_cfa_register reg
-#define CFI_STARTPROC			.cfi_startproc
-#define CFI_ENDPROC			.cfi_endproc
-
-/* Routines for restoring integer registers, called by the compiler.  */
-/* Called with r11 pointing to the stack header word of the caller of the */
-/* function, just beyond the end of the integer restore area.  */
-
-CFI_STARTPROC
-CFI_DEF_CFA_REGISTER (11)
-CFI_OFFSET (65, 4)
-CFI_OFFSET (14, -72)
-CFI_OFFSET (15, -68)
-CFI_OFFSET (16, -64)
-CFI_OFFSET (17, -60)
-CFI_OFFSET (18, -56)
-CFI_OFFSET (19, -52)
-CFI_OFFSET (20, -48)
-CFI_OFFSET (21, -44)
-CFI_OFFSET (22, -40)
-CFI_OFFSET (23, -36)
-CFI_OFFSET (24, -32)
-CFI_OFFSET (25, -28)
-CFI_OFFSET (26, -24)
-CFI_OFFSET (27, -20)
-CFI_OFFSET (28, -16)
-CFI_OFFSET (29, -12)
-CFI_OFFSET (30, -8)
-CFI_OFFSET (31, -4)
-FUNCTION(_restgpr_14_x)	lwz	14,-72(11)	/* restore gp registers */
-CFI_RESTORE (14)
-FUNCTION(_restgpr_15_x)	lwz	15,-68(11)
-CFI_RESTORE (15)
-FUNCTION(_restgpr_16_x)	lwz	16,-64(11)
-CFI_RESTORE (16)
-FUNCTION(_restgpr_17_x)	lwz	17,-60(11)
-CFI_RESTORE (17)
-FUNCTION(_restgpr_18_x)	lwz	18,-56(11)
-CFI_RESTORE (18)
-FUNCTION(_restgpr_19_x)	lwz	19,-52(11)
-CFI_RESTORE (19)
-FUNCTION(_restgpr_20_x)	lwz	20,-48(11)
-CFI_RESTORE (20)
-FUNCTION(_restgpr_21_x)	lwz	21,-44(11)
-CFI_RESTORE (21)
-FUNCTION(_restgpr_22_x)	lwz	22,-40(11)
-CFI_RESTORE (22)
-FUNCTION(_restgpr_23_x)	lwz	23,-36(11)
-CFI_RESTORE (23)
-FUNCTION(_restgpr_24_x)	lwz	24,-32(11)
-CFI_RESTORE (24)
-FUNCTION(_restgpr_25_x)	lwz	25,-28(11)
-CFI_RESTORE (25)
-FUNCTION(_restgpr_26_x)	lwz	26,-24(11)
-CFI_RESTORE (26)
-FUNCTION(_restgpr_27_x)	lwz	27,-20(11)
-CFI_RESTORE (27)
-FUNCTION(_restgpr_28_x)	lwz	28,-16(11)
-CFI_RESTORE (28)
-FUNCTION(_restgpr_29_x)	lwz	29,-12(11)
-CFI_RESTORE (29)
-FUNCTION(_restgpr_30_x)	lwz	30,-8(11)
-CFI_RESTORE (30)
-FUNCTION(_restgpr_31_x)	lwz	0,4(11)
-				lwz	31,-4(11)
-CFI_RESTORE (31)
-				mtlr	0
-CFI_RESTORE (65)
-				mr	1,11
-CFI_DEF_CFA_REGISTER (1)
-				blr
-CFI_ENDPROC
-
-CFI_STARTPROC
-FUNCTION(_savegpr_14)	stw	14,-72(11)	/* save gp registers */
-FUNCTION(_savegpr_15)	stw	15,-68(11)
-FUNCTION(_savegpr_16)	stw	16,-64(11)
-FUNCTION(_savegpr_17)	stw	17,-60(11)
-FUNCTION(_savegpr_18)	stw	18,-56(11)
-FUNCTION(_savegpr_19)	stw	19,-52(11)
-FUNCTION(_savegpr_20)	stw	20,-48(11)
-FUNCTION(_savegpr_21)	stw	21,-44(11)
-FUNCTION(_savegpr_22)	stw	22,-40(11)
-FUNCTION(_savegpr_23)	stw	23,-36(11)
-FUNCTION(_savegpr_24)	stw	24,-32(11)
-FUNCTION(_savegpr_25)	stw	25,-28(11)
-FUNCTION(_savegpr_26)	stw	26,-24(11)
-FUNCTION(_savegpr_27)	stw	27,-20(11)
-FUNCTION(_savegpr_28)	stw	28,-16(11)
-FUNCTION(_savegpr_29)	stw	29,-12(11)
-FUNCTION(_savegpr_30)	stw	30,-8(11)
-FUNCTION(_savegpr_31)	stw	31,-4(11)
-			blr
-CFI_ENDPROC

grub-core/net/arp.c

@@ -122,8 +122,8 @@ grub_net_arp_send_request (struct grub_net_network_level_interface *inf,
 }
 
 grub_err_t
-grub_net_arp_receive (struct grub_net_buff *nb,
-		      struct grub_net_card *card)
+grub_net_arp_receive (struct grub_net_buff *nb, struct grub_net_card *card,
+                      grub_uint16_t vlantag_vid)
 {
   struct arphdr *arp_header = (struct arphdr *) nb->data;
   grub_uint8_t *sender_hardware_address;
@@ -158,6 +158,12 @@ grub_net_arp_receive (struct grub_net_buff *nb,
 
   FOR_NET_NETWORK_LEVEL_INTERFACES (inf)
   {
+    /* Check vlantag id */
+    if (inf->card == card &&
+        ((inf->vlantag.set && vlantag_vid != inf->vlantag.vid) ||
+         (!inf->vlantag.set && vlantag_vid != 0)))
+        continue;
+
     /* Am I the protocol address target? */
     if (grub_net_addr_cmp (&inf->address, &target_addr) == 0
 	&& grub_be_to_cpu16 (arp_header->op) == ARP_REQUEST)

grub-core/net/drivers/ieee1275/ofnet.c

@@ -147,11 +147,11 @@ grub_ieee1275_parse_bootpath (const char *devpath, char *bootpath,
   char *comma_char = 0;
   char *equal_char = 0;
   grub_size_t field_counter = 0;
-
   grub_net_network_level_address_t client_addr, gateway_addr, subnet_mask;
   grub_net_link_level_address_t hw_addr;
   grub_net_interface_flags_t flags = 0;
   struct grub_net_network_level_interface *inter;
+  grub_uint32_t vlantag = 0;
 
   hw_addr.type = GRUB_NET_LINK_LEVEL_PROTOCOL_ETHERNET;
 
@@ -169,6 +169,18 @@ grub_ieee1275_parse_bootpath (const char *devpath, char *bootpath,
           *equal_char = 0;
           grub_env_set_net_property ((*card)->name, args, equal_char + 1,
                                      grub_strlen(equal_char + 1));
+
+          if ((grub_strcmp (args, "vtag") == 0) &&
+              (grub_strlen (equal_char + 1) > 4))
+            {
+            vlantag = grub_strtoul (equal_char + 1, 0, 16) & 0xffff;
+            if (grub_errno == GRUB_ERR_BAD_NUMBER)
+              {
+                vlantag = 0;
+                grub_errno = GRUB_ERR_NONE;
+              }
+            }
+
           *equal_char = '=';
         }
       else
@@ -207,6 +219,12 @@ grub_ieee1275_parse_bootpath (const char *devpath, char *bootpath,
                                   hw_addr.mac, sizeof(hw_addr.mac), 0);
       inter = grub_net_add_addr ((*card)->name, *card, &client_addr, &hw_addr,
                                  flags);
+      if (vlantag > 0)
+        {
+          inter->vlantag.set = 1;
+          inter->vlantag.vid = vlantag & 0xfff;
+        }
+
       grub_net_add_ipv4_local (inter,
                           __builtin_ctz (~grub_le_to_cpu32 (subnet_mask.ipv4)));
     }

grub-core/net/ethernet.c

@@ -18,6 +18,7 @@
 
 #include <grub/misc.h>
 #include <grub/mm.h>
+#include <grub/env.h>
 #include <grub/net/ethernet.h>
 #include <grub/net/ip.h>
 #include <grub/net/arp.h>
@@ -56,10 +57,16 @@ send_ethernet_packet (struct grub_net_network_level_interface *inf,
 {
   struct etherhdr *eth;
   grub_err_t err;
+  grub_uint8_t etherhdr_size;
 
-  COMPILE_TIME_ASSERT (sizeof (*eth) < GRUB_NET_MAX_LINK_HEADER_SIZE);
+  etherhdr_size = sizeof (*eth);
+  COMPILE_TIME_ASSERT (sizeof (*eth) + 4 < GRUB_NET_MAX_LINK_HEADER_SIZE);
 
-  err = grub_netbuff_push (nb, sizeof (*eth));
+  /* Increase ethernet header in case of vlantag */
+  if (inf->vlantag.set)
+    etherhdr_size += 4;
+
+  err = grub_netbuff_push (nb, etherhdr_size);
   if (err)
     return err;
   eth = (struct etherhdr *) nb->data;
@@ -76,6 +83,21 @@ send_ethernet_packet (struct grub_net_network_level_interface *inf,
 	return err;
       inf->card->opened = 1;
     }
+
+  /* Check and add a vlan-tag if needed. */
+  if (inf->vlantag.set)
+    {
+      grub_uint32_t vlantag;
+      vlantag = grub_cpu_to_be32 ((VLANTAG_IDENTIFIER << 16) | inf->vlantag.vid);
+
+      /* Move eth type to the right */
+      grub_memcpy ((char *) nb->data + etherhdr_size - 2,
+                   (char *) nb->data + etherhdr_size - 6, 2);
+
+      /* Add the tag in the middle */
+      grub_memcpy ((char *) nb->data + etherhdr_size - 6, &vlantag, 4);
+    }
+
   return inf->card->driver->send (inf->card, nb);
 }
 
@@ -90,10 +112,26 @@ grub_net_recv_ethernet_packet (struct grub_net_buff *nb,
   grub_net_link_level_address_t hwaddress;
   grub_net_link_level_address_t src_hwaddress;
   grub_err_t err;
+  grub_uint8_t etherhdr_size = sizeof (*eth);
+  grub_uint16_t vlantag_vid = 0;
+
+  /* Check if a vlan-tag is present. If so, the ethernet header is 4 bytes */
+  /* longer than the original one. The vlantag id is extracted and the header */
+  /* is reseted to the original size. */
+  if (grub_get_unaligned16 (nb->data + etherhdr_size - 2) ==
+      grub_cpu_to_be16_compile_time (VLANTAG_IDENTIFIER))
+    {
+      vlantag_vid = grub_be_to_cpu16 (grub_get_unaligned16 (nb->data +
+                                                      etherhdr_size)) & 0x1fff;
+      etherhdr_size += 4;
+      /* Move eth type to the original position */
+      grub_memcpy((char *) nb->data + etherhdr_size - 6,
+                  (char *) nb->data + etherhdr_size - 2, 2);
+    }
 
   eth = (struct etherhdr *) nb->data;
   type = grub_be_to_cpu16 (eth->type);
-  err = grub_netbuff_pull (nb, sizeof (*eth));
+  err = grub_netbuff_pull (nb, etherhdr_size);
   if (err)
     return err;
 
@@ -121,13 +159,14 @@ grub_net_recv_ethernet_packet (struct grub_net_buff *nb,
     {
       /* ARP packet. */
     case GRUB_NET_ETHERTYPE_ARP:
-      grub_net_arp_receive (nb, card);
+      grub_net_arp_receive (nb, card, vlantag_vid);
       grub_netbuff_free (nb);
       return GRUB_ERR_NONE;
       /* IP packet.  */
     case GRUB_NET_ETHERTYPE_IP:
     case GRUB_NET_ETHERTYPE_IP6:
-      return grub_net_recv_ip_packets (nb, card, &hwaddress, &src_hwaddress);
+      return grub_net_recv_ip_packets (nb, card, &hwaddress, &src_hwaddress,
+                                       vlantag_vid);
     }
   grub_netbuff_free (nb);
   return GRUB_ERR_NONE;

grub-core/net/ip.c

@@ -225,12 +225,13 @@ handle_dgram (struct grub_net_buff *nb,
 	      grub_net_ip_protocol_t proto,
 	      const grub_net_network_level_address_t *source,
 	      const grub_net_network_level_address_t *dest,
+              grub_uint16_t vlantag_vid,
 	      grub_uint8_t ttl)
 {
   struct grub_net_network_level_interface *inf = NULL;
   grub_err_t err;
   int multicast = 0;
-  
+
   /* DHCP needs special treatment since we don't know IP yet.  */
   {
     struct udphdr *udph;
@@ -290,6 +291,13 @@ handle_dgram (struct grub_net_buff *nb,
 	&& grub_net_addr_cmp (&inf->address, dest) == 0
 	&& grub_net_hwaddr_cmp (&inf->hwaddress, hwaddress) == 0)
       break;
+
+    /* Check vlantag id */
+    if (inf->card == card &&
+        ((inf->vlantag.set && vlantag_vid != inf->vlantag.vid) ||
+         (!inf->vlantag.set && vlantag_vid != 0)))
+        continue;
+
     /* Solicited node multicast.  */
     if (inf->card == card
 	&& inf->address.type == GRUB_NET_NETWORK_LEVEL_PROTOCOL_IPV6
@@ -378,7 +386,8 @@ static grub_err_t
 grub_net_recv_ip4_packets (struct grub_net_buff *nb,
 			   struct grub_net_card *card,
 			   const grub_net_link_level_address_t *hwaddress,
-			   const grub_net_link_level_address_t *src_hwaddress)
+			   const grub_net_link_level_address_t *src_hwaddress,
+                           grub_uint16_t vlantag_vid)
 {
   struct iphdr *iph = (struct iphdr *) nb->data;
   grub_err_t err;
@@ -453,7 +462,7 @@ grub_net_recv_ip4_packets (struct grub_net_buff *nb,
       dest.ipv4 = iph->dest;
 
       return handle_dgram (nb, card, src_hwaddress, hwaddress, iph->protocol,
-			   &source, &dest, iph->ttl);
+			   &source, &dest, vlantag_vid, iph->ttl);
     }
 
   for (prev = &reassembles, rsm = *prev; rsm; prev = &rsm->next, rsm = *prev)
@@ -589,7 +598,7 @@ grub_net_recv_ip4_packets (struct grub_net_buff *nb,
       dest.ipv4 = dst;
 
       return handle_dgram (ret, card, src_hwaddress,
-			   hwaddress, proto, &source, &dest,
+			   hwaddress, proto, &source, &dest, vlantag_vid,
 			   ttl);
     }
 }
@@ -644,7 +653,8 @@ static grub_err_t
 grub_net_recv_ip6_packets (struct grub_net_buff *nb,
 			   struct grub_net_card *card,
 			   const grub_net_link_level_address_t *hwaddress,
-			   const grub_net_link_level_address_t *src_hwaddress)
+			   const grub_net_link_level_address_t *src_hwaddress,
+                           grub_uint16_t vlantag_vid)
 {
   struct ip6hdr *iph = (struct ip6hdr *) nb->data;
   grub_err_t err;
@@ -695,21 +705,24 @@ grub_net_recv_ip6_packets (struct grub_net_buff *nb,
   grub_memcpy (dest.ipv6, &iph->dest, sizeof (dest.ipv6));
 
   return handle_dgram (nb, card, src_hwaddress, hwaddress, iph->protocol,
-		       &source, &dest, iph->ttl);
+		       &source, &dest, vlantag_vid, iph->ttl);
 }
 
 grub_err_t
 grub_net_recv_ip_packets (struct grub_net_buff *nb,
 			  struct grub_net_card *card,
 			  const grub_net_link_level_address_t *hwaddress,
-			  const grub_net_link_level_address_t *src_hwaddress)
+			  const grub_net_link_level_address_t *src_hwaddress,
+                          grub_uint16_t vlantag_vid)
 {
   struct iphdr *iph = (struct iphdr *) nb->data;
 
   if ((iph->verhdrlen >> 4) == 4)
-    return grub_net_recv_ip4_packets (nb, card, hwaddress, src_hwaddress);
+    return grub_net_recv_ip4_packets (nb, card, hwaddress, src_hwaddress,
+                                      vlantag_vid);
   if ((iph->verhdrlen >> 4) == 6)
-    return grub_net_recv_ip6_packets (nb, card, hwaddress, src_hwaddress);
+    return grub_net_recv_ip6_packets (nb, card, hwaddress, src_hwaddress,
+                                      vlantag_vid);
   grub_dprintf ("net", "Bad IP version: %d\n", (iph->verhdrlen >> 4));
   grub_netbuff_free (nb);
   return GRUB_ERR_NONE;

include/grub/compiler-rt.h

@@ -1,82 +0,0 @@
-/* compiler.h - macros for various compiler features */
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2002,2003,2005,2006,2007,2008,2009,2010,2014  Free Software Foundation, Inc.
- *
- *  GRUB 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 3 of the License, or
- *  (at your option) any later version.
- *
- *  GRUB 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 GRUB.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef GRUB_COMPILER_RT_HEADER
-#define GRUB_COMPILER_RT_HEADER	1
-
-#if defined (__powerpc__)
-
-void EXPORT_FUNC (_restgpr_14_x) (void);
-void EXPORT_FUNC (_restgpr_15_x) (void);
-void EXPORT_FUNC (_restgpr_16_x) (void);
-void EXPORT_FUNC (_restgpr_17_x) (void);
-void EXPORT_FUNC (_restgpr_18_x) (void);
-void EXPORT_FUNC (_restgpr_19_x) (void);
-void EXPORT_FUNC (_restgpr_20_x) (void);
-void EXPORT_FUNC (_restgpr_21_x) (void);
-void EXPORT_FUNC (_restgpr_22_x) (void);
-void EXPORT_FUNC (_restgpr_23_x) (void);
-void EXPORT_FUNC (_restgpr_24_x) (void);
-void EXPORT_FUNC (_restgpr_25_x) (void);
-void EXPORT_FUNC (_restgpr_26_x) (void);
-void EXPORT_FUNC (_restgpr_27_x) (void);
-void EXPORT_FUNC (_restgpr_28_x) (void);
-void EXPORT_FUNC (_restgpr_29_x) (void);
-void EXPORT_FUNC (_restgpr_30_x) (void);
-void EXPORT_FUNC (_restgpr_31_x) (void);
-void EXPORT_FUNC (_savegpr_14) (void);
-void EXPORT_FUNC (_savegpr_15) (void);
-void EXPORT_FUNC (_savegpr_16) (void);
-void EXPORT_FUNC (_savegpr_17) (void);
-void EXPORT_FUNC (_savegpr_18) (void);
-void EXPORT_FUNC (_savegpr_19) (void);
-void EXPORT_FUNC (_savegpr_20) (void);
-void EXPORT_FUNC (_savegpr_21) (void);
-void EXPORT_FUNC (_savegpr_22) (void);
-void EXPORT_FUNC (_savegpr_23) (void);
-void EXPORT_FUNC (_savegpr_24) (void);
-void EXPORT_FUNC (_savegpr_25) (void);
-void EXPORT_FUNC (_savegpr_26) (void);
-void EXPORT_FUNC (_savegpr_27) (void);
-void EXPORT_FUNC (_savegpr_28) (void);
-void EXPORT_FUNC (_savegpr_29) (void);
-void EXPORT_FUNC (_savegpr_30) (void);
-void EXPORT_FUNC (_savegpr_31) (void);
-
-grub_uint64_t
-EXPORT_FUNC (__lshrdi3) (grub_uint64_t u, int b);
-
-grub_uint64_t
-EXPORT_FUNC (__ashrdi3) (grub_uint64_t u, int b);
-
-grub_uint64_t
-EXPORT_FUNC (__ashldi3) (grub_uint64_t u, int b);
-
-int
-EXPORT_FUNC (__ucmpdi2) (grub_uint64_t a, grub_uint64_t b);
-
-grub_uint32_t
-EXPORT_FUNC (__bswapsi2) (grub_uint32_t u);
-
-grub_uint64_t
-EXPORT_FUNC (__bswapdi2) (grub_uint64_t u);
-
-#endif
-
-#endif /* ! GRUB_COMPILER_RT_HEADER */

include/grub/net.h

@@ -268,6 +268,12 @@ typedef struct grub_net
 
 extern grub_net_t (*EXPORT_VAR (grub_net_open)) (const char *name);
 
+struct grub_net_vlantag
+{
+  grub_uint8_t set;
+  grub_uint16_t vid;
+};
+
 struct grub_net_network_level_interface
 {
   struct grub_net_network_level_interface *next;
@@ -279,6 +285,7 @@ struct grub_net_network_level_interface
   grub_net_interface_flags_t flags;
   struct grub_net_bootp_packet *dhcp_ack;
   grub_size_t dhcp_acklen;
+  struct grub_net_vlantag vlantag;
   void *data;
 };
 
@@ -538,4 +545,6 @@ extern char *grub_net_default_server;
 #define GRUB_NET_INTERVAL 400
 #define GRUB_NET_INTERVAL_ADDITION 20
 
+#define VLANTAG_IDENTIFIER 0x8100
+
 #endif /* ! GRUB_NET_HEADER */

include/grub/net/arp.h

@@ -22,10 +22,11 @@
 #include <grub/net.h>
 
 extern grub_err_t grub_net_arp_receive (struct grub_net_buff *nb,
-					struct grub_net_card *card);
+                                        struct grub_net_card *card,
+                                        grub_uint16_t vlantag_vid);
 
 grub_err_t
 grub_net_arp_send_request (struct grub_net_network_level_interface *inf,
-			   const grub_net_network_level_address_t *proto_addr);
+                           const grub_net_network_level_address_t *proto_addr);
 
 #endif 

include/grub/net/ip.h

@@ -48,7 +48,8 @@ grub_err_t
 grub_net_recv_ip_packets (struct grub_net_buff *nb,
 			  struct grub_net_card *card,
 			  const grub_net_link_level_address_t *hwaddress,
-			  const grub_net_link_level_address_t *src_hwaddress);
+			  const grub_net_link_level_address_t *src_hwaddress,
+                          grub_uint16_t vlantag_vid);
 
 grub_err_t
 grub_net_send_ip_packet (struct grub_net_network_level_interface *inf,