mem: remove API to get physical address in dom0

[dpdk.git] / drivers / net / sfc / sfc.c

diff --git a/drivers/net/sfc/sfc.c b/drivers/net/sfc/sfc.c
index 88228ae..390823a 100644 (file)
--- a/drivers/net/sfc/sfc.c
+++ b/drivers/net/sfc/sfc.c
@@ -61,7 +61,7 @@ sfc_dma_alloc(const struct sfc_adapter *sa, const char *name, uint16_t id,
                return ENOMEM;
        }
 
-       esmp->esm_addr = rte_mem_phy2mch(mz->memseg_id, mz->phys_addr);
+       esmp->esm_addr = mz->phys_addr;
        if (esmp->esm_addr == RTE_BAD_PHYS_ADDR) {
                (void)rte_memzone_free(mz);
                return EFAULT;
@@ -398,7 +398,8 @@ sfc_configure(struct sfc_adapter *sa)
 
        SFC_ASSERT(sfc_adapter_is_locked(sa));
 
-       SFC_ASSERT(sa->state == SFC_ADAPTER_INITIALIZED);
+       SFC_ASSERT(sa->state == SFC_ADAPTER_INITIALIZED ||
+                  sa->state == SFC_ADAPTER_CONFIGURED);
        sa->state = SFC_ADAPTER_CONFIGURING;
 
        rc = sfc_check_conf(sa);
@@ -417,15 +418,15 @@ sfc_configure(struct sfc_adapter *sa)
        if (rc != 0)
                goto fail_rx_configure;
 
-       rc = sfc_tx_init(sa);
+       rc = sfc_tx_configure(sa);
        if (rc != 0)
-               goto fail_tx_init;
+               goto fail_tx_configure;
 
        sa->state = SFC_ADAPTER_CONFIGURED;
        sfc_log_init(sa, "done");
        return 0;
 
-fail_tx_init:
+fail_tx_configure:
        sfc_rx_close(sa);
 
 fail_rx_configure:
@@ -451,7 +452,7 @@ sfc_close(struct sfc_adapter *sa)
        SFC_ASSERT(sa->state == SFC_ADAPTER_CONFIGURED);
        sa->state = SFC_ADAPTER_CLOSING;
 
-       sfc_tx_fini(sa);
+       sfc_tx_close(sa);
        sfc_rx_close(sa);
        sfc_port_close(sa);
        sfc_intr_close(sa);
@@ -464,7 +465,7 @@ static int
 sfc_mem_bar_init(struct sfc_adapter *sa)
 {
        struct rte_eth_dev *eth_dev = sa->eth_dev;
-       struct rte_pci_device *pci_dev = SFC_DEV_TO_PCI(eth_dev);
+       struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);
        efsys_bar_t *ebp = &sa->mem_bar;
        unsigned int i;
        struct rte_mem_resource *res;
@@ -500,7 +501,7 @@ sfc_mem_bar_fini(struct sfc_adapter *sa)
  * and also known to give a uniform distribution
  * (a good distribution of traffic between different CPUs)
  */
-static const uint8_t default_rss_key[SFC_RSS_KEY_SIZE] = {
+static const uint8_t default_rss_key[EFX_RSS_KEY_SIZE] = {
        0x6d, 0x5a, 0x6d, 0x5a, 0x6d, 0x5a, 0x6d, 0x5a,
        0x6d, 0x5a, 0x6d, 0x5a, 0x6d, 0x5a, 0x6d, 0x5a,
        0x6d, 0x5a, 0x6d, 0x5a, 0x6d, 0x5a, 0x6d, 0x5a,
@@ -509,10 +510,10 @@ static const uint8_t default_rss_key[SFC_RSS_KEY_SIZE] = {
 };
 #endif
 
+#if EFSYS_OPT_RX_SCALE
 static int
 sfc_set_rss_defaults(struct sfc_adapter *sa)
 {
-#if EFSYS_OPT_RX_SCALE
        int rc;
 
        rc = efx_intr_init(sa->nic, sa->intr.type, NULL);
@@ -527,11 +528,11 @@ sfc_set_rss_defaults(struct sfc_adapter *sa)
        if (rc != 0)
                goto fail_rx_init;
 
-       rc = efx_rx_scale_support_get(sa->nic, &sa->rss_support);
+       rc = efx_rx_scale_default_support_get(sa->nic, &sa->rss_support);
        if (rc != 0)
                goto fail_scale_support_get;
 
-       rc = efx_rx_hash_support_get(sa->nic, &sa->hash_support);
+       rc = efx_rx_hash_default_support_get(sa->nic, &sa->hash_support);
        if (rc != 0)
                goto fail_hash_support_get;
 
@@ -555,10 +556,14 @@ fail_ev_init:
 
 fail_intr_init:
        return rc;
+}
 #else
+static int
+sfc_set_rss_defaults(__rte_unused struct sfc_adapter *sa)
+{
        return 0;
-#endif
 }
+#endif
 
 int
 sfc_attach(struct sfc_adapter *sa)
@@ -665,7 +670,7 @@ sfc_detach(struct sfc_adapter *sa)
 int
 sfc_probe(struct sfc_adapter *sa)
 {
-       struct rte_pci_device *pci_dev = SFC_DEV_TO_PCI(sa->eth_dev);
+       struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(sa->eth_dev);
        efx_nic_t *enp;
        int rc;