From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BAFD2C43381 for ; Wed, 20 Feb 2019 19:32:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 81EE32089F for ; Wed, 20 Feb 2019 19:32:43 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=Mellanox.com header.i=@Mellanox.com header.b="s5dXrUoF" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726995AbfBTTci (ORCPT ); Wed, 20 Feb 2019 14:32:38 -0500 Received: from mail-eopbgr00055.outbound.protection.outlook.com ([40.107.0.55]:56667 "EHLO EUR02-AM5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726154AbfBTTcd (ORCPT ); Wed, 20 Feb 2019 14:32:33 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Xhui47Ps7TUk1u098J5wVK3J9ChS3YGaytNy6wx1uF0=; b=s5dXrUoFJx451fi691Tr6OW3ooOfGmDjibRyenHdMuUoOMiFTnxDJYN4xiyBjx0bkbGy5DiOHCroAn9X0UK4I/e3OH79p51u0klOnqj89d0v30f60LU7KPbXFUz7j7DqXzLf3fb9nihb7WJfXP8rEMKKZo0q9ZIFSHOYaOcl/iw= Received: from AM6PR05MB5240.eurprd05.prod.outlook.com (20.177.196.214) by AM6PR05MB4871.eurprd05.prod.outlook.com (20.177.34.223) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1622.19; Wed, 20 Feb 2019 19:32:20 +0000 Received: from AM6PR05MB5240.eurprd05.prod.outlook.com ([fe80::3542:889c:3a85:3866]) by AM6PR05MB5240.eurprd05.prod.outlook.com ([fe80::3542:889c:3a85:3866%5]) with mapi id 15.20.1643.014; Wed, 20 Feb 2019 19:32:20 +0000 From: Ido Schimmel To: "netdev@vger.kernel.org" CC: "davem@davemloft.net" , Jiri Pirko , Petr Machata , mlxsw , Ido Schimmel Subject: [PATCH net-next 05/10] mlxsw: spectrum_buffers: Keep mlxsw_sp_sb_prs in mlxsw_sp_sb_vals Thread-Topic: [PATCH net-next 05/10] mlxsw: spectrum_buffers: Keep mlxsw_sp_sb_prs in mlxsw_sp_sb_vals Thread-Index: AQHUyVL+Zi9+WZa1GEi/4mt3fmbjtw== Date: Wed, 20 Feb 2019 19:32:20 +0000 Message-ID: <20190220193141.16498-6-idosch@mellanox.com> References: <20190220193141.16498-1-idosch@mellanox.com> In-Reply-To: <20190220193141.16498-1-idosch@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM6PR10CA0061.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:209:80::38) To AM6PR05MB5240.eurprd05.prod.outlook.com (2603:10a6:20b:64::22) authentication-results: spf=none (sender IP is ) smtp.mailfrom=idosch@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.20.1 x-originating-ip: [77.138.249.209] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 310ca14e-ffbd-47fb-c8da-08d6976a2133 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605104)(4618075)(2017052603328)(7153060)(7193020);SRVR:AM6PR05MB4871; x-ms-traffictypediagnostic: AM6PR05MB4871: x-microsoft-exchange-diagnostics: =?iso-8859-1?Q?1;AM6PR05MB4871;23:E7nlBF6H+bIN2F35ocVEn9YrcwHHodkvjOc9w2j?= =?iso-8859-1?Q?72grcC19M51oA4B1Ny9TQy4/fC5PVC554nD54fb2RslDSQzX0Y/LVVpvEo?= =?iso-8859-1?Q?luU8rBRc/XF5ym/J43JqXBGcZofMHXqwpwk3feSsSU00HZ752HJ9nxvP8k?= =?iso-8859-1?Q?a1KwwqxZcJd6Zg14gWRW88OYrGyesaCKC1HDXOd7bOSBrsNzKUAldCgnlN?= =?iso-8859-1?Q?I3EDzvQCYvat3lOjNsN7sHTQ9/RbQ9tZN2TdpaI0/EAjLG+qNfCbpZFB4+?= =?iso-8859-1?Q?Os3cb1dM5vLdb224qHWkvi8KWxBW9j+rMXyQxb1EPZsLlimaOQ6xB2LNK7?= =?iso-8859-1?Q?brTUk3cETJgJKUneMm6R6bBBxx+/7Ie6wMLsMebQMTtu/8GYXLzlBBxEC5?= =?iso-8859-1?Q?XGCFG91BIKIu9XbyHV5xppXgZubDo2t5lMjA0m3pXWf6dXtjEPv5m0CtfB?= =?iso-8859-1?Q?sLRxHsC2kG2fw1ktayTDJDZW44LdkjI/ibdIroNOykV5NJPmz/9fVhne8w?= =?iso-8859-1?Q?zMyWQB68FmrLaNH/qLc08qTOHawLkem3YS4apacCasAsuTtfXTnqz+jmqM?= =?iso-8859-1?Q?b1ak41OBrzSWeVC/0sNAwJBos1Yb8x0s3Srb51LE06PsEcIK/D/x5ldwep?= =?iso-8859-1?Q?KRXLDx2cCD2apbs2QO0suvEq8nOJzG4Uq0zT3B5MZZONhZfQ64wOxZz1iM?= =?iso-8859-1?Q?JdBFdFZUiCvNnQiRSemnBxRqQ6UULODFnARhaJ2KMR8yuBDki+NtRcXA0j?= =?iso-8859-1?Q?NBNanNOL3CN87oKci51S5iDMmFtJchZ/mszhvMtaEwsgqGesg9sh8Mkz+O?= =?iso-8859-1?Q?zHp/8wUe4tDz02bzim6bfS3EbqbOsqnxLGlNSJTVtATHApWeUvPifDzMGU?= =?iso-8859-1?Q?4dREHPPzHCMcFh56wJcSzDPXRk1DYd2Lv7rucVb8d+ist7FCLA14Jxil02?= =?iso-8859-1?Q?TCjXNnrZ0ZeyKXNkGJH0grGLyBjuoUMTqU6WanrUghIgcSZwQiuO0/KifB?= =?iso-8859-1?Q?Y6/PjCLB/gT7QALJtlHNNLX0zNFK0yxZxaIzozH2R/xr3+exfI4Q0vRKPN?= =?iso-8859-1?Q?BtrzK0rThPJO/4Hdq5zFSA2KpHABRFiaiRVSJajrr6H20wFo71FRRRCqM1?= =?iso-8859-1?Q?t8VHBQNt2OC0UlmS3swUDIWmr989ZAh5jDArRUGabW+SO3KIBzlKwQ62yv?= =?iso-8859-1?Q?q4h4xbtW7AHCoor2i13HmNivUIvzHQuK7ZQVfHpprU9hY8dAxZesSr6Yrn?= =?iso-8859-1?Q?hRXm8BTlaACqGm+F7dXrCyqz/5F3jATr+fWeOiA45hDFFksSA+7th2wFt4?= =?iso-8859-1?Q?smzI8SfFPOcIcadHUyZPOGmDdITRPW00m/dvL87kJUkYK2EKGD7ZpTRUqV?= =?iso-8859-1?Q?7g82xjbE=3D?= x-microsoft-antispam-prvs: x-forefront-prvs: 0954EE4910 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(136003)(376002)(396003)(39860400002)(346002)(366004)(199004)(189003)(486006)(86362001)(446003)(2616005)(4326008)(2351001)(478600001)(2906002)(105586002)(106356001)(11346002)(107886003)(476003)(68736007)(6916009)(54906003)(316002)(25786009)(6506007)(26005)(102836004)(386003)(53936002)(186003)(6116002)(3846002)(52116002)(99286004)(97736004)(2501003)(256004)(81156014)(6512007)(6486002)(50226002)(5640700003)(81166006)(305945005)(8936002)(7736002)(8676002)(1730700003)(14454004)(76176011)(1076003)(5660300002)(71190400001)(71200400001)(66066001)(36756003)(6436002);DIR:OUT;SFP:1101;SCL:1;SRVR:AM6PR05MB4871;H:AM6PR05MB5240.eurprd05.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; received-spf: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: 9RPrZFQo81rVD5Z2CnYaSqNHW2cNmKZ8cQhlWN1Wia+sUoo4kR0VnLstB2YJk1/3FOfvzvW4MYLgBFoQgOUGqj2Tu1e1NJWust1TynagtoQgdA2ofAuJ15fNEKZgQkPBmKrxxJmTzUN8t8Jboqv9lE3LabsL8JihnJml9JHzqv9/l36VcyxBKvJLzat9wXsbnZA4wxWcK5MpkzewH05l52HrKq7qcv2VFLIGMu1RlEYuL8Egci9m+Awr/12lG1mgZZPgHxKKAOhHvHpITj08NVToOq1Cjh4HSZdVFwUSBC+OEvKOGi/JfEJev1cewQv3aMvl4LSbVz0gEgPhv1K6RiddmW/x0ieV1cU+4VS1Dqe+Svw4TQEEYI+oJJ6aBrP5JHTSk6YCZOuk0tqgGNWVfeq/3eIu6KYmS2i1QsuUHp8= Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 310ca14e-ffbd-47fb-c8da-08d6976a2133 X-MS-Exchange-CrossTenant-originalarrivaltime: 20 Feb 2019 19:32:18.4503 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR05MB4871 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Petr Machata The SBPR register configures shared buffer pools. The default configuration depends on the chip type. Therefore keep it in struct mlxsw_sp_sb_vals. Redirect the one reference from the global array to the field. Because the pool descriptor ID is implicit in the ordering of array members, both this array and the pool descriptor array have the same length. Therefore reuse mlxsw_sp_sb.pool_dess_len for the purpose of determining the length of SBPR array. Drop the now useless MLXSW_SP_SB_PRS_LEN. Signed-off-by: Petr Machata Signed-off-by: Ido Schimmel --- drivers/net/ethernet/mellanox/mlxsw/spectrum_buffers.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_buffers.c b/drive= rs/net/ethernet/mellanox/mlxsw/spectrum_buffers.c index 672c27c79e8a..c100ce11417a 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_buffers.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_buffers.c @@ -75,6 +75,7 @@ struct mlxsw_sp_sb_vals { unsigned int pool_count; const struct mlxsw_sp_sb_pool_des *pool_dess; const struct mlxsw_sp_sb_pm *pms; + const struct mlxsw_sp_sb_pr *prs; }; =20 u32 mlxsw_sp_cells_bytes(const struct mlxsw_sp *mlxsw_sp, u32 cells) @@ -377,8 +378,6 @@ static const struct mlxsw_sp_sb_pr mlxsw_sp_sb_prs[] = =3D { MLXSW_SP_SB_PR(MLXSW_REG_SBPR_MODE_STATIC, MLXSW_SP_SB_INFI), }; =20 -#define MLXSW_SP_SB_PRS_LEN ARRAY_SIZE(mlxsw_sp_sb_prs) - static int mlxsw_sp_sb_prs_init(struct mlxsw_sp *mlxsw_sp, const struct mlxsw_sp_sb_pr *prs, size_t prs_len) @@ -684,12 +683,14 @@ const struct mlxsw_sp_sb_vals mlxsw_sp1_sb_vals =3D { .pool_count =3D ARRAY_SIZE(mlxsw_sp_sb_pool_dess), .pool_dess =3D mlxsw_sp_sb_pool_dess, .pms =3D mlxsw_sp_sb_pms, + .prs =3D mlxsw_sp_sb_prs, }; =20 const struct mlxsw_sp_sb_vals mlxsw_sp2_sb_vals =3D { .pool_count =3D ARRAY_SIZE(mlxsw_sp_sb_pool_dess), .pool_dess =3D mlxsw_sp_sb_pool_dess, .pms =3D mlxsw_sp_sb_pms, + .prs =3D mlxsw_sp_sb_prs, }; =20 int mlxsw_sp_buffers_init(struct mlxsw_sp *mlxsw_sp) @@ -710,12 +711,11 @@ int mlxsw_sp_buffers_init(struct mlxsw_sp *mlxsw_sp) mlxsw_sp->sb->cell_size =3D MLXSW_CORE_RES_GET(mlxsw_sp->core, CELL_SIZE)= ; mlxsw_sp->sb->sb_size =3D MLXSW_CORE_RES_GET(mlxsw_sp->core, MAX_BUFFER_SIZE); - err =3D mlxsw_sp_sb_ports_init(mlxsw_sp); if (err) goto err_sb_ports_init; - err =3D mlxsw_sp_sb_prs_init(mlxsw_sp, mlxsw_sp_sb_prs, - MLXSW_SP_SB_PRS_LEN); + err =3D mlxsw_sp_sb_prs_init(mlxsw_sp, mlxsw_sp->sb_vals->prs, + mlxsw_sp->sb_vals->pool_count); if (err) goto err_sb_prs_init; err =3D mlxsw_sp_cpu_port_sb_cms_init(mlxsw_sp); --=20 2.20.1