* Copyright (c) 2016 Microsemi Corporation
  */
 
+#include <linux/firmware.h>
+#include <linux/jiffies.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/mdio.h>
 #define DISABLE_HP_AUTO_MDIX_MASK        0x0080
 #define DISABLE_PAIR_SWAP_CORR_MASK      0x0020
 #define DISABLE_POLARITY_CORR_MASK       0x0010
+#define PARALLEL_DET_IGNORE_ADVERTISED    0x0008
+
+#define MSCC_PHY_EXT_CNTL_STATUS          22
+#define SMI_BROADCAST_WR_EN              0x0001
 
 #define MSCC_PHY_ERR_RX_CNT              19
 #define MSCC_PHY_ERR_FALSE_CARRIER_CNT   20
 #define MAC_IF_SELECTION_RMII             1
 #define MAC_IF_SELECTION_RGMII            2
 #define MAC_IF_SELECTION_POS              11
+#define VSC8584_MAC_IF_SELECTION_MASK     0x1000
+#define VSC8584_MAC_IF_SELECTION_SGMII    0
+#define VSC8584_MAC_IF_SELECTION_1000BASEX 1
+#define VSC8584_MAC_IF_SELECTION_POS      12
 #define FAR_END_LOOPBACK_MODE_MASK        0x0008
+#define MEDIA_OP_MODE_MASK               0x0700
+#define MEDIA_OP_MODE_COPPER             0
+#define MEDIA_OP_MODE_SERDES             1
+#define MEDIA_OP_MODE_1000BASEX                  2
+#define MEDIA_OP_MODE_100BASEFX                  3
+#define MEDIA_OP_MODE_AMS_COPPER_SERDES          5
+#define MEDIA_OP_MODE_AMS_COPPER_1000BASEX     6
+#define MEDIA_OP_MODE_AMS_COPPER_100BASEFX     7
+#define MEDIA_OP_MODE_POS                8
 
 #define MII_VSC85XX_INT_MASK             25
 #define MII_VSC85XX_INT_MASK_MASK        0xa000
 #define MSCC_PHY_PAGE_STANDARD           0x0000 /* Standard registers */
 #define MSCC_PHY_PAGE_EXTENDED           0x0001 /* Extended registers */
 #define MSCC_PHY_PAGE_EXTENDED_2         0x0002 /* Extended reg - page 2 */
+#define MSCC_PHY_PAGE_EXTENDED_3         0x0003 /* Extended reg - page 3 */
+#define MSCC_PHY_PAGE_EXTENDED_4         0x0004 /* Extended reg - page 4 */
+/* Extended reg - GPIO; this is a bank of registers that are shared for all PHYs
+ * in the same package.
+ */
+#define MSCC_PHY_PAGE_EXTENDED_GPIO      0x0010 /* Extended reg - GPIO */
+#define MSCC_PHY_PAGE_TEST               0x2a30 /* Test reg */
 #define MSCC_PHY_PAGE_TR                 0x52b5 /* Token ring registers */
 
 /* Extended Page 1 Registers */
 #define FORCE_MDI_CROSSOVER_MDI                  0x0008
 
 #define MSCC_PHY_ACTIPHY_CNTL            20
+#define PHY_ADDR_REVERSED                0x0200
 #define DOWNSHIFT_CNTL_MASK              0x001C
 #define DOWNSHIFT_EN                     0x0010
 #define DOWNSHIFT_CNTL_POS               2
 
 #define MSCC_PHY_EXT_PHY_CNTL_4                  23
+#define PHY_CNTL_4_ADDR_POS              11
+
+#define MSCC_PHY_VERIPHY_CNTL_2                  25
+
+#define MSCC_PHY_VERIPHY_CNTL_3                  26
 
 /* Extended Page 2 Registers */
+#define MSCC_PHY_CU_PMD_TX_CNTL                  16
+
 #define MSCC_PHY_RGMII_CNTL              20
 #define RGMII_RX_CLK_DELAY_MASK                  0x0070
 #define RGMII_RX_CLK_DELAY_POS           4
 #define SECURE_ON_ENABLE                 0x8000
 #define SECURE_ON_PASSWD_LEN_4           0x4000
 
+/* Extended Page 3 Registers */
+#define MSCC_PHY_SERDES_TX_VALID_CNT     21
+#define MSCC_PHY_SERDES_TX_CRC_ERR_CNT   22
+#define MSCC_PHY_SERDES_RX_VALID_CNT     28
+#define MSCC_PHY_SERDES_RX_CRC_ERR_CNT   29
+
+/* Extended page GPIO Registers */
+#define MSCC_DW8051_CNTL_STATUS                  0
+#define MICRO_NSOFT_RESET                0x8000
+#define RUN_FROM_INT_ROM                 0x4000
+#define AUTOINC_ADDR                     0x2000
+#define PATCH_RAM_CLK                    0x1000
+#define MICRO_PATCH_EN                   0x0080
+#define DW8051_CLK_EN                    0x0010
+#define MICRO_CLK_EN                     0x0008
+#define MICRO_CLK_DIVIDE(x)              ((x) >> 1)
+
+/* x Address in range 1-4 */
+#define MSCC_TRAP_ROM_ADDR(x)            ((x) * 2 + 1)
+#define MSCC_PATCH_RAM_ADDR(x)           (((x) + 1) * 2)
+#define MSCC_INT_MEM_ADDR                11
+
+#define MSCC_INT_MEM_CNTL                12
+#define READ_SFR                         0x6000
+#define READ_PRAM                        0x4000
+#define READ_ROM                         0x2000
+#define READ_RAM                         0x0000
+#define INT_MEM_WRITE_EN                 0x1000
+#define EN_PATCH_RAM_TRAP_ADDR(x)        (0x0100 << ((x) - 1))
+#define INT_MEM_DATA_M                   0x00ff
+#define INT_MEM_DATA(x)                          (INT_MEM_DATA_M & (x))
+
+#define MSCC_PHY_PROC_CMD                18
+#define PROC_CMD_NCOMPLETED              0x8000
+#define PROC_CMD_FAILED                          0x4000
+#define PROC_CMD_SGMII_PORT(x)           ((x) << 8)
+#define PROC_CMD_FIBER_PORT(x)           (0x0100 << (x) % 4)
+#define PROC_CMD_QSGMII_PORT             0x0c00
+#define PROC_CMD_RST_CONF_PORT           0x0080
+#define PROC_CMD_RECONF_PORT             0x0000
+#define PROC_CMD_READ_MOD_WRITE_PORT     0x0040
+#define PROC_CMD_WRITE                   0x0040
+#define PROC_CMD_READ                    0x0000
+#define PROC_CMD_FIBER_DISABLE           0x0020
+#define PROC_CMD_FIBER_100BASE_FX        0x0010
+#define PROC_CMD_FIBER_1000BASE_X        0x0000
+#define PROC_CMD_SGMII_MAC               0x0030
+#define PROC_CMD_QSGMII_MAC              0x0020
+#define PROC_CMD_NO_MAC_CONF             0x0000
+#define PROC_CMD_NOP                     0x000f
+#define PROC_CMD_CRC16                   0x0008
+#define PROC_CMD_FIBER_MEDIA_CONF        0x0001
+#define PROC_CMD_MCB_ACCESS_MAC_CONF     0x0000
+#define PROC_CMD_NCOMPLETED_TIMEOUT_MS    500
+
+#define MSCC_PHY_MAC_CFG_FASTLINK        19
+#define MAC_CFG_MASK                     0xc000
+#define MAC_CFG_SGMII                    0x0000
+#define MAC_CFG_QSGMII                   0x4000
+
+/* Test page Registers */
+#define MSCC_PHY_TEST_PAGE_5             5
+#define MSCC_PHY_TEST_PAGE_8             8
+
 /* Token ring page Registers */
 #define MSCC_PHY_TR_CNTL                 16
 #define TR_WRITE                         0x8000
 #define PHY_ID_VSC8531                   0x00070570
 #define PHY_ID_VSC8540                   0x00070760
 #define PHY_ID_VSC8541                   0x00070770
+#define PHY_ID_VSC8584                   0x000707c0
 
 #define MSCC_VDDMAC_1500                 1500
 #define MSCC_VDDMAC_1800                 1800
 #define DOWNSHIFT_COUNT_MAX              5
 
 #define MAX_LEDS                         4
+
+#define VSC8584_SUPP_LED_MODES (BIT(VSC8531_LINK_ACTIVITY) | \
+                               BIT(VSC8531_LINK_1000_ACTIVITY) | \
+                               BIT(VSC8531_LINK_100_ACTIVITY) | \
+                               BIT(VSC8531_LINK_10_ACTIVITY) | \
+                               BIT(VSC8531_LINK_100_1000_ACTIVITY) | \
+                               BIT(VSC8531_LINK_10_1000_ACTIVITY) | \
+                               BIT(VSC8531_LINK_10_100_ACTIVITY) | \
+                               BIT(VSC8584_LINK_100FX_1000X_ACTIVITY) | \
+                               BIT(VSC8531_DUPLEX_COLLISION) | \
+                               BIT(VSC8531_COLLISION) | \
+                               BIT(VSC8531_ACTIVITY) | \
+                               BIT(VSC8584_100FX_1000X_ACTIVITY) | \
+                               BIT(VSC8531_AUTONEG_FAULT) | \
+                               BIT(VSC8531_SERIAL_MODE) | \
+                               BIT(VSC8531_FORCE_LED_OFF) | \
+                               BIT(VSC8531_FORCE_LED_ON))
+
 #define VSC85XX_SUPP_LED_MODES (BIT(VSC8531_LINK_ACTIVITY) | \
                                BIT(VSC8531_LINK_1000_ACTIVITY) | \
                                BIT(VSC8531_LINK_100_ACTIVITY) | \
                                BIT(VSC8531_FORCE_LED_OFF) | \
                                BIT(VSC8531_FORCE_LED_ON))
 
+#define MSCC_VSC8584_REVB_INT8051_FW           "mscc_vsc8584_revb_int8051_fb48.bin"
+#define MSCC_VSC8584_REVB_INT8051_FW_START_ADDR        0xe800
+#define MSCC_VSC8584_REVB_INT8051_FW_CRC       0xfb48
+
+#define VSC8584_REVB                           0x0001
+#define MSCC_DEV_REV_MASK                      GENMASK(3, 0)
+
 struct reg_val {
        u16     reg;
        u32     val;
        },
 };
 
+static const struct vsc85xx_hw_stat vsc8584_hw_stats[] = {
+       {
+               .string = "phy_receive_errors",
+               .reg    = MSCC_PHY_ERR_RX_CNT,
+               .page   = MSCC_PHY_PAGE_STANDARD,
+               .mask   = ERR_CNT_MASK,
+       }, {
+               .string = "phy_false_carrier",
+               .reg    = MSCC_PHY_ERR_FALSE_CARRIER_CNT,
+               .page   = MSCC_PHY_PAGE_STANDARD,
+               .mask   = ERR_CNT_MASK,
+       }, {
+               .string = "phy_cu_media_link_disconnect",
+               .reg    = MSCC_PHY_ERR_LINK_DISCONNECT_CNT,
+               .page   = MSCC_PHY_PAGE_STANDARD,
+               .mask   = ERR_CNT_MASK,
+       }, {
+               .string = "phy_cu_media_crc_good_count",
+               .reg    = MSCC_PHY_CU_MEDIA_CRC_VALID_CNT,
+               .page   = MSCC_PHY_PAGE_EXTENDED,
+               .mask   = VALID_CRC_CNT_CRC_MASK,
+       }, {
+               .string = "phy_cu_media_crc_error_count",
+               .reg    = MSCC_PHY_EXT_PHY_CNTL_4,
+               .page   = MSCC_PHY_PAGE_EXTENDED,
+               .mask   = ERR_CNT_MASK,
+       }, {
+               .string = "phy_serdes_tx_good_pkt_count",
+               .reg    = MSCC_PHY_SERDES_TX_VALID_CNT,
+               .page   = MSCC_PHY_PAGE_EXTENDED_3,
+               .mask   = VALID_CRC_CNT_CRC_MASK,
+       }, {
+               .string = "phy_serdes_tx_bad_crc_count",
+               .reg    = MSCC_PHY_SERDES_TX_CRC_ERR_CNT,
+               .page   = MSCC_PHY_PAGE_EXTENDED_3,
+               .mask   = ERR_CNT_MASK,
+       }, {
+               .string = "phy_serdes_rx_good_pkt_count",
+               .reg    = MSCC_PHY_SERDES_RX_VALID_CNT,
+               .page   = MSCC_PHY_PAGE_EXTENDED_3,
+               .mask   = VALID_CRC_CNT_CRC_MASK,
+       }, {
+               .string = "phy_serdes_rx_bad_crc_count",
+               .reg    = MSCC_PHY_SERDES_RX_CRC_ERR_CNT,
+               .page   = MSCC_PHY_PAGE_EXTENDED_3,
+               .mask   = ERR_CNT_MASK,
+       },
+};
+
 struct vsc8531_private {
        int rate_magic;
        u16 supp_led_modes;
        const struct vsc85xx_hw_stat *hw_stats;
        u64 *stats;
        int nstats;
+       bool pkg_init;
+       /* For multiple port PHYs; the MDIO address of the base PHY in the
+        * package.
+        */
+       unsigned int base_addr;
 };
 
 #ifdef CONFIG_OF_MDIO
        return oldpage;
 }
 
+/* phydev->bus->mdio_lock should be locked when using this function */
+static int phy_base_write(struct phy_device *phydev, u32 regnum, u16 val)
+{
+       struct vsc8531_private *priv = phydev->priv;
+
+       if (unlikely(!mutex_is_locked(&phydev->mdio.bus->mdio_lock))) {
+               dev_err(&phydev->mdio.dev, "MDIO bus lock not held!\n");
+               dump_stack();
+       }
+
+       return __mdiobus_write(phydev->mdio.bus, priv->base_addr, regnum, val);
+}
+
+/* phydev->bus->mdio_lock should be locked when using this function */
+static int phy_base_read(struct phy_device *phydev, u32 regnum)
+{
+       struct vsc8531_private *priv = phydev->priv;
+
+       if (unlikely(!mutex_is_locked(&phydev->mdio.bus->mdio_lock))) {
+               dev_err(&phydev->mdio.dev, "MDIO bus lock not held!\n");
+               dump_stack();
+       }
+
+       return __mdiobus_read(phydev->mdio.bus, priv->base_addr, regnum);
+}
+
+/* bus->mdio_lock should be locked when using this function */
+static void vsc8584_csr_write(struct phy_device *phydev, u16 addr, u32 val)
+{
+       phy_base_write(phydev, MSCC_PHY_TR_MSB, val >> 16);
+       phy_base_write(phydev, MSCC_PHY_TR_LSB, val & GENMASK(15, 0));
+       phy_base_write(phydev, MSCC_PHY_TR_CNTL, TR_WRITE | TR_ADDR(addr));
+}
+
+/* bus->mdio_lock should be locked when using this function */
+static int vsc8584_cmd(struct phy_device *phydev, u16 val)
+{
+       unsigned long deadline;
+       u16 reg_val;
+
+       phy_base_write(phydev, MSCC_EXT_PAGE_ACCESS,
+                      MSCC_PHY_PAGE_EXTENDED_GPIO);
+
+       phy_base_write(phydev, MSCC_PHY_PROC_CMD, PROC_CMD_NCOMPLETED | val);
+
+       deadline = jiffies + msecs_to_jiffies(PROC_CMD_NCOMPLETED_TIMEOUT_MS);
+       do {
+               reg_val = phy_base_read(phydev, MSCC_PHY_PROC_CMD);
+       } while (time_before(jiffies, deadline) &&
+                (reg_val & PROC_CMD_NCOMPLETED) &&
+                !(reg_val & PROC_CMD_FAILED));
+
+       phy_base_write(phydev, MSCC_EXT_PAGE_ACCESS, MSCC_PHY_PAGE_STANDARD);
+
+       if (reg_val & PROC_CMD_FAILED)
+               return -EIO;
+
+       if (reg_val & PROC_CMD_NCOMPLETED)
+               return -ETIMEDOUT;
+
+       return 0;
+}
+
+/* bus->mdio_lock should be locked when using this function */
+static int vsc8584_micro_deassert_reset(struct phy_device *phydev,
+                                       bool patch_en)
+{
+       u32 enable, release;
+
+       phy_base_write(phydev, MSCC_EXT_PAGE_ACCESS,
+                      MSCC_PHY_PAGE_EXTENDED_GPIO);
+
+       enable = RUN_FROM_INT_ROM | MICRO_CLK_EN | DW8051_CLK_EN;
+       release = MICRO_NSOFT_RESET | RUN_FROM_INT_ROM | DW8051_CLK_EN |
+               MICRO_CLK_EN;
+
+       if (patch_en) {
+               enable |= MICRO_PATCH_EN;
+               release |= MICRO_PATCH_EN;
+
+               /* Clear all patches */
+               phy_base_write(phydev, MSCC_INT_MEM_CNTL, READ_RAM);
+       }
+
+       /* Enable 8051 Micro clock; CLEAR/SET patch present; disable PRAM clock
+        * override and addr. auto-incr; operate at 125 MHz
+        */
+       phy_base_write(phydev, MSCC_DW8051_CNTL_STATUS, enable);
+       /* Release 8051 Micro SW reset */
+       phy_base_write(phydev, MSCC_DW8051_CNTL_STATUS, release);
+
+       phy_base_write(phydev, MSCC_EXT_PAGE_ACCESS, MSCC_PHY_PAGE_STANDARD);
+
+       return 0;
+}
+
+/* bus->mdio_lock should be locked when using this function */
+static int vsc8584_micro_assert_reset(struct phy_device *phydev)
+{
+       int ret;
+       u16 reg;
+
+       ret = vsc8584_cmd(phydev, PROC_CMD_NOP);
+       if (ret)
+               return ret;
+
+       phy_base_write(phydev, MSCC_EXT_PAGE_ACCESS,
+                      MSCC_PHY_PAGE_EXTENDED_GPIO);
+
+       reg = phy_base_read(phydev, MSCC_INT_MEM_CNTL);
+       reg &= ~EN_PATCH_RAM_TRAP_ADDR(4);
+       phy_base_write(phydev, MSCC_INT_MEM_CNTL, reg);
+
+       phy_base_write(phydev, MSCC_TRAP_ROM_ADDR(4), 0x005b);
+       phy_base_write(phydev, MSCC_PATCH_RAM_ADDR(4), 0x005b);
+
+       reg = phy_base_read(phydev, MSCC_INT_MEM_CNTL);
+       reg |= EN_PATCH_RAM_TRAP_ADDR(4);
+       phy_base_write(phydev, MSCC_INT_MEM_CNTL, reg);
+
+       phy_base_write(phydev, MSCC_PHY_PROC_CMD, PROC_CMD_NOP);
+
+       reg = phy_base_read(phydev, MSCC_DW8051_CNTL_STATUS);
+       reg &= ~MICRO_NSOFT_RESET;
+       phy_base_write(phydev, MSCC_DW8051_CNTL_STATUS, reg);
+
+       phy_base_write(phydev, MSCC_PHY_PROC_CMD, PROC_CMD_MCB_ACCESS_MAC_CONF |
+                      PROC_CMD_SGMII_PORT(0) | PROC_CMD_NO_MAC_CONF |
+                      PROC_CMD_READ);
+
+       reg = phy_base_read(phydev, MSCC_INT_MEM_CNTL);
+       reg &= ~EN_PATCH_RAM_TRAP_ADDR(4);
+       phy_base_write(phydev, MSCC_INT_MEM_CNTL, reg);
+
+       phy_base_write(phydev, MSCC_EXT_PAGE_ACCESS, MSCC_PHY_PAGE_STANDARD);
+
+       return 0;
+}
+
+/* bus->mdio_lock should be locked when using this function */
+static int vsc8584_get_fw_crc(struct phy_device *phydev, u16 start, u16 size,
+                             u16 *crc)
+{
+       int ret;
+
+       phy_base_write(phydev, MSCC_EXT_PAGE_ACCESS, MSCC_PHY_PAGE_EXTENDED);
+
+       phy_base_write(phydev, MSCC_PHY_VERIPHY_CNTL_2, start);
+       phy_base_write(phydev, MSCC_PHY_VERIPHY_CNTL_3, size);
+
+       /* Start Micro command */
+       ret = vsc8584_cmd(phydev, PROC_CMD_CRC16);
+       if (ret)
+               goto out;
+
+       phy_base_write(phydev, MSCC_EXT_PAGE_ACCESS, MSCC_PHY_PAGE_EXTENDED);
+
+       *crc = phy_base_read(phydev, MSCC_PHY_VERIPHY_CNTL_2);
+
+out:
+       phy_base_write(phydev, MSCC_EXT_PAGE_ACCESS, MSCC_PHY_PAGE_STANDARD);
+
+       return ret;
+}
+
+/* bus->mdio_lock should be locked when using this function */
+static int vsc8584_patch_fw(struct phy_device *phydev,
+                           const struct firmware *fw)
+{
+       int i, ret;
+
+       ret = vsc8584_micro_assert_reset(phydev);
+       if (ret) {
+               dev_err(&phydev->mdio.dev,
+                       "%s: failed to assert reset of micro\n", __func__);
+               return ret;
+       }
+
+       phy_base_write(phydev, MSCC_EXT_PAGE_ACCESS,
+                      MSCC_PHY_PAGE_EXTENDED_GPIO);
+
+       /* Hold 8051 Micro in SW Reset, Enable auto incr address and patch clock
+        * Disable the 8051 Micro clock
+        */
+       phy_base_write(phydev, MSCC_DW8051_CNTL_STATUS, RUN_FROM_INT_ROM |
+                      AUTOINC_ADDR | PATCH_RAM_CLK | MICRO_CLK_EN |
+                      MICRO_CLK_DIVIDE(2));
+       phy_base_write(phydev, MSCC_INT_MEM_CNTL, READ_PRAM | INT_MEM_WRITE_EN |
+                      INT_MEM_DATA(2));
+       phy_base_write(phydev, MSCC_INT_MEM_ADDR, 0x0000);
+
+       for (i = 0; i < fw->size; i++)
+               phy_base_write(phydev, MSCC_INT_MEM_CNTL, READ_PRAM |
+                              INT_MEM_WRITE_EN | fw->data[i]);
+
+       /* Clear internal memory access */
+       phy_base_write(phydev, MSCC_INT_MEM_CNTL, READ_RAM);
+
+       phy_base_write(phydev, MSCC_EXT_PAGE_ACCESS, MSCC_PHY_PAGE_STANDARD);
+
+       return 0;
+}
+
+/* bus->mdio_lock should be locked when using this function */
+static int vsc8584_config_pre_init(struct phy_device *phydev)
+{
+       const struct reg_val pre_init1[] = {
+               {0x07fa, 0x0050100f},
+               {0x1688, 0x00049f81},
+               {0x0f90, 0x00688980},
+               {0x03a4, 0x0000d8f0},
+               {0x0fc0, 0x00000400},
+               {0x0f82, 0x0012b002},
+               {0x1686, 0x00000004},
+               {0x168c, 0x00d2c46f},
+               {0x17a2, 0x00000620},
+               {0x16a0, 0x00eeffdd},
+               {0x16a6, 0x00071448},
+               {0x16a4, 0x0013132f},
+               {0x16a8, 0x00000000},
+               {0x0ffc, 0x00c0a028},
+               {0x0fe8, 0x0091b06c},
+               {0x0fea, 0x00041600},
+               {0x0f80, 0x00fffaff},
+               {0x0fec, 0x00901809},
+               {0x0ffe, 0x00b01007},
+               {0x16b0, 0x00eeff00},
+               {0x16b2, 0x00007000},
+               {0x16b4, 0x00000814},
+       };
+       const struct reg_val pre_init2[] = {
+               {0x0486, 0x0008a518},
+               {0x0488, 0x006dc696},
+               {0x048a, 0x00000912},
+       };
+       const struct firmware *fw;
+       struct device *dev = &phydev->mdio.dev;
+       unsigned int i;
+       u16 crc, reg;
+       int ret;
+
+       phy_base_write(phydev, MSCC_EXT_PAGE_ACCESS, MSCC_PHY_PAGE_STANDARD);
+
+       /* all writes below are broadcasted to all PHYs in the same package */
+       reg = phy_base_read(phydev, MSCC_PHY_EXT_CNTL_STATUS);
+       reg |= SMI_BROADCAST_WR_EN;
+       phy_base_write(phydev, MSCC_PHY_EXT_CNTL_STATUS, reg);
+
+       phy_base_write(phydev, MII_VSC85XX_INT_MASK, 0);
+
+       reg = phy_base_read(phydev,  MSCC_PHY_BYPASS_CONTROL);
+       reg |= PARALLEL_DET_IGNORE_ADVERTISED;
+       phy_base_write(phydev, MSCC_PHY_BYPASS_CONTROL, reg);
+
+       /* The below register writes are tweaking analog and electrical
+        * configuration that were determined through characterization by PHY
+        * engineers. These don't mean anything more than "these are the best
+        * values".
+        */
+       phy_base_write(phydev, MSCC_EXT_PAGE_ACCESS, MSCC_PHY_PAGE_EXTENDED_3);
+
+       phy_base_write(phydev, MSCC_PHY_SERDES_TX_CRC_ERR_CNT, 0x2000);
+
+       phy_base_write(phydev, MSCC_EXT_PAGE_ACCESS, MSCC_PHY_PAGE_TEST);
+
+       phy_base_write(phydev, MSCC_PHY_TEST_PAGE_5, 0x1f20);
+
+       reg = phy_base_read(phydev, MSCC_PHY_TEST_PAGE_8);
+       reg |= 0x8000;
+       phy_base_write(phydev, MSCC_PHY_TEST_PAGE_8, reg);
+
+       phy_base_write(phydev, MSCC_EXT_PAGE_ACCESS, MSCC_PHY_PAGE_TR);
+
+       phy_base_write(phydev, MSCC_PHY_TR_CNTL, TR_WRITE | TR_ADDR(0x2fa4));
+
+       reg = phy_base_read(phydev, MSCC_PHY_TR_MSB);
+       reg &= ~0x007f;
+       reg |= 0x0019;
+       phy_base_write(phydev, MSCC_PHY_TR_MSB, reg);
+
+       phy_base_write(phydev, MSCC_PHY_TR_CNTL, TR_WRITE | TR_ADDR(0x0fa4));
+
+       for (i = 0; i < ARRAY_SIZE(pre_init1); i++)
+               vsc8584_csr_write(phydev, pre_init1[i].reg, pre_init1[i].val);
+
+       phy_base_write(phydev, MSCC_EXT_PAGE_ACCESS, MSCC_PHY_PAGE_EXTENDED_2);
+
+       phy_base_write(phydev, MSCC_PHY_CU_PMD_TX_CNTL, 0x028e);
+
+       phy_base_write(phydev, MSCC_EXT_PAGE_ACCESS, MSCC_PHY_PAGE_TR);
+
+       for (i = 0; i < ARRAY_SIZE(pre_init2); i++)
+               vsc8584_csr_write(phydev, pre_init2[i].reg, pre_init2[i].val);
+
+       phy_base_write(phydev, MSCC_EXT_PAGE_ACCESS, MSCC_PHY_PAGE_TEST);
+
+       reg = phy_base_read(phydev, MSCC_PHY_TEST_PAGE_8);
+       reg &= ~0x8000;
+       phy_base_write(phydev, MSCC_PHY_TEST_PAGE_8, reg);
+
+       phy_base_write(phydev, MSCC_EXT_PAGE_ACCESS, MSCC_PHY_PAGE_STANDARD);
+
+       /* end of write broadcasting */
+       reg = phy_base_read(phydev, MSCC_PHY_EXT_CNTL_STATUS);
+       reg &= ~SMI_BROADCAST_WR_EN;
+       phy_base_write(phydev, MSCC_PHY_EXT_CNTL_STATUS, reg);
+
+       ret = request_firmware(&fw, MSCC_VSC8584_REVB_INT8051_FW, dev);
+       if (ret) {
+               dev_err(dev, "failed to load firmware %s, ret: %d\n",
+                       MSCC_VSC8584_REVB_INT8051_FW, ret);
+               return ret;
+       }
+
+       /* Add one byte to size for the one added by the patch_fw function */
+       ret = vsc8584_get_fw_crc(phydev,
+                                MSCC_VSC8584_REVB_INT8051_FW_START_ADDR,
+                                fw->size + 1, &crc);
+       if (ret)
+               goto out;
+
+       if (crc != MSCC_VSC8584_REVB_INT8051_FW_CRC) {
+               dev_dbg(dev, "FW CRC is not the expected one, patching FW\n");
+               if (vsc8584_patch_fw(phydev, fw))
+                       dev_warn(dev,
+                                "failed to patch FW, expect non-optimal device\n");
+       }
+
+       vsc8584_micro_deassert_reset(phydev, false);
+
+       /* Add one byte to size for the one added by the patch_fw function */
+       ret = vsc8584_get_fw_crc(phydev,
+                                MSCC_VSC8584_REVB_INT8051_FW_START_ADDR,
+                                fw->size + 1, &crc);
+       if (ret)
+               goto out;
+
+       if (crc != MSCC_VSC8584_REVB_INT8051_FW_CRC)
+               dev_warn(dev,
+                        "FW CRC after patching is not the expected one, expect non-optimal device\n");
+
+       ret = vsc8584_micro_assert_reset(phydev);
+       if (ret)
+               goto out;
+
+       vsc8584_micro_deassert_reset(phydev, true);
+
+out:
+       phy_base_write(phydev, MSCC_EXT_PAGE_ACCESS, MSCC_PHY_PAGE_STANDARD);
+
+       release_firmware(fw);
+
+       return ret;
+}
+
+/* Check if one PHY has already done the init of the parts common to all PHYs
+ * in the Quad PHY package.
+ */
+static bool vsc8584_is_pkg_init(struct phy_device *phydev, bool reversed)
+{
+       struct mdio_device **map = phydev->mdio.bus->mdio_map;
+       struct vsc8531_private *vsc8531;
+       struct phy_device *phy;
+       int i, addr;
+
+       /* VSC8584 is a Quad PHY */
+       for (i = 0; i < 4; i++) {
+               vsc8531 = phydev->priv;
+
+               if (reversed)
+                       addr = vsc8531->base_addr - i;
+               else
+                       addr = vsc8531->base_addr + i;
+
+               phy = container_of(map[addr], struct phy_device, mdio);
+
+               if ((phy->phy_id & phydev->drv->phy_id_mask) !=
+                   (phydev->drv->phy_id & phydev->drv->phy_id_mask))
+                       continue;
+
+               vsc8531 = phy->priv;
+
+               if (vsc8531 && vsc8531->pkg_init)
+                       return true;
+       }
+
+       return false;
+}
+
+static int vsc8584_config_init(struct phy_device *phydev)
+{
+       struct vsc8531_private *vsc8531 = phydev->priv;
+       u16 addr, val;
+       int ret, i;
+
+       phydev->mdix_ctrl = ETH_TP_MDI_AUTO;
+
+       mutex_lock(&phydev->mdio.bus->mdio_lock);
+
+       __mdiobus_write(phydev->mdio.bus, phydev->mdio.addr,
+                       MSCC_EXT_PAGE_ACCESS, MSCC_PHY_PAGE_EXTENDED);
+       addr = __mdiobus_read(phydev->mdio.bus, phydev->mdio.addr,
+                             MSCC_PHY_EXT_PHY_CNTL_4);
+       addr >>= PHY_CNTL_4_ADDR_POS;
+
+       val = __mdiobus_read(phydev->mdio.bus, phydev->mdio.addr,
+                            MSCC_PHY_ACTIPHY_CNTL);
+       if (val & PHY_ADDR_REVERSED)
+               vsc8531->base_addr = phydev->mdio.addr + addr;
+       else
+               vsc8531->base_addr = phydev->mdio.addr - addr;
+
+       /* Some parts of the init sequence are identical for every PHY in the
+        * package. Some parts are modifying the GPIO register bank which is a
+        * set of registers that are affecting all PHYs, a few resetting the
+        * microprocessor common to all PHYs. The CRC check responsible of the
+        * checking the firmware within the 8051 microprocessor can only be
+        * accessed via the PHY whose internal address in the package is 0.
+        * All PHYs' interrupts mask register has to be zeroed before enabling
+        * any PHY's interrupt in this register.
+        * For all these reasons, we need to do the init sequence once and only
+        * once whatever is the first PHY in the package that is initialized and
+        * do the correct init sequence for all PHYs that are package-critical
+        * in this pre-init function.
+        */
+       if (!vsc8584_is_pkg_init(phydev, val & PHY_ADDR_REVERSED ? 1 : 0)) {
+               ret = vsc8584_config_pre_init(phydev);
+               if (ret)
+                       goto err;
+       }
+
+       vsc8531->pkg_init = true;
+
+       phy_base_write(phydev, MSCC_EXT_PAGE_ACCESS,
+                      MSCC_PHY_PAGE_EXTENDED_GPIO);
+
+       val = phy_base_read(phydev, MSCC_PHY_MAC_CFG_FASTLINK);
+       val &= ~MAC_CFG_MASK;
+       if (phydev->interface == PHY_INTERFACE_MODE_QSGMII)
+               val |= MAC_CFG_QSGMII;
+       else
+               val |= MAC_CFG_SGMII;
+
+       ret = phy_base_write(phydev, MSCC_PHY_MAC_CFG_FASTLINK, val);
+       if (ret)
+               goto err;
+
+       val = PROC_CMD_MCB_ACCESS_MAC_CONF | PROC_CMD_RST_CONF_PORT |
+               PROC_CMD_READ_MOD_WRITE_PORT;
+       if (phydev->interface == PHY_INTERFACE_MODE_QSGMII)
+               val |= PROC_CMD_QSGMII_MAC;
+       else
+               val |= PROC_CMD_SGMII_MAC;
+
+       ret = vsc8584_cmd(phydev, val);
+       if (ret)
+               goto err;
+
+       usleep_range(10000, 20000);
+
+       /* Disable SerDes for 100Base-FX */
+       ret = vsc8584_cmd(phydev, PROC_CMD_FIBER_MEDIA_CONF |
+                         PROC_CMD_FIBER_PORT(addr) | PROC_CMD_FIBER_DISABLE |
+                         PROC_CMD_READ_MOD_WRITE_PORT |
+                         PROC_CMD_RST_CONF_PORT | PROC_CMD_FIBER_100BASE_FX);
+       if (ret)
+               goto err;
+
+       /* Disable SerDes for 1000Base-X */
+       ret = vsc8584_cmd(phydev, PROC_CMD_FIBER_MEDIA_CONF |
+                         PROC_CMD_FIBER_PORT(addr) | PROC_CMD_FIBER_DISABLE |
+                         PROC_CMD_READ_MOD_WRITE_PORT |
+                         PROC_CMD_RST_CONF_PORT | PROC_CMD_FIBER_1000BASE_X);
+       if (ret)
+               goto err;
+
+       mutex_unlock(&phydev->mdio.bus->mdio_lock);
+
+       phy_write(phydev, MSCC_EXT_PAGE_ACCESS, MSCC_PHY_PAGE_STANDARD);
+
+       val = phy_read(phydev, MSCC_PHY_EXT_PHY_CNTL_1);
+       val &= ~(MEDIA_OP_MODE_MASK | VSC8584_MAC_IF_SELECTION_MASK);
+       val |= MEDIA_OP_MODE_COPPER | (VSC8584_MAC_IF_SELECTION_SGMII <<
+                                      VSC8584_MAC_IF_SELECTION_POS);
+       ret = phy_write(phydev, MSCC_PHY_EXT_PHY_CNTL_1, val);
+
+       ret = genphy_soft_reset(phydev);
+       if (ret)
+               return ret;
+
+       for (i = 0; i < vsc8531->nleds; i++) {
+               ret = vsc85xx_led_cntl_set(phydev, i, vsc8531->leds_mode[i]);
+               if (ret)
+                       return ret;
+       }
+
+       return genphy_config_init(phydev);
+
+err:
+       mutex_unlock(&phydev->mdio.bus->mdio_lock);
+       return ret;
+}
+
 static int vsc85xx_config_init(struct phy_device *phydev)
 {
        int rc, i;
        return genphy_config_init(phydev);
 }
 
+static int vsc8584_did_interrupt(struct phy_device *phydev)
+{
+       int rc = 0;
+
+       if (phydev->interrupts == PHY_INTERRUPT_ENABLED)
+               rc = phy_read(phydev, MII_VSC85XX_INT_STATUS);
+
+       return (rc < 0) ? 0 : rc & MII_VSC85XX_INT_MASK_MASK;
+}
+
 static int vsc85xx_ack_interrupt(struct phy_device *phydev)
 {
        int rc = 0;
        return genphy_read_status(phydev);
 }
 
+static int vsc8584_probe(struct phy_device *phydev)
+{
+       struct vsc8531_private *vsc8531;
+       u32 default_mode[4] = {VSC8531_LINK_1000_ACTIVITY,
+          VSC8531_LINK_100_ACTIVITY, VSC8531_LINK_ACTIVITY,
+          VSC8531_DUPLEX_COLLISION};
+
+       if ((phydev->phy_id & MSCC_DEV_REV_MASK) != VSC8584_REVB) {
+               dev_err(&phydev->mdio.dev, "Only VSC8584 revB is supported.\n");
+               return -ENOTSUPP;
+       }
+
+       vsc8531 = devm_kzalloc(&phydev->mdio.dev, sizeof(*vsc8531), GFP_KERNEL);
+       if (!vsc8531)
+               return -ENOMEM;
+
+       phydev->priv = vsc8531;
+
+       vsc8531->nleds = 4;
+       vsc8531->supp_led_modes = VSC8584_SUPP_LED_MODES;
+       vsc8531->hw_stats = vsc8584_hw_stats;
+       vsc8531->nstats = ARRAY_SIZE(vsc8584_hw_stats);
+       vsc8531->stats = devm_kmalloc_array(&phydev->mdio.dev, vsc8531->nstats,
+                                           sizeof(u64), GFP_KERNEL);
+       if (!vsc8531->stats)
+               return -ENOMEM;
+
+       return vsc85xx_dt_led_modes_get(phydev, default_mode);
+}
+
 static int vsc85xx_probe(struct phy_device *phydev)
 {
        struct vsc8531_private *vsc8531;
        .get_sset_count = &vsc85xx_get_sset_count,
        .get_strings    = &vsc85xx_get_strings,
        .get_stats      = &vsc85xx_get_stats,
+},
+{
+       .phy_id         = PHY_ID_VSC8584,
+       .name           = "Microsemi GE VSC8584 SyncE",
+       .phy_id_mask    = 0xfffffff0,
+       .features       = PHY_GBIT_FEATURES,
+       .flags          = PHY_HAS_INTERRUPT,
+       .soft_reset     = &genphy_soft_reset,
+       .config_init    = &vsc8584_config_init,
+       .config_aneg    = &vsc85xx_config_aneg,
+       .aneg_done      = &genphy_aneg_done,
+       .read_status    = &vsc85xx_read_status,
+       .ack_interrupt  = &vsc85xx_ack_interrupt,
+       .config_intr    = &vsc85xx_config_intr,
+       .did_interrupt  = &vsc8584_did_interrupt,
+       .suspend        = &genphy_suspend,
+       .resume         = &genphy_resume,
+       .probe          = &vsc8584_probe,
+       .get_tunable    = &vsc85xx_get_tunable,
+       .set_tunable    = &vsc85xx_set_tunable,
+       .read_page      = &vsc85xx_phy_read_page,
+       .write_page     = &vsc85xx_phy_write_page,
+       .get_sset_count = &vsc85xx_get_sset_count,
+       .get_strings    = &vsc85xx_get_strings,
+       .get_stats      = &vsc85xx_get_stats,
 }
 
 };
        { PHY_ID_VSC8531, 0xfffffff0, },
        { PHY_ID_VSC8540, 0xfffffff0, },
        { PHY_ID_VSC8541, 0xfffffff0, },
+       { PHY_ID_VSC8584, 0xfffffff0, },
        { }
 };