From patchwork Fri Oct 18 06:39:11 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: 13841280 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 0F856D3C550 for ; Fri, 18 Oct 2024 06:49:21 +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=EEyaQIcaSa5+mb094OvjW2KqzXq/V2wwCSsdaWimUtA=; b=RTmV3Qhd6hvBy/Z9XbCMlY4o+n Kj6IH9m3K7GQrbJwWiZ5TAzElXpPiOZYkILh0UFu0IfQsepq0FCi2PCfvnUJ32QbY1dT4q2PzB1Cb 79Esj+A++dsVkA1OOHkU9UrPKQ8x9x+b5Cs/ygUJWYusqvDaWqgck86uYNak2HzQfW5voBVAIUh/H kfux/Fj2+3z/IDtwwtYWzgwuzReEbn9zVDJ2FJVjLv5h8S4Nex1bl2zmiqESqSSbLLPo8I4uk2qof R3E/Ks9R//UJiHR8FhkUxbSEENLmR+85x1UGo7WsI1q4bm8InOWN8BzHa9jMifet2Gwn5gc+nTwXz hNiPvcXw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1t1gnN-0000000HDfk-45G3; Fri, 18 Oct 2024 06:49:09 +0000 Received: from mail-pl1-x631.google.com ([2607:f8b0:4864:20::631]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1t1gej-0000000HAqG-2pS8 for linux-arm-kernel@lists.infradead.org; Fri, 18 Oct 2024 06:40:15 +0000 Received: by mail-pl1-x631.google.com with SMTP id d9443c01a7336-20b5affde14so12312115ad.3 for ; Thu, 17 Oct 2024 23:40:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1729233613; x=1729838413; 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=EEyaQIcaSa5+mb094OvjW2KqzXq/V2wwCSsdaWimUtA=; b=LqDy9sM9xcYk5eWU4G9mYL+TWynbaXEfd893ogMSQTS85ohfqem5Bl9qJ2UVazYE27 73U+HpqdWs/pueqxfHtwAv67hdCT/TJjM+urPIITQi5rg84ttGNlZTS+mPTQdKNtCB82 Ts6AxHKB15tXJ+x67m3OPWZpoMS9zRfZa48vVRlOQsSn2hd9/3M3XGiVomBpgUGQkugc QKoZ/4r2E+ltSDIDh2qMqRL8ZDDqBhpY95aJVviqiI0jcRF5E4KsoFHskDmyDFZXQ/9T rjftrTajvJMwplMKfXCsunkjscQngnjwbqbNqGGZLj1w4skPIghV13p1M8fy0R4N83R4 nm5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729233613; x=1729838413; 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=EEyaQIcaSa5+mb094OvjW2KqzXq/V2wwCSsdaWimUtA=; b=eKZHdjxG2Ov5VkbpaDve5AZwDj/iZ0MdWA6ZiiJzCht8dDDe6t5PSuFdIpJP+sDdw9 VIm7+yEWYvQQMPLgb+RMx7L1U9N8JUhNrvLS/KhobyHwMb8srmJg/HZ9BI3hbx+7rxhS xwCXCMnAVhMGcTstBbBvGEmULiaWdWY3B8siHoBEvgNYroSz8hmzPhLshkihZ2HfpLF1 ts5J+5bCCO7K168n+Q9bzAFqGf2lE3fEdEJXY9w4/7E8Oz0oMULTgH9zqLD9uvy931If dXvvjEaVUzUCfmdhY6L1ZmawIQZSG9Br6hnJlrW2NQnyadmWo++QTGovxkgsBCpb8bhC EMWA== X-Forwarded-Encrypted: i=1; AJvYcCXWQ1WpqgJJrv99p8EwaXAS+w0FH7coTnVU2fBDWh596WiHa/b7xhnnbSbU5Zufb+Ly46dXwBG5exYDv2CKwJI9@lists.infradead.org X-Gm-Message-State: AOJu0Yx9XFAuSzjyQPH1DA4CDvMCK5qF362kMPavVVnYBwVwBb/oKxw/ QUpDQ2/S/yI1WSDAFjE1uDj/M1+OBdAmC9NBmU8+xZ5XIzu3oj3Z X-Google-Smtp-Source: AGHT+IGOxD5tfJSh2f087iD/w7KV+RKu1IaYQSlM8m+sKzV2CR4NX/4iBMMPRNAoT4F+qgJB9qds/A== X-Received: by 2002:a17:902:cf11:b0:20c:bb35:dae2 with SMTP id d9443c01a7336-20e5a89fbdbmr18335085ad.28.1729233612791; Thu, 17 Oct 2024 23:40:12 -0700 (PDT) Received: from localhost.localdomain ([129.146.253.192]) by smtp.googlemail.com with ESMTPSA id d9443c01a7336-20e5a74766fsm6285455ad.73.2024.10.17.23.40.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Oct 2024 23:40:12 -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 , Simon Horman , Serge Semin , 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 v2 5/8] net: stmmac: xgmac: Rename XGMAC_RQ to XGMAC_FPRQ Date: Fri, 18 Oct 2024 14:39:11 +0800 Message-Id: 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-20241017_234013_771526_A872FA71 X-CRM114-Status: GOOD ( 12.40 ) 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 --- 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 8ac9aff101e8..9245e360109f 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_fpe.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_fpe.c @@ -372,8 +372,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);