From patchwork Wed Jan 23 14:32:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ido Schimmel X-Patchwork-Id: 1029983 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=pass (p=none dis=none) header.from=mellanox.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.b="UY+ON3RU"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43l7714ybzz9s4s for ; Thu, 24 Jan 2019 01:33:01 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726972AbfAWOdA (ORCPT ); Wed, 23 Jan 2019 09:33:00 -0500 Received: from mail-eopbgr00083.outbound.protection.outlook.com ([40.107.0.83]:49032 "EHLO EUR02-AM5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725995AbfAWOdA (ORCPT ); Wed, 23 Jan 2019 09:33:00 -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=hcY2M7TWuqWq+vzzHI7r0EsQflUYyYbpDfC6/mCvGVY=; b=UY+ON3RUYvV7eYBqWIBXOmciyHDnqas1A8yBnu4RkhLt7grgmdMvyR8D0pW5PnpZQtf6I4IFW4Kqk4+pc1n42GklW7nmvKXjv5Veoge7Ak0+JAve9xmwODYrDJbydA5CCZkbdyGDQSxy7jmn6/LAbSnTIhC8qnMyClEavKj9e4s= Received: from DB7PR05MB4940.eurprd05.prod.outlook.com (20.176.235.152) by DB7PR05MB5721.eurprd05.prod.outlook.com (20.178.105.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1537.26; Wed, 23 Jan 2019 14:32:56 +0000 Received: from DB7PR05MB4940.eurprd05.prod.outlook.com ([fe80::6161:97fd:d315:7b07]) by DB7PR05MB4940.eurprd05.prod.outlook.com ([fe80::6161:97fd:d315:7b07%5]) with mapi id 15.20.1537.031; Wed, 23 Jan 2019 14:32:56 +0000 From: Ido Schimmel To: "netdev@vger.kernel.org" CC: "davem@davemloft.net" , Jiri Pirko , Petr Machata , mlxsw , Ido Schimmel Subject: [PATCH net-next 2/4] mlxsw: spectrum_nve: Breakout common code to a common function Thread-Topic: [PATCH net-next 2/4] mlxsw: spectrum_nve: Breakout common code to a common function Thread-Index: AQHUsyiI5sX4d+bV6EKtspa19b5Opg== Date: Wed, 23 Jan 2019 14:32:56 +0000 Message-ID: <20190123143217.17735-3-idosch@mellanox.com> References: <20190123143217.17735-1-idosch@mellanox.com> In-Reply-To: <20190123143217.17735-1-idosch@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM6P193CA0009.EURP193.PROD.OUTLOOK.COM (2603:10a6:209:3e::22) To DB7PR05MB4940.eurprd05.prod.outlook.com (2603:10a6:10:1e::24) 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: [193.47.165.251] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DB7PR05MB5721; 6:CLMFgBsRGJ80wKcumW1D0H0E7TT12AN2SaM36xfxeM1VF7GLPrOCYMkYSq24AQ3nwPSucqmaS3MQqM/af9EWQJIyOn6A7KQ7qSS2tlNeOurupW7jS4Aag7YvzpNYG+oKwoVla9+Q8XDRqHWs16XQjKsyyR73jUD2WX3lZrmHR/hG8p7z5mYFEokfnDpmVKjkI86wc52srOeoydYu3UUBrBYjWtTDFS5+5irhGtt+remqDEuldcchduooZmrJWWVvCoY6D+lGmB8rdTuwbypqP/mIjRN2a6Aw52CE0232Wjgqeh/YOrmTtMJi/pEWCtiV2lt9pWSwzc1wKhvKQToJogjRa4PfY5XTXCaazIqDwKYoANh6XEr4hifIATB+TeCQYTCF+YimGi/GPhZkwuK0L33oOISl0a13GuxpkmOn5/sDDoGmnz6SssE/CpLpls/fpUv8UJzUt54Tp1l54Fyq4Q==; 5:hGI5gvBdY4W7iwHUREzhd6njT+Ohlq+8RmM/HMyZEzU+7Hs6AvVum4Cp9p22GZUECW4pdng+MZKYRfQcr4Qya1d2e90T9fKqln+OfZOQ7ekaf47QjsSxKIm6PKybikepzreQaihKaBSSDT5yqDHY39Su9HgfsMXKMWWzjtQ4HXJjIXBkZziXL8fxaMrWd7ysQtH+C4WsPeXrH4hZU1T9KA==; 7:RChZglBgK9eOmWGo2WDd1lEGnLOgNRCGRCXipeQQZqqOuk6KmPeawMnL78OcW9nPIN/B/o7gbzyl22X5TvIi2I/Cofq5cIFbSHSC4i4E3Vyh/x+iy1BGbZV8tKRyXB37c+jAcjuxik9BT1QYFXTrjA== x-ms-office365-filtering-correlation-id: 78ff2a1d-8081-4136-5c45-08d6813faa4a x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(5600110)(711020)(4605077)(4618075)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060)(7193020); SRVR:DB7PR05MB5721; x-ms-traffictypediagnostic: DB7PR05MB5721: x-microsoft-antispam-prvs: x-forefront-prvs: 0926B0E013 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(366004)(346002)(396003)(376002)(39860400002)(136003)(189003)(199004)(53936002)(6512007)(1076003)(8936002)(66574012)(50226002)(6486002)(8676002)(1730700003)(68736007)(81156014)(97736004)(6506007)(5640700003)(14454004)(386003)(305945005)(7736002)(2906002)(54906003)(81166006)(25786009)(256004)(76176011)(6436002)(186003)(86362001)(102836004)(66066001)(11346002)(6916009)(446003)(2351001)(4326008)(99286004)(316002)(71200400001)(71190400001)(486006)(106356001)(105586002)(2616005)(476003)(26005)(52116002)(36756003)(2501003)(478600001)(6116002)(3846002)(107886003); DIR:OUT; SFP:1101; SCL:1; SRVR:DB7PR05MB5721; H:DB7PR05MB4940.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A: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: PMxCKouJ464Cz9UGjkfO+Gy9N26TfBhrd5HNlrODTJQnelWOzME4lGyYRsVyQHAiilRtmXKsf6GLA+skIhs+oat3FN1CRhwMVdvgw5Y/eP+OQvoFi603xBuJ5YoEL45M74TbzF75daOWR1cFQfxf5miQeoV2dIRENo1LvTajueInRLEw/iUwoAR+9cDoR6srs7U20Rz9ndxogSrroqH0a+7mUe4gBBuf1M3TR1AMpqeAmMkAsqMyWsBTDbrksCISUZq5cRviQuFmB/HT7I233AlW1Tp1W9GSYAXDOqmzqt6sEG8kqAV85Gz9T5oYVEbZKir/XUB9ahpWsWQwuxgcD8QTY70/QQ8Ykdp8UIjUZRYShUHz45Ay7HonprEEl5zxqRXHit0PNQCW+JRt45D4kRCWXh+PjPyJp4phrE3we8U= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 78ff2a1d-8081-4136-5c45-08d6813faa4a X-MS-Exchange-CrossTenant-originalarrivaltime: 23 Jan 2019 14:32:55.2707 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR05MB5721 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The configuration of a VXLAN tunnel in Spectrum-1 and Spectrum-2 is largely the same. To avoid code duplication, breakout the common parts to a common function that can be invoked from the ASIC-specific code. Signed-off-by: Ido Schimmel Reviewed-by: Petr Machata --- .../mellanox/mlxsw/spectrum_nve_vxlan.c | 30 ++++++++++++------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_nve_vxlan.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_nve_vxlan.c index 9ba0b83bd949..60f88e5642e1 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_nve_vxlan.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_nve_vxlan.c @@ -112,13 +112,30 @@ static int mlxsw_sp_nve_parsing_set(struct mlxsw_sp *mlxsw_sp, return mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(mprs), mprs_pl); } +static void +mlxsw_sp_nve_vxlan_config_prepare(char *tngcr_pl, + const struct mlxsw_sp_nve_config *config) +{ + u8 udp_sport; + + mlxsw_reg_tngcr_pack(tngcr_pl, MLXSW_REG_TNGCR_TYPE_VXLAN, true, + config->ttl); + /* VxLAN driver's default UDP source port range is 32768 (0x8000) + * to 60999 (0xee47). Set the upper 8 bits of the UDP source port + * to a random number between 0x80 and 0xee + */ + get_random_bytes(&udp_sport, sizeof(udp_sport)); + udp_sport = (udp_sport % (0xee - 0x80 + 1)) + 0x80; + mlxsw_reg_tngcr_nve_udp_sport_prefix_set(tngcr_pl, udp_sport); + mlxsw_reg_tngcr_usipv4_set(tngcr_pl, be32_to_cpu(config->ul_sip.addr4)); +} + static int mlxsw_sp1_nve_vxlan_config_set(struct mlxsw_sp *mlxsw_sp, const struct mlxsw_sp_nve_config *config) { char tngcr_pl[MLXSW_REG_TNGCR_LEN]; u16 ul_vr_id; - u8 udp_sport; int err; err = mlxsw_sp_router_tb_id_vr_id(mlxsw_sp, config->ul_tb_id, @@ -126,18 +143,9 @@ mlxsw_sp1_nve_vxlan_config_set(struct mlxsw_sp *mlxsw_sp, if (err) return err; - mlxsw_reg_tngcr_pack(tngcr_pl, MLXSW_REG_TNGCR_TYPE_VXLAN, true, - config->ttl); - /* VxLAN driver's default UDP source port range is 32768 (0x8000) - * to 60999 (0xee47). Set the upper 8 bits of the UDP source port - * to a random number between 0x80 and 0xee - */ - get_random_bytes(&udp_sport, sizeof(udp_sport)); - udp_sport = (udp_sport % (0xee - 0x80 + 1)) + 0x80; - mlxsw_reg_tngcr_nve_udp_sport_prefix_set(tngcr_pl, udp_sport); + mlxsw_sp_nve_vxlan_config_prepare(tngcr_pl, config); mlxsw_reg_tngcr_learn_enable_set(tngcr_pl, config->learning_en); mlxsw_reg_tngcr_underlay_virtual_router_set(tngcr_pl, ul_vr_id); - mlxsw_reg_tngcr_usipv4_set(tngcr_pl, be32_to_cpu(config->ul_sip.addr4)); return mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(tngcr), tngcr_pl); }