From patchwork Tue Jan 8 16:48:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ido Schimmel X-Patchwork-Id: 1022037 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="XmOrohSH"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43Yyr15wLkz9sLw for ; Wed, 9 Jan 2019 03:48:17 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729009AbfAHQsQ (ORCPT ); Tue, 8 Jan 2019 11:48:16 -0500 Received: from mail-eopbgr50054.outbound.protection.outlook.com ([40.107.5.54]:49376 "EHLO EUR03-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729109AbfAHQsQ (ORCPT ); Tue, 8 Jan 2019 11:48:16 -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=Riml1bULJeub/AR4y6X//S24e2jHkAyhMOCE/bTMv7w=; b=XmOrohSH0kNah2SPxA03a6E7mp+Tnbmduh5hYjYPo37wKfJ91qPu8TkQxbSIXuym6dPpxLkJO7Qa2wt966+ln+74gQpm//h/cOIj3O9yH4FLFeY2bFWU0WJ7dRnjwBKgMrilxfH2a1BKmMKUQQeHQvdZZcYMpYRidlWBPrUL3gY= Received: from AM6PR05MB6056.eurprd05.prod.outlook.com (20.179.2.148) by AM6PR05MB4405.eurprd05.prod.outlook.com (52.135.163.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1495.6; Tue, 8 Jan 2019 16:48:05 +0000 Received: from AM6PR05MB6056.eurprd05.prod.outlook.com ([fe80::5490:e4ea:7798:e65f]) by AM6PR05MB6056.eurprd05.prod.outlook.com ([fe80::5490:e4ea:7798:e65f%3]) with mapi id 15.20.1516.010; Tue, 8 Jan 2019 16:48:05 +0000 From: Ido Schimmel To: "netdev@vger.kernel.org" CC: "davem@davemloft.net" , Jiri Pirko , Petr Machata , Nir Dotan , mlxsw , Ido Schimmel Subject: [PATCH net 03/11] mlxsw: spectrum: Disable lag port TX before removing it Thread-Topic: [PATCH net 03/11] mlxsw: spectrum: Disable lag port TX before removing it Thread-Index: AQHUp3HtFi2n9vWHEkKRFeqyTeFT5g== Date: Tue, 8 Jan 2019 16:48:05 +0000 Message-ID: <20190108164732.4024-4-idosch@mellanox.com> References: <20190108164732.4024-1-idosch@mellanox.com> In-Reply-To: <20190108164732.4024-1-idosch@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM6P192CA0024.EURP192.PROD.OUTLOOK.COM (2603:10a6:209:83::37) To AM6PR05MB6056.eurprd05.prod.outlook.com (2603:10a6:20b:ab::20) 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; AM6PR05MB4405; 6:KbwSiU+Jo9xIbuOX+AaNlRVmVMWWt+7pHpPkzqMJER2XB3ww28MRS2GZiTjfzd9ABgRdxBBhPOaEmBOcEWE9S0hQgBDrqVoFUeyETA0MHqLkZ8JVRyBylDw5Ug2qytzWt59A4HHOE5Qcqzr5wqBllj4FIm/VHmO+Pq/3bwRYMuCjWdvHrLXg4b34Q7qilWZlqU4HoueKlfSgsSjtC6QBNPuCEWoSOBRFXjfAicT7XDZkPSZUGc9DB3ZqLGjNu3f2zJ54HFQSCalL85qepyV7Ta53tu6qOZfr71lkA6oAOgZS3hPmnCo1pXwu14eXVmCJYcIf6VpMnidwHxw1QKzxebr+V0O5laqcKmXgWyOZy3UfKVJBqlgeO+8m4prdAZzXmKpwZStc4V8yx7zndanMALTTP4ZynCJi4z+bqidvXKfNmKuMx+GfTYvXx03N7U/5lygaOiiJ8ys3SDUeZOvHPg==; 5:V8UIIJSz0+828wvCr4UvGMtZUII2OpC+mtUXxT6VN5Ovsy+WISuZgrr8C1F5bcZntUUwzZCxGEGxK1s/jVk7PdITG1bZvcIIpqlajnuMnB6zEXhVSFOE8BoFwRYoFlxPfHHBiLM+g94pEQvrtOAl8ztjonr8yfyB++XXxyfsq7R0SDNRgxZSmjh80/e5yYSEev2LKRbhq03CRGX5CXkl1A==; 7:hfix/7dS0OphkwgnMdVi+J1pPedzHK6pasbNNQ7lKMEmqYifKq/qE4TjgOE1ca1mMQv6LCnDtr13dEcs0CPS1k7T0rXvFAmb1wLjj6OUKPo2/C9U70YcpNLH94LlSrJi/VUdW7CJ7NyR2BmHPSRLrw== x-ms-office365-filtering-correlation-id: 9075a90e-b405-4069-3f9c-08d675890f96 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600109)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM6PR05MB4405; x-ms-traffictypediagnostic: AM6PR05MB4405: x-microsoft-antispam-prvs: x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(3230021)(908002)(999002)(5005026)(6040522)(8220060)(2401047)(8121501046)(3002001)(10201501046)(93006095)(93001095)(3231475)(944501520)(52105112)(6055026)(6041310)(20161123564045)(20161123560045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(201708071742011)(7699051)(76991095); SRVR:AM6PR05MB4405; BCL:0; PCL:0; RULEID:; SRVR:AM6PR05MB4405; x-forefront-prvs: 0911D5CE78 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(376002)(346002)(136003)(39860400002)(396003)(366004)(189003)(199004)(106356001)(105586002)(2906002)(6486002)(6116002)(3846002)(99286004)(6506007)(305945005)(486006)(7736002)(102836004)(386003)(76176011)(86362001)(52116002)(26005)(66066001)(5640700003)(6436002)(186003)(97736004)(2501003)(6512007)(2351001)(25786009)(1076003)(478600001)(81156014)(8936002)(36756003)(81166006)(68736007)(4326008)(50226002)(5660300001)(14444005)(256004)(1730700003)(107886003)(8676002)(6916009)(53936002)(54906003)(316002)(11346002)(14454004)(2616005)(71200400001)(71190400001)(476003)(446003); DIR:OUT; SFP:1101; SCL:1; SRVR:AM6PR05MB4405; H:AM6PR05MB6056.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: fsrD2cfIBxeEPfqsutLI0opwqVka1/PIK5O0mV0K33rMGcP7BX08V5DdKnez4tgLSlRhE29SXKqWJ8NVj5reABNjD3GbHJU1r3gNNGZCdhSDQ0m7DZxVoR0CAO+A3vtKE5Rgr+v+8rxQzaWwDuQ2RUW6X2gyzDfLBE4OODx7tYDW6yAJ+W0bC1s62vU2RWFRM8NAk7QlFhlRBsGXVuHVln96aAKs3F0iytWn/xsrwHl7qWc9NQ9nq9YGgzZbZejttUaMxeQIaYL1iXMzYp4gjkDuX7F8dXWADuqlj0kwQym3OIJ9hKmssn4HS2jZy5aH spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9075a90e-b405-4069-3f9c-08d675890f96 X-MS-Exchange-CrossTenant-originalarrivaltime: 08 Jan 2019 16:48:04.6434 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR05MB4405 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jiri Pirko Make sure that lag port TX is disabled before mlxsw_sp_port_lag_leave() is called and prevent from possible EMAD error. Fixes: 0d65fc13042f ("mlxsw: spectrum: Implement LAG port join/leave") Signed-off-by: Jiri Pirko Signed-off-by: Ido Schimmel --- drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c index eed1045e4d96..32519c93df17 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c @@ -5005,12 +5005,15 @@ static int mlxsw_sp_netdevice_port_upper_event(struct net_device *lower_dev, lower_dev, upper_dev); } else if (netif_is_lag_master(upper_dev)) { - if (info->linking) + if (info->linking) { err = mlxsw_sp_port_lag_join(mlxsw_sp_port, upper_dev); - else + } else { + mlxsw_sp_port_lag_tx_en_set(mlxsw_sp_port, + false); mlxsw_sp_port_lag_leave(mlxsw_sp_port, upper_dev); + } } else if (netif_is_ovs_master(upper_dev)) { if (info->linking) err = mlxsw_sp_port_ovs_join(mlxsw_sp_port);