From patchwork Mon Sep 2 15:33:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15268 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 0772B1734D; Mon, 2 Sep 2019 16:39:35 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id B455A17329 for ; Mon, 2 Sep 2019 16:39:34 +0100 (BST) Received: from localhost ([::1]:37708 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oQY-0006Z6-AJ for patchwork@mira.cbaines.net; Mon, 02 Sep 2019 11:39:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42897) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oMR-0002SN-Nb for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4oMQ-0004xF-8o for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:19 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50052) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i4oMQ-0004wb-4T for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:18 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i4oMP-0006fu-Ud for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:17 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v3 45/48] system: vm: Add arm64 support. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Sep 2019 15:35:17 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36477 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 36477@debbugs.gnu.org Received: via spool by 36477-submit@debbugs.gnu.org id=B36477.156743849525371 (code B ref 36477); Mon, 02 Sep 2019 15:35:17 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Sep 2019 15:34:55 +0000 Received: from localhost ([127.0.0.1]:58833 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oM3-0006b3-8c for submit@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:55 -0400 Received: from mail-wm1-f44.google.com ([209.85.128.44]:35823) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLj-0006Wu-5g for 36477@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:36 -0400 Received: by mail-wm1-f44.google.com with SMTP id n10so4388205wmj.0 for <36477@debbugs.gnu.org>; Mon, 02 Sep 2019 08:34:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=JesS3RUSqQBP4XclD5L5+e5n2bnMhV49weQtJOwx7EU=; b=Qy05xCRN4GUFk4xr42dzclfWE8FbDlc3HVsZO2gIAtwk6omPVi1GEKfhHCU11ZEhWK tdtJuFAwaK2Uw0UZbx3ACNOOSM8LYL/xemBVL9lLZQEVyBhVSG58SP23jZMN7kRInWkq VLBZVlfA3qtGT5NJYthhXinj8OrOQSi0OBwSdbzVjQSEvVrbxQ5KJRXefZJR8XA/q4Q/ yNg4rsN3sBOFSqZ1I2ovwSXQkQ8l87Ky8ny/4ZB+TEduIMeHInYqtQqig0UZreZdkboZ PXp28Q3W+TjlOArS+l09FPWe6/6rI0ireYrJDzWv1+9Ssdnigiq98s5raKLEildE7XUK V3Tw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=JesS3RUSqQBP4XclD5L5+e5n2bnMhV49weQtJOwx7EU=; b=iThf8n35qIg5P38mDBYiVxfamYg34XeO3hB7dEpAMTilB46NC5Cf8XgN/0A6CUZyY0 8lD1IVLIxCYYWyECUsSnVjWO9nlTXqrEoyiS3fWjmcmD4D0jZBioXZfIMcIjWDkP/OdS utrpet4GDi9/QrNJSrHSVUCjdKgQivTCd1H9I6qwxpBNIe55EYWF7ww7MQ73QWcwDPDP n7KaEFbNf4g+sY2CUz++BvpXVi2QOwNZESpp8ahbzjwNNL1TPXpI1qbS4ZCxueWwQmle KSiiZU2snTY6bhaSDoePk7IryeWd0TVpGrh8Woj7ToN2FDl9ivc0SC1Dg9EQIqQ3yio9 11tg== X-Gm-Message-State: APjAAAXJAZ2b6Mm+lhEGVpV5bvTjeASY5UEYsEuZSLO+r5OZnZd8VoBc EFmWjOaRpBK7hG3frf70J6E9S1ZQ X-Google-Smtp-Source: APXvYqwPEkNzEwhKbZAIIHy6JK7cJNryo89KKyzFt47VNqb6YSvMOVZwqNctOF2IOXjjaG1qOYzUAA== X-Received: by 2002:a1c:a94b:: with SMTP id s72mr15741390wme.9.1567438469421; Mon, 02 Sep 2019 08:34:29 -0700 (PDT) Received: from localhost.localdomain ([80.12.63.115]) by smtp.gmail.com with ESMTPSA id b26sm17232265wmj.14.2019.09.02.08.34.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2019 08:34:28 -0700 (PDT) From: Mathieu Othacehe Date: Mon, 2 Sep 2019 17:33:30 +0200 Message-Id: <20190902153333.11190-46-m.othacehe@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190902153333.11190-1-m.othacehe@gmail.com> References: <20190902153333.11190-1-m.othacehe@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mathieu Othacehe Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/build/vm.scm (load-in-linux-vm): Add target-arm64? argument and use it to pass correct arguments to qemu. * gnu/system/vm.scm (expression->derivation-in-linux-vm): Pass the new target-arm64? argument added above. Do not add ESP partition on all ARM targets. Do not pass grub-efi package to initialize-hard-disk on ARM targets. --- gnu/build/vm.scm | 22 +++++++++++++++++----- gnu/system/vm.scm | 17 +++++++++++------ 2 files changed, 28 insertions(+), 11 deletions(-) diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm index b85398ed24..e57917a9e5 100644 --- a/gnu/build/vm.scm +++ b/gnu/build/vm.scm @@ -82,6 +82,7 @@ make-disk-image? single-file-output? target-arm32? + target-arm64? (disk-image-size (* 100 (expt 2 20))) (disk-image-format "qcow2") (references-graphs '())) @@ -97,10 +98,14 @@ access it via /dev/hda. REFERENCES-GRAPHS can specify a list of reference-graph files as produced by the #:references-graphs parameter of 'derivation'." + (define target-arm? (or target-arm32? target-arm64?)) + (define arch-specific-flags `(;; On ARM, a machine has to be specified. Use "virt" machine to avoid ;; hardware limits imposed by other machines. - ,@(if target-arm32? '("-M" "virt") '()) + ,@(if target-arm? + '("-M" "virt") + '()) ;; On ARM32, if the kernel is built without LPAE support, ECAM conflicts ;; with VIRT_PCIE_MMIO causing PCI devices not to show up. Disable @@ -110,11 +115,18 @@ the #:references-graphs parameter of 'derivation'." '("-machine" "highmem=off") '()) + ;; On ARM64, we have to specify the CPU. "max" behaves as "host" when + ;; KVM is enabled, and like a system CPU with the maximum possible + ;; feature set otherwise. + ,@(if target-arm64? + '("-cpu" "max") + '()) + ;; Only enable kvm if we see /dev/kvm exists. This allows users without ;; hardware virtualization to still use these commands. KVM support is - ;; still buggy on some ARM32 boards. Do not use it even if available. + ;; still buggy on some ARM boards. Do not use it even if available. ,@(if (and (file-exists? "/dev/kvm") - (not target-arm32?)) + (not target-arm?)) '("-enable-kvm") '()) @@ -125,11 +137,11 @@ the #:references-graphs parameter of 'derivation'." ;; The serial port name differs between emulated ;; architectures/machines. " console=" - (if target-arm32? "ttyAMA0" "ttyS0")) + (if target-arm? "ttyAMA0" "ttyS0")) ;; NIC is not supported on ARM "virt" machine, so use a user mode ;; network stack instead. - ,@(if target-arm32? + ,@(if target-arm? '("-device" "virtio-net-pci,netdev=mynet" "-netdev" "user,id=mynet") '("-net" "nic,model=virtio")))) diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index ac6e4ded92..07cee2d4f5 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -235,10 +235,12 @@ made available under the /xchg CIFS share." #:memory-size #$memory-size #:make-disk-image? #$make-disk-image? #:single-file-output? #$single-file-output? - ;; FIXME: ‘target-arm32?’ may not operate on - ;; the right system/target values. Rewrite + ;; FIXME: ‘target-arm32?’ and + ;; ‘target-arm64?’ may not operate on the + ;; right system/target values. Rewrite ;; using ‘let-system’ when available. #:target-arm32? #$(target-arm32?) + #:target-arm64? #$(target-arm64?) #:disk-image-format #$disk-image-format #:disk-image-size size #:references-graphs graphs)))))) @@ -452,10 +454,10 @@ system." ;; bootloaders if we are not targeting ARM because UEFI ;; support in U-Boot is experimental. ;; - ;; FIXME: ‘target-arm32?’ may be not operate on the right + ;; FIXME: ‘target-arm?’ may be not operate on the right ;; system/target values. Rewrite using ‘let-system’ when ;; available. - (if #$(target-arm32?) + (if #$(target-arm?) '() (list (partition ;; The standalone grub image is about 10MiB, but @@ -466,10 +468,13 @@ system." ;; when mounting. The actual FAT-ness is based ;; on file system size (16 in this case). (file-system "vfat") - (flags '(esp)))))))) + (flags '(esp))))))) + (grub-efi #$@(if (target-arm?) + '(#f) + #~(#$grub-efi)))) (initialize-hard-disk "/dev/vda" #:partitions partitions - #:grub-efi #$grub-efi + #:grub-efi grub-efi #:bootloader-package #$(bootloader-package bootloader) #:bootcfg #$bootcfg-drv