From patchwork Fri May 8 12:34:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 226242 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=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT 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 5ED4EC38A2A for ; Fri, 8 May 2020 12:47:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 33BA024969 for ; Fri, 8 May 2020 12:47:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588942066; bh=sP2fDwHK0o+Nk6rO0FvGgB4mTCFHk1NwdhTnL2GdlBg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Mx7O5HUBPmiQ7/lAgKXRn2Gl8XUNoaFPcU6InWxDZTK9EjmnO358tRCKQGOvTh6sJ vHeUbJEy+UHnYRz1jjqpoZQ4OoHR4QaTITRLwH1IrHQDbsZ+HZa2pr71A8iK7tXJ6Y c+Mhs3krbgxDxbNHlBJGdmCTvPaGqfLb8ln2vvDg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729579AbgEHMro (ORCPT ); Fri, 8 May 2020 08:47:44 -0400 Received: from mail.kernel.org ([198.145.29.99]:50600 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729581AbgEHMrl (ORCPT ); Fri, 8 May 2020 08:47:41 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0EA9621473; Fri, 8 May 2020 12:47:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588942061; bh=sP2fDwHK0o+Nk6rO0FvGgB4mTCFHk1NwdhTnL2GdlBg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GQXhyVi5wPQAn+nmt5VUv4d7Qsh7RjFznVa/hhxWEFBIi0YVLRjJ0Qfor0KW42rIG 9XNFhBn8tjseRLYkjkOITYMVhOHXRHHOqZacxUKH5CbHX5Rm8Iqjccx1NmOjiEccuW bINrm49BgEBmnsVdgO+poXSc1LNKQwdGu0lkh5mY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Vivien Didelot , "David S. Miller" Subject: [PATCH 4.4 282/312] net: dsa: mv88e6xxx: enable SA learning on DSA ports Date: Fri, 8 May 2020 14:34:33 +0200 Message-Id: <20200508123144.243668620@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200508123124.574959822@linuxfoundation.org> References: <20200508123124.574959822@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Vivien Didelot commit 996ecb8246676100af2a4dc1cfed747712a3c85f upstream. In multi-chip systems, DSA Tag ports must learn SA addresses in order to correctly switch frames between interconnected chips. This fixes cross-chip hardware bridging in a VLAN filtering aware system, because a bridge group gets implemented as an hardware 802.1Q VLAN and thus DSA and user ports share the same FDB. Fixes: 4c7ea3c0791e ("net: dsa: mv88e6xxx: disable SA learning for DSA and CPU ports") Signed-off-by: Vivien Didelot Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/dsa/mv88e6xxx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/net/dsa/mv88e6xxx.c +++ b/drivers/net/dsa/mv88e6xxx.c @@ -2064,8 +2064,8 @@ static int mv88e6xxx_setup_port(struct d * the other bits clear. */ reg = 1 << port; - /* Disable learning for DSA and CPU ports */ - if (dsa_is_cpu_port(ds, port) || dsa_is_dsa_port(ds, port)) + /* Disable learning for CPU port */ + if (dsa_is_cpu_port(ds, port)) reg = 0; ret = _mv88e6xxx_reg_write(ds, REG_PORT(port), PORT_ASSOC_VECTOR, reg);