Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp4453952ybz; Tue, 28 Apr 2020 11:33:53 -0700 (PDT) X-Google-Smtp-Source: APiQypJEXTnQhn8XNOF5BrgE9NKlzS73bW8XK6yH3kasc+tYiq8wFZqWRGEY5T9KhL9D8yKminCe X-Received: by 2002:a05:6402:688:: with SMTP id f8mr23828292edy.233.1588098833769; Tue, 28 Apr 2020 11:33:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1588098833; cv=none; d=google.com; s=arc-20160816; b=k61KAtHa0xwLjsOKW0qHg5H7G+W3hPzwMTLB7FOV5OBB2Lr5DNkiEPqfKDG6xwD+qk hUBZUj0kFUCPJ+xj5hWA7kscoeKz0Z3DUPERybbGhq376EQZBOu1UzuuMoYG2mQ6wMw1 NY2FTSFsRX3HxsqbI0bZ4vgE9pce6zdqhEdrWBFoq33/vkkEjh8bBqHSlULTRvbFUW6I tcna8cmpezEo+9sojTKRD8pXjBALVujUZaYRbyYkca4P+icUUXuY3quj3bWsfHaPKlUJ 6J5/eMvHrdbX32T/zSinXcPYtJFoMBfOZYpPVZXjEbxHQyyYoKNoXHwhaSZPKxsZTjXC rHFg== 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=oIngkV9BVblQV2vwebFGguZQTBd02/WpmoL+doVSI6IYiThZ182wlPid0MR/o4we0G vYW1mGune8WeWlby6Uzkpt2DRMGTK3JhbVwENV5TgN9oO2EjThfTQ856rgu87uu+3yPa YLPzP3ayH7ahFwTFsx/FF4y4Tnw9Jgq2cBcaml0d+1cx2khqzRg4GmsI0DCH4t80aESR ihPM+VM9WypWdXOzrcOqcPQLl/qWJaDKM9kPrqMSDhvTRvIeItNR/tBn66mIUIGyMYI+ 9+kGEbdDlp77vqWkzpcig6zzaSQj3sfpaxp5iKZAULoR3V41Ivj+0pBxsF+HsDnbNu1Y D+fg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=GXJTC5X3; 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 q24si2166238ejb.184.2020.04.28.11.33.29; Tue, 28 Apr 2020 11:33:53 -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=GXJTC5X3; 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 S1728773AbgD1S3H (ORCPT + 99 others); Tue, 28 Apr 2020 14:29:07 -0400 Received: from mail.kernel.org ([198.145.29.99]:42122 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729255AbgD1S2v (ORCPT ); Tue, 28 Apr 2020 14:28:51 -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 EE6EC20730; Tue, 28 Apr 2020 18:28:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588098531; bh=n+/17Ma26qtlsBWNMwijsTBxk4UKAi/EZ1WVUM/oUuk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GXJTC5X3Zwwhny0H1SKdBiUHf4MxYRhTqdHiFINt40oHcyjVhc1ZzBzeoANOTDpKi H+Bqf77Q7EfGohdmgfXmWouJT4ercqDchU8dBPdTb+cB4dXq/HySv95lpNUK0uEME1 9aj2ui9b8JFPkjrMlUP/WYXe84FHaVPG3TtMXCWg= 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.6 067/167] net: dsa: b53: Fix ARL register definitions Date: Tue, 28 Apr 2020 20:24:03 +0200 Message-Id: <20200428182233.449132101@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 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)