From patchwork Tue Jun 12 13:17:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hal Rosenstock X-Patchwork-Id: 10460215 X-Patchwork-Delegate: ira.weiny@intel.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3B8416020F for ; Tue, 12 Jun 2018 13:17:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2C83028780 for ; Tue, 12 Jun 2018 13:17:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 20E8128783; Tue, 12 Jun 2018 13:17:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E1BF028780 for ; Tue, 12 Jun 2018 13:17:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933203AbeFLNRW (ORCPT ); Tue, 12 Jun 2018 09:17:22 -0400 Received: from mail-qt0-f174.google.com ([209.85.216.174]:41382 "EHLO mail-qt0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932912AbeFLNRT (ORCPT ); Tue, 12 Jun 2018 09:17:19 -0400 Received: by mail-qt0-f174.google.com with SMTP id y20-v6so23602998qto.8 for ; Tue, 12 Jun 2018 06:17:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dev-mellanox-co-il.20150623.gappssmtp.com; s=20150623; h=to:cc:from:subject:message-id:date:user-agent:mime-version :content-language:content-transfer-encoding; bh=sDcc8gnLZ3WzAgk4fAXHFlO5zHOXjSMXzv3tTR2h/MI=; b=H7mANp5Oq3y/mi60ZLiheG/2cEBv/jhk9W2xjSbkxPm7zi30FyRaUParItqD84A2ZG ysiGXVwVJnw2oIv4SbL9MqGBFeK3t5dMye8VBlGqdsSDAUOaXAdIDpBiPoLaSBuyIZ3Y aDOIiDWsHT36AoU20rnrh/jk0bHoq8/gknvmqXrQNkHhe+NZjuhRRNCdaGbvfDIcd0mf VznxYAnewbzYY+l+g9j4OBApT0n/r8YlZT/QKTH3k4MReBa163U/iqcMCjTwR+l9yDAC u61wONPJ6aRinMJtb7QDxMiN6okynPiWzYCiKsgZT5ULz0CnKWglc/REfuF66Q6xklTJ B5Ow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:cc:from:subject:message-id:date:user-agent :mime-version:content-language:content-transfer-encoding; bh=sDcc8gnLZ3WzAgk4fAXHFlO5zHOXjSMXzv3tTR2h/MI=; b=ianrgx1tzKmFAaE1BUmajA5bNfJy2jD8t2c2E/Uzcj2WKcd5N8Vbj71LDEjFmy2BqJ Ty3W63Yp4maVrpPEjBgzNH8l09555SzDq60Btne1giKG5lZ8xYhfjdIwxCnzG31z/9eX vodG8O5o94ABg8cuw+PNbHGukLAxbY3Ii006JZhgibY61urfCI6vei9/662zLcyvjzPN h7WsjY39aAkpmVzyfdZsj5x5yqWWYcs7MlJ3PU6irK3kbvx6dkKJw3UBTc/ChJEQvy3O xx0FNbsgOj+twX6Ysy5j52cMjhChlRKDygAJu5BApaz8mQ2QnZo8vWQqXwcwf7GW4mJL Zy2g== X-Gm-Message-State: APt69E3T+JmdCfTyFi98RyXc/sua+Vks2udFE7Mjyx1dL/C4bSppbYfS Kx85ImnJMM/qbSWX9oA7zU9nV42d X-Google-Smtp-Source: ADUXVKJ/AU5i9+TKq98cHi5Ylh8ChblwpFttHikuKXESyQRHEXpykbwnSDL/VpLoxmNB+6qIYPC7qQ== X-Received: by 2002:ac8:5416:: with SMTP id b22-v6mr396685qtq.332.1528809439023; Tue, 12 Jun 2018 06:17:19 -0700 (PDT) Received: from [192.168.1.183] (c-73-182-207-166.hsd1.ma.comcast.net. [73.182.207.166]) by smtp.googlemail.com with ESMTPSA id l73-v6sm115436qkl.78.2018.06.12.06.17.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Jun 2018 06:17:18 -0700 (PDT) To: "Weiny, Ira" Cc: "linux-rdma@vger.kernel.org" From: Hal Rosenstock Subject: [PATCH infiniband-diags] Add latest new device IDs to device white lists Message-ID: Date: Tue, 12 Jun 2018 09:17:17 -0400 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.8.0 MIME-Version: 1.0 Content-Language: en-US Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Hal Rosenstock --- libibnetdisc/src/ibnetdisc.c | 6 ++++-- src/ibdiag_common.c | 6 ++++-- src/vendstat.c | 3 ++- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/libibnetdisc/src/ibnetdisc.c b/libibnetdisc/src/ibnetdisc.c index 26bd09a..05f1dc9 100644 --- a/libibnetdisc/src/ibnetdisc.c +++ b/libibnetdisc/src/ibnetdisc.c @@ -198,7 +198,9 @@ static int is_mlnx_ext_port_info_supported(ibnd_port_t * port) uint16_t devid = (uint16_t) mad_get_field(port->node->info, 0, IB_NODE_DEVID_F); uint32_t vendorid = (uint32_t) mad_get_field(port->node->info, 0, IB_NODE_VENDORID_F); - if ((devid >= 0xc738 && devid <= 0xc73b) || devid == 0xcb20 || devid == 0xcf08 || + if ((devid >= 0xc738 && devid <= 0xc73b) || + devid == 0xc839 || devid == 0xcb20 || devid == 0xcf08 || + devid == 0xcf09 || devid == 0xd2f0 || ((vendorid == 0x119f) && /* Bull SwitchX */ (devid == 0x1b02 || devid == 0x1b50 || @@ -206,7 +208,7 @@ static int is_mlnx_ext_port_info_supported(ibnd_port_t * port) devid == 0x1ba0 || (devid >= 0x1bd0 && devid <= 0x1bd5)))) return 1; - if ((devid >= 0x1003 && devid <= 0x1019) || + if ((devid >= 0x1003 && devid <= 0x101b) || ((vendorid == 0x119f) && /* Bull ConnectX3 */ (devid == 0x1b33 || devid == 0x1b73 || diff --git a/src/ibdiag_common.c b/src/ibdiag_common.c index a57a04b..41b749c 100644 --- a/src/ibdiag_common.c +++ b/src/ibdiag_common.c @@ -542,7 +542,9 @@ int is_mlnx_ext_port_info_supported(uint32_t vendorid, { if (ibd_ibnetdisc_flags & IBND_CONFIG_MLX_EPI) { - if ((devid >= 0xc738 && devid <= 0xc73b) || devid == 0xcb20 || devid == 0xcf08 || + if ((devid >= 0xc738 && devid <= 0xc73b) || + devid == 0xc839 || devid == 0xcb20 || devid == 0xcf08 || + devid == 0xcf09 || devid == 0xd2f0 || ((vendorid == 0x119f) && /* Bull SwitchX */ (devid == 0x1b02 || devid == 0x1b50 || @@ -550,7 +552,7 @@ int is_mlnx_ext_port_info_supported(uint32_t vendorid, devid == 0x1ba0 || (devid >= 0x1bd0 && devid <= 0x1bd5)))) return 1; - if ((devid >= 0x1003 && devid <= 0x1019) || + if ((devid >= 0x1003 && devid <= 0x101b) || ((vendorid == 0x119f) && /* Bull ConnectX3 */ (devid == 0x1b33 || devid == 0x1b73 || diff --git a/src/vendstat.c b/src/vendstat.c index f3b3d42..5a3af21 100644 --- a/src/vendstat.c +++ b/src/vendstat.c @@ -147,8 +147,9 @@ static uint16_t ext_fw_info_device[][2] = { {0xc738, 0xc73b}, /* Switch-X */ {0xcb20, 0xcb20}, /* Switch-IB */ {0xcf08, 0xcf08}, /* Switch-IB2 */ + {0xd2f0, 0xd2f0}, /* Quantum */ {0x01b3, 0x01b3}, /* IS-4 */ - {0x1003, 0x1019}, /* Connect-X */ + {0x1003, 0x101b}, /* Connect-X */ {0x1b02, 0x1b02}, /* Bull SwitchX */ {0x1b50, 0x1b50}, /* Bull SwitchX */ {0x1ba0, 0x1ba0}, /* Bull SwitchIB */