RDMA/efa: Store network attributes in device attributes

There's no reason to separate the network attributes from all other
device attributes. Embed the fields inside the device attributes and
query them all in one function.

Link: https://lore.kernel.org/r/20191121141509.59297-2-galpress@amazon.com
Reviewed-by: Daniel Kranzdorf <dkkranzd@amazon.com>
Reviewed-by: Yossi Leybovich <sleybo@amazon.com>
Signed-off-by: Gal Pressman <galpress@amazon.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>

diff --git a/drivers/infiniband/hw/efa/efa.h b/drivers/infiniband/hw/efa/efa.h
index 2bda07078b974328e7beac900112ebdc7d5737e1..aa7396a1588a16509966348c417f8d7c1864f1bc 100644 (file)
--- a/drivers/infiniband/hw/efa/efa.h
+++ b/drivers/infiniband/hw/efa/efa.h
@@ -60,8 +60,6 @@ struct efa_dev {
        u64 mem_bar_len;
        u64 db_bar_addr;
        u64 db_bar_len;
-       u8 addr[EFA_GID_SIZE];
-       u32 mtu;
 
        int admin_msix_vector_idx;
        struct efa_irq admin_irq;

diff --git a/drivers/infiniband/hw/efa/efa_com_cmd.c b/drivers/infiniband/hw/efa/efa_com_cmd.c
index c079f1332082d32cdb6759150b684305f6c2b873..4713c2756ad33b9b7e1996abd1c2643b92fa6b89 100644 (file)
--- a/drivers/infiniband/hw/efa/efa_com_cmd.c
+++ b/drivers/infiniband/hw/efa/efa_com_cmd.c
@@ -423,28 +423,6 @@ static int efa_com_get_feature(struct efa_com_dev *edev,
        return efa_com_get_feature_ex(edev, get_resp, feature_id, 0, 0);
 }
 
-int efa_com_get_network_attr(struct efa_com_dev *edev,
-                            struct efa_com_get_network_attr_result *result)
-{
-       struct efa_admin_get_feature_resp resp;
-       int err;
-
-       err = efa_com_get_feature(edev, &resp,
-                                 EFA_ADMIN_NETWORK_ATTR);
-       if (err) {
-               ibdev_err_ratelimited(edev->efa_dev,
-                                     "Failed to get network attributes %d\n",
-                                     err);
-               return err;
-       }
-
-       memcpy(result->addr, resp.u.network_attr.addr,
-              sizeof(resp.u.network_attr.addr));
-       result->mtu = resp.u.network_attr.mtu;
-
-       return 0;
-}
-
 int efa_com_get_device_attr(struct efa_com_dev *edev,
                            struct efa_com_get_device_attr_result *result)
 {
@@ -501,6 +479,18 @@ int efa_com_get_device_attr(struct efa_com_dev *edev,
        result->max_llq_size = resp.u.queue_attr.max_llq_size;
        result->sub_cqs_per_cq = resp.u.queue_attr.sub_cqs_per_cq;
 
+       err = efa_com_get_feature(edev, &resp, EFA_ADMIN_NETWORK_ATTR);
+       if (err) {
+               ibdev_err_ratelimited(edev->efa_dev,
+                                     "Failed to get network attributes %d\n",
+                                     err);
+               return err;
+       }
+
+       memcpy(result->addr, resp.u.network_attr.addr,
+              sizeof(resp.u.network_attr.addr));
+       result->mtu = resp.u.network_attr.mtu;
+
        return 0;
 }
 

diff --git a/drivers/infiniband/hw/efa/efa_com_cmd.h b/drivers/infiniband/hw/efa/efa_com_cmd.h
index 7f6c13052f497699b5086ce6c8c6eebd4aa3ba07..6134d13ecc6fca82f48d7db94f836f6b18e6b071 100644 (file)
--- a/drivers/infiniband/hw/efa/efa_com_cmd.h
+++ b/drivers/infiniband/hw/efa/efa_com_cmd.h
@@ -100,14 +100,11 @@ struct efa_com_destroy_ah_params {
        u16 pdn;
 };
 
-struct efa_com_get_network_attr_result {
-       u8 addr[EFA_GID_SIZE];
-       u32 mtu;
-};
-
 struct efa_com_get_device_attr_result {
+       u8 addr[EFA_GID_SIZE];
        u64 page_size_cap;
        u64 max_mr_pages;
+       u32 mtu;
        u32 fw_version;
        u32 admin_api_version;
        u32 device_version;
@@ -271,8 +268,6 @@ int efa_com_create_ah(struct efa_com_dev *edev,
                      struct efa_com_create_ah_result *result);
 int efa_com_destroy_ah(struct efa_com_dev *edev,
                       struct efa_com_destroy_ah_params *params);
-int efa_com_get_network_attr(struct efa_com_dev *edev,
-                            struct efa_com_get_network_attr_result *result);
 int efa_com_get_device_attr(struct efa_com_dev *edev,
                            struct efa_com_get_device_attr_result *result);
 int efa_com_get_hw_hints(struct efa_com_dev *edev,

diff --git a/drivers/infiniband/hw/efa/efa_main.c b/drivers/infiniband/hw/efa/efa_main.c
index 0e3050d01b759480c1612c41f3717263db51fb1e..faf3ff1bca2ac0a989f5e9ef30ab07ed5466082f 100644 (file)
--- a/drivers/infiniband/hw/efa/efa_main.c
+++ b/drivers/infiniband/hw/efa/efa_main.c
@@ -30,15 +30,6 @@ MODULE_DEVICE_TABLE(pci, efa_pci_tbl);
        (BIT(EFA_ADMIN_FATAL_ERROR) | BIT(EFA_ADMIN_WARNING) | \
         BIT(EFA_ADMIN_NOTIFICATION) | BIT(EFA_ADMIN_KEEP_ALIVE))
 
-static void efa_update_network_attr(struct efa_dev *dev,
-                                   struct efa_com_get_network_attr_result *network_attr)
-{
-       memcpy(dev->addr, network_attr->addr, sizeof(network_attr->addr));
-       dev->mtu = network_attr->mtu;
-
-       dev_dbg(&dev->pdev->dev, "Full address %pI6\n", dev->addr);
-}
-
 /* This handler will called for unknown event group or unimplemented handlers */
 static void unimplemented_aenq_handler(void *data,
                                       struct efa_admin_aenq_entry *aenq_e)
@@ -234,7 +225,6 @@ static const struct ib_device_ops efa_dev_ops = {
 
 static int efa_ib_device_add(struct efa_dev *dev)
 {
-       struct efa_com_get_network_attr_result network_attr;
        struct efa_com_get_hw_hints_result hw_hints;
        struct pci_dev *pdev = dev->pdev;
        int err;
@@ -250,12 +240,6 @@ static int efa_ib_device_add(struct efa_dev *dev)
        if (err)
                return err;
 
-       err = efa_com_get_network_attr(&dev->edev, &network_attr);
-       if (err)
-               goto err_release_doorbell_bar;
-
-       efa_update_network_attr(dev, &network_attr);
-
        err = efa_com_get_hw_hints(&dev->edev, &hw_hints);
        if (err)
                goto err_release_doorbell_bar;

diff --git a/drivers/infiniband/hw/efa/efa_verbs.c b/drivers/infiniband/hw/efa/efa_verbs.c
index 657baa63faec22ebaefc615a5c0cf428a26485b6..e1f1c1495da1a394a71e644d0e1bfaa968682dbc 100644 (file)
--- a/drivers/infiniband/hw/efa/efa_verbs.c
+++ b/drivers/infiniband/hw/efa/efa_verbs.c
@@ -232,9 +232,9 @@ int efa_query_port(struct ib_device *ibdev, u8 port,
        props->pkey_tbl_len = 1;
        props->active_speed = IB_SPEED_EDR;
        props->active_width = IB_WIDTH_4X;
-       props->max_mtu = ib_mtu_int_to_enum(dev->mtu);
-       props->active_mtu = ib_mtu_int_to_enum(dev->mtu);
-       props->max_msg_sz = dev->mtu;
+       props->max_mtu = ib_mtu_int_to_enum(dev->dev_attr.mtu);
+       props->active_mtu = ib_mtu_int_to_enum(dev->dev_attr.mtu);
+       props->max_msg_sz = dev->dev_attr.mtu;
        props->max_vl_num = 1;
 
        return 0;
@@ -295,7 +295,7 @@ int efa_query_gid(struct ib_device *ibdev, u8 port, int index,
 {
        struct efa_dev *dev = to_edev(ibdev);
 
-       memcpy(gid->raw, dev->addr, sizeof(dev->addr));
+       memcpy(gid->raw, dev->dev_attr.addr, sizeof(dev->dev_attr.addr));
 
        return 0;
 }