From mboxrd@z Thu Jan 1 00:00:00 1970 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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 11AE2C28CBC for ; Thu, 30 Apr 2020 13:57:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D65BC2063A for ; Thu, 30 Apr 2020 13:57:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588255075; bh=rgqJWEix/GQDsqSO53LLaO59gXIZ/vIIE4s6yAZ4QKg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=E0TWCVVe4tpNsY3quBX9TPPiJHJIdlYqJ5rpUAKCC/XWe5tJcYpQfDDJEEQ423RaQ CquOoeezeK6Rs31Oktwjl6q+3xlQ8J8AaHYy4XVEDAQhI69U1HIa85L0movYlkhIN+ zxLn2g/N5raTaaZ2vHFosZH+GS91ZK9FODhVav3w= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729306AbgD3N5y (ORCPT ); Thu, 30 Apr 2020 09:57:54 -0400 Received: from mail.kernel.org ([198.145.29.99]:37512 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728244AbgD3Nyq (ORCPT ); Thu, 30 Apr 2020 09:54:46 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A9C9420870; Thu, 30 Apr 2020 13:54:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588254886; bh=rgqJWEix/GQDsqSO53LLaO59gXIZ/vIIE4s6yAZ4QKg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NdmD3WXht2bsnRGA07LsH+8/hugS21b5TxE3wEScfN3FQKGYUlyINkvHQ1z6XLv9H psLpKSEfMzmvwL6mELnRy4eRCsXK/883syycw6hEiH8KUatmkFanwyOUSHARaXEp/7 nzDMkwDXu4RjtFXLBXxdrO6ELFuujfMDVJ+PZy7g= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Florian Fainelli , Andrew Lunn , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 11/17] net: dsa: b53: Fix ARL register definitions Date: Thu, 30 Apr 2020 09:54:27 -0400 Message-Id: <20200430135433.21204-11-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200430135433.21204-1-sashal@kernel.org> References: <20200430135433.21204-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore 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: Sasha Levin --- drivers/net/dsa/b53/b53_regs.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/dsa/b53/b53_regs.h b/drivers/net/dsa/b53/b53_regs.h index 81044000ce751..85c44bfba55a2 100644 --- a/drivers/net/dsa/b53/b53_regs.h +++ b/drivers/net/dsa/b53/b53_regs.h @@ -261,7 +261,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 @@ -273,7 +273,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) -- 2.20.1