IB/qib: Add device specific info prints

Implement get_card_name and get_pci_dev helper functions for rdmavt
for qib.

Reviewed-by: Mike Marciniszyn <mike.marciniszyn@intel.com>
Reviewed-by: Ira Weiny <ira.weiny@intel.com>
Signed-off-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>

diff --git a/drivers/infiniband/hw/qib/qib.h b/drivers/infiniband/hw/qib/qib.h
index 0e68e1f4f6dc9a715aa284ade22ab0f810a7cc68..e610eafa27738c1e0c3c661db3564446e9c3dcd2 100644 (file)
--- a/drivers/infiniband/hw/qib/qib.h
+++ b/drivers/infiniband/hw/qib/qib.h
@@ -1455,6 +1455,8 @@ u64 qib_sps_ints(void);
 dma_addr_t qib_map_page(struct pci_dev *, struct page *, unsigned long,
                          size_t, int);
 const char *qib_get_unit_name(int unit);
+const char *qib_get_card_name(struct rvt_dev_info *rdi);
+struct pci_dev *qib_get_pci_dev(struct rvt_dev_info *rdi);
 
 /*
  * Flush write combining store buffers (if present) and perform a write

diff --git a/drivers/infiniband/hw/qib/qib_driver.c b/drivers/infiniband/hw/qib/qib_driver.c
index 57b19ead7776454d15877c299a5a67d3ba1e192c..ae5a7250f29453de4cabca0b4a33a124ea3f3fc6 100644 (file)
--- a/drivers/infiniband/hw/qib/qib_driver.c
+++ b/drivers/infiniband/hw/qib/qib_driver.c
@@ -90,6 +90,22 @@ const char *qib_get_unit_name(int unit)
        return iname;
 }
 
+const char *qib_get_card_name(struct rvt_dev_info *rdi)
+{
+       struct qib_ibdev *ibdev = container_of(rdi, struct qib_ibdev, rdi);
+       struct qib_devdata *dd = container_of(ibdev,
+                                             struct qib_devdata, verbs_dev);
+       return qib_get_unit_name(dd->unit);
+}
+
+struct pci_dev *qib_get_pci_dev(struct rvt_dev_info *rdi)
+{
+       struct qib_ibdev *ibdev = container_of(rdi, struct qib_ibdev, rdi);
+       struct qib_devdata *dd = container_of(ibdev,
+                                             struct qib_devdata, verbs_dev);
+       return dd->pcidev;
+}
+
 /*
  * Return count of units with at least one port ACTIVE.
  */

diff --git a/drivers/infiniband/hw/qib/qib_verbs.c b/drivers/infiniband/hw/qib/qib_verbs.c
index e55fc5f6c403e09808e85fb45bd424197ec015ec..6d96d7a0d42338eabc93178bb15a315517813089 100644 (file)
--- a/drivers/infiniband/hw/qib/qib_verbs.c
+++ b/drivers/infiniband/hw/qib/qib_verbs.c
@@ -2244,6 +2244,8 @@ int qib_register_ib_device(struct qib_devdata *dd)
         * Fill in rvt info object.
         */
        dd->verbs_dev.rdi.driver_f.port_callback = qib_create_port_files;
+       dd->verbs_dev.rdi.driver_f.get_card_name = qib_get_card_name;
+       dd->verbs_dev.rdi.driver_f.get_pci_dev = qib_get_pci_dev;
        dd->verbs_dev.rdi.dparms.props.max_pd = ib_qib_max_pds;
        dd->verbs_dev.rdi.flags = (RVT_FLAG_MR_INIT_DRIVER |
                                   RVT_FLAG_QP_INIT_DRIVER |