Rebase bootlock against 5.10 (#215)

* Add go modules support and fix syntax

Fixed deprecated syntax and introduced go modules support.

Signed-off-by: Marvin Drees <[email protected]>

* bootlock: Rebase against 5.10

Upgraded bootlock code to 5.10 sources
and update CircleCI image along the way.

Signed-off-by: Marvin Drees <[email protected]>

Co-authored-by: Christian Svensson <[email protected]>

Author: MDr164

Diff for: .circleci/config.yml

@@ -30,14 +30,14 @@ workflows:
 jobs:
   clean-code:
     docker:
-      - image: circleci/golang:1.13
-    working_directory: /go/src/github.com/u-root/u-bmc
+      - image: cimg/go:1.16.5
+    working_directory: ~/go/src/github.com/u-root/u-bmc
     steps:
       - checkout
       - run:
           name: Install dep
           command: |
-            wget https://github.com/golang/dep/releases/download/v0.5.1/dep-linux-amd64
+            wget https://github.com/golang/dep/releases/download/v0.5.4/dep-linux-amd64
             mv dep-linux-amd64 dep
             chmod +x dep
       - run:
@@ -62,8 +62,8 @@ jobs:
           command: ineffassign .
   test:
     docker:
-      - image: circleci/golang:1.13
-    working_directory: /go/src/github.com/u-root/u-bmc
+      - image: cimg/go:1.16.5
+    working_directory: ~/go/src/github.com/u-root/u-bmc
     environment:
       - CGO_ENABLED: 0
     steps:
@@ -84,8 +84,8 @@ jobs:
           command: make test TESTFLAGS=-cover
   race:
     docker:
-      - image: circleci/golang:1.13
-    working_directory: /go/src/github.com/u-root/u-bmc
+      - image: cimg/go:1.16.5
+    working_directory: ~/go/src/github.com/u-root/u-bmc
     environment:
       - CGO_ENABLED: 1
     steps:
@@ -103,8 +103,8 @@ jobs:
             make test TESTFLAGS=-race
   compile:
     docker:
-      - image: circleci/golang:1.13
-    working_directory: /go/src/github.com/u-root/u-bmc
+      - image: cimg/go:1.16.5
+    working_directory: ~/go/src/github.com/u-root/u-bmc
     environment:
       - CGO_ENABLED: 0
     steps:
@@ -125,20 +125,19 @@ jobs:
             go install -a ./platform/quanta-f06-leopard-ddr3/cmd/uinit
   image:
     docker:
-      - image: circleci/golang:1.13
-    working_directory: /go/src/github.com/u-root/u-bmc
+      - image: cimg/go:1.16.5
+    working_directory: ~/go/src/github.com/u-root/u-bmc
     environment:
       - CGO_ENABLED: 0
-      - GO111MODULE: "on"
     steps:
       - checkout
       - run:
           name: Install dependencies
           command: |
             sudo apt-get update
             sudo apt-get install gcc-arm-none-eabi mtd-utils fakeroot flex bison device-tree-compiler bc libssl-dev zlib1g-dev libglib2.0-dev libpixman-1-dev unzip cpio patch libelf-dev qemu-kvm
-            go mod download
-            go mod verify
+            go mod vendor
+            GO111MODULE=off go get github.com/u-root/u-root
       - run:
           name: Create test key
           command: |

Diff for: Makefile

@@ -298,6 +298,8 @@ flash.sim.img: flash.img
 
 initramfs.cpio: u-bmc ssh_keys.pub config/config.go $(shell find $(ROOT_DIR)cmd $(ROOT_DIR)platform/$(PLATFORM) $(ROOT_DIR)pkg $(ROOT_DIR)proto -name \*.go -type f)
 	go generate ./config/
+	rm -r vendor/github.com/u-root/u-root
+	ln -sf ../../../../u-root vendor/github.com/u-root
 	GOARM=5 GOARCH=$(ARCH) ./u-bmc -o "$@.tmp" -p "$(PLATFORM)"
 	mv "$@.tmp" "$@"
 

Diff for: README.md

@@ -83,7 +83,7 @@ touch config/i_agree_to_the_acme_terms
 go generate ./config/
 ```
 
-Builld image:
+Build image:
 ```
 make get
 make

Diff for: module/bootlock.c

@@ -24,6 +24,7 @@
 #define COMMON_OP_RDSR 0x05
 
 static struct spi_nor *nor;
+static struct spi_nor_controller_ops *ctrl;
 static void __iomem* aspeed_fmc_base;
 static void __iomem* aspeed_nor_base;
 
@@ -114,7 +115,7 @@ static ssize_t lock_show(struct kobject *kobj, struct kobj_attribute *attr,
 	uint32_t addr;
 
 	mutex_lock(&nor->lock);
-	nor->prepare(nor, SPI_NOR_OPS_LOCK);
+	ctrl->prepare(nor);
 	aspeed_user_control(1);
 
 	if (!device_supported()) {
@@ -140,7 +141,7 @@ static ssize_t lock_show(struct kobject *kobj, struct kobj_attribute *attr,
 
 read_err:
 	aspeed_user_control(0);
-	nor->unprepare(nor, SPI_NOR_OPS_LOCK);
+	ctrl->unprepare(nor);
 	mutex_unlock(&nor->lock);
 	if (ret < 0) {
 		return ret;
@@ -157,7 +158,7 @@ static ssize_t lock_store(struct kobject *kobj, struct kobj_attribute *attr,
 	uint32_t addr;
 
 	mutex_lock(&nor->lock);
-	nor->prepare(nor, SPI_NOR_OPS_LOCK);
+	ctrl->prepare(nor);
 	aspeed_user_control(1);
 
 	if (!device_supported()) {
@@ -176,7 +177,7 @@ static ssize_t lock_store(struct kobject *kobj, struct kobj_attribute *attr,
 
 lock_err:
 	aspeed_user_control(0);
-	nor->unprepare(nor, SPI_NOR_OPS_LOCK);
+	ctrl->unprepare(nor);
 	mutex_unlock(&nor->lock);
 	return ret < 0 ? ret : count;
 }

Diff for: pkg/bmc/grpc_test.go

@@ -125,7 +125,7 @@ func TestStreamConsoleTransmit(t *testing.T) {
 	go func() {
 		err := sc.Send(&pb.ConsoleData{Data: []byte(expected)})
 		if err != nil {
-			t.Fatalf("sc.Send: %v", err)
+			t.Errorf("sc.Send: %v", err) // should be Fatalf but vet complains
 		}
 	}()