From patchwork Mon Mar 11 12:37:23 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: 1054407 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 44HyNl6gXWz9s47 for ; Mon, 11 Mar 2019 23:39:51 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727269AbfCKMju (ORCPT ); Mon, 11 Mar 2019 08:39:50 -0400 Received: from mail-eopbgr740072.outbound.protection.outlook.com ([40.107.74.72]:11072 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727167AbfCKMju (ORCPT ); Mon, 11 Mar 2019 08:39:50 -0400 Received: from DM6PR07CA0070.namprd07.prod.outlook.com (2603:10b6:5:74::47) by SN2PR07MB2542.namprd07.prod.outlook.com (2603:10b6:804:7::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1686.18; Mon, 11 Mar 2019 12:39:44 +0000 Received: from DM3NAM05FT024.eop-nam05.prod.protection.outlook.com (2a01:111:f400:7e51::206) by DM6PR07CA0070.outlook.office365.com (2603:10b6:5:74::47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1686.18 via Frontend Transport; Mon, 11 Mar 2019 12:39:44 +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 DM3NAM05FT024.mail.protection.outlook.com (10.152.98.134) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA) id 15.20.1709.11 via Frontend Transport; Mon, 11 Mar 2019 12:39:44 +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; Mon, 11 Mar 2019 05:37:32 -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 x2BCbWp1023727; Mon, 11 Mar 2019 05:37:32 -0700 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id x2BCbWeQ023726; Mon, 11 Mar 2019 05:37:32 -0700 From: Sudarsana Reddy Kalluru To: CC: , , Subject: [PATCH net-next 1/2] qede: Populate mbi version in ethtool driver query data. Date: Mon, 11 Mar 2019 05:37:23 -0700 Message-ID: <20190311123724.23686-2-skalluru@marvell.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20190311123724.23686-1-skalluru@marvell.com> References: <20190311123724.23686-1-skalluru@marvell.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131967815846087111; (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)(376002)(396003)(136003)(39860400002)(346002)(2980300002)(1110001)(1109001)(339900001)(189003)(199004)(69596002)(107886003)(8676002)(486006)(6666004)(26826003)(53936002)(2351001)(356004)(47776003)(76176011)(51416003)(68736007)(106466001)(105606002)(26005)(5660300002)(1076003)(80596001)(36756003)(87636003)(50226002)(8936002)(86362001)(54906003)(336012)(85426001)(498600001)(6862004)(81156014)(2906002)(16586007)(4326008)(48376002)(97736004)(2616005)(36906005)(11346002)(305945005)(446003)(42186006)(316002)(50466002)(126002)(476003)(81166006); DIR:OUT; SFP:1101; SCL:1; SRVR:SN2PR07MB2542; 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: aff3abc1-37a9-40fc-75e9-08d6a61ea3b4 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(5600127)(711020)(4605104)(2017052603328); SRVR:SN2PR07MB2542; X-MS-TrafficTypeDiagnostic: SN2PR07MB2542: X-Microsoft-Antispam-PRVS: X-Forefront-PRVS: 09730BD177 X-Microsoft-Exchange-Diagnostics: 1; SN2PR07MB2542; 23:eTvidXqbm6AmehZE4/LuwRkK7mWov4M6hU03SjBLoveaO++dRBlaKmKBYJWzBTJlbqMM/LVECMR+o0+qp1PKEMTw1t0QLwMnkwLxb/n9PwTwo4NarqBcHqHEoxD6DV8NrOulwMqKbS+WC0WykHr6Gx1jsoYUS/y0ZpTGLhHDGH8rHz0oRiKNOLPi4orp7Oxu4nhe/B0+uPU4qo8T6UUcpqBmW+Y2QL5drBz9C2J+iO497Zz8aNmvem2BIW2JNbww6E1mHvBzvnAyOE4vbbhkTg8cZvNkVhkrvR/pMOSNF6t1wHyNGdfrQ+0X996yX3L34Vf/W2pPO/NUUd1gn/46wObXZTS33eevoFoXn8fuOV2EkXRY5LrQopSr1jqmYSXqV5LCpPsp0Vw6RbYwUyURxUTrU3rBngMTlaxbHackzoDn3fillxeADy5BDzGmF7AQNtXr4tuRyEsg4z0BXwoiu5a7Z4LVCHv0CUeqyOnJwc0XwCbVTrXUcKiFdgajCpx/PANDrtYUYFwQqYL7eqWu4al8reCq+Nv/yLLrTXlV+uq81qN0Al82s6W+Fr/ai8MYy73bR6oz5jBOltAvUbAF80Ifphc+q6pVujeLaf1mjpfyCcQOGajC5F/hRJJj3E2oA5tu2OIeExehlm0WFjHnHCQsAU3SiCSBbEw8j8QirPeZm66D1MoS9SnBLtMv/WlzjxorYPG6KxZkpsAJbL+n+AizS1vd+P2QU/a97qiBenZGOvb7Yt3pr7ChbfCFuTORwGDNX02SwW5T6cV2DPod4yy4hxql82qWswLFBZL53EjfEanNh2A6vw/RSY03upyarx+YA6/2EDh0LhcazRUGIIRRaKXYU2pC46EL+ijhWLlNiZ1lNb+bil0L354AzBLWh5PAy1Umt7C45dtrYbT9LpyJDL/TVXrMwvcfyPvbUZORUq3uCLryWUO6gsCi6k0ikQNCHrryffYQkST2Zq3aFKU1nZ870SKy/P9PkY1ljvEjuEwU10wFeeJmQKszPxsNgI7ttXjAMnByoJJ8TVD/+DK7WYGKxcPf9WH4JXWNwzel/2+U8KS8Ko/3mMTMBBWNvWhMC0n8IdRKMng4hLc1V8eyMdCqL6xgZYTcXKbKC2S0x8qrDgA4WzQmGnPAPXQVEZ6m8gpCm7Oj4m09Ad6+1wtR3mp92yD7fGDmUjHkk3ISXSP7p+BIoaLEiFpvYeQhoSouiCC+3SDTEcDv7Vc8NFH4hJtfKsJrT0In4JStfUkkSdlsBge/psQwNXJb7VRn X-Microsoft-Antispam-Message-Info: CWM0pCHoAIean9VPqC5iJIQk85IPkqdrC/CZTWtbgMDC4vQHUJqpGenIzdUKYwUavQctdxmOph4D59XoeuqZMgimaHx20MB2+vdFaKP1vyEoOB0JWArdO62PJ8enG87Jj5Vwhxr4hiGGX3JOCYqmBFQZCQ/4G/shVTdkr1LyCJdFD0R1ek5UjSORMXqa77sNk7RYdzQE+Q/HRoAH8/twQj9ncfoTiEUIaYsSM/B+QHtMG4HTzhS/aS8xld0lQf66ti/5CuvH9k0sP33hjNg0iyZP3oPNpRmYfkLzErWSqE6GnRb/ImJ8L1A5NyyGnC9FgC7GtbV5uEzheuidLenbbQ6GmFpsipy4hprG7TzthKvsKMPO0BSPYXNp1TEwOx0niueFZ6CFLZeqbbjZaVPkoeXHCoFWRkA8qYZNPnZoM94= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Mar 2019 12:39:44.1813 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: aff3abc1-37a9-40fc-75e9-08d6a61ea3b4 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: SN2PR07MB2542 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 Mon Mar 11 12:37:24 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: 1054409 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 44HyPT2kzlz9s47 for ; Mon, 11 Mar 2019 23:40:29 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727046AbfCKMk2 (ORCPT ); Mon, 11 Mar 2019 08:40:28 -0400 Received: from mail-eopbgr800077.outbound.protection.outlook.com ([40.107.80.77]:52768 "EHLO NAM03-DM3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726691AbfCKMk1 (ORCPT ); Mon, 11 Mar 2019 08:40:27 -0400 Received: from DM6PR07CA0061.namprd07.prod.outlook.com (2603:10b6:5:74::38) 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.1686.18; Mon, 11 Mar 2019 12:39:45 +0000 Received: from DM3NAM05FT024.eop-nam05.prod.protection.outlook.com (2a01:111:f400:7e51::201) by DM6PR07CA0061.outlook.office365.com (2603:10b6:5:74::38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1686.17 via Frontend Transport; Mon, 11 Mar 2019 12:39:45 +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 DM3NAM05FT024.mail.protection.outlook.com (10.152.98.134) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA) id 15.20.1709.11 via Frontend Transport; Mon, 11 Mar 2019 12:39:45 +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; Mon, 11 Mar 2019 05:37:35 -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 x2BCbZtj023739; Mon, 11 Mar 2019 05:37:35 -0700 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id x2BCbZQk023730; Mon, 11 Mar 2019 05:37:35 -0700 From: Sudarsana Reddy Kalluru To: CC: , , Subject: [PATCH net-next 2/2] qed: Define new MF bit for no_vlan config Date: Mon, 11 Mar 2019 05:37:24 -0700 Message-ID: <20190311123724.23686-3-skalluru@marvell.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20190311123724.23686-1-skalluru@marvell.com> References: <20190311123724.23686-1-skalluru@marvell.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131967815854103478; (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)(346002)(136003)(396003)(376002)(2980300002)(1109001)(1110001)(339900001)(189003)(199004)(486006)(50226002)(106466001)(126002)(105606002)(47776003)(80596001)(446003)(316002)(6862004)(4326008)(69596002)(2616005)(81156014)(476003)(1076003)(5660300002)(50466002)(2351001)(48376002)(14444005)(42186006)(8676002)(305945005)(54906003)(68736007)(16586007)(26005)(76176011)(36906005)(81166006)(336012)(51416003)(2906002)(8936002)(97736004)(107886003)(87636003)(11346002)(36756003)(26826003)(356004)(6666004)(85426001)(86362001)(498600001)(53936002); 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: 18acc525-8adb-44d3-4d86-08d6a61ea43b 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: 09730BD177 X-Microsoft-Exchange-Diagnostics: 1; BN3PR07MB2529; 23:pZmUZkz6t/Lt9jShDoZRn9eRe6rtxp0Q4/Efy94CXXGw3NwcCpQMcvG5OD+Wxmd4+PG9PvkeniKX6o/QPWM/9NtE9hGtIVXenbWdbnQqu1DsOAe9asapb0Y9sjdoV4z4CDeAAOY8ohBgKAHxbmQawPPC8V4nF5DKWTRIxsZvAsN10p4y6cMoMzYSCv5JWVRk066MFWRpuFOBt71n9XLboukqdi8x1j2aTs69DAz5a7+3tbbYLrfP2UiCIaknnWusx5NEbQgKEi3Uut/CvS4uLgmsQ+lR2csAGo6Cztl4jSRDhfDwVGlxcIMnXjD0CMmdkRg/x3mJYCqR7/aiFDPTCfMPyqiz+Mkv01xTsFRjosEfReJt7I+2rTwnLNVWiHz/XaYupzqBvTfTyEr9il3ksYdXVfSFUlC9SkDrTSJeOj081PECvH8nGf1dLMpuGuHWRBq6iqbusan9MPG74LNlEFF0unu46NU6kXIVO9hVopbBvJ79S/C9QeWneRNzmrB3yBbzFmLTrkaAp/Zgg256shwqWZhG+udSPl8QJrvCJaPE7OzJGd0D63j9AKI3Npoezrn/O3xQKe6kvrnFGzipUnMGKDAqVliZm3ZLW3uw08UNeq3tlYLNRT1kcjCd03jHQLY/tyxKvqeTVjvrqPCLkIb7K1r4U+TvGVcfpta7Qt/k9tnAFmnfplX857fQlriB7HIeFRACVUvCU2n1GNN9Yy4BL2PtClzDLc/wZ4DHvfToai7nYHZv4nNY2HBNNrohaNFQFWnJG8esSTfD6baoz83ywo46PMfwMOLAt5x6WwWJu/4v/FdcBA/qQ3B3seZOwHA/JA9UdU7HB99gCYSahQjrXNYmPpKUh4GDGpVMNaQc1wNVe+98EkAuTrg2m/ZDGt80PMLFVEZau6JJRtrQWABLaNY8Jcha/3t7pTPsHeJrHXOT+eyAWiq+XbAHn/5CBWULLvOeO3DYVdkEBpb7KokNOX3DmEM5eMSig7TotWWRMD3ke/PXsxy3bmb5EHCEzlbv+MJaNBR8Nfp49G3qOk4JnFhSq4FGQt49wmNaDWkswayRbOtkJDzteqnoQKlSyd7Kuuooyzh3WXSIIzInJKhVGwK8Xs15pFzkEqATpADjXB8AXyWV+32CMW+rbo0KdO6Cf4NYZMPRC+vZfO2QogecKxMe8Qg6W2TbkZjn3X4DA9GExmKApFZFVmPPQ8lnVN+zrhkKV9sXF0WWnmm4jQklULBZCsbbpvNLbQ4KkDLOuuRJgV7zY4TcwXRACMyRWiEGJx3ygZgmKMCPaq1YSg== X-Microsoft-Antispam-Message-Info: ZIHNVhFX8VS4ohec2hhM+F1kBjR78pcF1jJbhQL6xZQkdD+iIK6sbgf///mFa6NVlclXRA6T9zZBeBsE3s8XOkM4F02zU7x9xdgYMxzOVFzaSQZ128P+K3cnaHFQVyccOMkvha89vsr97T+WgzXAIIuQqXcXwW1YZEMi9BdbLjknArNTrx2954pt/4eihVRs5i7h5D+/lSPnT5nw32MoJ1a1NUQeIkGfyAjyNv6SS1V7jU7BrCl1QBohQIS1R6l377H1J0Z1Y9If3K6lkxKCZ2FO4WRj10puW82rAsZM0Bi/pX91xeLzLbJlaaaqlEGgHnuQjgm4sBUS673YpcTe4qcxm2RXjoSlt9DMh4BktKeZbwQTRTtP88KBTiRSM/mvp7plIrrRd3YvPDGgCl6aLqbutPeT8fCbrTou2jCd+64= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Mar 2019 12:39:45.0710 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 18acc525-8adb-44d3-4d86-08d6a61ea43b 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 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) |