From patchwork Thu Feb 10 10:38:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1590958 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=Nk0Wk/JZ; 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 4JvYBD3M7Cz9sFk 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 1nI6q4-00089q-Uz; 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 1nI6q1-00088z-NC for kernel-team@lists.ubuntu.com; Thu, 10 Feb 2022 10:38:09 +0000 Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) (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 8906D40058 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=NuRbO00hz0QE+fNSCJcw+fBOQcterJRKLpIuO7gC0mg=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Nk0Wk/JZGFug7W2Uzl2Bkjob1cZUWfzw6uJt1KUE6s8tXTj4PGqIN5c35yOhsSWie 4JfnyJVrrOsvafcrWKyr+G8YLt9GM6VV/qMszT1sBi1ic6uApAIcBmApb/sQ7aZJ/k s5D3yFbRFL4zUSdUJl5CvIuntFfeY+6FQZWyDNxDPra4iWkoWGYo8gQJMxdsK0JSHd zvN9Ux00TR2BE1DWtPpsu+kqUO9jjwCSaHfCH+xwMe1UQmfKHNeYTNR3wlkhvaX2HS iw5hxeQHCz/YNGRtu0qsy3Kej12bnVrHKzk7wgbwBxNTethttU6/Sm1FIbfpCm3iO3 nB1NSQRkoIphg== Received: by mail-ed1-f70.google.com with SMTP id o6-20020a50c906000000b0040f6ac3dbb5so3089545edh.17 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=NuRbO00hz0QE+fNSCJcw+fBOQcterJRKLpIuO7gC0mg=; b=PeNdRr0MBFDw870qov4blmhR69M0mCvQydouwAL9bgjewOlV2l1iCTjaUQh1KuSB2T wxywrN0QyPaIJvXKGbPhWqPLr8OCUtofn+soJiVxgqVH/cOEwapR7kAnrvAe1IAb0CJz ajD/8KnSXFZkDGmr3FBAoaEReUuk9zfGjlOUUexef75E/fK0QK8CbaYEEXUfbK0tW9DU bDojohNOcWX59mRDnWCWbjNPMMBk7kJpJo/6k0+W4M7uWzKBNL105r2e10V9RX3Bebtm UhzdfZA9Va3dBYIzbkVeT/B9rX0P1424wH46yvKO/l1xYpdcsMPD3VXKCaGqXyPvGnur zvxQ== X-Gm-Message-State: AOAM530oNx3YMtJpRx0ZKzNQyx+MDPGoFTepD3s9K7/pXRRPtO300TMw 11V0EhpKDHZPJe+z3IP9SmF78y//UrSDJI+gYudFZK6eWkiopQ1QylCCVPR20adhLHBw6m6stfl EuggYAW83sdHU5uy09PnLUY/awovBHOWLl7gwboK8gw== X-Received: by 2002:a17:907:6d9b:: with SMTP id sb27mr5834543ejc.85.1644489489267; Thu, 10 Feb 2022 02:38:09 -0800 (PST) X-Google-Smtp-Source: ABdhPJyuooLLqEa8OnAKUnIrdJ34aaOwXoU8X+tHPYivQVeRAdhP6M7yMLMnMEWZ3vUFM7fR0R6W1g== X-Received: by 2002:a17:907:6d9b:: with SMTP id sb27mr5834534ejc.85.1644489489058; Thu, 10 Feb 2022 02:38:09 -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.08 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][B/raspi-5.4][PATCH 1/1] UBUNTU: [Config] raspi-bionic: Set VIRTIO_PCI=m Date: Thu, 10 Feb 2022 11:38:06 +0100 Message-Id: <20220210103806.19659-4-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-bionic/config/annotations | 4 ++-- debian.raspi-bionic/config/config.common.ubuntu | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/debian.raspi-bionic/config/annotations b/debian.raspi-bionic/config/annotations index e580fae6c16b..5fd79a3f3af5 100644 --- a/debian.raspi-bionic/config/annotations +++ b/debian.raspi-bionic/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-bionic/config/config.common.ubuntu b/debian.raspi-bionic/config/config.common.ubuntu index 4f1a6050cb7f..f1b0550c2334 100644 --- a/debian.raspi-bionic/config/config.common.ubuntu +++ b/debian.raspi-bionic/config/config.common.ubuntu @@ -7863,7 +7863,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