From patchwork Wed Oct 23 07:05:24 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: 13846603 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 526A2D2E01C for ; Wed, 23 Oct 2024 07:25:59 +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=s8TKGjQeKzNK1dKhEB6C1AtEwQljW8KsdP2zdrjwMfM=; b=F4wHRH+B/VOnCQtqnRTGYcDWcx /bmSDCQwX0rl3x+kymaUlmXfAyMUQKtlzZKMkFbqvt5iVFb/sGWIWoiCmkgchX89O8JRpHmaOIevs 0HzOO7ACWvZ8QeMDzDJjinM0ZQaPOg7bVcbXK1Js6gfyAaXOk3voI6OLjTTM4g6+YXnjr2cHbYBS8 KD7HGEB8ixJAJi/BCS6H97xrqEJ/YdgBsviZvyBbqUj5NVZ6VyUTSYTBenww6JrDshduGzp5/EUq0 YNP+yfpojTsdkJgNlsM208WEzcZEFGosvwxyhXQwjzDAE0bmWc0DXVfjflUXtEuF0E9/RHFc8Dnnn sfbYfmvg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1t3Vkb-0000000DNRp-3eys; Wed, 23 Oct 2024 07:25:49 +0000 Received: from mail-pl1-x632.google.com ([2607:f8b0:4864:20::632]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1t3VS1-0000000DJxu-19Gr for linux-arm-kernel@lists.infradead.org; Wed, 23 Oct 2024 07:06:38 +0000 Received: by mail-pl1-x632.google.com with SMTP id d9443c01a7336-20c6f492d2dso74826145ad.0 for ; Wed, 23 Oct 2024 00:06:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1729667196; x=1730271996; 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=s8TKGjQeKzNK1dKhEB6C1AtEwQljW8KsdP2zdrjwMfM=; b=dozxUC+s1NhPo9P5SU4I3PMcYZ1Rrl/YpIZws04aiRSQeTMN2owTke4SOwCOlS0UZq sqQaySgf8P6SpzTrY1xEUTQHw3NPnUspJoDNbGxtjcYBLoSInwPTzg6hr1hjkuONtcML nNMqAXseRoTypiKUhL+q7cc06NP+YcaP3bw8oyXgEtdMMbae3wfjQbOkpVYfy/NhPLvW XaFzVEgwLAZMsiJ/0p1VHsLvpLnwi7biOM4nSykUlJkkfzK0pvbsmNAWTFBmX3svOXC6 opnzroM3c86ntjaTMHr8WD7hEi+LJphewx7VaC3HL1IulDMTJNAJpFyEcOoHxjnLhOqn mNiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729667196; x=1730271996; 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=s8TKGjQeKzNK1dKhEB6C1AtEwQljW8KsdP2zdrjwMfM=; b=Ze1SR0mw9MloE7fZNIfZw7nshLXL8LwtMgEy1xL5lw7rjlOLbz84bAGg2unUFE/NjQ VEHww4pkcSUTBCd0lA9DwxlinoMX/DnZDNDbGzNuKMRzbOqBmORkkqkjZ2BQ4CSaDyPS YbNRTiDsM8uXhx0VeBtVWF5GYu8zelOxt4N/aVLFuYpUMTpLswXYKYtUKIlUjCZ1em7v umjCS2Y3CshHyFF25d6TBDXnv/Vl5ji0psKnzNkqUHrVz5nGs68LOe4hEFQzISt6iJz1 49KYB205N8qU/jYaEzwA094DzNTaA6K5JD9tcZp/yng3WquUQiUbB86ngOSV9O+cgLZt gEfw== X-Forwarded-Encrypted: i=1; AJvYcCVjUHjS4jy9MYI1zII6IQ18s6XgBUrERCoLiQ+8xdb7fBGbNC9kWOFxNqFVNOdZ6Rv6KUzkOo7/shrORz3YJDcE@lists.infradead.org X-Gm-Message-State: AOJu0YwgJzT8vrniCVlSt+7ADOt/r3eComZG9mVSOLVsWyS7sn522SgL ojnMGVmPhmK6v3qSIoL9oNYxkuANAfvYo7/c1hsvq95e51wwiewh X-Google-Smtp-Source: AGHT+IHSnPv/WVNjHv6HF60PoAyBSgQDVxcTkHtmIHwy9EeV+7EtdLPdzYBRIDwHlO+bPFZudD1FSw== X-Received: by 2002:a17:903:2306:b0:20c:e222:619c with SMTP id d9443c01a7336-20fa9e9f8dcmr23396015ad.42.1729667196354; Wed, 23 Oct 2024 00:06:36 -0700 (PDT) Received: from localhost.localdomain ([129.146.253.192]) by smtp.googlemail.com with ESMTPSA id d9443c01a7336-20e7f0c167bsm51981745ad.140.2024.10.23.00.06.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Oct 2024 00:06:35 -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 , 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 v3 4/6] net: stmmac: xgmac: Rename XGMAC_RQ to XGMAC_FPRQ Date: Wed, 23 Oct 2024 15:05:24 +0800 Message-Id: <137e7cf0cb5e6c3e6cbe7f8fe7c979a70373c0aa.1729663066.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-20241023_000637_334798_58349F55 X-CRM114-Status: GOOD ( 13.34 ) 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 | 2 +- drivers/net/ethernet/stmicro/stmmac/stmmac_fpe.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h index efd47db05dbc..a04a79003692 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h +++ b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h @@ -84,7 +84,7 @@ #define XGMAC_MCBCQEN BIT(15) #define XGMAC_MCBCQ GENMASK(11, 8) #define XGMAC_MCBCQ_SHIFT 8 -#define XGMAC_RQ GENMASK(7, 4) +#define XGMAC_FPRQ GENMASK(7, 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 d2ea941370dc..f7d48bf2faed 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_fpe.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_fpe.c @@ -373,7 +373,7 @@ const struct stmmac_fpe_reg dwxgmac3_fpe_reg = { .mac_fpe_reg = XGMAC_MAC_FPE_CTRL_STS, .mtl_fpe_reg = XGMAC_MTL_FPE_CTRL_STS, .rxq_ctrl1_reg = XGMAC_RXQ_CTRL1, - .fprq_mask = XGMAC_RQ, + .fprq_mask = XGMAC_FPRQ, .int_en_reg = XGMAC_INT_EN, .int_en_bit = XGMAC_FPEIE, };