Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp4470803ybz; Tue, 28 Apr 2020 11:51:14 -0700 (PDT) X-Google-Smtp-Source: APiQypJD+Vjocv2ZayHY1c3FiZhVN9o8P5n+1TmizN+6cWcNLruMtNKAE3NPD6tJKsIc5cTxqirT X-Received: by 2002:aa7:dcc3:: with SMTP id w3mr22716908edu.231.1588099874624; Tue, 28 Apr 2020 11:51:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1588099874; cv=none; d=google.com; s=arc-20160816; b=RB9U44BDU79wmj5iJhISbVnVTcxo0jA0htdYgcSgNsrr3AY7u1eBaZKwLZEZAMs0gh 57vtJDpLEz5RCY0I18UYmnWtwClsoYxhKi7BJJaAkU2Dtr77Ps7J+gZLBVB5yf8kY09G v9v1tIPQhxCvJVBJ3Jp/y9vTdnb90LGsuOGLDQ9sV5K9snfmCYiX8FofcKOTszPSoANu 7Pw/5TmApBtA6C3XYNNPT46qxR5XFmUy68vQDCnLsM7VTLmO8YnCib8klSFsUPpxdrTr 8vget/zu5Gz+PMj4eD6ICZya5wLFuIjXxAemI5rM9jgEibKgXtI3hnQBFs69L87bO3sA gWPA== 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=GdR35MTG1JbpBfJujKMtpVdb5//0msPcCRn6/jnjUds=; b=BJWTNx0KD97xndShax2lXuobVjYpCTk+sdgX+2J8yKoktjpbDxL5bDHLXRpyv9wxx8 GB5ALx8hbMqd5VuQfvQZWj1GqYcvqShJgcg1Tzy4NbzXoqrtWemnyPB8/CTOS+vZjB9t 9V1jHkSHUwDT3PJ01bBZ87ku+ymCilxlkd0iz5kmQmJ03j6qIurOmpN351jTaghIz8Ta TpnRS0z5bBDpsFoWrt8KdIN1LRhE1tzO18UJv/0zVCcJ2hb4Hgtv5XELPUxE2LWmrOgF DzQ/SytvuJdlEXA6ErjDpco2tqZzDnruEXECpyQbh5yew1tuysHCNATlo5CBFUDjA+uh ZhZw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="EK/eYZu8"; 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 x2si2445787ejw.475.2020.04.28.11.50.51; Tue, 28 Apr 2020 11:51:14 -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="EK/eYZu8"; 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 S1730749AbgD1StE (ORCPT + 99 others); Tue, 28 Apr 2020 14:49:04 -0400 Received: from mail.kernel.org ([198.145.29.99]:59512 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729732AbgD1SkW (ORCPT ); Tue, 28 Apr 2020 14:40:22 -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 87D2A2085B; Tue, 28 Apr 2020 18:40:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588099222; bh=n+/17Ma26qtlsBWNMwijsTBxk4UKAi/EZ1WVUM/oUuk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EK/eYZu8gyrWuOS8wDg6rm5IrhuRFQzzNhBgpm+jxn6kLm0gU3HqhsxriJFYcIX7r zEVuGgdrUn//pvZmEON6bfGVL/laygO0muqXwfxES6/TYkyUdFh9vcBj6szmRG4L43 /Zq/cIt2s7TdkZnbduOKS9xCW7BiMeufThtVGZ+Q= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Andrew Lunn , Florian Fainelli , "David S. Miller" Subject: [PATCH 5.4 076/168] net: dsa: b53: Fix ARL register definitions Date: Tue, 28 Apr 2020 20:24:10 +0200 Message-Id: <20200428182241.718312404@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 c2e77a18a7ed65eb48f6e389b6a59a0fd753646a ] The ARL {MAC,VID} tuple and the forward entry were off by 0x10 bytes, which means that when we read/wrote from/to ARL bin index 0, we were actually accessing the ARLA_RWCTRL register. Fixes: 1da6df85c6fb ("net: dsa: b53: Implement ARL add/del/dump operations") Reviewed-by: Andrew Lunn Signed-off-by: Florian Fainelli Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/dsa/b53/b53_regs.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/net/dsa/b53/b53_regs.h +++ b/drivers/net/dsa/b53/b53_regs.h @@ -304,7 +304,7 @@ * * BCM5325 and BCM5365 share most definitions below */ -#define B53_ARLTBL_MAC_VID_ENTRY(n) (0x10 * (n)) +#define B53_ARLTBL_MAC_VID_ENTRY(n) ((0x10 * (n)) + 0x10) #define ARLTBL_MAC_MASK 0xffffffffffffULL #define ARLTBL_VID_S 48 #define ARLTBL_VID_MASK_25 0xff @@ -316,7 +316,7 @@ #define ARLTBL_VALID_25 BIT(63) /* ARL Table Data Entry N Registers (32 bit) */ -#define B53_ARLTBL_DATA_ENTRY(n) ((0x10 * (n)) + 0x08) +#define B53_ARLTBL_DATA_ENTRY(n) ((0x10 * (n)) + 0x18) #define ARLTBL_DATA_PORT_ID_MASK 0x1ff #define ARLTBL_TC(tc) ((3 & tc) << 11) #define ARLTBL_AGE BIT(14)