Merge pull request #294 from tinkerbell/asrock-kernel-alpine312

Asrock Kernel Testing - Alpine 3.12 Version
tinkerbell · Oct 12, 2021 · 75937e4 · 75937e4
2 parents 8f09258 + c3b5bb3
commit 75937e4
Show file tree

Hide file tree

Showing 12 changed files with 60 additions and 11 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,3 +1,4 @@
 docker/lfs/* filter=lfs diff=lfs merge=lfs -text
 installer/alpine/assets-*/* filter=lfs diff=lfs merge=lfs -text
 installer/alpine/eclypsiumdriver-alpine-* filter=lfs diff=lfs merge=lfs -text
+installer/alpine/BIOSControl_v1.0.3.zip filter=lfs diff=lfs merge=lfs -text
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -174,6 +174,17 @@ RUN if [ "$(uname -m)" = 'x86_64' ]; then \
         rm -f "${ECLYPSIUM_AGENT_FILENAME}"; \
     fi ;
 
+ARG ASRR_BIOS_APP_VERSION=1.0.3
+ARG ASRR_BIOS_APP_SHA512=5dbb458dd105d872f61f0256ec1a57c5de922328a23cd42e636b35c5bbda7e1e1d957b271de76b49345c35a55a97845842de106aea61f930ac440ad6e21f344a
+ARG ASRR_BIOS_APP_FILENAME="BIOSControl_v${ASRR_BIOS_APP_VERSION}.zip"
+
+COPY lfs/${ASRR_BIOS_APP_FILENAME} /tmp/osie/
+RUN cd /tmp/osie && \
+    echo "${ASRR_BIOS_APP_SHA512} ${ASRR_BIOS_APP_FILENAME}" | sha512sum -c && \
+    unzip ${ASRR_BIOS_APP_FILENAME} && \
+    install -D -m 755 BIOSControl /usr/sbin/BIOSControl && \
+    rm -rf /tmp/osie/BIOSControl /tmp/osie/driver /tmp/osie/ReadMe.txt
+
 # freebsd ufs fs fuse
 COPY lfs/osie-fuse-* /tmp/osie/
 RUN mv /tmp/osie/osie-fuse*$(uname -m).deb /tmp/ && rm -rf /tmp/osie/

diff --git a/docker/lfs/BIOSControl_v1.0.3.zip b/docker/lfs/BIOSControl_v1.0.3.zip
diff --git a/docker/lfs/getbiosconfig b/docker/lfs/getbiosconfig
diff --git a/docker/scripts/functions.sh b/docker/scripts/functions.sh
@@ -117,7 +117,7 @@ function configure_image_cache_dns() {
 	getent hosts github-cloud.githubusercontent.com | awk '{print $1}'
 }
 
-# returns a string of the BIOS vendor: "dell", "supermicro", or "unknown"
+# returns a string of the BIOS vendor: "Dell", "Supermicro", "ASRockRack", or "unknown"
 function detect_bios_vendor() {
 	local vendor=unknown
 
@@ -128,6 +128,11 @@ function detect_bios_vendor() {
 		# Check for Supermicro
 		if /opt/supermicro/sum/sum -c GetDmiInfo >/dev/null; then
 			vendor="Supermicro"
+		else
+			# Check for ASRockRack
+			if dmidecode --string baseboard-manufacturer | grep --ignore-case ASRockRack >/dev/null; then
+				vendor="ASRockRack"
+			fi
 		fi
 	fi
 
@@ -146,6 +151,9 @@ function detect_bios_version() {
 	if [[ ${vendor} == "Supermicro" ]]; then
 		version=$(/opt/supermicro/sum/sum -c GetDmiInfo | grep --after-context 2 "^\[BIOS Information\]" | awk -F '"' '/^Version/ {print $2}')
 	fi
+	if [[ ${vendor} == "ASRockRack" ]]; then
+		version=$(dmidecode --string bios-version)
+	fi
 
 	echo "${version}"
 }
@@ -162,7 +170,7 @@ function bios_inventory() {
 	local bios_json_fn="/tmp/bios.json"
 	local hollow_json_fn="/tmp/hollow.json"
 	local hollow_namespace="net.platformequinix.bios"
-	if UTIL_RACADM7=/opt/dell/srvadmin/bin/idracadm7 UTIL_SUM=/opt/supermicro/sum/sum packet-hardware inventorybios --verbose -u localhost --dry --cache-file "${bios_json_fn}"; then
+	if UTIL_RACADM7=/opt/dell/srvadmin/bin/idracadm7 UTIL_SUM=/opt/supermicro/sum/sum UTIL_ASRR_BIOSCONTROL=/usr/sbin/BIOSControl packet-hardware inventorybios --verbose -u localhost --dry --cache-file "${bios_json_fn}"; then
 		local inventorybios_json
 		inventorybios_json="$(cat "${bios_json_fn}")"
 		echo "inventorybios JSON is: [${inventorybios_json}]"

diff --git a/installer/alpine/BIOSControl_v1.0.3.zip b/installer/alpine/BIOSControl_v1.0.3.zip
diff --git a/installer/alpine/Dockerfile b/installer/alpine/Dockerfile
@@ -29,6 +29,7 @@ RUN true && \
         coreutils \
         linux-headers \
         sudo \
+        unzip \
         && \
     adduser -G abuild -g "Alpine Package Builder" -s /bin/ash -D builder && \
     echo "builder ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers && \
@@ -89,6 +90,23 @@ RUN echo "${ECLYPSIUM_DRIVER_SHA512}  ${ECLYPSIUM_DRIVER_FILENAME}" | sha512sum
     sudo apk add --no-scripts --no-cache --update --upgrade --cache-dir /tmp/non-persisted-apk-cache-dir \
         /home/builder/packages/non-free/x86_64/eclypsium*.apk
 
+# Build and install the ASRR BIOS utility and kernel module
+ARG ASRR_BIOS_DRIVER_VERSION=1.0
+ARG ASRR_BIOS_DRIVER_SHA512=5dbb458dd105d872f61f0256ec1a57c5de922328a23cd42e636b35c5bbda7e1e1d957b271de76b49345c35a55a97845842de106aea61f930ac440ad6e21f344a
+ARG ASRR_BIOS_DRIVER_FILENAME="BIOSControl_v1.0.3.zip"
+
+COPY ${ASRR_BIOS_DRIVER_FILENAME} /home/builder/
+RUN echo "${ASRR_BIOS_DRIVER_SHA512} ${ASRR_BIOS_DRIVER_FILENAME}" | sha512sum -c && \
+    unzip ${ASRR_BIOS_DRIVER_FILENAME} && \
+    # def for 5.x kernel build
+    echo '#define LINUX_VERSION_500 0' > driver/ver.h && \
+    # build module
+    make -C /lib/modules/${KERNEL}-${PKGREL}-${FLAVOR}/build M=/home/builder/driver && \
+    # install module
+    sudo install -D -m 600 driver/asrdev.ko /lib/modules/${KERNEL}-${PKGREL}-${FLAVOR}/extra/ && \
+    # clean up
+    rm -rf /home/builder/BIOSControl /home/builder/driver /home/builder/ReadMe.txt
+
 # Remove built and installed packages, these never get installed at runtime
 RUN rm -rf /home/builder/packages/*
 

diff --git a/installer/alpine/assets-x86_64/initramfs b/installer/alpine/assets-x86_64/initramfs
diff --git a/installer/alpine/assets-x86_64/modloop b/installer/alpine/assets-x86_64/modloop
diff --git a/installer/alpine/assets-x86_64/vmlinuz b/installer/alpine/assets-x86_64/vmlinuz
diff --git a/installer/alpine/build.sh b/installer/alpine/build.sh
@@ -6,6 +6,11 @@ set -o errexit -o nounset -o pipefail -o xtrace
 [[ $(uname -m) == aarch64 ]] && echo "aarch64 isn't _really_ tested/supported yet" && exit 1
 
 build_initramfs() {
+	# Asrockrack kernel module
+	cat >/etc/mkinitfs/features.d/asrockrack.modules <<-EOF
+		extra/asrdev.ko
+	EOF
+
 	# Eclypsium driver and supporting modules (IPMI)
 	cat >/etc/mkinitfs/features.d/eclypsium.modules <<-EOF
 		extra/eclypsiumdriver.ko
@@ -30,7 +35,7 @@ build_initramfs() {
 
 	# Make initramfs with features we think are spiffy
 	# shellcheck disable=SC2016
-	echo 'features="base ext2 ext3 ext4 keymap network packetrepo squashfs virtio eclypsium"' >/etc/mkinitfs/mkinitfs.conf
+	echo 'features="asrockrack base eclypsium ext2 ext3 ext4 keymap network packetrepo squashfs virtio"' >/etc/mkinitfs/mkinitfs.conf
 	kver=$(basename /lib/modules/*)
 	mkinitfs -l "$kver"
 	mkinitfs -o /assets/initramfs "$kver"

diff --git a/installer/alpine/init-x86_64 b/installer/alpine/init-x86_64
@@ -387,7 +387,7 @@ esac
 KOPT_pkgs="curl,docker,jq,mdadm,openssh,kexec-tools,tcpdump"
 case "$KOPT_packet_state" in
 '') ;;
-deprovisioning) KOPT_modules="$KOPT_modules,eclypsiumdriver,ipmi_devintf" ;;
+deprovisioning) KOPT_modules="$KOPT_modules,asrdev,eclypsiumdriver,ipmi_devintf" ;;
 preinstalling) packet_action=runner ;;
 *) echo "ignoring packet_state: $KOPT_packet_state" ;;
 esac