From: Serge Semin <fancer.lancer@gmail.com>
To: Russell King <linux@armlinux.org.uk>,
Andrew Halaney <ahalaney@redhat.com>,
Alexandre Torgue <alexandre.torgue@foss.st.com>,
Jose Abreu <joabreu@synopsys.com>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Maxime Coquelin <mcoquelin.stm32@gmail.com>
Cc: Alexei Starovoitov <ast@kernel.org>,
Jesper Dangaard Brouer <hawk@kernel.org>,
John Fastabend <john.fastabend@gmail.com>,
Daniel Borkmann <daniel@iogearbox.net>,
linux-arm-kernel@lists.infradead.org,
linux-stm32@st-md-mailman.stormreply.com, bpf@vger.kernel.org,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH RFC net-next v2 12/17] net: stmmac: Introduce internal PCS IRQ enable/disable methods
Date: Mon, 24 Jun 2024 16:26:29 +0300 [thread overview]
Message-ID: <20240624132802.14238-4-fancer.lancer@gmail.com> (raw)
In-Reply-To: <Zlmzu7/ANyZxOOQL@shell.armlinux.org.uk>
The PCS IRQ enable/disable procedures have been utilized in the framework
of the PHYLINK PCS enable/disable callbacks. Since a generic STMMAC
PHYLINK PCS implementation is about to be introduced let's move the
procedures into the dedicated DW GMAC and DW QoS Eth HW-abstraction
methods. These methods will be called from the PCS enable/disable
functions defined in the stmmac_pcs.c in the DW MAC-independent manner.
Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
---
.../ethernet/stmicro/stmmac/dwmac1000_core.c | 34 ++++++++++++-----
.../net/ethernet/stmicro/stmmac/dwmac4_core.c | 38 ++++++++++++++-----
drivers/net/ethernet/stmicro/stmmac/hwif.h | 6 +++
3 files changed, 58 insertions(+), 20 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c b/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c
index 1e50cc573407..99f0bbb318ec 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c
@@ -365,6 +365,26 @@ static void dwmac1000_set_eee_timer(struct mac_device_info *hw, int ls, int tw)
writel(value, ioaddr + LPI_TIMER_CTRL);
}
+static void dwmac1000_pcs_enable_irq(struct mac_device_info *hw)
+{
+ void __iomem *ioaddr = hw->pcsr;
+ u32 intr_mask;
+
+ intr_mask = readl(ioaddr + GMAC_INT_MASK);
+ intr_mask &= ~GMAC_INT_DISABLE_PCS;
+ writel(intr_mask, ioaddr + GMAC_INT_MASK);
+}
+
+static void dwmac1000_pcs_disable_irq(struct mac_device_info *hw)
+{
+ void __iomem *ioaddr = hw->pcsr;
+ u32 intr_mask;
+
+ intr_mask = readl(ioaddr + GMAC_INT_MASK);
+ intr_mask |= GMAC_INT_DISABLE_PCS;
+ writel(intr_mask, ioaddr + GMAC_INT_MASK);
+}
+
static u16 dwmac1000_pcs_get_config_reg(struct mac_device_info *hw)
{
void __iomem *ioaddr = hw->pcsr;
@@ -395,12 +415,8 @@ static int dwmac1000_mii_pcs_validate(struct phylink_pcs *pcs,
static int dwmac1000_mii_pcs_enable(struct phylink_pcs *pcs)
{
struct mac_device_info *hw = phylink_pcs_to_mac_dev_info(pcs);
- void __iomem *ioaddr = hw->pcsr;
- u32 intr_mask;
- intr_mask = readl(ioaddr + GMAC_INT_MASK);
- intr_mask &= ~GMAC_INT_DISABLE_PCS;
- writel(intr_mask, ioaddr + GMAC_INT_MASK);
+ dwmac1000_pcs_enable_irq(hw);
return 0;
}
@@ -408,12 +424,8 @@ static int dwmac1000_mii_pcs_enable(struct phylink_pcs *pcs)
static void dwmac1000_mii_pcs_disable(struct phylink_pcs *pcs)
{
struct mac_device_info *hw = phylink_pcs_to_mac_dev_info(pcs);
- void __iomem *ioaddr = hw->pcsr;
- u32 intr_mask;
- intr_mask = readl(ioaddr + GMAC_INT_MASK);
- intr_mask |= GMAC_INT_DISABLE_PCS;
- writel(intr_mask, ioaddr + GMAC_INT_MASK);
+ dwmac1000_pcs_disable_irq(hw);
}
static int dwmac1000_mii_pcs_config(struct phylink_pcs *pcs,
@@ -578,6 +590,8 @@ const struct stmmac_ops dwmac1000_ops = {
.set_eee_timer = dwmac1000_set_eee_timer,
.set_eee_pls = dwmac1000_set_eee_pls,
.debug = dwmac1000_debug,
+ .pcs_enable_irq = dwmac1000_pcs_enable_irq,
+ .pcs_disable_irq = dwmac1000_pcs_disable_irq,
.pcs_get_config_reg = dwmac1000_pcs_get_config_reg,
.pcs_ctrl_ane = dwmac1000_ctrl_ane,
.set_mac_loopback = dwmac1000_set_mac_loopback,
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c b/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c
index b7db076b4214..5dc8d59d3a8f 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c
@@ -456,6 +456,26 @@ static void dwmac4_set_eee_timer(struct mac_device_info *hw, int ls, int tw)
writel(value, ioaddr + GMAC4_LPI_TIMER_CTRL);
}
+static void dwmac4_pcs_enable_irq(struct mac_device_info *hw)
+{
+ void __iomem *ioaddr = hw->pcsr;
+ u32 intr_enable;
+
+ intr_enable = readl(ioaddr + GMAC_INT_EN);
+ intr_enable |= GMAC_PCS_IRQ_DEFAULT;
+ writel(intr_enable, ioaddr + GMAC_INT_EN);
+}
+
+static void dwmac4_pcs_disable_irq(struct mac_device_info *hw)
+{
+ void __iomem *ioaddr = hw->pcsr;
+ u32 intr_enable;
+
+ intr_enable = readl(ioaddr + GMAC_INT_EN);
+ intr_enable &= ~GMAC_PCS_IRQ_DEFAULT;
+ writel(intr_enable, ioaddr + GMAC_INT_EN);
+}
+
static u16 dwmac4_pcs_get_config_reg(struct mac_device_info *hw)
{
void __iomem *ioaddr = hw->pcsr;
@@ -780,12 +800,8 @@ static int dwmac4_mii_pcs_validate(struct phylink_pcs *pcs,
static int dwmac4_mii_pcs_enable(struct phylink_pcs *pcs)
{
struct mac_device_info *hw = phylink_pcs_to_mac_dev_info(pcs);
- void __iomem *ioaddr = hw->pcsr;
- u32 intr_enable;
- intr_enable = readl(ioaddr + GMAC_INT_EN);
- intr_enable |= GMAC_PCS_IRQ_DEFAULT;
- writel(intr_enable, ioaddr + GMAC_INT_EN);
+ dwmac4_pcs_enable_irq(hw);
return 0;
}
@@ -793,12 +809,8 @@ static int dwmac4_mii_pcs_enable(struct phylink_pcs *pcs)
static void dwmac4_mii_pcs_disable(struct phylink_pcs *pcs)
{
struct mac_device_info *hw = phylink_pcs_to_mac_dev_info(pcs);
- void __iomem *ioaddr = hw->pcsr;
- u32 intr_enable;
- intr_enable = readl(ioaddr + GMAC_INT_EN);
- intr_enable &= ~GMAC_PCS_IRQ_DEFAULT;
- writel(intr_enable, ioaddr + GMAC_INT_EN);
+ dwmac4_pcs_disable_irq(hw);
}
static int dwmac4_mii_pcs_config(struct phylink_pcs *pcs, unsigned int neg_mode,
@@ -1284,6 +1296,8 @@ const struct stmmac_ops dwmac4_ops = {
.set_eee_pls = dwmac4_set_eee_pls,
.pcs_ctrl_ane = dwmac4_ctrl_ane,
.debug = dwmac4_debug,
+ .pcs_enable_irq = dwmac4_pcs_enable_irq,
+ .pcs_disable_irq = dwmac4_pcs_disable_irq,
.pcs_get_config_reg = dwmac4_pcs_get_config_reg,
.set_filter = dwmac4_set_filter,
.set_mac_loopback = dwmac4_set_mac_loopback,
@@ -1329,6 +1343,8 @@ const struct stmmac_ops dwmac410_ops = {
.set_eee_pls = dwmac4_set_eee_pls,
.pcs_ctrl_ane = dwmac4_ctrl_ane,
.debug = dwmac4_debug,
+ .pcs_enable_irq = dwmac4_pcs_enable_irq,
+ .pcs_disable_irq = dwmac4_pcs_disable_irq,
.pcs_get_config_reg = dwmac4_pcs_get_config_reg,
.set_filter = dwmac4_set_filter,
.flex_pps_config = dwmac5_flex_pps_config,
@@ -1378,6 +1394,8 @@ const struct stmmac_ops dwmac510_ops = {
.set_eee_pls = dwmac4_set_eee_pls,
.pcs_ctrl_ane = dwmac4_ctrl_ane,
.debug = dwmac4_debug,
+ .pcs_enable_irq = dwmac4_pcs_enable_irq,
+ .pcs_disable_irq = dwmac4_pcs_disable_irq,
.pcs_get_config_reg = dwmac4_pcs_get_config_reg,
.set_filter = dwmac4_set_filter,
.safety_feat_config = dwmac5_safety_feat_config,
diff --git a/drivers/net/ethernet/stmicro/stmmac/hwif.h b/drivers/net/ethernet/stmicro/stmmac/hwif.h
index 00995a0c9813..2caa946a92f9 100644
--- a/drivers/net/ethernet/stmicro/stmmac/hwif.h
+++ b/drivers/net/ethernet/stmicro/stmmac/hwif.h
@@ -376,6 +376,8 @@ struct stmmac_ops {
struct stmmac_extra_stats *x, u32 rx_queues,
u32 tx_queues);
/* PCS calls */
+ void (*pcs_enable_irq)(struct mac_device_info *hw);
+ void (*pcs_disable_irq)(struct mac_device_info *hw);
u16 (*pcs_get_config_reg)(struct mac_device_info *hw);
void (*pcs_ctrl_ane)(void __iomem *pcsaddr, bool ane, bool srgmi_ral,
bool loopback);
@@ -493,6 +495,10 @@ struct stmmac_ops {
stmmac_do_void_callback(__priv, mac, set_eee_pls, __args)
#define stmmac_mac_debug(__priv, __args...) \
stmmac_do_void_callback(__priv, mac, debug, __priv, __args)
+#define stmmac_pcs_enable_irq(__priv, __args...) \
+ stmmac_do_void_callback(__priv, mac, pcs_enable_irq, __args)
+#define stmmac_pcs_disable_irq(__priv, __args...) \
+ stmmac_do_void_callback(__priv, mac, pcs_disable_irq, __args)
#define stmmac_pcs_get_config_reg(__priv, __args...) \
stmmac_do_callback(__priv, mac, pcs_get_config_reg, __args)
#define stmmac_pcs_ctrl_ane(__priv, __args...) \
--
2.43.0
next prev parent reply other threads:[~2024-06-24 13:28 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-31 11:25 [PATCH RFC v2 0/8] net: stmmac: convert stmmac "pcs" to phylink Russell King (Oracle)
2024-05-31 11:26 ` [PATCH RFC net-next v2 1/8] net: stmmac: add infrastructure for hwifs to provide PCS Russell King (Oracle)
2024-06-05 19:57 ` Andrew Halaney
2024-06-10 9:16 ` Russell King (Oracle)
2024-05-31 11:26 ` [PATCH RFC net-next v2 2/8] net: stmmac: provide core phylink PCS infrastructure Russell King (Oracle)
2024-05-31 11:26 ` [PATCH RFC net-next v2 3/8] net: stmmac: dwmac1000: convert sgmii/rgmii "pcs" to phylink Russell King (Oracle)
2024-06-05 20:05 ` Andrew Halaney
2024-06-05 21:59 ` Andrew Halaney
2024-06-10 9:24 ` Russell King (Oracle)
2024-06-10 9:19 ` Russell King (Oracle)
2024-06-11 12:25 ` Serge Semin
2024-06-12 22:04 ` Russell King (Oracle)
2024-06-13 21:14 ` Serge Semin
2024-06-18 10:26 ` Serge Semin
2024-06-24 1:32 ` Serge Semin
2024-06-24 13:40 ` Serge Semin
2024-05-31 11:26 ` [PATCH RFC net-next v2 4/8] net: stmmac: dwmac1000: move PCS interrupt control Russell King (Oracle)
2024-05-31 11:26 ` [PATCH RFC net-next v2 5/8] net: stmmac: dwmac4: convert sgmii/rgmii "pcs" to phylink Russell King (Oracle)
2024-06-05 22:35 ` Andrew Halaney
2024-06-11 18:22 ` Abhishek Chauhan (ABC)
2024-05-31 11:26 ` [PATCH RFC net-next v2 6/8] net: stmmac: dwmac4: move PCS interrupt control Russell King (Oracle)
2024-05-31 11:26 ` [PATCH RFC net-next v2 7/8] net: stmmac: remove obsolete pcs methods and associated code Russell King (Oracle)
2024-06-05 22:09 ` Andrew Halaney
2024-05-31 11:26 ` [PATCH RFC net-next v2 8/8] net: stmmac: Activate Inband/PCS flag based on the selected iface Russell King
2024-06-03 21:39 ` [PATCH RFC v2 0/8] net: stmmac: convert stmmac "pcs" to phylink Andrew Halaney
2024-06-24 13:26 ` [PATCH RFC net-next v2 09/17] net: stmmac: Introduce mac_device_info::priv pointer Serge Semin
2024-06-24 13:26 ` [PATCH RFC net-next v2 10/17] net: stmmac: Introduce internal PCS offset-based CSR access Serge Semin
2024-06-28 14:54 ` Russell King (Oracle)
2024-07-03 18:03 ` Serge Semin
2024-06-24 13:26 ` [PATCH RFC net-next v2 11/17] net: stmmac: Introduce internal PCS config register getter Serge Semin
2024-06-24 13:26 ` Serge Semin [this message]
2024-06-24 13:26 ` [PATCH RFC net-next v2 13/17] net: stmmac: Move internal PCS ANE-control method to dwmac-qcom-ethqos.c Serge Semin
2024-06-24 13:26 ` [PATCH RFC net-next v2 14/17] net: stmmac: Move internal PCS PHYLINK ops to stmmac_pcs.c Serge Semin
2024-06-28 15:07 ` Russell King (Oracle)
2024-07-03 19:08 ` Serge Semin
2024-07-03 20:07 ` Russell King (Oracle)
2024-07-04 19:56 ` Serge Semin
2024-06-24 13:26 ` [PATCH RFC net-next v2 15/17] net: stmmac: Move internal PCS ISR " Serge Semin
2024-06-24 13:26 ` [PATCH RFC net-next v2 16/17] net: stmmac: Move internal PCS init method " Serge Semin
2024-06-28 14:36 ` Russell King (Oracle)
2024-07-04 12:55 ` Serge Semin
2024-06-24 13:26 ` [PATCH RFC net-next v2 17/17] net: stmmac: pcs: Drop the _SHIFT macros Serge Semin
2024-06-28 14:42 ` Russell King (Oracle)
2024-07-04 13:19 ` Serge Semin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240624132802.14238-4-fancer.lancer@gmail.com \
--to=fancer.lancer@gmail.com \
--cc=ahalaney@redhat.com \
--cc=alexandre.torgue@foss.st.com \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=hawk@kernel.org \
--cc=joabreu@synopsys.com \
--cc=john.fastabend@gmail.com \
--cc=kuba@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-stm32@st-md-mailman.stormreply.com \
--cc=linux@armlinux.org.uk \
--cc=mcoquelin.stm32@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).