From patchwork Thu Sep 5 17:41:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Belous X-Patchwork-Id: 58693 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 1A02A1F08A; Thu, 5 Sep 2019 19:41:50 +0200 (CEST) Received: from NAM02-CY1-obe.outbound.protection.outlook.com (mail-eopbgr760078.outbound.protection.outlook.com [40.107.76.78]) by dpdk.org (Postfix) with ESMTP id 99AB11F074; Thu, 5 Sep 2019 19:41:45 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aVm391v8bheRkcE830WnnmpIa6+FQ8CKwuvdBtMvUK+lUUXiHKkIrMguMj0jPtqxMeaIPAQ3njcypBpqF8S707m0e7K4h5idRUsFKpUDV7rLts2GITVGgJtkqCGduK1nwR119fXGMco+WTf7aS2t7KpvTzixOlgpPLrYvr6fOW+kfxFoh+gEGyO8hpDNLjYYG4GIoEfVHPTxoGIJHjal/B5I8KKLAK2EAdDqwZD56qU0YjW7cmQxyxsWxjeX6U/KiFf58UDnhulE73KAbwuZXFSmChXUJBMbZ3IrPtVq4PgtQGaOVmcQXitcQnXgaNw6abUwMoXFd7bi9OXFBThfOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Ry6RHIEJ1wRo25HcCKoBqcDGv5GZbd4X5Wccr7Fz9as=; b=QGv41HkxjrESr3ZaL6k4TskqjI5Jse8dDhhooGRDDk7Oe26hDCMMgv5Lpdv+d1PSti+REPkGWQ0dO/RNMac5ENjoBs9anI6KJUYbQjV1DZkMAH5uVQ6hLkp2/Qr9HSKqzWUgW1eKUXAZlmYP3Ia+nmrStUiezcSc4MXm77RfbjyWnKyBv43MIDnoIAAQKZDHza5B3OC5ECqcNJMQeoP4X7/hk7gfYjca/7vAOhUraQwYMyHlnQAvVjdljS2kcaG/oTrbieNBqqm1JQYYpK0DvI7YT+wsd4zLeIp8lkgKEsc6GY9K6Ug9UNWjjG/SFsCDr5euP7zG4LUIBwFDZXtxcg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=aquantia.com; dmarc=pass action=none header.from=aquantia.com; dkim=pass header.d=aquantia.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=AQUANTIA1COM.onmicrosoft.com; s=selector2-AQUANTIA1COM-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Ry6RHIEJ1wRo25HcCKoBqcDGv5GZbd4X5Wccr7Fz9as=; b=1dP60ZXYGz303aj54MnBHAPplkglEZoBhF0EanYSJpwzQsvpwvkaXgwk45N7qU0qGfmC/oulQ3OUXygpAtj4sA614bpUKP+ReN3eDMU8CUkgEOVuJThvy6Wog1PclkaRJdnvKgJWRJJzPu9A7jda0WROxqVD5QeXRyC6x7E9lG8= Received: from CY4PR1101MB2183.namprd11.prod.outlook.com (10.172.76.20) by CY4SPR00MB057.namprd11.prod.outlook.com (10.173.60.151) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2241.14; Thu, 5 Sep 2019 17:41:44 +0000 Received: from CY4PR1101MB2183.namprd11.prod.outlook.com ([fe80::4dee:fb50:cc75:fbde]) by CY4PR1101MB2183.namprd11.prod.outlook.com ([fe80::4dee:fb50:cc75:fbde%6]) with mapi id 15.20.2199.027; Thu, 5 Sep 2019 17:41:44 +0000 From: Pavel Belous To: Ferruh Yigit CC: "dev@dpdk.org" , Igor Russkikh , Corey Melton , Pavel Belous , "stable@dpdk.org" Thread-Topic: [PATCH 1/3] net/atlantic: exclude MACSEC counters from xstats Thread-Index: AQHVZBEvlA2Do9ZnqEOQxoEr3Cw3JA== Date: Thu, 5 Sep 2019 17:41:44 +0000 Message-ID: <1567705278-10558-2-git-send-email-Pavel.Belous@aquantia.com> References: <1567705278-10558-1-git-send-email-Pavel.Belous@aquantia.com> In-Reply-To: <1567705278-10558-1-git-send-email-Pavel.Belous@aquantia.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: HE1PR05CA0314.eurprd05.prod.outlook.com (2603:10a6:7:93::45) To CY4PR1101MB2183.namprd11.prod.outlook.com (2603:10b6:910:18::20) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Pavel.Belous@aquantia.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.7.4 x-originating-ip: [95.79.108.179] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 100028ce-360e-42b6-1f43-08d732285183 x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600166)(711020)(4605104)(1401327)(2017052603328)(7193020); SRVR:CY4SPR00MB057; x-ms-traffictypediagnostic: CY4SPR00MB057: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:331; x-forefront-prvs: 015114592F x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(376002)(136003)(346002)(366004)(396003)(39850400004)(199004)(189003)(4326008)(3846002)(66446008)(86362001)(64756008)(66556008)(66476007)(8676002)(305945005)(6916009)(6116002)(2906002)(7736002)(66946007)(6512007)(6436002)(14454004)(6486002)(66066001)(81166006)(8936002)(81156014)(478600001)(50226002)(25786009)(6506007)(256004)(486006)(2616005)(476003)(71200400001)(316002)(54906003)(11346002)(71190400001)(36756003)(26005)(76176011)(446003)(386003)(44832011)(102836004)(186003)(52116002)(53936002)(99286004)(5660300002); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4SPR00MB057; H:CY4PR1101MB2183.namprd11.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: aquantia.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: VayVgUqr/ZriqdLmSnznmBPIq6NxNXvHFrLfRV2orslB9oU+rzHuAtm7irMTgJiUFqgAuhDn3ynXBWWUK3+p17dCfM6sVNL2H7pJPI48U12hT87g8Pikd1L2TTwXCc+e2PxoqlhJn6xvfA/oN3yKJdeTnub+oicM++mDFsk9m1nEh3wDQUNDUrdy9Wc8M7Ybguc3Tt2VueRZ1QgK9yjh0Vw6kNVgOxnmJfAd8xCIey8EZPqpNN9FXJBzeNOzsQXMwynTr5NbxJhEcIL7uvq9WGTWHK2vf5smL+oIssHDLmOjYoVmNtyue+feMfeARQJ+XtHWREVLlpeIxUPlFW4GVFpTBC63eYnkgENr4fO9EM4TzBOsTKqF0N2UgF00CUHAvU5KxfZQ1GFlSi1ME+EZA3wzPwx1jfpvKaZwVArAdUc= MIME-Version: 1.0 X-OriginatorOrg: aquantia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 100028ce-360e-42b6-1f43-08d732285183 X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Sep 2019 17:41:44.6771 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 83e2e134-991c-4ede-8ced-34d47e38e6b1 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: b2G13CnwHJIZkp9WbGadf6QYFRRbS+E/86Kmak6PN9Xc8IXNpcDT8NWQMXnI60vwfk5BtNwGKwjmRonut0h38g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4SPR00MB057 Subject: [dpdk-dev] [PATCH 1/3] net/atlantic: exclude MACSEC counters from xstats X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Pavel Belous Currently, driver always return full set of xstats counters, including MACSEC counters. But this driver also supports AQC100 chips, which does not have MACSEC feature. This fix adds checking for MACSEC availability (based on FW capability bits) and returns xstats without MACSEC counters if MACSEC feature is not available. Fixes: 09d4dfa85359 ("net/atlantic: implement MACsec statistics") Cc: stable@dpdk.org Signed-off-by: Pavel Belous Signed-off-by: Igor Russkikh --- drivers/net/atlantic/atl_ethdev.c | 52 ++++++++++++++++++++++++++++----------- 1 file changed, 38 insertions(+), 14 deletions(-) diff --git a/drivers/net/atlantic/atl_ethdev.c b/drivers/net/atlantic/atl_ethdev.c index 3c1b349..178f7db 100644 --- a/drivers/net/atlantic/atl_ethdev.c +++ b/drivers/net/atlantic/atl_ethdev.c @@ -993,20 +993,42 @@ atl_dev_stats_reset(struct rte_eth_dev *dev) } static int +atl_dev_xstats_get_count(struct rte_eth_dev *dev) +{ + struct atl_adapter *adapter = + (struct atl_adapter *)dev->data->dev_private; + + struct aq_hw_s *hw = &adapter->hw; + unsigned int i, count = 0; + + for (i = 0; i < RTE_DIM(atl_xstats_tbl); i++) { + if (atl_xstats_tbl[i].type == XSTATS_TYPE_MACSEC && + ((hw->caps_lo & BIT(CAPS_LO_MACSEC)) == 0)) + continue; + + count++; + } + + return count; +} + +static int atl_dev_xstats_get_names(struct rte_eth_dev *dev __rte_unused, struct rte_eth_xstat_name *xstats_names, unsigned int size) { unsigned int i; + unsigned int count = atl_dev_xstats_get_count(dev); - if (!xstats_names) - return RTE_DIM(atl_xstats_tbl); - - for (i = 0; i < size && i < RTE_DIM(atl_xstats_tbl); i++) - strlcpy(xstats_names[i].name, atl_xstats_tbl[i].name, - RTE_ETH_XSTATS_NAME_SIZE); + if (xstats_names) { + for (i = 0; i < size && i < count; i++) { + snprintf(xstats_names[i].name, + RTE_ETH_XSTATS_NAME_SIZE, "%s", + atl_xstats_tbl[i].name); + } + } - return i; + return count; } static int @@ -1020,9 +1042,10 @@ atl_dev_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstat *stats, struct macsec_msg_fw_response resp = { 0 }; int err = -1; unsigned int i; + unsigned int count = atl_dev_xstats_get_count(dev); if (!stats) - return 0; + return count; if (hw->aq_fw_ops->send_macsec_req != NULL) { req.ingress_sa_index = 0xff; @@ -1035,7 +1058,7 @@ atl_dev_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstat *stats, err = hw->aq_fw_ops->send_macsec_req(hw, &msg, &resp); } - for (i = 0; i < n && i < RTE_DIM(atl_xstats_tbl); i++) { + for (i = 0; i < n && i < count; i++) { stats[i].id = i; switch (atl_xstats_tbl[i].type) { @@ -1044,14 +1067,15 @@ atl_dev_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstat *stats, atl_xstats_tbl[i].offset); break; case XSTATS_TYPE_MACSEC: - if (err) - goto done; - stats[i].value = *(u64 *)((uint8_t *)&resp.stats + - atl_xstats_tbl[i].offset); + if (!err) { + stats[i].value = + *(u64 *)((uint8_t *)&resp.stats + + atl_xstats_tbl[i].offset); + } break; } } -done: + return i; } From patchwork Thu Sep 5 17:41:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Belous X-Patchwork-Id: 58694 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id BF5E51F09B; Thu, 5 Sep 2019 19:41:52 +0200 (CEST) Received: from NAM02-CY1-obe.outbound.protection.outlook.com (mail-eopbgr760042.outbound.protection.outlook.com [40.107.76.42]) by dpdk.org (Postfix) with ESMTP id 82CA51F080; Thu, 5 Sep 2019 19:41:48 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LRlSv/b9ovKR8UGun5jJD5AWBAQfTZ0ZwleL+TAa7IdWggKPhNwl90y6q94nuG4juov7TMV+RhKobCoGZ38SDldArfB1OKTaM9Eho/D+0LoD+V5BcRiUZQW81FIbGUfPufi/dzcLJE+abWN+/WfnLaqxDf6GgnKh/esLr9vMUhH9WdvDJbZKYGRg9PwlTjB24oHYh5x+T6WvDDbyQIYIdq1BaprNENtrfoG6NuS6XQivXovj00g0Yw9a9u7B+MwMXTgJQSX8kxrZZ1mgS2x7z2J+ndrZuz+fOQ+xQMyJXTGX855Nd4Kdmv0t7YXwmHjN0xGz3AjeJg2FaYljpO3n+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=82e7a7fzlsQlm8qhQe92DoXfdJjAfI8FRnizJh6dHsY=; b=k0lsfl5p9jAaMZtZ8h+B+c204yZ/JrvoH72h5IDuWL0c43FW8QHZ0NbHdBYEAcONb10iw97NTkRr6HqNF34+KacRbTtZXAXOzuJBO806qwqHHFWEHocMDhOObVwf+NCWrOYwiFORFshU/lfNS3IDBGo3U1z5I0yNQJfS1E7Gqz3Dpm81Hl/rqtvZvAvQbmDAFcLympxkyZQctuX/Lbc4g71vXbXKnvtaHcOAWIe2lsDCY7Ob75vC3j+YwRSJhzWj4fM0Q9Kop2JI4rWZYhjup4nSvvtSaIQ/zAznOXebqruBG9T2pj/yRSgnjXS7mkYywRcC14iaO8ENOD+ljZPoFQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=aquantia.com; dmarc=pass action=none header.from=aquantia.com; dkim=pass header.d=aquantia.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=AQUANTIA1COM.onmicrosoft.com; s=selector2-AQUANTIA1COM-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=82e7a7fzlsQlm8qhQe92DoXfdJjAfI8FRnizJh6dHsY=; b=FZZIAhs4S2+FH+W7Dr/Psw6gZ96toSzLcWcA7LaIyEIM91vwLedgLegu8TRC4eZ2MI90NkdRox82gJgVlpnyo1sXanoKDUeEYKXRwIR/d6v0h5t9mZyD8oNQtVyh4Dl3yAwmh+IaqCIU62a7y08pDDVwu8LxHcNy+PohOrpLcpg= Received: from CY4PR1101MB2183.namprd11.prod.outlook.com (10.172.76.20) by CY4SPR00MB057.namprd11.prod.outlook.com (10.173.60.151) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2241.14; Thu, 5 Sep 2019 17:41:47 +0000 Received: from CY4PR1101MB2183.namprd11.prod.outlook.com ([fe80::4dee:fb50:cc75:fbde]) by CY4PR1101MB2183.namprd11.prod.outlook.com ([fe80::4dee:fb50:cc75:fbde%6]) with mapi id 15.20.2199.027; Thu, 5 Sep 2019 17:41:47 +0000 From: Pavel Belous To: Ferruh Yigit CC: "dev@dpdk.org" , Igor Russkikh , Corey Melton , Pavel Belous , "stable@dpdk.org" Thread-Topic: [PATCH 2/3] net/atlantic: fix reported flow control mode Thread-Index: AQHVZBEwCq8Xk5bK4Uihj2VV9ELYhQ== Date: Thu, 5 Sep 2019 17:41:47 +0000 Message-ID: <1567705278-10558-3-git-send-email-Pavel.Belous@aquantia.com> References: <1567705278-10558-1-git-send-email-Pavel.Belous@aquantia.com> In-Reply-To: <1567705278-10558-1-git-send-email-Pavel.Belous@aquantia.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: HE1PR05CA0314.eurprd05.prod.outlook.com (2603:10a6:7:93::45) To CY4PR1101MB2183.namprd11.prod.outlook.com (2603:10b6:910:18::20) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Pavel.Belous@aquantia.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.7.4 x-originating-ip: [95.79.108.179] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 5f98ccc7-12fa-432c-4523-08d73228530f x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600166)(711020)(4605104)(1401327)(2017052603328)(7193020); SRVR:CY4SPR00MB057; x-ms-traffictypediagnostic: CY4SPR00MB057: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:172; x-forefront-prvs: 015114592F x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(376002)(136003)(346002)(366004)(396003)(39850400004)(199004)(189003)(4326008)(3846002)(66446008)(86362001)(64756008)(66556008)(66476007)(8676002)(305945005)(6916009)(6116002)(2906002)(7736002)(66946007)(6512007)(6436002)(14454004)(6486002)(66066001)(81166006)(8936002)(81156014)(478600001)(50226002)(25786009)(6506007)(256004)(486006)(2616005)(476003)(71200400001)(316002)(54906003)(11346002)(71190400001)(36756003)(26005)(76176011)(446003)(386003)(44832011)(102836004)(186003)(52116002)(53936002)(99286004)(5660300002); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4SPR00MB057; H:CY4PR1101MB2183.namprd11.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: aquantia.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: E4HFaK3jnzDZxzDELP33owV6AV1Niu5ONthhsmqfXsSGVYSvgP52nJ32lAxYw0u0H4YgtRtEWsdPUd5hCXvTcawaf+gxo+45TLUi+X5rINcYlZtWUqKM22SECaBoW4bkisiuAeQ3DPDxsZ1N5eL19L9AUDw3eDtx1oo8shSVkhKXJ3VDIz0k2gLhzT9KBxJeQxMQRP0zTIbCpBnezK1I6uvNZqWFUkp7JKzcDT0zckbfPZY28oUlfV9R5TgcTrsAcmWb38Bk4lX9JDFogouKgWdGTJFEaOWKMSJil/Xh0RZX6ozQ2Lbntu7qKXKLIbxAcnHcwwX/ZMfxMl2c7WUrnY8cfNXKP96TCuRp/9kz/Z8FSmldrOcPla7ssRTCIpPDYrNIlrHc/vHZgmt8o//DGuLUENOLPLofoK+ZFqDCbq8= MIME-Version: 1.0 X-OriginatorOrg: aquantia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5f98ccc7-12fa-432c-4523-08d73228530f X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Sep 2019 17:41:47.3588 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 83e2e134-991c-4ede-8ced-34d47e38e6b1 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 0Iuv9Wi0NkKhPYMxdqfe66bRtJhsKf09YIKdR2hgP21QpnVg7KE8aKhIiPZ3j2tKn9mcwAzSa5kWuzX6UFTs3w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4SPR00MB057 Subject: [dpdk-dev] [PATCH 2/3] net/atlantic: fix reported flow control mode X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Pavel Belous Driver reports current flow control mode based on internal flow control settings. Currently this logic works incorrectly. Fixes: 921eb6b8ce31 ("net/atlantic: fix flow control by sync settings on Rx") Cc: stable@dpdk.org Signed-off-by: Pavel Belous Signed-off-by: Igor Russkikh --- drivers/net/atlantic/atl_ethdev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/atlantic/atl_ethdev.c b/drivers/net/atlantic/atl_ethdev.c index 178f7db..1b9d514 100644 --- a/drivers/net/atlantic/atl_ethdev.c +++ b/drivers/net/atlantic/atl_ethdev.c @@ -1535,11 +1535,11 @@ atl_flow_ctrl_get(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf) if (fc == AQ_NIC_FC_OFF) fc_conf->mode = RTE_FC_NONE; - else if (fc & (AQ_NIC_FC_RX | AQ_NIC_FC_TX)) + else if ((fc & AQ_NIC_FC_RX) && (fc & AQ_NIC_FC_TX)) fc_conf->mode = RTE_FC_FULL; else if (fc & AQ_NIC_FC_RX) fc_conf->mode = RTE_FC_RX_PAUSE; - else if (fc & AQ_NIC_FC_RX) + else if (fc & AQ_NIC_FC_TX) fc_conf->mode = RTE_FC_TX_PAUSE; return 0; From patchwork Thu Sep 5 17:41:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Belous X-Patchwork-Id: 58695 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A39FC1F0A3; Thu, 5 Sep 2019 19:41:54 +0200 (CEST) Received: from NAM02-CY1-obe.outbound.protection.outlook.com (mail-eopbgr760082.outbound.protection.outlook.com [40.107.76.82]) by dpdk.org (Postfix) with ESMTP id 31AEF1F075 for ; Thu, 5 Sep 2019 19:41:51 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PhxLpPt1Nlzc+y87vhjlAlbw1juMIDBOCUbk66AqY7BeiqGemyW7toXwGHvOyHsEJQTkLSXbOYN7vtmBLF4CPvgZd/UhVUiFMM70U7bOo04zKNV5mv4s1FLf1skKDS8sj3Ezk2mZIkITFCXwur89KTKvgGEp/YXwPQGW0Y7DGEt3LEhntI0qU5Pdmjw2czv91hd3CAZWCxzeGcQUIxhFDY6h4e23uf9NoHAkMFBIRNQWww6CNSPMRdkPElh8a0kt/lam/MBZsfch1cV/m1+mz9nmQqeyu7M9+yqcz058gYDWyUXnO01lk+AG0pTWvSwkumeqKlO1+uNy4etTkaHiEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=S5RM5jgrJBbkmvNNTh98Kku36eefsUB3HHVOWWY/GGA=; b=ikp+2yg/m9qqfTOqmD22tqnfN7l8pcgZc8/oueKSg8HRbHuXgvIGYyfZIIFVgX/gS1jmIILRqFwfVu8oVP6seIYonWni1crwL6doCommqkAbRI4MTs5DDkl1Cn8FW4Wwg53r1mCnKe7uL1hup7EIlaUzcuS5aPNv5O839X2ZEnd2QiK1HcCqUqgHFdQHu/GZQYvLJ4cNnKsu4hsdy6ECVsQ8SHOcfVivxTmpKWr5zMx77HDWi0iewEtwtZjeWyW70sWNK3ZTUGdOoZ76M6TgsdbYbesGXnkWfptwDsExLPsSgEFpBsuORti/o1nCYQI2J8vkoebTUstsPedL0pc8EA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=aquantia.com; dmarc=pass action=none header.from=aquantia.com; dkim=pass header.d=aquantia.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=AQUANTIA1COM.onmicrosoft.com; s=selector2-AQUANTIA1COM-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=S5RM5jgrJBbkmvNNTh98Kku36eefsUB3HHVOWWY/GGA=; b=KBNrxiQ35OdS0iRPKiCYM5ikIaKEz61IOJ3Ue/rJQOs7F7l5CXcT8FmoUtJCrO9+9cf1WRjPpS5GLdZstbVXripeak7CqKBdpMfKasGwupWZT6EeE2vqduLhAKA7XL05trD7VbmaznUBod/jvAMBRA+jG/3lF+hIDSM3SAuAZhU= Received: from CY4PR1101MB2183.namprd11.prod.outlook.com (10.172.76.20) by CY4SPR00MB057.namprd11.prod.outlook.com (10.173.60.151) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2241.14; Thu, 5 Sep 2019 17:41:50 +0000 Received: from CY4PR1101MB2183.namprd11.prod.outlook.com ([fe80::4dee:fb50:cc75:fbde]) by CY4PR1101MB2183.namprd11.prod.outlook.com ([fe80::4dee:fb50:cc75:fbde%6]) with mapi id 15.20.2199.027; Thu, 5 Sep 2019 17:41:49 +0000 From: Pavel Belous To: Ferruh Yigit CC: "dev@dpdk.org" , Igor Russkikh , Corey Melton , Pavel Belous Thread-Topic: [PATCH 3/3] net/atlantic: add FW mailbox guard mutex Thread-Index: AQHVZBEypEvKlZQ+5EGjIiVo1/bcvg== Date: Thu, 5 Sep 2019 17:41:49 +0000 Message-ID: <1567705278-10558-4-git-send-email-Pavel.Belous@aquantia.com> References: <1567705278-10558-1-git-send-email-Pavel.Belous@aquantia.com> In-Reply-To: <1567705278-10558-1-git-send-email-Pavel.Belous@aquantia.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: HE1PR05CA0314.eurprd05.prod.outlook.com (2603:10a6:7:93::45) To CY4PR1101MB2183.namprd11.prod.outlook.com (2603:10b6:910:18::20) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Pavel.Belous@aquantia.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.7.4 x-originating-ip: [95.79.108.179] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 1892c580-65bd-4526-9f10-08d73228547a x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600166)(711020)(4605104)(1401327)(2017052603328)(7193020); SRVR:CY4SPR00MB057; x-ms-traffictypediagnostic: CY4SPR00MB057: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:238; x-forefront-prvs: 015114592F x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(376002)(136003)(346002)(366004)(396003)(39850400004)(199004)(189003)(4326008)(3846002)(66446008)(86362001)(64756008)(66556008)(66476007)(8676002)(305945005)(6916009)(6116002)(2906002)(7736002)(66946007)(6512007)(6436002)(14454004)(6486002)(66066001)(81166006)(8936002)(81156014)(478600001)(50226002)(25786009)(6506007)(256004)(14444005)(486006)(2616005)(476003)(71200400001)(316002)(54906003)(11346002)(71190400001)(36756003)(26005)(76176011)(15650500001)(446003)(386003)(44832011)(102836004)(186003)(52116002)(107886003)(53936002)(99286004)(5660300002); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4SPR00MB057; H:CY4PR1101MB2183.namprd11.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: aquantia.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: ZZgfHwANFtFQqUuVGqW2ie8zz/POecHSvl0+fvN5bbjVkIwcEjN7pqhpJGrEz/tc1FusahRMORhT5Zvts+SktkjK8s5cr3tMEH7xRVLZjHP+8JEGgef9pv3b9dXoJsf1TEEPwZ8pMueK6E+KDFTdOoHa0yyQlk+9n3f3BbFMqxnxdxShZ5KfJwJsdv6zMS9tBSF6abYwhfm+4NjXVxBj5U8Ie9TgvlhJ4haY9Wgr07GDZTluNedktz+K2p/I12mkQM7mGrtZJB3HL6C//WvEOg7IoJJ4Q1wHkZPIvTQNOdlKtP5avrLAmvY/N3dBmCxWlTj19mRgV3W6Dlf7Y/9aRVLorE85YtbmYkbu/uMdGNgiuks/mCJTTGFicFJFRstocNvr+TEX8b5vEiMCYD+JdONJi3IYQRN41cRrPpIR/TU= MIME-Version: 1.0 X-OriginatorOrg: aquantia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1892c580-65bd-4526-9f10-08d73228547a X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Sep 2019 17:41:49.6936 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 83e2e134-991c-4ede-8ced-34d47e38e6b1 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: O5QhZaFrOU3w3ueS7srHOuQc2wd8JJuZjiH8pN8wRiWS8vwmyun1gzT/CTC0rwo/Wci+t5vkTlQumJUO39KIDQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4SPR00MB057 Subject: [dpdk-dev] [PATCH 3/3] net/atlantic: add FW mailbox guard mutex X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Pavel Belous Driver uses the Firmware mailbox to read statistics and configure some features. This patch introduces a mutex to provide consistent access to the FW mailbox to prevent potential data corruption. Fixes: 86d36773bd42 ("net/atlantic: implement firmware operations") Signed-off-by: Pavel Belous --- drivers/net/atlantic/atl_ethdev.c | 4 ++ drivers/net/atlantic/atl_types.h | 2 + drivers/net/atlantic/hw_atl/hw_atl_utils_fw2x.c | 82 ++++++++++++++++++------- 3 files changed, 67 insertions(+), 21 deletions(-) diff --git a/drivers/net/atlantic/atl_ethdev.c b/drivers/net/atlantic/atl_ethdev.c index 1b9d514..1331b5f 100644 --- a/drivers/net/atlantic/atl_ethdev.c +++ b/drivers/net/atlantic/atl_ethdev.c @@ -410,6 +410,8 @@ eth_atl_dev_init(struct rte_eth_dev *eth_dev) hw->aq_nic_cfg = &adapter->hw_cfg; + pthread_mutex_init(&hw->mbox_mutex, NULL); + /* disable interrupt */ atl_disable_intr(hw); @@ -474,6 +476,8 @@ eth_atl_dev_uninit(struct rte_eth_dev *eth_dev) rte_free(eth_dev->data->mac_addrs); eth_dev->data->mac_addrs = NULL; + pthread_mutex_destroy(&hw->mbox_mutex); + return 0; } diff --git a/drivers/net/atlantic/atl_types.h b/drivers/net/atlantic/atl_types.h index 19aaf37..7d5b603 100644 --- a/drivers/net/atlantic/atl_types.h +++ b/drivers/net/atlantic/atl_types.h @@ -137,6 +137,8 @@ struct aq_hw_s { u32 rpc_addr; u32 rpc_tid; struct hw_aq_atl_utils_fw_rpc rpc; + + pthread_mutex_t mbox_mutex; }; struct aq_fw_ops { diff --git a/drivers/net/atlantic/hw_atl/hw_atl_utils_fw2x.c b/drivers/net/atlantic/hw_atl/hw_atl_utils_fw2x.c index 70d6e14..55dc728 100644 --- a/drivers/net/atlantic/hw_atl/hw_atl_utils_fw2x.c +++ b/drivers/net/atlantic/hw_atl/hw_atl_utils_fw2x.c @@ -6,6 +6,7 @@ */ #include +#include #include "../atl_hw_regs.h" #include "../atl_types.h" @@ -217,13 +218,15 @@ int aq_fw2x_get_mac_permanent(struct aq_hw_s *self, u8 *mac) u32 mac_addr[2] = { 0 }; u32 efuse_addr = aq_hw_read_reg(self, HW_ATL_FW2X_MPI_EFUSE_ADDR); + pthread_mutex_lock(&self->mbox_mutex); + if (efuse_addr != 0) { err = hw_atl_utils_fw_downld_dwords(self, efuse_addr + (40U * 4U), mac_addr, ARRAY_SIZE(mac_addr)); if (err) - return err; + goto exit; mac_addr[0] = rte_constant_bswap32(mac_addr[0]); mac_addr[1] = rte_constant_bswap32(mac_addr[1]); } @@ -252,6 +255,10 @@ int aq_fw2x_get_mac_permanent(struct aq_hw_s *self, u8 *mac) h >>= 8; mac[0] = (u8)(0xFFU & h); } + +exit: + pthread_mutex_unlock(&self->mbox_mutex); + return err; } @@ -261,6 +268,9 @@ static int aq_fw2x_update_stats(struct aq_hw_s *self) u32 mpi_opts = aq_hw_read_reg(self, HW_ATL_FW2X_MPI_CONTROL2_ADDR); u32 orig_stats_val = mpi_opts & BIT(CAPS_HI_STATISTICS); + + pthread_mutex_lock(&self->mbox_mutex); + /* Toggle statistics bit for FW to update */ mpi_opts = mpi_opts ^ BIT(CAPS_HI_STATISTICS); aq_hw_write_reg(self, HW_ATL_FW2X_MPI_CONTROL2_ADDR, mpi_opts); @@ -271,9 +281,15 @@ static int aq_fw2x_update_stats(struct aq_hw_s *self) BIT(CAPS_HI_STATISTICS)), 1U, 10000U); if (err) - return err; + goto exit; + + err = hw_atl_utils_update_stats(self); + +exit: + pthread_mutex_unlock(&self->mbox_mutex); + + return err; - return hw_atl_utils_update_stats(self); } static int aq_fw2x_get_temp(struct aq_hw_s *self, int *temp) @@ -283,6 +299,8 @@ static int aq_fw2x_get_temp(struct aq_hw_s *self, int *temp) u32 temp_val = mpi_opts & BIT(CAPS_HI_TEMPERATURE); u32 temp_res; + pthread_mutex_lock(&self->mbox_mutex); + /* Toggle statistics bit for FW to 0x36C.18 (CAPS_HI_TEMPERATURE) */ mpi_opts = mpi_opts ^ BIT(CAPS_HI_TEMPERATURE); aq_hw_write_reg(self, HW_ATL_FW2X_MPI_CONTROL2_ADDR, mpi_opts); @@ -298,6 +316,9 @@ static int aq_fw2x_get_temp(struct aq_hw_s *self, int *temp) &temp_res, sizeof(temp_res) / sizeof(u32)); + + pthread_mutex_unlock(&self->mbox_mutex); + if (err) return err; @@ -515,6 +536,8 @@ static int aq_fw2x_get_eeprom(struct aq_hw_s *self, int dev_addr, if ((self->caps_lo & BIT(CAPS_LO_SMBUS_READ)) == 0) return -EOPNOTSUPP; + pthread_mutex_lock(&self->mbox_mutex); + request.msg_id = 0; request.device_id = dev_addr; request.address = offset; @@ -526,7 +549,7 @@ static int aq_fw2x_get_eeprom(struct aq_hw_s *self, int dev_addr, sizeof(request) / sizeof(u32)); if (err < 0) - return err; + goto exit; /* Toggle 0x368.CAPS_LO_SMBUS_READ bit */ mpi_opts = aq_hw_read_reg(self, HW_ATL_FW2X_MPI_CONTROL_ADDR); @@ -541,17 +564,19 @@ static int aq_fw2x_get_eeprom(struct aq_hw_s *self, int dev_addr, 10U, 10000U); if (err < 0) - return err; + goto exit; err = hw_atl_utils_fw_downld_dwords(self, self->rpc_addr + sizeof(u32), &result, sizeof(result) / sizeof(u32)); if (err < 0) - return err; + goto exit; - if (result) - return -EIO; + if (result) { + err = -EIO; + goto exit; + } if (num_dwords) { err = hw_atl_utils_fw_downld_dwords(self, @@ -560,7 +585,7 @@ static int aq_fw2x_get_eeprom(struct aq_hw_s *self, int dev_addr, num_dwords); if (err < 0) - return err; + goto exit; } if (bytes_remains) { @@ -573,13 +598,16 @@ static int aq_fw2x_get_eeprom(struct aq_hw_s *self, int dev_addr, 1); if (err < 0) - return err; + goto exit; rte_memcpy((u8 *)data + len - bytes_remains, &val, bytes_remains); } - return 0; +exit: + pthread_mutex_unlock(&self->mbox_mutex); + + return err; } @@ -598,13 +626,15 @@ static int aq_fw2x_set_eeprom(struct aq_hw_s *self, int dev_addr, request.address = offset; request.length = len; + pthread_mutex_lock(&self->mbox_mutex); + /* Write SMBUS request to cfg memory */ err = hw_atl_utils_fw_upload_dwords(self, self->rpc_addr, (u32 *)(void *)&request, sizeof(request) / sizeof(u32)); if (err < 0) - return err; + goto exit; /* Write SMBUS data to cfg memory */ u32 num_dwords = len / sizeof(u32); @@ -617,7 +647,7 @@ static int aq_fw2x_set_eeprom(struct aq_hw_s *self, int dev_addr, num_dwords); if (err < 0) - return err; + goto exit; } if (bytes_remains) { @@ -633,7 +663,7 @@ static int aq_fw2x_set_eeprom(struct aq_hw_s *self, int dev_addr, 1); if (err < 0) - return err; + goto exit; } /* Toggle 0x368.CAPS_LO_SMBUS_WRITE bit */ @@ -648,7 +678,7 @@ static int aq_fw2x_set_eeprom(struct aq_hw_s *self, int dev_addr, 10U, 10000U); if (err < 0) - return err; + goto exit; /* Read status of write operation */ err = hw_atl_utils_fw_downld_dwords(self, self->rpc_addr + sizeof(u32), @@ -656,12 +686,17 @@ static int aq_fw2x_set_eeprom(struct aq_hw_s *self, int dev_addr, sizeof(result) / sizeof(u32)); if (err < 0) - return err; + goto exit; - if (result) - return -EIO; + if (result) { + err = -EIO; + goto exit; + } - return 0; +exit: + pthread_mutex_unlock(&self->mbox_mutex); + + return err; } static int aq_fw2x_send_macsec_request(struct aq_hw_s *self, @@ -677,13 +712,15 @@ static int aq_fw2x_send_macsec_request(struct aq_hw_s *self, if ((self->caps_lo & BIT(CAPS_LO_MACSEC)) == 0) return -EOPNOTSUPP; + pthread_mutex_lock(&self->mbox_mutex); + /* Write macsec request to cfg memory */ err = hw_atl_utils_fw_upload_dwords(self, self->rpc_addr, (u32 *)(void *)req, RTE_ALIGN(sizeof(*req) / sizeof(u32), sizeof(u32))); if (err < 0) - return err; + goto exit; /* Toggle 0x368.CAPS_LO_MACSEC bit */ mpi_opts = aq_hw_read_reg(self, HW_ATL_FW2X_MPI_CONTROL_ADDR); @@ -697,13 +734,16 @@ static int aq_fw2x_send_macsec_request(struct aq_hw_s *self, 1000U, 10000U); if (err < 0) - return err; + goto exit; /* Read status of write operation */ err = hw_atl_utils_fw_downld_dwords(self, self->rpc_addr + sizeof(u32), (u32 *)(void *)response, RTE_ALIGN(sizeof(*response) / sizeof(u32), sizeof(u32))); +exit: + pthread_mutex_unlock(&self->mbox_mutex); + return err; }