Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp262886pxj; Tue, 18 May 2021 02:49:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzpicVil4AshT15WUbT+ArdSJj+kAQ/WQHC5mIA8w3gjgreGf8KpoS9hDHaiOSVhEFn20sA X-Received: by 2002:aa7:c4c2:: with SMTP id p2mr5779148edr.144.1621331376576; Tue, 18 May 2021 02:49:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621331376; cv=none; d=google.com; s=arc-20160816; b=qopjPVM/cHPBAwPRgyOp0CD2Luy6GisPd0GZoCFf/xJ9rhVPG1O1svBhQC24kCBZw7 WKmDfL9kteoVF0BRZCJiVpolieQrH5kO2aH6JGh2qL2Jcac/OXqM4YqIAwcWBZCDtT+n xtMJxWMMggiBfz6BN5juUd1KojVD72P+BV8m/rx63CJa/Xpr76L2UNOptQ4VnFsInP69 nZSjJUeRstP0hjIRODf+iiqfdOfUcn9FTPFuisR57xFVdHQUvDn2RFKMajJmtlhuot7o kp+lKBvJl1EzToueo2xuBHq7f1Us4wKUK4szDxZaBVPXtIeqjVXLTARit2O2sbH4jMms zztQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=zMRVjssnDADZBvbOWBuD4ecMSUwAqMoTa3bVNN/0H8E=; b=j0MimfK1+mcf54/h2jx+two4j/QbjPCt2LLKNFsvOq0KLRQxcYLJARFVFPNdzOeuO+ Z3SQVIMrNIe+LTHJTGm0M6KzLY7VYwGBiLaDiqyPippq3uE8E9udMKiGs+QrZYro9VXy aCD5i+x1xNVsmm7S5/fxL6sLNQTfUFVxL8fE2T2KLFTAD1s5ccA9kkLhqHYQyiI0HKkA rZWLnccebQet5zR6KNJc6woeanBJvgGNKP5jnDMmbuUfaxSExILILsgEv83/O5tscVqp H8XKTSSJLu5qQRAXhsTPUrvzIlxZ3q+MYHeRCTmi16luUmLjDdiisss5VwUE1Hie4361 srPA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=BUcCskQt; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id bt8si17396259ejb.153.2021.05.18.02.49.13; Tue, 18 May 2021 02:49:36 -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=@linuxfoundation.org header.s=korg header.b=BUcCskQt; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243506AbhEQPKN (ORCPT + 99 others); Mon, 17 May 2021 11:10:13 -0400 Received: from mail.kernel.org ([198.145.29.99]:60352 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240355AbhEQPAq (ORCPT ); Mon, 17 May 2021 11:00:46 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 022D1613DE; Mon, 17 May 2021 14:26:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1621261616; bh=Ha9QZXpRKvGrp6zm9D/uXy1qCK2zYTFkN6rLPeDpbwY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BUcCskQtktWmdYZ7mfU7x4itNhaIDNFeWr6zmf2Et2r09WBUN/gKZQZx4/oPrXtCA iCNpABv1GTJiOHKbK2moWbPkYl0ucYX7j7Qz7g6DR5ewNu4tdEofgRnyCzK/cj7UMt HecnKAgxkEXjyPEY5G5gKoIZk+n+N0YG7ZEpzEXc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Yufeng Mo , Huazhong Tan , "David S. Miller" , Sasha Levin Subject: [PATCH 5.4 066/141] net: hns3: fix incorrect configuration for igu_egu_hw_err Date: Mon, 17 May 2021 16:01:58 +0200 Message-Id: <20210517140244.995546999@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210517140242.729269392@linuxfoundation.org> References: <20210517140242.729269392@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Yufeng Mo [ Upstream commit 2867298dd49ee84214b8721521dc7a5a6382520c ] According to the UM, the type and enable status of igu_egu_hw_err should be configured separately. Currently, the type field is incorrect when disable this error. So fix it by configuring these two fields separately. Fixes: bf1faf9415dd ("net: hns3: Add enable and process hw errors from IGU, EGU and NCSI") Signed-off-by: Yufeng Mo Signed-off-by: Huazhong Tan Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c | 3 ++- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.h | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c index 87dece0e745d..53fd6e4d9e2d 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c @@ -753,8 +753,9 @@ static int hclge_config_igu_egu_hw_err_int(struct hclge_dev *hdev, bool en) /* configure IGU,EGU error interrupts */ hclge_cmd_setup_basic_desc(&desc, HCLGE_IGU_COMMON_INT_EN, false); + desc.data[0] = cpu_to_le32(HCLGE_IGU_ERR_INT_TYPE); if (en) - desc.data[0] = cpu_to_le32(HCLGE_IGU_ERR_INT_EN); + desc.data[0] |= cpu_to_le32(HCLGE_IGU_ERR_INT_EN); desc.data[1] = cpu_to_le32(HCLGE_IGU_ERR_INT_EN_MASK); diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.h b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.h index 876fd81ad2f1..8eccdb651a3c 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.h +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.h @@ -33,7 +33,8 @@ #define HCLGE_TQP_ECC_ERR_INT_EN_MASK 0x0FFF #define HCLGE_MSIX_SRAM_ECC_ERR_INT_EN_MASK 0x0F000000 #define HCLGE_MSIX_SRAM_ECC_ERR_INT_EN 0x0F000000 -#define HCLGE_IGU_ERR_INT_EN 0x0000066F +#define HCLGE_IGU_ERR_INT_EN 0x0000000F +#define HCLGE_IGU_ERR_INT_TYPE 0x00000660 #define HCLGE_IGU_ERR_INT_EN_MASK 0x000F #define HCLGE_IGU_TNL_ERR_INT_EN 0x0002AABF #define HCLGE_IGU_TNL_ERR_INT_EN_MASK 0x003F -- 2.30.2