From patchwork Sat May 17 05:26:16 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chen Gang X-Patchwork-Id: 4195971 Return-Path: X-Original-To: patchwork-linux-rdma@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id DB2BC9F32A for ; Sat, 17 May 2014 05:26:33 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 084D0203AA for ; Sat, 17 May 2014 05:26:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2155920295 for ; Sat, 17 May 2014 05:26:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756206AbaEQF02 (ORCPT ); Sat, 17 May 2014 01:26:28 -0400 Received: from mail-pa0-f46.google.com ([209.85.220.46]:61436 "EHLO mail-pa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755257AbaEQF01 (ORCPT ); Sat, 17 May 2014 01:26:27 -0400 Received: by mail-pa0-f46.google.com with SMTP id kq14so3413271pab.33 for ; Fri, 16 May 2014 22:26:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:cc:subject :content-type:content-transfer-encoding; bh=oQTbT1pU3HrSGWHsqBeubo/F/tpYs95sasxls/tH8AI=; b=GHF85JZRVBYwELYd19hqHJyl0b7cLd7vMIYe/0DqeWQtRhJSa+xoMcZn+Z5xynwlRi 5IHZJjs/acxDgUFv+nwrSMeBfP6HhYZd56ZjGXiQZX3jPWD1wcfpFsnakrlmSokHp+bn aeeLgEVBQumTjXa9lZ04vc6xLpE3Z1uEOpdIwYpDegPqihtAQoXnSTRx7+14zkgrzo5/ HspCc91vde4/wJUe9J83kOaXdv6LfX5kxQyz2lbBAquN9h/x01P0XxuaSKRXn2h6Kuj7 1tUk2BwrJujqZ8xBCorh88nn4pXMEHWiQXPPrtW0dbAUG46lhT5mkLi6GdYv0VpgACEK JhHA== X-Received: by 10.66.66.108 with SMTP id e12mr26442652pat.35.1400304386529; Fri, 16 May 2014 22:26:26 -0700 (PDT) Received: from [192.168.1.119] ([124.127.118.42]) by mx.google.com with ESMTPSA id yo9sm42916496pab.16.2014.05.16.22.26.20 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 16 May 2014 22:26:25 -0700 (PDT) Message-ID: <5376F2F8.3010603@gmail.com> Date: Sat, 17 May 2014 13:26:16 +0800 From: Chen Gang User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.5.0 MIME-Version: 1.0 To: roland@kernel.org, sean.hefty@intel.com, hal.rosenstock@gmail.com CC: Guan Xuetao , matanb@mellanox.com, davem@davemloft.net, ogerlitz@mellanox.com, eyalpe@mellanox.com, amirv@mellanox.com, sbohrer@rgmadvisors.com, linux-rdma@vger.kernel.org, "linux-kernel@vger.kernel.org" , netdev@vger.kernel.org Subject: [PATCH] drivers: net: ethernet: mellanox: mlx4: let mlx4 depend on SMP Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 'struct irq_affinity_notify' and the related functions are only defined when SMP enabled, so at present, mlx4 has to only run under SMP. The related error (allmodconfig under unicore32): CC [M] drivers/net/ethernet/mellanox/mlx4/eq.o drivers/net/ethernet/mellanox/mlx4/eq.c:58: error: field ‘notify’ has incomplete type drivers/net/ethernet/mellanox/mlx4/eq.c: In function ‘mlx4_irq_notifier_notify’: drivers/net/ethernet/mellanox/mlx4/eq.c:1094: error: type defaults to ‘int’ in declaration of ‘__mptr’ drivers/net/ethernet/mellanox/mlx4/eq.c:1094: warning: initialization from incompatible pointer type drivers/net/ethernet/mellanox/mlx4/eq.c:1104: error: dereferencing pointer to incomplete type drivers/net/ethernet/mellanox/mlx4/eq.c: In function ‘mlx4_release_irq_notifier’: drivers/net/ethernet/mellanox/mlx4/eq.c:1111: error: type defaults to ‘int’ in declaration of ‘__mptr’ drivers/net/ethernet/mellanox/mlx4/eq.c:1111: warning: initialization from incompatible pointer type drivers/net/ethernet/mellanox/mlx4/eq.c: In function ‘mlx4_assign_irq_notifier’: drivers/net/ethernet/mellanox/mlx4/eq.c:1133: error: implicit declaration of function ‘irq_set_affinity_notifier’ make[5]: *** [drivers/net/ethernet/mellanox/mlx4/eq.o] Error 1 make[4]: *** [drivers/net/ethernet/mellanox/mlx4] Error 2 make[3]: *** [drivers/net/ethernet/mellanox] Error 2 make[2]: *** [drivers/net/ethernet] Error 2 make[1]: *** [drivers/net] Error 2 make: *** [drivers] Error 2 Signed-off-by: Chen Gang --- drivers/infiniband/hw/mlx4/Kconfig | 2 +- drivers/net/ethernet/mellanox/mlx4/Kconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/infiniband/hw/mlx4/Kconfig b/drivers/infiniband/hw/mlx4/Kconfig index fc01dea..e31e400 100644 --- a/drivers/infiniband/hw/mlx4/Kconfig +++ b/drivers/infiniband/hw/mlx4/Kconfig @@ -1,6 +1,6 @@ config MLX4_INFINIBAND tristate "Mellanox ConnectX HCA support" - depends on NETDEVICES && ETHERNET && PCI && INET + depends on NETDEVICES && ETHERNET && PCI && INET && SMP select NET_VENDOR_MELLANOX select MLX4_CORE ---help--- diff --git a/drivers/net/ethernet/mellanox/mlx4/Kconfig b/drivers/net/ethernet/mellanox/mlx4/Kconfig index 1486ce9..a1f2380 100644 --- a/drivers/net/ethernet/mellanox/mlx4/Kconfig +++ b/drivers/net/ethernet/mellanox/mlx4/Kconfig @@ -4,7 +4,7 @@ config MLX4_EN tristate "Mellanox Technologies 1/10/40Gbit Ethernet support" - depends on PCI + depends on PCI && SMP select MLX4_CORE select PTP_1588_CLOCK ---help---