Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp4497195ybz; Tue, 28 Apr 2020 12:20:26 -0700 (PDT) X-Google-Smtp-Source: APiQypIL8FCOM2kxqBmigz5Yu4vdHvQjKGSZXMutbZSTOdPdifIp3wRvsZ6T5Zy8zysytkP/jT9o X-Received: by 2002:a17:906:edb5:: with SMTP id sa21mr26643874ejb.270.1588101626127; Tue, 28 Apr 2020 12:20:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1588101626; cv=none; d=google.com; s=arc-20160816; b=aP869a9wjf+WMhOy2oWGLNnm+YRTW1vLWPfGqnW7Wd4Twi/fYrU5YCQ+DI3LXeSjhg 9sfxBN4isJqSZELyN4jGDGLBR33G9vV2faWjL5Ib0E+QHmkqCtWm/Q7X21GzfMN+p3b2 SGnairU3NOKYWQa5DutaoXzz+4/oYCUJEk6H8MoY2SJoqSdArw2xFPLXIYv8vsn9vq7p wjrKFdProji9FjzsP90zKHnXHexsd5r+qINXIKWK0LeX719qO9lk3jpdPpMW/INb05Q6 2Y69Z9dU5BlWk0gRCZYa4N98jzQy+1UO8Vsm6q8QpbLalREzziQQgNVSdBlpus+dRCaq uTOw== 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=G0sR+FYCVIh40STv+iQuMlN7mDvJwQpcvPSfdTSD/5Q=; b=nleThq2VUjKU7aSAKwGQaUBmGg1uI4Ixb4hJNA01fCfDQq+Uu9Ke/ZoVZG7EFdB/ZO 8YMI1DQ1Yh2DmcmdHlJk4DKDR34AzFk2kPuYvMolP7Px2dIxe/mGJEr2dBNy6suoxPzn x6x8Z0Z8cRGc1FOiQNgmdS0InDP3v/zl+HUCuYLyI+WNQksFMSkLYEqgjuwc0VZwedbQ DK0WAgErVwlmr2F1UoVaqJA3sVkJ+nKiDqhkytk76SO4FsYGX4sUOvsDjfpR+Av4jbwV /huuKtR0zeK2T5Qzu/VnTrH28Vau8kRPymSxMBMMhF59wfr7jTspwMNDhfatNzNNOEC1 Q+Aw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=xHHdbgC0; 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 u10si2067265edl.591.2020.04.28.12.20.01; Tue, 28 Apr 2020 12:20:26 -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=xHHdbgC0; 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 S1730195AbgD1S6q (ORCPT + 99 others); Tue, 28 Apr 2020 14:58:46 -0400 Received: from mail.kernel.org ([198.145.29.99]:42402 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729287AbgD1S3B (ORCPT ); Tue, 28 Apr 2020 14:29:01 -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 B732820730; Tue, 28 Apr 2020 18:29:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588098541; bh=ayzYA0u5RAjjS3HbPzakz8kLWk20mbV2cvoevGZM7x0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xHHdbgC0hEAfjw9+v2lzXzz8S5K7jW8wqxhzSLKxWc0tLoLoABBq9hQD+XX/KlZB3 OmQfh1zBidIMz6VSINPuOTWU/EZ4L7rjqHcW434/2vCB7hxSK5CelpKIGwasDJBTup KtkC46JWHiVvGqU0+lVLQmuzgfibJxougSWOBlKU= 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.6 069/167] net: dsa: b53: b53_arl_rw_op() needs to select IVL or SVL Date: Tue, 28 Apr 2020 20:24:05 +0200 Message-Id: <20200428182233.698317777@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200428182225.451225420@linuxfoundation.org> References: <20200428182225.451225420@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 @@ -1454,6 +1454,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) */