From patchwork Thu Nov 8 20:27:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivan Khoronzhuk X-Patchwork-Id: 150596 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp1307344ljp; Thu, 8 Nov 2018 12:31:13 -0800 (PST) X-Google-Smtp-Source: AJdET5cxf6zXChUVKR3Hw0IBigMdyIWuwuW3il/H3blm2Uo6gaJmDnDgfIxqrs9XFZOVcN2lXQQD X-Received: by 2002:a17:902:b03:: with SMTP id 3-v6mr6032348plq.233.1541709073122; Thu, 08 Nov 2018 12:31:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1541709073; cv=none; d=google.com; s=arc-20160816; b=be7L7x/ZHXg42egh95OipVof+sy2f3C0d/zCLXMKpTqQc6NtCzdxTucNyuD6VEFymg tDoJhWwM6XXXENXbl4+gcptANcpSo48Re/JmjJDyDerCDWzHhJhA6IrHvZew453Votcr vjAe2uE7L6Mi6O1gGs0RJQrWg3kWEnJ3+3XganHS7/tZDg6SlraWKkOmN5E/zKHEU8s5 TV1fS2qbQ8T4/3FPmA+QeVsofxqvH5P20pd+iGSRrIAZpf/3OM1mVy7stY9h5TQKT2Jy vx9MBW2YQ1ZaeylTGk22HUhYpKgIFIfbBFyzj54ykIsO2gJK2V/geO+GHu7c6XIGQdvN 5LJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=dJ21MFheqMtGC0GP2Ri/IKr1RXrXmw8gJIrPZPUwV48=; b=Sm27BYgssha9rIuDDhAlRQ8e8a8GK6iKNKcZ6IRUhlF9h4+dBn1nqwFKjN3KO9my1p nKnaiRXySJ385qiezS7AmE7dODHf6iW3dM3rw/84ij3Sli4TjyoO/KEEYe/GENmk1d+y y5y6VXueITkHWtT3B5H0rqZ/4l4LKgVJ2BMyiMQmvxuwv5Jm4lQZGrV2Yg/z1AbxPDGE B6tjaoebYzb1ROnC7/FCcvvIHDGwhyzyio1tqLZ/9h+saYDIqKl9IcG3ud3GIxKAilV0 3B3yi15dErRxSYKChHBm0Xi/3XQyKr8mrTL2mmeFyEGxQo/H8nNKOapiCTLVFyshYbky G4CQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Dw3rPxBi; spf=pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a6-v6si5586158pln.78.2018.11.08.12.31.12; Thu, 08 Nov 2018 12:31:13 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Dw3rPxBi; spf=pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727406AbeKIGIM (ORCPT + 10 others); Fri, 9 Nov 2018 01:08:12 -0500 Received: from mail-lj1-f193.google.com ([209.85.208.193]:35381 "EHLO mail-lj1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727325AbeKIGIL (ORCPT ); Fri, 9 Nov 2018 01:08:11 -0500 Received: by mail-lj1-f193.google.com with SMTP id x85-v6so19226192ljb.2 for ; Thu, 08 Nov 2018 12:31:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=dJ21MFheqMtGC0GP2Ri/IKr1RXrXmw8gJIrPZPUwV48=; b=Dw3rPxBiETf1OwrXIWVr1CKTjQCoEq+y9ZtYnMuSqIaqrFOfSCxGvVTrGv7Z1sCD4/ m55iGr9ygEsGTpYgcl1nTL/BdnJMy8xMuVcPe/Bl1dTFIyDctu44hqNd8yILxr14cE6n gShHhNL3x+OhAI9iObgwRZObiDPLaPiwqQUI4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=dJ21MFheqMtGC0GP2Ri/IKr1RXrXmw8gJIrPZPUwV48=; b=Qw020/p+nrZd34QPXLU6xUTwFT4bXbXarktWj2qOvytnacdrmjywEe2lnsmUDJe62x jmvoujOXbOGi4sgJJb1ItIJcLxkJfS46XvKHRy6WT3820kES5XWkXs+Sqe8bGa4lXKyK 7uRxuaAMaKFJ3IUCLHYOODO2aEQefX9hPzOUEF2z1HrNowG3nIHj5XV88JFf2SXnOUBr r7HL9BZpcU1HUaCJ3poHma30R+Wn+mHRZGNhrIciMbWPE7T6hzjy3rcHgtoIBVnu5alj v8Hx+PpNonYdIkoZeFfJQmJqFgkFSPMPgpvFPqL2e5P1QzTZexfu83IV0VgyAYHpiIeH xLXw== X-Gm-Message-State: AGRZ1gIfGIp/MdeiVaYYFpDqsnjvuU1XD67bJ2tiiDl/QHZdY0ThcwWm T88rq+xaBxrNE4ceUJ6GO551CA== X-Received: by 2002:a2e:8989:: with SMTP id c9-v6mr343251lji.124.1541709062298; Thu, 08 Nov 2018 12:31:02 -0800 (PST) Received: from localhost.localdomain (59-201-94-178.pool.ukrtel.net. [178.94.201.59]) by smtp.gmail.com with ESMTPSA id w9sm809250lfc.66.2018.11.08.12.31.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Nov 2018 12:31:01 -0800 (PST) From: Ivan Khoronzhuk To: grygorii.strashko@ti.com, davem@davemloft.net Cc: linux-omap@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, alexander.h.duyck@intel.com, bjorn@mork.no, Ivan Khoronzhuk Subject: [PATCH v2 net-next 4/4] net: ethernet: ti: cpsw: fix vlan configuration while down/up Date: Thu, 8 Nov 2018 22:27:57 +0200 Message-Id: <20181108202757.30110-5-ivan.khoronzhuk@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181108202757.30110-1-ivan.khoronzhuk@linaro.org> References: <20181108202757.30110-1-ivan.khoronzhuk@linaro.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The vlan configuration is not restored after interface donw/up sequence (if dual-emac - both interfaces). Tested on am572x EVM. Steps to check: ~# ip link add link eth1 name eth1.100 type vlan id 100 ~# ifconfig eth0 down ~# ifconfig eth1 down Try to remove vid and observe warning: ~# ip link del eth1.100 [ 739.526757] net eth1: removing vlanid 100 from vlan filter [ 739.533322] failed to kill vid 0081/100 for device eth1 This patch fixes it, restoring only vlan ALE entries and all other unicast/multicast entries are restored by system calling rx_mode ndo. Reviewed-by: Grygorii Strashko Signed-off-by: Ivan Khoronzhuk --- drivers/net/ethernet/ti/cpsw.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) -- 2.17.1 diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c index 0b18634d336c..9434fd5a5477 100644 --- a/drivers/net/ethernet/ti/cpsw.c +++ b/drivers/net/ethernet/ti/cpsw.c @@ -565,6 +565,9 @@ static const struct cpsw_stats cpsw_gstrings_ch_stats[] = { (func)(slave++, ##arg); \ } while (0) +static int cpsw_ndo_vlan_rx_add_vid(struct net_device *ndev, + __be16 proto, u16 vid); + static inline int cpsw_get_slave_port(u32 slave_num) { return slave_num + 1; @@ -1951,9 +1954,23 @@ static void cpsw_mqprio_resume(struct cpsw_slave *slave, struct cpsw_priv *priv) slave_write(slave, tx_prio_map, tx_prio_rg); } +static int cpsw_restore_vlans(struct net_device *vdev, int vid, void *arg) +{ + struct cpsw_priv *priv = arg; + + if (!vdev) + return 0; + + cpsw_ndo_vlan_rx_add_vid(priv->ndev, 0, vid); + return 0; +} + /* restore resources after port reset */ static void cpsw_restore(struct cpsw_priv *priv) { + /* restore vlan configurations */ + vlan_for_each(priv->ndev, cpsw_restore_vlans, priv); + /* restore MQPRIO offload */ for_each_slave(priv, cpsw_mqprio_resume, priv);