From patchwork Thu Feb 10 10:38:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1590957 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=F7pa2olR; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JvYBD261Vz9sFN for ; Thu, 10 Feb 2022 21:38:26 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1nI6q2-00089E-JN; Thu, 10 Feb 2022 10:38:10 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1nI6q1-00088s-88 for kernel-team@lists.ubuntu.com; Thu, 10 Feb 2022 10:38:09 +0000 Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 0803C40058 for ; Thu, 10 Feb 2022 10:38:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1644489489; bh=sXxI/SKXD+ae4evvGby07SXD/ndE5eU+Qb/Wwzd2Jfw=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=F7pa2olRmk9qWIrdJ9P01zwZxFHeG2sOrd0cJ3gQpu9fk0hMyY8FiTAl5WvgwHPGU VW0Vgq3M+Hc50Kj/4Vp9Gre60Iss3zcRA4411xceeKotpDd84J/IELzY6Y/gbdCJ+6 8DvbxlNHpdfsKGvMmPYIOi+MUzkvPfHaYTlr3uOknSembLcPKVVBGBk2jNicsp5EGN a2/9hKS16qzWwU4rXmXljiRqth7u0Gpy1mcVXhJraNkYQf5x5EPux4Vm8mYa26gKnA 8ZO6oB+4SN+vXpV8BFB8hKYouLnOQFfp/UGo4jsunsD3dBprASK10iVw/oi1RKkteP DyaaIcjddCNsg== Received: by mail-ed1-f71.google.com with SMTP id x6-20020a05640226c600b0040fe1993eebso2398484edd.6 for ; Thu, 10 Feb 2022 02:38:09 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=sXxI/SKXD+ae4evvGby07SXD/ndE5eU+Qb/Wwzd2Jfw=; b=XBNdJMwAto007xcQE7iYS6lkiP/u0Xv35IufKOjyWJFu3ovyjxbKi3YR11Nr80sGY7 aAphua5JQ6XvMwnQpvWDG0MI6QwSiaOcuzrE+FgjPt1s7OeWam2k266KG3LGAfEorcsi 5C+VEg6aCZvHwSj6Zbn/DJyKooSz5grKrv56MF63RhziLIEBug8FdXe0DVCORLFkSMUr i3wjdqauUfiyAJlqxoC2EOCpHDYEAFT+BCgJq0AkeqUOJyMCR8GYs7psn4jLXmg6hN3j L3OGCmD8LjtJAeK6NEBwjxRriahKaPRxQb1IWydjS9BaI6/6TzXP+/bbVwMBb9L4QuNK hzNg== X-Gm-Message-State: AOAM530mUp0CAyqqb88zPRnU+G12+1Se3f5FhpLOuvpODL/hTWGxFm6n 4IghJxKGiAY/qylMja+bUtVMjLnpGzZBSJ/ldgsz+P8KE15ZcnclgyCUrR48auLLSsLneNnh+YR UcFE3hFcptOepk0Dx82yKjnHXB80yFiQOtrDXih5hEQ== X-Received: by 2002:a17:906:715b:: with SMTP id z27mr5720112ejj.303.1644489488703; Thu, 10 Feb 2022 02:38:08 -0800 (PST) X-Google-Smtp-Source: ABdhPJz1NP6REI3uWOtAX48zCUGLp2EFIQ7iILLt9p0KZldnYe2V5wn3eG0eaAhE7NZjOooBhiFanw== X-Received: by 2002:a17:906:715b:: with SMTP id z27mr5720100ejj.303.1644489488460; Thu, 10 Feb 2022 02:38:08 -0800 (PST) Received: from gollum.fritz.box ([194.191.244.86]) by smtp.gmail.com with ESMTPSA id w22sm6883797ejc.137.2022.02.10.02.38.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Feb 2022 02:38:08 -0800 (PST) From: Juerg Haefliger X-Google-Original-From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [SRU][F/raspi][PATCH 1/1] UBUNTU: [Config] raspi: Set VIRTIO_PCI=m Date: Thu, 10 Feb 2022 11:38:05 +0100 Message-Id: <20220210103806.19659-3-juergh@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220210103806.19659-1-juergh@canonical.com> References: <20220210103806.19659-1-juergh@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1959102 Enable the VIRTIO_PCI module which is required for ADT and autopkgtest. Signed-off-by: Juerg Haefliger --- debian.raspi/config/annotations | 4 ++-- debian.raspi/config/config.common.ubuntu | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/debian.raspi/config/annotations b/debian.raspi/config/annotations index 0932f06da2c7..4501b0057146 100644 --- a/debian.raspi/config/annotations +++ b/debian.raspi/config/annotations @@ -7667,14 +7667,14 @@ CONFIG_VME_USER policy<{'amd64': 'm', 'arm64': ' CONFIG_VME_PIO2 policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm'}> # Menu: Device Drivers >> Virtio drivers -CONFIG_VIRTIO_PCI policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}> +CONFIG_VIRTIO_PCI policy<{'amd64': 'y', 'arm64': 'm', 'armhf': 'm', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}> CONFIG_VIRTIO_PCI_LEGACY policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}> CONFIG_VIRTIO_BALLOON policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}> CONFIG_VIRTIO_INPUT policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm'}> CONFIG_VIRTIO_MMIO policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'n'}> CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y'}> # -CONFIG_VIRTIO_PCI mark +CONFIG_VIRTIO_PCI mark note CONFIG_VIRTIO_MMIO note # Menu: Device Drivers >> Virtualization drivers diff --git a/debian.raspi/config/config.common.ubuntu b/debian.raspi/config/config.common.ubuntu index b219551934ed..0ca5e98c5a1b 100644 --- a/debian.raspi/config/config.common.ubuntu +++ b/debian.raspi/config/config.common.ubuntu @@ -7873,7 +7873,8 @@ CONFIG_VIRTIO_MENU=y CONFIG_VIRTIO_MMIO=y # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set CONFIG_VIRTIO_NET=m -# CONFIG_VIRTIO_PCI is not set +CONFIG_VIRTIO_PCI=m +CONFIG_VIRTIO_PCI_LEGACY=y # CONFIG_VIRTIO_PMEM is not set CONFIG_VIRTIO_VSOCKETS=m CONFIG_VIRTIO_VSOCKETS_COMMON=m