3 files changed, 24 insertions, 2 deletions

diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
index f7855a61e7ad..6043734ea613 100644
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
@@ -1734,6 +1734,9 @@ static int init_umac(struct bcmgenet_priv *priv)
         } else if (priv->ext_phy) {
                 int0_enable |= UMAC_IRQ_LINK_EVENT;
         } else if (priv->phy_interface == PHY_INTERFACE_MODE_MOCA) {
+                if (priv->hw_params->flags & GENET_HAS_MOCA_LINK_DET)
+                        int0_enable |= UMAC_IRQ_LINK_EVENT;
+
                 reg = bcmgenet_bp_mc_get(priv);
                 reg |= BIT(priv->hw_params->bp_in_en_shift);
 
@@ -2926,7 +2929,8 @@ static struct bcmgenet_hw_params bcmgenet_hw_params[] = {
                 .rdma_offset = 0x10000,
                 .tdma_offset = 0x11000,
                 .words_per_bd = 2,
-                .flags = GENET_HAS_EXT | GENET_HAS_MDIO_INTR,
+                .flags = GENET_HAS_EXT | GENET_HAS_MDIO_INTR |
+                         GENET_HAS_MOCA_LINK_DET,
         },
         [GENET_V4] = {
                 .tx_queues = 4,
@@ -2944,7 +2948,8 @@ static struct bcmgenet_hw_params bcmgenet_hw_params[] = {
                 .rdma_offset = 0x2000,
                 .tdma_offset = 0x4000,
                 .words_per_bd = 3,
-                .flags = GENET_HAS_40BITS | GENET_HAS_EXT | GENET_HAS_MDIO_INTR,
+                .flags = GENET_HAS_40BITS | GENET_HAS_EXT |
+                         GENET_HAS_MDIO_INTR | GENET_HAS_MOCA_LINK_DET,
         },
 };
 
diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.h b/drivers/net/ethernet/broadcom/genet/bcmgenet.h
index ddaa40cb0f21..6f2887a5e0be 100644
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.h
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.h
@@ -508,6 +508,7 @@ enum bcmgenet_version {
 #define GENET_HAS_40BITS        (1 << 0)
 #define GENET_HAS_EXT           (1 << 1)
 #define GENET_HAS_MDIO_INTR     (1 << 2)
+#define GENET_HAS_MOCA_LINK_DET (1 << 3)
 
 /* BCMGENET hardware parameters, keep this structure nicely aligned
  * since it is going to be used in hot paths
diff --git a/drivers/net/ethernet/broadcom/genet/bcmmii.c b/drivers/net/ethernet/broadcom/genet/bcmmii.c
index 6d3b66a103cc..e7651b3c6c57 100644
--- a/drivers/net/ethernet/broadcom/genet/bcmmii.c
+++ b/drivers/net/ethernet/broadcom/genet/bcmmii.c
@@ -462,6 +462,15 @@ static int bcmgenet_mii_of_init(struct bcmgenet_priv *priv)
         return 0;
 }
 
+static int bcmgenet_fixed_phy_link_update(struct net_device *dev,
+                                          struct fixed_phy_status *status)
+{
+        if (dev && dev->phydev && status)
+                status->link = dev->phydev->link;
+
+        return 0;
+}
+
 static int bcmgenet_mii_pd_init(struct bcmgenet_priv *priv)
 {
         struct device *kdev = &priv->pdev->dev;
@@ -513,6 +522,13 @@ static int bcmgenet_mii_pd_init(struct bcmgenet_priv *priv)
                         dev_err(kdev, "failed to register fixed PHY device\n");
                         return -ENODEV;
                 }
+
+                if (priv->hw_params->flags & GENET_HAS_MOCA_LINK_DET) {
+                        ret = fixed_phy_set_link_update(
+                                phydev, bcmgenet_fixed_phy_link_update);
+                        if (!ret)
+                                phydev->link = 0;
+                }
         }
 
         priv->phydev = phydev;