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=-9.6 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, 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 0E170C43387 for ; Wed, 26 Dec 2018 22:56:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D4592214D8 for ; Wed, 26 Dec 2018 22:56:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1545864995; bh=6z+Vjnhf2bSbjqUW1lnebvwvEFpQMJg3tHCTsr9+1dI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=DW3LkX/oQihpVkhjM4WpiwjjW5yMWKwB1/s+JyHrrZKzqpfpaBfuAXyAKDmb6VKsB JWMwflUUG6wHeDwzwVUfXyst7Al2xs507a1e1dWZe5PKAjVUdLYW88ntRBQGD9H2op sk0MIpjQptxXDBmzvv+MvPxH9g3JPISS6NXvXzlw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730186AbeLZW4e (ORCPT ); Wed, 26 Dec 2018 17:56:34 -0500 Received: from mail.kernel.org ([198.145.29.99]:55722 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730137AbeLZWyX (ORCPT ); Wed, 26 Dec 2018 17:54:23 -0500 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 687FF21741; Wed, 26 Dec 2018 22:54:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1545864862; bh=6z+Vjnhf2bSbjqUW1lnebvwvEFpQMJg3tHCTsr9+1dI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fTrv0/JRoSd6KIX7F+VKi3w/VM5pjMxp4bm4GJK1Vl+AxirHmM+2xuj/U9/2vJzvu /8DFLngWAPGnz370u30KDIFEyPLeOmMzgku5leBvcldzZgwL2qck5f2t4S2iu1tfFn lkkmdbXGSsZd8mrD+W/wHJi7WXUaJ5c+hKq+2ibY= From: Sasha Levin To: stable@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Yonglong Liu , Peng Li , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 20/35] net: hns: Incorrect offset address used for some registers. Date: Wed, 26 Dec 2018 17:41:27 -0500 Message-Id: <20181226224142.150866-20-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181226224142.150866-1-sashal@kernel.org> References: <20181226224142.150866-1-sashal@kernel.org> MIME-Version: 1.0 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: Yonglong Liu [ Upstream commit 4e1d4be681b2c26fd874adbf584bf034573ac45d ] According to the hip06 Datasheet: 1. The offset of INGRESS_SW_VLAN_TAG_DISC should be 0x1A00+4*all_chn_num 2. The offset of INGRESS_IN_DATA_STP_DISC should be 0x1A50+4*all_chn_num Signed-off-by: Yonglong Liu Signed-off-by: Peng Li Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c index 8ea3d95fa483..e25206540fd7 100644 --- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c +++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c @@ -2163,9 +2163,9 @@ void hns_dsaf_update_stats(struct dsaf_device *dsaf_dev, u32 node_num) DSAF_INODE_LOCAL_ADDR_FALSE_NUM_0_REG + 0x80 * (u64)node_num); hw_stats->vlan_drop += dsaf_read_dev(dsaf_dev, - DSAF_INODE_SW_VLAN_TAG_DISC_0_REG + 0x80 * (u64)node_num); + DSAF_INODE_SW_VLAN_TAG_DISC_0_REG + 4 * (u64)node_num); hw_stats->stp_drop += dsaf_read_dev(dsaf_dev, - DSAF_INODE_IN_DATA_STP_DISC_0_REG + 0x80 * (u64)node_num); + DSAF_INODE_IN_DATA_STP_DISC_0_REG + 4 * (u64)node_num); /* pfc pause frame statistics stored in dsaf inode*/ if ((node_num < DSAF_SERVICE_NW_NUM) && !is_ver1) { -- 2.19.1