From patchwork Sun Apr 28 18:45:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Oltean X-Patchwork-Id: 1092323 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=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="EkLsm4QK"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44scHm2kHZz9s5c for ; Mon, 29 Apr 2019 04:48:20 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727202AbfD1SsE (ORCPT ); Sun, 28 Apr 2019 14:48:04 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:41165 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726940AbfD1SsB (ORCPT ); Sun, 28 Apr 2019 14:48:01 -0400 Received: by mail-wr1-f65.google.com with SMTP id c12so12463457wrt.8 for ; Sun, 28 Apr 2019 11:48:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=TPzFyWxN7IUWbmizypbugUhyd4WOXrENEL6c/KvUkdo=; b=EkLsm4QK7F1T/tlyeO59tgXdN0iyGhoMZe8/+R+XC3NUyYaWGOjPdPkX2KsscRiB8J fP/x+ygfE+8+yeyORJFUDg+q/fmkkjjsBvvJGQdz0R2kaiRMcacnS7CMsnvMkMOw0tpD kyMjXJ57GpzIUn1xg0EuANKgO8N5Shyek11TGrBjxS3NFWUj2PeMsnEFrwsGUDfcQFhV 38JZVmGfwwnGteP8rbdp1Z+SgqLQmsriXgDIL3f94tdH0W6mqqLUuYfqtgGvGsHYlvMf RwsI3LRMTW21sjoXN9zDEmjUKPe6NATfsKiF5y6fKT+A3uxri49GSnYk+TEsGvek0OtA Rakw== 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=TPzFyWxN7IUWbmizypbugUhyd4WOXrENEL6c/KvUkdo=; b=RaKelgU2sUeOW5wxrk5nLEcPeTj/Ume0CeRIbuRi34AtgBvCh0+psrnJ9utHNwXZLV SsejgVK88KDYkO/9qaRvd+Ngt7bOvQlxbTrJ3sNluh0CB4vpCUH1KEorA0YsJucgSKED YZJL9a637hUc2qzGD+mBicPllMkwJUev2zWLsRsuMw3NzD+klcqNFH8IhXn0LHU6PT3G bbzn3GdwjCBN5FddkwmGV2A+EyflL+3AM7XvrFxE0euIjZhjkFTW5dqCND2l2FjBhdsk Ot+sFpnLOseh08ZLFs0Innetg+n+tPBlVJbFQqdTRQlwium5ZQTEMNfOgbbov7Th+V2R 2uoQ== X-Gm-Message-State: APjAAAV81E/GCDaDlgyuydo+YNr2hoBd0vX+nlplWzD/nYO6YJUzdFa7 EUIzUJ+hSBfdghFleqMV9c4= X-Google-Smtp-Source: APXvYqwNiwsQkkMGh7TKC8hu8aB9DPDBol7lxUWgh7Mu131M4T1t7OT9zyvWTfoq57cWTouRuyBj5A== X-Received: by 2002:a5d:6b10:: with SMTP id v16mr37881922wrw.294.1556477279780; Sun, 28 Apr 2019 11:47:59 -0700 (PDT) Received: from localhost.localdomain (5-12-225-227.residential.rdsnet.ro. [5.12.225.227]) by smtp.gmail.com with ESMTPSA id h5sm12254910wmf.38.2019.04.28.11.47.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 28 Apr 2019 11:47:59 -0700 (PDT) From: Vladimir Oltean To: f.fainelli@gmail.com, vivien.didelot@gmail.com, andrew@lunn.ch, davem@davemloft.net Cc: netdev@vger.kernel.org, Vladimir Oltean Subject: [PATCH net-next 04/13] net: dsa: b53: Let DSA handle mismatched VLAN filtering settings Date: Sun, 28 Apr 2019 21:45:45 +0300 Message-Id: <20190428184554.9968-5-olteanv@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190428184554.9968-1-olteanv@gmail.com> References: <20190428184554.9968-1-olteanv@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The DSA core is now able to do this check prior to calling the .port_vlan_filtering callback, so tell it that VLAN filtering is global for this particular hardware. Signed-off-by: Vladimir Oltean Suggested-by: Florian Fainelli Reviewed-by: Florian Fainelli --- drivers/net/dsa/b53/b53_common.c | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_common.c index 0852e5e08177..a779b9c3ab6e 100644 --- a/drivers/net/dsa/b53/b53_common.c +++ b/drivers/net/dsa/b53/b53_common.c @@ -966,6 +966,13 @@ static int b53_setup(struct dsa_switch *ds) b53_disable_port(ds, port); } + /* Let DSA handle the case were multiple bridges span the same switch + * device and different VLAN awareness settings are requested, which + * would be breaking filtering semantics for any of the other bridge + * devices. (not hardware supported) + */ + ds->vlan_filtering_is_global = true; + return ret; } @@ -1275,26 +1282,8 @@ EXPORT_SYMBOL(b53_phylink_mac_link_up); int b53_vlan_filtering(struct dsa_switch *ds, int port, bool vlan_filtering) { struct b53_device *dev = ds->priv; - struct net_device *bridge_dev; - unsigned int i; u16 pvid, new_pvid; - /* Handle the case were multiple bridges span the same switch device - * and one of them has a different setting than what is being requested - * which would be breaking filtering semantics for any of the other - * bridge devices. - */ - b53_for_each_port(dev, i) { - bridge_dev = dsa_to_port(ds, i)->bridge_dev; - if (bridge_dev && - bridge_dev != dsa_to_port(ds, port)->bridge_dev && - br_vlan_enabled(bridge_dev) != vlan_filtering) { - netdev_err(bridge_dev, - "VLAN filtering is global to the switch!\n"); - return -EINVAL; - } - } - b53_read16(dev, B53_VLAN_PAGE, B53_VLAN_PORT_DEF_TAG(port), &pvid); new_pvid = pvid; if (dev->vlan_filtering_enabled && !vlan_filtering) {