From patchwork Tue Nov 19 05:19:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 179678 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp161842ilf; Mon, 18 Nov 2019 21:41:27 -0800 (PST) X-Google-Smtp-Source: APXvYqyWEFyonIGh3p9fmVFmqpW+LtJL2yp0cxDszqosc2QqShd2aEeQDvtNS7GHAFIreBnaLtlI X-Received: by 2002:a17:906:2444:: with SMTP id a4mr29757071ejb.134.1574142086175; Mon, 18 Nov 2019 21:41:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574142086; cv=none; d=google.com; s=arc-20160816; b=nU9KU6ggbNQE5d5NeJ1LKVIqhS0EXky9Dk4nKB+ChKZzw4lXb2El/rszLoXyMaOdlB fVxf10eu2nw/xRHVgjJmAOq/niHYYhPwntpZHQL2AepnfA08Cd/RUivf0xTUFqDRN565 9xUG2SSngkhzE34PU0fa9cOwcJ6pgLIXob5PymrsScLRPGMhbr5yHcrCLtPZpF9F4+Ha PsbX0yc/AaTOi4LyPiNfuFWDW/0HOi4J6VsDJ8ktN8XLfKIK1gUMwVgK1CZWqg4Kk5r7 DoMYRE1RCzfzrkq+CoCUTZBFlEwfxTcQvBceEmRxoQo4+TrK8aRpetbbzzw08Lsf5k19 KL3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=VxQOjCc9NbghQ+SDlIN+YO13bay1VQlrNhDaIbGuA0E=; b=f3VFyno8+jumfQKBnNGM/sPzTKg0Ff7uuuBYq5kp32L9OyLK48qrd0pWVN8+Ung1TN tirJZFpaMzx1mb08rMF+2UyypMNXi55gNb2/L2zEnDuaRjhzRQgCY376WYfWabJH5qkL YU9N5NW4dEiuhhrMmnRE7he2H1rJUfe132ljJV7yzINfixzmcUk1p0rErVEZzlogfeiA hDYd3z3KulqUR37KL4A4aDbwNWowBOW87bXa/8FRX5BbtlodoNefRht5OMAWy9eEUO8w a8mBA+J5zlYbKPTs7U3aKDTfl81eDcnYogHL0tdt85Yvaa9Kok6SOQTZW111nHQrDPBb Twpw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=XuL6+aSW; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c25si13487228eja.24.2019.11.18.21.41.24; Mon, 18 Nov 2019 21:41:26 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=XuL6+aSW; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730517AbfKSFlV (ORCPT + 26 others); Tue, 19 Nov 2019 00:41:21 -0500 Received: from mail.kernel.org ([198.145.29.99]:35712 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729946AbfKSFlR (ORCPT ); Tue, 19 Nov 2019 00:41:17 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6285821783; Tue, 19 Nov 2019 05:41:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574142076; bh=xscJ7EClHwitBaxZMa5jBEldDG3fG8cJaiC13LZuq10=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XuL6+aSW1++/cMN4rn0S8rVfX9G77aay8qLXKGcnWdqqzh9tv/KMN73zjHxaZuUl8 +41qiEzIBd/L49IUvQIx/77B4VLJqC160fhKWi+TmSOYFwmLrUIhADMm0c6RVu7jeG uu2m5ICPoU4bc8hk9LDQwYWWFWzgW1phjuiF+4x4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Arnd Bergmann , Jason Gunthorpe , Sasha Levin Subject: [PATCH 4.19 380/422] RDMA: Fix dependencies for rdma_user_mmap_io Date: Tue, 19 Nov 2019 06:19:37 +0100 Message-Id: <20191119051423.687303372@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051400.261610025@linuxfoundation.org> References: <20191119051400.261610025@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Arnd Bergmann [ Upstream commit 46bdf777685677c1cc6b3da9220aace9da690731 ] The mlx4 driver produces a link error when it is configured as built-in while CONFIG_INFINIBAND_USER_ACCESS is set to =m: drivers/infiniband/hw/mlx4/main.o: In function `mlx4_ib_mmap': main.c:(.text+0x1af4): undefined reference to `rdma_user_mmap_io' The same function is called from mlx5, which already has a dependency to ensure we can call it, and from hns, which appears to suffer from the same problem. This adds the same dependency that mlx5 uses to the other two. Fixes: 6745d356ab39 ("RDMA/hns: Use rdma_user_mmap_io") Fixes: c282da4109e4 ("RDMA/mlx4: Use rdma_user_mmap_io") Signed-off-by: Arnd Bergmann Signed-off-by: Jason Gunthorpe Signed-off-by: Sasha Levin --- drivers/infiniband/hw/hns/Kconfig | 1 + drivers/infiniband/hw/mlx4/Kconfig | 1 + 2 files changed, 2 insertions(+) -- 2.20.1 diff --git a/drivers/infiniband/hw/hns/Kconfig b/drivers/infiniband/hw/hns/Kconfig index fddb5fdf92de8..21c2100b2ea98 100644 --- a/drivers/infiniband/hw/hns/Kconfig +++ b/drivers/infiniband/hw/hns/Kconfig @@ -1,6 +1,7 @@ config INFINIBAND_HNS tristate "HNS RoCE Driver" depends on NET_VENDOR_HISILICON + depends on INFINIBAND_USER_ACCESS || !INFINIBAND_USER_ACCESS depends on ARM64 || (COMPILE_TEST && 64BIT) ---help--- This is a RoCE/RDMA driver for the Hisilicon RoCE engine. The engine diff --git a/drivers/infiniband/hw/mlx4/Kconfig b/drivers/infiniband/hw/mlx4/Kconfig index db4aa13ebae0c..d1de3285fd885 100644 --- a/drivers/infiniband/hw/mlx4/Kconfig +++ b/drivers/infiniband/hw/mlx4/Kconfig @@ -1,6 +1,7 @@ config MLX4_INFINIBAND tristate "Mellanox ConnectX HCA support" depends on NETDEVICES && ETHERNET && PCI && INET + depends on INFINIBAND_USER_ACCESS || !INFINIBAND_USER_ACCESS depends on MAY_USE_DEVLINK select NET_VENDOR_MELLANOX select MLX4_CORE