From patchwork Mon Jul 22 17:38:34 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: 1135195 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 45spkJ5SpWz9sBZ; Tue, 23 Jul 2019 03:38:48 +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 1hpcGr-0002q2-2n; Mon, 22 Jul 2019 17:38:45 +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 1hpcGp-0002pQ-RD for kernel-team@lists.ubuntu.com; Mon, 22 Jul 2019 17:38:43 +0000 Received: from mail-qt1-f200.google.com ([209.85.160.200]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1hpcGp-0003mP-DG for kernel-team@lists.ubuntu.com; Mon, 22 Jul 2019 17:38:43 +0000 Received: by mail-qt1-f200.google.com with SMTP id x10so36153937qti.11 for ; Mon, 22 Jul 2019 10:38:43 -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=9RdJyqcNQddf7e+At18QX3fk1mEqSVt7Wzqlu3t/x80=; b=kb1n0Xvw+TSnmr+au2sL/l5gqLJZUBke58wkitTZvwwTLwpecbZfIF3jbuVTEMCUsd u7EiGcUCF9H0MJBxw7uxC5ShgW/nFn6EoiEGXvY/4WhCdh2gQKfbZFqWKgaTISOLeQat +vjNVpEnjBXGQIkohwOsK7Em9fwfsDELQu8/bDBb7zrDnBTNuKE/8RJLPOf+RTVXAga3 sbSYPs79gMkqf3o0LibAWHYm5YGNGppS09EaDaV9ZEmtXj8GjkIvQStXNfaAg4EFGvN0 qufVAtH8wml84es98yv55nkj8jRao3FSNzVKFQvx03mA2ObnzASIWi++mJvAzNR60qr7 Fn5g== X-Gm-Message-State: APjAAAXC+BczTdJK3KkpGQvywNWsyBewJ7xgT9ZxwrFVXp3xnc91qDir 2iFBnZW9N+18ICzyuCqU1eCxrMTtLfjgX2xjw6Vzpk23y9dX0ECuunTSaZr6P1ye9AEvq+zf4Uw omNmDkfp+0UTPunfKZLJtTtBOqMtQPgr3erpACU1B X-Received: by 2002:a0c:d216:: with SMTP id m22mr51598890qvh.84.1563817122166; Mon, 22 Jul 2019 10:38:42 -0700 (PDT) X-Google-Smtp-Source: APXvYqz35qX97Onb3K0O7BKOcoG9E7HsTr42C+h022Qxjaw2l8p9RZDxMnRJ81AN9XjRL3ieAdxx1Q== X-Received: by 2002:a0c:d216:: with SMTP id m22mr51598871qvh.84.1563817121871; Mon, 22 Jul 2019 10:38:41 -0700 (PDT) Received: from gallifrey.lan ([2804:14c:4e3:5580:d19b:5f47:dd1e:35aa]) by smtp.gmail.com with ESMTPSA id q12sm17115810qkm.126.2019.07.22.10.38.40 for (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 22 Jul 2019 10:38:41 -0700 (PDT) From: Marcelo Henrique Cerri To: kernel-team@lists.ubuntu.com Subject: [x/azure][PATCH v2 1/1] UBUNTU: [Config] linux-azure: CONFIG_MLX{4, 5}_INFINIBAND=m Date: Mon, 22 Jul 2019 14:38:34 -0300 Message-Id: <20190722173836.31954-2-marcelo.cerri@canonical.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190722173836.31954-1-marcelo.cerri@canonical.com> References: <20190722173836.31954-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: http://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..fbbfa2fd4b7d 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