From patchwork Fri Dec 7 14:00:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Russkikh X-Patchwork-Id: 1009431 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=aquantia.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=AQUANTIA1COM.onmicrosoft.com header.i=@AQUANTIA1COM.onmicrosoft.com header.b="c5i7hcof"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43BDcw716xz9s3q for ; Sat, 8 Dec 2018 01:00:16 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726061AbeLGOAP (ORCPT ); Fri, 7 Dec 2018 09:00:15 -0500 Received: from mail-eopbgr780045.outbound.protection.outlook.com ([40.107.78.45]:10848 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726034AbeLGOAN (ORCPT ); Fri, 7 Dec 2018 09:00:13 -0500 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=w5SVj+VogCQDa0mce8GvsoxZm7RIf8G7PbbkmNYJLtE=; b=c5i7hcofAE03yO9Y85/Ezu9g5iKhcvJaj/7RlVlCzFvSr9fAoIxuPaflRCykgw2mRa3aHSWzOFM2q89FMH1yNbPK2rZbsaje/aRFIDqctNqXaW6AmcI1y6Sowl1bgcQZLI4PA0pbLvmD8cbyUS7cyzzcrEwqB0fuZlGR0qS3jJE= Received: from DM6PR07MB6220.namprd07.prod.outlook.com (20.179.55.97) by DM6PR07MB5787.namprd07.prod.outlook.com (20.178.3.19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1404.19; Fri, 7 Dec 2018 14:00:11 +0000 Received: from DM6PR07MB6220.namprd07.prod.outlook.com ([fe80::9d23:ba09:343:4aaa]) by DM6PR07MB6220.namprd07.prod.outlook.com ([fe80::9d23:ba09:343:4aaa%4]) with mapi id 15.20.1404.021; Fri, 7 Dec 2018 14:00:11 +0000 From: Igor Russkikh To: "David S . Miller" CC: Dmitry Bogdanov , "netdev@vger.kernel.org" , Igor Russkikh Subject: [PATCH v2 net-next 1/4] net: aquantia: fix RSS table and key sizes Thread-Topic: [PATCH v2 net-next 1/4] net: aquantia: fix RSS table and key sizes Thread-Index: AQHUjjUrFEUOvHaYv0W5AdqekwpCiQ== Date: Fri, 7 Dec 2018 14:00:11 +0000 Message-ID: <6b8c5dff2c46073cd7c00960b6ac5b2c3a5fade4.1544190020.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: AM5PR06CA0006.eurprd06.prod.outlook.com (2603:10a6:206:2::19) To DM6PR07MB6220.namprd07.prod.outlook.com (2603:10b6:5:17d::33) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Igor.Russkikh@aquantia.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [95.79.108.179] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DM6PR07MB5787; 6:TJVr2NFvUtasj5V4uGzWrAPkqKMUYsJIwDsa78QGirlLQLrpMb5h/B+vWec4A/IVByM+wMmqfqtKUvncy3b3PeK3X6Q8fzLP87p3WzDUmOO1ebjIMLVHOBBphMUykqPVGPVBNYSJ1cN4ShJvHGCws4WeiwUe7Pl8hmlDLqNy9OHWU+d2xpKgp1IYugFadWLa+FQmjwp5XjDVW2yNZ+tv8PcYOhz2xNgi4GLba+UPrgZX6OETUMkUV9PPPlmXY9GvAZhQcKDRfUJP7m3rM3wzPoRvA0l+scAF+nWfmTcmZJBeWw9zexL+URHTzpelz/n7cCp2MCWrecJWjhsh9L/UPc2P0v/EeDizGa8q6sQ2QvhP0oew7lAHfstsiEbm34N1BmKAx6LnHWafRlRhttVioI28rF0FuUah7VQOnksnsqfID2eQoWcTWCHGIX/rHA10JPiqw/2t0/oW3g8WbIpTwg==; 5:6ce6sWP3n66YKu+FwQODAdudzsw3YY5KJvj2d72LgazTyy74Yc9JQttGzBB6TgjXkZsb6JUz8UO97zRMj7iClC6mJOrJ5Nof6waK/keMHkg4wnVCIkO+32WCyvauzKbeXCuTvuxs6IBvCWHodpRSoJDU+agSXqU6WaXdLkQPDsI=; 7:8170X8ggHtgZPC6xDEyEQb5XFu1UuvlBOPVo5ggi5Op70vfawnOuRDdKxY/A34Si+mJMn1zDP+3/5Fm5JFAcWbWHUdydJcJ1+0GeMFB8AQl7RhNLPKTxoWrxvQtQieMJj2TcUnX10xSHZjQy0Pgy+A== x-ms-office365-filtering-correlation-id: c00f12aa-da0c-4b7e-38d1-08d65c4c4dd5 x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390098)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(2017052603328)(7153060)(7193020); SRVR:DM6PR07MB5787; x-ms-traffictypediagnostic: DM6PR07MB5787: x-microsoft-antispam-prvs: x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(8121501046)(5005006)(10201501046)(93006095)(93001095)(3002001)(3231455)(999002)(944501520)(52105112)(148016)(149066)(150057)(6041310)(20161123558120)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(201708071742011)(7699051)(76991095); SRVR:DM6PR07MB5787; BCL:0; PCL:0; RULEID:; SRVR:DM6PR07MB5787; x-forefront-prvs: 0879599414 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(136003)(39850400004)(366004)(396003)(346002)(376002)(189003)(199004)(486006)(386003)(6506007)(102836004)(2616005)(476003)(44832011)(36756003)(446003)(11346002)(4326008)(52116002)(118296001)(76176011)(107886003)(186003)(71200400001)(7736002)(305945005)(256004)(71190400001)(106356001)(54906003)(316002)(66066001)(105586002)(86362001)(575784001)(97736004)(6916009)(25786009)(6486002)(81166006)(81156014)(5660300001)(3846002)(72206003)(478600001)(2906002)(6436002)(8676002)(68736007)(8936002)(26005)(53936002)(6512007)(14454004)(99286004)(6116002); DIR:OUT; SFP:1101; SCL:1; SRVR:DM6PR07MB5787; H:DM6PR07MB6220.namprd07.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: aquantia.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: Iob1CAVnm6FaI1veLWg/VkVrTeAp7fXNsmfif1v6uzEkhpW2I+oa04jdSjVCG/nm8e6Y1BemSAcrx1N1olaTn0BI90LfdRMElrwYhEnBZ6oQAzRzan+rnUyQ4XFQalgIzRiykiFJP6VP5djvPQSKR9r4Mgbwe5VJubiNCziLLHmz1QaU7cuf7Q4h9/7zStGRN5sh3qi0RxZbNMXXyRAZR2bOa5ZIl3XbctXG43ccbY897JIfM+V/jp5Sjzjk8Sh+uai6iFAEZ+MN8GQPnjBfybpIdv3mIjNGSp0Mm6N4GI1Wvw7rbm5h3CFY9l30zRl/5AGCmOjapHzsom7W9idVrhci2XCyFKkFifvMV+Ocm2Y= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: aquantia.com X-MS-Exchange-CrossTenant-Network-Message-Id: c00f12aa-da0c-4b7e-38d1-08d65c4c4dd5 X-MS-Exchange-CrossTenant-originalarrivaltime: 07 Dec 2018 14:00:11.5485 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 83e2e134-991c-4ede-8ced-34d47e38e6b1 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR07MB5787 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Dmitry Bogdanov Set RSS indirection table and RSS hash key sizes to their real size. Signed-off-by: Dmitry Bogdanov Signed-off-by: Igor Russkikh --- drivers/net/ethernet/aquantia/atlantic/aq_cfg.h | 4 ++-- drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_cfg.h b/drivers/net/ethernet/aquantia/atlantic/aq_cfg.h index 91eb8910b1c9..90a0e1d0d622 100644 --- a/drivers/net/ethernet/aquantia/atlantic/aq_cfg.h +++ b/drivers/net/ethernet/aquantia/atlantic/aq_cfg.h @@ -42,8 +42,8 @@ #define AQ_CFG_IS_LRO_DEF 1U /* RSS */ -#define AQ_CFG_RSS_INDIRECTION_TABLE_MAX 128U -#define AQ_CFG_RSS_HASHKEY_SIZE 320U +#define AQ_CFG_RSS_INDIRECTION_TABLE_MAX 64U +#define AQ_CFG_RSS_HASHKEY_SIZE 40U #define AQ_CFG_IS_RSS_DEF 1U #define AQ_CFG_NUM_RSS_QUEUES_DEF AQ_CFG_VECS_DEF diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_nic.c b/drivers/net/ethernet/aquantia/atlantic/aq_nic.c index 279ea58f4a9e..d617289d95f7 100644 --- a/drivers/net/ethernet/aquantia/atlantic/aq_nic.c +++ b/drivers/net/ethernet/aquantia/atlantic/aq_nic.c @@ -44,7 +44,7 @@ static void aq_nic_rss_init(struct aq_nic_s *self, unsigned int num_rss_queues) struct aq_rss_parameters *rss_params = &cfg->aq_rss; int i = 0; - static u8 rss_key[40] = { + static u8 rss_key[AQ_CFG_RSS_HASHKEY_SIZE] = { 0x1e, 0xad, 0x71, 0x87, 0x65, 0xfc, 0x26, 0x7d, 0x0d, 0x45, 0x67, 0x74, 0xcd, 0x06, 0x1a, 0x18, 0xb6, 0xc1, 0xf0, 0xc7, 0xbb, 0x18, 0xbe, 0xf8,