]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
net: stmmac: add EHL SGMII 1Gbps PCI info and PCI ID
authorVoon Weifeng <weifeng.voon@intel.com>
Tue, 27 Aug 2019 01:38:08 +0000 (09:38 +0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 28 Aug 2019 04:59:37 +0000 (21:59 -0700)
Added EHL SGMII 1Gbps PCI ID. Different MII and speed will have
different PCI ID.

Signed-off-by: Voon Weifeng <weifeng.voon@intel.com>
Signed-off-by: Ong Boon Leong <boon.leong.ong@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c

index d5d08e11c35378121b638e0aade35b2a38cee2fe..f6930e02f578a9f1ad23736ab2d496aa28c7f4a6 100644 (file)
@@ -108,6 +108,111 @@ static const struct stmmac_pci_info stmmac_pci_info = {
        .setup = stmmac_default_data,
 };
 
+static int intel_mgbe_common_data(struct pci_dev *pdev,
+                                 struct plat_stmmacenet_data *plat)
+{
+       int i;
+
+       plat->clk_csr = 5;
+       plat->has_gmac = 0;
+       plat->has_gmac4 = 1;
+       plat->force_sf_dma_mode = 0;
+       plat->tso_en = 1;
+
+       plat->rx_sched_algorithm = MTL_RX_ALGORITHM_SP;
+
+       for (i = 0; i < plat->rx_queues_to_use; i++) {
+               plat->rx_queues_cfg[i].mode_to_use = MTL_QUEUE_DCB;
+               plat->rx_queues_cfg[i].chan = i;
+
+               /* Disable Priority config by default */
+               plat->rx_queues_cfg[i].use_prio = false;
+
+               /* Disable RX queues routing by default */
+               plat->rx_queues_cfg[i].pkt_route = 0x0;
+       }
+
+       for (i = 0; i < plat->tx_queues_to_use; i++) {
+               plat->tx_queues_cfg[i].mode_to_use = MTL_QUEUE_DCB;
+
+               /* Disable Priority config by default */
+               plat->tx_queues_cfg[i].use_prio = false;
+       }
+
+       /* FIFO size is 4096 bytes for 1 tx/rx queue */
+       plat->tx_fifo_size = plat->tx_queues_to_use * 4096;
+       plat->rx_fifo_size = plat->rx_queues_to_use * 4096;
+
+       plat->tx_sched_algorithm = MTL_TX_ALGORITHM_WRR;
+       plat->tx_queues_cfg[0].weight = 0x09;
+       plat->tx_queues_cfg[1].weight = 0x0A;
+       plat->tx_queues_cfg[2].weight = 0x0B;
+       plat->tx_queues_cfg[3].weight = 0x0C;
+       plat->tx_queues_cfg[4].weight = 0x0D;
+       plat->tx_queues_cfg[5].weight = 0x0E;
+       plat->tx_queues_cfg[6].weight = 0x0F;
+       plat->tx_queues_cfg[7].weight = 0x10;
+
+       plat->mdio_bus_data->phy_mask = 0;
+
+       plat->dma_cfg->pbl = 32;
+       plat->dma_cfg->pblx8 = true;
+       plat->dma_cfg->fixed_burst = 0;
+       plat->dma_cfg->mixed_burst = 0;
+       plat->dma_cfg->aal = 0;
+
+       plat->axi = devm_kzalloc(&pdev->dev, sizeof(*plat->axi),
+                                GFP_KERNEL);
+       if (!plat->axi)
+               return -ENOMEM;
+
+       plat->axi->axi_lpi_en = 0;
+       plat->axi->axi_xit_frm = 0;
+       plat->axi->axi_wr_osr_lmt = 1;
+       plat->axi->axi_rd_osr_lmt = 1;
+       plat->axi->axi_blen[0] = 4;
+       plat->axi->axi_blen[1] = 8;
+       plat->axi->axi_blen[2] = 16;
+
+       /* Set default value for multicast hash bins */
+       plat->multicast_filter_bins = HASH_TABLE_SIZE;
+
+       /* Set default value for unicast filter entries */
+       plat->unicast_filter_entries = 1;
+
+       /* Set the maxmtu to a default of JUMBO_LEN */
+       plat->maxmtu = JUMBO_LEN;
+
+       return 0;
+}
+
+static int ehl_common_data(struct pci_dev *pdev,
+                          struct plat_stmmacenet_data *plat)
+{
+       int ret;
+
+       plat->rx_queues_to_use = 8;
+       plat->tx_queues_to_use = 8;
+       ret = intel_mgbe_common_data(pdev, plat);
+       if (ret)
+               return ret;
+
+       return 0;
+}
+
+static int ehl_sgmii_data(struct pci_dev *pdev,
+                         struct plat_stmmacenet_data *plat)
+{
+       plat->bus_id = 1;
+       plat->phy_addr = 0;
+       plat->interface = PHY_INTERFACE_MODE_SGMII;
+       return ehl_common_data(pdev, plat);
+}
+
+static struct stmmac_pci_info ehl_sgmii1g_pci_info = {
+       .setup = ehl_sgmii_data,
+};
+
 static const struct stmmac_pci_func_data galileo_stmmac_func_data[] = {
        {
                .func = 6,
@@ -349,6 +454,7 @@ static SIMPLE_DEV_PM_OPS(stmmac_pm_ops, stmmac_pci_suspend, stmmac_pci_resume);
 
 #define STMMAC_QUARK_ID  0x0937
 #define STMMAC_DEVICE_ID 0x1108
+#define STMMAC_EHL_SGMII1G_ID  0x4b31
 
 #define STMMAC_DEVICE(vendor_id, dev_id, info) {       \
        PCI_VDEVICE(vendor_id, dev_id),                 \
@@ -359,6 +465,7 @@ static const struct pci_device_id stmmac_id_table[] = {
        STMMAC_DEVICE(STMMAC, STMMAC_DEVICE_ID, stmmac_pci_info),
        STMMAC_DEVICE(STMICRO, PCI_DEVICE_ID_STMICRO_MAC, stmmac_pci_info),
        STMMAC_DEVICE(INTEL, STMMAC_QUARK_ID, quark_pci_info),
+       STMMAC_DEVICE(INTEL, STMMAC_EHL_SGMII1G_ID, ehl_sgmii1g_pci_info),
        {}
 };