From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B4C6D7BB01; Wed, 21 Feb 2024 14:28:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708525682; cv=none; b=mYcUvkOKcpeIISCB9rj1HOp5y/qD7F9sjJloZrOdLCm57u+UgVDoa2mbiEu5i9/UAwuKr05mHKVqzrq7GUmFgphtlgCXYh4cOwh1h0b+tLQceOgD4a4/pILeqPlpOebTNBSIkrGJboS7HURL5QCgJ2dHKK7yiD99Wg5LJ1WyUhg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708525682; c=relaxed/simple; bh=0A1r/NVEgMPDKEAynzfPrh+dBwoBhLHRzKEgZBT5tCY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BEiYhRbTtOrTA5f2OtjMWqk6QJ2mYePhojxihcsfpTkd1padAhHnO49v11s8C43wC0mWBSjb1Hugv3JIAgP3mnmJ6fg8JsiLuNZLNf8j813ZXRNyqXnBCotkbicj9Pt++sqg34eAmj3Ic0vig7levbc9pD5ClmsIhpwdlJRUd/E= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=iLYhstWd; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="iLYhstWd" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3BCE0C433F1; Wed, 21 Feb 2024 14:28:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1708525682; bh=0A1r/NVEgMPDKEAynzfPrh+dBwoBhLHRzKEgZBT5tCY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iLYhstWdtFhS+8LQsGULF//DJYvbUZExPXLO7LqnBAwbZxiUBDSqotZsobiH7+XJh 1cOszEqBhmG1exPq3/YFxPa8+lE82gaLa5CVLpYefC0uUEA8r+zxV5YJW7FzN9gTi1 OgGMcnTZiyqWzMJtYfw3kfhVHyl7j8zOe89qpTMo= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Furong Xu <0x1207@gmail.com>, Serge Semin , Paolo Abeni Subject: [PATCH 5.4 202/267] net: stmmac: xgmac: fix a typo of register name in DPP safety handling Date: Wed, 21 Feb 2024 14:09:03 +0100 Message-ID: <20240221125946.506587948@linuxfoundation.org> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240221125940.058369148@linuxfoundation.org> References: <20240221125940.058369148@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Furong Xu <0x1207@gmail.com> commit 1ce2654d87e2fb91fea83b288bd9b2641045e42a upstream. DDPP is copied from Synopsys Data book: DDPP: Disable Data path Parity Protection. When it is 0x0, Data path Parity Protection is enabled. When it is 0x1, Data path Parity Protection is disabled. The macro name should be XGMAC_DPP_DISABLE. Fixes: 46eba193d04f ("net: stmmac: xgmac: fix handling of DPP safety error for DMA channels") Signed-off-by: Furong Xu <0x1207@gmail.com> Reviewed-by: Serge Semin Link: https://lore.kernel.org/r/20240203053133.1129236-1-0x1207@gmail.com Signed-off-by: Paolo Abeni Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h | 2 +- drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) --- a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h +++ b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h @@ -257,7 +257,7 @@ #define XGMAC_TXCEIE BIT(0) #define XGMAC_MTL_ECC_INT_STATUS 0x000010cc #define XGMAC_MTL_DPP_CONTROL 0x000010e0 -#define XGMAC_DDPP_DISABLE BIT(0) +#define XGMAC_DPP_DISABLE BIT(0) #define XGMAC_MTL_TXQ_OPMODE(x) (0x00001100 + (0x80 * (x))) #define XGMAC_TQS GENMASK(25, 16) #define XGMAC_TQS_SHIFT 16 --- a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c @@ -852,7 +852,7 @@ static int dwxgmac3_safety_feat_config(v /* 5. Enable Data Path Parity Protection */ value = readl(ioaddr + XGMAC_MTL_DPP_CONTROL); /* already enabled by default, explicit enable it again */ - value &= ~XGMAC_DDPP_DISABLE; + value &= ~XGMAC_DPP_DISABLE; writel(value, ioaddr + XGMAC_MTL_DPP_CONTROL); return 0;