AMD + Intel analyze commands

cmds/amdana/main.go

@@ -0,0 +1,60 @@
+package main
+
+import (
+	"encoding/json"
+	"flag"
+	"fmt"
+	"io/ioutil"
+	"log"
+
+	amd "github.com/linuxboot/fiano/pkg/amd/manifest"
+)
+
+const (
+	// This needed a look at the image; how can we fully automate it?
+	mapping = 0xff000000
+)
+
+// this is only for Go - would be 5 lines inline in JS, thanks...
+type image []byte
+
+func (f image) ImageBytes() []byte {
+	return []byte(f)
+}
+
+func (f image) PhysAddrToOffset(physAddr uint64) uint64 {
+	return physAddr - mapping
+}
+
+func (f image) OffsetToPhysAddr(offset uint64) uint64 {
+	return offset + mapping
+}
+
+func main() {
+	flag.Parse()
+	args := flag.Args()
+
+	var path string
+
+	if len(args) > 0 {
+		path = args[0]
+		data, err := ioutil.ReadFile(path)
+		if err != nil {
+			log.Fatal(err)
+		}
+		// We could also use this, but its mapping wouldn't work with some images
+		// FIXME: figure out those mappings
+		// var amdfw amd.FirmwareImage = data
+		var amdfw image = data
+		fw, err := amd.NewAMDFirmware(amdfw)
+		if err != nil {
+			log.Fatal(err)
+		}
+		a := fw.PSPFirmware()
+		j, err := json.MarshalIndent(a, "", "  ")
+		if err != nil {
+			log.Fatal(err)
+		}
+		fmt.Printf(string(j))
+	}
+}

cmds/intelana/main.go

@@ -0,0 +1,61 @@
+package main
+
+import (
+	"encoding/json"
+	"flag"
+	"fmt"
+	"io/ioutil"
+	"log"
+
+	fit "github.com/linuxboot/fiano/pkg/intel/metadata/fit"
+	"github.com/linuxboot/fiano/pkg/uefi"
+)
+
+func main() {
+	flag.Parse()
+	args := flag.Args()
+
+	if len(args) > 0 {
+		path := args[0]
+		data, err := ioutil.ReadFile(path)
+		if err != nil {
+			log.Fatal(err)
+		}
+
+		fmt.Printf("\n== IFD ==\n")
+		regions := [...]uefi.FlashRegionType{
+			uefi.RegionTypeBIOS,
+			uefi.RegionTypeME,
+			uefi.RegionTypeGBE,
+			uefi.RegionTypePTT,
+			uefi.RegionTypeEC,
+			uefi.RegionTypeMicrocode,
+		}
+
+		fi, err := uefi.NewFlashImage(data)
+		if fi != nil {
+			for _, r := range regions {
+				if fi.IFD.Region.FlashRegions[r].Valid() {
+					offset := fi.IFD.Region.FlashRegions[r].BaseOffset()
+					size := fi.IFD.Region.FlashRegions[r].EndOffset() - offset
+					fmt.Printf("%-9s offset %x size %x\n", r, offset, size)
+				} else {
+					fmt.Printf("%-9s region not found/invalid\n", r)
+				}
+			}
+		}
+
+		fmt.Printf("\n== FIT ==\n")
+		table, err := fit.GetTable(data)
+		doJson := false
+		if doJson {
+			j, err := json.MarshalIndent(table, "", "  ")
+			if err != nil {
+				log.Fatal(err)
+			}
+			fmt.Printf(string(j))
+		} else {
+			fmt.Printf("\n%s", table)
+		}
+	}
+}

pkg/uefi/firmwarevolume.go

@@ -165,7 +165,11 @@ func (fv *FirmwareVolume) InsertFile(alignedOffset uint64, fBuf []byte) error {
 	// Check size
 	fLen := uint64(len(fBuf))
 	if fLen == 0 {
-		return errors.New("trying to insert empty file")
+		if true {
+			return nil
+		} else {
+			return errors.New("trying to insert empty file")
+		}
 	}
 	// Overwrite old data in the firmware volume.
 	fv.buf = append(fv.buf, fBuf...)

pkg/visitors/assemble.go

@@ -80,8 +80,9 @@ func (v *Assemble) Visit(f uefi.Firmware) error {
 		for _, file := range f.Files {
 			fileBuf := file.Buf()
 			fileLen := uint64(len(fileBuf))
+			log.Warnf("adding %v ", file.Header.GUID)
 			if fileLen == 0 {
-				log.Fatalf("%v", file.Header.GUID)
+				log.Warnf("%v empty?", file.Header.GUID)
 			}
 
 			// Pad to the 8 byte alignments.