From patchwork Wed Jan 30 00:55:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 1033091 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="J5jutoUp"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43q4jD61vcz9s9h for ; Wed, 30 Jan 2019 11:57:52 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727640AbfA3A5v (ORCPT ); Tue, 29 Jan 2019 19:57:51 -0500 Received: from mail-pg1-f193.google.com ([209.85.215.193]:45888 "EHLO mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727365AbfA3A5u (ORCPT ); Tue, 29 Jan 2019 19:57:50 -0500 Received: by mail-pg1-f193.google.com with SMTP id y4so9539910pgc.12 for ; Tue, 29 Jan 2019 16:57:50 -0800 (PST) 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=y2qm7A+/CCgrfTstiWJF722XPuBVch01JWCyDALceMo=; b=J5jutoUpDrj4OYQchjDb1vI085XVkyHPq9y9ptyzA15uDgN254lE874WVlsvtEC2kW z9kCXvY8MnHBIhGvhpYWumrmqTX9TmY2rlL0UEfIe9qbNEGRxedyyUMl1mldEcgs1y/e KN900vgsbtA1pBhP0g+15AxUzh+kQT3kA7LuxO+Ik7YLfiX6qTEkCpm+qXwThoaJrgs/ qRhoULfG0vLUt3qIXT4v0NotbW6ArFMzmvx6QDCFh7iXZ7KtHS9RRHRheTQQeYBtM66H no/UVE0r1iTMqh1McPGLT0/UhkYOspa/fdQ0W9U34bmWiWPQpODbmdW2CQ7r66ckTrm+ sBZA== 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=y2qm7A+/CCgrfTstiWJF722XPuBVch01JWCyDALceMo=; b=KgRig8mws/Ip7RYCYdJIX/kH8xEaOAeE+rNzLCCBaL+jMlSZ4R8m/4EOiISrAoKoIB HSpvgZ67R7qKk/98By8cJ+Mkn1Ygxmq/rFDfSWt+6M5qBmW8boFbLH6rH7NJWH5eO1d4 HLrvWx0yIk6HlSxLBb1OCRu/FTI32SbSNTcLUBmIWi03WoHDOYbdlfbmAVPd5GmwwUrA ZYUGrYdgRQoFr5Py6IoYjcBG5G4dcE4HD3t6wyxZkkh3qO9vyO/6M71XbBh64z+zfSQ1 oT93/dqw5XZtdSQmol+hmElY5y+mNzY8M2J7S7TIEB2uD0C0lvEWCj9ZWYlR6OAJ754c jP7w== X-Gm-Message-State: AJcUukf47zaixdblb6jQGNEmsX16BgrwKn6EzOF02ubrXgttTWUk7uHa 4o7aZG704NOzK4U3ZhxuycZ8h+r4 X-Google-Smtp-Source: ALg8bN4TpCElqgdBV4z0IPEsJrEt4hIpnYrhB1L8FXPiPM7cXIdNRFGBjvq6RsEhGBDyg5ItWy1BSA== X-Received: by 2002:a63:304:: with SMTP id 4mr23490429pgd.99.1548809869104; Tue, 29 Jan 2019 16:57:49 -0800 (PST) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.250]) by smtp.gmail.com with ESMTPSA id v191sm67837137pgb.77.2019.01.29.16.57.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Jan 2019 16:57:47 -0800 (PST) From: Florian Fainelli To: netdev@vger.kernel.org Cc: Florian Fainelli , andrew@lunn.ch, vivien.didelot@gmail.com, davem@davemloft.net, idosch@mellanox.com, jiri@mellanox.com, ilias.apalodimas@linaro.org, ivan.khoronzhuk@linaro.org, roopa@cumulusnetworks.com, nikolay@cumulusnetworks.com Subject: [PATCH net-next v2 02/12] net: dsa: b53: Fix default VLAN ID Date: Tue, 29 Jan 2019 16:55:38 -0800 Message-Id: <20190130005548.2212-3-f.fainelli@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190130005548.2212-1-f.fainelli@gmail.com> References: <20190130005548.2212-1-f.fainelli@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org We were not consistent in how the default VID of a given port was defined, b53_br_leave() would make sure the VLAN ID would be either 0/1 depending on the switch generation, but b53_configure_vlan(), which is the default configuration would unconditionally set it to 1. The correct value is 1 for 5325/5365 series and 0 otherwise. To avoid repeating that mistake ever again, introduce a helper function: b53_default_pvid() to factor that out. Fixes: 967dd82ffc52 ("net: dsa: b53: Add support for Broadcom RoboSwitch") Signed-off-by: Florian Fainelli --- drivers/net/dsa/b53/b53_common.c | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_common.c index 0e4bbdcc614f..964a9ec4652a 100644 --- a/drivers/net/dsa/b53/b53_common.c +++ b/drivers/net/dsa/b53/b53_common.c @@ -632,15 +632,25 @@ static void b53_enable_mib(struct b53_device *dev) b53_write8(dev, B53_MGMT_PAGE, B53_GLOBAL_CONFIG, gc); } +static u16 b53_default_pvid(struct b53_device *dev) +{ + if (is5325(dev) || is5365(dev)) + return 1; + else + return 0; +} + int b53_configure_vlan(struct dsa_switch *ds) { struct b53_device *dev = ds->priv; struct b53_vlan vl = { 0 }; - int i; + int i, def_vid; + + def_vid = b53_default_pvid(dev); /* clear all vlan entries */ if (is5325(dev) || is5365(dev)) { - for (i = 1; i < dev->num_vlans; i++) + for (i = def_vid; i < dev->num_vlans; i++) b53_set_vlan_entry(dev, i, &vl); } else { b53_do_vlan_op(dev, VTA_CMD_CLEAR); @@ -650,7 +660,7 @@ int b53_configure_vlan(struct dsa_switch *ds) b53_for_each_port(dev, i) b53_write16(dev, B53_VLAN_PAGE, - B53_VLAN_PORT_DEF_TAG(i), 1); + B53_VLAN_PORT_DEF_TAG(i), def_vid); if (!is5325(dev) && !is5365(dev)) b53_set_jumbo(dev, dev->enable_jumbo, false); @@ -1326,12 +1336,8 @@ int b53_vlan_del(struct dsa_switch *ds, int port, vl->members &= ~BIT(port); - if (pvid == vid) { - if (is5325(dev) || is5365(dev)) - pvid = 1; - else - pvid = 0; - } + if (pvid == vid) + pvid = b53_default_pvid(dev); if (untagged && !dsa_is_cpu_port(ds, port)) vl->untag &= ~(BIT(port)); @@ -1644,10 +1650,7 @@ void b53_br_leave(struct dsa_switch *ds, int port, struct net_device *br) b53_write16(dev, B53_PVLAN_PAGE, B53_PVLAN_PORT_MASK(port), pvlan); dev->ports[port].vlan_ctl_mask = pvlan; - if (is5325(dev) || is5365(dev)) - pvid = 1; - else - pvid = 0; + pvid = b53_default_pvid(dev); /* Make this port join all VLANs without VLAN entries */ if (is58xx(dev)) {