Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

Pull networking updates from David Miller:

 1) Add BQL support to via-rhine, from Tino Reichardt.

 2) Integrate SWITCHDEV layer support into the DSA layer, so DSA drivers
    can support hw switch offloading.  From Floria Fainelli.

 3) Allow 'ip address' commands to initiate multicast group join/leave,
    from Madhu Challa.

 4) Many ipv4 FIB lookup optimizations from Alexander Duyck.

 5) Support EBPF in cls_bpf classifier and act_bpf action, from Daniel
    Borkmann.

 6) Remove the ugly compat support in ARP for ugly layers like ax25,
    rose, etc.  And use this to clean up the neigh layer, then use it to
    implement MPLS support.  All from Eric Biederman.

 7) Support L3 forwarding offloading in switches, from Scott Feldman.

 8) Collapse the LOCAL and MAIN ipv4 FIB tables when possible, to speed
    up route lookups even further.  From Alexander Duyck.

 9) Many improvements and bug fixes to the rhashtable implementation,
    from Herbert Xu and Thomas Graf.  In particular, in the case where
    an rhashtable user bulk adds a large number of items into an empty
    table, we expand the table much more sanely.

10) Don't make the tcp_metrics hash table per-namespace, from Eric
    Biederman.

11) Extend EBPF to access SKB fields, from Alexei Starovoitov.

12) Split out new connection request sockets so that they can be
    established in the main hash table.  Much less false sharing since
    hash lookups go direct to the request sockets instead of having to
    go first to the listener then to the request socks hashed
    underneath.  From Eric Dumazet.

13) Add async I/O support for crytpo AF_ALG sockets, from Tadeusz Struk.

14) Support stable privacy address generation for RFC7217 in IPV6.  From
    Hannes Frederic Sowa.

15) Hash network namespace into IP frag IDs, also from Hannes Frederic
    Sowa.

16) Convert PTP get/set methods to use 64-bit time, from Richard
    Cochran.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1816 commits)
  fm10k: Bump driver version to 0.15.2
  fm10k: corrected VF multicast update
  fm10k: mbx_update_max_size does not drop all oversized messages
  fm10k: reset head instead of calling update_max_size
  fm10k: renamed mbx_tx_dropped to mbx_tx_oversized
  fm10k: update xcast mode before synchronizing multicast addresses
  fm10k: start service timer on probe
  fm10k: fix function header comment
  fm10k: comment next_vf_mbx flow
  fm10k: don't handle mailbox events in iov_event path and always process mailbox
  fm10k: use separate workqueue for fm10k driver
  fm10k: Set PF queues to unlimited bandwidth during virtualization
  fm10k: expose tx_timeout_count as an ethtool stat
  fm10k: only increment tx_timeout_count in Tx hang path
  fm10k: remove extraneous "Reset interface" message
  fm10k: separate PF only stats so that VF does not display them
  fm10k: use hw->mac.max_queues for stats
  fm10k: only show actual queues, not the maximum in hardware
  fm10k: allow creation of VLAN on default vid
  fm10k: fix unused warnings
  ...

12 files changed, 126 insertions, 60 deletions

diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
index 16adbc481772..8fadaa14b9f0 100644
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -68,8 +68,8 @@ config SMSC_PHY
 config BROADCOM_PHY
         tristate "Drivers for Broadcom PHYs"
         ---help---
-          Currently supports the BCM5411, BCM5421, BCM5461, BCM5464, BCM5481
-          and BCM5482 PHYs.
+          Currently supports the BCM5411, BCM5421, BCM5461, BCM54616S, BCM5464,
+          BCM5481 and BCM5482 PHYs.
 
 config BCM63XX_PHY
         tristate "Drivers for Broadcom 63xx SOCs internal PHY"
diff --git a/drivers/net/phy/amd-xgbe-phy.c b/drivers/net/phy/amd-xgbe-phy.c
index 32efbd48f326..fb276f64cd64 100644
--- a/drivers/net/phy/amd-xgbe-phy.c
+++ b/drivers/net/phy/amd-xgbe-phy.c
@@ -78,6 +78,7 @@
 #include <linux/bitops.h>
 #include <linux/property.h>
 #include <linux/acpi.h>
+#include <linux/jiffies.h>
 
 MODULE_AUTHOR("Tom Lendacky <thomas.lendacky@amd.com>");
 MODULE_LICENSE("Dual BSD/GPL");
@@ -100,6 +101,8 @@ MODULE_DESCRIPTION("AMD 10GbE (amd-xgbe) PHY driver");
 #define XGBE_PHY_SPEED_2500             1
 #define XGBE_PHY_SPEED_10000            2
 
+#define XGBE_AN_MS_TIMEOUT              500
+
 #define XGBE_AN_INT_CMPLT               0x01
 #define XGBE_AN_INC_LINK                0x02
 #define XGBE_AN_PG_RCV                  0x04
@@ -434,6 +437,7 @@ struct amd_xgbe_phy_priv {
         unsigned int an_supported;
         unsigned int parallel_detect;
         unsigned int fec_ability;
+        unsigned long an_start;
 
         unsigned int lpm_ctrl;          /* CTRL1 for resume */
 };
@@ -902,8 +906,23 @@ static enum amd_xgbe_phy_an amd_xgbe_an_page_received(struct phy_device *phydev)
 {
         struct amd_xgbe_phy_priv *priv = phydev->priv;
         enum amd_xgbe_phy_rx *state;
+        unsigned long an_timeout;
         int ret;
 
+        if (!priv->an_start) {
+                priv->an_start = jiffies;
+        } else {
+                an_timeout = priv->an_start +
+                             msecs_to_jiffies(XGBE_AN_MS_TIMEOUT);
+                if (time_after(jiffies, an_timeout)) {
+                        /* Auto-negotiation timed out, reset state */
+                        priv->kr_state = AMD_XGBE_RX_BPA;
+                        priv->kx_state = AMD_XGBE_RX_BPA;
+
+                        priv->an_start = jiffies;
+                }
+        }
+
         state = amd_xgbe_phy_in_kr_mode(phydev) ? &priv->kr_state
                                                 : &priv->kx_state;
 
@@ -932,8 +951,8 @@ static enum amd_xgbe_phy_an amd_xgbe_an_incompat_link(struct phy_device *phydev)
         if (amd_xgbe_phy_in_kr_mode(phydev)) {
                 priv->kr_state = AMD_XGBE_RX_ERROR;
 
-                if (!(phydev->supported & SUPPORTED_1000baseKX_Full) &&
-                    !(phydev->supported & SUPPORTED_2500baseX_Full))
+                if (!(phydev->advertising & SUPPORTED_1000baseKX_Full) &&
+                    !(phydev->advertising & SUPPORTED_2500baseX_Full))
                         return AMD_XGBE_AN_NO_LINK;
 
                 if (priv->kx_state != AMD_XGBE_RX_BPA)
@@ -941,7 +960,7 @@ static enum amd_xgbe_phy_an amd_xgbe_an_incompat_link(struct phy_device *phydev)
         } else {
                 priv->kx_state = AMD_XGBE_RX_ERROR;
 
-                if (!(phydev->supported & SUPPORTED_10000baseKR_Full))
+                if (!(phydev->advertising & SUPPORTED_10000baseKR_Full))
                         return AMD_XGBE_AN_NO_LINK;
 
                 if (priv->kr_state != AMD_XGBE_RX_BPA)
@@ -1078,6 +1097,7 @@ again:
                 priv->an_state = AMD_XGBE_AN_READY;
                 priv->kr_state = AMD_XGBE_RX_BPA;
                 priv->kx_state = AMD_XGBE_RX_BPA;
+                priv->an_start = 0;
         }
 
         if (cur_state != priv->an_state)
@@ -1101,7 +1121,7 @@ static int amd_xgbe_an_init(struct phy_device *phydev)
         if (ret < 0)
                 return ret;
 
-        if (phydev->supported & SUPPORTED_10000baseR_FEC)
+        if (phydev->advertising & SUPPORTED_10000baseR_FEC)
                 ret |= 0xc000;
         else
                 ret &= ~0xc000;
@@ -1113,13 +1133,13 @@ static int amd_xgbe_an_init(struct phy_device *phydev)
         if (ret < 0)
                 return ret;
 
-        if (phydev->supported & SUPPORTED_10000baseKR_Full)
+        if (phydev->advertising & SUPPORTED_10000baseKR_Full)
                 ret |= 0x80;
         else
                 ret &= ~0x80;
 
-        if ((phydev->supported & SUPPORTED_1000baseKX_Full) ||
-            (phydev->supported & SUPPORTED_2500baseX_Full))
+        if ((phydev->advertising & SUPPORTED_1000baseKX_Full) ||
+            (phydev->advertising & SUPPORTED_2500baseX_Full))
                 ret |= 0x20;
         else
                 ret &= ~0x20;
@@ -1131,12 +1151,12 @@ static int amd_xgbe_an_init(struct phy_device *phydev)
         if (ret < 0)
                 return ret;
 
-        if (phydev->supported & SUPPORTED_Pause)
+        if (phydev->advertising & SUPPORTED_Pause)
                 ret |= 0x400;
         else
                 ret &= ~0x400;
 
-        if (phydev->supported & SUPPORTED_Asym_Pause)
+        if (phydev->advertising & SUPPORTED_Asym_Pause)
                 ret |= 0x800;
         else
                 ret &= ~0x800;
@@ -1212,38 +1232,14 @@ static int amd_xgbe_phy_config_init(struct phy_device *phydev)
                 priv->an_irq_allocated = 1;
         }
 
-        ret = phy_read_mmd(phydev, MDIO_MMD_PMAPMD, MDIO_PMA_10GBR_FEC_ABILITY);
-        if (ret < 0)
-                return ret;
-        priv->fec_ability = ret & XGBE_PHY_FEC_MASK;
-
-        /* Initialize supported features */
-        phydev->supported = SUPPORTED_Autoneg;
-        phydev->supported |= SUPPORTED_Pause | SUPPORTED_Asym_Pause;
-        phydev->supported |= SUPPORTED_Backplane;
-        phydev->supported |= SUPPORTED_10000baseKR_Full;
-        switch (priv->speed_set) {
-        case AMD_XGBE_PHY_SPEEDSET_1000_10000:
-                phydev->supported |= SUPPORTED_1000baseKX_Full;
-                break;
-        case AMD_XGBE_PHY_SPEEDSET_2500_10000:
-                phydev->supported |= SUPPORTED_2500baseX_Full;
-                break;
-        }
-
-        if (priv->fec_ability & XGBE_PHY_FEC_ENABLE)
-                phydev->supported |= SUPPORTED_10000baseR_FEC;
-
-        phydev->advertising = phydev->supported;
-
         /* Set initial mode - call the mode setting routines
          * directly to insure we are properly configured
          */
-        if (phydev->supported & SUPPORTED_10000baseKR_Full)
+        if (phydev->advertising & SUPPORTED_10000baseKR_Full)
                 ret = amd_xgbe_phy_xgmii_mode(phydev);
-        else if (phydev->supported & SUPPORTED_1000baseKX_Full)
+        else if (phydev->advertising & SUPPORTED_1000baseKX_Full)
                 ret = amd_xgbe_phy_gmii_mode(phydev);
-        else if (phydev->supported & SUPPORTED_2500baseX_Full)
+        else if (phydev->advertising & SUPPORTED_2500baseX_Full)
                 ret = amd_xgbe_phy_gmii_2500_mode(phydev);
         else
                 ret = -EINVAL;
@@ -1315,10 +1311,10 @@ static int __amd_xgbe_phy_config_aneg(struct phy_device *phydev)
         disable_irq(priv->an_irq);
 
         /* Start auto-negotiation in a supported mode */
-        if (phydev->supported & SUPPORTED_10000baseKR_Full)
+        if (phydev->advertising & SUPPORTED_10000baseKR_Full)
                 ret = amd_xgbe_phy_set_mode(phydev, AMD_XGBE_MODE_KR);
-        else if ((phydev->supported & SUPPORTED_1000baseKX_Full) ||
-                 (phydev->supported & SUPPORTED_2500baseX_Full))
+        else if ((phydev->advertising & SUPPORTED_1000baseKX_Full) ||
+                 (phydev->advertising & SUPPORTED_2500baseX_Full))
                 ret = amd_xgbe_phy_set_mode(phydev, AMD_XGBE_MODE_KX);
         else
                 ret = -EINVAL;
@@ -1746,6 +1742,29 @@ static int amd_xgbe_phy_probe(struct phy_device *phydev)
                        sizeof(priv->serdes_dfe_tap_ena));
         }
 
+        /* Initialize supported features */
+        phydev->supported = SUPPORTED_Autoneg;
+        phydev->supported |= SUPPORTED_Pause | SUPPORTED_Asym_Pause;
+        phydev->supported |= SUPPORTED_Backplane;
+        phydev->supported |= SUPPORTED_10000baseKR_Full;
+        switch (priv->speed_set) {
+        case AMD_XGBE_PHY_SPEEDSET_1000_10000:
+                phydev->supported |= SUPPORTED_1000baseKX_Full;
+                break;
+        case AMD_XGBE_PHY_SPEEDSET_2500_10000:
+                phydev->supported |= SUPPORTED_2500baseX_Full;
+                break;
+        }
+
+        ret = phy_read_mmd(phydev, MDIO_MMD_PMAPMD, MDIO_PMA_10GBR_FEC_ABILITY);
+        if (ret < 0)
+                return ret;
+        priv->fec_ability = ret & XGBE_PHY_FEC_MASK;
+        if (priv->fec_ability & XGBE_PHY_FEC_ENABLE)
+                phydev->supported |= SUPPORTED_10000baseR_FEC;
+
+        phydev->advertising = phydev->supported;
+
         phydev->priv = priv;
 
         if (!priv->adev || acpi_disabled)
@@ -1817,6 +1836,7 @@ static struct phy_driver amd_xgbe_phy_driver[] = {
                 .phy_id_mask            = XGBE_PHY_MASK,
                 .name                   = "AMD XGBE PHY",
                 .features               = 0,
+                .flags                  = PHY_IS_INTERNAL,
                 .probe                  = amd_xgbe_phy_probe,
                 .remove                 = amd_xgbe_phy_remove,
                 .soft_reset             = amd_xgbe_phy_soft_reset,
diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c
index f80e19ac6704..fabf11d32d27 100644
--- a/drivers/net/phy/at803x.c
+++ b/drivers/net/phy/at803x.c
@@ -192,16 +192,17 @@ static int at803x_probe(struct phy_device *phydev)
 {
         struct device *dev = &phydev->dev;
         struct at803x_priv *priv;
+        struct gpio_desc *gpiod_reset;
 
         priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
         if (!priv)
                 return -ENOMEM;
 
-        priv->gpiod_reset = devm_gpiod_get(dev, "reset");
-        if (IS_ERR(priv->gpiod_reset))
-                priv->gpiod_reset = NULL;
-        else
-                gpiod_direction_output(priv->gpiod_reset, 1);
+        gpiod_reset = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_HIGH);
+        if (IS_ERR(gpiod_reset))
+                return PTR_ERR(gpiod_reset);
+
+        priv->gpiod_reset = gpiod_reset;
 
         phydev->priv = priv;
 
diff --git a/drivers/net/phy/bcm7xxx.c b/drivers/net/phy/bcm7xxx.c
index 974ec4515269..64c74c6a4828 100644
--- a/drivers/net/phy/bcm7xxx.c
+++ b/drivers/net/phy/bcm7xxx.c
@@ -396,6 +396,7 @@ static struct phy_driver bcm7xxx_driver[] = {
         BCM7XXX_28NM_GPHY(PHY_ID_BCM7364, "Broadcom BCM7364"),
         BCM7XXX_28NM_GPHY(PHY_ID_BCM7366, "Broadcom BCM7366"),
         BCM7XXX_28NM_GPHY(PHY_ID_BCM7439, "Broadcom BCM7439"),
+        BCM7XXX_28NM_GPHY(PHY_ID_BCM7439_2, "Broadcom BCM7439 (2)"),
         BCM7XXX_28NM_GPHY(PHY_ID_BCM7445, "Broadcom BCM7445"),
 {
         .phy_id         = PHY_ID_BCM7425,
diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c
index a52afb26421b..9c71295f2fef 100644
--- a/drivers/net/phy/broadcom.c
+++ b/drivers/net/phy/broadcom.c
@@ -549,6 +549,19 @@ static struct phy_driver broadcom_drivers[] = {
         .config_intr    = bcm54xx_config_intr,
         .driver         = { .owner = THIS_MODULE },
 }, {
+        .phy_id         = PHY_ID_BCM54616S,
+        .phy_id_mask    = 0xfffffff0,
+        .name           = "Broadcom BCM54616S",
+        .features       = PHY_GBIT_FEATURES |
+                          SUPPORTED_Pause | SUPPORTED_Asym_Pause,
+        .flags          = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT,
+        .config_init    = bcm54xx_config_init,
+        .config_aneg    = genphy_config_aneg,
+        .read_status    = genphy_read_status,
+        .ack_interrupt  = bcm54xx_ack_interrupt,
+        .config_intr    = bcm54xx_config_intr,
+        .driver         = { .owner = THIS_MODULE },
+}, {
         .phy_id         = PHY_ID_BCM5464,
         .phy_id_mask    = 0xfffffff0,
         .name           = "Broadcom BCM5464",
@@ -660,6 +673,7 @@ static struct mdio_device_id __maybe_unused broadcom_tbl[] = {
         { PHY_ID_BCM5411, 0xfffffff0 },
         { PHY_ID_BCM5421, 0xfffffff0 },
         { PHY_ID_BCM5461, 0xfffffff0 },
+        { PHY_ID_BCM54616S, 0xfffffff0 },
         { PHY_ID_BCM5464, 0xfffffff0 },
         { PHY_ID_BCM5482, 0xfffffff0 },
         { PHY_ID_BCM5482, 0xfffffff0 },
diff --git a/drivers/net/phy/dp83640.c b/drivers/net/phy/dp83640.c
index 4c2b5a80f17c..496e02f961d3 100644
--- a/drivers/net/phy/dp83640.c
+++ b/drivers/net/phy/dp83640.c
@@ -257,7 +257,7 @@ static void ext_write(int broadcast, struct phy_device *phydev,
 
 /* Caller must hold extreg_lock. */
 static int tdr_write(int bc, struct phy_device *dev,
-                     const struct timespec *ts, u16 cmd)
+                     const struct timespec64 *ts, u16 cmd)
 {
         ext_write(bc, dev, PAGE4, PTP_TDR, ts->tv_nsec & 0xffff);/* ns[15:0]  */
         ext_write(bc, dev, PAGE4, PTP_TDR, ts->tv_nsec >> 16);   /* ns[31:16] */
@@ -411,12 +411,12 @@ static int ptp_dp83640_adjtime(struct ptp_clock_info *ptp, s64 delta)
         struct dp83640_clock *clock =
                 container_of(ptp, struct dp83640_clock, caps);
         struct phy_device *phydev = clock->chosen->phydev;
-        struct timespec ts;
+        struct timespec64 ts;
         int err;
 
         delta += ADJTIME_FIX;
 
-        ts = ns_to_timespec(delta);
+        ts = ns_to_timespec64(delta);
 
         mutex_lock(&clock->extreg_lock);
 
@@ -427,7 +427,8 @@ static int ptp_dp83640_adjtime(struct ptp_clock_info *ptp, s64 delta)
         return err;
 }
 
-static int ptp_dp83640_gettime(struct ptp_clock_info *ptp, struct timespec *ts)
+static int ptp_dp83640_gettime(struct ptp_clock_info *ptp,
+                               struct timespec64 *ts)
 {
         struct dp83640_clock *clock =
                 container_of(ptp, struct dp83640_clock, caps);
@@ -452,7 +453,7 @@ static int ptp_dp83640_gettime(struct ptp_clock_info *ptp, struct timespec *ts)
 }
 
 static int ptp_dp83640_settime(struct ptp_clock_info *ptp,
-                               const struct timespec *ts)
+                               const struct timespec64 *ts)
 {
         struct dp83640_clock *clock =
                 container_of(ptp, struct dp83640_clock, caps);
@@ -605,7 +606,7 @@ static void recalibrate(struct dp83640_clock *clock)
 {
         s64 now, diff;
         struct phy_txts event_ts;
-        struct timespec ts;
+        struct timespec64 ts;
         struct list_head *this;
         struct dp83640_private *tmp;
         struct phy_device *master = clock->chosen->phydev;
@@ -697,7 +698,7 @@ static void recalibrate(struct dp83640_clock *clock)
                 diff = now - (s64) phy2txts(&event_ts);
                 pr_info("slave offset %lld nanoseconds\n", diff);
                 diff += ADJTIME_FIX;
-                ts = ns_to_timespec(diff);
+                ts = ns_to_timespec64(diff);
                 tdr_write(0, tmp->phydev, &ts, PTP_STEP_CLK);
         }
 
@@ -998,8 +999,8 @@ static void dp83640_clock_init(struct dp83640_clock *clock, struct mii_bus *bus)
         clock->caps.pps         = 0;
         clock->caps.adjfreq     = ptp_dp83640_adjfreq;
         clock->caps.adjtime     = ptp_dp83640_adjtime;
-        clock->caps.gettime     = ptp_dp83640_gettime;
-        clock->caps.settime     = ptp_dp83640_settime;
+        clock->caps.gettime64   = ptp_dp83640_gettime;
+        clock->caps.settime64   = ptp_dp83640_settime;
         clock->caps.enable      = ptp_dp83640_enable;
         clock->caps.verify      = ptp_dp83640_verify;
         /*
diff --git a/drivers/net/phy/fixed_phy.c b/drivers/net/phy/fixed_phy.c
index a08a3c78ba97..1960b46add65 100644
--- a/drivers/net/phy/fixed_phy.c
+++ b/drivers/net/phy/fixed_phy.c
@@ -183,6 +183,35 @@ int fixed_phy_set_link_update(struct phy_device *phydev,
 }
 EXPORT_SYMBOL_GPL(fixed_phy_set_link_update);
 
+int fixed_phy_update_state(struct phy_device *phydev,
+                           const struct fixed_phy_status *status,
+                           const struct fixed_phy_status *changed)
+{
+        struct fixed_mdio_bus *fmb = &platform_fmb;
+        struct fixed_phy *fp;
+
+        if (!phydev || !phydev->bus)
+                return -EINVAL;
+
+        list_for_each_entry(fp, &fmb->phys, node) {
+                if (fp->addr == phydev->addr) {
+#define _UPD(x) if (changed->x) \
+        fp->status.x = status->x
+                        _UPD(link);
+                        _UPD(speed);
+                        _UPD(duplex);
+                        _UPD(pause);
+                        _UPD(asym_pause);
+#undef _UPD
+                        fixed_phy_update_regs(fp);
+                        return 0;
+                }
+        }
+
+        return -ENOENT;
+}
+EXPORT_SYMBOL(fixed_phy_update_state);
+
 int fixed_phy_add(unsigned int irq, int phy_addr,
                   struct fixed_phy_status *status)
 {
diff --git a/drivers/net/phy/mdio-bcm-unimac.c b/drivers/net/phy/mdio-bcm-unimac.c
index 6deac6d32f57..414fdf1f343f 100644
--- a/drivers/net/phy/mdio-bcm-unimac.c
+++ b/drivers/net/phy/mdio-bcm-unimac.c
@@ -187,7 +187,7 @@ static int unimac_mdio_remove(struct platform_device *pdev)
         return 0;
 }
 
-static struct of_device_id unimac_mdio_ids[] = {
+static const struct of_device_id unimac_mdio_ids[] = {
         { .compatible = "brcm,genet-mdio-v4", },
         { .compatible = "brcm,genet-mdio-v3", },
         { .compatible = "brcm,genet-mdio-v2", },
diff --git a/drivers/net/phy/mdio-gpio.c b/drivers/net/phy/mdio-gpio.c
index 0a0578a592b8..49ce7ece5af3 100644
--- a/drivers/net/phy/mdio-gpio.c
+++ b/drivers/net/phy/mdio-gpio.c
@@ -249,7 +249,7 @@ static int mdio_gpio_remove(struct platform_device *pdev)
         return 0;
 }
 
-static struct of_device_id mdio_gpio_of_match[] = {
+static const struct of_device_id mdio_gpio_of_match[] = {
         { .compatible = "virtual,mdio-gpio", },
         { /* sentinel */ }
 };
diff --git a/drivers/net/phy/mdio-mux-gpio.c b/drivers/net/phy/mdio-mux-gpio.c
index 320eb15315c8..1a87a585e74d 100644
--- a/drivers/net/phy/mdio-mux-gpio.c
+++ b/drivers/net/phy/mdio-mux-gpio.c
@@ -99,7 +99,7 @@ static int mdio_mux_gpio_remove(struct platform_device *pdev)
         return 0;
 }
 
-static struct of_device_id mdio_mux_gpio_match[] = {
+static const struct of_device_id mdio_mux_gpio_match[] = {
         {
                 .compatible = "mdio-mux-gpio",
         },
diff --git a/drivers/net/phy/mdio-mux-mmioreg.c b/drivers/net/phy/mdio-mux-mmioreg.c
index 0aa985c74014..2377c1341172 100644
--- a/drivers/net/phy/mdio-mux-mmioreg.c
+++ b/drivers/net/phy/mdio-mux-mmioreg.c
@@ -145,7 +145,7 @@ static int mdio_mux_mmioreg_remove(struct platform_device *pdev)
         return 0;
 }
 
-static struct of_device_id mdio_mux_mmioreg_match[] = {
+static const struct of_device_id mdio_mux_mmioreg_match[] = {
         {
                 .compatible = "mdio-mux-mmioreg",
         },
diff --git a/drivers/net/phy/mdio-octeon.c b/drivers/net/phy/mdio-octeon.c
index c81052486edc..c838ad6155f7 100644
--- a/drivers/net/phy/mdio-octeon.c
+++ b/drivers/net/phy/mdio-octeon.c
@@ -252,7 +252,7 @@ static int octeon_mdiobus_remove(struct platform_device *pdev)
         return 0;
 }
 
-static struct of_device_id octeon_mdiobus_match[] = {
+static const struct of_device_id octeon_mdiobus_match[] = {
         {
                 .compatible = "cavium,octeon-3860-mdio",
         },