net/ionic: observe endiannness in ioread/iowrite

[dpdk.git] / drivers / net / ionic / ionic_ethdev.c

diff --git a/drivers/net/ionic/ionic_ethdev.c b/drivers/net/ionic/ionic_ethdev.c
index 838e93e..9a319df 100644 (file)
--- a/drivers/net/ionic/ionic_ethdev.c
+++ b/drivers/net/ionic/ionic_ethdev.c
@@ -5,9 +5,9 @@
 #include <rte_pci.h>
 #include <rte_bus_pci.h>
 #include <rte_ethdev.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_malloc.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_pci.h>
 
 #include "ionic_logs.h"
 #include "ionic.h"
@@ -276,7 +276,10 @@ ionic_dev_link_update(struct rte_eth_dev *eth_dev,
 
        /* Initialize */
        memset(&link, 0, sizeof(link));
-       link.link_autoneg = ETH_LINK_AUTONEG;
+
+       if (adapter->idev.port_info->config.an_enable) {
+               link.link_autoneg = ETH_LINK_AUTONEG;
+       }
 
        if (!adapter->link_up ||
            !(lif->state & IONIC_LIF_F_UP)) {
@@ -371,13 +374,15 @@ ionic_dev_info_get(struct rte_eth_dev *eth_dev,
        struct ionic_lif *lif = IONIC_ETH_DEV_TO_LIF(eth_dev);
        struct ionic_adapter *adapter = lif->adapter;
        struct ionic_identity *ident = &adapter->ident;
+       union ionic_lif_config *cfg = &ident->lif.eth.config;
 
        IONIC_PRINT_CALL();
 
        dev_info->max_rx_queues = (uint16_t)
-               ident->lif.eth.config.queue_count[IONIC_QTYPE_RXQ];
+               rte_le_to_cpu_32(cfg->queue_count[IONIC_QTYPE_RXQ]);
        dev_info->max_tx_queues = (uint16_t)
-               ident->lif.eth.config.queue_count[IONIC_QTYPE_TXQ];
+               rte_le_to_cpu_32(cfg->queue_count[IONIC_QTYPE_TXQ]);
+
        /* Also add ETHER_CRC_LEN if the adapter is able to keep CRC */
        dev_info->min_rx_bufsize = IONIC_MIN_MTU + RTE_ETHER_HDR_LEN;
        dev_info->max_rx_pktlen = IONIC_MAX_MTU + RTE_ETHER_HDR_LEN;
@@ -386,7 +391,7 @@ ionic_dev_info_get(struct rte_eth_dev *eth_dev,
        dev_info->max_mtu = IONIC_MAX_MTU;
 
        dev_info->hash_key_size = IONIC_RSS_HASH_KEY_SIZE;
-       dev_info->reta_size = ident->lif.eth.rss_ind_tbl_sz;
+       dev_info->reta_size = rte_le_to_cpu_16(ident->lif.eth.rss_ind_tbl_sz);
        dev_info->flow_type_rss_offloads = IONIC_ETH_RSS_OFFLOAD_ALL;
 
        dev_info->speed_capa =
@@ -531,6 +536,7 @@ ionic_dev_rss_reta_update(struct rte_eth_dev *eth_dev,
        struct ionic_adapter *adapter = lif->adapter;
        struct ionic_identity *ident = &adapter->ident;
        uint32_t i, j, index, num;
+       uint16_t tbl_sz = rte_le_to_cpu_16(ident->lif.eth.rss_ind_tbl_sz);
 
        IONIC_PRINT_CALL();
 
@@ -540,15 +546,15 @@ ionic_dev_rss_reta_update(struct rte_eth_dev *eth_dev,
                return -EINVAL;
        }
 
-       if (reta_size != ident->lif.eth.rss_ind_tbl_sz) {
+       if (reta_size != tbl_sz) {
                IONIC_PRINT(ERR, "The size of hash lookup table configured "
                        "(%d) does not match the number hardware can support "
                        "(%d)",
-                       reta_size, ident->lif.eth.rss_ind_tbl_sz);
+                       reta_size, tbl_sz);
                return -EINVAL;
        }
 
-       num = lif->adapter->ident.lif.eth.rss_ind_tbl_sz / RTE_RETA_GROUP_SIZE;
+       num = tbl_sz / RTE_RETA_GROUP_SIZE;
 
        for (i = 0; i < num; i++) {
                for (j = 0; j < RTE_RETA_GROUP_SIZE; j++) {
@@ -571,14 +577,15 @@ ionic_dev_rss_reta_query(struct rte_eth_dev *eth_dev,
        struct ionic_adapter *adapter = lif->adapter;
        struct ionic_identity *ident = &adapter->ident;
        int i, num;
+       uint16_t tbl_sz = rte_le_to_cpu_16(ident->lif.eth.rss_ind_tbl_sz);
 
        IONIC_PRINT_CALL();
 
-       if (reta_size != ident->lif.eth.rss_ind_tbl_sz) {
+       if (reta_size != tbl_sz) {
                IONIC_PRINT(ERR, "The size of hash lookup table configured "
                        "(%d) does not match the number hardware can support "
                        "(%d)",
-                       reta_size, ident->lif.eth.rss_ind_tbl_sz);
+                       reta_size, tbl_sz);
                return -EINVAL;
        }
 
@@ -869,7 +876,8 @@ ionic_dev_start(struct rte_eth_dev *eth_dev)
        struct ionic_lif *lif = IONIC_ETH_DEV_TO_LIF(eth_dev);
        struct ionic_adapter *adapter = lif->adapter;
        struct ionic_dev *idev = &adapter->idev;
-       uint32_t allowed_speeds;
+       uint32_t speed = 0, allowed_speeds;
+       uint8_t an_enable;
        int err;
 
        IONIC_PRINT_CALL();
@@ -896,11 +904,23 @@ ionic_dev_start(struct rte_eth_dev *eth_dev)
                return err;
        }
 
-       if (eth_dev->data->dev_conf.link_speeds & ETH_LINK_SPEED_FIXED) {
-               uint32_t speed = ionic_parse_link_speeds(dev_conf->link_speeds);
+       /* Configure link */
+       an_enable = (dev_conf->link_speeds & ETH_LINK_SPEED_FIXED) == 0;
 
-               if (speed)
-                       ionic_dev_cmd_port_speed(idev, speed);
+       ionic_dev_cmd_port_autoneg(idev, an_enable);
+       err = ionic_dev_cmd_wait_check(idev, IONIC_DEVCMD_TIMEOUT);
+       if (err)
+               IONIC_PRINT(WARNING, "Failed to %s autonegotiation",
+                       an_enable ? "enable" : "disable");
+
+       if (!an_enable)
+               speed = ionic_parse_link_speeds(dev_conf->link_speeds);
+       if (speed) {
+               ionic_dev_cmd_port_speed(idev, speed);
+               err = ionic_dev_cmd_wait_check(idev, IONIC_DEVCMD_TIMEOUT);
+               if (err)
+                       IONIC_PRINT(WARNING, "Failed to set link speed %u",
+                               speed);
        }
 
        ionic_dev_link_update(eth_dev, 0);
@@ -1212,11 +1232,12 @@ eth_ionic_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
                goto err_free_adapter;
        }
 
-       adapter->max_mac_addrs = adapter->ident.lif.eth.max_ucast_filters;
+       adapter->max_mac_addrs =
+               rte_le_to_cpu_32(adapter->ident.lif.eth.max_ucast_filters);
 
-       if (adapter->ident.dev.nlifs != 1) {
+       if (rte_le_to_cpu_32(adapter->ident.dev.nlifs) != 1) {
                IONIC_PRINT(ERR, "Unexpected request for %d LIFs",
-                       adapter->ident.dev.nlifs);
+                       rte_le_to_cpu_32(adapter->ident.dev.nlifs));
                goto err_free_adapter;
        }