net: txgbe: Setup Rx and Tx ring

Improve the configuration of Rx and Tx ring, set Rx flags and implement
ndo_set_rx_mode ops.

Signed-off-by: Jiawen Wu <jiawenwu@trustnetic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/wangxun/libwx/wx_type.h b/drivers/net/ethernet/wangxun/libwx/wx_type.h
index 6d7e36239e224619be07195a07acbdee68b13c1b..479bc4fd2bd4931f79d1f1758c3f1474abbe1ed2 100644 (file)
--- a/drivers/net/ethernet/wangxun/libwx/wx_type.h
+++ b/drivers/net/ethernet/wangxun/libwx/wx_type.h
@@ -200,6 +200,7 @@
 #define WX_MAC_TX_CFG                0x11000
 #define WX_MAC_TX_CFG_TE             BIT(0)
 #define WX_MAC_TX_CFG_SPEED_MASK     GENMASK(30, 29)
+#define WX_MAC_TX_CFG_SPEED_10G      FIELD_PREP(WX_MAC_TX_CFG_SPEED_MASK, 0)
 #define WX_MAC_TX_CFG_SPEED_1G       FIELD_PREP(WX_MAC_TX_CFG_SPEED_MASK, 3)
 #define WX_MAC_RX_CFG                0x11004
 #define WX_MAC_RX_CFG_RE             BIT(0)

diff --git a/drivers/net/ethernet/wangxun/txgbe/txgbe_main.c b/drivers/net/ethernet/wangxun/txgbe/txgbe_main.c
index 48cca2fb54c7d164029b2ddae957672cc025fa5e..3b50acb0969929e6bdbe15b47c62691ab297d41a 100644 (file)
--- a/drivers/net/ethernet/wangxun/txgbe/txgbe_main.c
+++ b/drivers/net/ethernet/wangxun/txgbe/txgbe_main.c
@@ -218,6 +218,8 @@ static int txgbe_request_irq(struct wx *wx)
 
 static void txgbe_up_complete(struct wx *wx)
 {
+       u32 reg;
+
        wx_control_hw(wx, true);
        wx_configure_vectors(wx);
 
@@ -225,6 +227,15 @@ static void txgbe_up_complete(struct wx *wx)
        rd32(wx, WX_PX_IC);
        rd32(wx, WX_PX_MISC_IC);
        txgbe_irq_enable(wx, true);
+
+       /* Configure MAC Rx and Tx when link is up */
+       reg = rd32(wx, WX_MAC_RX_CFG);
+       wr32(wx, WX_MAC_RX_CFG, reg);
+       wr32(wx, WX_MAC_PKT_FLT, WX_MAC_PKT_FLT_PR);
+       reg = rd32(wx, WX_MAC_WDG_TIMEOUT);
+       wr32(wx, WX_MAC_WDG_TIMEOUT, reg);
+       reg = rd32(wx, WX_MAC_TX_CFG);
+       wr32(wx, WX_MAC_TX_CFG, (reg & ~WX_MAC_TX_CFG_SPEED_MASK) | WX_MAC_TX_CFG_SPEED_10G);
 }
 
 static void txgbe_reset(struct wx *wx)
@@ -246,11 +257,17 @@ static void txgbe_reset(struct wx *wx)
 static void txgbe_disable_device(struct wx *wx)
 {
        struct net_device *netdev = wx->netdev;
+       u32 i;
 
        wx_disable_pcie_master(wx);
        /* disable receives */
        wx_disable_rx(wx);
 
+       /* disable all enabled rx queues */
+       for (i = 0; i < wx->num_rx_queues; i++)
+               /* this call also flushes the previous write */
+               wx_disable_rx_queue(wx, wx->rx_ring[i]);
+
        netif_carrier_off(netdev);
        netif_tx_disable(netdev);
 
@@ -268,6 +285,13 @@ static void txgbe_disable_device(struct wx *wx)
                wr32m(wx, WX_MAC_TX_CFG, WX_MAC_TX_CFG_TE, 0);
        }
 
+       /* disable transmits in the hardware now that interrupts are off */
+       for (i = 0; i < wx->num_tx_queues; i++) {
+               u8 reg_idx = wx->tx_ring[i]->reg_idx;
+
+               wr32(wx, WX_PX_TR_CFG(reg_idx), WX_PX_TR_CFG_SWFLSH);
+       }
+
        /* Disable the Tx DMA engine */
        wr32m(wx, WX_TDM_CTL, WX_TDM_CTL_TE, 0);
 }
@@ -291,6 +315,8 @@ static int txgbe_sw_init(struct wx *wx)
        wx->mac.max_tx_queues = TXGBE_SP_MAX_TX_QUEUES;
        wx->mac.max_rx_queues = TXGBE_SP_MAX_RX_QUEUES;
        wx->mac.mcft_size = TXGBE_SP_MC_TBL_SIZE;
+       wx->mac.rx_pb_size = TXGBE_SP_RX_PB_SIZE;
+       wx->mac.tx_pb_size = TXGBE_SP_TDB_PB_SZ;
 
        /* PCI config space info */
        err = wx_sw_init(wx);
@@ -345,7 +371,7 @@ static int txgbe_open(struct net_device *netdev)
        struct wx *wx = netdev_priv(netdev);
        int err;
 
-       err = wx_setup_isb_resources(wx);
+       err = wx_setup_resources(wx);
        if (err)
                goto err_reset;
 
@@ -379,7 +405,7 @@ static void txgbe_close_suspend(struct wx *wx)
        txgbe_disable_device(wx);
 
        wx_free_irq(wx);
-       wx_free_isb_resources(wx);
+       wx_free_resources(wx);
 }
 
 /**
@@ -399,7 +425,7 @@ static int txgbe_close(struct net_device *netdev)
 
        txgbe_down(wx);
        wx_free_irq(wx);
-       wx_free_isb_resources(wx);
+       wx_free_resources(wx);
        wx_control_hw(wx, false);
 
        return 0;
@@ -445,6 +471,7 @@ static const struct net_device_ops txgbe_netdev_ops = {
        .ndo_open               = txgbe_open,
        .ndo_stop               = txgbe_close,
        .ndo_start_xmit         = txgbe_xmit_frame,
+       .ndo_set_rx_mode        = wx_set_rx_mode,
        .ndo_validate_addr      = eth_validate_addr,
        .ndo_set_mac_address    = wx_set_mac,
 };
@@ -549,6 +576,16 @@ static int txgbe_probe(struct pci_dev *pdev,
        }
 
        netdev->features |= NETIF_F_HIGHDMA;
+       netdev->features = NETIF_F_SG;
+
+       /* copy netdev features into list of user selectable features */
+       netdev->hw_features |= netdev->features | NETIF_F_RXALL;
+
+       netdev->priv_flags |= IFF_UNICAST_FLT;
+       netdev->priv_flags |= IFF_SUPP_NOFCS;
+
+       netdev->min_mtu = ETH_MIN_MTU;
+       netdev->max_mtu = TXGBE_MAX_JUMBO_FRAME_SIZE - (ETH_HLEN + ETH_FCS_LEN);
 
        /* make sure the EEPROM is good */
        err = txgbe_validate_eeprom_checksum(wx, NULL);

diff --git a/drivers/net/ethernet/wangxun/txgbe/txgbe_type.h b/drivers/net/ethernet/wangxun/txgbe/txgbe_type.h
index ec28cf60c91d9570dd1ef5aee1d03b522d901afe..563ea51deca6b43dc7e708b313289db6733ce7bb 100644 (file)
--- a/drivers/net/ethernet/wangxun/txgbe/txgbe_type.h
+++ b/drivers/net/ethernet/wangxun/txgbe/txgbe_type.h
@@ -77,6 +77,9 @@
 #define TXGBE_SP_MAX_RX_QUEUES  128
 #define TXGBE_SP_RAR_ENTRIES    128
 #define TXGBE_SP_MC_TBL_SIZE    128
+#define TXGBE_SP_RX_PB_SIZE     512
+#define TXGBE_SP_TDB_PB_SZ      (160 * 1024) /* 160KB Packet Buffer */
+#define TXGBE_MAX_JUMBO_FRAME_SIZE      9432 /* max payload 9414 */
 
 /* TX/RX descriptor defines */
 #define TXGBE_DEFAULT_TXD               512