From patchwork Tue Oct 15 09:09:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Furong Xu <0x1207@gmail.com> X-Patchwork-Id: 13836009 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 04B0DCFC27D for ; Tue, 15 Oct 2024 09:35:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=qC4ITX8vr0WBNue0oHaO5HTmQIFp73nTXTvZqY8X0oE=; b=0fa8AHMvB+WXoNP6x5Y3Mifhr9 hYhN0yptB9AgRbVSzZv9s28tbXEnlwLg8zxVHM2TJfbcVic2sDe+ejhmi5hdoUsAXbwMrNYR/HfvA Lg8u1MDooQIz3yVbYzDWMUAwpfT+BZekXlJpMXWcz/HRI4FMWh6+o9dG7aflQ/yrNPKTY/FH2X9y3 8J02kZbTeakmBcYyiMtrbgBdJiBrT5jdZYA/Ll7jTHQFopK0nDNeJfXapnBjwBCxHmh3tVSieXZDM inkfzu29jPkSHnvIekZrIkOTkehT21SS2m/Rjrsr1JgtHYFKLEkV+8QGba9979ivg7WgcRaoVYlSr QZ3wIsSA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1t0dx4-00000007iAT-2Wjy; Tue, 15 Oct 2024 09:34:50 +0000 Received: from mail-pl1-x62e.google.com ([2607:f8b0:4864:20::62e]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1t0dZT-00000007e0H-19zS for linux-arm-kernel@lists.infradead.org; Tue, 15 Oct 2024 09:10:28 +0000 Received: by mail-pl1-x62e.google.com with SMTP id d9443c01a7336-20ce5e3b116so15113715ad.1 for ; Tue, 15 Oct 2024 02:10:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728983426; x=1729588226; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=qC4ITX8vr0WBNue0oHaO5HTmQIFp73nTXTvZqY8X0oE=; b=RRLP5B8n516Nfv+En/LkQ5zC07y/+gOPzdbno30pFBkvLqF998neEhpw/TKduv2qrg TYc67CKmAmBzh+AJA+q2ErnK99b7H6B0y4P3pjr6iPi34mpCtN16g0TyMHpU6VUdTCgR yF4LpGLRmjS7/A2ZfinAo7At6WZKtryt/QBashkAStNnlliZmX3WKFxA4mUbxjPI/Jo5 m6SxMrttM/0f+AjeNpOQ2L3vj5lfLl6ENmcWja1xKoS8bgLnTvkQJTxXlUcgFVgOcbcm o6DAGqn1YhjzAA9jMHvgY/c7y9a/WdmWlChBk/c8665uFQKou8znHHUagDc5LrCYJbIk bEgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728983426; x=1729588226; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qC4ITX8vr0WBNue0oHaO5HTmQIFp73nTXTvZqY8X0oE=; b=gnls0GHioJ5Ak95mnGO8tlCOJH1L4XYgd8+U88xcM6MXjG59QKqXLd9MkbExyzUwkA hwgySTPwpLMd8UkVkG7ZlW7R0l+YgtFztPjZ8/e8OfNo16HxDsTfdK+hHhyJHZ2UDRVx P/+/8pzZ2j7FeRaRtRBQGr98oQycB3S3XLpIgb4d/qwHlAYnSd8wAjsf7yJK2hRhkdV0 ZPx/2dJx6GkdwRQnM+E4sUImJXuYd2Pf5OO+RtivtuUazmv/pF0LAzVfQIbnDoGHxbwb AhsPR2wfu+8y/Zu/UdJospYDfhkzqb/iZcggTai6Y+tHXg5eeNxujqeyDdMLKjeUTjUJ ryLA== X-Forwarded-Encrypted: i=1; AJvYcCVBphYMSnIIlu6jwPEEAKdJm0WM7jBGrgcaOTVx6MdrwbPSTkByCkbfquyDThISBuC0mbwjQnfD99P/aU/PXPyT@lists.infradead.org X-Gm-Message-State: AOJu0YwiBQUcdNiycHfsEYRMjJ/ht/Fa2LZna0F5RlLewy4eF5zpPefE nSFqAd5Tcba1a/EWynVrlU26ppOSSXHc7GIF/LRmlhz2rgb2eM8N X-Google-Smtp-Source: AGHT+IFdWqzBaHWfrp76YUJtczY0dt/qtyrIGQByrUQ7U4/m9oSOLWWvisslI/C2kgflrL3/LwZ3uA== X-Received: by 2002:a17:902:e747:b0:20b:ce88:1b9d with SMTP id d9443c01a7336-20cbb22efb7mr169979085ad.45.1728983426052; Tue, 15 Oct 2024 02:10:26 -0700 (PDT) Received: from localhost.localdomain ([129.146.253.192]) by smtp.googlemail.com with ESMTPSA id d9443c01a7336-20d17ec8f35sm7905095ad.0.2024.10.15.02.10.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Oct 2024 02:10:25 -0700 (PDT) From: Furong Xu <0x1207@gmail.com> To: netdev@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Vladimir Oltean , Andrew Lunn , Alexandre Torgue , Jose Abreu , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Maxime Coquelin , xfr@outlook.com, Furong Xu <0x1207@gmail.com> Subject: [PATCH net-next v1 4/5] net: stmmac: xgmac: Rename XGMAC_RQ to XGMAC_FPRQ Date: Tue, 15 Oct 2024 17:09:25 +0800 Message-Id: <4557515b4df0ebe7fb8c1fd8b3725386bf77d1a4.1728980110.git.0x1207@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241015_021027_336245_8BA5AC2C X-CRM114-Status: GOOD ( 12.88 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Synopsys XGMAC Databook defines MAC_RxQ_Ctrl1 register: RQ: Frame Preemption Residue Queue XGMAC_FPRQ is more readable and more consistent with GMAC4. Signed-off-by: Furong Xu <0x1207@gmail.com> Reviewed-by: Simon Horman Reviewed-by: Simon Horman --- drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h | 4 ++-- drivers/net/ethernet/stmicro/stmmac/stmmac_fpe.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h index 917796293c26..c66fa6040672 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h +++ b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h @@ -84,8 +84,8 @@ #define XGMAC_MCBCQEN BIT(15) #define XGMAC_MCBCQ GENMASK(11, 8) #define XGMAC_MCBCQ_SHIFT 8 -#define XGMAC_RQ GENMASK(7, 4) -#define XGMAC_RQ_SHIFT 4 +#define XGMAC_FPRQ GENMASK(7, 4) +#define XGMAC_FPRQ_SHIFT 4 #define XGMAC_UPQ GENMASK(3, 0) #define XGMAC_UPQ_SHIFT 0 #define XGMAC_RXQ_CTRL2 0x000000a8 diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_fpe.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_fpe.c index 0c13d5aee3d2..6060a1d702c6 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_fpe.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_fpe.c @@ -332,8 +332,8 @@ static void dwxgmac3_fpe_configure(void __iomem *ioaddr, } value = readl(ioaddr + XGMAC_RXQ_CTRL1); - value &= ~XGMAC_RQ; - value |= (num_rxq - 1) << XGMAC_RQ_SHIFT; + value &= ~XGMAC_FPRQ; + value |= (num_rxq - 1) << XGMAC_FPRQ_SHIFT; writel(value, ioaddr + XGMAC_RXQ_CTRL1); value = readl(ioaddr + XGMAC_MAC_FPE_CTRL_STS);