CI: add arm64 support to ci-qemu-test.sh
ClosedPublic
Actions

Authored by emaste on Jun 25 2021, 8:22 PM.

Details

Reviewers

imp
bcran

Commits

rG129d0eb49ece: CI: add arm64 support to ci-qemu-test.sh
rGbba96bb143bb: CI: add arm64 support to ci-qemu-test.sh

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

emaste requested review of this revision.Jun 25 2021, 8:22 PM

emaste created this revision.

imp added inline comments.Jun 25 2021, 8:46 PM

tools/boot/ci-qemu-test.sh
94	sanity check needed here as well for finding the BIOS for the arm64 case, no?

emaste added inline comments.Jun 25 2021, 9:04 PM

tools/boot/ci-qemu-test.sh
94	It comes with qemu so no need. In fact it looks like qemu includes amd64 firmware too, /usr/local/share/qemu/edk2-x86_64-code.fd, so we could drop that. I presume it was added after this was first set up.

emaste added inline comments.Jun 26 2021, 4:56 PM

tools/boot/ci-qemu-test.sh
94	D30915 submitted to make that change first

the rest of this looks good... not entirely sure that 256MB is good, but it's what's there now...

This revision is now accepted and ready to land.Jun 26 2021, 5:13 PM

Closed by commit rGbba96bb143bb: CI: add arm64 support to ci-qemu-test.sh (authored by emaste). · Explain WhyJun 26 2021, 8:16 PM

This revision was automatically updated to reflect the committed changes.

emaste added a commit: rGbba96bb143bb: CI: add arm64 support to ci-qemu-test.sh.

emaste added a commit: rG129d0eb49ece: CI: add arm64 support to ci-qemu-test.sh.Dec 13 2021, 12:30 AM

Revision Contents
Changeset List

Path

Size

tools/

boot/

ci-qemu-test.sh

32 lines

Diff 91405

View Options

tools/boot/ci-qemu-test.sh

	Show All 38 Lines
	EOF			EOF
	ASSUME_ALWAYS_YES=true INSTALL_AS_USER=true pkg \			ASSUME_ALWAYS_YES=true INSTALL_AS_USER=true pkg \
	-o ABI_FILE=$OBJTOP/bin/sh/sh \			-o ABI_FILE=$OBJTOP/bin/sh/sh \
	-C ${ROOTDIR}/pkg.conf -r ${ROOTDIR} install \			-C ${ROOTDIR}/pkg.conf -r ${ROOTDIR} install \
	FreeBSD-kernel-generic FreeBSD-bootloader \			FreeBSD-kernel-generic FreeBSD-bootloader \
	FreeBSD-clibs FreeBSD-runtime			FreeBSD-clibs FreeBSD-runtime

	# Put loader in standard EFI location.			# Put loader in standard EFI location.
	mv ${ROOTDIR}/boot/loader.efi ${ROOTDIR}/efi/boot/BOOTx64.EFI			mv ${ROOTDIR}/boot/loader.efi ${ROOTDIR}/efi/boot/$EFIBOOT

	# Configuration files.			# Configuration files.
	cat > ${ROOTDIR}/boot/loader.conf <<EOF			cat > ${ROOTDIR}/boot/loader.conf <<EOF
	vfs.root.mountfrom="msdosfs:/dev/ada0s1"			vfs.root.mountfrom="msdosfs:/dev/$ROOTDEV"
	autoboot_delay=-1			autoboot_delay=-1
	boot_verbose=YES			boot_verbose=YES
	EOF			EOF
	cat > ${ROOTDIR}/etc/rc <<EOF			cat > ${ROOTDIR}/etc/rc <<EOF
	#!/bin/sh			#!/bin/sh

	echo "Hello world."			echo "Hello world."
	/sbin/sysctl vm.stats.vm.v_wire_count			/sbin/sysctl vm.stats.vm.v_wire_count
	Show All 12 Lines
	if [ -z "${SRCTOP}" ]; then			if [ -z "${SRCTOP}" ]; then
	die "Cannot locate top of source tree"			die "Cannot locate top of source tree"
	fi			fi
	: ${OBJTOP:=$(make -V OBJTOP)}			: ${OBJTOP:=$(make -V OBJTOP)}
	if [ -z "${OBJTOP}" ]; then			if [ -z "${OBJTOP}" ]; then
	die "Cannot locate top of object tree"			die "Cannot locate top of object tree"
	fi			fi

				: ${TARGET:=$(uname -m)}
				case $TARGET in
				amd64)
	# Locate the uefi firmware file used by qemu.			# Locate the uefi firmware file used by qemu.
	: ${OVMF:=/usr/local/share/qemu/edk2-x86_64-code.fd}			: ${OVMF:=/usr/local/share/qemu/edk2-x86_64-code.fd}
	if [ ! -r "${OVMF}" ]; then			if [ ! -r "${OVMF}" ]; then
	die "Cannot read UEFI firmware file ${OVMF}"			die "Cannot read UEFI firmware file ${OVMF}"
	fi			fi
				QEMU="qemu-system-x86_64 -drive if=pflash,format=raw,readonly,file=${OVMF}"
				EFIBOOT=BOOTx64.EFI
				ROOTDEV=ada0s1
				;;
				arm64)
				QEMU="qemu-system-aarch64 -cpu cortex-a57 -M virt -bios edk2-aarch64-code.fd"
				EFIBOOT=BOOTAA64.EFI
				impUnsubmitted Not Done Inline Actions sanity check needed here as well for finding the BIOS for the arm64 case, no? imp: sanity check needed here as well for finding the BIOS for the arm64 case, no?
				emasteAuthorUnsubmitted Done Inline Actions It comes with qemu so no need. In fact it looks like qemu includes amd64 firmware too, /usr/local/share/qemu/edk2-x86_64-code.fd, so we could drop that. I presume it was added after this was first set up. emaste: It comes with qemu so no need. In fact it looks like qemu includes amd64 firmware too…
				emasteAuthorUnsubmitted Done Inline Actions D30915 submitted to make that change first emaste: D30915 submitted to make that change first
				ROOTDEV=vtbd0s1
				;;
				*)
				die "Unknown TARGET:TARGET_ARCH $TARGET:$TARGET_ARCH"
				esac

	# Create a temp dir to hold the boot image.			# Create a temp dir to hold the boot image.
	ROOTDIR=$(mktemp -d -t ci-qemu-test-fat-root)			ROOTDIR=$(mktemp -d -t ci-qemu-test-fat-root)
	trap tempdir_cleanup EXIT SIGINT SIGHUP SIGTERM SIGQUIT			trap tempdir_cleanup EXIT SIGINT SIGHUP SIGTERM SIGQUIT

	# Populate the boot image in a temp dir.			# Populate the boot image in a temp dir.
	( cd ${SRCTOP} && tempdir_setup )			( cd ${SRCTOP} && tempdir_setup )

	# And, boot in QEMU.			# And, boot in QEMU.
	: ${BOOTLOG:=${TMPDIR:-/tmp}/ci-qemu-test-boot.log}			: ${BOOTLOG:=${TMPDIR:-/tmp}/ci-qemu-test-boot.log}
	timeout 300 \			timeout 300 \
	qemu-system-x86_64 -m 256M -nodefaults \			$QEMU -m 256M -nodefaults \
	-drive if=pflash,format=raw,readonly,file=${OVMF} \
	-serial stdio -vga none -nographic -monitor none \			-serial stdio -vga none -nographic -monitor none \
	-snapshot -hda fat:${ROOTDIR} 2>&1 \| tee ${BOOTLOG}			-snapshot -hda fat:${ROOTDIR} 2>&1 \| tee ${BOOTLOG}

	# Check whether we succesfully booted...			# Check whether we succesfully booted...
	if grep -q 'Hello world.' ${BOOTLOG}; then			if grep -q 'Hello world.' ${BOOTLOG}; then
	echo "OK"			echo "OK"
	else			else
	die "Did not boot successfully, see ${BOOTLOG}"			die "Did not boot successfully, see ${BOOTLOG}"
	fi			fi

CI: add arm64 support to ci-qemu-test.shClosedPublicActions