net: stmmac: pass struct stmmac_priv to host_irq_status() method

Rather than passing struct mac_device_info to the host_irq_status()
method, pass struct stmmac_priv so that we can pass the integrated
PCS to the PCS interrupt handler.

Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://patch.msgid.link/E1vevHr-00000002YoY-2X2i@rmk-PC.armlinux.org.uk
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c b/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c
index 80c399fd874c7430295e1caa2f11c87d49de8a67..d288f03d37e457d087f879b3d5c0ecdfbeb3c930 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c
@@ -265,10 +265,10 @@ static void dwmac1000_pmt(struct mac_device_info *hw, unsigned long mode)
        writel(pmt, ioaddr + GMAC_PMT);
 }
 
-static int dwmac1000_irq_status(struct mac_device_info *hw,
+static int dwmac1000_irq_status(struct stmmac_priv *priv,
                                struct stmmac_extra_stats *x)
 {
-       void __iomem *ioaddr = hw->pcsr;
+       void __iomem *ioaddr = priv->hw->pcsr;
        u32 intr_status = readl(ioaddr + GMAC_INT_STATUS);
        u32 intr_mask = readl(ioaddr + GMAC_INT_MASK);
        int ret = 0;

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c b/drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c
index dbc0c1019ed5e85247ede81c57159fd748c90111..4efe4c3ae5dcc53a7b9826f3e2b1bd54f6e256c4 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c
@@ -53,7 +53,7 @@ static int dwmac100_rx_ipc_enable(struct mac_device_info *hw)
        return 0;
 }
 
-static int dwmac100_irq_status(struct mac_device_info *hw,
+static int dwmac100_irq_status(struct stmmac_priv *priv,
                               struct stmmac_extra_stats *x)
 {
        return 0;

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c b/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c
index 5f00b71366d985ca698dacbfdb79a5cdda7da067..f78c95e61609f5c2bd442d7b0e8ea75bc7f0d71c 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c
@@ -615,10 +615,10 @@ static int dwmac4_irq_mtl_status(struct stmmac_priv *priv,
        return ret;
 }
 
-static int dwmac4_irq_status(struct mac_device_info *hw,
+static int dwmac4_irq_status(struct stmmac_priv *priv,
                             struct stmmac_extra_stats *x)
 {
-       void __iomem *ioaddr = hw->pcsr;
+       void __iomem *ioaddr = priv->hw->pcsr;
        u32 intr_status = readl(ioaddr + GMAC_INT_STATUS);
        u32 intr_enable = readl(ioaddr + GMAC_INT_EN);
        int ret = 0;

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c
index 311ff9753ac824968cb6ef835ceb867b7b3ded20..ca81bb1cae39f47fc44c66b1c60008e1493441b6 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c
@@ -298,10 +298,10 @@ static void dwxgmac2_dump_regs(struct mac_device_info *hw, u32 *reg_space)
                reg_space[i] = readl(ioaddr + i * 4);
 }
 
-static int dwxgmac2_host_irq_status(struct mac_device_info *hw,
+static int dwxgmac2_host_irq_status(struct stmmac_priv *priv,
                                    struct stmmac_extra_stats *x)
 {
-       void __iomem *ioaddr = hw->pcsr;
+       void __iomem *ioaddr = priv->hw->pcsr;
        u32 stat, en;
        int ret = 0;
 

diff --git a/drivers/net/ethernet/stmicro/stmmac/hwif.h b/drivers/net/ethernet/stmicro/stmmac/hwif.h
index df6e8a567b1f646f83effbb38d8e53441a6f6150..0db96a3872592b778065300448ff31a51ef65f32 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/hwif.h
+++ b/drivers/net/ethernet/stmicro/stmmac/hwif.h
@@ -354,7 +354,7 @@ struct stmmac_ops {
        /* Dump MAC registers */
        void (*dump_regs)(struct mac_device_info *hw, u32 *reg_space);
        /* Handle extra events on specific interrupts hw dependent */
-       int (*host_irq_status)(struct mac_device_info *hw,
+       int (*host_irq_status)(struct stmmac_priv *priv,
                               struct stmmac_extra_stats *x);
        /* Handle MTL interrupts */
        int (*host_mtl_irq_status)(struct stmmac_priv *priv,
@@ -453,7 +453,7 @@ struct stmmac_ops {
 #define stmmac_dump_mac_regs(__priv, __args...) \
        stmmac_do_void_callback(__priv, mac, dump_regs, __args)
 #define stmmac_host_irq_status(__priv, __args...) \
-       stmmac_do_callback(__priv, mac, host_irq_status, __args)
+       stmmac_do_callback(__priv, mac, host_irq_status, __priv, __args)
 #define stmmac_host_mtl_irq_status(__priv, __args...) \
        stmmac_do_callback(__priv, mac, host_mtl_irq_status, __priv, __args)
 #define stmmac_set_filter(__priv, __args...) \

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index b3730312aeed4ac4fee55b0e768dd9effcbefb69..c2589f02ff7ed67d940add306ed12db2c32cf23d 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -6137,7 +6137,7 @@ static void stmmac_common_interrupt(struct stmmac_priv *priv)
 
        /* To handle GMAC own interrupts */
        if (priv->plat->core_type == DWMAC_CORE_GMAC || xmac) {
-               int status = stmmac_host_irq_status(priv, priv->hw, &priv->xstats);
+               int status = stmmac_host_irq_status(priv, &priv->xstats);
 
                if (unlikely(status)) {
                        /* For LPI we need to save the tx status */