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@xxxxxxxxx> --- .../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