From patchwork Thu Feb 10 10:38:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1590956 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=UJfwjQOM; 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 4JvYBD1NLSz9s8s for ; Thu, 10 Feb 2022 21:38:27 +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 1nI6q4-00089c-Oq; Thu, 10 Feb 2022 10:38:12 +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 1nI6q0-00088l-GL for kernel-team@lists.ubuntu.com; Thu, 10 Feb 2022 10:38:08 +0000 Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.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 4D1DF40058 for ; Thu, 10 Feb 2022 10:38:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1644489488; bh=40Qv/YnLyKWVnIXGrss95vDgBqU8YAZp5sgGlPZocpg=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=UJfwjQOMzGsYJTJcSqolzrBS9CMuYDroCkpOacZWkqp1ma1lxHCf3rcYUv+K9m3ut 4itzIYv/wv9A0W1q7KDLu7SFwWa1jAL053zo/soYqsKfpQSULf3d4F0EKxh/Tjgqn/ JwG3VrNwZGnH+JGTgJwpbTF1DP0vojCPYw/ehKQoKXDP+hOXO/SZdDfyv1c7bXoMqI HWLQAhKpNzNSi08pHH919d+qi+dQgkDsqEIeRYIyWVGVGoghPvC4xMrd+4PcgSIghu 5pT/udiO6oMPI+qDguUJmgq/qc6vJfDgvtQNNPo/u39Whd41RO1e0o+f7beVkE7Q/Q Q5LQ4fJnd0Jzw== Received: by mail-ej1-f71.google.com with SMTP id k16-20020a17090632d000b006ae1cdb0f07so2509259ejk.16 for ; Thu, 10 Feb 2022 02:38:08 -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=40Qv/YnLyKWVnIXGrss95vDgBqU8YAZp5sgGlPZocpg=; b=j80vCVBVYgYjvuy5iVd6b67rn3bs5WdxBnbe+IAhz+kty2TmHEb1AYcKVDgBolrC7E k1DXx6DEaPufxa4IJZfo/FaGxx2G0qK5lK8pgePfJ6OrjO51LcUajw3eWrVz9efX2gJ5 pgj42Z8Jpt+/WIFIjTSvtqip8fKkyJhTy72i2HpSSCGeyg/WxhPq7F6/aEcChl08oJQ0 6p9CQfBjiTYlViaELPo5esqa2/lovJ740kBqonmBpiWTzSfsMNDstiDVM8a2ioBVSd/D 0eFAcH0BjveKzZvxm2A6LQEFavd1s3M2fE193MC/KSUtF7QUItJO6lfXgptxTt7X/4Tu 4dwA== X-Gm-Message-State: AOAM531cs7cJgW021leGh7Xi6tcnsAJhuXzZyZN0BTgYDLTH3oqC2OTv XG2qzeLt9pVgtFe0SrxWsP1dwzseTSf4TzPUa+j9KRyjFi+GI/k2I07f11CWOwWHNNsYz6usLRF aMLZ0knJp3ZmR31CWUNvJEmIP8Q87SF1+XO6VNoJk0Q== X-Received: by 2002:a17:907:720e:: with SMTP id dr14mr6024196ejc.196.1644489488013; Thu, 10 Feb 2022 02:38:08 -0800 (PST) X-Google-Smtp-Source: ABdhPJzZoIj9UWrigh4Rn9+NSDhr3TWLyta13vlbMiqGMMqx+tm8OUl5EymScHQ3ISrjk7hg6jGd/w== X-Received: by 2002:a17:907:720e:: with SMTP id dr14mr6024188ejc.196.1644489487859; Thu, 10 Feb 2022 02:38:07 -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:07 -0800 (PST) From: Juerg Haefliger X-Google-Original-From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [SRU][I/raspi][PATCH 1/1] UBUNTU: [Config] raspi: Set VIRTIO_PCI=m Date: Thu, 10 Feb 2022 11:38:04 +0100 Message-Id: <20220210103806.19659-2-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 | 2 ++ debian.raspi/config/config.common.ubuntu | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian.raspi/config/annotations b/debian.raspi/config/annotations index a9dcab5c622e..f3f37e64d6ce 100644 --- a/debian.raspi/config/annotations +++ b/debian.raspi/config/annotations @@ -4,6 +4,8 @@ include "../../debian.master/config/annotations" +CONFIG_VIRTIO_PCI policy<{'*': 'm'}> mark note + CONFIG_HUGETLBFS policy<{'arm64': 'y', 'armhf': 'y', 'armhf-raspi-nolpae': '-'}> mark note CONFIG_CGROUP_HUGETLB policy<{'arm64': 'y', 'armhf': 'y', 'armhf-raspi-nolpae': '-'}> mark note diff --git a/debian.raspi/config/config.common.ubuntu b/debian.raspi/config/config.common.ubuntu index 55b53ce32da1..563f66106bd2 100644 --- a/debian.raspi/config/config.common.ubuntu +++ b/debian.raspi/config/config.common.ubuntu @@ -8733,7 +8733,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_PCI_LIB=m # CONFIG_VIRTIO_PMEM is not set CONFIG_VIRTIO_VDPA=m