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 2B3B1C43381 for ; Fri, 22 Feb 2019 13:56:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E4BEB2075C for ; Fri, 22 Feb 2019 13:56:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=Mellanox.com header.i=@Mellanox.com header.b="qyWrNIBr" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726639AbfBVN4u (ORCPT ); Fri, 22 Feb 2019 08:56:50 -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 S1726380AbfBVN4t (ORCPT ); Fri, 22 Feb 2019 08:56:49 -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=/KoLq7hjPPiB3UfUzO6rfMWWnRqBU23/EyNcZ98gIRM=; b=qyWrNIBrDn0+kblBGRo7Llo6+ABZc/q510ZC+KlpIl1AY2C76c3/Tpe5rEQ+Y6QTUHZck8+Y1wzRBdVpmrON2+0Y9HlTNxxIs2oCFEUUfP1EoCdTXBtd8ml90dYetIMEOh8qsrewzydXODNcqZYQhUBHmjBJnCJn5nSmvyZPjb8= 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:37 +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:37 +0000 From: Ido Schimmel To: "netdev@vger.kernel.org" CC: "davem@davemloft.net" , Jiri Pirko , Shalom Toledo , mlxsw , Ido Schimmel Subject: [PATCH net-next 02/10] mlxsw: spectrum: Remove unsupported eth_proto_lp_advertise field in PTYS Thread-Topic: [PATCH net-next 02/10] mlxsw: spectrum: Remove unsupported eth_proto_lp_advertise field in PTYS Thread-Index: AQHUyrZt1sMlerl6REKiT1Bn5qHS9A== Date: Fri, 22 Feb 2019 13:56:37 +0000 Message-ID: <20190222135613.27692-3-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: f19c7416-8f64-4107-0f4f-08d698cd8fe1 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:b9Z+Zwa5qlIc9OgH12iOktRRoMAdfaZeKhsvNr9?= =?iso-8859-1?Q?EY0WJtS7z+Jv+9myTDaOwu6W+ytYgv5XoVZm/KtTIVQvgnMY4Zzj5wC63r?= =?iso-8859-1?Q?S528S2QvT8iqsCgkrEOGIfA+h/4VvFQW8h54fGAu21NJVe9FqNHlVN6OjD?= =?iso-8859-1?Q?mJDnQg5Nhthl6HfCCAMAdSWl9v5+LSZv32s3zujTpmTmTUCDdqv509qaSA?= =?iso-8859-1?Q?GRp5ghNr6vMJ5P84p0GnkZDcVzjqreQ0OWxWFjfEtuQSuhzkg9qpQ2FZTH?= =?iso-8859-1?Q?kZlp9FPtCC80DvUXg/53j6INATOhZs7GLjlXQlnTcnMlHNVQOmv1lFsTec?= =?iso-8859-1?Q?N5RQl4ZS8EM3lKIIW9Y7GD97V6hiaXifJuZWN9DJbldFRSBmQ2X1Jpi/GH?= =?iso-8859-1?Q?oA99xViW44xSUyMFw8hivrYODEq+vYSqfKXigpBTncXdsOgnxMWFXcZdIA?= =?iso-8859-1?Q?U9HCklzYkH3fZn7rlAZtNO7HBlDdeYbdgDOrV5bCsPGrcH++5u1SgsQxe9?= =?iso-8859-1?Q?f9qGN5YSQf+SPLzTtaezcsqCdRkhKk6S2bGLlPQFCUkclWw5yGYs13URft?= =?iso-8859-1?Q?ZC5bYvmfq5CEVKX2THr9qg59sjWatdoTq+VvvVSTzRinQe9T5araI8Pc3Y?= =?iso-8859-1?Q?LASz9c32rv1asdx5TEscI04ru4w5CCuiEi9gvpmgvSwqpavUwWWF/krNio?= =?iso-8859-1?Q?JBfmDt30ihIpW1q9lWezOuu9fj9ZzkC1OgC6VYJiKXHoLlOgohES6gZi9W?= =?iso-8859-1?Q?9OkALE43xflMNcjIKkDuA4AsQDsqJ1fjMvWrgBW7uffEMnVZ6X95w09yYa?= =?iso-8859-1?Q?r5VUh8Kckrc08LAjRTRcMpOCjgyPuSIL8wqnExhFanL1GFboDocJnRNZlP?= =?iso-8859-1?Q?bXDhGyqdWjJiNFRWa6NwC7t3tqFB8IdZVIu+RZNVKxTwNjNGMMwnHlfb5z?= =?iso-8859-1?Q?IyMBH1IQGmF+IXiafGhYtQkm6Za7WLjXP+iZej2TlFB4VAZ22kHvSpu8/1?= =?iso-8859-1?Q?kQRaVxQaWh7AgEcFx4+YRgygq3twstWe4OIK7f9l3j4OzVvqddZzKPJHbU?= =?iso-8859-1?Q?KX7zJPztdH0RjMjR9JNgIEocxJNk/ZdAPdrdJHmlzU4FicTK7VOCvggpj6?= =?iso-8859-1?Q?K+Wky8dcyRXgyZGmPDgY4yMf3B4BIk5S8tyI4HRQrTdCRXKdhliVFzpxBU?= =?iso-8859-1?Q?ctu/XeQEMIBRd9MNHWl40mzY0S9rRzssAfhJcE+JAlzupMQH85bPvVM12/?= =?iso-8859-1?Q?XhAzAdOrk3A6j6FyG5qncenpLVhmkPw8KRfe0dolecoS6/0Ydeiqni1EvK?= =?iso-8859-1?Q?mGabfo8COOiWADZezZom+2mZTDFoBAPJKMI3uLACfu80TlUg/Wz/ld18Lb?= =?iso-8859-1?Q?c7ZV9B6mugs8wVAU3D43LFM3mATTE?= 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)(14444005)(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: buf9fK31Hr9ULFjEdNnnnePLxV56SP4Ua7njq18H1QKEjfba0YqUadKlK/0tCcPtmYTWaWXJLS5tXYd4Tb+ei5+gdqcSZK0mitwSuyXV10D7EXvE4bIyV02mrFqEb3mKzRIPJZQFi3VrR4Ndv+qBuohfqh1h3aTBhjvou7C5w/lyTwvwRyh9sMN58VPETW9FHJtgD575Ki4vcguEkMEqaTKd0BFPcw+vAccpKPMSlgQjhFhG91GHacUQxIl1an1fnye3p4UlQDk/OkuebQ2LQKDLz4P2UadDMuDPtDuAhkg+25icyeplS4hYu9Hbl8mtkwzEW8D/2lTxeH/+laXvu64iCkqo8Qce/RmFx9PnReEKBfFcPT8/MNjQ4Q3Q81lsRKqsvqhFC5ILYCKvdIKchP6TAXrdilot8j0Gw5VIi4U= 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: f19c7416-8f64-4107-0f4f-08d698cd8fe1 X-MS-Exchange-CrossTenant-originalarrivaltime: 22 Feb 2019 13:56:36.2678 (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 Remove eth_proto_lp_advertise field in PTYS register since it is not supported by the firmware. Signed-off-by: Shalom Toledo Acked-by: Jiri Pirko Signed-off-by: Ido Schimmel --- drivers/net/ethernet/mellanox/mlxsw/reg.h | 7 ------- drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 15 +-------------- 2 files changed, 1 insertion(+), 21 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlxsw/reg.h b/drivers/net/ethern= et/mellanox/mlxsw/reg.h index cbd0193ec3f6..19d361219693 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/reg.h +++ b/drivers/net/ethernet/mellanox/mlxsw/reg.h @@ -4061,13 +4061,6 @@ MLXSW_ITEM32(reg, ptys, ib_link_width_oper, 0x28, 16= , 16); */ MLXSW_ITEM32(reg, ptys, ib_proto_oper, 0x28, 0, 16); =20 -/* reg_ptys_eth_proto_lp_advertise - * The protocols that were advertised by the link partner during - * autonegotiation. - * Access: RO - */ -MLXSW_ITEM32(reg, ptys, eth_proto_lp_advertise, 0x30, 0, 32); - static inline void mlxsw_reg_ptys_eth_pack(char *payload, u8 local_port, u32 proto_admin, bool autoneg) { diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c b/drivers/net/e= thernet/mellanox/mlxsw/spectrum.c index 3da7bf142cd2..b812406850ba 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c @@ -2606,21 +2606,10 @@ static void mlxsw_sp_port_get_link_advertise(u32 et= h_proto_admin, bool autoneg, mlxsw_sp_from_ptys_link(eth_proto_admin, cmd->link_modes.advertising); } =20 -static void -mlxsw_sp_port_get_link_lp_advertise(u32 eth_proto_lp, u8 autoneg_status, - struct ethtool_link_ksettings *cmd) -{ - if (autoneg_status !=3D MLXSW_REG_PTYS_AN_STATUS_OK || !eth_proto_lp) - return; - - ethtool_link_ksettings_add_link_mode(cmd, lp_advertising, Autoneg); - mlxsw_sp_from_ptys_link(eth_proto_lp, cmd->link_modes.lp_advertising); -} - static int mlxsw_sp_port_get_link_ksettings(struct net_device *dev, struct ethtool_link_ksettings *cmd) { - u32 eth_proto_cap, eth_proto_admin, eth_proto_oper, eth_proto_lp; + u32 eth_proto_cap, eth_proto_admin, eth_proto_oper; struct mlxsw_sp_port *mlxsw_sp_port =3D netdev_priv(dev); struct mlxsw_sp *mlxsw_sp =3D mlxsw_sp_port->mlxsw_sp; char ptys_pl[MLXSW_REG_PTYS_LEN]; @@ -2640,9 +2629,7 @@ static int mlxsw_sp_port_get_link_ksettings(struct ne= t_device *dev, =20 mlxsw_sp_port_get_link_advertise(eth_proto_admin, autoneg, cmd); =20 - eth_proto_lp =3D mlxsw_reg_ptys_eth_proto_lp_advertise_get(ptys_pl); autoneg_status =3D mlxsw_reg_ptys_an_status_get(ptys_pl); - mlxsw_sp_port_get_link_lp_advertise(eth_proto_lp, autoneg_status, cmd); =20 cmd->base.autoneg =3D autoneg ? AUTONEG_ENABLE : AUTONEG_DISABLE; cmd->base.port =3D mlxsw_sp_port_connector_port(eth_proto_oper); --=20 2.20.1