From patchwork Sat Mar 9 14:03:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Russkikh X-Patchwork-Id: 51003 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 806A22C39; Sat, 9 Mar 2019 15:03:29 +0100 (CET) Received: from NAM05-CO1-obe.outbound.protection.outlook.com (mail-eopbgr720043.outbound.protection.outlook.com [40.107.72.43]) by dpdk.org (Postfix) with ESMTP id A52CD27D; Sat, 9 Mar 2019 15:03:26 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=AQUANTIA1COM.onmicrosoft.com; s=selector1-aquantia-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=wABkk6GVQI7y28vBO2rYuZ8oKyYJ+NjFDgT7aPKXxmg=; b=ZlM8qDz4x0vwqQKlw8UgAZ0rP4jIddto+4qKNCy8NJ3awbCVx1aj5jQrSl2sNNDDxUkouKi/b2u0m//MzM0IjBZQyZZ38KeUOqW3kRiyjIUdnWeSqsasZj4kIkxBOAxDmpw7M7pPalKLjqMUmBPjrq6FoGE8IIVr1NtAdMuiOP4= Received: from DM6PR11MB3625.namprd11.prod.outlook.com (20.178.230.149) by DM6PR11MB2892.namprd11.prod.outlook.com (20.177.216.89) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1686.18; Sat, 9 Mar 2019 14:03:24 +0000 Received: from DM6PR11MB3625.namprd11.prod.outlook.com ([fe80::d145:a1f4:ed34:e31b]) by DM6PR11MB3625.namprd11.prod.outlook.com ([fe80::d145:a1f4:ed34:e31b%3]) with mapi id 15.20.1665.020; Sat, 9 Mar 2019 14:03:24 +0000 From: Igor Russkikh To: "dev@dpdk.org" CC: Pavel Belous , Igor Russkikh , "stable@dpdk.org" Thread-Topic: [PATCH v2 01/10] net/atlantic: fix negative error codes Thread-Index: AQHU1oDchocMPEhf+0WG/FcDpnc/cA== Date: Sat, 9 Mar 2019 14:03:24 +0000 Message-ID: <8b5751022a766644ba6abff9be929ffdd73e01cb.1552138867.git.igor.russkikh@aquantia.com> References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: HE1PR05CA0278.eurprd05.prod.outlook.com (2603:10a6:3:fc::30) To DM6PR11MB3625.namprd11.prod.outlook.com (2603:10b6:5:13a::21) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Igor.Russkikh@aquantia.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.17.1 x-originating-ip: [95.79.108.179] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 629f374c-8223-4aa1-3c58-08d6a497fec1 x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600127)(711020)(4605104)(2017052603328)(7153060)(7193020); SRVR:DM6PR11MB2892; x-ms-traffictypediagnostic: DM6PR11MB2892: x-microsoft-exchange-diagnostics: =?iso-8859-1?Q?1; DM6PR11MB2892; 23:6ob4RhVGCzjORlqQVExvzkCmYRdzBk95kUt3jQ9?= =?iso-8859-1?q?+255hvcgSWaHHcBavbzQ3kSC2?= =?iso-8859-1?q?5b5sKC5owb67muOoWFf3BdwtT3Rd/JaZ2Qtjddwj6jWij4Q0hIH?= =?iso-8859-1?q?XrKbuX/O9/bQV059YBZ1O5ijZkq+wF97R2Q7YUR/KqZQH+8Aw2h?= =?iso-8859-1?q?q4FxzPRgPbuDlHhwNZaq7oR8stiv93oRk/NMOpVgBiO5jk73kIQ?= =?iso-8859-1?q?960EQPm+MnvIloMKX+1uJY0cWvXakOZJgmOZ3axjjcSnMzP233A?= =?iso-8859-1?q?zIPCIaY9fOtcDYKeCwG2Qfr3cEXDXN9iDCiTeqf40oxX5qKgjAM?= =?iso-8859-1?q?ut2MLw+DD+k9lCpKa+LSwzZqCrKr+3naX1Re13iuNxQCp2lIYt7?= =?iso-8859-1?q?U1UP1V36AUBNnUzXZ6qTjC1KUFrLsNMUTPy5338QaT/Eb2QZGcS?= =?iso-8859-1?q?YOyGtPD+EuoblQtuwqwo1Y1ZIUexiQj+5u55CHorJIvW5if7wDa?= =?iso-8859-1?q?do1Hh4yV28fK1b75v8/3yfuyjCnMdqSrgQKBt+16w1672tKphPH?= =?iso-8859-1?q?DqUvKMuI7dKAyFf/AI9n6F+HIozA8b1Kam7781k/JfB2LrBGp8E?= =?iso-8859-1?q?9vwXFNM+O5lNI9MjnGDrMPxsm3BjvraX6U1QA9jL/TBZlJ0wS3A?= =?iso-8859-1?q?4qspP99k+FurGuqOrCQqiBehLoqh8r+Tg62O54/3aGcj2ed8jFu?= =?iso-8859-1?q?HLQXrsTKJ0hCZL44+8jr9Da7FeUtuRuQGzLs+cJ/8vgtabQKjAK?= =?iso-8859-1?q?RDpe8/DQNbmfSmLo2PkpHyu6LAa1Dn9uQg4JKJGD7KupR/p1g8B?= =?iso-8859-1?q?GvfeyoUSqMgDIIsZCOBTKs7oDQRDSyt3NvFEcQSJ/5sJGM6mIqU?= =?iso-8859-1?q?zHxxJvBcnPDv+LpkDMc+3eV6oc0JSbDTOqtwpF0aUSYFfDf3wzZ?= =?iso-8859-1?q?3nZFfm/ZIQgbYWQE4/rqPWgRZD4IhLQ/V3x6qeDmZjEyi8xoyyO?= =?iso-8859-1?q?KOYmCBknWMk71bJ+GqQ1zp2HmsmgSDc6CT4io3eIh+mTAp8dD4W?= =?iso-8859-1?q?ClEYPP7AVKRueQdwodueSr7BgFB6qFtBHFPn0YZhE+CT8y8l2vY?= =?iso-8859-1?q?ybPOxuZZ9NOfG1FfzbxA6vJeIKzn9yn+2JtPwIocSsGR0+WwMDj?= =?iso-8859-1?q?5Oa3aw2Hd3Uc4invxiHNya3Oe4M1lTQyktUgPGTacBU65oDQRGx?= =?iso-8859-1?q?jZ+RqMeM2D+l7m8UcstbRyHQVAxaHMWAd1NNP/7J8VP95NlIyT8?= =?iso-8859-1?q?c9famMlubmEhDogXEDlKOioqGrKpBRlI99OFUCqpYDItd3FjMXT?= =?iso-8859-1?q?CMMkKlCRpg7w8lPZ1v0pDygVk81u62kLb+RceWP0BuhzN5b0LA9?= =?iso-8859-1?q?MUqaep8p2k5f13iEy01Mh7Ayg/lc2FYukcev/royHwkhDR/Tudc?= =?iso-8859-1?q?xgIwkwiImfcwNF3RzQkm4Rx326B/VdKJZiwNadb85B1IKtOg=3D?= x-microsoft-antispam-prvs: x-forefront-prvs: 0971922F40 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(396003)(376002)(366004)(39850400004)(136003)(346002)(199004)(189003)(106356001)(5660300002)(6116002)(26005)(4326008)(99286004)(52116002)(2906002)(3846002)(76176011)(2351001)(105586002)(14454004)(102836004)(97736004)(476003)(68736007)(44832011)(386003)(186003)(486006)(11346002)(446003)(2616005)(6506007)(450100002)(25786009)(2501003)(86362001)(305945005)(7736002)(72206003)(8676002)(6486002)(256004)(118296001)(316002)(8936002)(66066001)(6436002)(81156014)(1730700003)(4744005)(53936002)(5640700003)(81166006)(50226002)(71190400001)(6916009)(54906003)(36756003)(71200400001)(478600001)(6512007); DIR:OUT; SFP:1101; SCL:1; SRVR:DM6PR11MB2892; H:DM6PR11MB3625.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: u92Ax0LPwMY+dzwPc4t6UUHo8c7rm6k+2ACslO7HDmRHXRIvsdnFzltIVawEqRBmG+y4PbEqFLpxkJORhlwVTJfUwPJEcVNDt61LmtA7QjUu1FA+nr2LiWbCGES9gvsien+gsoyi3DWg3p6N4nmPQVAbrXWlMwskqwfFhVRfSurcOHluniCUsdAvey341wq6XAxtFMK52c1Q/g+LgxbzBpcO1xAl249Kzk0zHco/jttdDcantq7RpwDrsVYYx0mBIOMBMeuHSL3CT5vt8A808xEK1JSGXa2PTJLsKwxPC1NlkVsVF39UXfzzKd48ash3piIL6cdXnwZXe6PF5eVYSFlZjh0qexNq3qR4n5MKcM/qzB6Gs9KQ+Q0NRs6L/8aeXh0dgIUT66ryr4pUJCmtXFWEgSnNYTDV8oT40lsB1Xw= MIME-Version: 1.0 X-OriginatorOrg: aquantia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 629f374c-8223-4aa1-3c58-08d6a497fec1 X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Mar 2019 14:03:24.4630 (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-Transport-CrossTenantHeadersStamped: DM6PR11MB2892 Subject: [dpdk-dev] [PATCH v2 01/10] net/atlantic: fix negative error codes 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" These are just convention breakage on rte_errno, no real harm from that. Cc: stable@dpdk.org Signed-off-by: Igor Russkikh Fixes: 2b1472d7150c ("net/atlantic: implement Tx path") --- drivers/net/atlantic/atl_rxtx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/atlantic/atl_rxtx.c b/drivers/net/atlantic/atl_rxtx.c index 40c913795c79..aea58c0d5b83 100644 --- a/drivers/net/atlantic/atl_rxtx.c +++ b/drivers/net/atlantic/atl_rxtx.c @@ -812,12 +812,12 @@ atl_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, ol_flags = m->ol_flags; if (m->nb_segs > AQ_HW_MAX_SEGS_SIZE) { - rte_errno = -EINVAL; + rte_errno = EINVAL; return i; } if (ol_flags & ATL_TX_OFFLOAD_NOTSUP_MASK) { - rte_errno = -ENOTSUP; + rte_errno = ENOTSUP; return i; } From patchwork Sat Mar 9 14:03:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Russkikh X-Patchwork-Id: 51004 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 26AE74C8F; Sat, 9 Mar 2019 15:03:31 +0100 (CET) Received: from NAM05-CO1-obe.outbound.protection.outlook.com (mail-eopbgr720043.outbound.protection.outlook.com [40.107.72.43]) by dpdk.org (Postfix) with ESMTP id 45456F94 for ; Sat, 9 Mar 2019 15:03:27 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=AQUANTIA1COM.onmicrosoft.com; s=selector1-aquantia-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=bZD5OGZvcupvG13kag5SM8drI6xAEwjhZjuz8xLRjoY=; b=lEHNW8EmOu/mv24tXaEjvMh/cqfzz8JlND7nZPiDpDN2KoW+fL1vvP2o+9zTaCO5pLcDHhQcUXZKricwi3rve6sLEIJvcn+1X8VqTj5wo4O8Yy4c7YVOt8TopKw2hT4Mi5a0reAJJE5ZFpUV/ahqfScYkLTaasC0V3xwrVqoTOI= Received: from DM6PR11MB3625.namprd11.prod.outlook.com (20.178.230.149) by DM6PR11MB2892.namprd11.prod.outlook.com (20.177.216.89) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1686.18; Sat, 9 Mar 2019 14:03:26 +0000 Received: from DM6PR11MB3625.namprd11.prod.outlook.com ([fe80::d145:a1f4:ed34:e31b]) by DM6PR11MB3625.namprd11.prod.outlook.com ([fe80::d145:a1f4:ed34:e31b%3]) with mapi id 15.20.1665.020; Sat, 9 Mar 2019 14:03:26 +0000 From: Igor Russkikh To: "dev@dpdk.org" CC: Pavel Belous , Igor Russkikh Thread-Topic: [PATCH v2 02/10] net/atlantic: remove unused variable Thread-Index: AQHU1oDdfX0aL3wYOECVUHq72SXqrQ== Date: Sat, 9 Mar 2019 14:03:26 +0000 Message-ID: <59452f9adb69bb2abeef105bf92606f68994dcb4.1552138867.git.igor.russkikh@aquantia.com> References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: HE1PR05CA0278.eurprd05.prod.outlook.com (2603:10a6:3:fc::30) To DM6PR11MB3625.namprd11.prod.outlook.com (2603:10b6:5:13a::21) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Igor.Russkikh@aquantia.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.17.1 x-originating-ip: [95.79.108.179] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 37e0ea3d-8111-4654-41df-08d6a497ffd2 x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600127)(711020)(4605104)(2017052603328)(7153060)(7193020); SRVR:DM6PR11MB2892; x-ms-traffictypediagnostic: DM6PR11MB2892: x-microsoft-exchange-diagnostics: =?iso-8859-1?Q?1; DM6PR11MB2892; 23:4rc9faiBZO4CbZLfjkabvTyaAMX6GMfr9sYY/Fs?= =?iso-8859-1?q?LRaYHsJj6zHiGvDbpyIWntHXT?= =?iso-8859-1?q?tsh1AcPNROe3z93xDgQR+oEpw8V9rJz3ihdfgo/6PvBoYrEI+tu?= =?iso-8859-1?q?2T99NqzwnmYe5Kdzc4IgHsHK1sKikNxekz3wrjBGJV3D9Bhlo+v?= =?iso-8859-1?q?wUsppwa06I2sGAeKd2UReGhIsd7KSHYv1HVEO2fb1lySKvru/9N?= =?iso-8859-1?q?M9GFoyTxahm1CpuzqPRtdHSQa3WD5yqa2zm7v/cJRJxFV31pVUW?= =?iso-8859-1?q?Jv1QZoau5Q+gzmF/b+XzJs9TZwUFOcv0xTZBeLsB1utfiIglOdv?= =?iso-8859-1?q?ppqPSgSaOuqGvjT1IDTiK8lc7E/zqK/B8/jMZq/FdFhpHItJq6O?= =?iso-8859-1?q?Iy29zCyIiiDtFPv9lRjdwBu9PUio2kST2LuE9LhBRUlx+pBqlkE?= =?iso-8859-1?q?0vUQjXXHc4PFqZRUp84JkX0UkP5TDaZkfIFa0MK47mgVoxvv9N1?= =?iso-8859-1?q?82ecn/ZiEt674bO9T2Z7Qeg5Uz5PIrqD+HEfOpi1tk5EEZfd7Nj?= =?iso-8859-1?q?fYLUawEfe7AlfY2bkefegfj/hCHsxc9yjSJcIY9IIXrdYv47swZ?= =?iso-8859-1?q?Aja2H6oTH5uVi0KNwS02bkSFxrt7aTwjwFIMOfZ3tQoevnIJRp+?= =?iso-8859-1?q?Dq6/Z/PbcmBbj7sWZBy2JI0wZmMLFtvDxoSdkbgIaPFJiXKp+i+?= =?iso-8859-1?q?bEP3Eig954MLjfUR3Q5QUBMJ9GZhvBQ083ts+8re8aHk7M6Vl9j?= =?iso-8859-1?q?+KVxWohKreoCZCSll/fE+FtKjA0peFwqx5kbG/j+qbZuCf1t4pc?= =?iso-8859-1?q?ctmLbvTphwsxzXD/lMl27bhx0nfbWkLRknCOHehMlIp+iusaw0a?= =?iso-8859-1?q?nbWUIy3DawQNxBihcO5x19+ISK8DGqKBs3AlyuSvfOVwue5gpAw?= =?iso-8859-1?q?mDL0yO+T+zBLueb4XGsNsPW2VJQd60N0yzcdFFqXu4TLP9LvLA0?= =?iso-8859-1?q?DbjniVVr8ULkH1rTu2Tgt645clpmqSIRgrMBj3XNKTEDZWPeN5s?= =?iso-8859-1?q?EkMqJRSuYrHPG3Svfbq3Nb6nxanfliygqg9xvqmoXrkBRf984gO?= =?iso-8859-1?q?IZX1RFb7O/xyyPExK+OETzNnrULUT2c4xpSpIE9Prmd+9+MZKnm?= =?iso-8859-1?q?k7hCFAnKRHylnqS1qD2AyVsIQGBja2MQCDkxwU6BfLUgh2XurU9?= =?iso-8859-1?q?XDckxiY77FYMZSOZh1QjE9jMmlqoy3MMSHAhu/O34i7v325n0Aw?= =?iso-8859-1?q?DFmtchlONi8Bnnjnqet7KAvQUGzMUpKVeXc6U1uiABuYa4unp94?= =?iso-8859-1?q?9EtkQcYtiKXzijyHBwyWHXacctLhPy+66U2rVj1VtUuWSRqivMs?= =?iso-8859-1?q?ZO59TxYoj0U43VIM9OnLcdyaeaqxaMQjbmGacQsMhDiqveiQLJ3?= =?iso-8859-1?q?NDMBtTcVZPaQV8DsVh8DoCWL1MQ=3D=3D?= x-microsoft-antispam-prvs: x-forefront-prvs: 0971922F40 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(396003)(376002)(366004)(39850400004)(136003)(346002)(199004)(189003)(106356001)(5660300002)(6116002)(26005)(4326008)(99286004)(52116002)(2906002)(3846002)(76176011)(107886003)(2351001)(105586002)(14454004)(102836004)(97736004)(476003)(68736007)(44832011)(386003)(186003)(486006)(11346002)(446003)(2616005)(6506007)(25786009)(2501003)(86362001)(305945005)(7736002)(72206003)(8676002)(6486002)(256004)(118296001)(316002)(8936002)(66066001)(6436002)(81156014)(1730700003)(53936002)(5640700003)(81166006)(50226002)(71190400001)(6916009)(54906003)(36756003)(71200400001)(478600001)(6512007); DIR:OUT; SFP:1101; SCL:1; SRVR:DM6PR11MB2892; H:DM6PR11MB3625.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: 2Bpi3OjYhbksFwAN3EpYvL7IsNJsIa5jv1litZF0B2qvHdZLVZ9WwWePtXZockMHmzpcvgyTSFFOAuj8sBNX7utbTVZrYnSSXiuzeqN6Lcu62nCvjMsoyt31Ns82s1sLAu/rFIpt4bkov8/QYoEbA/DnDlJRuiVTXew6PlqexVmQCWImeN4NunMr2NKUu3hmWac636JdFSNeZIQsjHXzhH+lp6ltq8DikxGRWDd6vvbrilVJO2asEM2kqsCkaUqqzTnIcKvhGOTFXpFauNPB5xnTQ2ezf2oYSgAAxW3VHbYSCL/Yk72cwa0PvqcOvmLGg8bj2Esg+r1TpzcNHXxmxKjbKnw8qqZxyliqzPYPZHqmE/SWY/vaxEDWdJAzZL1+a1wwkfagKzhkKXdsuuAGGi19UEIrA/EMgO+HmHAsLk0= MIME-Version: 1.0 X-OriginatorOrg: aquantia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 37e0ea3d-8111-4654-41df-08d6a497ffd2 X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Mar 2019 14:03:26.3233 (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-Transport-CrossTenantHeadersStamped: DM6PR11MB2892 Subject: [dpdk-dev] [PATCH v2 02/10] net/atlantic: remove unused variable 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" Found by coverity scan. Signed-off-by: Igor Russkikh --- drivers/net/atlantic/hw_atl/hw_atl_b0.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/net/atlantic/hw_atl/hw_atl_b0.c b/drivers/net/atlantic/hw_atl/hw_atl_b0.c index 9400e0edb999..53fd8e9f0237 100644 --- a/drivers/net/atlantic/hw_atl/hw_atl_b0.c +++ b/drivers/net/atlantic/hw_atl/hw_atl_b0.c @@ -31,7 +31,6 @@ static int hw_atl_b0_hw_qos_set(struct aq_hw_s *self) u32 tc = 0U; u32 buff_size = 0U; unsigned int i_priority = 0U; - bool is_rx_flow_control = false; /* TPS Descriptor rate init */ hw_atl_tps_tx_pkt_shed_desc_rate_curr_time_res_set(self, 0x0U); @@ -64,7 +63,6 @@ static int hw_atl_b0_hw_qos_set(struct aq_hw_s *self) /* QoS Rx buf size per TC */ tc = 0; - is_rx_flow_control = 0; buff_size = HW_ATL_B0_RXBUF_MAX; hw_atl_rpb_rx_pkt_buff_size_per_tc_set(self, buff_size, tc); @@ -76,9 +74,7 @@ static int hw_atl_b0_hw_qos_set(struct aq_hw_s *self) (buff_size * (1024U / 32U) * 50U) / 100U, tc); - hw_atl_rpb_rx_xoff_en_per_tc_set(self, - is_rx_flow_control ? 1U : 0U, - tc); + hw_atl_rpb_rx_xoff_en_per_tc_set(self, 0U, tc); /* QoS 802.1p priority -> TC mapping */ for (i_priority = 8U; i_priority--;) From patchwork Sat Mar 9 14:03:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Russkikh X-Patchwork-Id: 51005 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 07D5A4C95; Sat, 9 Mar 2019 15:03:33 +0100 (CET) Received: from NAM05-CO1-obe.outbound.protection.outlook.com (mail-eopbgr720087.outbound.protection.outlook.com [40.107.72.87]) by dpdk.org (Postfix) with ESMTP id 6D86F2C2F for ; Sat, 9 Mar 2019 15:03:29 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=AQUANTIA1COM.onmicrosoft.com; s=selector1-aquantia-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=g7Ii1gRIOIBRycrBzLHNcTdLlen0JqZJaBksU87ef44=; b=vu/fY1Vq4A8WBYeFV/Z4hkLgb4BSze42CA15U5sLgbWGneuTcPxAH8HnssBZEvhD+0yPBgKQorOv6TcQpSNTigSP70V9vMkNNbeQ5FHFlgtuo5/sqQ2JFC6AnATkzj5axUIeqnzFxJX8CbnbLk12C1ZTExqPDttju2ejTS8h+7A= Received: from DM6PR11MB3625.namprd11.prod.outlook.com (20.178.230.149) by DM6PR11MB2892.namprd11.prod.outlook.com (20.177.216.89) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1686.18; Sat, 9 Mar 2019 14:03:28 +0000 Received: from DM6PR11MB3625.namprd11.prod.outlook.com ([fe80::d145:a1f4:ed34:e31b]) by DM6PR11MB3625.namprd11.prod.outlook.com ([fe80::d145:a1f4:ed34:e31b%3]) with mapi id 15.20.1665.020; Sat, 9 Mar 2019 14:03:28 +0000 From: Igor Russkikh To: "dev@dpdk.org" CC: Pavel Belous , Igor Russkikh Thread-Topic: [PATCH v2 03/10] net/atlantic: extra checks for error codes Thread-Index: AQHU1oDejtsP81sFbkOt51GZEFCMdQ== Date: Sat, 9 Mar 2019 14:03:28 +0000 Message-ID: <925d69d6e50ad1df50e703bd5783e0da96dc8c77.1552138867.git.igor.russkikh@aquantia.com> References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: HE1PR05CA0278.eurprd05.prod.outlook.com (2603:10a6:3:fc::30) To DM6PR11MB3625.namprd11.prod.outlook.com (2603:10b6:5:13a::21) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Igor.Russkikh@aquantia.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.17.1 x-originating-ip: [95.79.108.179] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 3e998e3a-26b1-4fb4-0d2d-08d6a49800ed x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600127)(711020)(4605104)(2017052603328)(7153060)(7193020); SRVR:DM6PR11MB2892; x-ms-traffictypediagnostic: DM6PR11MB2892: x-microsoft-exchange-diagnostics: =?iso-8859-1?Q?1; DM6PR11MB2892; 23:jXhPKMmyFbaG0YoBEcmapX/KjFmrHdt0YfimjGQ?= =?iso-8859-1?q?gVJh12M2RxE4RRv+tDiHjlqZm?= =?iso-8859-1?q?Tv21PYK9LhEL9HF3VQ2tCayzAmCWlAEdcfX3qn2fTrEsuykpWhR?= =?iso-8859-1?q?V9MOnnSYSlCUAr4I9mXN2PfBXDu7IgmPKFWzWe9TD+RGZ+t/Wso?= =?iso-8859-1?q?2n7E6yRHAPNz+z/w4eKKbediDzD9uYsYV4FXRmuEdU6hEZujbtH?= =?iso-8859-1?q?9BHOKX14YqATvJ1FgztmPCVjGFxe/K7I2JKA8qMv6iuh/PI83bv?= =?iso-8859-1?q?WAWlX+JjAuXFeh/EeQUR6ltTyYQwU0BAkR0s4sMQaBAgVzzNW0q?= =?iso-8859-1?q?fmSOcvSxQOhUSEke6U0oeOKTBGx1O+72iGNKUisa5a9rmPZ64jK?= =?iso-8859-1?q?On528WGOmiBlRKTUe5Uwrz9XWYPpRRsKR1jwr5cWefEIISlHbVc?= =?iso-8859-1?q?JKY/unfviV3H6SjssCT0wSTLsAKt0u/fIGryEny3GP5WUVUbv1/?= =?iso-8859-1?q?F1Q1Ms6GCyU09Td/72aXUgZCV3lwuVkIJowgt1+z6ioW12IrwwN?= =?iso-8859-1?q?lidDK0qIAeeb50Dd3O+PS1LuYeIBtZA+zz9v4DwjqO+MOB4nWKr?= =?iso-8859-1?q?UxtrgMJe9kEK9QHGNg7aiDdliaKheAwQipvisFuGR8oPx224LuY?= =?iso-8859-1?q?bcb+u3aBRe/eOipVWNHm2spfllZmfF54OLyztbhwRNFf405aQL2?= =?iso-8859-1?q?osEzYctnqkmYRSDYwClMTTJ4KaJxncEvXeOYY/LiNYw3ZlJcUpJ?= =?iso-8859-1?q?vHWAliDdcDTa3TClFMgA6PWU1nSOrStYuiuqThYDBThXdnrLQOe?= =?iso-8859-1?q?bJYQvu1p3Hokjs7iOXZhBQwzzaBx4p1UIcZE4xf+S6hxAbNjc+L?= =?iso-8859-1?q?DSgY+E9fkxw/3wzH3dBgCvxmqzFXZRijKtDk6whQfT6Bk5wTArP?= =?iso-8859-1?q?DHENYrAbkw7JsTr3FWpE5bJy/wkz2GBft0VamxJbRgAcVfqeTUX?= =?iso-8859-1?q?HakAPHJLJq7PTGxHs10ArULptTn2qSYrmDafX/gGyNB7g5w6TbH?= =?iso-8859-1?q?kRHRdae8qdxUm28hMly3oBbiyax8rzBd4E2LelUDPO0qtfWdg23?= =?iso-8859-1?q?eai7qdj0qOFq/cv4UVnWKgqubIBrSz1FvvVCjmPdc52kq1WbIrm?= =?iso-8859-1?q?5j69tlRlcNYi/tz0gDSVsVxL4kbeBkSgINQHCLoE8AWNwJT3dEx?= =?iso-8859-1?q?nQrW50nkysdLjMhQUGg2KBbQTKHpIUi8jHPb2lIUJVw2v7anVHX?= =?iso-8859-1?q?1rDwu4pu3QyhPphifC3INlb3hEigiUXjvk61lJ/BvLFNq3ODU+X?= =?iso-8859-1?q?NI4Fy/Qx/mJK8kS5Ij4hgwUhAn8iyV/rGH5UEVvrax/MIJ8FCkz?= =?iso-8859-1?q?q3amwo5gwK1mSzQWRe+wKD8awXRxKvE2v1oRGpjT1XKBuO6xnU8?= =?iso-8859-1?q?Fd9dPVvQlMQYJ2gJQiN/WEm/0p/atwlQbhO+dbNH6YqYGNXM=3D?= x-microsoft-antispam-prvs: x-forefront-prvs: 0971922F40 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(396003)(376002)(366004)(39850400004)(136003)(346002)(199004)(189003)(106356001)(5660300002)(6116002)(26005)(4326008)(99286004)(52116002)(2906002)(3846002)(76176011)(107886003)(2351001)(105586002)(14454004)(102836004)(97736004)(476003)(68736007)(44832011)(386003)(186003)(486006)(11346002)(446003)(2616005)(6506007)(25786009)(2501003)(86362001)(305945005)(7736002)(72206003)(8676002)(6486002)(256004)(118296001)(316002)(8936002)(66066001)(6436002)(81156014)(1730700003)(4744005)(53936002)(5640700003)(81166006)(50226002)(71190400001)(6916009)(54906003)(36756003)(71200400001)(478600001)(6512007); DIR:OUT; SFP:1101; SCL:1; SRVR:DM6PR11MB2892; H:DM6PR11MB3625.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: sVoRfoA18k7uG1uUhWK71fMNJ51a6++ECn9l4eD9TRwGvOMNAp5Z6E4dedXWxUsI6kBX6aS09PK7kyouU0Bp8aEphXotwAqfoB0Ja5cx/jl4cHQxweSt6igjNltSP6SI4gucBHFo1sQ7hMEqnnUPCsr50U1bUrEI3U0s90cp/h4Jm19noLSVU7vHM5dZEbZCdpvACz6i7csHOFhQB+lAGwJ1buyX9wGlCDSE08gNqzoTt86fmMwbMaxM/N5nwsXXuuH9U0lpcuAHoq8Ia5Jzfgr7eoANWlVNWTboR3zYUWtc7lvBFrL7UaL0lO0nIMyTTvvxcsapVV9ri+Gkjh9yh3u9eICBHV7vIMRHDFmfp7RvYMZBPoF7VyjjOLuGoaftPhTyb+g7Y5leTNXrY4UPaCuNn3YPBkR9wDHj/jujLiA= MIME-Version: 1.0 X-OriginatorOrg: aquantia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3e998e3a-26b1-4fb4-0d2d-08d6a49800ed X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Mar 2019 14:03:28.1336 (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-Transport-CrossTenantHeadersStamped: DM6PR11MB2892 Subject: [dpdk-dev] [PATCH v2 03/10] net/atlantic: extra checks for error codes 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" Found by Coverity scan. Checks are useless because at these code places err is always zero. Signed-off-by: Igor Russkikh --- drivers/net/atlantic/hw_atl/hw_atl_utils.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/net/atlantic/hw_atl/hw_atl_utils.c b/drivers/net/atlantic/hw_atl/hw_atl_utils.c index f11093a50404..13f02b9f99c5 100644 --- a/drivers/net/atlantic/hw_atl/hw_atl_utils.c +++ b/drivers/net/atlantic/hw_atl/hw_atl_utils.c @@ -462,8 +462,6 @@ int hw_atl_utils_fw_rpc_wait(struct aq_hw_s *self, goto err_exit; } } while (sw.tid != fw.tid || 0xFFFFU == fw.len); - if (err < 0) - goto err_exit; if (rpc) { if (fw.len) { @@ -875,8 +873,7 @@ static int aq_fw1x_set_wol(struct aq_hw_s *self, bool wol_enabled, u8 *mac) } err = hw_atl_utils_fw_rpc_call(self, rpc_size); - if (err < 0) - goto err_exit; + err_exit: return err; } From patchwork Sat Mar 9 14:03:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Russkikh X-Patchwork-Id: 51006 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 E1D0E4CA9; Sat, 9 Mar 2019 15:03:34 +0100 (CET) Received: from NAM05-CO1-obe.outbound.protection.outlook.com (mail-eopbgr720088.outbound.protection.outlook.com [40.107.72.88]) by dpdk.org (Postfix) with ESMTP id BC1034C93; Sat, 9 Mar 2019 15:03:31 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=AQUANTIA1COM.onmicrosoft.com; s=selector1-aquantia-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=CAvHW3PobxJ9ecLtd9m6eO1s5nLpGGx1XnR0ZRy43SY=; b=HBNPckPF2vO1no0g29gkhkMF5frxc9q/PRafd6p8tOztHA8gT8cZttJpulhOHNzhZmwDXjjSnYIGRZcTkib+sxd7RUIrNztGVRTT3vl/ZrPva0HDTu6hIUluBGp3FM7oGFXMfYVWXWrJHRRfkl2BimKTCG8AjS9Pww7C/MRV/54= Received: from DM6PR11MB3625.namprd11.prod.outlook.com (20.178.230.149) by DM6PR11MB2892.namprd11.prod.outlook.com (20.177.216.89) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1686.18; Sat, 9 Mar 2019 14:03:30 +0000 Received: from DM6PR11MB3625.namprd11.prod.outlook.com ([fe80::d145:a1f4:ed34:e31b]) by DM6PR11MB3625.namprd11.prod.outlook.com ([fe80::d145:a1f4:ed34:e31b%3]) with mapi id 15.20.1665.020; Sat, 9 Mar 2019 14:03:30 +0000 From: Igor Russkikh To: "dev@dpdk.org" CC: Pavel Belous , Igor Russkikh , "stable@dpdk.org" , Pavel Belous Thread-Topic: [PATCH v2 04/10] net/atlantic: fix buffer overflow Thread-Index: AQHU1oDgF1zF5O8EcEq7UzfKsv+Law== Date: Sat, 9 Mar 2019 14:03:30 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: HE1PR05CA0278.eurprd05.prod.outlook.com (2603:10a6:3:fc::30) To DM6PR11MB3625.namprd11.prod.outlook.com (2603:10b6:5:13a::21) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Igor.Russkikh@aquantia.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.17.1 x-originating-ip: [95.79.108.179] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 25faaeb8-dc9b-45f6-3e9e-08d6a4980243 x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600127)(711020)(4605104)(2017052603328)(7153060)(7193020); SRVR:DM6PR11MB2892; x-ms-traffictypediagnostic: DM6PR11MB2892: x-microsoft-exchange-diagnostics: =?iso-8859-1?Q?1; DM6PR11MB2892; 23:IxolDbZXOtYIpksTCLUhF51yO7iY/rsb6L8EJb0?= =?iso-8859-1?q?u1tN4SKgKvK407dCdSOcfb2vK?= =?iso-8859-1?q?Ctf7avIOsfY7bjvpj+tncbT+1OebWmiwdf8BaQHisYu7Ec9uCtY?= =?iso-8859-1?q?9cIMZjLD4T63YQdSky133Pyegix3AHImTwq43gWEbCDT8utAWqt?= =?iso-8859-1?q?RG/v8Hcs/0RAjRJaAzwA03mOVCIbr/i2y7se43pzEg/LnUwghmf?= =?iso-8859-1?q?0KdJRTdyC/rCYiW7mDQ3KLITGtUrCHqvIR0oVRHQLrAWj3PYI5A?= =?iso-8859-1?q?e4Gr6ro97UOBqppNx51WtgRuIPoateNyaKBRilky9ZziErc+JuK?= =?iso-8859-1?q?FMoG32rH0vB+GwRMLt+CXxam+w0FB9z5T1b2dvYdZhcwkd5Kcs0?= =?iso-8859-1?q?3EkdY/qOALBtScDSz97oqZYQy6+1je4JojtQW0iMXX+q9miRub3?= =?iso-8859-1?q?m6v0lUR/nQZkMKto6eBKhBTOC2avsC1RaD/58VPHZdtNec/voTP?= =?iso-8859-1?q?V03OPJTDhj8kifY9RBHQZVcS/V7A4G0A5tRnx1Q5ORsvjFaW32u?= =?iso-8859-1?q?6mjz1ucyl54Jz85k/+s4lUQwrUo5RtVgHKmrgxFAkgCqs+4lv7w?= =?iso-8859-1?q?NsrSeWQMALs0vG4HylY2mqinawPA2jjvrLUyPmLIKHAvXzQzrJY?= =?iso-8859-1?q?TDspsNj23odmnOWN9c/Yi5VZM7uP3Mby2afgI1V1Lly3lA6mgIU?= =?iso-8859-1?q?3cwWQW7YZyGRvZBN766N2tGqSkr/4IXs5sqfgPPER9OoZOZRYgo?= =?iso-8859-1?q?Wmi44aeuYameU/BPKc87M5TN562G+F99OP6q4b6u2+mMIaAtnbm?= =?iso-8859-1?q?O5SZqveaTTSFgN5hv/L7RrMrs6Sugn9DD+CRld5a4/IkI1Fb/b1?= =?iso-8859-1?q?46j5echYqc4Lf+Lf8iu94iyDa3LECickRFkC7Bq346g82L6giMD?= =?iso-8859-1?q?GTjxzRbA585Je86cQSvd1YCyGjclOSJbBl28/eOjSkcjenfs82h?= =?iso-8859-1?q?w5WQfveKIsMRPepvNjmofCKqczkO8rj/kgxKtJP2j/139lFSP7w?= =?iso-8859-1?q?kyZ5MJM4lS4TGjhHBfpI+dzYqpCEOVxGaO3zgShyGrjV72zslye?= =?iso-8859-1?q?4BJo/RmBLKjuGHs53n/7wu3KvPVlfX6j7Z5f1r6iNPm63J0KtAu?= =?iso-8859-1?q?rMAdR6vZjJBwlAOOXfudehLSJYnzGLLMe1aqAPZP72Y1f5t/V9l?= =?iso-8859-1?q?2OTtRnLsNyLSbFmBZMbGNpjrAcKOIWK+7g0K6+DC4WAc8N67fyE?= =?iso-8859-1?q?ZvBC5yX25EtqZktgqrExfMFh0xE3TpPO+KO4BjmCKw0c/p4phPW?= =?iso-8859-1?q?sRribU/89f900SIvQlFkg34gMa8YGphQA8+3kLve5dR12BnSqJS?= =?iso-8859-1?q?b5FAs54WJ801HqjrvNhQbFwoTLHdwCCMpVvWCmy7q1N+4ti/qnp?= =?iso-8859-1?q?UGbY1Z9CjRao4d1OCAoCKvNS97ldJq2dSplXF2mCOy7xsc6nYp5?= =?iso-8859-1?q?XJAyltynQmhx5XlvOn?= x-microsoft-antispam-prvs: x-forefront-prvs: 0971922F40 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(396003)(376002)(366004)(39850400004)(136003)(346002)(199004)(189003)(106356001)(5660300002)(6116002)(26005)(4326008)(99286004)(52116002)(2906002)(3846002)(76176011)(107886003)(2351001)(105586002)(14454004)(102836004)(97736004)(476003)(68736007)(44832011)(386003)(186003)(486006)(11346002)(446003)(2616005)(6506007)(450100002)(25786009)(2501003)(86362001)(305945005)(7736002)(14444005)(72206003)(8676002)(6486002)(256004)(118296001)(316002)(8936002)(66066001)(6436002)(81156014)(1730700003)(53936002)(5640700003)(81166006)(50226002)(71190400001)(6916009)(54906003)(36756003)(71200400001)(478600001)(6512007); DIR:OUT; SFP:1101; SCL:1; SRVR:DM6PR11MB2892; H:DM6PR11MB3625.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: SMUIXzy2+GPaRLD+2Rhcfl6EAge7zZpjQdzMpS2fco7EFL9RLrLTZ+Wgm5mztmawCfwlf8xoUMQWOkz80YoDA9o4R1TJtPr7hC558NCiP8VHNjmGkOGiAEDbSZmN9zA0n5I5ZEGoY733VSweGKZm1Y4lAQ2Sy5qIYnsMwAP/mpQ2fGBAKV/gnzEMKYAHRHfsN6U1sDWZ4qk3npZaJJ3LAnyIY5qrju5Fu8PyTAbVf5ltlYQwjUZ+JguckG8bVAztIK/HAB3COYSrjS4gk577t1J9KUx/VBHI0Qucp16ZVIhlaoH+SE1jMbK0Jfv/EFK9U/Q53eLV+G3SlCSlDRJhm1d4HAjJN5/0v2IvKEKPBFtuqZvswHWxk3Ji+wZUO5R2Gmsz4HHNRrT0E2Ma/8/y5K0xpa2c6RdRG2rW7WACsJs= MIME-Version: 1.0 X-OriginatorOrg: aquantia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 25faaeb8-dc9b-45f6-3e9e-08d6a4980243 X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Mar 2019 14:03:30.3142 (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-Transport-CrossTenantHeadersStamped: DM6PR11MB2892 Subject: [dpdk-dev] [PATCH v2 04/10] net/atlantic: fix buffer overflow 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 Found by Coverity scan. This is a real memory corruption. There is no need in extra RTE_ALIGN macros since the request/result structures are 4-byte aligned by definition. Cc: stable@dpdk.org Fixes: ce4e8d418097 ("net/atlantic: implement EEPROM get/set") Signed-off-by: Igor Russkikh Signed-off-by: Pavel Belous --- drivers/net/atlantic/hw_atl/hw_atl_utils_fw2x.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 6841d9bce39c..f90ccfe9e010 100644 --- a/drivers/net/atlantic/hw_atl/hw_atl_utils_fw2x.c +++ b/drivers/net/atlantic/hw_atl/hw_atl_utils_fw2x.c @@ -501,7 +501,7 @@ static int aq_fw2x_get_eeprom(struct aq_hw_s *self, u32 *data, u32 len) /* Write SMBUS request to cfg memory */ err = hw_atl_utils_fw_upload_dwords(self, self->rpc_addr, (u32 *)(void *)&request, - RTE_ALIGN(sizeof(request), sizeof(u32))); + sizeof(request) / sizeof(u32)); if (err < 0) return err; @@ -523,7 +523,7 @@ static int aq_fw2x_get_eeprom(struct aq_hw_s *self, u32 *data, u32 len) err = hw_atl_utils_fw_downld_dwords(self, self->rpc_addr + sizeof(u32), &result, - RTE_ALIGN(sizeof(result), sizeof(u32))); + sizeof(result) / sizeof(u32)); if (err < 0) return err; @@ -558,7 +558,7 @@ static int aq_fw2x_set_eeprom(struct aq_hw_s *self, u32 *data, u32 len) /* Write SMBUS request to cfg memory */ err = hw_atl_utils_fw_upload_dwords(self, self->rpc_addr, (u32 *)(void *)&request, - RTE_ALIGN(sizeof(request), sizeof(u32))); + sizeof(request) / sizeof(u32)); if (err < 0) return err; @@ -589,7 +589,7 @@ static int aq_fw2x_set_eeprom(struct aq_hw_s *self, u32 *data, u32 len) /* Read status of write operation */ err = hw_atl_utils_fw_downld_dwords(self, self->rpc_addr + sizeof(u32), &result, - RTE_ALIGN(sizeof(result), sizeof(u32))); + sizeof(result) / sizeof(u32)); if (err < 0) return err; From patchwork Sat Mar 9 14:03:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Russkikh X-Patchwork-Id: 51007 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 A603A4CC7; Sat, 9 Mar 2019 15:03:36 +0100 (CET) Received: from NAM05-CO1-obe.outbound.protection.outlook.com (mail-eopbgr720041.outbound.protection.outlook.com [40.107.72.41]) by dpdk.org (Postfix) with ESMTP id B5C734C9D for ; Sat, 9 Mar 2019 15:03:33 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=AQUANTIA1COM.onmicrosoft.com; s=selector1-aquantia-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=pjKaQt8T7Hblhhup1hF4r+xHHP5oQwVyFLFOZsst5vc=; b=He5B3WLVloY7AVFMPcFOzwieb/Q2FF4EOLcvwLL3hs59B2GEHt/Jxh2KCsoEHeToplbSkvt+f0Prp2viE3QSXVs+SIf9XCC1IufBRLghJQmViumdFHHgbjEeMLhHTILHfJ1mYilrnBqvyttvFabu40JphTWjr/DHPeKOfgkVubo= Received: from DM6PR11MB3625.namprd11.prod.outlook.com (20.178.230.149) by DM6PR11MB2892.namprd11.prod.outlook.com (20.177.216.89) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1686.18; Sat, 9 Mar 2019 14:03:32 +0000 Received: from DM6PR11MB3625.namprd11.prod.outlook.com ([fe80::d145:a1f4:ed34:e31b]) by DM6PR11MB3625.namprd11.prod.outlook.com ([fe80::d145:a1f4:ed34:e31b%3]) with mapi id 15.20.1665.020; Sat, 9 Mar 2019 14:03:32 +0000 From: Igor Russkikh To: "dev@dpdk.org" CC: Pavel Belous , Igor Russkikh , Pavel Belous Thread-Topic: [PATCH v2 05/10] net/atlantic: use EEPROM magic as a device address Thread-Index: AQHU1oDhm9gI+iTg9UO1nlvQyhN0hA== Date: Sat, 9 Mar 2019 14:03:32 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: HE1PR05CA0278.eurprd05.prod.outlook.com (2603:10a6:3:fc::30) To DM6PR11MB3625.namprd11.prod.outlook.com (2603:10b6:5:13a::21) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Igor.Russkikh@aquantia.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.17.1 x-originating-ip: [95.79.108.179] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 8b32d83f-e609-47a7-83dd-08d6a4980370 x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600127)(711020)(4605104)(2017052603328)(7153060)(7193020); SRVR:DM6PR11MB2892; x-ms-traffictypediagnostic: DM6PR11MB2892: x-microsoft-exchange-diagnostics: =?iso-8859-1?Q?1; DM6PR11MB2892; 23:a2x0NLL6LTsuSzsX22grU2RuLZff3GBu8yOptNP?= =?iso-8859-1?q?HG97m2/nuGcwbXtBVaj397Sah?= =?iso-8859-1?q?2zYshau36mnHHesRIgcf84uvB4z1lUptOovXA6lq+V8cbV6i4qk?= =?iso-8859-1?q?fUGjL9PBn4JDCTLhQx5og8bcdiCVk8jAMo0TGHI1Yhv3TYI3j9I?= =?iso-8859-1?q?VYsaQo7Tr8pD1EBc9nFVv82wuPvE+f+muBSzEdDiDTBnPMEqtMO?= =?iso-8859-1?q?QT5NPb2LREJgbEGuRyeUzhbDcFr/0caWsQ4sgVNfcwO7/zLKLkl?= =?iso-8859-1?q?tbk6U9dKpV0x1q2czNwrXls6e45fRP7Zuz95enAR+bBInAJhhdX?= =?iso-8859-1?q?q+hR/gOIa1LmjWC2FRJBdieoEcXqm7LdMIYxSK6zLxpGOfBbKzk?= =?iso-8859-1?q?4zatcKDgmx9Zgd1/YwU1zeuBOaDClCrh/u3irgTcTgDM5Z1uPxp?= =?iso-8859-1?q?58vgHOAXPhk3b0dLAFzaP+QlsREl5sFxT9koH6Tm1FqH3nj0ASy?= =?iso-8859-1?q?0TmO/QfHFOwOlPl5SWlAuCAGrPgyv8YV8VnG3MyfCo+Ul5a3JjZ?= =?iso-8859-1?q?/AU3ZLy5g4LeU1G2IKLle0og9pJYBgjunDzm5fNOXPpP3137rlT?= =?iso-8859-1?q?/YbjddR/tdEHD40RSnlPHyCLPPQtTB7Ea8JAFl3IQIeimZPbBmq?= =?iso-8859-1?q?pIXKWkkjJDkc79GhiEJ4l9QXlWa+GMFggoMqF7CUE3RniJudDUN?= =?iso-8859-1?q?VvN6l1nC/iKsxJyCn4Afg0aHdjAEiiLdbDHwj1P/eqi3jx5ECxQ?= =?iso-8859-1?q?YFQgupnTXr0I/EJAMwsyUZdMS5ZowLzINsZYiT9AJ3sTP+B2lC3?= =?iso-8859-1?q?TvgfZqaoof1kvidC2HGX1vx4yiecb6YgkAE+837X2G3RgRO4kNo?= =?iso-8859-1?q?639DeAUK4ZnHp8mRHhURS28L57YGHJSfikgZIOyCBCY7Gc8UG8/?= =?iso-8859-1?q?f1uixWSFWWKLgZU9wFKfToF5YUHqnHzn5zafwag8Y8DZBpgAW4B?= =?iso-8859-1?q?7yu87QlM0Yz3wkTQVc7sd69ZhTFPyVGr93M4R3XcaEW63/HTOt6?= =?iso-8859-1?q?O8GBSq0LAH7UrGSgVdzsF0Ty5ELDegzAtHNVbKacrw5Ju+lWirI?= =?iso-8859-1?q?fy76ND9kJVxTyzN5xb5zBtbXPmU9Gsf3RiKWCFPkNt8TwrkfeDu?= =?iso-8859-1?q?MS/quf3SuW3pyVk833k6DoZyccmGRQbkfc06Yc2Th2Ui3GWBZPQ?= =?iso-8859-1?q?4kwDMewE1LjKZqrvi+CXZzf9AFb36bnNfpZWK6M+WL2CMUuviNC?= =?iso-8859-1?q?PPnddT+O2oFlZ5vcV//u1a3Lt3686QEZbNvA0CJqq0UhoUQvn2h?= =?iso-8859-1?q?X3S6GLCGR7t64rhrzbg2twxgI+eYzYYRHExGMcVmeJIwWvOAiEG?= =?iso-8859-1?q?jxVFbXZBh4CnhkW68tzNym8pAHAFyb3VFWGbzn+EImJm4hfr8Q5?= =?iso-8859-1?q?m8L+aqeCIfcixtnZKrpgxs5WDgRucUx1WL/D3J2v4IVjo5+A=3D?= x-microsoft-antispam-prvs: x-forefront-prvs: 0971922F40 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(396003)(376002)(366004)(39850400004)(136003)(346002)(199004)(189003)(106356001)(5660300002)(6116002)(26005)(4326008)(99286004)(52116002)(2906002)(3846002)(76176011)(107886003)(2351001)(105586002)(14454004)(102836004)(97736004)(476003)(68736007)(44832011)(386003)(186003)(486006)(11346002)(446003)(2616005)(6506007)(25786009)(2501003)(86362001)(305945005)(7736002)(14444005)(72206003)(8676002)(6486002)(256004)(118296001)(316002)(8936002)(66066001)(6436002)(81156014)(1730700003)(53936002)(5640700003)(81166006)(50226002)(71190400001)(6916009)(54906003)(36756003)(71200400001)(478600001)(6512007); DIR:OUT; SFP:1101; SCL:1; SRVR:DM6PR11MB2892; H:DM6PR11MB3625.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: K/1VXSliw4c8+JisN/k51/CESBUDxsJe0X8PJn0+zf1Um4b33dyQNT7R1g1gPCMRMgGwHEqrS4o7WY6Qn+6OmlQCTGwLmbWq2cvjPBNvBJ/IdYg5imaa7YYw1yeugP0HpPsMmZzUSOmROuG998U45DD4VqY3li8E07KF6YHLb8VWjafaZZ4prX4jjZqzC00Nd+Vvub3rMg5OVWdlyyu8E9oCvvVPl06JqTVt2nIajOC2UVgQhuYyGPQzT+LUlcE7wc2muEfothOmhhR2mY/Ch+w0EgqEFl9DtnIYvwNKb/pBikPfE3dV05zszMO8h9n3zPi1VdNYOeOPbmluSXznqEpSXtKC5RA3S3Zc0ZktkGA4pZ2duN32ZeFNUj5MUrZT6kNL562arxj6fz/Y2fsHZDBiUWkcgZXe6bcllWfK2N0= MIME-Version: 1.0 X-OriginatorOrg: aquantia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8b32d83f-e609-47a7-83dd-08d6a4980370 X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Mar 2019 14:03:32.2916 (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-Transport-CrossTenantHeadersStamped: DM6PR11MB2892 Subject: [dpdk-dev] [PATCH v2 05/10] net/atlantic: use EEPROM magic as a device address 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 Default dev addr is replaced with magic field from the request. Length is allowed to be less than maximum. SMBUS access bit definitions also better organised now. Signed-off-by: Igor Russkikh Signed-off-by: Pavel Belous --- drivers/net/atlantic/atl_ethdev.c | 24 +++++++++++----- drivers/net/atlantic/atl_types.h | 7 +++-- drivers/net/atlantic/hw_atl/hw_atl_utils.c | 4 +++ drivers/net/atlantic/hw_atl/hw_atl_utils.h | 23 ++++++++------- .../net/atlantic/hw_atl/hw_atl_utils_fw2x.c | 28 +++++++++++-------- 5 files changed, 56 insertions(+), 30 deletions(-) diff --git a/drivers/net/atlantic/atl_ethdev.c b/drivers/net/atlantic/atl_ethdev.c index 5bc04f55cc21..925f9722ec66 100644 --- a/drivers/net/atlantic/atl_ethdev.c +++ b/drivers/net/atlantic/atl_ethdev.c @@ -1102,24 +1102,30 @@ atl_dev_get_eeprom_length(struct rte_eth_dev *dev __rte_unused) return SFP_EEPROM_SIZE; } -static int -atl_dev_get_eeprom(struct rte_eth_dev *dev, struct rte_dev_eeprom_info *eeprom) +int atl_dev_get_eeprom(struct rte_eth_dev *dev, + struct rte_dev_eeprom_info *eeprom) { struct aq_hw_s *hw = ATL_DEV_PRIVATE_TO_HW(dev->data->dev_private); + uint32_t dev_addr = SMBUS_DEVICE_ID; if (hw->aq_fw_ops->get_eeprom == NULL) return -ENOTSUP; - if (eeprom->length != SFP_EEPROM_SIZE || eeprom->data == NULL) + if (eeprom->length > SFP_EEPROM_SIZE || eeprom->data == NULL) return -EINVAL; - return hw->aq_fw_ops->get_eeprom(hw, eeprom->data, eeprom->length); + if (eeprom->magic) + dev_addr = eeprom->magic; + + return hw->aq_fw_ops->get_eeprom(hw, dev_addr, eeprom->data, + eeprom->length); } -static int -atl_dev_set_eeprom(struct rte_eth_dev *dev, struct rte_dev_eeprom_info *eeprom) +int atl_dev_set_eeprom(struct rte_eth_dev *dev, + struct rte_dev_eeprom_info *eeprom) { struct aq_hw_s *hw = ATL_DEV_PRIVATE_TO_HW(dev->data->dev_private); + uint32_t dev_addr = SMBUS_DEVICE_ID; if (hw->aq_fw_ops->set_eeprom == NULL) return -ENOTSUP; @@ -1127,7 +1133,11 @@ atl_dev_set_eeprom(struct rte_eth_dev *dev, struct rte_dev_eeprom_info *eeprom) if (eeprom->length != SFP_EEPROM_SIZE || eeprom->data == NULL) return -EINVAL; - return hw->aq_fw_ops->set_eeprom(hw, eeprom->data, eeprom->length); + if (eeprom->magic) + dev_addr = eeprom->magic; + + return hw->aq_fw_ops->set_eeprom(hw, dev_addr, + eeprom->data, eeprom->length); } static int diff --git a/drivers/net/atlantic/atl_types.h b/drivers/net/atlantic/atl_types.h index 3d90f6caefc2..46628dc0464d 100644 --- a/drivers/net/atlantic/atl_types.h +++ b/drivers/net/atlantic/atl_types.h @@ -137,9 +137,12 @@ struct aq_fw_ops { int (*led_control)(struct aq_hw_s *self, u32 mode); - int (*get_eeprom)(struct aq_hw_s *self, u32 *data, u32 len); + int (*get_eeprom)(struct aq_hw_s *self, int dev_addr, + u32 *data, u32 len); + + int (*set_eeprom)(struct aq_hw_s *self, int dev_addr, + u32 *data, u32 len); - int (*set_eeprom)(struct aq_hw_s *self, u32 *data, u32 len); }; struct atl_sw_stats { diff --git a/drivers/net/atlantic/hw_atl/hw_atl_utils.c b/drivers/net/atlantic/hw_atl/hw_atl_utils.c index 13f02b9f99c5..4299b7016e2f 100644 --- a/drivers/net/atlantic/hw_atl/hw_atl_utils.c +++ b/drivers/net/atlantic/hw_atl/hw_atl_utils.c @@ -305,6 +305,10 @@ int hw_atl_utils_fw_downld_dwords(struct aq_hw_s *self, u32 a, AQ_HW_WAIT_FOR(!(0x100 & aq_hw_read_reg(self, HW_ATL_MIF_CMD)), 1, 1000U); + if (err) { + err = -ETIMEDOUT; + goto err_exit; + } *(p++) = aq_hw_read_reg(self, HW_ATL_MIF_VAL); a += 4; diff --git a/drivers/net/atlantic/hw_atl/hw_atl_utils.h b/drivers/net/atlantic/hw_atl/hw_atl_utils.h index 5f3f70847310..f2a87826c0d1 100644 --- a/drivers/net/atlantic/hw_atl/hw_atl_utils.h +++ b/drivers/net/atlantic/hw_atl/hw_atl_utils.h @@ -8,6 +8,7 @@ #ifndef HW_ATL_UTILS_H #define HW_ATL_UTILS_H +#define BIT(x) (1UL << (x)) #define HW_ATL_FLUSH() { (void)aq_hw_read_reg(self, 0x10); } /* Hardware tx descriptor */ @@ -389,18 +390,8 @@ enum hal_atl_utils_fw_state_e { #define HAL_ATLANTIC_UTILS_FW_MSG_OFFLOAD_DEL 10U #define HAL_ATLANTIC_UTILS_FW_MSG_CABLE_DIAG 13U // 0xd -#define SMBUS_READ_REQUEST BIT(13) -#define SMBUS_WRITE_REQUEST BIT(14) #define SMBUS_DEVICE_ID 0x50 -enum hw_atl_fw2x_rate { - FW2X_RATE_100M = 0x20, - FW2X_RATE_1G = 0x100, - FW2X_RATE_2G5 = 0x200, - FW2X_RATE_5G = 0x400, - FW2X_RATE_10G = 0x800, -}; - enum hw_atl_fw2x_caps_lo { CAPS_LO_10BASET_HD = 0x00, CAPS_LO_10BASET_FD, @@ -414,6 +405,10 @@ enum hw_atl_fw2x_caps_lo { CAPS_LO_2P5GBASET_FD, CAPS_LO_5GBASET_FD, CAPS_LO_10GBASET_FD, + CAPS_LO_AUTONEG, + CAPS_LO_SMBUS_READ, + CAPS_LO_SMBUS_WRITE, + CAPS_LO_MACSEC }; enum hw_atl_fw2x_caps_hi { @@ -451,6 +446,14 @@ enum hw_atl_fw2x_caps_hi { CAPS_HI_TRANSACTION_ID, }; +enum hw_atl_fw2x_rate { + FW2X_RATE_100M = BIT(CAPS_LO_100BASETX_FD), + FW2X_RATE_1G = BIT(CAPS_LO_1000BASET_FD), + FW2X_RATE_2G5 = BIT(CAPS_LO_2P5GBASET_FD), + FW2X_RATE_5G = BIT(CAPS_LO_5GBASET_FD), + FW2X_RATE_10G = BIT(CAPS_LO_10GBASET_FD), +}; + struct aq_hw_s; struct aq_fw_ops; struct aq_hw_link_status_s; 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 f90ccfe9e010..78ca1eb1faaa 100644 --- a/drivers/net/atlantic/hw_atl/hw_atl_utils_fw2x.c +++ b/drivers/net/atlantic/hw_atl/hw_atl_utils_fw2x.c @@ -129,7 +129,11 @@ static u32 fw2x_to_eee_mask(u32 speed) static int aq_fw2x_set_link_speed(struct aq_hw_s *self, u32 speed) { - u32 val = link_speed_mask_2fw2x_ratemask(speed); + u32 rate_mask = link_speed_mask_2fw2x_ratemask(speed); + u32 reg_val = aq_hw_read_reg(self, HW_ATL_FW2X_MPI_CONTROL_ADDR); + u32 val = rate_mask | ((BIT(CAPS_LO_SMBUS_READ) | + BIT(CAPS_LO_SMBUS_WRITE) | + BIT(CAPS_LO_MACSEC)) & reg_val); aq_hw_write_reg(self, HW_ATL_FW2X_MPI_CONTROL_ADDR, val); @@ -484,7 +488,8 @@ static int aq_fw2x_led_control(struct aq_hw_s *self, u32 mode) return 0; } -static int aq_fw2x_get_eeprom(struct aq_hw_s *self, u32 *data, u32 len) +static int aq_fw2x_get_eeprom(struct aq_hw_s *self, int dev_addr, + u32 *data, u32 len) { int err = 0; struct smbus_read_request request; @@ -494,7 +499,7 @@ static int aq_fw2x_get_eeprom(struct aq_hw_s *self, u32 *data, u32 len) if (self->fw_ver_actual < HW_ATL_FW_FEATURE_EEPROM) return -EOPNOTSUPP; - request.device_id = SMBUS_DEVICE_ID; + request.device_id = dev_addr; request.address = 0; request.length = len; @@ -506,16 +511,16 @@ static int aq_fw2x_get_eeprom(struct aq_hw_s *self, u32 *data, u32 len) if (err < 0) return err; - /* Toggle 0x368.SMBUS_READ_REQUEST bit */ + /* Toggle 0x368.CAPS_LO_SMBUS_READ bit */ mpi_opts = aq_hw_read_reg(self, HW_ATL_FW2X_MPI_CONTROL_ADDR); - mpi_opts ^= SMBUS_READ_REQUEST; + mpi_opts ^= BIT(CAPS_LO_SMBUS_READ); aq_hw_write_reg(self, HW_ATL_FW2X_MPI_CONTROL_ADDR, mpi_opts); /* Wait until REQUEST_BIT matched in 0x370 */ AQ_HW_WAIT_FOR((aq_hw_read_reg(self, HW_ATL_FW2X_MPI_STATE_ADDR) & - SMBUS_READ_REQUEST) == (mpi_opts & SMBUS_READ_REQUEST), + BIT(CAPS_LO_SMBUS_READ)) == (mpi_opts & BIT(CAPS_LO_SMBUS_READ)), 10U, 10000U); if (err < 0) @@ -542,7 +547,8 @@ static int aq_fw2x_get_eeprom(struct aq_hw_s *self, u32 *data, u32 len) } -static int aq_fw2x_set_eeprom(struct aq_hw_s *self, u32 *data, u32 len) +static int aq_fw2x_set_eeprom(struct aq_hw_s *self, int dev_addr, + u32 *data, u32 len) { struct smbus_write_request request; u32 mpi_opts, result = 0; @@ -551,7 +557,7 @@ static int aq_fw2x_set_eeprom(struct aq_hw_s *self, u32 *data, u32 len) if (self->fw_ver_actual < HW_ATL_FW_FEATURE_EEPROM) return -EOPNOTSUPP; - request.device_id = SMBUS_DEVICE_ID; + request.device_id = dev_addr; request.address = 0; request.length = len; @@ -572,15 +578,15 @@ static int aq_fw2x_set_eeprom(struct aq_hw_s *self, u32 *data, u32 len) if (err < 0) return err; - /* Toggle 0x368.SMBUS_WRITE_REQUEST bit */ + /* Toggle 0x368.CAPS_LO_SMBUS_WRITE bit */ mpi_opts = aq_hw_read_reg(self, HW_ATL_FW2X_MPI_CONTROL_ADDR); - mpi_opts ^= SMBUS_WRITE_REQUEST; + mpi_opts ^= BIT(CAPS_LO_SMBUS_WRITE); aq_hw_write_reg(self, HW_ATL_FW2X_MPI_CONTROL_ADDR, mpi_opts); /* Wait until REQUEST_BIT matched in 0x370 */ AQ_HW_WAIT_FOR((aq_hw_read_reg(self, HW_ATL_FW2X_MPI_STATE_ADDR) & - SMBUS_WRITE_REQUEST) == (mpi_opts & SMBUS_WRITE_REQUEST), + BIT(CAPS_LO_SMBUS_WRITE)) == (mpi_opts & BIT(CAPS_LO_SMBUS_WRITE)), 10U, 10000U); if (err < 0) From patchwork Sat Mar 9 14:03:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Russkikh X-Patchwork-Id: 51008 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 79E524F98; Sat, 9 Mar 2019 15:03:38 +0100 (CET) Received: from NAM05-CO1-obe.outbound.protection.outlook.com (mail-eopbgr720043.outbound.protection.outlook.com [40.107.72.43]) by dpdk.org (Postfix) with ESMTP id D88AE4CBD; Sat, 9 Mar 2019 15:03:35 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=AQUANTIA1COM.onmicrosoft.com; s=selector1-aquantia-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=q4+DJPYTJQxzSdb4fXcC1nBJWoojhxm1DylR0yF3Tts=; b=l+xS0u6pDIUt8tVDj5kNWEk/f644oKiZLCJajb3Qbct5iW28bTzU510iQ0dsLsKetGIPSnrmEtYumluv3kwjeNL5QYZDRjoaMVbPaMxPyG9nz/zJggMikncETRJAK7o+nmvYeS2wPUEz94qQFw9P5LDJ2Mi3y42Li+ETscx7vz4= Received: from DM6PR11MB3625.namprd11.prod.outlook.com (20.178.230.149) by DM6PR11MB2892.namprd11.prod.outlook.com (20.177.216.89) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1686.18; Sat, 9 Mar 2019 14:03:34 +0000 Received: from DM6PR11MB3625.namprd11.prod.outlook.com ([fe80::d145:a1f4:ed34:e31b]) by DM6PR11MB3625.namprd11.prod.outlook.com ([fe80::d145:a1f4:ed34:e31b%3]) with mapi id 15.20.1665.020; Sat, 9 Mar 2019 14:03:34 +0000 From: Igor Russkikh To: "dev@dpdk.org" CC: Pavel Belous , Igor Russkikh , "stable@dpdk.org" , Pavel Belous Thread-Topic: [PATCH v2 06/10] net/atlantic: fix EEPROM get for small and uneven lengths Thread-Index: AQHU1oDiHlEj9M8bzk62FFyT6fCeeg== Date: Sat, 9 Mar 2019 14:03:34 +0000 Message-ID: <5850449a9d75c21ee7b41a527f4e45c11d28e7ca.1552138867.git.igor.russkikh@aquantia.com> References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: HE1PR05CA0278.eurprd05.prod.outlook.com (2603:10a6:3:fc::30) To DM6PR11MB3625.namprd11.prod.outlook.com (2603:10b6:5:13a::21) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Igor.Russkikh@aquantia.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.17.1 x-originating-ip: [95.79.108.179] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 7b08c8f6-1124-442f-768b-08d6a49804c0 x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600127)(711020)(4605104)(2017052603328)(7153060)(7193020); SRVR:DM6PR11MB2892; x-ms-traffictypediagnostic: DM6PR11MB2892: x-microsoft-exchange-diagnostics: =?iso-8859-1?Q?1; DM6PR11MB2892; 23:oR39Lvbbx2eis6GUzOua7h7EZop+FZRn1XlH6ua?= =?iso-8859-1?q?HxymTh8LqkGl8DRK9lRFFCWt8?= =?iso-8859-1?q?g65SC8Tfvp2btMjxdT/lxASWzNVq2MlD8wTLNFJs2dqaL6xN0ZA?= =?iso-8859-1?q?ovoB6ujdyK4iU6q9xr4bsZr3au+DKPaZyHR07T9tkugjh87aRL7?= =?iso-8859-1?q?p9kQ2tChaiytVyzcl0DJIQnvtlyzqgxbXHkk0W8kgfAwLHZm9IT?= =?iso-8859-1?q?ctzGQ7/47sK0MovlkGZipKTFaezLs+nqTN7G56Oyi2/px0/voPt?= =?iso-8859-1?q?JrE5MAQHOAWdaFg6IhkOgzyWXPyuKwbG9ECCkBdWz0cGDbY8iDf?= =?iso-8859-1?q?4KwMyFYazIw3ezj2lEGu9oMndxx73K2+jeZNHdZ6D++aqxrP8dD?= =?iso-8859-1?q?RxZ/RJu8sJVyrAGNGZ0ELFfJh3QoFAdNdJaT5q6SzQRpqAvccpX?= =?iso-8859-1?q?1s+gMFNof75RZDloF8QusAF+M3ywcUAsQnQR0xa2A6GMaV0/1W6?= =?iso-8859-1?q?PA/qxWLG08C+ztuicC8yGZgfROiGEcCd5Q2brtcqGQd8+ktUB9v?= =?iso-8859-1?q?5AxfRoHgNCLmoGKd97kASMcJN9fdj6ZYjixK26fzTgHbI4CpTV2?= =?iso-8859-1?q?HIBQsmQ1bhaPEFdjNOO3MvLe4Cf6TcKS8ap7aXSpkEmXdxaSOF8?= =?iso-8859-1?q?DGMl/tr2bmwL/y/9i8L+CSbDdTf4MR0njdBAX5l0PnYxoinR6uv?= =?iso-8859-1?q?YVSALUDwIN5Moysii4ojGCG54aFKgkTLruKbQR96ZLWpSoH4jwJ?= =?iso-8859-1?q?14njvAy/UQ+QlTX/mruasxjMjcGxM238sCTFtbPWOaueueWlXeI?= =?iso-8859-1?q?eh3HaDiHV7Qt2GnZkDlLO+Os60bUK5T6wSxRNaATKQkWypHCwc/?= =?iso-8859-1?q?Y+3pOhYRH32J9q1TmZ4DAivwd0ZmWY42+Vvrz5J0NUe4DbVqtFp?= =?iso-8859-1?q?lGV0bwRUB7bG2TSZV3DY4Wf3jQpjpmSC7ezjYkeISPk6NZVr3UA?= =?iso-8859-1?q?HTr2GVO/k1fHdc5/NIOpyL5T2m88Pg3DGmvCdEoy+eqc98XlrZR?= =?iso-8859-1?q?0zLwkHAuCE+J1YOliUdng0s6GA0Ko2RX3Knb8DSgRqtoYtX6XpA?= =?iso-8859-1?q?rFEhA2LrB3n5YLRDj8cdkSFWgUOTDn/tcGxxNrTczkdBcjQWg2o?= =?iso-8859-1?q?sbD0Pa+HcGaag4K6VxxsXkmGuw0Np041UTvOOtIMZUsTWkKOmdn?= =?iso-8859-1?q?UdQMjDQ2KyQZfp3RqfceDv7xqqCLqAwqXIAtxBMpbOCjo+Eu1mh?= =?iso-8859-1?q?nosimkQi8uodwUbq33mzYkPkt8BuGXyTflMqKGB1CaJQSHW8Cq1?= =?iso-8859-1?q?av7Cp1DmDTMO0kURlVNTx65DaTwmzUm1MssfNgyxE0YNjhI8t8w?= =?iso-8859-1?q?ba+4UMwUWlcXpK+7Yx0WvOvGvKCQV8LJTCiuH4XJ4FNqSAzpuL/?= =?iso-8859-1?q?C1cZjPwV2Q/CnfMM6pedDKlxaJYO4gaQr2/ebYxZgTLenvlg=3D?= x-microsoft-antispam-prvs: x-forefront-prvs: 0971922F40 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(396003)(376002)(366004)(39850400004)(136003)(346002)(199004)(189003)(106356001)(5660300002)(6116002)(26005)(4326008)(99286004)(52116002)(2906002)(3846002)(76176011)(107886003)(2351001)(105586002)(14454004)(102836004)(97736004)(476003)(68736007)(44832011)(386003)(186003)(486006)(11346002)(446003)(2616005)(6506007)(450100002)(25786009)(2501003)(86362001)(305945005)(7736002)(72206003)(8676002)(6486002)(256004)(118296001)(316002)(8936002)(66066001)(6436002)(81156014)(1730700003)(53936002)(5640700003)(81166006)(50226002)(71190400001)(6916009)(54906003)(36756003)(71200400001)(478600001)(6512007); DIR:OUT; SFP:1101; SCL:1; SRVR:DM6PR11MB2892; H:DM6PR11MB3625.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: oEnP76kai4MyqNY21KE7GhygbXRFQrUQuXf6v610YEfiLlwt1Nbk0Ntf5U6YOpv4/4ekdrzqxJPQ+TCicTRYL2gmlea/stc0ip1Pk4aAcPh4A5AFEm3swOqAAq6z+lftltobsOoZY4Vhcp/S82buy+Xo4fXCDR/WYDQKmoXCSUnxq5K6XusK8TVYMNBf+AW2V04vYzW1nlCb87E3dVNsH3QSmSTAGwLL3Tt1znShxprk0LVJ1iv46fJryYSrmjASubAuk1wO09SoMzMNUab1gjAxU1d1dbrPnSRkFlhyETdbJg4ck2+6ZclY089+tdO7zPiaAFDenpdkEba3izcKvTkWe3oHNgq2Ys6CyhdYCUdLdfU5TZVUJ81P0M0bKX4e/9Y42bG6gATuRwy8KCOi4bD1wHCBZuQllhQY1VA7BSg= MIME-Version: 1.0 X-OriginatorOrg: aquantia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7b08c8f6-1124-442f-768b-08d6a49804c0 X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Mar 2019 14:03:34.3355 (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-Transport-CrossTenantHeadersStamped: DM6PR11MB2892 Subject: [dpdk-dev] [PATCH v2 06/10] net/atlantic: fix EEPROM get for small and uneven lengths 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 Fixes: ce4e8d418097 ("net/atlantic: implement EEPROM get/set") Cc: stable@dpdk.org Signed-off-by: Igor Russkikh Signed-off-by: Pavel Belous --- .../net/atlantic/hw_atl/hw_atl_utils_fw2x.c | 28 ++++++++++++++++--- 1 file changed, 24 insertions(+), 4 deletions(-) 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 78ca1eb1faaa..dc619bfdd75e 100644 --- a/drivers/net/atlantic/hw_atl/hw_atl_utils_fw2x.c +++ b/drivers/net/atlantic/hw_atl/hw_atl_utils_fw2x.c @@ -534,13 +534,33 @@ static int aq_fw2x_get_eeprom(struct aq_hw_s *self, int dev_addr, return err; if (result == 0) { - err = hw_atl_utils_fw_downld_dwords(self, + u32 num_dwords = len / sizeof(u32); + u32 bytes_remains = len % sizeof(u32); + + if (num_dwords) { + err = hw_atl_utils_fw_downld_dwords(self, self->rpc_addr + sizeof(u32) * 2, data, - RTE_ALIGN(len, sizeof(u32))); + num_dwords); - if (err < 0) - return err; + if (err < 0) + return err; + } + + if (bytes_remains) { + u32 val = 0; + + err = hw_atl_utils_fw_downld_dwords(self, + self->rpc_addr + sizeof(u32) * 2 + num_dwords, + &val, + sizeof(u32)); + + if (err < 0) + return err; + + rte_memcpy((u8 *)data + len - bytes_remains, + &val, bytes_remains); + } } return 0; From patchwork Sat Mar 9 14:03:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Russkikh X-Patchwork-Id: 51009 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 4CAAD5587; Sat, 9 Mar 2019 15:03:40 +0100 (CET) Received: from NAM05-CO1-obe.outbound.protection.outlook.com (mail-eopbgr720060.outbound.protection.outlook.com [40.107.72.60]) by dpdk.org (Postfix) with ESMTP id AFC2B4C9F; Sat, 9 Mar 2019 15:03:37 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=AQUANTIA1COM.onmicrosoft.com; s=selector1-aquantia-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=sg2ckF1YSz0JoFrGCU9j27ARXnPBYWGd8vFAXSgaKA8=; b=hH5CfAD3pAURDupuZQtTLSzdpqwaB0vrFpezkgVLTzqtmChEFpdmq1w4tudAiUwLSuCjCZ5EFPGG6BabybIUCHHSBx9TWoqK9+DkqCr7h9+9ZZUew7Xg4E+vW/jVn0qruhN611ux+pvq2T2nTdqCLrSC9LVfxSmqD0X0qjvRFcE= Received: from DM6PR11MB3625.namprd11.prod.outlook.com (20.178.230.149) by DM6PR11MB2892.namprd11.prod.outlook.com (20.177.216.89) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1686.18; Sat, 9 Mar 2019 14:03:36 +0000 Received: from DM6PR11MB3625.namprd11.prod.outlook.com ([fe80::d145:a1f4:ed34:e31b]) by DM6PR11MB3625.namprd11.prod.outlook.com ([fe80::d145:a1f4:ed34:e31b%3]) with mapi id 15.20.1665.020; Sat, 9 Mar 2019 14:03:36 +0000 From: Igor Russkikh To: "dev@dpdk.org" CC: Pavel Belous , Igor Russkikh , "stable@dpdk.org" Thread-Topic: [PATCH v2 07/10] net/atlantic: fix link configuration Thread-Index: AQHU1oDjcLyaSIcia0ycajnZwr+cyg== Date: Sat, 9 Mar 2019 14:03:36 +0000 Message-ID: <990e873dd65514d8b56ffc52be664cb667259f63.1552138867.git.igor.russkikh@aquantia.com> References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: HE1PR05CA0278.eurprd05.prod.outlook.com (2603:10a6:3:fc::30) To DM6PR11MB3625.namprd11.prod.outlook.com (2603:10b6:5:13a::21) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Igor.Russkikh@aquantia.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.17.1 x-originating-ip: [95.79.108.179] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: b4a1e36b-9f88-40af-abfe-08d6a49805d7 x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600127)(711020)(4605104)(2017052603328)(7153060)(7193020); SRVR:DM6PR11MB2892; x-ms-traffictypediagnostic: DM6PR11MB2892: x-microsoft-exchange-diagnostics: =?iso-8859-1?Q?1; DM6PR11MB2892; 23:COBFR/zoKajre5tlxhYlxGvMaqr+C/x/ou7/LMd?= =?iso-8859-1?q?tMxaXz4a4+qXK14krARiEoJkV?= =?iso-8859-1?q?9mIJqChDFYM3bO/Qy2CmcmqTqE7TE9NQWcrljJtvZmifeRoPqUt?= =?iso-8859-1?q?LXHL7yR7E12o4bXSVcJngre2cWlZ1KVZsQmZlHBSc4KIRH0I70Z?= =?iso-8859-1?q?Am7J/HCUxXSoGzLI0EaNUyxJ09klSFuTAHPHvccZiQMmiLcWYlj?= =?iso-8859-1?q?NnEaNGCQSCtFhgFPHyeH9EXZv88/5TcSTw1Sh3bOeiq4mHmzKm6?= =?iso-8859-1?q?UPWMz8b+CYJHicLAZwfcJdLNRWspFb6bV7muH6eAWSp1qlNyFNQ?= =?iso-8859-1?q?uupqq2zfldBcr7sO3JgNOAnf1JJJb7wFdSooafbN13OyitRe2vk?= =?iso-8859-1?q?Cd357kqtaThLvflcUGQMcYxul1vQQgGNdkMRBWw7wK8L2vAqPqm?= =?iso-8859-1?q?wRHtyCYJ1VmSsjaBnfLkZ2vRoRkz/P0ZhnXNKHsHL6kyGRHyeH8?= =?iso-8859-1?q?uAsZxw1UtwRMLdpJ7OQcnSEIP4Sk32AbXuKJX9IXY2TqE1g73ON?= =?iso-8859-1?q?oSrGZ7sfp/6m7/v++1bIb3rOCev90Nh7jSV3dnISg/TV/NY4bUJ?= =?iso-8859-1?q?TE1dFKQb3J/VxP14ectY5j743q8Ynbs0jPh6WFazzXKeBCj1b7D?= =?iso-8859-1?q?SR2DkK85qE3scpvh60S/fVm3quV5lZw18V6m0P/cH5ycyPeM6Ls?= =?iso-8859-1?q?rnOAN64dVAKZTwJRnScteNz4etlpi7jl+3ZvvyKgesX25p6iFdZ?= =?iso-8859-1?q?R3vyTtBapQ8PP3YMa5BevovDYWCwUfsx3qqXwxpEVXkC2KAhiSp?= =?iso-8859-1?q?hnEsuSKm/C9jYYXw+FWmiCfLzBpd8cViZ6Hrf9QdCpZt+ZHssI/?= =?iso-8859-1?q?lx77eB5xZaLJqe0F8ZItXqI9DOARcskAlYtq1QisGnUU80wCclE?= =?iso-8859-1?q?UDEQyH3AaY5lsvtR/QZl7/1uC7iOdYK94JQJ8q1tVD0da+2/vlx?= =?iso-8859-1?q?0iMacwOb2m5ApFtx2oMk37klqMT8zCyxivzvmf35NB04jsASc1y?= =?iso-8859-1?q?UrUFdzuDJzjft3vHVQqQVSNBAYmEHkhcTh9IeEowHQIL7O9LiLU?= =?iso-8859-1?q?Ol3E6lWhCkoNHLzLGTZor9xSNW6bBIg5AXIqg30toQdXuvSgxzR?= =?iso-8859-1?q?VEKm0hXucF5ySBJo4y04pVJKZOoOlGoCTdw6rfus5x5JXHHbHn1?= =?iso-8859-1?q?9mjDt24leqMWG9ldiXuqIP7VBMABJPXeamH84aN9yBDqEOt5zFw?= =?iso-8859-1?q?CpZyN8eAKviOvJDYQFuN7IYThHA6g8PTCxHMqQoBU5w3uNmo3bp?= =?iso-8859-1?q?NBjQLhJF79dRQSrW73fl0ybqGKRPMoU7UAGjrB7CAv29Ak3Nw/3?= =?iso-8859-1?q?aWq/4RSkFVaq4XG/4m+ipzwCDXNe+ZoUffWpDDfuaMK5n5jE/Aj?= =?iso-8859-1?q?8xhhlNWvL6Smdpqo/B2WEtd7vYBqQlDe2hkUIv72ChjJiS1g=3D?= x-microsoft-antispam-prvs: x-forefront-prvs: 0971922F40 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(396003)(376002)(366004)(39850400004)(136003)(346002)(199004)(189003)(106356001)(5660300002)(6116002)(26005)(4326008)(99286004)(52116002)(2906002)(3846002)(76176011)(2351001)(105586002)(14454004)(102836004)(97736004)(476003)(68736007)(44832011)(386003)(186003)(486006)(11346002)(446003)(2616005)(6506007)(450100002)(25786009)(2501003)(86362001)(305945005)(7736002)(14444005)(72206003)(8676002)(6486002)(256004)(118296001)(316002)(8936002)(66066001)(6436002)(81156014)(1730700003)(53936002)(5640700003)(81166006)(50226002)(71190400001)(6916009)(54906003)(36756003)(71200400001)(478600001)(6512007); DIR:OUT; SFP:1101; SCL:1; SRVR:DM6PR11MB2892; H:DM6PR11MB3625.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: rvMbdyFjreZQJx2tGYwPyj99Nmcba84ztp/k/kX3sqsjEWe0buQyZq2k9D2Lgqn6S8ctnqGyoepK3oJxWehFcCqqsqFmGUYBHOnBCJ2VCrjrpbfHA0L1RxMFZCm1fGnAr1lIjcTJZTqBOqLGCmdzrrGUCSqIEYlYwEu0UvK7yFeyoGZiS5zZIS+lCzCy1iupdmkt6FzPKqH2l1CcPZEUBLKk4wIUn7OI8w0DKpdFR+pXBo1KH+m21XaKbHUGKZjoM8XCx9AKVmgq2OiXFEkrR74sD8nm9+6v3aUnc/lZHcgnfRhHJFnrf2b+oojGzChAgwOkeMOVT91mysB7lFYMufbKdN4vNcB2JQW3mKPwwU/bOJoqpNO6jg2uMJGMXnTfn04LRbenJZiUQ5kzGYjlnO0lEQfGyifr6CEtCmwpx84= MIME-Version: 1.0 X-OriginatorOrg: aquantia.com X-MS-Exchange-CrossTenant-Network-Message-Id: b4a1e36b-9f88-40af-abfe-08d6a49805d7 X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Mar 2019 14:03:36.3050 (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-Transport-CrossTenantHeadersStamped: DM6PR11MB2892 Subject: [dpdk-dev] [PATCH v2 07/10] net/atlantic: fix link configuration 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" In case link speed is re configured after port start, it does not takes the requested speed value, but instead just sets full autoneg mask. Cc: stable@dpdk.org Fixes: 7943ba05f67c ("net/atlantic: add link status and interrupt management") Signed-off-by: Igor Russkikh --- drivers/net/atlantic/atl_ethdev.c | 44 ++++++++++++++----------------- 1 file changed, 20 insertions(+), 24 deletions(-) diff --git a/drivers/net/atlantic/atl_ethdev.c b/drivers/net/atlantic/atl_ethdev.c index 925f9722ec66..c869ff321bf5 100644 --- a/drivers/net/atlantic/atl_ethdev.c +++ b/drivers/net/atlantic/atl_ethdev.c @@ -465,8 +465,6 @@ atl_dev_start(struct rte_eth_dev *dev) struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev); struct rte_intr_handle *intr_handle = &pci_dev->intr_handle; uint32_t intr_vector = 0; - uint32_t *link_speeds; - uint32_t speed = 0; int status; int err; @@ -543,6 +541,8 @@ atl_dev_start(struct rte_eth_dev *dev) goto error; } + err = atl_dev_set_link_up(dev); + err = hw->aq_fw_ops->update_link_status(hw); if (err) @@ -550,26 +550,6 @@ atl_dev_start(struct rte_eth_dev *dev) dev->data->dev_link.link_status = hw->aq_link_status.mbps != 0; - link_speeds = &dev->data->dev_conf.link_speeds; - - speed = 0x0; - - if (*link_speeds == ETH_LINK_SPEED_AUTONEG) { - speed = hw->aq_nic_cfg->link_speed_msk; - } else { - if (*link_speeds & ETH_LINK_SPEED_10G) - speed |= AQ_NIC_RATE_10G; - if (*link_speeds & ETH_LINK_SPEED_5G) - speed |= AQ_NIC_RATE_5G; - if (*link_speeds & ETH_LINK_SPEED_1G) - speed |= AQ_NIC_RATE_1G; - if (*link_speeds & ETH_LINK_SPEED_2_5G) - speed |= AQ_NIC_RATE_2G5; - if (*link_speeds & ETH_LINK_SPEED_100M) - speed |= AQ_NIC_RATE_100M; - } - - err = hw->aq_fw_ops->set_link_speed(hw, speed); if (err) goto error; @@ -657,9 +637,25 @@ static int atl_dev_set_link_up(struct rte_eth_dev *dev) { struct aq_hw_s *hw = ATL_DEV_PRIVATE_TO_HW(dev->data->dev_private); + uint32_t link_speeds = dev->data->dev_conf.link_speeds; + uint32_t speed_mask = 0; + + if (link_speeds == ETH_LINK_SPEED_AUTONEG) { + speed_mask = hw->aq_nic_cfg->link_speed_msk; + } else { + if (link_speeds & ETH_LINK_SPEED_10G) + speed_mask |= AQ_NIC_RATE_10G; + if (link_speeds & ETH_LINK_SPEED_5G) + speed_mask |= AQ_NIC_RATE_5G; + if (link_speeds & ETH_LINK_SPEED_1G) + speed_mask |= AQ_NIC_RATE_1G; + if (link_speeds & ETH_LINK_SPEED_2_5G) + speed_mask |= AQ_NIC_RATE_2G5; + if (link_speeds & ETH_LINK_SPEED_100M) + speed_mask |= AQ_NIC_RATE_100M; + } - return hw->aq_fw_ops->set_link_speed(hw, - hw->aq_nic_cfg->link_speed_msk); + return hw->aq_fw_ops->set_link_speed(hw, speed_mask); } /* From patchwork Sat Mar 9 14:03:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Russkikh X-Patchwork-Id: 51010 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 AF0B25699; Sat, 9 Mar 2019 15:03:41 +0100 (CET) Received: from NAM05-CO1-obe.outbound.protection.outlook.com (mail-eopbgr720076.outbound.protection.outlook.com [40.107.72.76]) by dpdk.org (Postfix) with ESMTP id 647184F90 for ; Sat, 9 Mar 2019 15:03:39 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=AQUANTIA1COM.onmicrosoft.com; s=selector1-aquantia-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ipuTH0c4InD4UNeJ540Sdqni4fRPmh8Pjb4kzF/gsGY=; b=YDwioipCNSJB0aAoS89al7PI6xxNbQA/dtCkE9gjKyld679DFx+EdfHiQ8fgWNHXtctDjteWNs+VdCVFRFo4kcQU8nX97hb0uKb9gwbzcCxpCQz4TzMWy89Au94c2LeXIDT0WIJun9nI8xN+pkewP4luJzVedgM1gixpYCOs95E= Received: from DM6PR11MB3625.namprd11.prod.outlook.com (20.178.230.149) by DM6PR11MB2892.namprd11.prod.outlook.com (20.177.216.89) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1686.18; Sat, 9 Mar 2019 14:03:38 +0000 Received: from DM6PR11MB3625.namprd11.prod.outlook.com ([fe80::d145:a1f4:ed34:e31b]) by DM6PR11MB3625.namprd11.prod.outlook.com ([fe80::d145:a1f4:ed34:e31b%3]) with mapi id 15.20.1665.020; Sat, 9 Mar 2019 14:03:38 +0000 From: Igor Russkikh To: "dev@dpdk.org" CC: Pavel Belous , Igor Russkikh Thread-Topic: [PATCH v2 08/10] net/atlantic: eliminate excessive log levels on Rx/Tx Thread-Index: AQHU1oDkRmKDEPs+NUWxzcTn2zmPxg== Date: Sat, 9 Mar 2019 14:03:38 +0000 Message-ID: <41721f486b1a4c6feb0d0c4a4ce92a65f9af209b.1552138867.git.igor.russkikh@aquantia.com> References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: HE1PR05CA0278.eurprd05.prod.outlook.com (2603:10a6:3:fc::30) To DM6PR11MB3625.namprd11.prod.outlook.com (2603:10b6:5:13a::21) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Igor.Russkikh@aquantia.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.17.1 x-originating-ip: [95.79.108.179] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: d974867a-83ae-49ca-188a-08d6a49806e6 x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600127)(711020)(4605104)(2017052603328)(7153060)(7193020); SRVR:DM6PR11MB2892; x-ms-traffictypediagnostic: DM6PR11MB2892: x-microsoft-exchange-diagnostics: =?iso-8859-1?Q?1; DM6PR11MB2892; 23:CWUV7vhTijLBZkiS9TjaMEVY3ZsmStIRQJLU24T?= =?iso-8859-1?q?MvRfjNvlYyGJwC2RFBGwru3gq?= =?iso-8859-1?q?vLBC4CdGkACT90Kz7PM/XI5awcSUhirSv5kE8UYoYxeiRUeHeGu?= =?iso-8859-1?q?1lK7cQx8GxZppXllCICboW6861MdovlevOvFm7nNohPEKVM738z?= =?iso-8859-1?q?3mESHpCJq+F6zMGQBUaexUOpygllmtuqOE7SoUDz3cy1wLyqy26?= =?iso-8859-1?q?EoJHkbjniTqdXyvVd+MJG8GEKbejZLUarrdQAakgSh2SfLVeQzU?= =?iso-8859-1?q?zNQuvQatSlbXDVPkYUYG6akFeswDsCYLk0dz3QjPhnOyAhU+6Q9?= =?iso-8859-1?q?jomSOXfTLGu4lePScOFaOT1WjGaWszHeJRXALbOBOSBE/pmZ/ID?= =?iso-8859-1?q?umD5crSz8IzQmuQAAvzmI1jOoperNhIVgeoWKe8zrrkjRtAlq/x?= =?iso-8859-1?q?X6b/RCyqRgIXU1I+JNnlPjQAnm7HuU3iJ6a1CW4FF72Cm9uSxBP?= =?iso-8859-1?q?Y1uG14uAcLREbxOcmHLYNGR6FHIHX+Prv7UN/rqIujh6RVyhKxg?= =?iso-8859-1?q?X/Zf7Z7Ci1lbDfxo0m1MwkTnoMoQuMtnpskSVOyv4cCLN7ll6lM?= =?iso-8859-1?q?Z4vmY8xhFpp9EdvZTUBCDPvnnV882T3s15nY8xEdXP3aBDPCv3/?= =?iso-8859-1?q?sLtBvMqNo3CNY2UzXC2GoMORZnVd+qRDEaCsV/agVbsLQ/qUVwZ?= =?iso-8859-1?q?98ONQACYNJ61a7nIZWoeVsOineyOQVY7k2c+uRu8XeyJGWI3RJT?= =?iso-8859-1?q?QxQbAsxzU3oR6vX+oZ7sfQ/7/2AwWHa1A5nN8ZEt1kL6VfAXzse?= =?iso-8859-1?q?Lg9cl0vbl0pRjOOIyYVcD2bdIqODx95Jg17LJHtiX4sxAA6hwnp?= =?iso-8859-1?q?IcXDMwbjB0opqxyvih7QuDaODcwcBED5sn+KPpInvJ3E0kWjGqY?= =?iso-8859-1?q?v8BN69AHyA09BEY4FSv8/8a0tUardhqJGd2j3qJHAN3MuZJTsYp?= =?iso-8859-1?q?4+tEsgfrvPiIZz72XGUFJ4D9ETn6NLUatRWzXcFvBc7NfILUeDE?= =?iso-8859-1?q?ynAKf2SQq60IcVMD5G/ms3LJ9BI7M1AmEB3Kuyq34tmcXua1F4O?= =?iso-8859-1?q?zla2PMcYQn+RkL3TpmvA8xFlKsXzpgK2WEMECErCBupfjB5/oIU?= =?iso-8859-1?q?clHinVSQzAFn/HrDQPBeALEVXoKSXqYN2gqdHjr2KzV69xIJNZu?= =?iso-8859-1?q?UFndD1D4HhLe33W/BM7i++c3+gbPJp5XuuR8z+IPb8JCwW/UXFc?= =?iso-8859-1?q?/koaNJ/zVg1R4wGduAygkPihbHTR50zRz/eB7LLHR3t0pmq0NWP?= =?iso-8859-1?q?aDg/CPP1aBAoky7qkpWuxDmC54nPC+zjjtVkyvgTgX4F7LPyUu2?= =?iso-8859-1?q?4Gk8Yver0MIjSZRYv58ZMvwgdiVXaNA5TIAPZZp/VfRfYFBSCio?= =?iso-8859-1?q?N43J44o33Dh2DzmHjTrSdIyNzBg=3D=3D?= x-microsoft-antispam-prvs: x-forefront-prvs: 0971922F40 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(396003)(376002)(366004)(39850400004)(136003)(346002)(199004)(189003)(106356001)(5660300002)(6116002)(26005)(4326008)(99286004)(52116002)(2906002)(3846002)(76176011)(107886003)(2351001)(105586002)(14454004)(102836004)(97736004)(476003)(68736007)(44832011)(386003)(186003)(486006)(11346002)(446003)(2616005)(6506007)(25786009)(2501003)(86362001)(305945005)(7736002)(72206003)(8676002)(6486002)(256004)(118296001)(316002)(8936002)(66066001)(6436002)(81156014)(1730700003)(53936002)(5640700003)(81166006)(50226002)(71190400001)(6916009)(54906003)(36756003)(71200400001)(478600001)(6512007); DIR:OUT; SFP:1101; SCL:1; SRVR:DM6PR11MB2892; H:DM6PR11MB3625.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: AfyZt+7Ky5fifqP3Z5vQJqSL1uH3U+3delV9W8wDO1YXxmRGGTensg1lGXMRV4CGvExXgzZxAzv9qCIF0zNT+VsUOy2J/gwvG4Z6Sq59V8CgP9GpTFfwZPxKAHEiMrnM0Dnry4Dwte1tLM1DA+cBVVEZxGNZLdvwGnL9kduMbqr1FY79j+aHrqZ5BR7YEGoTkgJ+t2xBjNDkeOLx7pD4V1B/4M5Zl7UvVDuV+UiafBurN9p2JYFvTMagiKOjX/A3OYFBCfRhepdluXmdGoqn5qsgsJRglPfYZgf7lv9Bcw6iE4d49a9khVCae9oEfB2yQMYWo7SCP03Cval2PxYV8oLDISD4C9WII2o7QFvNVnldG6FHW3hiaAB2V+Fxe9/6Z7C+PXZTsObLMv6UUzXnszafFKR5c2VqOkN8T/5xr8g= MIME-Version: 1.0 X-OriginatorOrg: aquantia.com X-MS-Exchange-CrossTenant-Network-Message-Id: d974867a-83ae-49ca-188a-08d6a49806e6 X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Mar 2019 14:03:38.0553 (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-Transport-CrossTenantHeadersStamped: DM6PR11MB2892 Subject: [dpdk-dev] [PATCH v2 08/10] net/atlantic: eliminate excessive log levels on Rx/Tx 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" Default rxtx logging used ERR level, that caused logger to always trigger. That may cause perf degradation even if logger was not enabled but compiled in. Signed-off-by: Igor Russkikh --- drivers/net/atlantic/atl_rxtx.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/drivers/net/atlantic/atl_rxtx.c b/drivers/net/atlantic/atl_rxtx.c index aea58c0d5b83..f1519594adad 100644 --- a/drivers/net/atlantic/atl_rxtx.c +++ b/drivers/net/atlantic/atl_rxtx.c @@ -946,7 +946,7 @@ atl_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts) break; } - PMD_RX_LOG(ERR, "port_id=%u queue_id=%u tail=%u " + PMD_RX_LOG(DEBUG, "port_id=%u queue_id=%u tail=%u " "eop=0x%x pkt_len=%u hash=0x%x hash_type=0x%x", (unsigned int)rxq->port_id, (unsigned int)rxq->queue_id, @@ -981,7 +981,7 @@ atl_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts) while (true) { new_mbuf = rte_mbuf_raw_alloc(rxq->mb_pool); if (new_mbuf == NULL) { - PMD_RX_LOG(ERR, + PMD_RX_LOG(DEBUG, "RX mbuf alloc failed port_id=%u " "queue_id=%u", (unsigned int)rxq->port_id, (unsigned int)rxq->queue_id); @@ -1084,7 +1084,7 @@ atl_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts) adapter->sw_stats.q_ibytes[rxq->queue_id] += rx_mbuf_first->pkt_len; - PMD_RX_LOG(ERR, "add mbuf segs=%d pkt_len=%d", + PMD_RX_LOG(DEBUG, "add mbuf segs=%d pkt_len=%d", rx_mbuf_first->nb_segs, rx_mbuf_first->pkt_len); } @@ -1104,7 +1104,7 @@ atl_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts) */ nb_hold = (uint16_t)(nb_hold + rxq->nb_rx_hold); if (nb_hold > rxq->rx_free_thresh) { - PMD_RX_LOG(ERR, "port_id=%u queue_id=%u rx_tail=%u " + PMD_RX_LOG(DEBUG, "port_id=%u queue_id=%u rx_tail=%u " "nb_hold=%u nb_rx=%u", (unsigned int)rxq->port_id, (unsigned int)rxq->queue_id, (unsigned int)tail, (unsigned int)nb_hold, @@ -1129,8 +1129,6 @@ atl_xmit_cleanup(struct atl_tx_queue *txq) struct hw_atl_txd_s *txd; int to_clean = 0; - PMD_INIT_FUNC_TRACE(); - if (txq != NULL) { sw_ring = txq->sw_ring; int head = txq->tx_head; @@ -1181,11 +1179,7 @@ atl_tso_setup(struct rte_mbuf *tx_pkt, union hw_atl_txc_s *txc) uint32_t tx_cmd = 0; uint64_t ol_flags = tx_pkt->ol_flags; - PMD_INIT_FUNC_TRACE(); - if (ol_flags & PKT_TX_TCP_SEG) { - PMD_DRV_LOG(DEBUG, "xmit TSO pkt"); - tx_cmd |= tx_desc_cmd_lso | tx_desc_cmd_l4cs; txc->cmd = 0x4; @@ -1240,8 +1234,6 @@ atl_xmit_pkt(struct aq_hw_s *hw, struct atl_tx_queue *txq, u32 tx_cmd = 0U; int desc_count = 0; - PMD_INIT_FUNC_TRACE(); - tail = txq->tx_tail; txc = (union hw_atl_txc_s *)&txq->hw_ring[tail]; From patchwork Sat Mar 9 14:03:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Russkikh X-Patchwork-Id: 51011 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 1DFBD4CC5; Sat, 9 Mar 2019 15:03:50 +0100 (CET) Received: from NAM05-CO1-obe.outbound.protection.outlook.com (mail-eopbgr720058.outbound.protection.outlook.com [40.107.72.58]) by dpdk.org (Postfix) with ESMTP id 0DDDA4C9F; Sat, 9 Mar 2019 15:03:48 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=AQUANTIA1COM.onmicrosoft.com; s=selector1-aquantia-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=3cHPa8Fv4cnCYGxxdG1v/sr7mpBLSL6Dh5HELp7YT60=; b=JohYMUtZP3d8V4hEnkIdO7QlH8a0Km3iFORVnE/D/kAQ/KsF+sneGFwX4Z7vF8JCgGSinP1RokQ99uKS+ybisHFwiXAd6rPJis3YPv/wMdgAkU9hvuSCkMlL1PbvI1nnBSzyU8j7B6zgNHP43IMo26Y97niDlEETIXeoES3ZO+A= Received: from DM6PR11MB3625.namprd11.prod.outlook.com (20.178.230.149) by DM6PR11MB2892.namprd11.prod.outlook.com (20.177.216.89) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1686.18; Sat, 9 Mar 2019 14:03:43 +0000 Received: from DM6PR11MB3625.namprd11.prod.outlook.com ([fe80::d145:a1f4:ed34:e31b]) by DM6PR11MB3625.namprd11.prod.outlook.com ([fe80::d145:a1f4:ed34:e31b%3]) with mapi id 15.20.1665.020; Sat, 9 Mar 2019 14:03:43 +0000 From: Igor Russkikh To: "dev@dpdk.org" CC: Pavel Belous , Igor Russkikh , "stable@dpdk.org" Thread-Topic: [PATCH v2 09/10] net/atlantic: fix missing VLAN filter offload Thread-Index: AQHU1oDnNYVVtw3DZESFw8MxAZ2e2g== Date: Sat, 9 Mar 2019 14:03:43 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: HE1PR05CA0278.eurprd05.prod.outlook.com (2603:10a6:3:fc::30) To DM6PR11MB3625.namprd11.prod.outlook.com (2603:10b6:5:13a::21) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Igor.Russkikh@aquantia.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.17.1 x-originating-ip: [95.79.108.179] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 7a4cd473-ce27-4bf9-7e19-08d6a498080c x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600127)(711020)(4605104)(2017052603328)(7153060)(7193020); SRVR:DM6PR11MB2892; x-ms-traffictypediagnostic: DM6PR11MB2892: x-microsoft-exchange-diagnostics: =?iso-8859-1?Q?1; DM6PR11MB2892; 23:PZonz7iSaxe44sNTaKuVbZ+v81ClkpqyFtFcTtK?= =?iso-8859-1?q?RBA5014x+4gUGvb6m05JIOSPz?= =?iso-8859-1?q?FhCI9BMNxwVKsrnOPVxHEPxnFYGj9uPnnWlbTRjrLneLo/ZwcSs?= =?iso-8859-1?q?VOmJijWBbEvD7H/gj5RjMlXLMFdwA+V+2JiIRG5gdcOBi/WbdhB?= =?iso-8859-1?q?kSJEkKb/65/2QhIEGs8XlcpNJvfE4qpkUg9ZyCEtf4l62mz/Jmw?= =?iso-8859-1?q?sO8OxdHHkcNYklnt6pj+6S41QE/My4076GO2LlaMMTZZUVIx+n3?= =?iso-8859-1?q?JOGe5eutsNCDu9VeHoEvgbm3Xn/35gG1gV+EiH4hyPPC99qUJJ1?= =?iso-8859-1?q?l2e5MGk22ROf7mGGj/MpobnlDVJ301D5ClQTh4OK6bPwRrIV1iN?= =?iso-8859-1?q?/Wfr6zBBaqB4SOrQ2xm1kVGXWcZdQdMDiKtIVbC2XhaUi7OS3bq?= =?iso-8859-1?q?sDSg6Jsyl/9I0WcTOj0o6Cm+7sTeqxAvHYJUfzwxLBS3LByIrWz?= =?iso-8859-1?q?K6+0C6cC9p2V8eoH3Gt2QkGxYf2m/oFQh/yekzbnZBRJx1I9vGc?= =?iso-8859-1?q?OUFyWSOJb6VMelq4zAJMjWdbogn1KZZ+FJFOhOwJ9tpsWeDJj6T?= =?iso-8859-1?q?iRRbARN22zGii8JvMwxBsrc5z5v3PhIlI6qW6HjFyETEyK2MYjX?= =?iso-8859-1?q?vv2r/ZNB/tcIj9NGzDlCUlfvNhXD5Al4xEtejkiSjzA02u15kVa?= =?iso-8859-1?q?h71L7Hlwv6SqdlqU3nIgdtu+O4YQIvfjPULmzhXUez6Cj8Ubrga?= =?iso-8859-1?q?1ZIe0dWRjVgHdBIFZ9n8fnc0EycyaGuvZhb5piyspYMF0R3MrpQ?= =?iso-8859-1?q?vR2G1zfHcJlO7xc/DQQ8saVEW6Iu2uC2ysGZJX4Zr28jn1lr7ZP?= =?iso-8859-1?q?73TPsowZ9qym9Wnm78ax0sNK2mjXRUFfHOvBgXy2ztxRYEPzHNe?= =?iso-8859-1?q?58tmigK8vRwZ8RuMQ6PQifBYagCi1wKKXfvPH8hdbepZy8csjE9?= =?iso-8859-1?q?Db7yA9tlc6VCoJ9I863DC4kahye+b2MOlQYXG2GGMBrWh0ModrS?= =?iso-8859-1?q?Q7m5WyhS75tkXtUXkvdYHaJbol5MotwM5vxnm7SoWJIe5crl3CG?= =?iso-8859-1?q?vxvK84SqUsaFsYJaKmg0rHlGeM6yrsc8W1L9LO9kHIFQF+7mR9I?= =?iso-8859-1?q?N/cEnvK59ILUh9T3ciEjv7kbQDav1Uhu8MK6Tmh82JadwVxiefU?= =?iso-8859-1?q?4tlAV4JpKEcI2p1TynjWtJ2n97ogSMHJjFw5RZy1/ILRAXfuJIv?= =?iso-8859-1?q?SbtcSl2DV9H5x9LuLqtJpUWrajrBF5uFWLYJI1UnDzoYudzawx6?= =?iso-8859-1?q?ajZm9uvco/Y2Kd8eUykd1mXQwrnCbys7MB6/SVGLDQamqi6ZQJq?= =?iso-8859-1?q?jO28MWEnNtkEiw=3D=3D?= x-microsoft-antispam-prvs: x-forefront-prvs: 0971922F40 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(366004)(199004)(189003)(106356001)(5660300002)(6116002)(26005)(4326008)(99286004)(52116002)(2906002)(3846002)(76176011)(2351001)(105586002)(14454004)(102836004)(97736004)(476003)(68736007)(44832011)(386003)(186003)(486006)(11346002)(446003)(2616005)(6506007)(450100002)(25786009)(2501003)(86362001)(305945005)(7736002)(14444005)(72206003)(8676002)(6486002)(256004)(118296001)(8936002)(66066001)(6436002)(81156014)(1730700003)(4744005)(53936002)(5640700003)(81166006)(50226002)(71190400001)(6916009)(54906003)(36756003)(498600001)(71200400001)(6512007); DIR:OUT; SFP:1101; SCL:1; SRVR:DM6PR11MB2892; H:DM6PR11MB3625.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: cYJ5yekLTcpdo+Nh3BaeLoqCmzPyac/sCm6KExGlKl4fOntNWQKQtTmsMI9Nt04cVFmMmUd48VrLcRUPETUa/AsvrstbFd44voG6wbOjnNFwva9dTHcqaCcqzghykH54jlOldS793r2X8qGqnuJHga053n7fkwbJV8IASJ0xuELerzujMajxxj7nICyfaIB2R33zsMmuXlEBd9nIZtmPOgB3DMabfBwP68PaLLutHVYLnDAmkkrJdWRd8PxCVkt/XSC+N90tw+I3GQYfNu9QflVx+2hMNMkQBtG9Pxrh2WWwebFW+AQrZWJWsFuhts+gJ3KUJJMJQAHBneP54658geMSHKiEPJGzx4vBUzug4bffEGEzlNUj+VqMJOHDKeWGt5Do9H/94L6D/wVZ/DdL9XirrDE4ihDAoef3zPbdIow= MIME-Version: 1.0 X-OriginatorOrg: aquantia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7a4cd473-ce27-4bf9-7e19-08d6a498080c X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Mar 2019 14:03:43.2209 (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-Transport-CrossTenantHeadersStamped: DM6PR11MB2892 Subject: [dpdk-dev] [PATCH v2 09/10] net/atlantic: fix missing VLAN filter offload 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" Original vlan offload code declared callbacks, but did not enable the feature offload bit Cc: stable@dpdk.org Fixes: f7c2c2c8c558 ("net/atlantic: implement VLAN filters and offloads") Signed-off-by: Igor Russkikh --- drivers/net/atlantic/atl_ethdev.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/atlantic/atl_ethdev.c b/drivers/net/atlantic/atl_ethdev.c index c869ff321bf5..f2674f0cafe9 100644 --- a/drivers/net/atlantic/atl_ethdev.c +++ b/drivers/net/atlantic/atl_ethdev.c @@ -165,7 +165,8 @@ static struct rte_pci_driver rte_atl_pmd = { | DEV_RX_OFFLOAD_IPV4_CKSUM \ | DEV_RX_OFFLOAD_UDP_CKSUM \ | DEV_RX_OFFLOAD_TCP_CKSUM \ - | DEV_RX_OFFLOAD_JUMBO_FRAME) + | DEV_RX_OFFLOAD_JUMBO_FRAME \ + | DEV_RX_OFFLOAD_VLAN_FILTER) #define ATL_TX_OFFLOADS (DEV_TX_OFFLOAD_VLAN_INSERT \ | DEV_TX_OFFLOAD_IPV4_CKSUM \ From patchwork Sat Mar 9 14:03:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Russkikh X-Patchwork-Id: 51012 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 5EB742B87; Sat, 9 Mar 2019 15:03:53 +0100 (CET) Received: from NAM05-CO1-obe.outbound.protection.outlook.com (mail-eopbgr720058.outbound.protection.outlook.com [40.107.72.58]) by dpdk.org (Postfix) with ESMTP id 998624CC5; Sat, 9 Mar 2019 15:03:48 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=AQUANTIA1COM.onmicrosoft.com; s=selector1-aquantia-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=fUIpjn9B7SFQijR47zwQy2EjzrY0iHLPsFA5M5D+Xg8=; b=bRJzMBGrhQMGr7h9BJfc4Ch40kHxAt9UCtQ0Nu2eHvroKhwdJdWFg0WPLS6ucUdZY4WoZSkZlIsqfAI6ud5zZ97ZWXidkM9gtVTKQd0KYwS+6IL9THdvAWGlg3A/nydjceTffU7cD0x3kAyVpGpczi3yNkQx9gtCmLjwAaqURvc= Received: from DM6PR11MB3625.namprd11.prod.outlook.com (20.178.230.149) by DM6PR11MB2892.namprd11.prod.outlook.com (20.177.216.89) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1686.18; Sat, 9 Mar 2019 14:03:46 +0000 Received: from DM6PR11MB3625.namprd11.prod.outlook.com ([fe80::d145:a1f4:ed34:e31b]) by DM6PR11MB3625.namprd11.prod.outlook.com ([fe80::d145:a1f4:ed34:e31b%3]) with mapi id 15.20.1665.020; Sat, 9 Mar 2019 14:03:46 +0000 From: Igor Russkikh To: "dev@dpdk.org" CC: Pavel Belous , Igor Russkikh , "stable@dpdk.org" Thread-Topic: [PATCH v2 10/10] net/atlantic: fix xstats to return correct number of items Thread-Index: AQHU1oDoHbME+4uVJ0aaepIaewVdjg== Date: Sat, 9 Mar 2019 14:03:45 +0000 Message-ID: <1f87d939b0dca15529c98bb920fe88d749753c19.1552138867.git.igor.russkikh@aquantia.com> References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: HE1PR05CA0278.eurprd05.prod.outlook.com (2603:10a6:3:fc::30) To DM6PR11MB3625.namprd11.prod.outlook.com (2603:10b6:5:13a::21) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Igor.Russkikh@aquantia.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.17.1 x-originating-ip: [95.79.108.179] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: f21c0b59-e336-44e2-66a3-08d6a4980b20 x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600127)(711020)(4605104)(2017052603328)(7153060)(7193020); SRVR:DM6PR11MB2892; x-ms-traffictypediagnostic: DM6PR11MB2892: x-microsoft-exchange-diagnostics: =?iso-8859-1?Q?1; DM6PR11MB2892; 23:kdDeAGyDwFEirs0TRwzc0Hdb6rWAIyW3PaymnH9?= =?iso-8859-1?q?pmpz9pdCyel8LTjBOlwUFLEdq?= =?iso-8859-1?q?gkm1knXcPq7pSXgG7RxMYBXe1llkwP233iLm/qHlqyVlXjykP4Y?= =?iso-8859-1?q?F/7QRAAoOyQJAM5M42iGXXsj6xA/pGo3VigoBKhbBGORNbJr0ib?= =?iso-8859-1?q?23EdpeiFPtQOD0fhpjJHEwrWW9KviuVEZ6eDyzYbnoovSiXc8bf?= =?iso-8859-1?q?rj44XlohLzEUpiVFoM7SdgUhIG9mzqYpf9BZOnjeYsldRfN+78r?= =?iso-8859-1?q?qr+BqYfKkTfRP3YnWoM92j8mXgU7uYAoBFQFhZC84aZnD0F/6IB?= =?iso-8859-1?q?OUqoQUlSKZObNdGQYZZTEX8XhJgp0Gh6DryHLDRX6QYwPoVMSBj?= =?iso-8859-1?q?WLGSJuR7e2Xnb+1VrD2DcaJnfI7wMgA6rUSS0rk1ncACX/Z8Gd7?= =?iso-8859-1?q?6PntP6moyT0w3imMJCeI5P8QK9Je1Hz13uG9BV5t5frUcfiKFiU?= =?iso-8859-1?q?Bt33neKZcXbOC1LOuP28j5utGLOL3zyqLCk2ENtPNjuaLX/xOcK?= =?iso-8859-1?q?Wl2moiUo592nrmbSaqkjCscmBYo+QGUDhiYyqWS3egjk+DFHzue?= =?iso-8859-1?q?7AaxE5gXy4dWwCfdPn0aFvmmwcaHGdexpFEnbZ75i47I5Hdv2eU?= =?iso-8859-1?q?Co09Zwq/UOyZEm8jbOOPNgzGHSQO1iR6qHWD8SapjL1CpKJ6ohC?= =?iso-8859-1?q?hH8n8Bnui5GkdnFvRJLj81ihR87/hZLvjip/aIggCDDAci47rbp?= =?iso-8859-1?q?LY5dlPWoxDPmoVnqrLwDKkxLzhCLheBBUSvfbCgaAxzb4eapNOI?= =?iso-8859-1?q?no5Kn/SHCQysNGWKtLUZphZf911ixSTDtUP6NT6zey+K65bbnTu?= =?iso-8859-1?q?T65ghnVJWAc4lHs2ZhwYFUBIFSMxvwwymQpu7lnOYnQJXyc8PCI?= =?iso-8859-1?q?+DdeRbM/xnlcS7lEsR5ecAadASJiUXTDA022vZ9Mi26uHLXu5o9?= =?iso-8859-1?q?HSJJWshH/UQbxRig3wXVGeSdr4SvgkIXtHol3vEs6i48eKmFFc1?= =?iso-8859-1?q?harLKwsmlo2LAMsB0NUbYgqbF9i2V7TFM95Nf6t8V2bXutzTVUh?= =?iso-8859-1?q?Adn1PeMv7/T/dOMNDcOZgmShATB/K3tY5ZjNKlcm5AnrYDZAI0C?= =?iso-8859-1?q?A/zMb1zz1lb/ixpYR7pCHw3Ewb89ta2V/oD3Hqqv3OAgW68ThzD?= =?iso-8859-1?q?3cEV97ku7gFBx67WX08A4qcBR1hOzuKPHxKIc2juGi2RuA7zPvU?= =?iso-8859-1?q?qC5gL8wVjBFSFjuykUOgkhWpX7DEYCeBatQ8ecYeN31Bnmq/uEu?= =?iso-8859-1?q?r+55qgLS6DfDzLUYN2FbJ71RVS4yDBxS/1uYhKZN8iQ?= x-microsoft-antispam-prvs: x-forefront-prvs: 0971922F40 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(366004)(199004)(189003)(106356001)(5660300002)(6116002)(26005)(4326008)(99286004)(52116002)(2906002)(3846002)(76176011)(2351001)(105586002)(14454004)(102836004)(97736004)(476003)(68736007)(44832011)(386003)(186003)(486006)(11346002)(446003)(2616005)(6506007)(450100002)(25786009)(2501003)(86362001)(305945005)(7736002)(72206003)(8676002)(6486002)(256004)(118296001)(8936002)(66066001)(6436002)(81156014)(1730700003)(4744005)(53936002)(5640700003)(81166006)(50226002)(71190400001)(6916009)(54906003)(36756003)(498600001)(71200400001)(6512007); DIR:OUT; SFP:1101; SCL:1; SRVR:DM6PR11MB2892; H:DM6PR11MB3625.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: p0CgcTkaCr8vD8KqDsaofO84saMOZJ/65HoKrr3l0cLQCBjEvZbRA9gy5k3ckKmCc8q8ow2GDOhC6tb27PbhbHDWuutCAblDt3GCkLVAgABfVR1GpDahxxCk73EhusP/ZpHk2FZNNxCB2npJIo6B8I8HqC3iTmYF3MaOI7/pBnSZIzjvlObyCI5zy3iAkAl4UxVaPddM515BxH74bwk/nQI/jtienvtsMjCpr9Jge1DXkuJul09o9KnlkTVz4C+/CdJqEPbktbU3GtgBG1DlyvDBY4ZVSuqJASy/3pTK2inVrDKA53usCbd3T+q2d215McG4dTRvkTlt3dmPMbfmrcO+BCNu72af9k51wne8I1lfAsZiAw6VtaK1/pfdEsJZuqTCu1NS+P4ULoKkHt0iXRQAn4YOc3N7+/PMbc6Cx6M= MIME-Version: 1.0 X-OriginatorOrg: aquantia.com X-MS-Exchange-CrossTenant-Network-Message-Id: f21c0b59-e336-44e2-66a3-08d6a4980b20 X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Mar 2019 14:03:45.2453 (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-Transport-CrossTenantHeadersStamped: DM6PR11MB2892 Subject: [dpdk-dev] [PATCH v2 10/10] net/atlantic: fix xstats to return correct number of items 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" Max number of xstats items was returned instead of actual number of filled in records. Cc: stable@dpdk.org Fixes: fbe059e87209 ("net/atlantic: implement device statistics") 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 f2674f0cafe9..0f6edf878fe8 100644 --- a/drivers/net/atlantic/atl_ethdev.c +++ b/drivers/net/atlantic/atl_ethdev.c @@ -758,7 +758,7 @@ atl_dev_xstats_get_names(struct rte_eth_dev *dev __rte_unused, snprintf(xstats_names[i].name, RTE_ETH_XSTATS_NAME_SIZE, "%s", atl_xstats_tbl[i].name); - return size; + return i; } static int @@ -778,7 +778,7 @@ atl_dev_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstat *stats, atl_xstats_tbl[i].offset); } - return n; + return i; } static int