From patchwork Wed Mar 20 07:26:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sudarsana Reddy Kalluru X-Patchwork-Id: 1058905 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=marvell.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44PM3d1gsCz9sNH for ; Wed, 20 Mar 2019 18:28:45 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727404AbfCTH2n (ORCPT ); Wed, 20 Mar 2019 03:28:43 -0400 Received: from mail-eopbgr690079.outbound.protection.outlook.com ([40.107.69.79]:50829 "EHLO NAM04-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725942AbfCTH2n (ORCPT ); Wed, 20 Mar 2019 03:28:43 -0400 Received: from CY1PR07CA0034.namprd07.prod.outlook.com (2a01:111:e400:c60a::44) by BN3PR07MB2529.namprd07.prod.outlook.com (2a01:111:e400:7bbf::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1709.14; Wed, 20 Mar 2019 07:28:41 +0000 Received: from BY2NAM05FT035.eop-nam05.prod.protection.outlook.com (2a01:111:f400:7e52::205) by CY1PR07CA0034.outlook.office365.com (2a01:111:e400:c60a::44) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1709.13 via Frontend Transport; Wed, 20 Mar 2019 07:28:40 +0000 Authentication-Results: spf=fail (sender IP is 199.233.58.38) smtp.mailfrom=marvell.com; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=fail action=none header.from=marvell.com; Received-SPF: Fail (protection.outlook.com: domain of marvell.com does not designate 199.233.58.38 as permitted sender) receiver=protection.outlook.com; client-ip=199.233.58.38; helo=CAEXCH02.caveonetworks.com; Received: from CAEXCH02.caveonetworks.com (199.233.58.38) by BY2NAM05FT035.mail.protection.outlook.com (10.152.100.172) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA) id 15.20.1750.4 via Frontend Transport; Wed, 20 Mar 2019 07:28:40 +0000 Received: from dut1171.mv.qlogic.com (10.112.88.18) by CAEXCH02.caveonetworks.com (10.67.98.110) with Microsoft SMTP Server (TLS) id 14.2.347.0; Wed, 20 Mar 2019 00:26:31 -0700 Received: from dut1171.mv.qlogic.com (localhost [127.0.0.1]) by dut1171.mv.qlogic.com (8.14.7/8.14.7) with ESMTP id x2K7QV68031630; Wed, 20 Mar 2019 00:26:31 -0700 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id x2K7QV4C031629; Wed, 20 Mar 2019 00:26:31 -0700 From: Sudarsana Reddy Kalluru To: CC: , , Subject: [PATCH net-next 1/2] qede: Populate mbi version in ethtool driver query data. Date: Wed, 20 Mar 2019 00:26:25 -0700 Message-ID: <20190320072626.31589-2-skalluru@marvell.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20190320072626.31589-1-skalluru@marvell.com> References: <20190320072626.31589-1-skalluru@marvell.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131975405204595567; (abac79dc-c90b-41ba-8033-08d666125e47); (abac79dc-c90b-41ba-8033-08d666125e47) X-Forefront-Antispam-Report: CIP:199.233.58.38; IPV:CAL; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(346002)(39860400002)(396003)(376002)(136003)(2980300002)(1110001)(1109001)(339900001)(189003)(199004)(8936002)(8676002)(5660300002)(81156014)(47776003)(1076003)(50226002)(87636003)(48376002)(6666004)(498600001)(356004)(81166006)(336012)(26826003)(97736004)(6862004)(4326008)(53936002)(476003)(446003)(86362001)(50466002)(16586007)(36756003)(107886003)(42186006)(316002)(11346002)(126002)(54906003)(80596001)(2351001)(68736007)(2616005)(69596002)(26005)(2906002)(76176011)(51416003)(85426001)(105606002)(106466001)(486006)(36906005)(305945005); DIR:OUT; SFP:1101; SCL:1; SRVR:BN3PR07MB2529; H:CAEXCH02.caveonetworks.com; FPR:; SPF:Fail; LANG:en; PTR:InfoDomainNonexistent; MX:1; A:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: da6bb172-33b9-4d8b-1ee4-08d6ad05acb1 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(5600127)(711020)(4605104)(2017052603328); SRVR:BN3PR07MB2529; X-MS-TrafficTypeDiagnostic: BN3PR07MB2529: X-Microsoft-Antispam-PRVS: X-Forefront-PRVS: 098291215C X-Microsoft-Antispam-Message-Info: qKpEbCaWVVc4SU9ev6eY1VZCCrfV+t9j+Tgz7F2jwraFQRKc/4XvXGWlvphc8yIKbl/Sc1LHaK3CN7WHo8ba94XaPGyvm6D3qPvY1R0UAH1yPFOH/a8Y+ATKAB3yhk+ilbOddn4mwf8GhPq/owAI4FmI3YCSklxESB/4uNjBysNoUFPSVWlyTGqVz1uKEU6JWP7UZR8EZMyNxZg7hgHwSgN7rzkedNniyMEfX2IkgTxvP3yShTp2lv3FfckkFazI1277GLN81/1GCj1G14NdjtaFjp2meZ6yXVgIWwk09exbRRanBGbE1uBnurL3OTfRR29cXjoyTuUX3/IZ7jBKvifX/TRFF+IgW5ClOpFYc7jdgy7rkXC9v1EH36/4ukPNn6lDGIh8ZXeczSvrpOGvo4QIpn6+s/MwytVqBSoOgfU= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Mar 2019 07:28:40.0648 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: da6bb172-33b9-4d8b-1ee4-08d6ad05acb1 X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[199.233.58.38]; Helo=[CAEXCH02.caveonetworks.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN3PR07MB2529 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The patch adds support to display MBI image version in 'ethtool -i' output. Signed-off-by: Sudarsana Reddy Kalluru Signed-off-by: Ariel Elior Signed-off-by: Michal Kalderon --- drivers/net/ethernet/qlogic/qede/qede_ethtool.c | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/qlogic/qede/qede_ethtool.c b/drivers/net/ethernet/qlogic/qede/qede_ethtool.c index c623808..8447a8c 100644 --- a/drivers/net/ethernet/qlogic/qede/qede_ethtool.c +++ b/drivers/net/ethernet/qlogic/qede/qede_ethtool.c @@ -652,9 +652,9 @@ static void qede_get_drvinfo(struct net_device *ndev, { char mfw[ETHTOOL_FWVERS_LEN], storm[ETHTOOL_FWVERS_LEN]; struct qede_dev *edev = netdev_priv(ndev); + char mbi[ETHTOOL_FWVERS_LEN]; strlcpy(info->driver, "qede", sizeof(info->driver)); - strlcpy(info->version, DRV_MODULE_VERSION, sizeof(info->version)); snprintf(storm, ETHTOOL_FWVERS_LEN, "%d.%d.%d.%d", edev->dev_info.common.fw_major, @@ -668,13 +668,27 @@ static void qede_get_drvinfo(struct net_device *ndev, (edev->dev_info.common.mfw_rev >> 8) & 0xFF, edev->dev_info.common.mfw_rev & 0xFF); - if ((strlen(storm) + strlen(mfw) + strlen("mfw storm ")) < - sizeof(info->fw_version)) { + if ((strlen(storm) + strlen(DRV_MODULE_VERSION) + strlen("[storm] ")) < + sizeof(info->version)) + snprintf(info->version, sizeof(info->version), + "%s [storm %s]", DRV_MODULE_VERSION, storm); + else + snprintf(info->version, sizeof(info->version), + "%s %s", DRV_MODULE_VERSION, storm); + + if (edev->dev_info.common.mbi_version) { + snprintf(mbi, ETHTOOL_FWVERS_LEN, "%d.%d.%d", + (edev->dev_info.common.mbi_version & + QED_MBI_VERSION_2_MASK) >> QED_MBI_VERSION_2_OFFSET, + (edev->dev_info.common.mbi_version & + QED_MBI_VERSION_1_MASK) >> QED_MBI_VERSION_1_OFFSET, + (edev->dev_info.common.mbi_version & + QED_MBI_VERSION_0_MASK) >> QED_MBI_VERSION_0_OFFSET); snprintf(info->fw_version, sizeof(info->fw_version), - "mfw %s storm %s", mfw, storm); + "mbi %s [mfw %s]", mbi, mfw); } else { snprintf(info->fw_version, sizeof(info->fw_version), - "%s %s", mfw, storm); + "mfw %s", mfw); } strlcpy(info->bus_info, pci_name(edev->pdev), sizeof(info->bus_info)); From patchwork Wed Mar 20 07:26:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sudarsana Reddy Kalluru X-Patchwork-Id: 1058907 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=marvell.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44PM3r5MdNz9sNf for ; Wed, 20 Mar 2019 18:28:56 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727541AbfCTH2z (ORCPT ); Wed, 20 Mar 2019 03:28:55 -0400 Received: from mail-eopbgr790045.outbound.protection.outlook.com ([40.107.79.45]:54352 "EHLO NAM03-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725942AbfCTH2z (ORCPT ); Wed, 20 Mar 2019 03:28:55 -0400 Received: from DM6PR07CA0001.namprd07.prod.outlook.com (2603:10b6:5:94::14) by DM6PR07MB5371.namprd07.prod.outlook.com (2603:10b6:5:44::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1709.15; Wed, 20 Mar 2019 07:28:52 +0000 Received: from BY2NAM05FT003.eop-nam05.prod.protection.outlook.com (2a01:111:f400:7e52::206) by DM6PR07CA0001.outlook.office365.com (2603:10b6:5:94::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1730.15 via Frontend Transport; Wed, 20 Mar 2019 07:28:52 +0000 Authentication-Results: spf=fail (sender IP is 199.233.58.38) smtp.mailfrom=marvell.com; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=fail action=none header.from=marvell.com; Received-SPF: Fail (protection.outlook.com: domain of marvell.com does not designate 199.233.58.38 as permitted sender) receiver=protection.outlook.com; client-ip=199.233.58.38; helo=CAEXCH02.caveonetworks.com; Received: from CAEXCH02.caveonetworks.com (199.233.58.38) by BY2NAM05FT003.mail.protection.outlook.com (10.152.100.140) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA) id 15.20.1750.4 via Frontend Transport; Wed, 20 Mar 2019 07:28:52 +0000 Received: from dut1171.mv.qlogic.com (10.112.88.18) by CAEXCH02.caveonetworks.com (10.67.98.110) with Microsoft SMTP Server (TLS) id 14.2.347.0; Wed, 20 Mar 2019 00:26:34 -0700 Received: from dut1171.mv.qlogic.com (localhost [127.0.0.1]) by dut1171.mv.qlogic.com (8.14.7/8.14.7) with ESMTP id x2K7QY5T031634; Wed, 20 Mar 2019 00:26:34 -0700 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id x2K7QYUB031633; Wed, 20 Mar 2019 00:26:34 -0700 From: Sudarsana Reddy Kalluru To: CC: , , Subject: [PATCH net-next 2/2] qed: Define new MF bit for no_vlan config Date: Wed, 20 Mar 2019 00:26:26 -0700 Message-ID: <20190320072626.31589-3-skalluru@marvell.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20190320072626.31589-1-skalluru@marvell.com> References: <20190320072626.31589-1-skalluru@marvell.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131975405325229095; (abac79dc-c90b-41ba-8033-08d666125e47); (abac79dc-c90b-41ba-8033-08d666125e47) X-Forefront-Antispam-Report: CIP:199.233.58.38; IPV:CAL; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(39860400002)(136003)(396003)(376002)(346002)(2980300002)(1110001)(1109001)(339900001)(199004)(189003)(48376002)(11346002)(86362001)(50226002)(85426001)(54906003)(446003)(6666004)(80596001)(107886003)(356004)(47776003)(14444005)(69596002)(305945005)(36906005)(68736007)(8936002)(36756003)(50466002)(2906002)(42186006)(81156014)(8676002)(16586007)(81166006)(336012)(316002)(105606002)(5660300002)(2616005)(486006)(2351001)(476003)(76176011)(106466001)(51416003)(6862004)(1076003)(126002)(4326008)(498600001)(53936002)(26005)(26826003)(97736004)(87636003); DIR:OUT; SFP:1101; SCL:1; SRVR:DM6PR07MB5371; H:CAEXCH02.caveonetworks.com; FPR:; SPF:Fail; LANG:en; PTR:InfoDomainNonexistent; A:1; MX:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: eacb9650-8e3e-4406-b677-08d6ad05b3e8 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(5600127)(711020)(4605104)(2017052603328); SRVR:DM6PR07MB5371; X-MS-TrafficTypeDiagnostic: DM6PR07MB5371: X-Microsoft-Antispam-PRVS: X-Forefront-PRVS: 098291215C X-Microsoft-Antispam-Message-Info: yBQ0siK0oHbjpfRE73QMdStxpCvmyH+o1MvmAz8viOHzV+1mZgJCRD2rqdLkoc8i7AcRM+8CUFfFuLbnEI5qA1es2RBZ/iV5dACPB9uG9IyWN1XB/69j0n83KRdfL/oUKD167o1iMnjlW49FOEdztQv8qzXjajfse9+hvZ0aU9qWu7r8DvkPlSep+cfE5R8++jad7IqU3zGPQoVe/5HaP4H106wsQq5GKNsUjPuXuKkHfAK6t6xFSJ5VQ96myF0indOz73M8SYYqiEPAjO811wPYcepCZDiQeubKbLR0hshVzF1eykqcOeFmCZN28tuAQSsje+izdNlOV9edI2YZ4Bbw97Ptbd9xCjqLkRGTd4pwab0Q35eJL1Sgq2ri/pHZETehGtI9y5+X0moZPfcCty9V1mBT3eNTiRdn72xU8Ag= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Mar 2019 07:28:52.1819 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: eacb9650-8e3e-4406-b677-08d6ad05b3e8 X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[199.233.58.38]; Helo=[CAEXCH02.caveonetworks.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR07MB5371 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The patch introduces a new Multi-Function bit for cases where firmware shouldn't perform the insertion of vlan-0 tag. The new bit is defined to abstract the implementation from the actual MF mode. Signed-off-by: Sudarsana Reddy Kalluru Signed-off-by: Ariel Elior Signed-off-by: Michal Kalderon --- drivers/net/ethernet/qlogic/qed/qed.h | 3 +++ drivers/net/ethernet/qlogic/qed/qed_dcbx.c | 4 +--- drivers/net/ethernet/qlogic/qed/qed_dev.c | 6 ++++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/qlogic/qed/qed.h b/drivers/net/ethernet/qlogic/qed/qed.h index 43a57ec..512186a 100644 --- a/drivers/net/ethernet/qlogic/qed/qed.h +++ b/drivers/net/ethernet/qlogic/qed/qed.h @@ -492,6 +492,9 @@ enum qed_mf_mode_bit { /* Allow DSCP to TC mapping */ QED_MF_DSCP_TO_TC_MAP, + + /* Do not insert a vlan tag with id 0 */ + QED_MF_DONT_ADD_VLAN0_TAG, }; enum qed_ufp_mode { diff --git a/drivers/net/ethernet/qlogic/qed/qed_dcbx.c b/drivers/net/ethernet/qlogic/qed/qed_dcbx.c index 69966df..5c6a276 100644 --- a/drivers/net/ethernet/qlogic/qed/qed_dcbx.c +++ b/drivers/net/ethernet/qlogic/qed/qed_dcbx.c @@ -204,9 +204,7 @@ static bool qed_dcbx_roce_v2_tlv(u32 app_info_bitmap, u16 proto_id, bool ieee) else p_data->arr[type].update = DONT_UPDATE_DCB_DSCP; - /* Do not add vlan tag 0 when DCB is enabled and port in UFP/OV mode */ - if ((test_bit(QED_MF_8021Q_TAGGING, &p_hwfn->cdev->mf_bits) || - test_bit(QED_MF_8021AD_TAGGING, &p_hwfn->cdev->mf_bits))) + if (test_bit(QED_MF_DONT_ADD_VLAN0_TAG, &p_hwfn->cdev->mf_bits)) p_data->arr[type].dont_add_vlan0 = true; /* QM reconf data */ diff --git a/drivers/net/ethernet/qlogic/qed/qed_dev.c b/drivers/net/ethernet/qlogic/qed/qed_dev.c index 9df8c4b..1955737 100644 --- a/drivers/net/ethernet/qlogic/qed/qed_dev.c +++ b/drivers/net/ethernet/qlogic/qed/qed_dev.c @@ -3157,12 +3157,14 @@ static int qed_hw_get_nvm_info(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt) cdev->mf_bits = BIT(QED_MF_OVLAN_CLSS) | BIT(QED_MF_LLH_PROTO_CLSS) | BIT(QED_MF_UFP_SPECIFIC) | - BIT(QED_MF_8021Q_TAGGING); + BIT(QED_MF_8021Q_TAGGING) | + BIT(QED_MF_DONT_ADD_VLAN0_TAG); break; case NVM_CFG1_GLOB_MF_MODE_BD: cdev->mf_bits = BIT(QED_MF_OVLAN_CLSS) | BIT(QED_MF_LLH_PROTO_CLSS) | - BIT(QED_MF_8021AD_TAGGING); + BIT(QED_MF_8021AD_TAGGING) | + BIT(QED_MF_DONT_ADD_VLAN0_TAG); break; case NVM_CFG1_GLOB_MF_MODE_NPAR1_0: cdev->mf_bits = BIT(QED_MF_LLH_MAC_CLSS) |