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,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 6D301C43381 for ; Fri, 22 Feb 2019 13:57:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 28C7D2075C for ; Fri, 22 Feb 2019 13:57:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=Mellanox.com header.i=@Mellanox.com header.b="lzlzQxNl" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726816AbfBVN5B (ORCPT ); Fri, 22 Feb 2019 08:57:01 -0500 Received: from mail-eopbgr150071.outbound.protection.outlook.com ([40.107.15.71]:17186 "EHLO EUR01-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726380AbfBVN5A (ORCPT ); Fri, 22 Feb 2019 08:57: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=XOsej6nGP//LzFkgtygiXPkDtFF34xYMjbkOZM+a7Ts=; b=lzlzQxNl/5bDyRrKea6rpYtd64msbFGhj9h+8+UHaW6ybsWaBPz9iEdfAYKZuuXPy+IK6PGv44SPvszUKk5rmZ3WJc96sZNMpK/lU1jty1C9D2JtCg7emYLYE1KZ0wLAhTfBpqQyUxxT2APML4BAO+iP46Ot+W6JZyitgPWPQhY= Received: from AM6PR05MB5240.eurprd05.prod.outlook.com (20.177.196.214) by AM6PR05MB4358.eurprd05.prod.outlook.com (52.135.162.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1622.19; Fri, 22 Feb 2019 13:56:39 +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; Fri, 22 Feb 2019 13:56:39 +0000 From: Ido Schimmel To: "netdev@vger.kernel.org" CC: "davem@davemloft.net" , Jiri Pirko , Shalom Toledo , mlxsw , Ido Schimmel Subject: [PATCH net-next 04/10] mlxsw: spectrum: Rename port type-speed functions to ASIC specific Thread-Topic: [PATCH net-next 04/10] mlxsw: spectrum: Rename port type-speed functions to ASIC specific Thread-Index: AQHUyrZuOIrpHSAQ+U2kc/t3awwwYw== Date: Fri, 22 Feb 2019 13:56:39 +0000 Message-ID: <20190222135613.27692-5-idosch@mellanox.com> References: <20190222135613.27692-1-idosch@mellanox.com> In-Reply-To: <20190222135613.27692-1-idosch@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM6PR10CA0017.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:209:89::30) 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: [79.176.7.115] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 00f1cf20-85a9-4200-8dd5-08d698cd9137 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:AM6PR05MB4358; x-ms-traffictypediagnostic: AM6PR05MB4358: x-microsoft-exchange-diagnostics: =?iso-8859-1?Q?1;AM6PR05MB4358;23:CpVtCw/AGyyPnp4UvWDoWX/YMr21KH9ZxOvyS/C?= =?iso-8859-1?Q?3pio9Vhk0bua5LGga+Y5DDL6O/2mRxO+yygffXo/NOqyhx2OA/GrlYJnR9?= =?iso-8859-1?Q?czG2h98vb5SHjOuub78IMa+qA1Q4DBqGWhLtP5R8zbad54db19xOYZxwIo?= =?iso-8859-1?Q?0pxsB0ECP6U8lwxT+tNzjwije0kKqJPJHnmK5QD4DS8a6PGXsEVcx2qtuq?= =?iso-8859-1?Q?Vddp0GDOeeqsTohE9vrv+YCwxM49qYjsx2Mc+ltmX1/uP/X3gbu7leelzo?= =?iso-8859-1?Q?dNX5xjgwKBjmrD7xbMlMnp+FcgzrUDZoML6YH9b/6tWb8hSnawzTth4OPC?= =?iso-8859-1?Q?AgbJxK0m2mW5jTsinTAABwG0LWzaNEkPYiQRcShSX4bVAnjoMwFkQ7J9ZW?= =?iso-8859-1?Q?J1qvBXzzFm1o1Am9F3nlQduw9BHHKl6HmloAbzLEXvhEKLqxxbNw1kgMfA?= =?iso-8859-1?Q?Cpt6M+pwys75N8vzOodTyhheWCzseGkT9O4ikr9Q1N9pT0eoYwYgjb6fOF?= =?iso-8859-1?Q?qZu/a3Pr4O80j6KHhbxEpv3FJAHNGIsOVCU8SeD6DSmhYr99lROcjNzEad?= =?iso-8859-1?Q?uJMia8bm5JOkXlxr2SuEj7wPOULMiRSND8p0c+f5/JIOCHvxDeg++FeuC7?= =?iso-8859-1?Q?bqUnkUCwJY1DEvWKNelk4IMdSH+W2tbbgfYbt6sHSV69ccTxjZPVlAJc/j?= =?iso-8859-1?Q?gqHMC0BzvBRPUcSdLsQ/y3P2ExLmfuHu53QF13jCcCkT9ne/Ndg9qR7ps2?= =?iso-8859-1?Q?eLBQU24uUm7Gh9BAyPMME3D0WzOklphpE/GCS3UZINwj52AbDhBmGA830W?= =?iso-8859-1?Q?MFc0jAlq+hURTaTLUb0RAXn26wmuuhpmCquyeT20bfkJoXLlSCOhnfu5/O?= =?iso-8859-1?Q?xZisumVi6+0sT133eaTJ9Y6Ab9WgnJWOf+y5OknerXYSLErP/0LkfylCvq?= =?iso-8859-1?Q?/y+dUTQ3p1ximwMVBK23KDE8YATOu3KlJ/yJORhbRNoVNun08nUbuiKlsq?= =?iso-8859-1?Q?Sz/ojw1swj8IBVFJIR2XK5ml0RUIwkkoobp53nQWBpKzWXu7ulBDYZExfb?= =?iso-8859-1?Q?iVaCDgokUXAZ46xwXXvdzDrs2PjM7nz6+e8A/Kn24Lk0a9JaWKD4npn48i?= =?iso-8859-1?Q?U0nueLrQ7lFXuYbA+ggODDOQsNuiMorX0GRWBgvbqBiv3VyxV6X0nfqA4o?= =?iso-8859-1?Q?6iZOssAmSXeY0JKlwOJGvi86/MmNLyLVYkWFXNptJvXGbLPiw4PokRqi04?= =?iso-8859-1?Q?A6wSchuao/Y7xsnQhmf8MSAuoaU+K6hqWj09yjiJ4JXt0SgpIeZmrcCjr0?= =?iso-8859-1?Q?MJHubArLZds8E0zol9QH4/+rO8rfbkvYIWGK1SvkIHWqXDF/qJgQAEXJ+W?= =?iso-8859-1?Q?53fg5PQA=3D?= x-microsoft-antispam-prvs: x-forefront-prvs: 09565527D6 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(366004)(39860400002)(346002)(136003)(376002)(396003)(189003)(199004)(81166006)(99286004)(3846002)(66066001)(50226002)(81156014)(11346002)(1730700003)(68736007)(2351001)(26005)(478600001)(8676002)(25786009)(6116002)(14454004)(97736004)(6916009)(6512007)(316002)(8936002)(6486002)(256004)(5640700003)(54906003)(6436002)(105586002)(6506007)(186003)(106356001)(386003)(7736002)(5660300002)(76176011)(1076003)(52116002)(476003)(107886003)(86362001)(2906002)(53936002)(71190400001)(2501003)(4326008)(486006)(102836004)(36756003)(446003)(71200400001)(305945005)(2616005);DIR:OUT;SFP:1101;SCL:1;SRVR:AM6PR05MB4358;H:AM6PR05MB5240.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: U4qjSQPyIs//S1eZrabmgAYhzyN4gPvE06OC0C+Wl3AYphZ0VYSRC2mIbRtHr6vy0w1rFYOGS39bIe+XhkFj+B0wEkaxWOFcTf6jWEm37VThV0TayJl/3bvsxIDAj6PPEgUoQqob5I4Z3AgMpTrqhHhJ9sB3AoMz35D+CTrG4D45CVARPSzfPMZwcOfP7wAOQSF3sZqB3QCPuiwvR1yeydfA/cXs8aggDrTW1AZuca1oOhH+NmaLIDPNYD7t3ZzU+fHA7Z0iTIHddQk3nqpiHfeX3UAq1XPpThyhmDG950HTysXxivJG8FDvulfQagnzr9YECpvlRsUIRMlsCTQr95y/jjkQcJww/ePFLWETxV8JSdhbFApcpaF6xguvpekS1ntbcXj9XNpH7mPdf1WGmKJflu5x7ZthWvXvjRmbpQs= 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: 00f1cf20-85a9-4200-8dd5-08d698cd9137 X-MS-Exchange-CrossTenant-originalarrivaltime: 22 Feb 2019 13:56:38.5214 (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: AM6PR05MB4358 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Shalom Toledo Rename port speed-type functions to be Spectrum-1 ASIC specific. Signed-off-by: Shalom Toledo Acked-by: Jiri Pirko Signed-off-by: Ido Schimmel --- .../net/ethernet/mellanox/mlxsw/spectrum.c | 69 ++++++++++--------- 1 file changed, 35 insertions(+), 34 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c b/drivers/net/e= thernet/mellanox/mlxsw/spectrum.c index e86b0341b7b0..4824037248e8 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c @@ -2336,13 +2336,13 @@ static int mlxsw_sp_port_get_sset_count(struct net_= device *dev, int sset) } } =20 -struct mlxsw_sp_port_link_mode { +struct mlxsw_sp1_port_link_mode { enum ethtool_link_mode_bit_indices mask_ethtool; u32 mask; u32 speed; }; =20 -static const struct mlxsw_sp_port_link_mode mlxsw_sp_port_link_mode[] =3D = { +static const struct mlxsw_sp1_port_link_mode mlxsw_sp1_port_link_mode[] = =3D { { .mask =3D MLXSW_REG_PTYS_ETH_SPEED_100BASE_T, .mask_ethtool =3D ETHTOOL_LINK_MODE_100baseT_Full_BIT, @@ -2470,11 +2470,11 @@ static const struct mlxsw_sp_port_link_mode mlxsw_s= p_port_link_mode[] =3D { }, }; =20 -#define MLXSW_SP_PORT_LINK_MODE_LEN ARRAY_SIZE(mlxsw_sp_port_link_mode) +#define MLXSW_SP1_PORT_LINK_MODE_LEN ARRAY_SIZE(mlxsw_sp1_port_link_mode) =20 static void -mlxsw_sp_from_ptys_supported_port(u32 ptys_eth_proto, - struct ethtool_link_ksettings *cmd) +mlxsw_sp1_from_ptys_supported_port(u32 ptys_eth_proto, + struct ethtool_link_ksettings *cmd) { if (ptys_eth_proto & (MLXSW_REG_PTYS_ETH_SPEED_10GBASE_CR | MLXSW_REG_PTYS_ETH_SPEED_10GBASE_SR | @@ -2492,19 +2492,20 @@ mlxsw_sp_from_ptys_supported_port(u32 ptys_eth_prot= o, ethtool_link_ksettings_add_link_mode(cmd, supported, Backplane); } =20 -static void mlxsw_sp_from_ptys_link(u32 ptys_eth_proto, unsigned long *mod= e) +static void mlxsw_sp1_from_ptys_link(u32 ptys_eth_proto, unsigned long *mo= de) { int i; =20 - for (i =3D 0; i < MLXSW_SP_PORT_LINK_MODE_LEN; i++) { - if (ptys_eth_proto & mlxsw_sp_port_link_mode[i].mask) - __set_bit(mlxsw_sp_port_link_mode[i].mask_ethtool, + for (i =3D 0; i < MLXSW_SP1_PORT_LINK_MODE_LEN; i++) { + if (ptys_eth_proto & mlxsw_sp1_port_link_mode[i].mask) + __set_bit(mlxsw_sp1_port_link_mode[i].mask_ethtool, mode); } } =20 -static void mlxsw_sp_from_ptys_speed_duplex(bool carrier_ok, u32 ptys_eth_= proto, - struct ethtool_link_ksettings *cmd) +static void +mlxsw_sp1_from_ptys_speed_duplex(bool carrier_ok, u32 ptys_eth_proto, + struct ethtool_link_ksettings *cmd) { u32 speed =3D SPEED_UNKNOWN; u8 duplex =3D DUPLEX_UNKNOWN; @@ -2513,9 +2514,9 @@ static void mlxsw_sp_from_ptys_speed_duplex(bool carr= ier_ok, u32 ptys_eth_proto, if (!carrier_ok) goto out; =20 - for (i =3D 0; i < MLXSW_SP_PORT_LINK_MODE_LEN; i++) { - if (ptys_eth_proto & mlxsw_sp_port_link_mode[i].mask) { - speed =3D mlxsw_sp_port_link_mode[i].speed; + for (i =3D 0; i < MLXSW_SP1_PORT_LINK_MODE_LEN; i++) { + if (ptys_eth_proto & mlxsw_sp1_port_link_mode[i].mask) { + speed =3D mlxsw_sp1_port_link_mode[i].speed; duplex =3D DUPLEX_FULL; break; } @@ -2526,39 +2527,39 @@ static void mlxsw_sp_from_ptys_speed_duplex(bool ca= rrier_ok, u32 ptys_eth_proto, } =20 static u32 -mlxsw_sp_to_ptys_advert_link(const struct ethtool_link_ksettings *cmd) +mlxsw_sp1_to_ptys_advert_link(const struct ethtool_link_ksettings *cmd) { u32 ptys_proto =3D 0; int i; =20 - for (i =3D 0; i < MLXSW_SP_PORT_LINK_MODE_LEN; i++) { - if (test_bit(mlxsw_sp_port_link_mode[i].mask_ethtool, + for (i =3D 0; i < MLXSW_SP1_PORT_LINK_MODE_LEN; i++) { + if (test_bit(mlxsw_sp1_port_link_mode[i].mask_ethtool, cmd->link_modes.advertising)) - ptys_proto |=3D mlxsw_sp_port_link_mode[i].mask; + ptys_proto |=3D mlxsw_sp1_port_link_mode[i].mask; } return ptys_proto; } =20 -static u32 mlxsw_sp_to_ptys_speed(u32 speed) +static u32 mlxsw_sp1_to_ptys_speed(u32 speed) { u32 ptys_proto =3D 0; int i; =20 - for (i =3D 0; i < MLXSW_SP_PORT_LINK_MODE_LEN; i++) { - if (speed =3D=3D mlxsw_sp_port_link_mode[i].speed) - ptys_proto |=3D mlxsw_sp_port_link_mode[i].mask; + for (i =3D 0; i < MLXSW_SP1_PORT_LINK_MODE_LEN; i++) { + if (speed =3D=3D mlxsw_sp1_port_link_mode[i].speed) + ptys_proto |=3D mlxsw_sp1_port_link_mode[i].mask; } return ptys_proto; } =20 -static u32 mlxsw_sp_to_ptys_upper_speed(u32 upper_speed) +static u32 mlxsw_sp1_to_ptys_upper_speed(u32 upper_speed) { u32 ptys_proto =3D 0; int i; =20 - for (i =3D 0; i < MLXSW_SP_PORT_LINK_MODE_LEN; i++) { - if (mlxsw_sp_port_link_mode[i].speed <=3D upper_speed) - ptys_proto |=3D mlxsw_sp_port_link_mode[i].mask; + for (i =3D 0; i < MLXSW_SP1_PORT_LINK_MODE_LEN; i++) { + if (mlxsw_sp1_port_link_mode[i].speed <=3D upper_speed) + ptys_proto |=3D mlxsw_sp1_port_link_mode[i].mask; } return ptys_proto; } @@ -2570,8 +2571,8 @@ static void mlxsw_sp_port_get_link_supported(u32 eth_= proto_cap, ethtool_link_ksettings_add_link_mode(cmd, supported, Autoneg); ethtool_link_ksettings_add_link_mode(cmd, supported, Pause); =20 - mlxsw_sp_from_ptys_supported_port(eth_proto_cap, cmd); - mlxsw_sp_from_ptys_link(eth_proto_cap, cmd->link_modes.supported); + mlxsw_sp1_from_ptys_supported_port(eth_proto_cap, cmd); + mlxsw_sp1_from_ptys_link(eth_proto_cap, cmd->link_modes.supported); } =20 static void mlxsw_sp_port_get_link_advertise(u32 eth_proto_admin, bool aut= oneg, @@ -2581,7 +2582,7 @@ static void mlxsw_sp_port_get_link_advertise(u32 eth_= proto_admin, bool autoneg, return; =20 ethtool_link_ksettings_add_link_mode(cmd, advertising, Autoneg); - mlxsw_sp_from_ptys_link(eth_proto_admin, cmd->link_modes.advertising); + mlxsw_sp1_from_ptys_link(eth_proto_admin, cmd->link_modes.advertising); } =20 static u8 @@ -2641,8 +2642,8 @@ static int mlxsw_sp_port_get_link_ksettings(struct ne= t_device *dev, cmd->base.autoneg =3D autoneg ? AUTONEG_ENABLE : AUTONEG_DISABLE; connector_type =3D mlxsw_reg_ptys_connector_type_get(ptys_pl); cmd->base.port =3D mlxsw_sp_port_connector_port(connector_type); - mlxsw_sp_from_ptys_speed_duplex(netif_carrier_ok(dev), eth_proto_oper, - cmd); + mlxsw_sp1_from_ptys_speed_duplex(netif_carrier_ok(dev), eth_proto_oper, + cmd); =20 return 0; } @@ -2666,8 +2667,8 @@ mlxsw_sp_port_set_link_ksettings(struct net_device *d= ev, =20 autoneg =3D cmd->base.autoneg =3D=3D AUTONEG_ENABLE; eth_proto_new =3D autoneg ? - mlxsw_sp_to_ptys_advert_link(cmd) : - mlxsw_sp_to_ptys_speed(cmd->base.speed); + mlxsw_sp1_to_ptys_advert_link(cmd) : + mlxsw_sp1_to_ptys_speed(cmd->base.speed); =20 eth_proto_new =3D eth_proto_new & eth_proto_cap; if (!eth_proto_new) { @@ -2867,7 +2868,7 @@ mlxsw_sp_port_speed_by_width_set(struct mlxsw_sp_port= *mlxsw_sp_port, u8 width) char ptys_pl[MLXSW_REG_PTYS_LEN]; u32 eth_proto_admin; =20 - eth_proto_admin =3D mlxsw_sp_to_ptys_upper_speed(upper_speed); + eth_proto_admin =3D mlxsw_sp1_to_ptys_upper_speed(upper_speed); mlxsw_reg_ptys_eth_pack(ptys_pl, mlxsw_sp_port->local_port, eth_proto_admin, mlxsw_sp_port->link.autoneg); return mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(ptys), ptys_pl); --=20 2.20.1