From patchwork Thu Oct 25 19:07:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hal Rosenstock X-Patchwork-Id: 10656417 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E304013B5 for ; Thu, 25 Oct 2018 19:07:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D426E2C3CA for ; Thu, 25 Oct 2018 19:07:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C88D92C3D7; Thu, 25 Oct 2018 19:07:12 +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.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI 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 4AA132C3CA for ; Thu, 25 Oct 2018 19:07:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727420AbeJZDlL (ORCPT ); Thu, 25 Oct 2018 23:41:11 -0400 Received: from mail-qt1-f196.google.com ([209.85.160.196]:34976 "EHLO mail-qt1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727418AbeJZDlL (ORCPT ); Thu, 25 Oct 2018 23:41:11 -0400 Received: by mail-qt1-f196.google.com with SMTP id a10-v6so11236683qtp.2 for ; Thu, 25 Oct 2018 12:07:10 -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=LMk22FYMwxUqSUhsp732dqoNXfLqLYZlSjWpTIXto0U=; b=DcKv4Y+JjBWZqKH1jXNYkkHcpkvKGKjgDE/IQWW4Nfz6jFHJMINcBgmo32E6p51OnR TnFGtf8qYT324+6dKUHRjnwzYTOSNytbH/j1ec+BXM8Y3RqEDomh1Hf6Zy/nIMnAwLTz 2dYG4RXg64diQp20VzZqleUl1MzXvcyIxBb/BILlFfZ/+vvwce7RrJNeU52iCrgs7Nun VCddNhPcomsOO4y9UBQy9kMR+0NySu522RsIcwqBX91/Z+cfUUyNe8YFrceuqYksX7ob O2KAyab6fFtC4Fjkfl7f/hHOOFnm2C13MyOl+g6EHGy2Mrx1h0tIUKABnwUSvr6GwJek kuPw== 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=LMk22FYMwxUqSUhsp732dqoNXfLqLYZlSjWpTIXto0U=; b=dAiHK8W+nrd6nQQixC71T2uUP8EBUEI5gTeO0hITW7voInmISGvVZeMV3UrQvd2+WJ tk21nh0KrSLwNpHxz3PgTwrtPyRn5dxVgCgnzigqigEqWnG0vZs97dADoakFEp5ZikhV 9XWtMoIiJxJSRDhhf0Y0DkQFQ/c6zY9TK++zpZZnfIRhxjj3UcTYLyELqLFSZcPhY9RL bFtb/ozS/xFCvE20c/ovPPR6v0Z7LDLY45DGBHiavji4Xknwd6BeOAmYptYN7SewWDFM eFsawoD05osDoY6OMLGNCNvXWFvp6rH8Hl51CeotLXCIvwpWe+9RTZ9RlZVgo+g5re8c EDrQ== X-Gm-Message-State: AGRZ1gJS/4QP38nHih/IOJEpfXzsPA0R8Tg/jn9i+AlOrXKIXkHc7GDt dT3liNbe4HnIq6jUtGj8qTxFPg== X-Google-Smtp-Source: AJdET5ceLiJw6W3dSDrK73PoUTTIGHJB6ddYfTZyBxNAmBLmK9O83dLQTHeOXVByrGoIL5ZEeFaTEA== X-Received: by 2002:ac8:4a10:: with SMTP id x16-v6mr437443qtq.385.1540494430179; Thu, 25 Oct 2018 12:07:10 -0700 (PDT) Received: from [192.168.1.183] (c-73-142-227-196.hsd1.ma.comcast.net. [73.142.227.196]) by smtp.googlemail.com with ESMTPSA id b11-v6sm7899230qtb.41.2018.10.25.12.07.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 25 Oct 2018 12:07:07 -0700 (PDT) To: "Weiny, Ira" Cc: "linux-rdma@vger.kernel.org" , Vincent Ficet From: Hal Rosenstock Subject: [PATCH infiniband-diags] Add latest Bull device IDs to device white lists Message-ID: <9d28007b-9a67-4010-ce4d-107b3ea6d437@dev.mellanox.co.il> Date: Thu, 25 Oct 2018 15:07:05 -0400 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 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 Sequana HDR adapter: devid = 0x1bc5 Sequana HDR100 adapter: devid = 0x1bc6 Sequana Quantum: devid = 0x1bf0 Signed-off-by: Hal Rosenstock --- libibnetdisc/src/ibnetdisc.c | 8 +++++--- src/ibdiag_common.c | 8 +++++--- src/vendstat.c | 3 ++- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/libibnetdisc/src/ibnetdisc.c b/libibnetdisc/src/ibnetdisc.c index 04bc5c5..8455d7f 100644 --- a/libibnetdisc/src/ibnetdisc.c +++ b/libibnetdisc/src/ibnetdisc.c @@ -206,7 +206,9 @@ static int is_mlnx_ext_port_info_supported(ibnd_port_t * port) (devid == 0x1b02 || devid == 0x1b50 || /* Bull SwitchIB and SwitchIB2 */ devid == 0x1ba0 || - (devid >= 0x1bd0 && devid <= 0x1bd5)))) + (devid >= 0x1bd0 && devid <= 0x1bd5) || + /* Bull Quantum */ + devid == 0x1bf0))) return 1; if ((devid >= 0x1003 && devid <= 0x101b) || (devid == 0xa2d2) || ((vendorid == 0x119f) && @@ -217,9 +219,9 @@ static int is_mlnx_ext_port_info_supported(ibnd_port_t * port) /* Bull ConnectIB */ devid == 0x1b83 || devid == 0x1b93 || devid == 0x1b94 || - /* Bull ConnectX4 */ + /* Bull ConnectX4, Sequana HDR and HDR100 */ devid == 0x1bb4 || devid == 0x1bb5 || - devid == 0x1bc4))) + (devid >= 0x1bc4 && devid <= 0x1bc6)))) return 1; return 0; } diff --git a/src/ibdiag_common.c b/src/ibdiag_common.c index a3aaada..bc1d897 100644 --- a/src/ibdiag_common.c +++ b/src/ibdiag_common.c @@ -550,7 +550,9 @@ int is_mlnx_ext_port_info_supported(uint32_t vendorid, (devid == 0x1b02 || devid == 0x1b50 || /* Bull SwitchIB and SwitchIB2 */ devid == 0x1ba0 || - (devid >= 0x1bd0 && devid <= 0x1bd5)))) + (devid >= 0x1bd0 && devid <= 0x1bd5) || + /* Bull Quantum */ + devid == 0x1bf0))) return 1; if ((devid >= 0x1003 && devid <= 0x101b) || (devid == 0xa2d2) || @@ -562,9 +564,9 @@ int is_mlnx_ext_port_info_supported(uint32_t vendorid, /* Bull ConnectIB */ devid == 0x1b83 || devid == 0x1b93 || devid == 0x1b94 || - /* Bull ConnectX4 */ + /* Bull ConnectX4, Sequana HDR and HDR100 */ devid == 0x1bb4 || devid == 0x1bb5 || - devid == 0x1bc4))) + (devid >= 0x1bc4 && devid <= 0x1bc6)))) return 1; } diff --git a/src/vendstat.c b/src/vendstat.c index 71d7b98..b0ebc3a 100644 --- a/src/vendstat.c +++ b/src/vendstat.c @@ -155,6 +155,7 @@ static uint16_t ext_fw_info_device[][2] = { {0x1b50, 0x1b50}, /* Bull SwitchX */ {0x1ba0, 0x1ba0}, /* Bull SwitchIB */ {0x1bd0, 0x1bd5}, /* Bull SwitchIB and SwitchIB2 */ + {0x1bf0, 0x1bf0}, /* Bull Sequana Quantum */ {0x1b33, 0x1b33}, /* Bull ConnectX3 */ {0x1b73, 0x1b73}, /* Bull ConnectX3 */ {0x1b40, 0x1b41}, /* Bull ConnectX3 */ @@ -162,7 +163,7 @@ static uint16_t ext_fw_info_device[][2] = { {0x1b83, 0x1b83}, /* Bull ConnectIB */ {0x1b93, 0x1b94}, /* Bull ConnectIB */ {0x1bb4, 0x1bb5}, /* Bull ConnectX4 */ - {0x1bc4, 0x1bc4}, /* Bull ConnectX4 */ + {0x1bc4, 0x1bc6}, /* Bull ConnectX4, Sequana HDR and HDR100 */ {0x0000, 0x0000}}; static int is_ext_fw_info_supported(uint16_t device_id) {