From patchwork Tue Mar 12 15:24:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Russkikh X-Patchwork-Id: 51123 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 51E9E4C9F; Tue, 12 Mar 2019 16:24:55 +0100 (CET) Received: from NAM03-CO1-obe.outbound.protection.outlook.com (mail-eopbgr790045.outbound.protection.outlook.com [40.107.79.45]) by dpdk.org (Postfix) with ESMTP id D3B4211A4; Tue, 12 Mar 2019 16:24:52 +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=goIRs9M9RovtMdi4AeAeYzuul4FCI3EgsG3t0VxNcPTLOO1t1mBAKQsJj9FKu8+7FDjCQH+U9P6vTpVjFxyYqQ5Q5uV7FdB+vzkA9dhjhc/3ssFvoR+AMb26ycW+4znN7QJObh5IVs/D4HskelAMxTtjbFzC6lJPK12krNx1eLE= Received: from DM6PR11MB3625.namprd11.prod.outlook.com (20.178.230.149) by DM6PR11MB2747.namprd11.prod.outlook.com (20.176.100.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1686.18; Tue, 12 Mar 2019 15:24:52 +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.1686.021; Tue, 12 Mar 2019 15:24:52 +0000 From: Igor Russkikh To: "dev@dpdk.org" CC: Pavel Belous , Igor Russkikh , "stable@dpdk.org" Thread-Topic: [PATCH v3 01/10] net/atlantic: fix negative error codes Thread-Index: AQHU2Oe85lBIfj0Ha0C7ouJhr7ZIZw== Date: Tue, 12 Mar 2019 15:24:52 +0000 Message-ID: <8b5751022a766644ba6abff9be929ffdd73e01cb.1552402263.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: HE1PR0901CA0050.eurprd09.prod.outlook.com (2603:10a6:3:45::18) 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: 58ff60de-0e0b-4e93-e672-08d6a6fedf28 x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600127)(711020)(4605104)(2017052603328)(7153060)(7193020); SRVR:DM6PR11MB2747; x-ms-traffictypediagnostic: DM6PR11MB2747: x-microsoft-exchange-diagnostics: =?iso-8859-1?Q?1; DM6PR11MB2747; 23:DNAu95jE7Zk0mlYdv9PA/QwoILV2mR08+MPgQQj?= =?iso-8859-1?q?1My8X6NmlJ3aGlRI4pLr2Wn5F?= =?iso-8859-1?q?N/K0LMfjXLPTKkzGUE5sFJo4Q8a9BTpoGXd63zSvUhv/7ZZkGvv?= =?iso-8859-1?q?0NynwjynYPY5U2jAHetFEYTZFbMCyyUX91qNBppn76ZXC5XwPWW?= =?iso-8859-1?q?LPXHCwmOXZLP2CAdVX+zeqmvjlvpHtY0IN9wKEmG94sMl7AA/wV?= =?iso-8859-1?q?zSX1QhEHup/jOsbm4HjTCwXQc4BmQU4r7N2rFGZWEMnL1AvpY/p?= =?iso-8859-1?q?1u9leeUZqUZ8p8PuCHkDNjKDVM7FzROMyLYC5iJIQ7Em2yCdTbM?= =?iso-8859-1?q?Afwu+98wNgW3Ydlz+Mysr+OtGvBE3lOb7EaxXatnMp5TWyVd7TG?= =?iso-8859-1?q?R6jU5EHRJSe8msRouEh0ypTR7DfCCeLzv8igxfSvHjvZs5MsI3l?= =?iso-8859-1?q?a3WMUDSI/PuV6QFeaS4P4ww2UG+2y3C/bjOz900E4FUTXAZpPFU?= =?iso-8859-1?q?PFdDzvcLebne8bb+Ncj/YgJsynFxCIGzp0X6p1C1AcRC4Fs9tia?= =?iso-8859-1?q?sWviLCUBoN7z6aS2Mmz8MV/rjvIW8Xqw7hYm3jCHL7rGNlidYs/?= =?iso-8859-1?q?fwVjbzJvrImf8ujCcQyiZcCkZ4AmuJlW3qBsGDf4PeFhEvAl/1g?= =?iso-8859-1?q?OtVyO70CMMhTtHAo66L0ajN3qKzFt9Ae9NfNd5/rbnTrZaZplJb?= =?iso-8859-1?q?DP7lZVtPLTA2sxM/Ipetx/RWKuSUBswIOnINQZ2JuFcDqfAiCQ+?= =?iso-8859-1?q?k5DFpbi/a8IKmsSDnHkSWMgqRAtIwnkdhk9Z51LnlBQP5x0EHcW?= =?iso-8859-1?q?9g1z6O71gVD+qQ8RZf1Y95kDsApN1vzBw8L6DbV5dS35c0Q3kcF?= =?iso-8859-1?q?HdmIDZttkOG82JNX/ArD6Lorx95zcWhJNH+pgUNgog77WE+b6iU?= =?iso-8859-1?q?jgNenVUiCPxFXglH9OnwFqk/shRV7zmxX/qHe+bNpcOjA94E5ho?= =?iso-8859-1?q?diU5j6hNztX1bpPk0XzfBdZTNOvXSLJoS8YLy8/LDlpn46e9YM5?= =?iso-8859-1?q?mucjcK6S0mgCTI01S2u6BAF7PwiagF+d7fhUOxcUtweO/ULhITg?= =?iso-8859-1?q?tkRxuXKoYpUd+WF9WIPFTK3oYh/cW8AZN6O/0bxcmMKP7Fcb4xg?= =?iso-8859-1?q?CBpNTYRVlWUJziFxWRVRGJn+Wwec9E7JtEhADofwtonyQ83oNVC?= =?iso-8859-1?q?hZeR9nIgDNE9XHUOyjqMQha9Ce4S3ETht3MRURk+XVFpIhVQ3xp?= =?iso-8859-1?q?0wasISv/5QbAIkMcstABfGVO7heXC+AxQAErG4u18Qc4rzDPmq6?= =?iso-8859-1?q?qvaefYk3ctj4Radk8UAKUyGmz0A6KGvV9FGXqi/MkmweVjKQ8HJ?= =?iso-8859-1?q?sFBYfh8/qWFw9B5Nap+MSCba+29g8gC5ojibpyc4fc0xrHBwl40?= =?iso-8859-1?q?PgBhJPSosNjhELPbC4m8crv19MjUYB2MRV/fISbHA5HfB8Qg=3D?= x-microsoft-antispam-prvs: x-forefront-prvs: 09749A275C x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(396003)(346002)(39850400004)(136003)(366004)(376002)(199004)(189003)(53936002)(2501003)(106356001)(86362001)(81166006)(5660300002)(99286004)(81156014)(6116002)(44832011)(2351001)(105586002)(4326008)(66066001)(2616005)(71200400001)(4744005)(486006)(72206003)(478600001)(446003)(476003)(186003)(118296001)(14454004)(26005)(54906003)(71190400001)(11346002)(386003)(6506007)(305945005)(102836004)(25786009)(7736002)(50226002)(3846002)(256004)(316002)(36756003)(450100002)(6916009)(6486002)(52116002)(1730700003)(8676002)(76176011)(6512007)(97736004)(8936002)(68736007)(6436002)(2906002)(5640700003); DIR:OUT; SFP:1101; SCL:1; SRVR:DM6PR11MB2747; 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: 7eb6CvQ4pxgJsUcMaAONwtPzOBCvDTR3VSKlh+jWy8TUqZ3478g/EUgwG7b0UWCN7v+7p/KC3p+SlCSE7kGXVimVU+IEu/edYR1DhjfIVlSocdhu5rjVB/DiJFsv9/ZwZT0bFy6cOeZueIpQWKorIB84RNiPzzOp6MPllHRshBRqZb5vXcqW5WTQkDzLfcifFAr/jqWq0mvtYio+wT3e1+erDiCzkqIAB0HervkphKZ7FXOM2P5/N/zAlJAFdGfvxS0zGoJ54mwvfC42HardA8KJPGN9fU2iXZfX6VK6pBhavipNfnXXodrmqlirOgflUyK6sGFVqAKAc7QVE/v6s1+iVD5mC0jNJxm5XXP8B5RkkLUkXKH/aepqjFTl0VbPto16zOuR5qNMte0ywWe/IlB2+zBbFF3MCwJtyaQWwKU= MIME-Version: 1.0 X-OriginatorOrg: aquantia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 58ff60de-0e0b-4e93-e672-08d6a6fedf28 X-MS-Exchange-CrossTenant-originalarrivaltime: 12 Mar 2019 15:24:52.0541 (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: DM6PR11MB2747 Subject: [dpdk-dev] [PATCH v3 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 Tue Mar 12 15:24:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Russkikh X-Patchwork-Id: 51124 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 308674CC3; Tue, 12 Mar 2019 16:24:57 +0100 (CET) Received: from NAM03-CO1-obe.outbound.protection.outlook.com (mail-eopbgr790072.outbound.protection.outlook.com [40.107.79.72]) by dpdk.org (Postfix) with ESMTP id 4DC854C9D for ; Tue, 12 Mar 2019 16:24:55 +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=rC7XPbHCe0FPJicFWuUJe/OPxSvcdQsGFAmt3EPuQBY=; b=uAEexBZpHumroTrxlBi9EauYLg7Sjxdc7nt7P7MwT2ursV/f4NmLrUz/YoE4S5ABIr1INTST5JO3/+ruS8kMKHV/KdDKmnPAS/Xp6jkX8HvZH/+ijr3yV+4PjQ0LVxPbYiciCd+9RJ72JZNdw6g/AqQkqvaDtDEgVuUEbQ1DFrs= Received: from DM6PR11MB3625.namprd11.prod.outlook.com (20.178.230.149) by DM6PR11MB2747.namprd11.prod.outlook.com (20.176.100.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1686.18; Tue, 12 Mar 2019 15:24:53 +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.1686.021; Tue, 12 Mar 2019 15:24:53 +0000 From: Igor Russkikh To: "dev@dpdk.org" CC: Pavel Belous , Igor Russkikh Thread-Topic: [PATCH v3 02/10] net/atlantic: remove unused variable Thread-Index: AQHU2Oe9qiVL8Bt5iUiTo0+F69BLXQ== Date: Tue, 12 Mar 2019 15:24:53 +0000 Message-ID: <7be2f22e182554be25d661e97e61ea36b87c2aec.1552402263.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: HE1PR0901CA0050.eurprd09.prod.outlook.com (2603:10a6:3:45::18) 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: 51f07df5-d495-4f92-19ad-08d6a6fee04c x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600127)(711020)(4605104)(2017052603328)(7153060)(7193020); SRVR:DM6PR11MB2747; x-ms-traffictypediagnostic: DM6PR11MB2747: x-microsoft-exchange-diagnostics: =?iso-8859-1?Q?1; DM6PR11MB2747; 23:LWNSGLcRavCP7O/1yAQeBy75WCZWj+fz8lwToms?= =?iso-8859-1?q?8yvEZ0pVSA7xuGI5Nri+tt04E?= =?iso-8859-1?q?DBe8863gpT4DwocEE0v6sB+HooAEclEaS1TO5pQohCqeL0BMGKr?= =?iso-8859-1?q?COAgIv5PXR3ZLjrU23EsprHVvH9yunmQiuBFzkKS6E22Jjx1pMO?= =?iso-8859-1?q?u05lcKHVmBXYfBLfGJlzbW02JWzSeSC6C8kuzYws6kWNfiA5RD7?= =?iso-8859-1?q?j0sqLBhyLG83Wa/Uq4EGUKGup2BznaYCfl92tBN6ECrKOlxqoFz?= =?iso-8859-1?q?wY6eM1breHVMTiEsT6Fvwn4gjGHD3Gm/zsvdiggqMCMjjcEsxjN?= =?iso-8859-1?q?sgbFzJjAbn6XITnTPx/IOe9Dq1qVE+t31KFa1vxCKBK30TXPkSo?= =?iso-8859-1?q?6Fn6NEkmh7bbNzRET57oeFuakDK52+Spy2Ybj5ybwPLOKGITBMx?= =?iso-8859-1?q?SekC3+PsuIx9rnej+53BKwHLWF+w4Jq7AbOWqi9PwGXbJvkM5aA?= =?iso-8859-1?q?GzYgA6GF0gIsCDaQAJMnexlFkQPjN4q9LlP1wE8Hr3YdeJNFdY2?= =?iso-8859-1?q?b+HEHF3tbCAOxhCKaHligBNIUEUD94hqh3uaTy5HROkq+jq5zRA?= =?iso-8859-1?q?4sM3HIFEoFzivXDNO+IUcOWLuG+OyUrBje+ndbOUTnz6/EXPht4?= =?iso-8859-1?q?6y6YnKLsSia4L94uoRZbxQdGORuMevx7bQyOCZpPxeD1/Y9gJ38?= =?iso-8859-1?q?WAQSRksQIh6jP/joJATTsWBUpGb/VGdVkLrzohiMqDjGHL1onvH?= =?iso-8859-1?q?VD4WIEsu+nfjvM/IxaIlxWXkPk6IJ4YgsFkwLIsUkEL065AqED9?= =?iso-8859-1?q?CB3OVcTvLYI1qbJ3gNKVHVOayMgYUnkZ7ZETHFfhkn1SdPDUCcf?= =?iso-8859-1?q?FujJa54CMAF4fqrOQVp9UNwgZAukrLMwvqZH1vlYPl+ueE51ka/?= =?iso-8859-1?q?tcmSJLUXZZDY4+p3vSIonKrQV1oUWz+0MU9nndGIM08/k85xJ53?= =?iso-8859-1?q?89YosBxC+8+zsiTDXdiXNb3DYxDY7Ef0S1/IMMOOU+sQ9PJVU0o?= =?iso-8859-1?q?dITDSRLjqe419Ucjfb3TQuqQgXOCn8fIRWkepjm7co9Bl3ILiEe?= =?iso-8859-1?q?zjA+yIqM6bS5RQ/isRxLwxuRIOpmpny05B1cfZkj4rgl82UMO6H?= =?iso-8859-1?q?0ngDrRmR6P5AFVSC5ym4NqR8FIFdV8MosXZbthDe5kbo0fNHgfX?= =?iso-8859-1?q?BelEUfMvfZwoYKsrBXUTjqRN+5xMU71zSq6xA07eQ5190dtxI0G?= =?iso-8859-1?q?JSY5m/W/7RlEZ3ndiD2i3jV4HMQnJQZ6yAIyt6tLIsYciUL8p94?= =?iso-8859-1?q?DBV+YfFKC0iiBaOEpsKAzJf57MvmZerAXtgFk+X/Yi3RAJLhuL6?= =?iso-8859-1?q?L9HJ+JDEWP/QEa4ZZi5ngAeDjbfHjgohDuX4h1FjKD+GoU+Gcln?= =?iso-8859-1?q?zmLyraVFn2UcAKvOSZnH7iF5oIg=3D=3D?= x-microsoft-antispam-prvs: x-forefront-prvs: 09749A275C x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(396003)(346002)(39850400004)(136003)(366004)(376002)(199004)(189003)(53936002)(2501003)(106356001)(86362001)(81166006)(5660300002)(99286004)(81156014)(6116002)(44832011)(2351001)(105586002)(4326008)(66066001)(2616005)(71200400001)(486006)(72206003)(478600001)(446003)(476003)(186003)(118296001)(14454004)(26005)(54906003)(71190400001)(11346002)(386003)(6506007)(305945005)(102836004)(25786009)(7736002)(50226002)(3846002)(256004)(107886003)(316002)(36756003)(6916009)(6486002)(52116002)(1730700003)(8676002)(76176011)(6512007)(97736004)(8936002)(68736007)(6436002)(2906002)(5640700003); DIR:OUT; SFP:1101; SCL:1; SRVR:DM6PR11MB2747; 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: hcfDRn4bBTKfLh8eHVQ8XBQ04Op8AhOVpUI62E+MdU9UZVbusLUfgG/Wp1OnFffTtlwDxgWlGXWpbKsODEgHpW9j5mhGSPq5ntbQnsHx/1PNDMRpOfJlXSITCj2u+HZ90WhYD70QoQebNdDrSAYu6Q3ktwntSR6cDVNPJvjUxSNRFlT5KR9A8f+rYc8biSG3PtWf6d8HGY4GcQXtMnZHx5VCMRPbqLWYc/7YwkrKaklhz2sU0X+OMS0fDt3tGbeGKS66ByIEniku62+I7PzPNCPAfK2Be+lFty7F2oZpvsLtkpAIviYBqXLm0Rb8Ih3J/r5Sgz244wwKixmpYfJA8E/I8749UgunlN7+bbpC+YYG1F5YLA8rSL8PFHBzw7puf0oLUwmNUSrST9I/QbUm8txjp7rSlGHtblt9oJqL+pY= MIME-Version: 1.0 X-OriginatorOrg: aquantia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 51f07df5-d495-4f92-19ad-08d6a6fee04c X-MS-Exchange-CrossTenant-originalarrivaltime: 12 Mar 2019 15:24:53.7403 (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: DM6PR11MB2747 Subject: [dpdk-dev] [PATCH v3 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. Fixes: 7906661edac6 ("net/atlantic: add b0 hardware layer") Coverity issue: 323512 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 Tue Mar 12 15:24:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Russkikh X-Patchwork-Id: 51125 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 92A2A4D3A; Tue, 12 Mar 2019 16:24:59 +0100 (CET) Received: from NAM03-CO1-obe.outbound.protection.outlook.com (mail-eopbgr790083.outbound.protection.outlook.com [40.107.79.83]) by dpdk.org (Postfix) with ESMTP id 08E254CA9 for ; Tue, 12 Mar 2019 16:24:57 +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=C2k/QXJURdDAVAu04eZNPjSDzz0Dc7slfWGj4traU0O0QBxX7EO1pG0e8GYtcteySXa9uAFD/mGZRTXN4Lng3LZjMmWxywKcCMtLPYP693E2WF7Zez9JfXWEPNPNm0lbBa1OOntarHRm9lOnpSzpKovpO7DOwQWFkXFuEsGbN14= Received: from DM6PR11MB3625.namprd11.prod.outlook.com (20.178.230.149) by DM6PR11MB2747.namprd11.prod.outlook.com (20.176.100.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1686.18; Tue, 12 Mar 2019 15:24:55 +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.1686.021; Tue, 12 Mar 2019 15:24:55 +0000 From: Igor Russkikh To: "dev@dpdk.org" CC: Pavel Belous , Igor Russkikh Thread-Topic: [PATCH v3 03/10] net/atlantic: extra checks for error codes Thread-Index: AQHU2Oe/hVhsezxOlkGYZSMyPLNwbA== Date: Tue, 12 Mar 2019 15:24:55 +0000 Message-ID: <9878dd7a3e0652025e6cdb4c9e2b6e889e2e33e9.1552402263.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: HE1PR0901CA0050.eurprd09.prod.outlook.com (2603:10a6:3:45::18) 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: 273a548b-2ebf-4130-9f5e-08d6a6fee14e x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600127)(711020)(4605104)(2017052603328)(7153060)(7193020); SRVR:DM6PR11MB2747; x-ms-traffictypediagnostic: DM6PR11MB2747: x-microsoft-exchange-diagnostics: =?iso-8859-1?Q?1; DM6PR11MB2747; 23:TQPxj2+cM6EH+xHqTYC1c65u/mydgTxkrMvjlsE?= =?iso-8859-1?q?F6nj3HbtyJyUiHQuFLHspNcHM?= =?iso-8859-1?q?v1+vWgVg3++xFtXuOoVccNr1QlifaWGthA2ZAH39+SN0kjSFXEq?= =?iso-8859-1?q?Mj7REMLgx7nGTVs5bqS3QHDGK8LXwa6CYMLOUYP1Ta5fuWvwOxE?= =?iso-8859-1?q?p5nzoiJ5l27BPEu7tvfivnxnOqbWyJS1ucYHEdvIZkLuJWoXSvU?= =?iso-8859-1?q?SpHrXnBvPxkqMntp293BGL/ajWS+varZAyercH6VAKL0/9BWJWt?= =?iso-8859-1?q?oOT1ZU8RlbTYzxl3eD0kjEfaoNgvdoCWY6guml5Mg5b/kLAritc?= =?iso-8859-1?q?WNnFtlnp+HAVE6/dbeTqJ5FpRcKERtt5OigieSdslNG3dGt4CPu?= =?iso-8859-1?q?tmFiAki7v47WGnCHc5zwiDz1DbQbmpHQq5UHwLNYlL9QkoCKO0C?= =?iso-8859-1?q?TEHG6wrLBmJ+GaRkvdY96QbzyBdHs00p2YUmPRPVxxvEd+QVjWl?= =?iso-8859-1?q?mdB8D74Dy4ruCOnsvsXd9fk2556JPrVifhXGmx1uGPkQK773NYS?= =?iso-8859-1?q?CAiPh8uwd8Aq+GYpFseBNxlphNsSzItPvJsJTv1XEXNb9ffSNQl?= =?iso-8859-1?q?qxlSbFCHf7rPPYSTXLPQv3drn/DAdLWoyGan/wGecyrYdfylS/T?= =?iso-8859-1?q?hZ3yI8GcJenl+tNkfKEuEKWVQqOg9iPuNWWYUbdE4IeldsIrsQi?= =?iso-8859-1?q?hztYgbY/I93FiJR6J9m7kaE0zTBoipmEOj+p3+9TDehvUPEr8lA?= =?iso-8859-1?q?Z/mnBDiYwA31YjDi3ideJAKZMyKFzu+nKjTUGAqTkvtEdXpLCva?= =?iso-8859-1?q?T0FykRg6g5a25rQu4hk3wl1I+3Uo3N7kzB38iSnGVR3wSLiHmGo?= =?iso-8859-1?q?mubf+hEE7AxYyw/hOu+ZJBDwAweEevOvzhdcG2bMLoW/zoUv2iW?= =?iso-8859-1?q?jvOr8LjC2B+2+iGmxrET9a6RO7veTmOyAmuK4YOjsIvDJJAoc3f?= =?iso-8859-1?q?l7FRED6YYbzWQ3YDqQ2hPKF7ssbL3CbQf2D+LeNcgUOYsPllNZz?= =?iso-8859-1?q?HlG04Gm2CYcjp6kKrNVHIrtI86hgBxwJ6TeYEfK77kZN68D4i8k?= =?iso-8859-1?q?ZDp6lEiGCMkv7ludlATqmr8qqk7BFzfWm33eNm+e0efQIQbIj1+?= =?iso-8859-1?q?sL8kTBp0UtK9jxnDEqsNuTi4+USJQC1glXVYAKvbswvt/q0xNiY?= =?iso-8859-1?q?vvMahcV9Y7dEl1BoawnPTx4ao79xeljXtOxU1FK170ScHIBJDaJ?= =?iso-8859-1?q?nGQBoS89UnkJY3mJDm8fnlZ0ONGsj4TJJh4ah6gEt6haOOIzrPD?= =?iso-8859-1?q?DG1+P3JgZbDd5t6jBNbTbJIotvAeU1qXQRwtVty4xKz+RfYssm7?= =?iso-8859-1?q?5udJ+tL9qSmBCIARrWsic1lFpbivsYHN5Wo2FZNwXes/0MVxNx0?= =?iso-8859-1?q?7h9DWzmT3bdsvrB+J9/GkLjDo40D+NNI/kn7EGJ33NFcP+/M=3D?= x-microsoft-antispam-prvs: x-forefront-prvs: 09749A275C x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(396003)(346002)(39850400004)(136003)(366004)(376002)(199004)(189003)(53936002)(2501003)(106356001)(86362001)(81166006)(5660300002)(99286004)(81156014)(6116002)(44832011)(2351001)(105586002)(4326008)(66066001)(2616005)(71200400001)(4744005)(486006)(72206003)(478600001)(446003)(476003)(186003)(118296001)(14454004)(26005)(54906003)(71190400001)(11346002)(386003)(6506007)(305945005)(102836004)(25786009)(7736002)(50226002)(3846002)(256004)(107886003)(316002)(36756003)(6916009)(6486002)(52116002)(1730700003)(8676002)(76176011)(6512007)(97736004)(8936002)(68736007)(6436002)(2906002)(5640700003); DIR:OUT; SFP:1101; SCL:1; SRVR:DM6PR11MB2747; 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: UivdVxVgrC9GlUa9psPO3HobEFhtznkkAaTo/3/Ez3ZThFDcm1k9ILtHgGX2Wvijdx/gtS/m0e+B2uX93QgVLfZxSPhpMNTILPDa1JtlOrIw5D24/tbUPEPKv9Y1l5v5T5g936q3ACIt6he0USosZwGUpbyYDOlEASzTtwNPhppIAqZLDczimbcJcu5A+Wc26/3tfwstUS0qaCnG0Sr/x/eRxDOl4Q7BiaK/NdYtH/UzoBgL1llg8khiGj/RxeAvY8/zI3f8LOPIuQcd7Pvnt4dMJr6X/q6uONZ/RIIttCFdNUXD28chcWp1x1AHBjRwBUIYu+8VmGDRZGSMd6CaLHTC2mcVaJ1tvw4tbFpZDpvjKKjQhv+xMuWLT9WK8VRReNPaLYqcQtxEwSAKJQ/Pu3M3jIlV9Fxn3o/G12sk+7U= MIME-Version: 1.0 X-OriginatorOrg: aquantia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 273a548b-2ebf-4130-9f5e-08d6a6fee14e X-MS-Exchange-CrossTenant-originalarrivaltime: 12 Mar 2019 15:24:55.5947 (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: DM6PR11MB2747 Subject: [dpdk-dev] [PATCH v3 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 Tue Mar 12 15:24:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Russkikh X-Patchwork-Id: 51126 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 A4C5F5398; Tue, 12 Mar 2019 16:25:01 +0100 (CET) Received: from NAM03-CO1-obe.outbound.protection.outlook.com (mail-eopbgr790044.outbound.protection.outlook.com [40.107.79.44]) by dpdk.org (Postfix) with ESMTP id 3A21C4CE4; Tue, 12 Mar 2019 16:24:59 +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=hD9ukWT3lFANCKM4/GuADDJnermSg3AqLmHYBv0WSDA=; b=SaqJN1XGN/uLilU9MPF0tv2o1uIgXm9SJQdaEDuG+hTNuHqo6ePO2iQw9MWD4HFHunoNBzRqvGOjwQzhbG8UaaboNhgixpVxIL7cxM6wySUxNS6lhru/GVvfOQfdsPkWF+fbRsoEgPS6ujLto37twy2W9gM2jmkYHiWR+z0qf9w= Received: from DM6PR11MB3625.namprd11.prod.outlook.com (20.178.230.149) by DM6PR11MB2747.namprd11.prod.outlook.com (20.176.100.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1686.18; Tue, 12 Mar 2019 15:24:57 +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.1686.021; Tue, 12 Mar 2019 15:24:57 +0000 From: Igor Russkikh To: "dev@dpdk.org" CC: Pavel Belous , Igor Russkikh , "stable@dpdk.org" , Pavel Belous Thread-Topic: [PATCH v3 04/10] net/atlantic: fix buffer overflow Thread-Index: AQHU2OfAzEeFbMRQEkWoGSRW5bm8Lw== Date: Tue, 12 Mar 2019 15:24:57 +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: HE1PR0901CA0050.eurprd09.prod.outlook.com (2603:10a6:3:45::18) 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: db426902-8cf6-4493-15de-08d6a6fee2ab x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600127)(711020)(4605104)(2017052603328)(7153060)(7193020); SRVR:DM6PR11MB2747; x-ms-traffictypediagnostic: DM6PR11MB2747: x-microsoft-exchange-diagnostics: =?iso-8859-1?Q?1; DM6PR11MB2747; 23:LJ5rVY/GdnpW6ZovKtHUXGE9EO3eyomn2Edungu?= =?iso-8859-1?q?JSXHj0aHk5LvD/vER/tk+c0p/?= =?iso-8859-1?q?OLx44c6yoLUj1ZYshb0UmSnrBUDdTQLTcCuZYHAI/IU+KgIVRzp?= =?iso-8859-1?q?JL4MbT2QhV/hS8Gnd6P8C2PqGunbIfkmfc7WHlzSCByLPdibuJE?= =?iso-8859-1?q?C34FxXhn+oMC0zKZToVR1Hap5S3S9rIODUJ5s8r276zmp7plBGG?= =?iso-8859-1?q?43ymsjIS41xIu91VloqxwiObjNaKRsEbcfO1f4Rlo76L6MeKVSd?= =?iso-8859-1?q?GZLJgBYsVV0R9c2ZBjgZ71rGtNAv/CGl3JWb3WecWJffLQx6uhG?= =?iso-8859-1?q?quD1/Ed2NlBkAyun6K2vLK19zOIstY+01dQt7xihLRRjc3Ot7vs?= =?iso-8859-1?q?WKTQer7fgWSzDh0wjEikStqtQwql/fHKEMBbPswghj31mZZCArG?= =?iso-8859-1?q?bkHrxxUJaTgzUCyRUklyjHbbEj7kOAVBdMwhvC0CJD/GQ5KnyQe?= =?iso-8859-1?q?2YwB1uLbDCJrZ/Bjzu54GsJSoMIs7352+5ox04J4QOtOhqMDvWi?= =?iso-8859-1?q?zkdbZ3ZNJIErc/EMslvngPCP0n4wtAbzcv/wsRB+5Ojr4V8q/l9?= =?iso-8859-1?q?Y/7hUkWK0xqb2YnLddq0OzLxX4JBWdtgn0IeWfL6HmwGK4R/Vj5?= =?iso-8859-1?q?ktlwoFasf5R50btM1JwCwpc4sI6JA6I1AghfiemKkK6BXwW944R?= =?iso-8859-1?q?HdsB7Xf49mFPPOF3DHX/zb5kHXW0tZy0qNq270K3HzSDXxXks8/?= =?iso-8859-1?q?y5cngI8YjfS0AeBLebQ8HchqY8fM+a/gwO4xagVMqpStiFeCgXV?= =?iso-8859-1?q?5M1LmgnQS1ZovjTHoOsFOoJCrn5Qtovr/dB9L7HbTTZccBf0XVa?= =?iso-8859-1?q?aH0dtizHK84XKJOITXKyw+g3SCFNDTZ6Fh6QfxftluOajNQt5YW?= =?iso-8859-1?q?/EaJR5nooofXpkZBUbQWg1vMYXG+2lIRECdsb1lgikcJIhZNz8P?= =?iso-8859-1?q?ZcPbLnU+lXtV33y2RWTlCvXdmHI7P7BwhIzJwoxfBQKP9lfJfaF?= =?iso-8859-1?q?1irXdY+dEGBOtMg7HRDGXt+6s+UxGsbguUnhwYssRfhEyDBR212?= =?iso-8859-1?q?b/NmGGzDhMdhmCbo2IIIyeRpH+0e9BvZZZ+4k0lV5Ens9CNiv6K?= =?iso-8859-1?q?dx9YIFNRnthTrJcunNbAylzwK4UrWt1jDLKoEf+Txecms7Nvm08?= =?iso-8859-1?q?QENFNLe94HNe95OTSt1BbB8tHPbuIN1rXAqHTsImEnXtP5KH3j0?= =?iso-8859-1?q?YpyAdENE94MWb+h8oaDUUM1SCPOx2V33IPuA114ZpBY4EtK8IMY?= =?iso-8859-1?q?UkeT+hO68blS7RAPHtE9yM823Sd4Bl/SZ0JD8wr7aRw36WdEew0?= =?iso-8859-1?q?rhEvKmc/rkYkWmexW0pTlst7spFcjcg2EBkLdnHnSqfq3eBAEoh?= =?iso-8859-1?q?f0+fVg2QeU/wzLzrCinWvuiSctqEMZ5nK4RElv/K6EwegMoxD3E?= =?iso-8859-1?q?UBalgKyI+00wemltda?= x-microsoft-antispam-prvs: x-forefront-prvs: 09749A275C x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(396003)(346002)(39850400004)(136003)(366004)(376002)(199004)(189003)(53936002)(2501003)(106356001)(86362001)(81166006)(5660300002)(99286004)(81156014)(6116002)(44832011)(2351001)(105586002)(4326008)(66066001)(2616005)(71200400001)(486006)(72206003)(478600001)(446003)(476003)(186003)(118296001)(14454004)(26005)(54906003)(71190400001)(11346002)(386003)(6506007)(305945005)(102836004)(25786009)(7736002)(14444005)(50226002)(3846002)(256004)(107886003)(316002)(36756003)(450100002)(6916009)(6486002)(52116002)(1730700003)(8676002)(76176011)(6512007)(97736004)(8936002)(68736007)(6436002)(2906002)(5640700003); DIR:OUT; SFP:1101; SCL:1; SRVR:DM6PR11MB2747; 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: JaVvY/xXZpTvcPPlROe2KQAmtmdFKw8a+iZBBFke8KSAj82OT6/pFqWpEFUGt2IW8RRxSUtEEFhjPLt1XEnurgYkO7xP/JPpFAjAmX0O/h1CXBqoFdO8Bk/hHvrauWPm0oKQyn+BwM6W/sI5291fDbEM0vdGIQimVwr3FmIc084JOCkhwIKxXPqrm8Pr1qw/MlXDnelxf9zXqi6GXeLYRhwBBC4IuQtpTDKkHx04t6WrsY4U4D1yo67Fz9MYo+8Sa66hU1XIqlx6sxBdM7g6RbHJ8h5NAIpnXwYjzV4ZlX+PVhKECmr3eISxd+pkN/sudAXKggvEKG/UPpw7npSMs9tSh5Va/hrlu+gR3uaRtweXJ5pf204XztS1a6SV0q36AxgAj/ghTEYgQuThjBJkSIo8Z2V0ki+ZqHxNhgig7Zs= MIME-Version: 1.0 X-OriginatorOrg: aquantia.com X-MS-Exchange-CrossTenant-Network-Message-Id: db426902-8cf6-4493-15de-08d6a6fee2ab X-MS-Exchange-CrossTenant-originalarrivaltime: 12 Mar 2019 15:24:57.7973 (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: DM6PR11MB2747 Subject: [dpdk-dev] [PATCH v3 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") Coverity issue: 323518 Coverity issue: 323520 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 Tue Mar 12 15:24:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Russkikh X-Patchwork-Id: 51127 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 5A64C5592; Tue, 12 Mar 2019 16:25:03 +0100 (CET) Received: from NAM03-BY2-obe.outbound.protection.outlook.com (mail-eopbgr780087.outbound.protection.outlook.com [40.107.78.87]) by dpdk.org (Postfix) with ESMTP id 5D2B64F93 for ; Tue, 12 Mar 2019 16:25:01 +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=4E/sLDIyoShPPI0v0ri6IFqjBml1650h70sAeRsnN2I=; b=rySAzpM6t9EcWcSw31RS/K9jajIDWlwbDLttitXW64W/P7xeBF/AKVmZOFbXGxHcW3C5jey7EIilHP8oo/kdEdT1TiWp/QYpZGIntSh8NR1lb6xn1Z2hrPnTbjDifETNjV3258dfazbSnP8vg8m4MxpCrp2FlHKT0ZUGDz3A5Lc= Received: from DM6PR11MB3625.namprd11.prod.outlook.com (20.178.230.149) by DM6PR11MB2747.namprd11.prod.outlook.com (20.176.100.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1686.18; Tue, 12 Mar 2019 15:24:59 +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.1686.021; Tue, 12 Mar 2019 15:24:59 +0000 From: Igor Russkikh To: "dev@dpdk.org" CC: Pavel Belous , Igor Russkikh , Pavel Belous Thread-Topic: [PATCH v3 05/10] net/atlantic: use EEPROM magic as a device address Thread-Index: AQHU2OfBHYDDICbFE0mHbxUJxXx3LQ== Date: Tue, 12 Mar 2019 15:24:59 +0000 Message-ID: <13dc16dc55b42d6ba0df358ad727308938fde8cf.1552402263.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: HE1PR0901CA0050.eurprd09.prod.outlook.com (2603:10a6:3:45::18) 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: 553eefff-3191-4a17-0b10-08d6a6fee3da x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600127)(711020)(4605104)(2017052603328)(7153060)(7193020); SRVR:DM6PR11MB2747; x-ms-traffictypediagnostic: DM6PR11MB2747: x-microsoft-exchange-diagnostics: =?iso-8859-1?Q?1; DM6PR11MB2747; 23:u+s+ey6apKtOo++nbDvJ+Y02ozeTORqOnCexfUG?= =?iso-8859-1?q?8nL9gLTsZcCAnCxkdOVBpv6G9?= =?iso-8859-1?q?wrp7kMEaCR9lAKA/ujDul/FDr9nQzN/aay/fu3BM//isniqs/B5?= =?iso-8859-1?q?y5VC75p2GIOTVL/FbG+zER1p9vzwWYcdfKjTfbuT0e/uA2uJ7G2?= =?iso-8859-1?q?kzmpKEQqS3He4TLVGV+1RaaS/NciOa++XUFZk/hHcKnWALhFYW0?= =?iso-8859-1?q?LwGaftaQvJTj0stRvGeWzof2+uPaWn8GPUfpB5D+1FvfTBUd6Gd?= =?iso-8859-1?q?RYxBvhEkXmnEYy4UW4t2ko0bRGdS0rDATDUWTnX4AHOnJjR6sdU?= =?iso-8859-1?q?2JXORRpw72xCXu+rbOn0dn7ZPV+gBvcIs/21EDeI/p7lw8vQDoH?= =?iso-8859-1?q?1E6bWT9EIN3kXUAusgh1fljRE+fS2gLC+q/RU+HRD6uvn7Et4eX?= =?iso-8859-1?q?9VYekvAFB6C/tE6vYBbtUobGWJbKcMIVwegSHG0/pIxmrqi28L+?= =?iso-8859-1?q?fYJTHQi8tdvjBM/lSWTPunagIhlcyOpmg+dc1qt9IFFLcgArA7Y?= =?iso-8859-1?q?e7RCYT6y7oNsvQGYN/6PSQTSH7VFjucWg4RiGZXwaXaYZQAghLa?= =?iso-8859-1?q?jSaKX1H875M0foHUA0apOz5CddUeMqtW/nqcDmeHd0ImOdzTBCe?= =?iso-8859-1?q?sLBMvmPys2lMBIsg1dFILJJU+3mIKVhtOxKxdRHnJB0tM0A7eYP?= =?iso-8859-1?q?SwaSIy3tnJEKb4hZe8ssDsg6ijFb4r6s9BQj9Y0jt7/uwaGJ7pG?= =?iso-8859-1?q?2JQ4kBV/EldBVDEyBl73LrKyIyY9fTaFhWBTWlyYZrdMrEl3S0+?= =?iso-8859-1?q?p8ugt7Tla3YLW2uSW09SJjofFbDeKOfbfmXAhrNO7+SOUy87Y40?= =?iso-8859-1?q?7IgRROPD/WHFbFytTXfGvxlJ/fpr0EgObLY9ZsiEoQ4Ahd7EzRw?= =?iso-8859-1?q?mILOZtdY/E/MgSELwHXYUOU+nlFSZSK4qBWt5eZJfD+sE7YbP6Z?= =?iso-8859-1?q?Lo/ulLN63Vy5F2HJd6AGVMcUlstrffslnObZTh7PlQdq2UnNMw6?= =?iso-8859-1?q?KETC0WyWkNOs9cBclDBG/mt8WkUQSIU4LTywhzCUe1/NgAciPIP?= =?iso-8859-1?q?QFsVFWyOhGqNVdlX9+7a/6MMV+rkbecidwQ8B8waiZOgq0cHnzB?= =?iso-8859-1?q?ar2LnC0lecWTFigs0NHFIOsl3sui1Khq9QF9uP1w9sC2h+QnMy8?= =?iso-8859-1?q?O2b07s6UmsIZxG+a2VrBVp+rZ1WgBCwkznW4m1iu9YwNdGecqra?= =?iso-8859-1?q?NwT2wRdIBwRiucEGVIjYXzqWVyK7ZUaKkenaHOfmBGont276vQn?= =?iso-8859-1?q?xY7cMpTBOPgm1FNaNUMu+XgoWHHJ75bvA1NQF9QDngXfLBV/cej?= =?iso-8859-1?q?mx8WX3osa7Y4nP+NlS+AAl8AkmE09XpbH0wBqJYiEPpEhtfR5dw?= =?iso-8859-1?q?LOx0AD9m/xGneWwLqZr9pJxTPs9ZY/x3ns0hZqduLQ5o1ZVs=3D?= x-microsoft-antispam-prvs: x-forefront-prvs: 09749A275C x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(396003)(346002)(39850400004)(136003)(366004)(376002)(199004)(189003)(53936002)(2501003)(106356001)(86362001)(81166006)(5660300002)(99286004)(81156014)(6116002)(44832011)(2351001)(105586002)(4326008)(66066001)(2616005)(71200400001)(486006)(72206003)(478600001)(446003)(476003)(186003)(118296001)(14454004)(26005)(54906003)(71190400001)(11346002)(386003)(6506007)(305945005)(102836004)(25786009)(7736002)(14444005)(50226002)(3846002)(256004)(107886003)(316002)(36756003)(6916009)(6486002)(52116002)(1730700003)(8676002)(76176011)(6512007)(97736004)(8936002)(68736007)(6436002)(2906002)(5640700003); DIR:OUT; SFP:1101; SCL:1; SRVR:DM6PR11MB2747; 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: R3wtSP+XkTvOWUC7B2LdCXxrhAZkktt1/i/ID+rAgUDl0/zy3Uz0sXAHXfC8gl82IxhKsXYo+7YWvxT80T6Igf2bv3lUSYqSxWh4anb1GcmbpyroTYknp5OG//QJVXQDRLKZCXZ6P6GO1rSf9tm7sJtceRvTNRuY+XYIi34VFpRReZFZDffzpCwsGFIdChVWNHGxmotu1g0JYCgmx4fZrMGP+pPpFvdYmKSiqifdxTs2VVXFS6PQxW8Y9M4BbelSA44dHtML3yCIp+fCrSlNzwDUbBS+FLdqdg8PAJubkPPDeXhq540zSy6TiZlrLqsG66dltAZF1xCVz0zWeAwIk//aWWpLjqu1gqSDGgvgPkWxN63xkWnCNQLWJC3Ynf9BGHsmIC+Z1QdCB66n/ARNZTV7Mm5jlC32nvd8geF0Dls= MIME-Version: 1.0 X-OriginatorOrg: aquantia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 553eefff-3191-4a17-0b10-08d6a6fee3da X-MS-Exchange-CrossTenant-originalarrivaltime: 12 Mar 2019 15:24:59.7898 (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: DM6PR11MB2747 Subject: [dpdk-dev] [PATCH v3 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 | 25 +++++++++++----- 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 | 30 +++++++++++-------- 5 files changed, 58 insertions(+), 31 deletions(-) diff --git a/drivers/net/atlantic/atl_ethdev.c b/drivers/net/atlantic/atl_ethdev.c index 5bc04f55cc21..a510646a5f7e 100644 --- a/drivers/net/atlantic/atl_ethdev.c +++ b/drivers/net/atlantic/atl_ethdev.c @@ -1102,24 +1102,31 @@ 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 + eeprom->offset > 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, eeprom->offset); } -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 +1134,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..3edaf0c7c047 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, u32 offset); + + 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..1d9190155421 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, u32 offset) { int err = 0; struct smbus_read_request request; @@ -494,8 +499,8 @@ 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.address = 0; + request.device_id = dev_addr; + request.address = offset; request.length = len; /* Write SMBUS request to cfg memory */ @@ -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 Tue Mar 12 15:25:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Russkikh X-Patchwork-Id: 51128 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 F14034F94; Tue, 12 Mar 2019 16:25:05 +0100 (CET) Received: from NAM03-CO1-obe.outbound.protection.outlook.com (mail-eopbgr790050.outbound.protection.outlook.com [40.107.79.50]) by dpdk.org (Postfix) with ESMTP id 866B05688; Tue, 12 Mar 2019 16:25:03 +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=aJ6oSpzi2bQ747WPAHfFT6fePTGStolzIe/Qt0LSAoI=; b=j91oUH/yNqOwdKpkahgTVqZab5kzAxb1XHve4g3PAuGRHACzBn1HKvqe/ALV+tKldznBUGzGQHCUtxJ8jC8/948H7zHX4mkBJHplCCgrzfI2gVDNFt5GCixVIx6EZhsYgzwVuZ77RvpGGVi1wnGlV1t99cfBwMTuGepqpqp4pPY= Received: from DM6PR11MB3625.namprd11.prod.outlook.com (20.178.230.149) by DM6PR11MB2747.namprd11.prod.outlook.com (20.176.100.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1686.18; Tue, 12 Mar 2019 15:25:02 +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.1686.021; Tue, 12 Mar 2019 15:25:02 +0000 From: Igor Russkikh To: "dev@dpdk.org" CC: Pavel Belous , Igor Russkikh , "stable@dpdk.org" , Pavel Belous Thread-Topic: [PATCH v3 06/10] net/atlantic: fix EEPROM get for small and uneven lengths Thread-Index: AQHU2OfC908YZtmstEmdJ6jfT9iL4w== Date: Tue, 12 Mar 2019 15:25:01 +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: HE1PR0901CA0050.eurprd09.prod.outlook.com (2603:10a6:3:45::18) 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: 587319e2-b1bb-439b-d0a1-08d6a6fee52b x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600127)(711020)(4605104)(2017052603328)(7153060)(7193020); SRVR:DM6PR11MB2747; x-ms-traffictypediagnostic: DM6PR11MB2747: x-microsoft-exchange-diagnostics: =?iso-8859-1?Q?1; DM6PR11MB2747; 23:BNoVGvS2mKQt3J+8jsmQ0IEM81AZHYOY5pEUMHL?= =?iso-8859-1?q?ORP8ouO0eFeZ+7qZX7qgwTh8y?= =?iso-8859-1?q?8mqFNDLVcvpGAQGTciyRD+JPDWcpaznvGJ8OYsUeGYM/0JjLsWM?= =?iso-8859-1?q?hgoy7orOoi2fzrD8PWNmc0wP6gq7YOXaCYQBvOxQ+H8HwpRsKWS?= =?iso-8859-1?q?mJkwpGYFRl74imQZaEA+782ysFTNLrRMsa8XOUo8pJxPKUTZu93?= =?iso-8859-1?q?RNqjaClKfshewZ2Uxh+WiFHAsfxnQj3JfdnJi5IthEKEir5l3Uf?= =?iso-8859-1?q?0oMHWX/g2lYdQXMosU50mBbrN2xcPypcKiwHXCLwVSnFoBtKYjh?= =?iso-8859-1?q?bhVUq2w9A4+rqHM5csXt/eyghnoMlDK2g/lYrcLl0i200abxBqv?= =?iso-8859-1?q?6jZyaLLjtHCmzXXVTsQb51RGtqk73PiE6+hudFlH/EvLuyNH++c?= =?iso-8859-1?q?Mn9NSWyYUfNs0M+GYiAPavm1PO4kUKL11v9by2x2IDfuQc1XhCt?= =?iso-8859-1?q?AZfh+4dP9/ULN/5uHMnwA+DzoL55fnNFm0wPOWhHCPH2ZeymN3z?= =?iso-8859-1?q?gIM5cJzEhOontFjR3OK8HxkP60HAiYxZdyj7R9T1iwHNCs7o4GB?= =?iso-8859-1?q?rAd6OSgW2ZMOiJCMhIlmwoHa6B6AoCx+Z1mN9nkRp07BPn04epi?= =?iso-8859-1?q?OZ1e4kww2PNpWtDUPQ4g/I76KAA4tffL5EPmMDnbSoyNIBG8Ygw?= =?iso-8859-1?q?dEltDLbDswtJWw1vuau6/m/COq8x95DIKZ3HTUUiokVNnI7COR/?= =?iso-8859-1?q?ycmCWs7/msjsxLanilUSqasiHJL1F5R28G4Ye7QtTpr4nYwlhQ7?= =?iso-8859-1?q?sfan3VIXBjSt3g5TN1kQ1lYCbVQ7F8LmSDmhkzqg3Lp/HqG8enY?= =?iso-8859-1?q?fQlPhfk7DP51S6KROgFV/Fp6qMj+URGDR4ODuV/fiZsEEjFWih+?= =?iso-8859-1?q?STytlHdd8VTyTqwt7RQZGkP1/uoSkhyrXg05Z1MWmTo3JaQHTPn?= =?iso-8859-1?q?JIXnZqJcyeOKaBFtP1DXKwtDPQ3GbY9qKmpdj+UuLwfkpY3BJxF?= =?iso-8859-1?q?DisuTRjES1fojhrqnzWhkaZmFbGWO/E4GGUfbdeuiL7dUCfz/gC?= =?iso-8859-1?q?MKkpGt3q1vJ8OTOvNBl8w/f9JAYEZMI8WuyF48tVqEpd3vUXHy8?= =?iso-8859-1?q?YVu4CAUKhA8KJa+g2XMymwjXfGx3VyKc38eZpG07+w7UDZpwdpn?= =?iso-8859-1?q?MJ47azVelGHR6WQyA28B4tHJMhBWeyBzFpTIHubJpA6yM7QpC/H?= =?iso-8859-1?q?2yVsOn6xRBhhUDpb7gIboGQlTPL9lrYYDjzLOdzzGCAsot+c/Sj?= =?iso-8859-1?q?l6ykbG7B7LHqnkeBVZ7QYlmXq0nUPzquwcrfrgp3mtijwOVwGtd?= =?iso-8859-1?q?oGoI93hkABxzE0JF62ZIuzg4w7nxGb9g2aA6XjmCzjeWOMJpwBJ?= =?iso-8859-1?q?NmImk4IWILOgiEF2r+UH9UpgytrnYF7p/dR8S1S1XpTgR79jPVO?= =?iso-8859-1?q?ndVMtzdX3zQjfIgbM6Gl4fmjVvCNbYjm5QnN4vXSbdZ8IQ7pGet?= =?iso-8859-1?q?8YTOrYxEPTFR+7VJc5lutssmG0EYZ5VR3UjLi3YvPMOJmeuEP/c?= =?iso-8859-1?q?3g=3D=3D?= x-microsoft-antispam-prvs: x-forefront-prvs: 09749A275C x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(979002)(396003)(346002)(39850400004)(136003)(366004)(376002)(199004)(189003)(53936002)(2501003)(106356001)(86362001)(81166006)(5660300002)(99286004)(81156014)(6116002)(44832011)(2351001)(105586002)(4326008)(66066001)(2616005)(71200400001)(486006)(72206003)(478600001)(446003)(476003)(186003)(118296001)(14454004)(26005)(54906003)(71190400001)(11346002)(386003)(6506007)(305945005)(102836004)(25786009)(7736002)(50226002)(3846002)(256004)(107886003)(316002)(36756003)(450100002)(6916009)(6486002)(52116002)(1730700003)(8676002)(76176011)(6512007)(97736004)(8936002)(68736007)(6436002)(2906002)(5640700003)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1101; SCL:1; SRVR:DM6PR11MB2747; 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: hw3GYpt4fLERe90mL7OBRioJoSJcf4isvvldcBpoA7a5zDP/gkK65kAuIN11ljG5BwJLpooKIS70J5Onu+cSmacGYcBWEiJnnzDNKfUJkhL8mb+nx/j5EsBVPSU5l3uCzGzEaiG3pkPXKtRuXXrbwVx6CaCaLnNRNWPIJO9jMS874yR6ZdGz/ffzHyD1alQ75R2g+ZPHv5wC4Pq5MueQCpOqEx30noJt1/jsSZc8s6XOFuI++Hcfy4MIDbasLwkzwr3ADhNyj8zpwgaswuhB05qlYmIt5HWkukIsk2ZNTlMnj01X6xULT6qgutqk8y0BCVVrHSkWSUdJihNkyPbiqkfqxgImMaqZR/2qix4fd5pEZJFytL+mtjiFuk0uuEI+eKDqToUSOQW5kj88rJFxQmTqPChPgjeXx4xXMn8iK80= MIME-Version: 1.0 X-OriginatorOrg: aquantia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 587319e2-b1bb-439b-d0a1-08d6a6fee52b X-MS-Exchange-CrossTenant-originalarrivaltime: 12 Mar 2019 15:25:01.9324 (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: DM6PR11MB2747 Subject: [dpdk-dev] [PATCH v3 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 1d9190155421..f215ceb70435 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 Tue Mar 12 15:25:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Russkikh X-Patchwork-Id: 51129 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 DFF915A4A; Tue, 12 Mar 2019 16:25:09 +0100 (CET) Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-eopbgr770071.outbound.protection.outlook.com [40.107.77.71]) by dpdk.org (Postfix) with ESMTP id 0B7BE5699; Tue, 12 Mar 2019 16:25:06 +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=/cpHjI6uoHXsoj+Y8vM6EkegxQ9MgOaR81q3imLsohc=; b=JPWoGOQ3ZYEwYdQalrT3l+pUydNUElzCx885+5Ds27o0T4KVbrrg4qEvwFkLAadVPRc5Iec/qmmn+IFIcpvYOm2qiUJSJAJBSSfJVXEJLZN+JQrLWQQkrwAWTIOW13bepai0CCL2Miwl5NoZ2wv+Ps4T1LCZU/C6uFZ9DUgu/XI= Received: from DM6PR11MB3625.namprd11.prod.outlook.com (20.178.230.149) by DM6PR11MB3068.namprd11.prod.outlook.com (20.177.218.153) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1686.19; Tue, 12 Mar 2019 15:25:04 +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.1686.021; Tue, 12 Mar 2019 15:25:04 +0000 From: Igor Russkikh To: "dev@dpdk.org" CC: Pavel Belous , Igor Russkikh , "stable@dpdk.org" Thread-Topic: [PATCH v3 07/10] net/atlantic: fix link configuration Thread-Index: AQHU2OfEXowG8t5j2U+ZL3BMTsOeLQ== Date: Tue, 12 Mar 2019 15:25:03 +0000 Message-ID: <78c4ae4e6390cc14855961faf7c8568840aad47e.1552402263.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: HE1PR0901CA0050.eurprd09.prod.outlook.com (2603:10a6:3:45::18) 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: 2faefe88-30ba-44a3-c308-08d6a6fee651 x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600127)(711020)(4605104)(2017052603328)(7153060)(7193020); SRVR:DM6PR11MB3068; x-ms-traffictypediagnostic: DM6PR11MB3068: x-microsoft-exchange-diagnostics: =?iso-8859-1?Q?1; DM6PR11MB3068; 23:w31+9t9pL9O0IbCLnmUeCfbvYlXt8o7ts5ju2bZ?= =?iso-8859-1?q?rYe6OnC7BwodUsACtY+XHc1+u?= =?iso-8859-1?q?7l/AFaAQSATVO63a9t3qD0p2OpyXyJZFvPDxfX2ODUmDTVkqSGs?= =?iso-8859-1?q?6kcdqF6ir2NDZWC1YW8pWz0wxmt+SOmtGPJNpIFGq80l+GxqeTY?= =?iso-8859-1?q?eUtRoDv/wtAynpfYyYqvREUBZ429Yb/fkUvdh5ol4oEn0o6m33c?= =?iso-8859-1?q?w4UIyqzBkELsmrZlNiRGJplIzRKvnSPuUqZlow+5e5TUEqzuGcV?= =?iso-8859-1?q?4RTBiBdyg9Bft2MnZsXomb6c7/IKSMBk25uLJ12NozCX+9G7VNl?= =?iso-8859-1?q?WbuEQQOB+YGkDrNiqY/Y1/5DSVNwlsUQpYyiHcPJ/9HRqjPMkbt?= =?iso-8859-1?q?kn9tCvF+pERmS/f4L2hvJlJ3HM2WtuRK+sOTydCkY3uRKAjbu3L?= =?iso-8859-1?q?gdaVgpLZzCzBZ/8KPOa+NMSdWgyS6Eeh4QTUcRNOLYpqetHlQSF?= =?iso-8859-1?q?e2J0cbhI/x4/zjPEb+u2YQInlQHinU8Wt2byZsVwlfgqQmOzkn8?= =?iso-8859-1?q?soqO8W9QmNBhIo9E/50oMTtUqNY2y+mVdYsOPpX/l2af1ZYWc7O?= =?iso-8859-1?q?a58Aq/YonnkyV3c3lbnJrsIE2vX3Us/wJa7+XI6fDzyKbbmVNGd?= =?iso-8859-1?q?dQJHcUDwUVK7fMW4uxjB89Hd7JtAI/cs1LciyZeUkezZlG9jfzQ?= =?iso-8859-1?q?NFtCU2iYCGgvtmy/wpKiAvtkEnXZJc2KYKIaJQUfw7eYKxflxTf?= =?iso-8859-1?q?BwKe1n4lFaVcHtdEKTGpQBxTm55PaPYQd/SsK/uIgLrMmSww6Rc?= =?iso-8859-1?q?Y1EAj8V5zum76IQFMRnpE2DkhDKs4gp6iFq21uAHJaz3LcuftzZ?= =?iso-8859-1?q?0lY7iBfvq+NWDXQv5VeSANfdjGdFnSZ6GCK5KdInDdIrdF2Mi6D?= =?iso-8859-1?q?w3pf31mSbn9xDZ7dIJ8yR5h6+3hNLok9NWVqiJ/Kjwavmue0zWT?= =?iso-8859-1?q?u+mYSfEDiyqaHRY7CPLZVzU8kwpm+5jeDB2Mv1B4zXmQPcMkt4i?= =?iso-8859-1?q?iO3OaLbYLrHATStT1IhQBK9RULU/9O91K0VdHj2ApBLGE4oHUzl?= =?iso-8859-1?q?JB03JZ9+geAx+fsu11zC2q+/54+2D1Zid3Df4B2Un/ky+mF4hR0?= =?iso-8859-1?q?yFCZsL9H/oIR0x8u+8aj0exVmUjnu1nBG3azNI4nuQrTMBS+VDn?= =?iso-8859-1?q?+QftOncNtS/Qg7jJEn8xHt4pgaB5JTWTDWiooAlG+bASMCPStz5?= =?iso-8859-1?q?sQ9gGgA+UPnvxbhwr0uTcbTGDsdfz+Qjt3NjOIz/I5trR2wQsIG?= =?iso-8859-1?q?Nc9IKONhVVJz9kW2QMzJeggS25ErnExk8mHILMFnMa2iqlVGAC9?= =?iso-8859-1?q?0H8TSZK1PhJi6Di+U4ArCmLS9fIQzEbbBAc3eFSLoDaxYiqjlmt?= =?iso-8859-1?q?7dU/wjRTmVrf9CQ9DcL6LZGD3zut2mCQZ/QG1G9g4dVNbofo=3D?= x-microsoft-antispam-prvs: x-forefront-prvs: 09749A275C x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(376002)(346002)(136003)(366004)(39850400004)(396003)(199004)(189003)(72206003)(97736004)(4326008)(14454004)(81166006)(2906002)(5660300002)(6916009)(8676002)(71200400001)(478600001)(25786009)(118296001)(71190400001)(86362001)(14444005)(256004)(1730700003)(3846002)(81156014)(36756003)(68736007)(6116002)(305945005)(54906003)(316002)(446003)(8936002)(44832011)(53936002)(5640700003)(26005)(11346002)(476003)(76176011)(66066001)(106356001)(99286004)(2616005)(105586002)(186003)(450100002)(386003)(52116002)(7736002)(6436002)(6486002)(2351001)(6506007)(2501003)(6512007)(102836004)(50226002)(486006); DIR:OUT; SFP:1101; SCL:1; SRVR:DM6PR11MB3068; 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: z9ZoEmAuHmMCdNDU3twxtKwDxWL8oklx5QKMpFZtO+YNApbjV97id/gLcNgaMhK5WWtlduiDlC9LxfHeReOvlxVFsbMxdkTTfqiGtotRdLxZnqhgIWij5w12Yb/MGV784BgbUcZX8U4eBG6jxGRy9yUe0fQcoOXuCyqGjBqGbxjNDyi2uQ02wCR+K01ghB8gIn/Dg8xvh6e9rTk4B4uueB7MSS8zoK2kHsG25LMacHGm+OnfLkmc+0DTpWV2PDlCk8kLP1/RldTHDQezYD7j1k0dJMlHUhuIGhgCPcPVXcRWNgCGht1XSzH1x1Ybph8PQplgffaCyK0kBUWDGh0pec5/KDqJaKwuu73CgJK2vQN7/vtLJ5BC4WdqMUbLq6ScAL+e0jo9upYcnKiMJTtTsYxoY73ZGcaN46cEeRcvtTA= MIME-Version: 1.0 X-OriginatorOrg: aquantia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2faefe88-30ba-44a3-c308-08d6a6fee651 X-MS-Exchange-CrossTenant-originalarrivaltime: 12 Mar 2019 15:25:03.9198 (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: DM6PR11MB3068 Subject: [dpdk-dev] [PATCH v3 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 a510646a5f7e..e43e1e724696 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 Tue Mar 12 15:25:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Russkikh X-Patchwork-Id: 51130 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 7412C5B16; Tue, 12 Mar 2019 16:25:11 +0100 (CET) Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-eopbgr770082.outbound.protection.outlook.com [40.107.77.82]) by dpdk.org (Postfix) with ESMTP id 1AE5756A3 for ; Tue, 12 Mar 2019 16:25:07 +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=Kok20R4CmEVdzsoELjNdua0zRhF+kgvxmrMsVvN26+WBllYTiMSdrRAXgTFIYcRXdruJwmg2V0JfdFjaK7KbANSbkiiD2HJq4fwEL7hE0fAVuHVKXiRPlv6+DR3FZUXMkDF6LFWFAMtv2tbCpFgGOpyw92Y1eNU54d9Haax0Oc0= Received: from DM6PR11MB3625.namprd11.prod.outlook.com (20.178.230.149) by DM6PR11MB3068.namprd11.prod.outlook.com (20.177.218.153) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1686.19; Tue, 12 Mar 2019 15:25:05 +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.1686.021; Tue, 12 Mar 2019 15:25:05 +0000 From: Igor Russkikh To: "dev@dpdk.org" CC: Pavel Belous , Igor Russkikh Thread-Topic: [PATCH v3 08/10] net/atlantic: eliminate excessive log levels on Rx/Tx Thread-Index: AQHU2OfFtHZo2ocufUC8Ux6X24aGlg== Date: Tue, 12 Mar 2019 15:25:05 +0000 Message-ID: <87513983880d4f283bc0b3dbda4f2d15709828e8.1552402263.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: HE1PR0901CA0050.eurprd09.prod.outlook.com (2603:10a6:3:45::18) 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: f48c7b45-31f8-4a92-9512-08d6a6fee75f x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600127)(711020)(4605104)(2017052603328)(7153060)(7193020); SRVR:DM6PR11MB3068; x-ms-traffictypediagnostic: DM6PR11MB3068: x-microsoft-exchange-diagnostics: =?iso-8859-1?Q?1; DM6PR11MB3068; 23:0j7UJnmb5zsSwJOh/PKAERHUXe0pKSqi0Qv3uAE?= =?iso-8859-1?q?phl9h8Ra/k/DxeP3wCW+1feWl?= =?iso-8859-1?q?kVfTvKCKdFnyBbkFcpHwLLjMrJvCEREWuRHYw3G2ZcTpHPwu8K9?= =?iso-8859-1?q?oanyCDPACRCvzEuR/nIEbSuYo1bUQCE7hEC//8e8+ne1+lMu2KN?= =?iso-8859-1?q?ODUAdPfOuIKXzpvR9VeA7zxaFv9c/fixFG5ut/q/1ijp/pYdy+0?= =?iso-8859-1?q?g2E+odgWqnl8vnjFzxaLKxIVXTxM3fBdI021X+88RX137gqV3XS?= =?iso-8859-1?q?Stqv7sSjv3kPT/Xiiz3YG5KN0wW5RYHTW89nYUam6b+HncPFoXd?= =?iso-8859-1?q?Yzq5eCAI89IrBJpHa8c7Bgy0Nw46SGGaPCYAcIsWOmAT/E13Oa7?= =?iso-8859-1?q?lkOcnjdglcmVmd+espaH9Tj25J3szOlJSKmCZ1WCFwN8ZEzA3gA?= =?iso-8859-1?q?E89WowxLEDtMSWr8iE1Nd/5QYjMm7puyrQx7lAdHf2JI/iz17zO?= =?iso-8859-1?q?EEOPPkaoBdgNBIkPvm3/9BZk+Rbvavpe3TZN7MRhRsSa9CG/d1v?= =?iso-8859-1?q?Fz+83/Qh3S5JvH2ldBZY4OlOQ2c4Vcsi+lRO1FoacZBgrrUIfpw?= =?iso-8859-1?q?l52hKMqjAhNQeRj9DeZSzh3kS0i2teeero4IYkwM5k20D2TmPnQ?= =?iso-8859-1?q?QtggUVecAQETrrMhXwDXLt/H0yo+09sIADPk2SkQGiwyNPsl8xo?= =?iso-8859-1?q?DxM9FSPKs7ChNZZRR8D2Z2IVU6ASlLpshIYEx/tKrC4XUFmz4Kf?= =?iso-8859-1?q?t4hhp1o2B9qz+K/9P1dgjZYCx2Kf4/3w9mLzx9qFw/TDHHF0Z+V?= =?iso-8859-1?q?oAulyZBrk+eSbsqrYg51kyXET/8eCuarb8/ckSXLEOOcp4K776b?= =?iso-8859-1?q?PQQpnqSXfOmODxNsjW6fdxL3q9ueGJ2YWSPYpD83Vk8WLBxK1U6?= =?iso-8859-1?q?xmREzxXf7ySHBDsaKJXTAWu4iN7jo1nEyqAWJfcpiGJMPtGWOip?= =?iso-8859-1?q?cbJbsADHfPcTGwFt880M/oRwI3cGW+Jee2ap6+zlL9954V1cZAD?= =?iso-8859-1?q?uYt/7iDxr6PYFLP1MV0LHV+Fj6ShK8+4h0bhRYJwMNLC4PcklVh?= =?iso-8859-1?q?9LlhV/rg4t45BI4ke1EZVv19IckHnt1FK5KYubEiKqXPuHuYfzz?= =?iso-8859-1?q?rFLMjhxnB/SmFoB3hnnwoljV60QrXh8KtIknTYaPka1tK1HMBxq?= =?iso-8859-1?q?g6Oz3VBfQ7uJTJtDubN0bJ3u2VwzqEdp1nHA9VL6a5+6TDyCJrr?= =?iso-8859-1?q?8WY2I+mjfvpYbOI5/g9JPLnnOOV53V8OCykghxKe+V+SWEBTWSj?= =?iso-8859-1?q?azMbRpACx2zzSdS9u8PaVrT3Ut3B9tEjZWGKba/5Mgy6U/CteBc?= =?iso-8859-1?q?XCdClI/OxdYqanbj+46JuuYV19u2OamY9sINiswIdGmU35FRgM4?= =?iso-8859-1?q?7XThpnkFTxZWcmBflI4EvAvlJMg=3D=3D?= x-microsoft-antispam-prvs: x-forefront-prvs: 09749A275C x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(376002)(346002)(136003)(366004)(39850400004)(396003)(199004)(189003)(72206003)(97736004)(4326008)(14454004)(81166006)(2906002)(5660300002)(6916009)(8676002)(71200400001)(478600001)(25786009)(118296001)(71190400001)(86362001)(256004)(1730700003)(3846002)(81156014)(36756003)(68736007)(6116002)(305945005)(54906003)(316002)(446003)(8936002)(44832011)(53936002)(5640700003)(26005)(11346002)(476003)(76176011)(66066001)(106356001)(99286004)(2616005)(105586002)(186003)(386003)(52116002)(7736002)(107886003)(6436002)(6486002)(2351001)(6506007)(2501003)(6512007)(102836004)(50226002)(486006); DIR:OUT; SFP:1101; SCL:1; SRVR:DM6PR11MB3068; 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: HBWjx3MFHwokOvtPtJ6kWgVtRlykUb3uRvz2++o46rjcIo68JSWU7woREq221A47XE+8iWNAnB0KFrjyU53wgV7NIMXXgaSQ9eJW+/bOkqEriq7ZBZZC5/dGZMwkDw0v5GOASV0R7TFOX/Lzmn0lgIFNJ57d9gKDNnZH6qybtE4P1nwqSo4aWI/eEtxZcTrq0DWDIOTvvhZizjoDoZefmJ7HnIQgrjAQ13Zb2NiA7CxhbRABD6OlmvSLIwXH5vVPbpll1sel67kUgt3UnyfAH04Rm+2UP7Bi0nmXxiISSFwB72KYaa5HCZ+bAq4WH9aKRbKYmaZH7K9Vg+Z/5Q3nIMlXgHVHftoqxqdV0WTr5rDZl3a/1pkxvTC0C+agm59y7N81ZOQyVP8uzU6Fl9Rieg/daWUSUaCAfrONbMOnuW4= MIME-Version: 1.0 X-OriginatorOrg: aquantia.com X-MS-Exchange-CrossTenant-Network-Message-Id: f48c7b45-31f8-4a92-9512-08d6a6fee75f X-MS-Exchange-CrossTenant-originalarrivaltime: 12 Mar 2019 15:25:05.7421 (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: DM6PR11MB3068 Subject: [dpdk-dev] [PATCH v3 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 Tue Mar 12 15:25:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Russkikh X-Patchwork-Id: 51131 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 AE21F5B2E; Tue, 12 Mar 2019 16:25:14 +0100 (CET) Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-eopbgr770050.outbound.protection.outlook.com [40.107.77.50]) by dpdk.org (Postfix) with ESMTP id 4FD7958F6; Tue, 12 Mar 2019 16:25:13 +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=g2rW/WM+Lgd5SdvWoCp736OMMl3HWHNoV4m5VRJ27lA=; b=Q/N7fSpzQUNgzFYrXRP/Ix55IopGykTYba+z2rqoUMg/5CYNA/2Y0mAxnuLa8dS41PcAl5BcIamhx3vsWM/0Uqg3Isq1H/ZS+H+NlU1QSR0KHJpzbOuRrZzVSa+oRmEO6A2Z7q8c1Xsyg7GfvIRirtR23QWcMfpwmOzWGd4QTW0= Received: from DM6PR11MB3625.namprd11.prod.outlook.com (20.178.230.149) by DM6PR11MB3068.namprd11.prod.outlook.com (20.177.218.153) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1686.19; Tue, 12 Mar 2019 15:25:07 +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.1686.021; Tue, 12 Mar 2019 15:25:07 +0000 From: Igor Russkikh To: "dev@dpdk.org" CC: Pavel Belous , Igor Russkikh , "stable@dpdk.org" Thread-Topic: [PATCH v3 09/10] net/atlantic: fix missing VLAN filter offload Thread-Index: AQHU2OfGb4Adiy1MZ0atOs1oggCYdQ== Date: Tue, 12 Mar 2019 15:25:07 +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: HE1PR0901CA0050.eurprd09.prod.outlook.com (2603:10a6:3:45::18) 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: 8847ff12-f642-447e-ec0f-08d6a6fee898 x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600127)(711020)(4605104)(2017052603328)(7153060)(7193020); SRVR:DM6PR11MB3068; x-ms-traffictypediagnostic: DM6PR11MB3068: x-microsoft-exchange-diagnostics: =?iso-8859-1?Q?1; DM6PR11MB3068; 23:n06Jm7v9QWh6JpaSYsZzhtQRUPaZvTb3xvWZHk+?= =?iso-8859-1?q?gdpElvXLwcDWn/rUlyI6laYKj?= =?iso-8859-1?q?M/L5a11hA0T6Kj4CgIR2Q5dN0sR0D4iCGVvbvDdEHJWaRZN6lvp?= =?iso-8859-1?q?quJJUdey5c2J+2MdFPWGHeGQ8YBv+F5Wvcmm1//UrPCHLIdvAKP?= =?iso-8859-1?q?KVIso6cYAfv30cliLPWAl23c8Dsg+aPpTRQgC7hX1AMyKxVytIP?= =?iso-8859-1?q?sp6hgMDHVmYdaugWmZ/wtvVB0d15W96Qd7knAHLun/l0ScKt8EE?= =?iso-8859-1?q?C1fkeQvhaXMaMSJFrB56GdHtbXXWYzoX4R0sFPjrhx6jAkC0F/J?= =?iso-8859-1?q?Wprb36kn/C1XiCjXa8dmMWV26jN8EzclBrHsiSPcJamuiKVXnz2?= =?iso-8859-1?q?+VTLoKSJvl9hNu6Je200sU9L/ItPygJA0/ugnY4LSQrtaQaIQCl?= =?iso-8859-1?q?Fm9ZPa8wwnjXgfTgr40FVmED8ZW0iYB1TOp/TY1o9zukun+zxui?= =?iso-8859-1?q?5XaDTjELSjN29UfEgHK9kecdqITs0EhjjIAijFTCV00ZWdlPvZh?= =?iso-8859-1?q?zwvdneDfuOdb/oQJlAetsfMWL5e+vUBodc8j+7LsbGHcNE68ako?= =?iso-8859-1?q?KAgPgt7L38WLo8B8xwxkXrXhZA0AKn0sF1S+g/PhG0J4HhimDXu?= =?iso-8859-1?q?1Xyvy9VDwlQNTi94VaBcemPI712pSgrGJW3LjTIpVGgEcoTjTWJ?= =?iso-8859-1?q?7RHQUULJSh6xLJrjuIeznghyHm9SojlzhWrXAer3uHJVLpHxZKv?= =?iso-8859-1?q?GDIEFjaUyPjVk8Wdko4AAoBMbVFNZXyoT3hP4rKuUyOzB//XsOu?= =?iso-8859-1?q?+phrPRxTagh5eM/30LGTu/zTCwjDD0BtkikGwbY+oFmS/a52hce?= =?iso-8859-1?q?plJt7G9BmWN9a95jjrbLFNuS8/APx3MkzOFhzdDNbkeTAqsWz8i?= =?iso-8859-1?q?fcb+oG3cC4N3zgXHpGQTAfXJ8ROe3QBDGc9vrS2b8ac/XW73AT/?= =?iso-8859-1?q?ohd1PAipefFuG6vD30Gc/LrB3wj7rGBTDFjIUA5qD5jktTni2sE?= =?iso-8859-1?q?RHC/3QPK31UkMEVfNtCiIbyTxe8mko5xNjcdzmFkCZr2Kb/GZ+1?= =?iso-8859-1?q?aP4S4tW1pGtbGSKU1ypo50rwrdaOmn+0yOfMyNDyEiJf/tW0pTe?= =?iso-8859-1?q?JR4g2Ecu4DAiqmsjPWOV0kOP1TTekolIeYgKWeHqpRlRRGu/MIr?= =?iso-8859-1?q?RoAvVr+CQyZuVzC6bRGctKc5R7z2578fRznsoz9AowRccpt8SpG?= =?iso-8859-1?q?giWCeS0zaumpd23hOOze9hBuZVgvjMPrXY2uPBCrc/YeWKXXDFR?= =?iso-8859-1?q?ZsiX4CkkhhWdMlFFqB4/guob/tFlb9Uq4TzXvrB0QNEChTt9kkQ?= =?iso-8859-1?q?DYZ3x/6tL2rW2/Jwj/omkNkuZ5kJ+4u13gd8YH0BC9OKpQLOb8q?= =?iso-8859-1?q?o2dwr5SHkxKB1kC75gaWBQbqhWaS6b0gI4WIFzB+zQXMHe1fCbO?= =?iso-8859-1?q?2ROAqS2CowdmvWb94Z?= x-microsoft-antispam-prvs: x-forefront-prvs: 09749A275C x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(376002)(346002)(136003)(366004)(39850400004)(396003)(199004)(189003)(72206003)(97736004)(4326008)(14454004)(81166006)(2906002)(4744005)(5660300002)(6916009)(8676002)(71200400001)(478600001)(25786009)(118296001)(71190400001)(86362001)(14444005)(256004)(1730700003)(3846002)(81156014)(36756003)(68736007)(6116002)(305945005)(54906003)(316002)(446003)(8936002)(44832011)(53936002)(5640700003)(26005)(11346002)(476003)(76176011)(66066001)(106356001)(99286004)(2616005)(105586002)(186003)(450100002)(386003)(52116002)(7736002)(6436002)(6486002)(2351001)(6506007)(2501003)(6512007)(102836004)(50226002)(486006); DIR:OUT; SFP:1101; SCL:1; SRVR:DM6PR11MB3068; 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: ufeIFSzziSTHI/z8xxm/bf/vHW2k4VbBNMXapWQ1t1BjAxJ+OO+Bgg8/i+Pmt+0CJlRv6ojwCJ7H8+jfGQoEkyGdLgvNPpdZDGyWSAgRoS6vMRYfHCFjUjrqOxgdVZ1xnyxv9BSjb39963+8rxjYzabzQd9U2BVkIruWwvLHoGXynN4kYYJ09XXH7cRZ84QO7hzJqYO74Nf5CqwQqLR6JxLV6SWDfUkbKZxl/DvEN3MN3lucUGWbhwpTo95dYim1TxZIo3nIm++8S8zyVZr5WVDZlF8ozAAeXiYaNwEn1CLkvzE6SDiXvs2gSBeXFE6G86jqeFVXXrhFf4Pa/+kysT5bybD4GsiUjvA6Ib0o4u/umND0Wxdnmt1kYHVGTeDFb6rWOu1Dt3h2EyJd64BEPFDXBt+DrrKO5EXYfDmVF50= MIME-Version: 1.0 X-OriginatorOrg: aquantia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8847ff12-f642-447e-ec0f-08d6a6fee898 X-MS-Exchange-CrossTenant-originalarrivaltime: 12 Mar 2019 15:25:07.7756 (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: DM6PR11MB3068 Subject: [dpdk-dev] [PATCH v3 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 e43e1e724696..b05dc545d0b1 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 Tue Mar 12 15:25:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Russkikh X-Patchwork-Id: 51132 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 5954F5B3E; Tue, 12 Mar 2019 16:25:16 +0100 (CET) Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-eopbgr770050.outbound.protection.outlook.com [40.107.77.50]) by dpdk.org (Postfix) with ESMTP id B17FA5B2A; Tue, 12 Mar 2019 16:25:13 +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=liRBXwd6gBDGPl1jNq3k3bp+9mJNuYuVANKgNi8whTU=; b=RdQrCrDYCN0cDitcvIL/jlb0fn/JioDJY5bcxVh714OsN6gWe9G+JeD1hRqcPl1Dqgb3WNxAHlA3WPZeyUt2uxKLWLgtBKGyyjTKotLPrzltgm+mcZmud9UL61YkasGmTSuQzka+TyAFbo1bwUqJqQ/nu8wuciwkPskegeugCZ0= Received: from DM6PR11MB3625.namprd11.prod.outlook.com (20.178.230.149) by DM6PR11MB3068.namprd11.prod.outlook.com (20.177.218.153) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1686.19; Tue, 12 Mar 2019 15:25:12 +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.1686.021; Tue, 12 Mar 2019 15:25:12 +0000 From: Igor Russkikh To: "dev@dpdk.org" CC: Pavel Belous , Igor Russkikh , "stable@dpdk.org" Thread-Topic: [PATCH v3 10/10] net/atlantic: fix xstats to return correct number of items Thread-Index: AQHU2OfH5pSr13jPjEakE0goEMUHUA== Date: Tue, 12 Mar 2019 15:25:10 +0000 Message-ID: <7ff8c44079f5bd9adc1370988c97a8aabb48e94f.1552402263.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: HE1PR0901CA0050.eurprd09.prod.outlook.com (2603:10a6:3:45::18) 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: 41143940-9830-4b7b-691f-08d6a6feea10 x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600127)(711020)(4605104)(2017052603328)(7153060)(7193020); SRVR:DM6PR11MB3068; x-ms-traffictypediagnostic: DM6PR11MB3068: x-microsoft-exchange-diagnostics: =?iso-8859-1?Q?1; DM6PR11MB3068; 23:dLLN4GJ3codYrNFbJrRlTpFD/qQKHfIYTfdk5/3?= =?iso-8859-1?q?edqkt6RJouIDMvJDh5S+5gWnu?= =?iso-8859-1?q?20BaToklkEGhuA1XGgNqzPi4yaFpMvsV4wtqWjjvd20Xs2CZSSu?= =?iso-8859-1?q?kLBwcKM5gjs23Gb9T+uyPE/AS8MprGax+QJquHAuZBx93/2A0ty?= =?iso-8859-1?q?yKBF9DrSCJmZBcPtRsglPkeBAz8w4AlgX+JPXym6B9dFqW4VT1j?= =?iso-8859-1?q?HiIJ9u761FgmtQSInc0nDKX9w+IKd9OBGT+cF/LKCovbLO0mgpf?= =?iso-8859-1?q?bQ6NbD5H8OJmV1zzTyX155TC/LkmqNTRtxksCQeadO23Rwjx5TT?= =?iso-8859-1?q?hL4+hpSJpTCtVs3gbDGawE4gJyjaX5qrFqbcywXeDNsNrTDc1qz?= =?iso-8859-1?q?3K79B6CRVKqjDBNVLXFHkJiLwy3Tv5NQwN7FatQ5Qzos/3mH0F0?= =?iso-8859-1?q?imstMFTWMwjfmgPo9DSXx7WpZs/97W8JRYr/tMWqlqQbZ/A85Vg?= =?iso-8859-1?q?sj5zVgLsCmSbW8W35z2WBffSCQRF8smdkEvWVTSlCegu2ReaQRU?= =?iso-8859-1?q?ViBWIEi/bA/ePA979bHVDsDDvq00YcxZQXbTS/z0hsjFwCH1XWH?= =?iso-8859-1?q?KCcu2rTJubL285S0HvrsvYI2C+2ZUGjOrfKHXUS/2uumc2mtbEe?= =?iso-8859-1?q?b+TFicHTIZDXxrbYGSXV/7+p47mlALBxcEY7eq3XyKIceMBpJvw?= =?iso-8859-1?q?T4+yCF3HJdzxosxenICQnAxWbqF3eE5UZRfFW4VPfhDQc9ivUuf?= =?iso-8859-1?q?qpeyP7u+iKn6dgBmGhzvIbtEz/gxz0pRMsUdK1oFlNYvjGdc1xB?= =?iso-8859-1?q?57GiMfc/1ppLoOP8HRNJ2xEizj3ZsbShI4GcUypzOG0jSO3+WIq?= =?iso-8859-1?q?yElwjeyf2+/UqbLYOT60PGbFFSh38HIrp0fBJpog8APsDWe88Pg?= =?iso-8859-1?q?rw2fOZQdd5uwQoytrmm1+97F6WQ5oFBw/x6y/pVjFDKi/ykf8Pk?= =?iso-8859-1?q?v4fuZd3R7K057W8gKwO9F++GM+bfV8ygM674+CACajiwHewfxIN?= =?iso-8859-1?q?zeJiVfzfly8G8/rtsC6wx99FHtRaGAxBZnweBpuj9dxnNlnEwpS?= =?iso-8859-1?q?xu6yYfKKvPz6mZpJoYG5IPSi11MWrfhlXNbOX0KWhWot8bzzxbh?= =?iso-8859-1?q?Um+VqQXLYEz7dTLhM8g4FeuFI2UN77HatopVh4sBVVSYFe51qhR?= =?iso-8859-1?q?hatxo3IvAxQjRtcH1OIQ6lkqjBX+JMyeBRE1VVV3dlWi3U5fk4x?= =?iso-8859-1?q?Qbww6K1xvyt0XtxWVCwFE08t2hIIfjuyzLwcD2fEFS09ugScVsr?= =?iso-8859-1?q?KsEupoyHgZ/RKDOlpfJj2PjRNZ4m1bzgZodQTnZ1tF81GUtuAdx?= =?iso-8859-1?q?hHAxKyXnqFk3OXoop+D/V1Jc6KeHRT6R5InkrGIakmTdVih8//e?= =?iso-8859-1?q?54qT7MMl708TWkel0SwajJmw+qZsNXBDbzLYDO9hdynpIEug=3D?= x-microsoft-antispam-prvs: x-forefront-prvs: 09749A275C x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(376002)(346002)(136003)(366004)(39850400004)(396003)(199004)(189003)(72206003)(97736004)(4326008)(14454004)(81166006)(2906002)(4744005)(5660300002)(6916009)(8676002)(71200400001)(478600001)(25786009)(118296001)(71190400001)(86362001)(256004)(1730700003)(3846002)(81156014)(36756003)(68736007)(6116002)(305945005)(54906003)(316002)(446003)(8936002)(44832011)(53936002)(5640700003)(26005)(11346002)(476003)(76176011)(66066001)(106356001)(99286004)(2616005)(105586002)(186003)(450100002)(386003)(52116002)(7736002)(6436002)(6486002)(2351001)(6506007)(2501003)(6512007)(102836004)(50226002)(486006); DIR:OUT; SFP:1101; SCL:1; SRVR:DM6PR11MB3068; 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: F0I7GpMl7StRaxjSc6h8wn77ea/OIwudg+vrck4WBVLYjbBGaJSPEf5RT1PUCnWNmjws5QfuAF7XvMms6qy4Lobcif8FtONGdGi3RKYC2KvgCKFY/LAlOUORxMqfZnvrLZ+FBtschIoxQrL6HA7rzn+6HFDBBWwwk+ZY51m6Hfim6BZnmJAauVmeDEjOtqCy/KpktNgr5v+qdkmfWdL2F1ij9AwTHujlcD+0t8MkZg07XW8hUkMTDMtZXgpiwWVUpStdLZef+noH22KTcqk8BXccAsY6Huv7K/3+hTocOGd36hz3bBov+O4sw2NJLmreNAJBeLXe+YoZWkNjVHoRD3V+m6aUQyXw0h3FXuwK+wKNumsk5ef9LVkjs6tN+svEz0fFpzYHDExLoBsFUR1953OJdMHrWpTkntrV4ghsm0o= MIME-Version: 1.0 X-OriginatorOrg: aquantia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 41143940-9830-4b7b-691f-08d6a6feea10 X-MS-Exchange-CrossTenant-originalarrivaltime: 12 Mar 2019 15:25:10.2304 (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: DM6PR11MB3068 Subject: [dpdk-dev] [PATCH v3 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 b05dc545d0b1..5c62d137b255 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