Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp669803ybz; Fri, 1 May 2020 06:32:08 -0700 (PDT) X-Google-Smtp-Source: APiQypLm4uUgIo0hD1Alrww50DW8CVWJvJwyRazRE0av1vbQtuenMA47BVRbwUrzW4/Jq4X0oTDm X-Received: by 2002:aa7:c312:: with SMTP id l18mr3677156edq.161.1588339928128; Fri, 01 May 2020 06:32:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1588339928; cv=none; d=google.com; s=arc-20160816; b=xde99foioYfztfOUINCGxRwQGCNjuGRqg55jdKP2nv8G5RbhtxeAC7LWTJCKxhIT8B ElOwZb9bZC0aNGKjM8GISh/Uky6EmpgvJ8vFnz/sDvLaDxo7S84Xto/UEw1As+Hg06hO KQLKW7vdTCz10PeTcqKBHHKI9YBMaBIB7Yq/x3J1Ga0KkNzWZQCdefyi05OZY7rG72BH jPdfQx4iCaJJOLjw/8zN/z0wmEYBq5igO5MrInf+UPrvkc8xX+cBAOr97jwzVYT9qFnJ AC8YnPYHfgfF5DG7SqLma27+DRn4ae16lIDTm1Mj883OpVP57Z5fyI8uB2tcTsdRybxl vClg== 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=9/vrlq2agAkUreO5iyiynVZ12D9PBPZy6a4VkXVHp7c=; b=kyZu2ejLt1m7v0mcF9YwF4uG/n/yUv7ojftEm8YKF79ELhoU3BJikYNlDUF+YnDIKN X4zSkoycGfE9aXx0EFHEGAxqwG4GXaxzN8CmEfQn4grAf8OlvLYflZU2Sm7/f2CogYus YiLj1qTZ2ciptND/GP+wBkfc5/Nia7FcImv9NTfAVkNHIx4WWTo7dSbV5/vcZxe8S3nE yI+q1PT3/yxEwwfvPHklYiJpjfChyu3RE3Al8Vha3mJInNIhlS6AMa8kj/D8euFSoYO/ qNJrmUCl1gae2f4Y1TSgb+JV8eAWyk3gZePJt3r7cnwq82FbZmjbC8Bi2XBUe1+zYQKU jzWQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=XYa1oxJQ; 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 n18si1797874edq.472.2020.05.01.06.31.44; Fri, 01 May 2020 06:32:08 -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=XYa1oxJQ; 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 S1729209AbgEAN3G (ORCPT + 99 others); Fri, 1 May 2020 09:29:06 -0400 Received: from mail.kernel.org ([198.145.29.99]:52392 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729180AbgEAN3B (ORCPT ); Fri, 1 May 2020 09: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 C52BC2166E; Fri, 1 May 2020 13:29:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588339741; bh=gadNk1MI0y1p+NJKWzpJ9ZztzLlLX5NK6p24UrFs91A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XYa1oxJQTZ+uYapSXkazphmxCm0ZTeDVvPNH/7aSlSz8DAA9kByRUYpqCSV4oGQ1N 7jt29f/91BjbSWRrfPqLM3bVYKnK16lIxZHHeEV6RGkzFexvzvJteGsbRRVRFYFXJH idcxIsrVRPvUd/6AodYgCsHsJMsId1paDqT4iNd8= 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 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> X-Mailer: git-send-email 2.26.2 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: 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 @@ -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)