From patchwork Fri Oct 18 06:39:10 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: 13841279 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 42D6BD3C54C for ; Fri, 18 Oct 2024 06:47:47 +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=uHbmAwDjiYOV8KhTiLIYT7cbQ3af1qQULlja7wQ0pPc=; b=rj9NsCb27aMdE3RPxtllfzN8S/ oOR51Qy2DtIHnKEDb9Dz47pKuaA/Sw9jsirwF9sJp0ZKqwhzNmKBugJqeWmy5nPxYxL5AFdI6yKHw mZm6z78yviS7YKRfU0zXadLh+QZT/it3zH4zbhGZls/esYkoTROa0JMCGmIce8VawT4cm661gr6GE gMK7jmN9aLRVednwrfy5GqUv6LH3+MHvLBsEJTmAQBHLTKbGjUPEs/S/4YmaKkrvv38JADJNi3stL 3a/LaAWLxsHWdbZxJvQZChhOLalCRhkIvhDGFU/hhTVTOs/mGrIJToU/Wo1UVbEC+xURfh2zVtxOH 1akLCpRg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1t1gls-0000000HD6Z-2O77; Fri, 18 Oct 2024 06:47:36 +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 1t1gee-0000000HAoM-0URw for linux-arm-kernel@lists.infradead.org; Fri, 18 Oct 2024 06:40:10 +0000 Received: by mail-pl1-x62e.google.com with SMTP id d9443c01a7336-20cdb889222so18474575ad.3 for ; Thu, 17 Oct 2024 23:40:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1729233607; x=1729838407; 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=uHbmAwDjiYOV8KhTiLIYT7cbQ3af1qQULlja7wQ0pPc=; b=U+eS2vvtR+vMrABfhC9UxsII7N5ouPyo/ZoSoq6absxyAVbd7UU8Vds+AJiANqTNyG 423NPyhO35BKuvY7bc/NQO52FctGwxykuUDt0DEKUOovLXXQ+fxHBcWR6gG7JLnz+Ous A63gOLBMixQ3T9e7VHh7cYDOokTjKuckKR80Ak1nIDnQR1z/FG26pmNkXIWGp3jg7ICB jvlXc1aBwm7URZ7q6xkqj+3Nk9/md/oburek8ZUeaNHmzV182i8u7zNoI1BECVc46pHQ PIqnl5g/RMHKvr0vZ0EVelQLmGSIXmZ/nC5d7TmuAGS0uilDlJMy+zCfFMEGfNJEYi4/ aHgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729233607; x=1729838407; 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=uHbmAwDjiYOV8KhTiLIYT7cbQ3af1qQULlja7wQ0pPc=; b=fZZQZZ5/l7A2LRfkyA93cfh2WFSePEv1FBWPIA+HSHPKwITcXuQ1GpBfOc4/05jVi0 meY8sKUgZxbKMHny+9/WOphngjIywD8qVd07Jdoke9EXROOiqqUpsSw4UJZe1Gvu/uly vA7Dp8IS46YdLUVWY4NKeeO+8loeGgo92hRiXVfMsnt2C/Ikb+ZRBFyqJmHpqPy+t00l dVQ2YkKalHvubftzaWvFTGDX5JrolyjpE6DSX7DM0TeiOL486nS5YvLEwtR1ysefNTsv y5JABix8Ewp9CN/iXvRNI6mH4y6MHy310puz3fBH3W/7uHSYRKghaikgAmbSRAsoXhtk ipPw== X-Forwarded-Encrypted: i=1; AJvYcCUbMsyKEtEiwXLf9UqJBkGy3y442LG5h/bES5R8DzYnAzzjJwGv/VLg/raLDw/YLEhd57vZczI3XzQ1VA6uHely@lists.infradead.org X-Gm-Message-State: AOJu0YwD/3KI9FJ97qOhLa/5tF3ogphmpb1Sr6HnuHHjmfodICFAy98d WtwmE63mi2GnRq3wsUiEpcjpBHDE8h6IJXdFlOCktFdldnh0VMbD X-Google-Smtp-Source: AGHT+IFJiPh28oIYkpyq/B5bxlxch6Jn09s9zfWCZDUfIpcfJRP3Ty80z+SZO0AQd3F0RY7s3L620w== X-Received: by 2002:a17:902:f70f:b0:20b:8ef3:67a with SMTP id d9443c01a7336-20e5a70d30bmr20302425ad.7.1729233607153; Thu, 17 Oct 2024 23:40:07 -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.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Oct 2024 23:40:06 -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 4/8] net: stmmac: Refactor stmmac_fpe_ops functions for reuse Date: Fri, 18 Oct 2024 14:39:10 +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_234008_184773_34547729 X-CRM114-Status: GOOD ( 18.68 ) 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 FPE implementation for DWMAC4 and DWXGMAC differs only for: 1) Offset address of MAC_FPE_CTRL_STS and MTL_FPE_CTRL_STS 2) FPRQ(Frame Preemption Residue Queue) field in MAC_RxQ_Ctrl1 3) Bit offset of Frame Preemption Interrupt Enable Refactor stmmac_fpe_ops function callbacks to avoid code duplication between gmac4 and xgmac. Signed-off-by: Furong Xu <0x1207@gmail.com> --- .../net/ethernet/stmicro/stmmac/stmmac_fpe.c | 78 ++++++++++++++----- 1 file changed, 59 insertions(+), 19 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_fpe.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_fpe.c index 0aa30e302dd8..8ac9aff101e8 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_fpe.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_fpe.c @@ -9,6 +9,15 @@ #include "dwmac5.h" #include "dwxgmac2.h" +struct stmmac_fpe_configure_info { + const u32 rxq_ctrl1_reg; /* offset of MAC_RxQ_Ctrl1 */ + const u32 fprq_mask; /* Frame Preemption Residue Queue */ + const u32 fprq_shift; + const u32 mac_fpe_reg; /* offset of MAC_FPE_CTRL_STS */ + const u32 int_en_reg; /* offset of MAC_Interrupt_Enable */ + const u32 int_en_bit; /* Frame Preemption Interrupt Enable */ +}; + void stmmac_fpe_link_state_handle(struct stmmac_priv *priv, bool is_up) { struct stmmac_fpe_cfg *fpe_cfg = &priv->fpe_cfg; @@ -160,41 +169,42 @@ void stmmac_fpe_apply(struct stmmac_priv *priv) } } -static void dwmac5_fpe_configure(void __iomem *ioaddr, - struct stmmac_fpe_cfg *cfg, - u32 num_txq, u32 num_rxq, - bool tx_enable, bool pmac_enable) +static void common_fpe_configure(void __iomem *ioaddr, + struct stmmac_fpe_cfg *cfg, u32 num_rxq, + bool tx_enable, bool pmac_enable, + const struct stmmac_fpe_configure_info *info) { u32 value; if (tx_enable) { cfg->fpe_csr = STMMAC_MAC_FPE_CTRL_STS_EFPE; - value = readl(ioaddr + GMAC_RXQ_CTRL1); - value &= ~GMAC_RXQCTRL_FPRQ; - value |= (num_rxq - 1) << GMAC_RXQCTRL_FPRQ_SHIFT; - writel(value, ioaddr + GMAC_RXQ_CTRL1); + value = readl(ioaddr + info->rxq_ctrl1_reg); + value &= ~info->fprq_mask; + /* Keep this SHIFT, FIELD_PREP() expects a constant mask :-/ */ + value |= (num_rxq - 1) << info->fprq_shift; + writel(value, ioaddr + info->rxq_ctrl1_reg); } else { cfg->fpe_csr = 0; } - writel(cfg->fpe_csr, ioaddr + GMAC5_MAC_FPE_CTRL_STS); + writel(cfg->fpe_csr, ioaddr + info->mac_fpe_reg); - value = readl(ioaddr + GMAC_INT_EN); + value = readl(ioaddr + info->int_en_reg); if (pmac_enable) { - if (!(value & GMAC_INT_FPE_EN)) { + if (!(value & info->int_en_bit)) { /* Dummy read to clear any pending masked interrupts */ - readl(ioaddr + GMAC5_MAC_FPE_CTRL_STS); + readl(ioaddr + info->mac_fpe_reg); - value |= GMAC_INT_FPE_EN; + value |= info->int_en_bit; } } else { - value &= ~GMAC_INT_FPE_EN; + value &= ~info->int_en_bit; } - writel(value, ioaddr + GMAC_INT_EN); + writel(value, ioaddr + info->int_en_reg); } -static int dwmac5_fpe_irq_status(void __iomem *ioaddr, struct net_device *dev) +static int common_fpe_irq_status(void __iomem *ioaddr, struct net_device *dev) { u32 value; int status; @@ -204,7 +214,7 @@ static int dwmac5_fpe_irq_status(void __iomem *ioaddr, struct net_device *dev) /* Reads from the MAC_FPE_CTRL_STS register should only be performed * here, since the status flags of MAC_FPE_CTRL_STS are "clear on read" */ - value = readl(ioaddr + GMAC5_MAC_FPE_CTRL_STS); + value = readl(ioaddr); if (value & STMMAC_MAC_FPE_CTRL_STS_TRSP) { status |= FPE_EVENT_TRSP; @@ -229,7 +239,7 @@ static int dwmac5_fpe_irq_status(void __iomem *ioaddr, struct net_device *dev) return status; } -static void dwmac5_fpe_send_mpacket(void __iomem *ioaddr, +static void common_fpe_send_mpacket(void __iomem *ioaddr, struct stmmac_fpe_cfg *cfg, enum stmmac_mpacket_type type) { @@ -240,7 +250,37 @@ static void dwmac5_fpe_send_mpacket(void __iomem *ioaddr, else if (type == MPACKET_RESPONSE) value |= STMMAC_MAC_FPE_CTRL_STS_SRSP; - writel(value, ioaddr + GMAC5_MAC_FPE_CTRL_STS); + writel(value, ioaddr); +} + +static void dwmac5_fpe_configure(void __iomem *ioaddr, + struct stmmac_fpe_cfg *cfg, + u32 num_txq, u32 num_rxq, + bool tx_enable, bool pmac_enable) +{ + static const struct stmmac_fpe_configure_info dwmac5_fpe_info = { + .rxq_ctrl1_reg = GMAC_RXQ_CTRL1, + .fprq_mask = GMAC_RXQCTRL_FPRQ, + .fprq_shift = GMAC_RXQCTRL_FPRQ_SHIFT, + .mac_fpe_reg = GMAC5_MAC_FPE_CTRL_STS, + .int_en_reg = GMAC_INT_EN, + .int_en_bit = GMAC_INT_FPE_EN, + }; + + common_fpe_configure(ioaddr, cfg, num_rxq, tx_enable, pmac_enable, + &dwmac5_fpe_info); +} + +static int dwmac5_fpe_irq_status(void __iomem *ioaddr, struct net_device *dev) +{ + return common_fpe_irq_status(ioaddr + GMAC5_MAC_FPE_CTRL_STS, dev); +} + +static void dwmac5_fpe_send_mpacket(void __iomem *ioaddr, + struct stmmac_fpe_cfg *cfg, + enum stmmac_mpacket_type type) +{ + common_fpe_send_mpacket(ioaddr + GMAC5_MAC_FPE_CTRL_STS, cfg, type); } static int dwmac5_fpe_get_add_frag_size(const void __iomem *ioaddr)