]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
drivers: net: xgene: Add SGMII based 1GbE support
authorIyappan Subramanian <isubramanian@apm.com>
Tue, 14 Oct 2014 00:05:34 +0000 (17:05 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 14 Oct 2014 20:09:21 +0000 (16:09 -0400)
Signed-off-by: Iyappan Subramanian <isubramanian@apm.com>
Signed-off-by: Keyur Chudgar <kchudgar@apm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/apm/xgene/Makefile
drivers/net/ethernet/apm/xgene/xgene_enet_hw.h
drivers/net/ethernet/apm/xgene/xgene_enet_main.c
drivers/net/ethernet/apm/xgene/xgene_enet_main.h
drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c [new file with mode: 0644]
drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.h [new file with mode: 0644]
drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.h

index 589b3524771385c1a1cdb76091f26f6582a1805a..68be565548c09de5c7ecbaec377b9d5d291a5567 100644 (file)
@@ -2,6 +2,6 @@
 # Makefile for APM X-Gene Ethernet Driver.
 #
 
-xgene-enet-objs := xgene_enet_hw.o xgene_enet_xgmac.o \
+xgene-enet-objs := xgene_enet_hw.o xgene_enet_sgmac.o xgene_enet_xgmac.o \
                   xgene_enet_main.o xgene_enet_ethtool.o
 obj-$(CONFIG_NET_XGENE) += xgene-enet.o
index 2efc4d98d4a5d15a49ffbb08eda92563698b90ca..38558584080ed8029a3640f171353fe09cb6503e 100644 (file)
@@ -44,6 +44,7 @@ static inline u32 xgene_get_bits(u32 val, u32 start, u32 end)
 
 enum xgene_enet_rm {
        RM0,
+       RM1,
        RM3 = 3
 };
 
@@ -143,6 +144,8 @@ enum xgene_enet_rm {
 #define CFG_CLE_FPSEL0_SET(dst, val)           xgene_set_bits(dst, val, 16, 4)
 #define CFG_MACMODE_SET(dst, val)              xgene_set_bits(dst, val, 18, 2)
 #define CFG_WAITASYNCRD_SET(dst, val)          xgene_set_bits(dst, val, 0, 16)
+#define CFG_CLE_DSTQID0(val)           (val & GENMASK(11, 0))
+#define CFG_CLE_FPSEL0(val)            ((val << 16) & GENMASK(19, 16))
 #define ICM_CONFIG0_REG_0_ADDR         0x0400
 #define ICM_CONFIG2_REG_0_ADDR         0x0410
 #define RX_DV_GATE_REG_0_ADDR          0x05fc
index 9e251ecf6e33f712cc843f29d1b73b0d7cd3c506..3c208cc6f6bb470ae97d74f06fbaf0dcbaaf7ee6 100644 (file)
@@ -21,6 +21,7 @@
 
 #include "xgene_enet_main.h"
 #include "xgene_enet_hw.h"
+#include "xgene_enet_sgmac.h"
 #include "xgene_enet_xgmac.h"
 
 static void xgene_enet_init_bufpool(struct xgene_enet_desc_ring *buf_pool)
@@ -813,6 +814,7 @@ static int xgene_enet_get_resources(struct xgene_enet_pdata *pdata)
                return pdata->phy_mode;
        }
        if (pdata->phy_mode != PHY_INTERFACE_MODE_RGMII &&
+           pdata->phy_mode != PHY_INTERFACE_MODE_SGMII &&
            pdata->phy_mode != PHY_INTERFACE_MODE_XGMII) {
                dev_err(dev, "Incorrect phy-connection-type specified\n");
                return -ENODEV;
@@ -830,7 +832,8 @@ static int xgene_enet_get_resources(struct xgene_enet_pdata *pdata)
        pdata->eth_csr_addr = base_addr + BLOCK_ETH_CSR_OFFSET;
        pdata->eth_ring_if_addr = base_addr + BLOCK_ETH_RING_IF_OFFSET;
        pdata->eth_diag_csr_addr = base_addr + BLOCK_ETH_DIAG_CSR_OFFSET;
-       if (pdata->phy_mode == PHY_INTERFACE_MODE_RGMII) {
+       if (pdata->phy_mode == PHY_INTERFACE_MODE_RGMII ||
+           pdata->phy_mode == PHY_INTERFACE_MODE_SGMII) {
                pdata->mcx_mac_addr = base_addr + BLOCK_ETH_MAC_OFFSET;
                pdata->mcx_mac_csr_addr = base_addr + BLOCK_ETH_MAC_CSR_OFFSET;
        } else {
@@ -881,6 +884,11 @@ static void xgene_enet_setup_ops(struct xgene_enet_pdata *pdata)
                pdata->port_ops = &xgene_gport_ops;
                pdata->rm = RM3;
                break;
+       case PHY_INTERFACE_MODE_SGMII:
+               pdata->mac_ops = &xgene_sgmac_ops;
+               pdata->port_ops = &xgene_sgport_ops;
+               pdata->rm = RM1;
+               break;
        default:
                pdata->mac_ops = &xgene_xgmac_ops;
                pdata->port_ops = &xgene_xgport_ops;
index 10b03a1f16e956538bd568a29a400c506c7ce916..874e5a01161fb9e9e1a05eb90afee3b148c07182 100644 (file)
@@ -39,6 +39,9 @@
 #define NUM_PKT_BUF    64
 #define NUM_BUFPOOL    32
 
+#define PHY_POLL_LINK_ON       (10 * HZ)
+#define PHY_POLL_LINK_OFF      (PHY_POLL_LINK_ON / 5)
+
 /* software context of a descriptor ring */
 struct xgene_enet_desc_ring {
        struct net_device *ndev;
@@ -118,6 +121,13 @@ struct xgene_enet_pdata {
        struct delayed_work link_work;
 };
 
+struct xgene_indirect_ctl {
+       void __iomem *addr;
+       void __iomem *ctl;
+       void __iomem *cmd;
+       void __iomem *cmd_done;
+};
+
 /* Set the specified value into a bit-field defined by its starting position
  * and length within a single u64.
  */
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c b/drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c
new file mode 100644 (file)
index 0000000..e6d24c2
--- /dev/null
@@ -0,0 +1,389 @@
+/* Applied Micro X-Gene SoC Ethernet Driver
+ *
+ * Copyright (c) 2014, Applied Micro Circuits Corporation
+ * Authors: Iyappan Subramanian <isubramanian@apm.com>
+ *         Keyur Chudgar <kchudgar@apm.com>
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "xgene_enet_main.h"
+#include "xgene_enet_hw.h"
+#include "xgene_enet_sgmac.h"
+
+static void xgene_enet_wr_csr(struct xgene_enet_pdata *p, u32 offset, u32 val)
+{
+       iowrite32(val, p->eth_csr_addr + offset);
+}
+
+static void xgene_enet_wr_ring_if(struct xgene_enet_pdata *p,
+                                 u32 offset, u32 val)
+{
+       iowrite32(val, p->eth_ring_if_addr + offset);
+}
+
+static void xgene_enet_wr_diag_csr(struct xgene_enet_pdata *p,
+                                  u32 offset, u32 val)
+{
+       iowrite32(val, p->eth_diag_csr_addr + offset);
+}
+
+static bool xgene_enet_wr_indirect(struct xgene_indirect_ctl *ctl,
+                                  u32 wr_addr, u32 wr_data)
+{
+       int i;
+
+       iowrite32(wr_addr, ctl->addr);
+       iowrite32(wr_data, ctl->ctl);
+       iowrite32(XGENE_ENET_WR_CMD, ctl->cmd);
+
+       /* wait for write command to complete */
+       for (i = 0; i < 10; i++) {
+               if (ioread32(ctl->cmd_done)) {
+                       iowrite32(0, ctl->cmd);
+                       return true;
+               }
+               udelay(1);
+       }
+
+       return false;
+}
+
+static void xgene_enet_wr_mac(struct xgene_enet_pdata *p,
+                             u32 wr_addr, u32 wr_data)
+{
+       struct xgene_indirect_ctl ctl = {
+               .addr = p->mcx_mac_addr + MAC_ADDR_REG_OFFSET,
+               .ctl = p->mcx_mac_addr + MAC_WRITE_REG_OFFSET,
+               .cmd = p->mcx_mac_addr + MAC_COMMAND_REG_OFFSET,
+               .cmd_done = p->mcx_mac_addr + MAC_COMMAND_DONE_REG_OFFSET
+       };
+
+       if (!xgene_enet_wr_indirect(&ctl, wr_addr, wr_data))
+               netdev_err(p->ndev, "mac write failed, addr: %04x\n", wr_addr);
+}
+
+static u32 xgene_enet_rd_csr(struct xgene_enet_pdata *p, u32 offset)
+{
+       return ioread32(p->eth_csr_addr + offset);
+}
+
+static u32 xgene_enet_rd_diag_csr(struct xgene_enet_pdata *p, u32 offset)
+{
+       return ioread32(p->eth_diag_csr_addr + offset);
+}
+
+static u32 xgene_enet_rd_indirect(struct xgene_indirect_ctl *ctl, u32 rd_addr)
+{
+       u32 rd_data;
+       int i;
+
+       iowrite32(rd_addr, ctl->addr);
+       iowrite32(XGENE_ENET_RD_CMD, ctl->cmd);
+
+       /* wait for read command to complete */
+       for (i = 0; i < 10; i++) {
+               if (ioread32(ctl->cmd_done)) {
+                       rd_data = ioread32(ctl->ctl);
+                       iowrite32(0, ctl->cmd);
+
+                       return rd_data;
+               }
+               udelay(1);
+       }
+
+       pr_err("%s: mac read failed, addr: %04x\n", __func__, rd_addr);
+
+       return 0;
+}
+
+static u32 xgene_enet_rd_mac(struct xgene_enet_pdata *p, u32 rd_addr)
+{
+       struct xgene_indirect_ctl ctl = {
+               .addr = p->mcx_mac_addr + MAC_ADDR_REG_OFFSET,
+               .ctl = p->mcx_mac_addr + MAC_READ_REG_OFFSET,
+               .cmd = p->mcx_mac_addr + MAC_COMMAND_REG_OFFSET,
+               .cmd_done = p->mcx_mac_addr + MAC_COMMAND_DONE_REG_OFFSET
+       };
+
+       return xgene_enet_rd_indirect(&ctl, rd_addr);
+}
+
+static int xgene_enet_ecc_init(struct xgene_enet_pdata *p)
+{
+       struct net_device *ndev = p->ndev;
+       u32 data;
+       int i;
+
+       xgene_enet_wr_diag_csr(p, ENET_CFG_MEM_RAM_SHUTDOWN_ADDR, 0);
+       for (i = 0; i < 10 && data != ~0U ; i++) {
+               usleep_range(100, 110);
+               data = xgene_enet_rd_diag_csr(p, ENET_BLOCK_MEM_RDY_ADDR);
+       }
+
+       if (data != ~0U) {
+               netdev_err(ndev, "Failed to release memory from shutdown\n");
+               return -ENODEV;
+       }
+
+       return 0;
+}
+
+static void xgene_enet_config_ring_if_assoc(struct xgene_enet_pdata *p)
+{
+       u32 val = 0xffffffff;
+
+       xgene_enet_wr_ring_if(p, ENET_CFGSSQMIWQASSOC_ADDR, val);
+       xgene_enet_wr_ring_if(p, ENET_CFGSSQMIFPQASSOC_ADDR, val);
+}
+
+static void xgene_mii_phy_write(struct xgene_enet_pdata *p, u8 phy_id,
+                               u32 reg, u16 data)
+{
+       u32 addr, wr_data, done;
+       int i;
+
+       addr = PHY_ADDR(phy_id) | REG_ADDR(reg);
+       xgene_enet_wr_mac(p, MII_MGMT_ADDRESS_ADDR, addr);
+
+       wr_data = PHY_CONTROL(data);
+       xgene_enet_wr_mac(p, MII_MGMT_CONTROL_ADDR, wr_data);
+
+       for (i = 0; i < 10; i++) {
+               done = xgene_enet_rd_mac(p, MII_MGMT_INDICATORS_ADDR);
+               if (!(done & BUSY_MASK))
+                       return;
+               usleep_range(10, 20);
+       }
+
+       netdev_err(p->ndev, "MII_MGMT write failed\n");
+}
+
+static u32 xgene_mii_phy_read(struct xgene_enet_pdata *p, u8 phy_id, u32 reg)
+{
+       u32 addr, data, done;
+       int i;
+
+       addr = PHY_ADDR(phy_id) | REG_ADDR(reg);
+       xgene_enet_wr_mac(p, MII_MGMT_ADDRESS_ADDR, addr);
+       xgene_enet_wr_mac(p, MII_MGMT_COMMAND_ADDR, READ_CYCLE_MASK);
+
+       for (i = 0; i < 10; i++) {
+               done = xgene_enet_rd_mac(p, MII_MGMT_INDICATORS_ADDR);
+               if (!(done & BUSY_MASK)) {
+                       data = xgene_enet_rd_mac(p, MII_MGMT_STATUS_ADDR);
+                       xgene_enet_wr_mac(p, MII_MGMT_COMMAND_ADDR, 0);
+
+                       return data;
+               }
+               usleep_range(10, 20);
+       }
+
+       netdev_err(p->ndev, "MII_MGMT read failed\n");
+
+       return 0;
+}
+
+static void xgene_sgmac_reset(struct xgene_enet_pdata *p)
+{
+       xgene_enet_wr_mac(p, MAC_CONFIG_1_ADDR, SOFT_RESET1);
+       xgene_enet_wr_mac(p, MAC_CONFIG_1_ADDR, 0);
+}
+
+static void xgene_sgmac_set_mac_addr(struct xgene_enet_pdata *p)
+{
+       u32 addr0, addr1;
+       u8 *dev_addr = p->ndev->dev_addr;
+
+       addr0 = (dev_addr[3] << 24) | (dev_addr[2] << 16) |
+               (dev_addr[1] << 8) | dev_addr[0];
+       xgene_enet_wr_mac(p, STATION_ADDR0_ADDR, addr0);
+
+       addr1 = xgene_enet_rd_mac(p, STATION_ADDR1_ADDR);
+       addr1 |= (dev_addr[5] << 24) | (dev_addr[4] << 16);
+       xgene_enet_wr_mac(p, STATION_ADDR1_ADDR, addr1);
+}
+
+static u32 xgene_enet_link_status(struct xgene_enet_pdata *p)
+{
+       u32 data;
+
+       data = xgene_mii_phy_read(p, INT_PHY_ADDR,
+                                 SGMII_BASE_PAGE_ABILITY_ADDR >> 2);
+
+       return data & LINK_UP;
+}
+
+static void xgene_sgmac_init(struct xgene_enet_pdata *p)
+{
+       u32 data, loop = 10;
+
+       xgene_sgmac_reset(p);
+
+       /* Enable auto-negotiation */
+       xgene_mii_phy_write(p, INT_PHY_ADDR, SGMII_CONTROL_ADDR >> 2, 0x1000);
+       xgene_mii_phy_write(p, INT_PHY_ADDR, SGMII_TBI_CONTROL_ADDR >> 2, 0);
+
+       while (loop--) {
+               data = xgene_mii_phy_read(p, INT_PHY_ADDR,
+                                         SGMII_STATUS_ADDR >> 2);
+               if ((data & AUTO_NEG_COMPLETE) && (data & LINK_STATUS))
+                       break;
+               usleep_range(10, 20);
+       }
+       if (!(data & AUTO_NEG_COMPLETE) || !(data & LINK_STATUS))
+               netdev_err(p->ndev, "Auto-negotiation failed\n");
+
+       data = xgene_enet_rd_mac(p, MAC_CONFIG_2_ADDR);
+       ENET_INTERFACE_MODE2_SET(&data, 2);
+       xgene_enet_wr_mac(p, MAC_CONFIG_2_ADDR, data | FULL_DUPLEX2);
+       xgene_enet_wr_mac(p, INTERFACE_CONTROL_ADDR, ENET_GHD_MODE);
+
+       data = xgene_enet_rd_csr(p, ENET_SPARE_CFG_REG_ADDR);
+       data |= MPA_IDLE_WITH_QMI_EMPTY;
+       xgene_enet_wr_csr(p, ENET_SPARE_CFG_REG_ADDR, data);
+
+       xgene_sgmac_set_mac_addr(p);
+
+       data = xgene_enet_rd_csr(p, DEBUG_REG_ADDR);
+       data |= CFG_BYPASS_UNISEC_TX | CFG_BYPASS_UNISEC_RX;
+       xgene_enet_wr_csr(p, DEBUG_REG_ADDR, data);
+
+       /* Adjust MDC clock frequency */
+       data = xgene_enet_rd_mac(p, MII_MGMT_CONFIG_ADDR);
+       MGMT_CLOCK_SEL_SET(&data, 7);
+       xgene_enet_wr_mac(p, MII_MGMT_CONFIG_ADDR, data);
+
+       /* Enable drop if bufpool not available */
+       data = xgene_enet_rd_csr(p, RSIF_CONFIG_REG_ADDR);
+       data |= CFG_RSIF_FPBUFF_TIMEOUT_EN;
+       xgene_enet_wr_csr(p, RSIF_CONFIG_REG_ADDR, data);
+
+       /* Rtype should be copied from FP */
+       xgene_enet_wr_csr(p, RSIF_RAM_DBG_REG0_ADDR, 0);
+
+       /* Bypass traffic gating */
+       xgene_enet_wr_csr(p, CFG_LINK_AGGR_RESUME_0_ADDR, TX_PORT0);
+       xgene_enet_wr_csr(p, CFG_BYPASS_ADDR, RESUME_TX);
+       xgene_enet_wr_csr(p, SG_RX_DV_GATE_REG_0_ADDR, RESUME_RX0);
+}
+
+static void xgene_sgmac_rxtx(struct xgene_enet_pdata *p, u32 bits, bool set)
+{
+       u32 data;
+
+       data = xgene_enet_rd_mac(p, MAC_CONFIG_1_ADDR);
+
+       if (set)
+               data |= bits;
+       else
+               data &= ~bits;
+
+       xgene_enet_wr_mac(p, MAC_CONFIG_1_ADDR, data);
+}
+
+static void xgene_sgmac_rx_enable(struct xgene_enet_pdata *p)
+{
+       xgene_sgmac_rxtx(p, RX_EN, true);
+}
+
+static void xgene_sgmac_tx_enable(struct xgene_enet_pdata *p)
+{
+       xgene_sgmac_rxtx(p, TX_EN, true);
+}
+
+static void xgene_sgmac_rx_disable(struct xgene_enet_pdata *p)
+{
+       xgene_sgmac_rxtx(p, RX_EN, false);
+}
+
+static void xgene_sgmac_tx_disable(struct xgene_enet_pdata *p)
+{
+       xgene_sgmac_rxtx(p, TX_EN, false);
+}
+
+static void xgene_enet_reset(struct xgene_enet_pdata *p)
+{
+       clk_prepare_enable(p->clk);
+       clk_disable_unprepare(p->clk);
+       clk_prepare_enable(p->clk);
+
+       xgene_enet_ecc_init(p);
+       xgene_enet_config_ring_if_assoc(p);
+}
+
+static void xgene_enet_cle_bypass(struct xgene_enet_pdata *p,
+                                 u32 dst_ring_num, u16 bufpool_id)
+{
+       u32 data, fpsel;
+
+       data = CFG_CLE_BYPASS_EN0;
+       xgene_enet_wr_csr(p, CLE_BYPASS_REG0_0_ADDR, data);
+
+       fpsel = xgene_enet_ring_bufnum(bufpool_id) - 0x20;
+       data = CFG_CLE_DSTQID0(dst_ring_num) | CFG_CLE_FPSEL0(fpsel);
+       xgene_enet_wr_csr(p, CLE_BYPASS_REG1_0_ADDR, data);
+}
+
+static void xgene_enet_shutdown(struct xgene_enet_pdata *p)
+{
+       clk_disable_unprepare(p->clk);
+}
+
+static void xgene_enet_link_state(struct work_struct *work)
+{
+       struct xgene_enet_pdata *p = container_of(to_delayed_work(work),
+                                    struct xgene_enet_pdata, link_work);
+       struct net_device *ndev = p->ndev;
+       u32 link, poll_interval;
+
+       link = xgene_enet_link_status(p);
+       if (link) {
+               if (!netif_carrier_ok(ndev)) {
+                       netif_carrier_on(ndev);
+                       xgene_sgmac_init(p);
+                       xgene_sgmac_rx_enable(p);
+                       xgene_sgmac_tx_enable(p);
+                       netdev_info(ndev, "Link is Up - 1Gbps\n");
+               }
+               poll_interval = PHY_POLL_LINK_ON;
+       } else {
+               if (netif_carrier_ok(ndev)) {
+                       xgene_sgmac_rx_disable(p);
+                       xgene_sgmac_tx_disable(p);
+                       netif_carrier_off(ndev);
+                       netdev_info(ndev, "Link is Down\n");
+               }
+               poll_interval = PHY_POLL_LINK_OFF;
+       }
+
+       schedule_delayed_work(&p->link_work, poll_interval);
+}
+
+struct xgene_mac_ops xgene_sgmac_ops = {
+       .init           = xgene_sgmac_init,
+       .reset          = xgene_sgmac_reset,
+       .rx_enable      = xgene_sgmac_rx_enable,
+       .tx_enable      = xgene_sgmac_tx_enable,
+       .rx_disable     = xgene_sgmac_rx_disable,
+       .tx_disable     = xgene_sgmac_tx_disable,
+       .set_mac_addr   = xgene_sgmac_set_mac_addr,
+       .link_state     = xgene_enet_link_state
+};
+
+struct xgene_port_ops xgene_sgport_ops = {
+       .reset          = xgene_enet_reset,
+       .cle_bypass     = xgene_enet_cle_bypass,
+       .shutdown       = xgene_enet_shutdown
+};
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.h b/drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.h
new file mode 100644 (file)
index 0000000..de43246
--- /dev/null
@@ -0,0 +1,41 @@
+/* Applied Micro X-Gene SoC Ethernet Driver
+ *
+ * Copyright (c) 2014, Applied Micro Circuits Corporation
+ * Authors: Iyappan Subramanian <isubramanian@apm.com>
+ *         Keyur Chudgar <kchudgar@apm.com>
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __XGENE_ENET_SGMAC_H__
+#define __XGENE_ENET_SGMAC_H__
+
+#define PHY_ADDR(src)          (((src)<<8) & GENMASK(12, 8))
+#define REG_ADDR(src)          ((src) & GENMASK(4, 0))
+#define PHY_CONTROL(src)       ((src) & GENMASK(15, 0))
+#define INT_PHY_ADDR                   0x1e
+#define SGMII_TBI_CONTROL_ADDR         0x44
+#define SGMII_CONTROL_ADDR             0x00
+#define SGMII_STATUS_ADDR              0x04
+#define SGMII_BASE_PAGE_ABILITY_ADDR   0x14
+#define AUTO_NEG_COMPLETE              BIT(5)
+#define LINK_STATUS                    BIT(2)
+#define LINK_UP                                BIT(15)
+#define MPA_IDLE_WITH_QMI_EMPTY                BIT(12)
+#define SG_RX_DV_GATE_REG_0_ADDR       0x0dfc
+
+extern struct xgene_mac_ops xgene_sgmac_ops;
+extern struct xgene_port_ops xgene_sgport_ops;
+
+#endif  /* __XGENE_ENET_SGMAC_H__ */
index dcb20879e82d96153395f37e0c50d3120d82af90..5a5296a6d1df0a65e806dc7c9b3f78f5f6b27608 100644 (file)
@@ -47,9 +47,6 @@
 #define XG_ENET_SPARE_CFG_REG_1_ADDR   0x0410
 #define XGENET_RX_DV_GATE_REG_0_ADDR   0x0804
 
-#define PHY_POLL_LINK_ON       (10 * HZ)
-#define PHY_POLL_LINK_OFF      (PHY_POLL_LINK_ON / 5)
-
 extern struct xgene_mac_ops xgene_xgmac_ops;
 extern struct xgene_port_ops xgene_xgport_ops;