From patchwork Mon Jul 22 17:07:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Henrique Cerri X-Patchwork-Id: 1135107 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com 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 ozlabs.org (Postfix) with ESMTPS id 45sp2m4F8gz9sML; Tue, 23 Jul 2019 03:08:00 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1hpbn2-0004lu-8C; Mon, 22 Jul 2019 17:07:56 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1hpbn0-0004lb-I0 for kernel-team@lists.ubuntu.com; Mon, 22 Jul 2019 17:07:54 +0000 Received: from mail-qk1-f200.google.com ([209.85.222.200]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1hpbn0-0001i6-4q for kernel-team@lists.ubuntu.com; Mon, 22 Jul 2019 17:07:54 +0000 Received: by mail-qk1-f200.google.com with SMTP id t124so34184255qkh.3 for ; Mon, 22 Jul 2019 10:07:54 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=6aNkbfTHHBq0K5C3XERf9PzaTpemg+zxfzOAQ6bR2uE=; b=osFtS8HUoX11zoRBQzLnfI5Vb4xCByeJzDsKpD+zMsDfJnCQXwZnSbsQzoeiES6cwn IBlJOvTMcTgmwKJYjNa6dnTQkStUZiDZGDYwypMbDlaCoRPeD2RnM89wcG4L3d2j9FH/ MY+oOL/mWM7sgwy3RrMXVhQ0R4ycPvN8ea6POjoZEyjqK4yT9UrzhcrmlIjEep7TqV3n 9Egw5r0YmBgHTw4AJIzkm/PKb3FxzRigR81M01jqqs/kNjfiigudATkNhEtrRF0hlSpy 11FDHVvobcxZmg60XGkur4nqZHTzO/uTf790uMtufKm/zr5Hawko6EzKv2b8d9roId84 sQGw== X-Gm-Message-State: APjAAAUoFTm2Zz4hUEHUvN0jHAqxgqY0hPjTsv22RSKTV9kPA/F0TyQE UT2vPkQFZAFvQXVuadJd9JlnjbBjh/i4eGRLvOT4aTSGwYSUP1Ml22NbMpxeBMmatbrpLUDWjcz R03hNhzjtlLKlu5CaAIzc9OwQBExewYBCgW882XwH X-Received: by 2002:ac8:17ac:: with SMTP id o41mr50161022qtj.184.1563815272878; Mon, 22 Jul 2019 10:07:52 -0700 (PDT) X-Google-Smtp-Source: APXvYqxsS0Vd67NubebmjaybpizYCD+hSzxdgpi8qaWdDC7U8XKFakGNYP755PltktBbotPgo73KtA== X-Received: by 2002:ac8:17ac:: with SMTP id o41mr50161011qtj.184.1563815272591; Mon, 22 Jul 2019 10:07:52 -0700 (PDT) Received: from gallifrey.lan ([2804:14c:4e3:5580:d19b:5f47:dd1e:35aa]) by smtp.gmail.com with ESMTPSA id m10sm18019426qka.43.2019.07.22.10.07.51 for (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 22 Jul 2019 10:07:51 -0700 (PDT) From: Marcelo Henrique Cerri To: kernel-team@lists.ubuntu.com Subject: [x/azure][PATCH 1/1] UBUNTU: [Config] linux-azure: CONFIG_MLX{4, 5}_INFINIBAND=m Date: Mon, 22 Jul 2019 14:07:44 -0300 Message-Id: <20190722170746.17592-2-marcelo.cerri@canonical.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190722170746.17592-1-marcelo.cerri@canonical.com> References: <20190722170746.17592-1-marcelo.cerri@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/1837397 Make all the necessary mlx* and ib* modules loadable to allow Mellanox OFED drivers to be built and loaded by users. Ensure that all the new .ko files are include into the regular linux-modules package and not into the linux-modules-extra package. Signed-off-by: Marcelo Henrique Cerri --- debian.azure/config/annotations | 26 +++++++++++++-------- debian.azure/config/config.common.ubuntu | 17 +++++++------- debian.azure/control.d/azure.inclusion-list | 4 ++++ 3 files changed, 29 insertions(+), 18 deletions(-) diff --git a/debian.azure/config/annotations b/debian.azure/config/annotations index 2d62714ba03d..96762356ddbf 100644 --- a/debian.azure/config/annotations +++ b/debian.azure/config/annotations @@ -4,11 +4,23 @@ include "../../debian.master/config/annotations" -CONFIG_MLX4_INFINIBAND policy<{'amd64': 'y'}> -CONFIG_MLX4_INFINIBAND mark note +CONFIG_MLX5_CORE policy<{'amd64': 'm'}> +CONFIG_MLX5_CORE mark note -CONFIG_MLX5_INFINIBAND policy<{'amd64': 'y'}> -CONFIG_MLX5_INFINIBAND mark note +CONFIG_MLX4_CORE policy<{'amd64': 'm'}> +CONFIG_MLX4_CORE mark note + +CONFIG_MLX4_INFINIBAND policy<{'amd64': 'm'}> +CONFIG_MLX4_INFINIBAND mark note + +CONFIG_MLX5_INFINIBAND policy<{'amd64': 'm'}> +CONFIG_MLX5_INFINIBAND mark note + +CONFIG_INFINIBAND_USER_MAD policy<{'amd64': 'm'}> +CONFIG_INFINIBAND_USER_MAD mark note + +CONFIG_INFINIBAND_IPOIB policy<{'amd64': 'm'}> +CONFIG_INFINIBAND_IPOIB mark note CONFIG_BLK_DEV_NVME policy<{'amd64': 'y'}> CONFIG_BLK_DEV_NVME mark note @@ -43,12 +55,6 @@ CONFIG_IOSCHED_BFQ policy<{'amd64': 'm'}> CONFIG_BFQ_GROUP_IOSCHED policy<{'amd64': 'y'}> CONFIG_BFQ_GROUP_IOSCHED mark note -CONFIG_INFINIBAND_USER_MAD policy<{'amd64': 'y'}> -CONFIG_INFINIBAND_USER_MAD note note mark - -CONFIG_INFINIBAND_IPOIB policy<{'amd64': 'y'}> -CONFIG_INFINIBAND_IPOIB note note mark - CONFIG_INFINIBAND_IPOIB_DEBUG policy<{'amd64': 'y'}> CONFIG_INFINIBAND_IPOIB_DEBUG note note mark diff --git a/debian.azure/config/config.common.ubuntu b/debian.azure/config/config.common.ubuntu index 2c7a8ec0791d..427b16bf6327 100644 --- a/debian.azure/config/config.common.ubuntu +++ b/debian.azure/config/config.common.ubuntu @@ -1965,7 +1965,7 @@ CONFIG_INET_XFRM_MODE_BEET=m CONFIG_INET_XFRM_MODE_TRANSPORT=m CONFIG_INET_XFRM_MODE_TUNNEL=m CONFIG_INET_XFRM_TUNNEL=m -CONFIG_INFINIBAND=y +CONFIG_INFINIBAND=m CONFIG_INFINIBAND_ADDR_TRANS=y CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS=y # CONFIG_INFINIBAND_BNXT_RE is not set @@ -1973,7 +1973,7 @@ CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS=y # CONFIG_INFINIBAND_CXGB4 is not set # CONFIG_INFINIBAND_EXP_USER_ACCESS is not set # CONFIG_INFINIBAND_I40IW is not set -CONFIG_INFINIBAND_IPOIB=y +CONFIG_INFINIBAND_IPOIB=m # CONFIG_INFINIBAND_IPOIB_CM is not set CONFIG_INFINIBAND_IPOIB_DEBUG=y # CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set @@ -1989,8 +1989,8 @@ CONFIG_INFINIBAND_OPA_VNIC=m # CONFIG_INFINIBAND_RDMAVT is not set CONFIG_INFINIBAND_SRP=m # CONFIG_INFINIBAND_SRPT is not set -CONFIG_INFINIBAND_USER_ACCESS=y -CONFIG_INFINIBAND_USER_MAD=y +CONFIG_INFINIBAND_USER_ACCESS=m +CONFIG_INFINIBAND_USER_MAD=m CONFIG_INFINIBAND_USER_MEM=y CONFIG_INFINIBAND_USNIC=m CONFIG_INITRAMFS_SOURCE="" @@ -2678,21 +2678,22 @@ CONFIG_MISC_RTSX=m CONFIG_MISC_RTSX_PCI=m # CONFIG_MK8 is not set # CONFIG_MKISS is not set -CONFIG_MLX4_CORE=y +CONFIG_MLX4_CORE=m CONFIG_MLX4_CORE_GEN2=y CONFIG_MLX4_DEBUG=y CONFIG_MLX4_EN=m CONFIG_MLX4_EN_DCB=y -CONFIG_MLX4_INFINIBAND=y +CONFIG_MLX4_INFINIBAND=m CONFIG_MLX5_ACCEL=y -CONFIG_MLX5_CORE=y +CONFIG_MLX5_CORE=m CONFIG_MLX5_CORE_EN=y CONFIG_MLX5_CORE_EN_DCB=y CONFIG_MLX5_CORE_IPOIB=y CONFIG_MLX5_EN_IPSEC=y +CONFIG_MLX5_EN_TLS=y CONFIG_MLX5_ESWITCH=y CONFIG_MLX5_FPGA=y -CONFIG_MLX5_INFINIBAND=y +CONFIG_MLX5_INFINIBAND=m CONFIG_MLX5_MPFS=y CONFIG_MLXFW=m CONFIG_MLXSW_CORE=m diff --git a/debian.azure/control.d/azure.inclusion-list b/debian.azure/control.d/azure.inclusion-list index 1a1979ddfbde..2c5a7e1b5d03 100644 --- a/debian.azure/control.d/azure.inclusion-list +++ b/debian.azure/control.d/azure.inclusion-list @@ -61,10 +61,14 @@ drivers/infiniband/core/ib_cm.ko drivers/infiniband/core/ib_core.ko drivers/infiniband/core/ib_mad.ko drivers/infiniband/core/ib_sa.ko +drivers/infiniband/core/ib_umad.ko drivers/infiniband/core/iw_cm.ko drivers/infiniband/core/rdma_cm.ko drivers/infiniband/core/rdma_ucm.ko +drivers/infiniband/hw/mlx4/* +drivers/infiniband/hw/mlx5/* drivers/infiniband/hw/vmbus-rdma/* +drivers/infiniband/ulp/ipoib/ib_ipoib.ko drivers/infiniband/ulp/iser/ib_iser.ko drivers/infiniband/ulp/isert/ib_isert.ko drivers/input/evbug.ko From patchwork Mon Jul 22 17:07:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Henrique Cerri X-Patchwork-Id: 1135109 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com 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 ozlabs.org (Postfix) with ESMTPS id 45sp2r5ktRz9sBZ; Tue, 23 Jul 2019 03:08:04 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1hpbn5-0004nl-K6; Mon, 22 Jul 2019 17:07:59 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1hpbn2-0004ly-LY for kernel-team@lists.ubuntu.com; Mon, 22 Jul 2019 17:07:56 +0000 Received: from mail-qk1-f200.google.com ([209.85.222.200]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1hpbn2-0001iE-1D for kernel-team@lists.ubuntu.com; Mon, 22 Jul 2019 17:07:56 +0000 Received: by mail-qk1-f200.google.com with SMTP id d9so34002578qko.8 for ; Mon, 22 Jul 2019 10:07:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/wQUE0LM5WcfNzKWGaxFyXKNk1bm4J885wOT1EsWJjc=; b=FOeUZjryaZ4+pT9BDjzXaKXq3RYy3jNX6wt3ld4sG0VJDs9wfmYnoIUunCmq1KGntB rwP2O1SsxrdgCq23wjspJiTlPCrEUv7giJbaQCtnVJ9MAyJTa6tEuNOGpynX7WwmZkAG /3XpZiKKq0NC0sDXjFjDXhH4SMzX6KIimGmGvIn8WpqKgQtr4AQnqmGNZ1I+OE2mSPDP 6BrDOLwGvkmrK4pN0bKvaQNaGDG8wYsF2ZDCXSpv2xPz8oS38xfTw74ANsErqTq5v0n7 yF4Dk1f2sRlY5I7WOLaGGS0RNzVj2VDDSytRpEgL6DMcTtGHIUP+rWp8hkUfAlsLMWuq QofA== X-Gm-Message-State: APjAAAVdv4l2xad+04U7SYLCIfN1nyUnOfO2qqkL8MTMvLT8PplpvSMk qlX5MaE5UWHIlWgCMFP26vrvrFnW97xcuYya49zwiKIK1gWRef9/R9Y3qk4JlXtmKaF7Us8L/Zk ReS3gpE1hxkIYQvWZn0+2Xm43BWnIOeNvKu9RHktl X-Received: by 2002:ad4:4a14:: with SMTP id m20mr50401216qvz.58.1563815274800; Mon, 22 Jul 2019 10:07:54 -0700 (PDT) X-Google-Smtp-Source: APXvYqyajUDnIzCtJQdl7lYFYyOT+xu6kdaXT4bZI53J5Qrb+uk2dsU0dty3QnwMHspQCDkdX0aaMQ== X-Received: by 2002:ad4:4a14:: with SMTP id m20mr50401205qvz.58.1563815274488; Mon, 22 Jul 2019 10:07:54 -0700 (PDT) Received: from gallifrey.lan ([2804:14c:4e3:5580:d19b:5f47:dd1e:35aa]) by smtp.gmail.com with ESMTPSA id m10sm18019426qka.43.2019.07.22.10.07.52 for (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 22 Jul 2019 10:07:53 -0700 (PDT) From: Marcelo Henrique Cerri To: kernel-team@lists.ubuntu.com Subject: [c/azure][PATCH 2/2] UBUNTU: [Config] linux-azure: CONFIG_MLX{4, 5}_INFINIBAND=m Date: Mon, 22 Jul 2019 14:07:45 -0300 Message-Id: <20190722170746.17592-3-marcelo.cerri@canonical.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190722170746.17592-1-marcelo.cerri@canonical.com> References: <20190722170746.17592-1-marcelo.cerri@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/1837397 Make all the necessary mlx* and ib* modules loadable to allow Mellanox OFED drivers to be built and loaded by users. Ensure that all the new .ko files are include into the regular linux-modules package and not into the linux-modules-extra package. Signed-off-by: Marcelo Henrique Cerri --- debian.azure/config/annotations | 26 +++++++++++++-------- debian.azure/config/config.common.ubuntu | 17 +++++++------- debian.azure/control.d/azure.inclusion-list | 4 ++++ 3 files changed, 29 insertions(+), 18 deletions(-) diff --git a/debian.azure/config/annotations b/debian.azure/config/annotations index ca3d81e5a17d..cb1270559268 100644 --- a/debian.azure/config/annotations +++ b/debian.azure/config/annotations @@ -4,11 +4,23 @@ include "../../debian.master/config/annotations" -CONFIG_MLX4_INFINIBAND policy<{'amd64': 'y'}> -CONFIG_MLX4_INFINIBAND mark note +CONFIG_MLX5_CORE policy<{'amd64': 'm'}> +CONFIG_MLX5_CORE mark note -CONFIG_MLX5_INFINIBAND policy<{'amd64': 'y'}> -CONFIG_MLX5_INFINIBAND mark note +CONFIG_MLX4_CORE policy<{'amd64': 'm'}> +CONFIG_MLX4_CORE mark note + +CONFIG_MLX4_INFINIBAND policy<{'amd64': 'm'}> +CONFIG_MLX4_INFINIBAND mark note + +CONFIG_MLX5_INFINIBAND policy<{'amd64': 'm'}> +CONFIG_MLX5_INFINIBAND mark note + +CONFIG_INFINIBAND_USER_MAD policy<{'amd64': 'm'}> +CONFIG_INFINIBAND_USER_MAD mark note + +CONFIG_INFINIBAND_IPOIB policy<{'amd64': 'm'}> +CONFIG_INFINIBAND_IPOIB mark note CONFIG_BLK_DEV_NVME policy<{'amd64': 'y'}> CONFIG_BLK_DEV_NVME mark note @@ -43,12 +55,6 @@ CONFIG_IOSCHED_BFQ policy<{'amd64': 'm'}> CONFIG_BFQ_GROUP_IOSCHED policy<{'amd64': 'y'}> CONFIG_BFQ_GROUP_IOSCHED mark note -CONFIG_INFINIBAND_USER_MAD policy<{'amd64': 'y'}> -CONFIG_INFINIBAND_USER_MAD note note mark - -CONFIG_INFINIBAND_IPOIB policy<{'amd64': 'y'}> -CONFIG_INFINIBAND_IPOIB note note mark - CONFIG_INFINIBAND_IPOIB_DEBUG policy<{'amd64': 'y'}> CONFIG_INFINIBAND_IPOIB_DEBUG note note mark diff --git a/debian.azure/config/config.common.ubuntu b/debian.azure/config/config.common.ubuntu index 014e52409c29..8bd78ceb2e75 100644 --- a/debian.azure/config/config.common.ubuntu +++ b/debian.azure/config/config.common.ubuntu @@ -1983,7 +1983,7 @@ CONFIG_INET_XFRM_MODE_BEET=m CONFIG_INET_XFRM_MODE_TRANSPORT=m CONFIG_INET_XFRM_MODE_TUNNEL=m CONFIG_INET_XFRM_TUNNEL=m -CONFIG_INFINIBAND=y +CONFIG_INFINIBAND=m CONFIG_INFINIBAND_ADDR_TRANS=y CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS=y # CONFIG_INFINIBAND_BNXT_RE is not set @@ -1991,7 +1991,7 @@ CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS=y # CONFIG_INFINIBAND_CXGB4 is not set # CONFIG_INFINIBAND_EXP_LEGACY_VERBS_NEW_UAPI is not set # CONFIG_INFINIBAND_I40IW is not set -CONFIG_INFINIBAND_IPOIB=y +CONFIG_INFINIBAND_IPOIB=m # CONFIG_INFINIBAND_IPOIB_CM is not set CONFIG_INFINIBAND_IPOIB_DEBUG=y # CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set @@ -2007,8 +2007,8 @@ CONFIG_INFINIBAND_OPA_VNIC=m # CONFIG_INFINIBAND_RDMAVT is not set CONFIG_INFINIBAND_SRP=m # CONFIG_INFINIBAND_SRPT is not set -CONFIG_INFINIBAND_USER_ACCESS=y -CONFIG_INFINIBAND_USER_MAD=y +CONFIG_INFINIBAND_USER_ACCESS=m +CONFIG_INFINIBAND_USER_MAD=m CONFIG_INFINIBAND_USER_MEM=y CONFIG_INFINIBAND_USNIC=m CONFIG_INITRAMFS_SOURCE="" @@ -2686,21 +2686,22 @@ CONFIG_MISC_RTSX=m CONFIG_MISC_RTSX_PCI=m # CONFIG_MK8 is not set # CONFIG_MKISS is not set -CONFIG_MLX4_CORE=y +CONFIG_MLX4_CORE=m CONFIG_MLX4_CORE_GEN2=y CONFIG_MLX4_DEBUG=y CONFIG_MLX4_EN=m CONFIG_MLX4_EN_DCB=y -CONFIG_MLX4_INFINIBAND=y +CONFIG_MLX4_INFINIBAND=m CONFIG_MLX5_ACCEL=y -CONFIG_MLX5_CORE=y +CONFIG_MLX5_CORE=m CONFIG_MLX5_CORE_EN=y CONFIG_MLX5_CORE_EN_DCB=y CONFIG_MLX5_CORE_IPOIB=y CONFIG_MLX5_EN_IPSEC=y +CONFIG_MLX5_EN_TLS=y CONFIG_MLX5_ESWITCH=y CONFIG_MLX5_FPGA=y -CONFIG_MLX5_INFINIBAND=y +CONFIG_MLX5_INFINIBAND=m CONFIG_MLX5_MPFS=y CONFIG_MLXFW=m CONFIG_MLXREG_HOTPLUG=m diff --git a/debian.azure/control.d/azure.inclusion-list b/debian.azure/control.d/azure.inclusion-list index cb0569fccd6c..693e58e66f8e 100644 --- a/debian.azure/control.d/azure.inclusion-list +++ b/debian.azure/control.d/azure.inclusion-list @@ -61,10 +61,14 @@ drivers/infiniband/core/ib_cm.ko drivers/infiniband/core/ib_core.ko drivers/infiniband/core/ib_mad.ko drivers/infiniband/core/ib_sa.ko +drivers/infiniband/core/ib_umad.ko drivers/infiniband/core/iw_cm.ko drivers/infiniband/core/rdma_cm.ko drivers/infiniband/core/rdma_ucm.ko +drivers/infiniband/hw/mlx4/* +drivers/infiniband/hw/mlx5/* drivers/infiniband/hw/vmbus-rdma/* +drivers/infiniband/ulp/ipoib/ib_ipoib.ko drivers/infiniband/ulp/iser/ib_iser.ko drivers/infiniband/ulp/isert/ib_isert.ko drivers/input/evbug.ko From patchwork Mon Jul 22 17:07:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Henrique Cerri X-Patchwork-Id: 1135110 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com 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 ozlabs.org (Postfix) with ESMTPS id 45sp2s5DW9z9sLt; Tue, 23 Jul 2019 03:08:05 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1hpbn8-0004pu-18; Mon, 22 Jul 2019 17:08:02 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1hpbn5-0004nO-FD for kernel-team@lists.ubuntu.com; Mon, 22 Jul 2019 17:07:59 +0000 Received: from mail-qk1-f197.google.com ([209.85.222.197]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1hpbn5-0001iN-0T for kernel-team@lists.ubuntu.com; Mon, 22 Jul 2019 17:07:59 +0000 Received: by mail-qk1-f197.google.com with SMTP id z13so34109971qka.15 for ; Mon, 22 Jul 2019 10:07:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=pzQFlLj9BHNDj5GcQWCGS5HxeUUFsB0DfEDLY7rXXSs=; b=HmqDzHYkpE9NAhF7EK5mfGNjUzc5UoliId5spMywGkby46ji4ewFvAzTkothWiMkfR mP9GJurU6lceceXS0tU5HM/XEdkdwXUq3kYKOemnn808an+O3UGKnS3ZxHELUSX0AYw2 Ju+N3UY0HWvjFe4aFNVbS69dCUGA+uW+6iRtgH8FyzpRJeG0OBAROWZElWi97uKqxcxV cl+SQ1vIKxJjbLamP1bYKo9amBBuRugRjBF0oqdRDVM4j7v9IP+RRDp1dEB/dkhyOeFI +vkqXXBBClbxuRHOYK5+65qgLMuZCWawEdDeAOy0HW9ekEbZmqizyRnVydteSvv5myhv YUKg== X-Gm-Message-State: APjAAAUKovvIy+8PiT2sMH2Ahfq4y4kK3e/g5ko12BzrTGwEZ93VlLgA 3EXlBy74zJN0r4PDYBJbq4T6jLrWGz4jsTwwtbYmty+YUMAI4Di9OHcdpt0Qj0TvVd1NV9o2+kk 2eGwgKZktcFyINKTxCMH+YyR94L6OqrHJe9xRijRO X-Received: by 2002:ac8:1c2d:: with SMTP id a42mr49712434qtk.311.1563815276713; Mon, 22 Jul 2019 10:07:56 -0700 (PDT) X-Google-Smtp-Source: APXvYqx7JfENN1o+JOilC7nvraXdhkpw8ajkY5dFJkJK4ZU12p2RJNIfpQb6Nz34PrKQcMfKNTrdKA== X-Received: by 2002:ac8:1c2d:: with SMTP id a42mr49712419qtk.311.1563815276387; Mon, 22 Jul 2019 10:07:56 -0700 (PDT) Received: from gallifrey.lan ([2804:14c:4e3:5580:d19b:5f47:dd1e:35aa]) by smtp.gmail.com with ESMTPSA id m10sm18019426qka.43.2019.07.22.10.07.54 for (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 22 Jul 2019 10:07:55 -0700 (PDT) From: Marcelo Henrique Cerri To: kernel-team@lists.ubuntu.com Subject: [d/azure][PATCH 3/3] UBUNTU: [Config] linux-azure: CONFIG_MLX{4, 5}_INFINIBAND=m Date: Mon, 22 Jul 2019 14:07:46 -0300 Message-Id: <20190722170746.17592-4-marcelo.cerri@canonical.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190722170746.17592-1-marcelo.cerri@canonical.com> References: <20190722170746.17592-1-marcelo.cerri@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/1837397 Make all the necessary mlx* and ib* modules loadable to allow Mellanox OFED drivers to be built and loaded by users. Ensure that all the new .ko files are include into the regular linux-modules package and not into the linux-modules-extra package. Signed-off-by: Marcelo Henrique Cerri --- debian.azure/config/annotations | 26 +++++++++++++-------- debian.azure/config/config.common.ubuntu | 17 +++++++------- debian.azure/control.d/azure.inclusion-list | 4 ++++ 3 files changed, 29 insertions(+), 18 deletions(-) diff --git a/debian.azure/config/annotations b/debian.azure/config/annotations index 3c8c16421f5e..0161db377a80 100644 --- a/debian.azure/config/annotations +++ b/debian.azure/config/annotations @@ -4,11 +4,23 @@ include "../../debian.master/config/annotations" -CONFIG_MLX4_INFINIBAND policy<{'amd64': 'y'}> -CONFIG_MLX4_INFINIBAND mark note +CONFIG_MLX5_CORE policy<{'amd64': 'm'}> +CONFIG_MLX5_CORE mark note -CONFIG_MLX5_INFINIBAND policy<{'amd64': 'y'}> -CONFIG_MLX5_INFINIBAND mark note +CONFIG_MLX4_CORE policy<{'amd64': 'm'}> +CONFIG_MLX4_CORE mark note + +CONFIG_MLX4_INFINIBAND policy<{'amd64': 'm'}> +CONFIG_MLX4_INFINIBAND mark note + +CONFIG_MLX5_INFINIBAND policy<{'amd64': 'm'}> +CONFIG_MLX5_INFINIBAND mark note + +CONFIG_INFINIBAND_USER_MAD policy<{'amd64': 'm'}> +CONFIG_INFINIBAND_USER_MAD mark note + +CONFIG_INFINIBAND_IPOIB policy<{'amd64': 'm'}> +CONFIG_INFINIBAND_IPOIB mark note CONFIG_BLK_DEV_NVME policy<{'amd64': 'y'}> CONFIG_BLK_DEV_NVME mark note @@ -19,12 +31,6 @@ CONFIG_EDAC_DECODE_MCE mark note CONFIG_EDAC_AMD64 mark note -CONFIG_INFINIBAND_USER_MAD policy<{'amd64': 'y'}> -CONFIG_INFINIBAND_USER_MAD note note mark - -CONFIG_INFINIBAND_IPOIB policy<{'amd64': 'y'}> -CONFIG_INFINIBAND_IPOIB note note mark - CONFIG_INFINIBAND_IPOIB_DEBUG policy<{'amd64': 'y'}> CONFIG_INFINIBAND_IPOIB_DEBUG note note mark diff --git a/debian.azure/config/config.common.ubuntu b/debian.azure/config/config.common.ubuntu index 1622200d7fe6..36141db19908 100644 --- a/debian.azure/config/config.common.ubuntu +++ b/debian.azure/config/config.common.ubuntu @@ -2038,7 +2038,7 @@ CONFIG_INET_XFRM_MODE_BEET=m CONFIG_INET_XFRM_MODE_TRANSPORT=m CONFIG_INET_XFRM_MODE_TUNNEL=m CONFIG_INET_XFRM_TUNNEL=m -CONFIG_INFINIBAND=y +CONFIG_INFINIBAND=m CONFIG_INFINIBAND_ADDR_TRANS=y CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS=y # CONFIG_INFINIBAND_BNXT_RE is not set @@ -2046,7 +2046,7 @@ CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS=y # CONFIG_INFINIBAND_CXGB4 is not set # CONFIG_INFINIBAND_EXP_LEGACY_VERBS_NEW_UAPI is not set # CONFIG_INFINIBAND_I40IW is not set -CONFIG_INFINIBAND_IPOIB=y +CONFIG_INFINIBAND_IPOIB=m # CONFIG_INFINIBAND_IPOIB_CM is not set CONFIG_INFINIBAND_IPOIB_DEBUG=y # CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set @@ -2062,8 +2062,8 @@ CONFIG_INFINIBAND_OPA_VNIC=m # CONFIG_INFINIBAND_RDMAVT is not set CONFIG_INFINIBAND_SRP=m # CONFIG_INFINIBAND_SRPT is not set -CONFIG_INFINIBAND_USER_ACCESS=y -CONFIG_INFINIBAND_USER_MAD=y +CONFIG_INFINIBAND_USER_ACCESS=m +CONFIG_INFINIBAND_USER_MAD=m CONFIG_INFINIBAND_USER_MEM=y CONFIG_INFINIBAND_USNIC=m CONFIG_INITRAMFS_SOURCE="" @@ -2756,23 +2756,24 @@ CONFIG_MISC_RTSX=m CONFIG_MISC_RTSX_PCI=m # CONFIG_MK8 is not set # CONFIG_MKISS is not set -CONFIG_MLX4_CORE=y +CONFIG_MLX4_CORE=m CONFIG_MLX4_CORE_GEN2=y CONFIG_MLX4_DEBUG=y CONFIG_MLX4_EN=m CONFIG_MLX4_EN_DCB=y -CONFIG_MLX4_INFINIBAND=y +CONFIG_MLX4_INFINIBAND=m CONFIG_MLX5_ACCEL=y -CONFIG_MLX5_CORE=y +CONFIG_MLX5_CORE=m CONFIG_MLX5_CORE_EN=y CONFIG_MLX5_CORE_EN_DCB=y CONFIG_MLX5_CORE_IPOIB=y CONFIG_MLX5_EN_ARFS=y CONFIG_MLX5_EN_IPSEC=y CONFIG_MLX5_EN_RXNFC=y +CONFIG_MLX5_EN_TLS=y CONFIG_MLX5_ESWITCH=y CONFIG_MLX5_FPGA=y -CONFIG_MLX5_INFINIBAND=y +CONFIG_MLX5_INFINIBAND=m CONFIG_MLX5_MPFS=y CONFIG_MLXFW=m CONFIG_MLXREG_HOTPLUG=m diff --git a/debian.azure/control.d/azure.inclusion-list b/debian.azure/control.d/azure.inclusion-list index cb0569fccd6c..693e58e66f8e 100644 --- a/debian.azure/control.d/azure.inclusion-list +++ b/debian.azure/control.d/azure.inclusion-list @@ -61,10 +61,14 @@ drivers/infiniband/core/ib_cm.ko drivers/infiniband/core/ib_core.ko drivers/infiniband/core/ib_mad.ko drivers/infiniband/core/ib_sa.ko +drivers/infiniband/core/ib_umad.ko drivers/infiniband/core/iw_cm.ko drivers/infiniband/core/rdma_cm.ko drivers/infiniband/core/rdma_ucm.ko +drivers/infiniband/hw/mlx4/* +drivers/infiniband/hw/mlx5/* drivers/infiniband/hw/vmbus-rdma/* +drivers/infiniband/ulp/ipoib/ib_ipoib.ko drivers/infiniband/ulp/iser/ib_iser.ko drivers/infiniband/ulp/isert/ib_isert.ko drivers/input/evbug.ko