diff mbox series

[4.9,27/80] net: dsa: b53: Fix ARL register definitions

Message ID	20200501131523.072001878@linuxfoundation.org
State	New
Headers	show Return-Path: <SRS0=1/SS=6P=vger.kernel.org=stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Andrew Lunn <andrew@lunn.ch>, Florian Fainelli <f.fainelli@gmail.com>, "David S. Miller" <davem@davemloft.net> Subject: [PATCH 4.9 27/80] net: dsa: b53: Fix ARL register definitions Date: Fri, 1 May 2020 15:21:21 +0200 Message-Id: <20200501131523.072001878@linuxfoundation.org> In-Reply-To: <20200501131513.810761598@linuxfoundation.org> References: <20200501131513.810761598@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk
Series	None \| expand [4.9,02/80] net: ipv4: emulate READ_ONCE() on ->hdrincl bit-field in raw_sendmsg() [4.9,05/80] crypto: mxs-dcp - make symbols sha1_null_hash and sha256_null_hash static [4.9,06/80] vti4: removed duplicate log message. [4.9,10/80] ceph: dont skip updating wanted caps when cap is stale [4.9,11/80] pwm: rcar: Fix late Runtime PM enablement [4.9,13/80] ASoC: Intel: atom: Take the drv->lock mutex before calling sst_send_slot_map() [4.9,14/80] kernel/gcov/fs.c: gcov_seq_next() should increase position index [4.9,19/80] PCI/ASPM: Allow re-enabling Clock PM [4.9,20/80] ipv6: fix restrict IPV6_ADDRFORM operation [4.9,21/80] macsec: avoid to set wrong mtu [4.9,22/80] macvlan: fix null dereference in macvlan_device_event() [4.9,23/80] net: netrom: Fix potential nr_neigh refcnt leak in nr_add_node [4.9,25/80] tcp: cache line align MAX_TCP_HEADER [4.9,27/80] net: dsa: b53: Fix ARL register definitions [4.9,28/80] xfrm: Always set XFRM_TRANSFORMED in xfrm{4,6}_output_finish [4.9,31/80] iio: xilinx-xadc: Fix clearing interrupt when enabling trigger [4.9,32/80] iio: xilinx-xadc: Fix sequencer configuration for aux channels in simultaneous mode [4.9,38/80] overflow.h: Add arithmetic shift helper [4.9,41/80] ALSA: usb-audio: Fix usb audio refcnt leak when getting spdif [4.9,43/80] tpm/tpm_tis: Free IRQ if probing fails [4.9,44/80] KVM: Check validity of resolved slot when searching memslots [4.9,45/80] KVM: VMX: Enable machine check support for 32bit targets [4.9,46/80] tty: hvc: fix buffer overflow during hvc_alloc(). [4.9,48/80] usb-storage: Add unusual_devs entry for JMicron JMS566 [4.9,54/80] staging: vt6656: Fix drivers TBTT timing counter. [4.9,55/80] staging: vt6656: Power save stop wake_up_count wrap around. [4.9,57/80] UAS: fix deadlock in error handling and PM flushing work [4.9,59/80] remoteproc: Fix wrong rvring index computation [4.9,60/80] fuse: fix possibly missed wake-up after abort [4.9,63/80] nfsd: memory corruption in nfsd4_lock() [4.9,64/80] net/cxgb4: Check the return from t4_query_params properly [4.9,65/80] perf/core: fix parent pid/tid in task exit events [4.9,66/80] bpf, x86: Fix encoding for lower 8-bit registers in BPF_STX BPF_B [4.9,68/80] scsi: target: fix PR IN / READ FULL STATUS for FC [4.9,69/80] objtool: Fix CONFIG_UBSAN_TRAP unreachable warnings [4.9,71/80] xen/xenbus: ensure xenbus_map_ring_valloc() returns proper grant status [4.9,74/80] hwmon: (jc42) Fix name to have no illegal characters [4.9,77/80] ext4: dont perform block validity checks on the journal inode [4.9,79/80] ext4: unsigned int compared against zero

Commit Message

gregkh@linuxfoundation.org May 1, 2020, 1:21 p.m. UTC

From: Florian Fainelli <f.fainelli@gmail.com>

[ 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 <andrew@lunn.ch>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 drivers/net/dsa/b53/b53_regs.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff mbox series

Patch

--- 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)