From patchwork Tue Jan 15 19:41:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 1025387 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="qztITXPB"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43fLMy2cljz9s9G for ; Wed, 16 Jan 2019 06:42:38 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389424AbfAOTmh (ORCPT ); Tue, 15 Jan 2019 14:42:37 -0500 Received: from mail-pg1-f194.google.com ([209.85.215.194]:38357 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389415AbfAOTmg (ORCPT ); Tue, 15 Jan 2019 14:42:36 -0500 Received: by mail-pg1-f194.google.com with SMTP id g189so1669181pgc.5 for ; Tue, 15 Jan 2019 11:42:35 -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=qztITXPB+XYGsHWDmVDgs0PE8iv+8VGSNobV1Fm4smmJ69wmhBVrHQ34ZLHm9VK3rz AsgwA9ttYh2eeowYPDcYNiiY5YOVAqyunVsuwuYbCQWKhd4rl55rqplFN7e9RA19pa46 o1l3EKASPVRjZUgKsC+XCzwB9CoKhyFXbQ3wHlQZWsyK/XNcySzcn5EerWDfoyrY1rD0 vyYKzs0DN1EihbR7DhRvZ7FRviLrqE3LrWy5ifcGskfdKWZuRxNMXZ0UHTcRtEPMUUNP I5okL40SrcY8xravKmDxQFo6oZ957QX7Y3v8pK9GnKpIQHMcr8Cv+wIWfFk3EHWNOHur +X3g== 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=FyTdiJqt0Hys5lbYxFpS4/hq2zzjgsNzQd8PjsLZXO5iyDjCy1pdqRI25lsiMu8eFP XeB1PVfIJhMDeHRBrS+G63y21OiI3gwPHZWo/2kKtxKaiVNt4pAtjp9qWNPiM+oJU/Rp Ixh9SFyYPa0DoUyiFlnfYAjiuuvBqwKV4tf80+gaQtL/zJoi0CZETUS3e8N4dLRSlkqa SOqUC6wyGSs+BntaWQNBaMYnyH4E3hjdOXE+djw0CIKL9RSv0lzLyfUxEBHOuTxpFJvL kdKuDGWCL87CU1fN0EXa2Tkrv1tPRaktQ9Bm6AUM2Oz0m6kapY+pr8zqGnimMZOUbQ39 oSkQ== X-Gm-Message-State: AJcUukeRt2+kKnpaOcWDfMEE+6c6Ee7HvnVgrChUlRz+wIx7fBpB4o11 +hVWmfH/24MQ6NhSEE/ov6yTxGUt X-Google-Smtp-Source: ALg8bN6+WpGElDL2iDkSTsNCz+kV367/N029KNbM8pGD9iDXz4qkC5DN/9HMF0RKaTUNiY/TBvoHRw== X-Received: by 2002:a65:4683:: with SMTP id h3mr5004701pgr.225.1547581354421; Tue, 15 Jan 2019 11:42:34 -0800 (PST) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.250]) by smtp.gmail.com with ESMTPSA id 128sm6954262pfu.129.2019.01.15.11.42.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 15 Jan 2019 11:42:33 -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: [RFC net-next 02/14] net: dsa: b53: Fix default VLAN ID Date: Tue, 15 Jan 2019 11:41:18 -0800 Message-Id: <20190115194130.19896-3-f.fainelli@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190115194130.19896-1-f.fainelli@gmail.com> References: <20190115194130.19896-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)) {