hvm: Etherboot for E100 NIC

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
Signed-off-by: Yosuke Iwamatsu <y-iwamatsu@ab.jp.nec.com>

diff --git a/.hgignore b/.hgignore
index 300fb0545c2835bd1475c8a13fa0448d787594e4..3135bc5703d8a2771ca4afcef49efbda81006d92 100644 (file)
--- a/.hgignore
+++ b/.hgignore
@@ -105,6 +105,8 @@
 ^tools/firmware/.*\.bin$
 ^tools/firmware/.*\.sym$
 ^tools/firmware/.*bios/.*bios.*\.txt$
+^tools/firmware/etherboot/eb-roms\.h$
+^tools/firmware/etherboot/eb-rom-list\.h$
 ^tools/firmware/etherboot/etherboot-5
 ^tools/firmware/etherboot/etherboot-build
 ^tools/firmware/etherboot/.*\.zrom\.h$

diff --git a/tools/firmware/etherboot/Makefile b/tools/firmware/etherboot/Makefile
index 67776afbd76e1b3dfd746835cd4bba098072bf10..fa5b6588d686fef61a4bf81b83112e81b89fa59f 100644 (file)
--- a/tools/firmware/etherboot/Makefile
+++ b/tools/firmware/etherboot/Makefile
@@ -9,16 +9,24 @@ D=etherboot-$(EB_VERSION)
 T=etherboot-$(EB_VERSION).tar.gz
 E=etherboot-build
 
-TARGETS=eb-rtl8139.zrom.h
+NICS = rtl8139 eepro100
 
-all: $(TARGETS)
+ROM_ZHS = $(addprefix eb-, $(addsuffix .zrom.h, $(NICS)))
+
+all: eb-roms.h
 
 eb-%.zrom.h: $E/src/Config
        $(MAKE) -C $E/src bin/$*.zrom
-       ../hvmloader/mkhex etherboot <$E/src/bin/$*.zrom >$@.new
+       ../hvmloader/mkhex etherboot_$* <$E/src/bin/$*.zrom >$@.new
        mv -f $@.new $@
 
-$E/src/Config: $T Config
+eb-rom-list.h: make-eb-rom-list $E/src/bin/Roms
+       ./$^ $(NICS) >$@.new && mv -f $@.new $@
+
+eb-roms.h: eb-rom-list.h $(ROM_ZHS)
+       cat $^ >$@.new && mv -f $@.new $@
+
+$E/src/Config: $T Config
        rm -rf $D $E
        tar zxf $T
        cat Config >>$D/src/Config
@@ -44,7 +52,10 @@ $E/src/Config:       $T Config
                mv Config.new Config
        mv $D $E
 
+$E/src/bin/Roms: $E/src/Config
+       $(MAKE) -C $E/src bin/Roms
+
 clean:
-       rm -rf $D $E *.zrom.h *~
+       rm -rf $D $E *.zrom.h eb-rom-list.h eb-roms.h *~
 
 .PHONY: all clean

diff --git a/tools/firmware/etherboot/make-eb-rom-list b/tools/firmware/etherboot/make-eb-rom-list
new file mode 100755 (executable)
index 0000000..fb18ad0
--- /dev/null
+++ b/tools/firmware/etherboot/make-eb-rom-list
@@ -0,0 +1,11 @@
+#!/bin/sh
+set -e
+roms=$1; shift
+echo "/* autogenerated - do not edit */"
+echo "#define ETHERBOOT_ROM_LIST \\"
+for nic in "$@"; do
+       makerom=`grep "^MAKEROM_ID_$nic *= *-p *" <$roms`
+       echo "  ETHERBOOT_ROM($nic,${makerom#*-p}) \\"
+done
+echo
+echo "/*end.*/"

diff --git a/tools/firmware/hvmloader/Makefile b/tools/firmware/hvmloader/Makefile
index 22340052216d8295f7863d1062bf769af6af10b5..c2d8ecabadfadb5e34a2768e90b72dc8e2e5a01a 100644 (file)
--- a/tools/firmware/hvmloader/Makefile
+++ b/tools/firmware/hvmloader/Makefile
@@ -55,7 +55,7 @@ roms.h:       ../rombios/BIOS-bochs-latest ../vgabios/VGABIOS-lgpl-latest.bin ../vgabi
        sh ./mkhex vgabios_stdvga ../vgabios/VGABIOS-lgpl-latest.bin >> roms.h
        sh ./mkhex vgabios_cirrusvga ../vgabios/VGABIOS-lgpl-latest.cirrus.bin >> roms.h
        sh ./mkhex vmxassist ../vmxassist/vmxassist.bin >> roms.h
-       cat ../etherboot/eb-rtl8139.zrom.h >> roms.h
+       cat ../etherboot/eb-roms.h >> roms.h
        sh ./mkhex extboot ../extboot/extboot.bin >> roms.h
 
 .PHONY: clean

diff --git a/tools/firmware/hvmloader/hvmloader.c b/tools/firmware/hvmloader/hvmloader.c
index ce6f8a063c0278b057c1edbbaec0d856acec5dda..9316ff81a1374d158a4c435ecf0ad3e992e87391 100644 (file)
--- a/tools/firmware/hvmloader/hvmloader.c
+++ b/tools/firmware/hvmloader/hvmloader.c
@@ -345,27 +345,58 @@ static void pci_setup(void)
     }
 }
 
+static int must_load_extboot(void)
+{
+    return (inb(0x404) == 1);
+}
+
 /*
- * If the network card is in the boot order, load the Etherboot option ROM.
- * Read the boot order bytes from CMOS and check if any of them are 0x4.
+ * Scan the PCI bus for the first NIC supported by etherboot, and copy
+ * the corresponding rom data to *copy_rom_dest. Returns the length of the
+ * selected rom, or 0 if no NIC found.
  */
-static int must_load_nic(void) 
+static int scan_etherboot_nic(void *copy_rom_dest)
 {
-    uint8_t boot_order;
+    static struct etherboots_table_entry {
+        char *name;
+        void *etherboot_rom;
+        int etherboot_sz;
+        uint16_t vendor, device;
+    } etherboots_table[] = {
+#define ETHERBOOT_ROM(name, vendor, device) \
+  { #name, etherboot_##name, sizeof(etherboot_##name), vendor, device },
+        ETHERBOOT_ROM_LIST
+        { 0 }
+    };
+
+    uint32_t devfn;
+    uint16_t class, vendor_id, device_id;
+    struct etherboots_table_entry *eb;
 
-    /* Read CMOS register 0x3d (boot choices 0 and 1). */
-    boot_order = cmos_inb(0x3d);
-    if ( ((boot_order & 0xf) == 0x4) || ((boot_order & 0xf0) == 0x40) ) 
-        return 1;
+    for ( devfn = 0; devfn < 128; devfn++ )
+    {
+        class     = pci_readw(devfn, PCI_CLASS_DEVICE);
+        vendor_id = pci_readw(devfn, PCI_VENDOR_ID);
+        device_id = pci_readw(devfn, PCI_DEVICE_ID);
 
-    /* Read CMOS register 0x38 (boot choice 2 and FDD test flag). */
-    boot_order = cmos_inb(0x38);
-    return ((boot_order & 0xf0) == 0x40);
-}
+        if ( (vendor_id == 0xffff) && (device_id == 0xffff) )
+            continue;
 
-static int must_load_extboot(void)
-{
-    return (inb(0x404) == 1);
+        if ( class != 0x0200 ) /* Not a NIC */
+            continue;
+
+        for ( eb = etherboots_table; eb->name; eb++ )
+            if (eb->vendor == vendor_id &&
+                eb->device == device_id)
+                goto found;
+    }
+
+    return 0;
+
+ found:
+    printf("Loading %s Etherboot PXE ROM ...\n", eb->name);
+    memcpy(copy_rom_dest, eb->etherboot_rom, eb->etherboot_sz);
+    return eb->etherboot_sz;
 }
 
 /* Replace possibly erroneous memory-size CMOS fields with correct values. */
@@ -443,13 +474,7 @@ int main(void)
         vgabios_sz = sizeof(vgabios_stdvga);
     }
 
-    if ( must_load_nic() )
-    {
-        printf("Loading ETHERBOOT ...\n");
-        memcpy((void *)ETHERBOOT_PHYSICAL_ADDRESS,
-               etherboot, sizeof(etherboot));
-        etherboot_sz = sizeof(etherboot);
-    }
+    etherboot_sz = scan_etherboot_nic((void*)ETHERBOOT_PHYSICAL_ADDRESS);
 
     if ( must_load_extboot() )
     {