Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp4464495ybz; Tue, 28 Apr 2020 11:44:28 -0700 (PDT) X-Google-Smtp-Source: APiQypJhgotl33yvq4TjrVUV1zxWwIAKNNm8rDLIQtr4foCt4jEyEchRkvfcH0/RFSvwKlbiAZ5h X-Received: by 2002:a17:906:3291:: with SMTP id 17mr25484911ejw.343.1588099467959; Tue, 28 Apr 2020 11:44:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1588099467; cv=none; d=google.com; s=arc-20160816; b=ZPfVLWc8/2ZC5iOnfn1iAbvi3PPY7xYvYwfkhANBJbzrwhDZ5zsBIvQcLnHgb/Ep+7 J1YHy3fr2n24oUHsrwGHHF1vcPHuc54h5CKdUUVVVMA7cxW8C1Rf/ndKofEN+FaApbsi YDfPWgLrSWGoR++veg+ieFdogYNDQAZwxjvY0bmQeQ/97E0lA/ZfA11mXHX+XSmX/F3H y3GbGn41Hu0T4AxJkdYN0I8ttbiQ4sGoSHQYJlfsrUtMI9IWpGYyOPoba9O5453uPwua 7Z7gkixjo7j1Q4gqdS13W5LxczYrL9ZTpjS6g39vuLhl+u5t601gflpfJA/nK3rlQSwM rZrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=9VVZbRvANv+0tbvhFpUpGNo77nWKFMg1omJm78/UMmg=; b=tnFep/wHPjv9V/6KrTZEt4TYuvOWtJ5N9deResuqIcRgjN2Fa/v8RWUORHy3FfIVeQ Kp4GEO0mIrDYl4qR3c/kxDMKjEQTaTEsYvf4sFvB5p9mCx2bLKVOAGsSWdezG68a+jHg mMCjSt0IsNY5Zl1LRTTAJr6DXCMvixt4mJczTjm2QkphIBjs0faYTBhfeu9RlnseeTiY 6WnAb9fR7duPVIZKSseYbGm66Cjx0MEWrv09zyxL97Tte0C7GfAWZ6jg9Aj3i52bLUyr cnxPAvb/KUxssUB7t3JVVKdk+3UOOUUPz9kyVxz3UWXb4Q9w7mOwUF1BzAoIXLiJIVdP 4bAQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=UboVY+x6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id m24si2282082edr.227.2020.04.28.11.44.04; Tue, 28 Apr 2020 11:44:27 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=UboVY+x6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730788AbgD1Skm (ORCPT + 99 others); Tue, 28 Apr 2020 14:40:42 -0400 Received: from mail.kernel.org ([198.145.29.99]:59786 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730943AbgD1Ske (ORCPT ); Tue, 28 Apr 2020 14:40:34 -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 0FA902076A; Tue, 28 Apr 2020 18:40:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588099234; bh=zj1ucqAnFWab6s3lvbpafxI8eN5LcI4OKuLu8l9+6Lk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UboVY+x6kOmWUuH4gSsl7R90WJT0Iz+aKlHSvgXd2eFpbSwB9LiFHCs1+8vjZx88k /PCilgTtvL00zLuyzVu6aHaVONMvwivqdSUYKcD95mfObCmUBAP35i7PXlBVChNFVk aVvvPE/T1x8Bkn9VoNGZWWd2I212Wd4hu5u8FhCw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Florian Fainelli , "David S. Miller" Subject: [PATCH 5.4 078/168] net: dsa: b53: b53_arl_rw_op() needs to select IVL or SVL Date: Tue, 28 Apr 2020 20:24:12 +0200 Message-Id: <20200428182242.018362141@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200428182231.704304409@linuxfoundation.org> References: <20200428182231.704304409@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Florian Fainelli [ Upstream commit 64fec9493f7dc9bdd7233bcfe98985c45bd0e3c1 ] Flip the IVL_SVL_SELECT bit correctly based on the VLAN enable status, the default is to perform Shared VLAN learning instead of Individual learning. Fixes: 1da6df85c6fb ("net: dsa: b53: Implement ARL add/del/dump operations") Signed-off-by: Florian Fainelli Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/dsa/b53/b53_common.c | 4 ++++ drivers/net/dsa/b53/b53_regs.h | 1 + 2 files changed, 5 insertions(+) --- a/drivers/net/dsa/b53/b53_common.c +++ b/drivers/net/dsa/b53/b53_common.c @@ -1441,6 +1441,10 @@ static int b53_arl_rw_op(struct b53_devi reg |= ARLTBL_RW; else reg &= ~ARLTBL_RW; + if (dev->vlan_enabled) + reg &= ~ARLTBL_IVL_SVL_SELECT; + else + reg |= ARLTBL_IVL_SVL_SELECT; b53_write8(dev, B53_ARLIO_PAGE, B53_ARLTBL_RW_CTRL, reg); return b53_arl_op_wait(dev); --- a/drivers/net/dsa/b53/b53_regs.h +++ b/drivers/net/dsa/b53/b53_regs.h @@ -292,6 +292,7 @@ /* ARL Table Read/Write Register (8 bit) */ #define B53_ARLTBL_RW_CTRL 0x00 #define ARLTBL_RW BIT(0) +#define ARLTBL_IVL_SVL_SELECT BIT(6) #define ARLTBL_START_DONE BIT(7) /* MAC Address Index Register (48 bit) */