Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C0712C43381 for ; Sun, 17 Feb 2019 16:32:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8FD2A2190C for ; Sun, 17 Feb 2019 16:32:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=armlinux.org.uk header.i=@armlinux.org.uk header.b="cU2YoUf+" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726583AbfBQQcn (ORCPT ); Sun, 17 Feb 2019 11:32:43 -0500 Received: from pandora.armlinux.org.uk ([78.32.30.218]:39732 "EHLO pandora.armlinux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726087AbfBQQcn (ORCPT ); Sun, 17 Feb 2019 11:32:43 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=armlinux.org.uk; s=pandora-2019; h=Date:Sender:Message-Id:Content-Type: Content-Transfer-Encoding:MIME-Version:Subject:Cc:To:From:References: In-Reply-To:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=gKyqVUjO/oq0d3lQB5/0M6hla6l0Fj1/dpL3dPuvwO8=; b=cU2YoUf+0dvfCmxR/iuvNnPgmR NqJeq7bIQOHUitHJTmLd7OuLN4JPtqtf/Za6FWzu8qMrgvbbkGdj9cm50JLcfR11/dptWcr69gzaA nJn7cxPHtmpZKDxRI+f/DBncl4vO8N+ARx3xXr+0evQoQel4ww7yE0Me14g2evSPBwlpucGpRKoRS CHsCKSN0CACeBc/1vut0S5sc8bkhyKhPE90saY7pW/8UG2JksXapN8AuVSuOTZCp5gvipERFzs4qy gmmCMi1U7KcGRPdbT6wv0wZ86CBs3cA4/eRveiIUEafLvKIqzjOrdBdnGuoczpTLbwsVHg8KXftBn BbcR/XYQ==; Received: from e0022681537dd.dyn.armlinux.org.uk ([fd8f:7570:feb6:1:222:68ff:fe15:37dd]:47264 helo=rmk-PC.armlinux.org.uk) by pandora.armlinux.org.uk with esmtpsa (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.90_1) (envelope-from ) id 1gvPMq-0001JC-41; Sun, 17 Feb 2019 16:32:36 +0000 Received: from rmk by rmk-PC.armlinux.org.uk with local (Exim 4.82_1-5b7a7c0-XX) (envelope-from ) id 1gvPMo-0000Ah-Vy; Sun, 17 Feb 2019 16:32:35 +0000 In-Reply-To: <20190217163114.yomawlljyxlqy3ob@shell.armlinux.org.uk> References: <20190217163114.yomawlljyxlqy3ob@shell.armlinux.org.uk> From: Russell King To: Andrew Lunn , Florian Fainelli , Vivien Didelot Cc: Heiner Kallweit , "David S. Miller" , netdev@vger.kernel.org Subject: [PATCH net-next v2 2/3] net: dsa: mv88e6xxx: add support for bridge flags MIME-Version: 1.0 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="utf-8" Message-Id: Date: Sun, 17 Feb 2019 16:32:34 +0000 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Add support for the bridge flags to Marvell 88e6xxx bridges, allowing the multicast and unicast flood properties to be controlled. These can be controlled on a per-port basis via commands such as: bridge link set dev lan1 flood on|off bridge link set dev lan1 mcast_flood on|off Signed-off-by: Russell King --- drivers/net/dsa/mv88e6xxx/chip.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c index 32e7af5caa69..72db6e74be48 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -4692,6 +4692,38 @@ static int mv88e6xxx_port_mdb_del(struct dsa_switch *ds, int port, return err; } +static int mv88e6xxx_port_bridge_flags(struct dsa_switch *ds, int port, + unsigned long flags) +{ + struct mv88e6xxx_chip *chip = ds->priv; + bool unicast, multicast; + int ret = -EOPNOTSUPP; + + unicast = dsa_is_cpu_port(ds, port) || dsa_is_dsa_port(ds, port) || + flags & BR_FLOOD; + multicast = flags & BR_MCAST_FLOOD; + + mutex_lock(&chip->reg_lock); + if (chip->info->ops->port_set_egress_floods) + ret = chip->info->ops->port_set_egress_floods(chip, port, + unicast, + multicast); + mutex_unlock(&chip->reg_lock); + + return ret; +} + +static unsigned long mv88e6xxx_bridge_flags_support(struct dsa_switch *ds) +{ + struct mv88e6xxx_chip *chip = ds->priv; + unsigned long support = 0; + + if (chip->info->ops->port_set_egress_floods) + support |= BR_FLOOD | BR_MCAST_FLOOD; + + return support; +} + static const struct dsa_switch_ops mv88e6xxx_switch_ops = { #if IS_ENABLED(CONFIG_NET_DSA_LEGACY) .probe = mv88e6xxx_drv_probe, @@ -4719,6 +4751,8 @@ static const struct dsa_switch_ops mv88e6xxx_switch_ops = { .set_ageing_time = mv88e6xxx_set_ageing_time, .port_bridge_join = mv88e6xxx_port_bridge_join, .port_bridge_leave = mv88e6xxx_port_bridge_leave, + .port_bridge_flags = mv88e6xxx_port_bridge_flags, + .bridge_flags_support = mv88e6xxx_bridge_flags_support, .port_stp_state_set = mv88e6xxx_port_stp_state_set, .port_fast_age = mv88e6xxx_port_fast_age, .port_vlan_filtering = mv88e6xxx_port_vlan_filtering, -- 2.7.4