Adds support for enabling sriov on CN23XX cards.
Signed-off-by: Derek Chickles
Signed-off-by: Satanand Burla
Signed-off-by: Felix Manlunas
Signed-off-by: Raghu Vatsavayi
---
.../ethernet/cavium/liquidio/cn23xx_pf_device.c| 257 +++--
drivers/net/ethernet/cavium/liquidio/lio_main.c| 147
.../net/ethernet/cavium/liquidio/octeon_config.h | 3 +
.../net/ethernet/cavium/liquidio/octeon_device.h | 5 +
4 files changed, 241 insertions(+), 171 deletions(-)
diff --git a/drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.c
b/drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.c
index a2953d5..deec869 100644
--- a/drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.c
+++ b/drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.c
@@ -19,7 +19,7 @@
* This file may also be available under a different license from Cavium.
* Contact Cavium, Inc. for more information
**/
-
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include
#include
#include
@@ -52,174 +52,174 @@ void cn23xx_dump_pf_initialized_regs(struct octeon_device
*oct)
struct octeon_cn23xx_pf *cn23xx = (struct octeon_cn23xx_pf *)oct->chip;
/*In cn23xx_soft_reset*/
- dev_dbg(>pci_dev->dev, "%s[%llx] : 0x%llx\n",
- "CN23XX_WIN_WR_MASK_REG", CVM_CAST64(CN23XX_WIN_WR_MASK_REG),
- CVM_CAST64(octeon_read_csr64(oct, CN23XX_WIN_WR_MASK_REG)));
- dev_dbg(>pci_dev->dev, "%s[%llx] : 0x%016llx\n",
- "CN23XX_SLI_SCRATCH1", CVM_CAST64(CN23XX_SLI_SCRATCH1),
- CVM_CAST64(octeon_read_csr64(oct, CN23XX_SLI_SCRATCH1)));
- dev_dbg(>pci_dev->dev, "%s[%llx] : 0x%016llx\n",
- "CN23XX_RST_SOFT_RST", CN23XX_RST_SOFT_RST,
- lio_pci_readq(oct, CN23XX_RST_SOFT_RST));
+ pr_devel("%s[%llx] : 0x%llx\n",
+"CN23XX_WIN_WR_MASK_REG", CVM_CAST64(CN23XX_WIN_WR_MASK_REG),
+CVM_CAST64(octeon_read_csr64(oct, CN23XX_WIN_WR_MASK_REG)));
+ pr_devel("%s[%llx] : 0x%016llx\n",
+"CN23XX_SLI_SCRATCH1", CVM_CAST64(CN23XX_SLI_SCRATCH1),
+CVM_CAST64(octeon_read_csr64(oct, CN23XX_SLI_SCRATCH1)));
+ pr_devel("%s[%llx] : 0x%016llx\n",
+"CN23XX_RST_SOFT_RST", CN23XX_RST_SOFT_RST,
+lio_pci_readq(oct, CN23XX_RST_SOFT_RST));
/*In cn23xx_set_dpi_regs*/
- dev_dbg(>pci_dev->dev, "%s[%llx] : 0x%016llx\n",
- "CN23XX_DPI_DMA_CONTROL", CN23XX_DPI_DMA_CONTROL,
- lio_pci_readq(oct, CN23XX_DPI_DMA_CONTROL));
+ pr_devel("%s[%llx] : 0x%016llx\n",
+"CN23XX_DPI_DMA_CONTROL", CN23XX_DPI_DMA_CONTROL,
+lio_pci_readq(oct, CN23XX_DPI_DMA_CONTROL));
for (i = 0; i < 6; i++) {
- dev_dbg(>pci_dev->dev, "%s(%d)[%llx] : 0x%016llx\n",
- "CN23XX_DPI_DMA_ENG_ENB", i,
- CN23XX_DPI_DMA_ENG_ENB(i),
- lio_pci_readq(oct, CN23XX_DPI_DMA_ENG_ENB(i)));
- dev_dbg(>pci_dev->dev, "%s(%d)[%llx] : 0x%016llx\n",
- "CN23XX_DPI_DMA_ENG_BUF", i,
- CN23XX_DPI_DMA_ENG_BUF(i),
- lio_pci_readq(oct, CN23XX_DPI_DMA_ENG_BUF(i)));
+ pr_devel("%s(%d)[%llx] : 0x%016llx\n",
+"CN23XX_DPI_DMA_ENG_ENB", i,
+CN23XX_DPI_DMA_ENG_ENB(i),
+lio_pci_readq(oct, CN23XX_DPI_DMA_ENG_ENB(i)));
+ pr_devel("%s(%d)[%llx] : 0x%016llx\n",
+"CN23XX_DPI_DMA_ENG_BUF", i,
+CN23XX_DPI_DMA_ENG_BUF(i),
+lio_pci_readq(oct, CN23XX_DPI_DMA_ENG_BUF(i)));
}
- dev_dbg(>pci_dev->dev, "%s[%llx] : 0x%016llx\n", "CN23XX_DPI_CTL",
- CN23XX_DPI_CTL, lio_pci_readq(oct, CN23XX_DPI_CTL));
+ pr_devel("%s[%llx] : 0x%016llx\n", "CN23XX_DPI_CTL",
+CN23XX_DPI_CTL, lio_pci_readq(oct, CN23XX_DPI_CTL));
/*In cn23xx_setup_pcie_mps and cn23xx_setup_pcie_mrrs */
pci_read_config_dword(oct->pci_dev, CN23XX_CONFIG_PCIE_DEVCTL, );
- dev_dbg(>pci_dev->dev, "%s[%llx] : 0x%016llx\n",
- "CN23XX_CONFIG_PCIE_DEVCTL",
- CVM_CAST64(CN23XX_CONFIG_PCIE_DEVCTL), CVM_CAST64(regval));
+ pr_devel("%s[%llx] : 0x%016llx\n",
+"CN23XX_CONFIG_PCIE_DEVCTL",
+CVM_CAST64(CN23XX_CONFIG_PCIE_DEVCTL), CVM_CAST64(regval));
- dev_dbg(>pci_dev->dev, "%s(%d)[%llx] : 0x%016llx\n",
- "CN23XX_DPI_SLI_PRTX_CFG", oct->pcie_port,
- CN23XX_DPI_SLI_PRTX_CFG(oct->pcie_port),
- lio_pci_readq(oct, CN23XX_DPI_SLI_PRTX_CFG(oct->pcie_port)));
+