IB/hfi1: Destage hfi1 driver and fix a few bugs
Subsystems (4)
cover IB/hfi1: Destage hfi1 driver and fix a few bugs
We believe the TODO list has been satisfied for the hfi1 driver. The main item was removing the code duplication between hfi1 and qib. That has been handled by the introduction of rdmavt in previously posted patch series.
There are also a few more bug fixes for hfi1 and one for rdmavt included in this series.
This series builds on our currently outstanding patch sets and applies on top of the "Misc bug fixes" series. It can also be seen in the my public git tree at:
https://github.com/ddalessa/kernel/tree/for-4.6.
---
Dennis Dalessandro (1):
IB/hfi1: Move hfi1 driver out of staging
Easwar Hariharan (1):
staging/rdma/hfi1: Fix reporting of LED status in Get(LedInfo) and Get(PortInfo)
Jianxin Xiong (1):
staging/rdma/hfi1: Fix header size calculation for RC/UC QPs with GRH enabled
Jubin John (2):
IB/rdmavt: Check lkey_table_size value before use staging/rdma/hfi1: Fix memory leaks
Kaike Wan (2):
staging/rdma/hfi1: Avoid using upstream component if it is not accessible staging/rdma/hfi1: Check interrupt registers mapping
MAINTAINERS | 13 +++---
drivers/infiniband/Kconfig | 2 +
drivers/infiniband/hw/Makefile | 1
drivers/infiniband/hw/hfi1/Kconfig | 0
drivers/infiniband/hw/hfi1/Makefile | 0
drivers/infiniband/hw/hfi1/affinity.c | 0
drivers/infiniband/hw/hfi1/affinity.h | 0
drivers/infiniband/hw/hfi1/aspm.h | 19 ++++++++-
drivers/infiniband/hw/hfi1/chip.c | 56 +++++++++++++++++++++++++++
drivers/infiniband/hw/hfi1/chip.h | 0
drivers/infiniband/hw/hfi1/chip_registers.h | 0
drivers/infiniband/hw/hfi1/common.h | 0
drivers/infiniband/hw/hfi1/debugfs.c | 0
drivers/infiniband/hw/hfi1/debugfs.h | 0
drivers/infiniband/hw/hfi1/device.c | 0
drivers/infiniband/hw/hfi1/device.h | 0
drivers/infiniband/hw/hfi1/diag.c | 0
drivers/infiniband/hw/hfi1/dma.c | 0
drivers/infiniband/hw/hfi1/driver.c | 13 +++++-
drivers/infiniband/hw/hfi1/efivar.c | 0
drivers/infiniband/hw/hfi1/efivar.h | 0
drivers/infiniband/hw/hfi1/eprom.c | 0
drivers/infiniband/hw/hfi1/eprom.h | 0
drivers/infiniband/hw/hfi1/file_ops.c | 0
drivers/infiniband/hw/hfi1/firmware.c | 0
drivers/infiniband/hw/hfi1/hfi.h | 0
drivers/infiniband/hw/hfi1/init.c | 2 +
drivers/infiniband/hw/hfi1/intr.c | 0
drivers/infiniband/hw/hfi1/iowait.h | 0
drivers/infiniband/hw/hfi1/mad.c | 24 +++++++++---
drivers/infiniband/hw/hfi1/mad.h | 0
drivers/infiniband/hw/hfi1/opa_compat.h | 0
drivers/infiniband/hw/hfi1/pcie.c | 22 +++++++++--
drivers/infiniband/hw/hfi1/pio.c | 2 -
drivers/infiniband/hw/hfi1/pio.h | 0
drivers/infiniband/hw/hfi1/pio_copy.c | 0
drivers/infiniband/hw/hfi1/platform.c | 0
drivers/infiniband/hw/hfi1/platform.h | 0
drivers/infiniband/hw/hfi1/qp.c | 0
drivers/infiniband/hw/hfi1/qp.h | 0
drivers/infiniband/hw/hfi1/qsfp.c | 0
drivers/infiniband/hw/hfi1/qsfp.h | 0
drivers/infiniband/hw/hfi1/rc.c | 8 ++--
drivers/infiniband/hw/hfi1/ruc.c | 0
drivers/infiniband/hw/hfi1/sdma.c | 2 -
drivers/infiniband/hw/hfi1/sdma.h | 0
drivers/infiniband/hw/hfi1/sdma_txreq.h | 0
drivers/infiniband/hw/hfi1/sysfs.c | 0
drivers/infiniband/hw/hfi1/trace.c | 0
drivers/infiniband/hw/hfi1/trace.h | 0
drivers/infiniband/hw/hfi1/twsi.c | 0
drivers/infiniband/hw/hfi1/twsi.h | 0
drivers/infiniband/hw/hfi1/uc.c | 4 +-
drivers/infiniband/hw/hfi1/ud.c | 0
drivers/infiniband/hw/hfi1/user_exp_rcv.c | 0
drivers/infiniband/hw/hfi1/user_exp_rcv.h | 0
drivers/infiniband/hw/hfi1/user_pages.c | 0
drivers/infiniband/hw/hfi1/user_sdma.c | 0
drivers/infiniband/hw/hfi1/user_sdma.h | 0
drivers/infiniband/hw/hfi1/verbs.c | 0
drivers/infiniband/hw/hfi1/verbs.h | 0
drivers/infiniband/hw/hfi1/verbs_txreq.c | 0
drivers/infiniband/hw/hfi1/verbs_txreq.h | 0
drivers/infiniband/sw/rdmavt/mr.c | 3 -
drivers/staging/rdma/Kconfig | 2 -
drivers/staging/rdma/Makefile | 1
drivers/staging/rdma/hfi1/TODO | 6 ---
67 files changed, 143 insertions(+), 37 deletions(-)
rename drivers/{staging/rdma/hfi1/Kconfig => infiniband/hw/hfi1/Kconfig} (100%)
rename drivers/{staging/rdma/hfi1/Makefile => infiniband/hw/hfi1/Makefile} (100%)
rename drivers/{staging/rdma/hfi1/affinity.c => infiniband/hw/hfi1/affinity.c} (100%)
rename drivers/{staging/rdma/hfi1/affinity.h => infiniband/hw/hfi1/affinity.h} (100%)
rename drivers/{staging/rdma/hfi1/aspm.h => infiniband/hw/hfi1/aspm.h} (95%)
rename drivers/{staging/rdma/hfi1/chip.c => infiniband/hw/hfi1/chip.c} (99%)
rename drivers/{staging/rdma/hfi1/chip.h => infiniband/hw/hfi1/chip.h} (100%)
rename drivers/{staging/rdma/hfi1/chip_registers.h => infiniband/hw/hfi1/chip_registers.h} (100%)
rename drivers/{staging/rdma/hfi1/common.h => infiniband/hw/hfi1/common.h} (100%)
rename drivers/{staging/rdma/hfi1/debugfs.c => infiniband/hw/hfi1/debugfs.c} (100%)
rename drivers/{staging/rdma/hfi1/debugfs.h => infiniband/hw/hfi1/debugfs.h} (100%)
rename drivers/{staging/rdma/hfi1/device.c => infiniband/hw/hfi1/device.c} (100%)
rename drivers/{staging/rdma/hfi1/device.h => infiniband/hw/hfi1/device.h} (100%)
rename drivers/{staging/rdma/hfi1/diag.c => infiniband/hw/hfi1/diag.c} (100%)
rename drivers/{staging/rdma/hfi1/dma.c => infiniband/hw/hfi1/dma.c} (100%)
rename drivers/{staging/rdma/hfi1/driver.c => infiniband/hw/hfi1/driver.c} (98%)
rename drivers/{staging/rdma/hfi1/efivar.c => infiniband/hw/hfi1/efivar.c} (100%)
rename drivers/{staging/rdma/hfi1/efivar.h => infiniband/hw/hfi1/efivar.h} (100%)
rename drivers/{staging/rdma/hfi1/eprom.c => infiniband/hw/hfi1/eprom.c} (100%)
rename drivers/{staging/rdma/hfi1/eprom.h => infiniband/hw/hfi1/eprom.h} (100%)
rename drivers/{staging/rdma/hfi1/file_ops.c => infiniband/hw/hfi1/file_ops.c} (100%)
rename drivers/{staging/rdma/hfi1/firmware.c => infiniband/hw/hfi1/firmware.c} (100%)
rename drivers/{staging/rdma/hfi1/hfi.h => infiniband/hw/hfi1/hfi.h} (100%)
rename drivers/{staging/rdma/hfi1/init.c => infiniband/hw/hfi1/init.c} (99%)
rename drivers/{staging/rdma/hfi1/intr.c => infiniband/hw/hfi1/intr.c} (100%)
rename drivers/{staging/rdma/hfi1/iowait.h => infiniband/hw/hfi1/iowait.h} (100%)
rename drivers/{staging/rdma/hfi1/mad.c => infiniband/hw/hfi1/mad.c} (99%)
rename drivers/{staging/rdma/hfi1/mad.h => infiniband/hw/hfi1/mad.h} (100%)
rename drivers/{staging/rdma/hfi1/opa_compat.h => infiniband/hw/hfi1/opa_compat.h} (100%)
rename drivers/{staging/rdma/hfi1/pcie.c => infiniband/hw/hfi1/pcie.c} (98%)
rename drivers/{staging/rdma/hfi1/pio.c => infiniband/hw/hfi1/pio.c} (99%)
rename drivers/{staging/rdma/hfi1/pio.h => infiniband/hw/hfi1/pio.h} (100%)
rename drivers/{staging/rdma/hfi1/pio_copy.c => infiniband/hw/hfi1/pio_copy.c} (100%)
rename drivers/{staging/rdma/hfi1/platform.c => infiniband/hw/hfi1/platform.c} (100%)
rename drivers/{staging/rdma/hfi1/platform.h => infiniband/hw/hfi1/platform.h} (100%)
rename drivers/{staging/rdma/hfi1/qp.c => infiniband/hw/hfi1/qp.c} (100%)
rename drivers/{staging/rdma/hfi1/qp.h => infiniband/hw/hfi1/qp.h} (100%)
rename drivers/{staging/rdma/hfi1/qsfp.c => infiniband/hw/hfi1/qsfp.c} (100%)
rename drivers/{staging/rdma/hfi1/qsfp.h => infiniband/hw/hfi1/qsfp.h} (100%)
rename drivers/{staging/rdma/hfi1/rc.c => infiniband/hw/hfi1/rc.c} (99%)
rename drivers/{staging/rdma/hfi1/ruc.c => infiniband/hw/hfi1/ruc.c} (100%)
rename drivers/{staging/rdma/hfi1/sdma.c => infiniband/hw/hfi1/sdma.c} (99%)
rename drivers/{staging/rdma/hfi1/sdma.h => infiniband/hw/hfi1/sdma.h} (100%)
rename drivers/{staging/rdma/hfi1/sdma_txreq.h => infiniband/hw/hfi1/sdma_txreq.h} (100%)
rename drivers/{staging/rdma/hfi1/sysfs.c => infiniband/hw/hfi1/sysfs.c} (100%)
rename drivers/{staging/rdma/hfi1/trace.c => infiniband/hw/hfi1/trace.c} (100%)
rename drivers/{staging/rdma/hfi1/trace.h => infiniband/hw/hfi1/trace.h} (100%)
rename drivers/{staging/rdma/hfi1/twsi.c => infiniband/hw/hfi1/twsi.c} (100%)
rename drivers/{staging/rdma/hfi1/twsi.h => infiniband/hw/hfi1/twsi.h} (100%)
rename drivers/{staging/rdma/hfi1/uc.c => infiniband/hw/hfi1/uc.c} (100%)
rename drivers/{staging/rdma/hfi1/ud.c => infiniband/hw/hfi1/ud.c} (100%)
rename drivers/{staging/rdma/hfi1/user_exp_rcv.c => infiniband/hw/hfi1/user_exp_rcv.c} (100%)
rename drivers/{staging/rdma/hfi1/user_exp_rcv.h => infiniband/hw/hfi1/user_exp_rcv.h} (100%)
rename drivers/{staging/rdma/hfi1/user_pages.c => infiniband/hw/hfi1/user_pages.c} (100%)
rename drivers/{staging/rdma/hfi1/user_sdma.c => infiniband/hw/hfi1/user_sdma.c} (100%)
rename drivers/{staging/rdma/hfi1/user_sdma.h => infiniband/hw/hfi1/user_sdma.h} (100%)
rename drivers/{staging/rdma/hfi1/verbs.c => infiniband/hw/hfi1/verbs.c} (100%)
rename drivers/{staging/rdma/hfi1/verbs.h => infiniband/hw/hfi1/verbs.h} (100%)
rename drivers/{staging/rdma/hfi1/verbs_txreq.c => infiniband/hw/hfi1/verbs_txreq.c} (100%)
rename drivers/{staging/rdma/hfi1/verbs_txreq.h => infiniband/hw/hfi1/verbs_txreq.h} (100%)
delete mode 100644 drivers/staging/rdma/hfi1/TODOSignature · 5 lines
-Denny -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
A message that is not in the archive (sent off-list or not yet received): 20160226213022.16535.8149.stgit-9QXIwq+3FY+1XWohqUldA0EOCMrvLtNR@public.gmane.org
PATCH 1/7 IB/rdmavt: Check lkey_table_size value before use
From: Jubin John <[email protected]>
The lkey_table_size driver specific parameter value is used before its value is sanity checked and restricted to RVT_MAX_LKEY_TABLE_BITS.
This causes a vmalloc allocation failure for large values. Fix this by moving the value check before the first usage of the value.
Reviewed-by Dennis Dalessandro <[email protected]>
Reviewed-by Mike Marciniszyn <[email protected]>
Signed-off-by Jubin John <[email protected]>
--- drivers/infiniband/sw/rdmavt/mr.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-)
drivers/infiniband/sw/rdmavt/mr.c +1 -2
@@ -76,8 +76,6 @@ int rvt_driver_mr_init(struct rvt_dev_info *rdi)spin_lock_init (&rdi->lkey_table.lock); - rdi->lkey_table.max =1 << lkey_table_size; -/* ensure generation is at least 4 bits */ if (lkey_table_size >RVT_MAX_LKEY_TABLE_BITS ) { rvt_pr_warn(rdi, "lkey bits %u too large, reduced to %u\n",
@@ -85,6 +83,7 @@ int rvt_driver_mr_init(struct rvt_dev_info *rdi) rdi->dparms.lkey_table_size =RVT_MAX_LKEY_TABLE_BITS ; lkey_table_size = rdi->dparms.lkey_table_size; } + rdi->lkey_table.max =1 << lkey_table_size; lk_tab_size = rdi->lkey_table.max *sizeof (*rdi->lkey_table.table); rdi->lkey_table.table = (struct rvt_mregion __rcu **)vmalloc_node (lk_tab_size, rdi->dparms.node);
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH 2/7 staging/rdma/hfi1: Fix header size calculation for RC/UC QPs with GRH enabled
In reply to a message not in the archiveFrom: Jianxin Xiong <[email protected]>
There is a header size counter in both the QP struture and the txreq structure. The counter in the txreq structure is not updated properly for RC and UC queue pairs with GRH enabled, and thus causing SDMA send to fail. This patch fixes the RC and UC path.
Reviewed-by Dennis Dalessandro <[email protected]>
Reviewed-by Dean Luick <[email protected]>
Reviewed-by Mike Marciniszyn <[email protected]>
Signed-off-by Jianxin Xiong <[email protected]>
Signed-off-by Jubin John <[email protected]>
--- drivers/staging/rdma/hfi1/rc.c | 8 ++++---- drivers/staging/rdma/hfi1/uc.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-)
drivers/staging/rdma/hfi1/rc.c +4 -4
@@ -358,11 +358,11 @@ normal: } qp->s_rdma_ack_cnt++; qp->s_hdrwords = hwords; -/* pbc */ - ps->s_txreq->hdr_dwords = hwords +2 ; ps->s_txreq->sde = priv->s_sde; qp->s_cur_size = len;hfi1_make_ruc_header (qp, ohdr, bth0, bth2, middle, ps); +/* pbc */ + ps->s_txreq->hdr_dwords = qp->s_hdrwords +2 ;return 1 ; bail:
@@ -763,8 +763,6 @@ int hfi1_make_rc_req(struct rvt_qp *qp, struct hfi1_pkt_state *ps) } qp->s_len -= len; qp->s_hdrwords = hwords; -/* pbc */ - ps->s_txreq->hdr_dwords = hwords +2 ; ps->s_txreq->sde = priv->s_sde; qp->s_cur_sge = ss; qp->s_cur_size = len;
@@ -775,6 +773,8 @@ int hfi1_make_rc_req(struct rvt_qp *qp, struct hfi1_pkt_state *ps) bth2, middle, ps); +/* pbc */ + ps->s_txreq->hdr_dwords = qp->s_hdrwords +2 ;return 1 ; done_free_tx:
drivers/staging/rdma/hfi1/uc.c +2 -2
@@ -239,13 +239,13 @@ int hfi1_make_uc_req(struct rvt_qp *qp, struct hfi1_pkt_state *ps) } qp->s_len -= len; qp->s_hdrwords = hwords; -/* pbc */ - ps->s_txreq->hdr_dwords = qp->s_hdrwords +2 ; ps->s_txreq->sde = priv->s_sde; qp->s_cur_sge = &qp->s_sge; qp->s_cur_size = len;hfi1_make_ruc_header (qp, ohdr, bth0 | (qp->s_state <<24 ),mask_psn (qp->s_psn++), middle, ps); +/* pbc */ + ps->s_txreq->hdr_dwords = qp->s_hdrwords +2 ;return 1 ; done_free_tx:
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH 3/7 staging/rdma/hfi1: Avoid using upstream component if it is not accessible
In reply to a message not in the archiveFrom: Kaike Wan <[email protected]>
When the hfi1 device is assigned to a VM (eg KVM), the hfi1 driver has no access to the upstream component and therefore cannot use it to perform some operations, such as secondary bus reset. As a result, the hfi1 driver cannot perform the pcie Gen3 transition. Instead, those operation should be done in the host environment, preferrably done during the Option ROM initialization. Similarly, the hfi1 driver cannot support ASPM and tune the pcie capability under this circumstance.
Reviewed-by Mike Marciniszyn <[email protected]>
Reviewed-by Dennis Dalessandro <[email protected]>
Signed-off-by Kaike Wan <[email protected]>
--- drivers/staging/rdma/hfi1/aspm.h | 19 +++++++++++++++++-- drivers/staging/rdma/hfi1/pcie.c | 22 +++++++++++++++++++--- 2 files changed, 36 insertions(+), 5 deletions(-)
drivers/staging/rdma/hfi1/aspm.h +17 -2
@@ -72,6 +72,13 @@ static inline bool aspm_hw_l1_supported(struct hfi1_devdata *dd)struct pci_dev *parent = dd->pcidev->bus->self;u32 up, dn; +/* +* If the driver does not have access to the upstream component, +* it cannot support ASPM L1 at all. +*/ +if (!parent) +return false; +pcie_capability_read_dword (dd->pcidev,PCI_EXP_LNKCAP , &dn); dn =ASPM_L1_SUPPORTED (dn);
@@ -98,6 +105,13 @@ static inline void aspm_hw_enable_l1(struct hfi1_devdata *dd) {struct pci_dev *parent = dd->pcidev->bus->self; +/* +* If the driver does not have access to the upstream component, +* it cannot support ASPM L1 at all. +*/ +if (!parent) +return ; +/* Enable ASPM L1 first in upstream component and then downstream */ pcie_capability_clear_and_set_word(parent, PCI_EXP_LNKCTL, PCI_EXP_LNKCTL_ASPMC,
@@ -114,8 +128,9 @@ static inline void aspm_hw_disable_l1(struct hfi1_devdata *dd)/* Disable ASPM L1 first in downstream component and then upstream */ pcie_capability_clear_and_set_word (dd->pcidev,PCI_EXP_LNKCTL ,PCI_EXP_LNKCTL_ASPMC ,0x0 ); -pcie_capability_clear_and_set_word (parent,PCI_EXP_LNKCTL , -PCI_EXP_LNKCTL_ASPMC ,0x0 ); +if (parent) +pcie_capability_clear_and_set_word (parent,PCI_EXP_LNKCTL , +PCI_EXP_LNKCTL_ASPMC ,0x0 ); }static inline void aspm_enable (struct hfi1_devdata *dd)
drivers/staging/rdma/hfi1/pcie.c +19 -3
@@ -362,6 +362,7 @@ static void update_lbus_info(struct hfi1_devdata *dd)int pcie_speeds (struct hfi1_devdata *dd) {u32 linkcap; +struct pci_dev *parent = dd->pcidev->bus->self;if (!pci_is_pcie (dd->pcidev)) {dd_dev_err (dd,"Can't find PCI Express capability!\n" );
@@ -382,7 +383,7 @@ int pcie_speeds(struct hfi1_devdata *dd)/* * bus->max_bus_speed is set from the bridge's linkcap Max Link Speed */ -if (dd->pcidev->bus->max_bus_speed !=PCIE_SPEED_8_0GT ) { +if (parent && dd->pcidev->bus->max_bus_speed !=PCIE_SPEED_8_0GT ) {dd_dev_info (dd,"Parent PCIe bridge does not support Gen3\n" ); dd->link_gen3_capable =0 ; }
@@ -471,6 +472,12 @@ static void tune_pcie_caps(struct hfi1_devdata *dd) }/* Find out supported and configured values for parent (root) */ parent = dd->pcidev->bus->self; +/* +* The driver cannot perform the tuning if it does not have +* access to the upstream component. +*/ +if (!parent) +return ;if (!pci_is_root_bus (parent->bus)) {dd_dev_info (dd,"Parent not root\n" );return ;
@@ -939,7 +946,7 @@ static void write_xmt_margin(struct hfi1_devdata *dd, const char *fname)*/ int do_pcie_gen3_transition (struct hfi1_devdata *dd) { -struct pci_dev *parent; +struct pci_dev *parent = dd->pcidev->bus->self;u64 fw_ctrl;u64 reg, therm;u32 reg32, fs, lf;
@@ -982,6 +989,16 @@ int do_pcie_gen3_transition(struct hfi1_devdata *dd) }/* +* The driver cannot do the transition if it has no access to the +* upstream component +*/ +if (!parent) { +dd_dev_info (dd,"%s: No upstream, Can't do gen3 transition\n" , + __func__); +return 0 ; + } + +/* * Do the Gen3 transition. Steps are those of the PCIe Gen3 * recipe. */
@@ -1157,7 +1174,6 @@ retry:* that it is Gen3 capable earlier. */ dd_dev_info (dd,"%s: setting parent target link speed\n" , __func__); - parent = dd->pcidev->bus->self;pcie_capability_read_word (parent,PCI_EXP_LNKCTL2 , &lnkctl2);dd_dev_info (dd,"%s: ..old link control2: 0x%x\n" , __func__, (u32 )lnkctl2);
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH 4/7 staging/rdma/hfi1: Check interrupt registers mapping
In reply to a message not in the archiveFrom: Kaike Wan <[email protected]>
This patch tests the interrupt registers when the driver has no access to its upstream component. In this case, it is highly likely that it is running in a virtual machine (eg, Qemu-kvm guest). If the interrupt registers are not mapped properly by the virtual machine monitor, an error message will be printed and the probing will be terminated. This will help the user identify the issue. On the other hand, if the driver is running in a host or has access to its upstream component in some other VM, it will do nothing.
Reviewed-by Mike Marciniszyn <[email protected]>
Reviewed-by Dennis Dalessandro <[email protected]>
Signed-off-by Kaike Wan <[email protected]>
--- drivers/staging/rdma/hfi1/chip.c | 56 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 56 insertions(+), 0 deletions(-)
drivers/staging/rdma/hfi1/chip.c +56 -0
@@ -13943,6 +13943,50 @@ static int obtain_boardname(struct hfi1_devdata *dd)return 0 ; } +/* +* Check the interrupt registers to make sure that they are mapped correctly. +* It is intended to help user identify any mismapping by VMM when the driver +* is running in a VM. This function should only be called before interrupt +* is set up properly. +* +* Return 0 on success, -EINVAL on failure. +*/ +static int check_int_registers (struct hfi1_devdata *dd) +{ +u64 reg; +u64 all_bits = ~(u64 )0 ; +u64 mask; + +/* Clear CceIntMask[0] to avoid raising any interrupts */ + mask =read_csr (dd,CCE_INT_MASK ); +write_csr (dd,CCE_INT_MASK ,0ull ); + reg =read_csr (dd,CCE_INT_MASK ); +if (reg) + goto err_exit; + +/* Clear all interrupt status bits */ +write_csr (dd,CCE_INT_CLEAR , all_bits); + reg =read_csr (dd,CCE_INT_STATUS ); +if (reg) + goto err_exit; + +/* Set all interrupt status bits */ +write_csr (dd,CCE_INT_FORCE , all_bits); + reg =read_csr (dd,CCE_INT_STATUS ); +if (reg != all_bits) + goto err_exit; + +/* Restore the interrupt mask */ +write_csr (dd,CCE_INT_CLEAR , all_bits); +write_csr (dd,CCE_INT_MASK , mask); + +return 0 ; +err_exit: +write_csr (dd,CCE_INT_MASK , mask); +dd_dev_err (dd,"Interrupt registers not properly mapped by VMM\n" ); +return -EINVAL ; +} +/** * Allocate and initialize the device structure for the hfi. * @dev: the pci_dev for hfi1_ib device
@@ -13967,6 +14011,7 @@ struct hfi1_devdata *hfi1_init_dd(struct pci_dev *pdev,"RTL FPGA emulation" , "Functional simulator" }; +struct pci_dev *parent = pdev->bus->self; dd =hfi1_alloc_devdata (pdev,NUM_IB_PORTS *sizeof (struct hfi1_pportdata ));
@@ -14046,6 +14091,17 @@ struct hfi1_devdata *hfi1_init_dd(struct pci_dev *pdev, &CCE_REVISION_CHIP_REV_MINOR_MASK ;/* +* Check interrupt registers mapping if the driver has no access to +* the upstream component. In this case, it is likely that the driver +* is running in a VM. +*/ +if (!parent) { + ret =check_int_registers (dd); +if (ret) + goto bail_cleanup; + } + +/* * obtain the hardware ID - NOT related to unit, which is a * software enumeration */
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH 5/7 staging/rdma/hfi1: Fix reporting of LED status in Get(LedInfo) and Get(PortInfo)
In reply to a message not in the archiveFrom: Easwar Hariharan <[email protected]>
The LedInfo SMA attribute is redefined to control the LED beaconing state machine instead of the LED directly. In accordance, we now return the state of LED beaconing, represented by whether the beaconing timer is active, instead of the state of the LED itself for SMA queries Get(LedInfo) and Get(PortInfo). While we are at it, we fix the beaconing timer control code so that the state of the timer is accurately updated.
Reviewed-by Ira Weiny <[email protected]>
Reviewed-by Mike Marciniszyn <[email protected]>
Signed-off-by Easwar Hariharan <[email protected]>
Signed-off-by Jubin John <[email protected]>
--- drivers/staging/rdma/hfi1/driver.c | 13 +++++++++++-- drivers/staging/rdma/hfi1/mad.c | 24 +++++++++++++++++++----- 2 files changed, 30 insertions(+), 7 deletions(-)
drivers/staging/rdma/hfi1/driver.c +11 -2
@@ -1169,6 +1169,12 @@ void shutdown_led_override(struct hfi1_pportdata *ppd) {struct hfi1_devdata *dd = ppd->dd; +/* +* This pairs with the memory barrier implied by the atomic_dec in +* hfi1_set_led_override to ensure that we read the correct state of +* LED beaconing represented by led_override_timer_active +*/ +smp_mb ();if (atomic_read (&ppd->led_override_timer_active)) {del_timer_sync (&ppd->led_override_timer);atomic_set (&ppd->led_override_timer_active,0 );
@@ -1199,11 +1205,14 @@ static void run_led_override(unsigned long opaque)* don't re-fire the timer if user asked for it to be off; we let * it fire one more time after they turn it off to simplify */ -if (ppd->led_override_vals[0 ] || ppd->led_override_vals[1 ]) +if (ppd->led_override_vals[0 ] || ppd->led_override_vals[1 ]) {mod_timer (&ppd->led_override_timer, jiffies + timeout); -else + }else {/* Hand control of the LED to the DC for normal operation */ write_csr (dd,DCC_CFG_LED_CNTRL ,0 ); +/* Record that we did not re-fire the timer */ +atomic_dec (&ppd->led_override_timer_active); + } }/*
drivers/staging/rdma/hfi1/mad.c +19 -5
@@ -516,6 +516,7 @@ static int __subn_get_opa_portinfo(struct opa_smp *smp, u32 am, u8 *data,struct opa_port_info *pi = (struct opa_port_info *)data;u8 mtu;u8 credit_rate; +u8 is_beaconing_active;u32 state;u32 num_ports =OPA_AM_NPORT (am);u32 start_of_sm_config =OPA_AM_START_SM_CFG (am);
@@ -581,6 +582,14 @@ static int __subn_get_opa_portinfo(struct opa_smp *smp, u32 am, u8 *data, pi->port_states.ledenable_offlinereason = ppd->neighbor_normal <<4 ; pi->port_states.ledenable_offlinereason |= ppd->is_sm_config_started <<5 ; +/* +* This pairs with the memory barrier implied by the atomic_dec in +* hfi1_set_led_override to ensure that we read the correct state of +* LED beaconing represented by led_override_timer_active +*/ +smp_mb (); + is_beaconing_active = !!atomic_read (&ppd->led_override_timer_active); + pi->port_states.ledenable_offlinereason |= is_beaconing_active <<6 ; pi->port_states.ledenable_offlinereason |= ppd->offline_disabled_reason;#else
@@ -3578,19 +3587,24 @@ static int __subn_get_opa_led_info(struct opa_smp *smp, u32 am, u8 *data, u32 *resp_len) {struct hfi1_devdata *dd =dd_from_ibdev (ibdev); +struct hfi1_pportdata *ppd = dd->pport;struct opa_led_info *p = (struct opa_led_info *)data;u32 nport =OPA_AM_NPORT (am); -u64 reg; +u32 is_beaconing_active;if (nport !=1 ) { smp->status |=IB_SMP_INVALID_FIELD ;return reply ((struct ib_mad_hdr *)smp); } - reg =read_csr (dd,DCC_CFG_LED_CNTRL ); -if ((reg &DCC_CFG_LED_CNTRL_LED_CNTRL_SMASK ) && - ((reg &DCC_CFG_LED_CNTRL_LED_SW_BLINK_RATE_SMASK ) ==0xf )) - p->rsvd_led_mask =cpu_to_be32 (OPA_LED_MASK ); +/* +* This pairs with the memory barrier implied by the atomic_dec in +* hfi1_set_led_override to ensure that we read the correct state of +* LED beaconing represented by led_override_timer_active +*/ +smp_mb (); + is_beaconing_active = !!atomic_read (&ppd->led_override_timer_active); + p->rsvd_led_mask =cpu_to_be32 (is_beaconing_active <<OPA_LED_SHIFT );if (resp_len) *resp_len +=sizeof (struct opa_led_info );
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH 6/7 staging/rdma/hfi1: Fix memory leaks
In reply to a message not in the archiveFrom: Jubin John <[email protected]>
Fix 3 memory leaks reported by the LeakCheck tool in the KEDR framework.
The following resources were allocated memory during their respective initializations but not freed during cleanup:
1. SDMA map elements
2. PIO map elements
3. HW send context to SW index map
This patch fixes the memory leaks by freeing the allocated memory in the cleanup path.
Reviewed-by Dean Luick <[email protected]>
Reviewed-by Dennis Dalessandro <[email protected]>
Reviewed-by Mike Marciniszyn <[email protected]>
Signed-off-by Jubin John <[email protected]>
--- drivers/staging/rdma/hfi1/init.c | 2 ++ drivers/staging/rdma/hfi1/pio.c | 2 +- drivers/staging/rdma/hfi1/sdma.c | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-)
drivers/staging/rdma/hfi1/init.c +2 -0
@@ -1324,6 +1324,8 @@ static void cleanup_device_data(struct hfi1_devdata *dd) dd->num_send_contexts =0 ;kfree (dd->send_contexts); dd->send_contexts =NULL ; +kfree (dd->hw_to_sw); + dd->hw_to_sw =NULL ;kfree (dd->boardname);vfree (dd->events);vfree (dd->status);
drivers/staging/rdma/hfi1/pio.c +1 -1
@@ -1881,7 +1881,7 @@ void free_pio_map(struct hfi1_devdata *dd)/* Free PIO map if allocated */ if (rcu_access_pointer (dd->pio_map)) {spin_lock_irq (&dd->pio_map_lock); -kfree (rcu_access_pointer (dd->pio_map)); +pio_map_free (rcu_access_pointer (dd->pio_map));RCU_INIT_POINTER (dd->pio_map,NULL );spin_unlock_irq (&dd->pio_map_lock);synchronize_rcu ();
drivers/staging/rdma/hfi1/sdma.c +1 -1
@@ -966,7 +966,7 @@ static void sdma_clean(struct hfi1_devdata *dd, size_t num_engines) sde->tx_ring =NULL ; }spin_lock_irq (&dd->sde_map_lock); -kfree (rcu_access_pointer (dd->sdma_map)); +sdma_map_free (rcu_access_pointer (dd->sdma_map));RCU_INIT_POINTER (dd->sdma_map,NULL );spin_unlock_irq (&dd->sde_map_lock);synchronize_rcu ();
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH 7/7 IB/hfi1: Move hfi1 driver out of staging
In reply to a message not in the archiveThe TODO list for hfi1 has been completed and the code is as checkpatch clean as it can reasonably be. There are a few warnings left but those are being left intentionally as it would render the code less readable to change.
Reviewed-by Jubin John <[email protected]>
Signed-off-by Dennis Dalessandro <[email protected]>
---
MAINTAINERS | 13 +++++++------
drivers/infiniband/Kconfig | 2 ++
drivers/infiniband/hw/Makefile | 1 +
drivers/infiniband/hw/hfi1/Kconfig | 0
drivers/infiniband/hw/hfi1/Makefile | 0
drivers/infiniband/hw/hfi1/affinity.c | 0
drivers/infiniband/hw/hfi1/affinity.h | 0
drivers/infiniband/hw/hfi1/aspm.h | 0
drivers/infiniband/hw/hfi1/chip.c | 0
drivers/infiniband/hw/hfi1/chip.h | 0
drivers/infiniband/hw/hfi1/chip_registers.h | 0
drivers/infiniband/hw/hfi1/common.h | 0
drivers/infiniband/hw/hfi1/debugfs.c | 0
drivers/infiniband/hw/hfi1/debugfs.h | 0
drivers/infiniband/hw/hfi1/device.c | 0
drivers/infiniband/hw/hfi1/device.h | 0
drivers/infiniband/hw/hfi1/diag.c | 0
drivers/infiniband/hw/hfi1/dma.c | 0
drivers/infiniband/hw/hfi1/driver.c | 0
drivers/infiniband/hw/hfi1/efivar.c | 0
drivers/infiniband/hw/hfi1/efivar.h | 0
drivers/infiniband/hw/hfi1/eprom.c | 0
drivers/infiniband/hw/hfi1/eprom.h | 0
drivers/infiniband/hw/hfi1/file_ops.c | 0
drivers/infiniband/hw/hfi1/firmware.c | 0
drivers/infiniband/hw/hfi1/hfi.h | 0
drivers/infiniband/hw/hfi1/init.c | 0
drivers/infiniband/hw/hfi1/intr.c | 0
drivers/infiniband/hw/hfi1/iowait.h | 0
drivers/infiniband/hw/hfi1/mad.c | 0
drivers/infiniband/hw/hfi1/mad.h | 0
drivers/infiniband/hw/hfi1/opa_compat.h | 0
drivers/infiniband/hw/hfi1/pcie.c | 0
drivers/infiniband/hw/hfi1/pio.c | 0
drivers/infiniband/hw/hfi1/pio.h | 0
drivers/infiniband/hw/hfi1/pio_copy.c | 0
drivers/infiniband/hw/hfi1/platform.c | 0
drivers/infiniband/hw/hfi1/platform.h | 0
drivers/infiniband/hw/hfi1/qp.c | 0
drivers/infiniband/hw/hfi1/qp.h | 0
drivers/infiniband/hw/hfi1/qsfp.c | 0
drivers/infiniband/hw/hfi1/qsfp.h | 0
drivers/infiniband/hw/hfi1/rc.c | 0
drivers/infiniband/hw/hfi1/ruc.c | 0
drivers/infiniband/hw/hfi1/sdma.c | 0
drivers/infiniband/hw/hfi1/sdma.h | 0
drivers/infiniband/hw/hfi1/sdma_txreq.h | 0
drivers/infiniband/hw/hfi1/sysfs.c | 0
drivers/infiniband/hw/hfi1/trace.c | 0
drivers/infiniband/hw/hfi1/trace.h | 0
drivers/infiniband/hw/hfi1/twsi.c | 0
drivers/infiniband/hw/hfi1/twsi.h | 0
drivers/infiniband/hw/hfi1/uc.c | 0
drivers/infiniband/hw/hfi1/ud.c | 0
drivers/infiniband/hw/hfi1/user_exp_rcv.c | 0
drivers/infiniband/hw/hfi1/user_exp_rcv.h | 0
drivers/infiniband/hw/hfi1/user_pages.c | 0
drivers/infiniband/hw/hfi1/user_sdma.c | 0
drivers/infiniband/hw/hfi1/user_sdma.h | 0
drivers/infiniband/hw/hfi1/verbs.c | 0
drivers/infiniband/hw/hfi1/verbs.h | 0
drivers/infiniband/hw/hfi1/verbs_txreq.c | 0
drivers/infiniband/hw/hfi1/verbs_txreq.h | 0
drivers/staging/rdma/Kconfig | 2 --
drivers/staging/rdma/Makefile | 1 -
drivers/staging/rdma/hfi1/TODO | 6 ------
66 files changed, 10 insertions(+), 15 deletions(-)
rename drivers/{staging/rdma/hfi1/Kconfig => infiniband/hw/hfi1/Kconfig} (100%)
rename drivers/{staging/rdma/hfi1/Makefile => infiniband/hw/hfi1/Makefile} (100%)
rename drivers/{staging/rdma/hfi1/affinity.c => infiniband/hw/hfi1/affinity.c} (100%)
rename drivers/{staging/rdma/hfi1/affinity.h => infiniband/hw/hfi1/affinity.h} (100%)
rename drivers/{staging/rdma/hfi1/aspm.h => infiniband/hw/hfi1/aspm.h} (100%)
rename drivers/{staging/rdma/hfi1/chip.c => infiniband/hw/hfi1/chip.c} (100%)
rename drivers/{staging/rdma/hfi1/chip.h => infiniband/hw/hfi1/chip.h} (100%)
rename drivers/{staging/rdma/hfi1/chip_registers.h => infiniband/hw/hfi1/chip_registers.h} (100%)
rename drivers/{staging/rdma/hfi1/common.h => infiniband/hw/hfi1/common.h} (100%)
rename drivers/{staging/rdma/hfi1/debugfs.c => infiniband/hw/hfi1/debugfs.c} (100%)
rename drivers/{staging/rdma/hfi1/debugfs.h => infiniband/hw/hfi1/debugfs.h} (100%)
rename drivers/{staging/rdma/hfi1/device.c => infiniband/hw/hfi1/device.c} (100%)
rename drivers/{staging/rdma/hfi1/device.h => infiniband/hw/hfi1/device.h} (100%)
rename drivers/{staging/rdma/hfi1/diag.c => infiniband/hw/hfi1/diag.c} (100%)
rename drivers/{staging/rdma/hfi1/dma.c => infiniband/hw/hfi1/dma.c} (100%)
rename drivers/{staging/rdma/hfi1/driver.c => infiniband/hw/hfi1/driver.c} (100%)
rename drivers/{staging/rdma/hfi1/efivar.c => infiniband/hw/hfi1/efivar.c} (100%)
rename drivers/{staging/rdma/hfi1/efivar.h => infiniband/hw/hfi1/efivar.h} (100%)
rename drivers/{staging/rdma/hfi1/eprom.c => infiniband/hw/hfi1/eprom.c} (100%)
rename drivers/{staging/rdma/hfi1/eprom.h => infiniband/hw/hfi1/eprom.h} (100%)
rename drivers/{staging/rdma/hfi1/file_ops.c => infiniband/hw/hfi1/file_ops.c} (100%)
rename drivers/{staging/rdma/hfi1/firmware.c => infiniband/hw/hfi1/firmware.c} (100%)
rename drivers/{staging/rdma/hfi1/hfi.h => infiniband/hw/hfi1/hfi.h} (100%)
rename drivers/{staging/rdma/hfi1/init.c => infiniband/hw/hfi1/init.c} (100%)
rename drivers/{staging/rdma/hfi1/intr.c => infiniband/hw/hfi1/intr.c} (100%)
rename drivers/{staging/rdma/hfi1/iowait.h => infiniband/hw/hfi1/iowait.h} (100%)
rename drivers/{staging/rdma/hfi1/mad.c => infiniband/hw/hfi1/mad.c} (100%)
rename drivers/{staging/rdma/hfi1/mad.h => infiniband/hw/hfi1/mad.h} (100%)
rename drivers/{staging/rdma/hfi1/opa_compat.h => infiniband/hw/hfi1/opa_compat.h} (100%)
rename drivers/{staging/rdma/hfi1/pcie.c => infiniband/hw/hfi1/pcie.c} (100%)
rename drivers/{staging/rdma/hfi1/pio.c => infiniband/hw/hfi1/pio.c} (100%)
rename drivers/{staging/rdma/hfi1/pio.h => infiniband/hw/hfi1/pio.h} (100%)
rename drivers/{staging/rdma/hfi1/pio_copy.c => infiniband/hw/hfi1/pio_copy.c} (100%)
rename drivers/{staging/rdma/hfi1/platform.c => infiniband/hw/hfi1/platform.c} (100%)
rename drivers/{staging/rdma/hfi1/platform.h => infiniband/hw/hfi1/platform.h} (100%)
rename drivers/{staging/rdma/hfi1/qp.c => infiniband/hw/hfi1/qp.c} (100%)
rename drivers/{staging/rdma/hfi1/qp.h => infiniband/hw/hfi1/qp.h} (100%)
rename drivers/{staging/rdma/hfi1/qsfp.c => infiniband/hw/hfi1/qsfp.c} (100%)
rename drivers/{staging/rdma/hfi1/qsfp.h => infiniband/hw/hfi1/qsfp.h} (100%)
rename drivers/{staging/rdma/hfi1/rc.c => infiniband/hw/hfi1/rc.c} (100%)
rename drivers/{staging/rdma/hfi1/ruc.c => infiniband/hw/hfi1/ruc.c} (100%)
rename drivers/{staging/rdma/hfi1/sdma.c => infiniband/hw/hfi1/sdma.c} (100%)
rename drivers/{staging/rdma/hfi1/sdma.h => infiniband/hw/hfi1/sdma.h} (100%)
rename drivers/{staging/rdma/hfi1/sdma_txreq.h => infiniband/hw/hfi1/sdma_txreq.h} (100%)
rename drivers/{staging/rdma/hfi1/sysfs.c => infiniband/hw/hfi1/sysfs.c} (100%)
rename drivers/{staging/rdma/hfi1/trace.c => infiniband/hw/hfi1/trace.c} (100%)
rename drivers/{staging/rdma/hfi1/trace.h => infiniband/hw/hfi1/trace.h} (100%)
rename drivers/{staging/rdma/hfi1/twsi.c => infiniband/hw/hfi1/twsi.c} (100%)
rename drivers/{staging/rdma/hfi1/twsi.h => infiniband/hw/hfi1/twsi.h} (100%)
rename drivers/{staging/rdma/hfi1/uc.c => infiniband/hw/hfi1/uc.c} (100%)
rename drivers/{staging/rdma/hfi1/ud.c => infiniband/hw/hfi1/ud.c} (100%)
rename drivers/{staging/rdma/hfi1/user_exp_rcv.c => infiniband/hw/hfi1/user_exp_rcv.c} (100%)
rename drivers/{staging/rdma/hfi1/user_exp_rcv.h => infiniband/hw/hfi1/user_exp_rcv.h} (100%)
rename drivers/{staging/rdma/hfi1/user_pages.c => infiniband/hw/hfi1/user_pages.c} (100%)
rename drivers/{staging/rdma/hfi1/user_sdma.c => infiniband/hw/hfi1/user_sdma.c} (100%)
rename drivers/{staging/rdma/hfi1/user_sdma.h => infiniband/hw/hfi1/user_sdma.h} (100%)
rename drivers/{staging/rdma/hfi1/verbs.c => infiniband/hw/hfi1/verbs.c} (100%)
rename drivers/{staging/rdma/hfi1/verbs.h => infiniband/hw/hfi1/verbs.h} (100%)
rename drivers/{staging/rdma/hfi1/verbs_txreq.c => infiniband/hw/hfi1/verbs_txreq.c} (100%)
rename drivers/{staging/rdma/hfi1/verbs_txreq.h => infiniband/hw/hfi1/verbs_txreq.h} (100%)
delete mode 100644 drivers/staging/rdma/hfi1/TODOMAINTAINERS +7 -6
@@ -5014,6 +5014,13 @@ F: drivers/block/cciss* F: include/linux/cciss_ioctl.h F: include/uapi/linux/cciss_ioctl.h +HFI1 DRIVER +M: Mike Marciniszyn <[email protected]> +M: Dennis Dalessandro <[email protected]> +L: [email protected] +S: Supported +F: drivers/infiniband/hw/hfi1 + HFS FILESYSTEM L: [email protected] S: Orphan
@@ -10465,12 +10472,6 @@ M: Arnaud Patard <[email protected]> S: Odd Fixes F: drivers/staging/xgifb/ -HFI1 DRIVER -M: Mike Marciniszyn <[email protected]> -L: [email protected] -S: Supported -F: drivers/staging/rdma/hfi1 - STARFIRE/DURALAN NETWORK DRIVER M: Ion Badulescu <ionut-Rv4seVrz/[email protected]> S: Odd Fixes
drivers/infiniband/Kconfig +2 -0
@@ -84,4 +84,6 @@ source "drivers/infiniband/ulp/isert/Kconfig" source "drivers/infiniband/sw/rdmavt/Kconfig" +source "drivers/infiniband/hw/hfi1/Kconfig" + endif # INFINIBAND
drivers/infiniband/hw/Makefile +1 -0
@@ -7,3 +7,4 @@ obj-$(CONFIG_MLX5_INFINIBAND) += mlx5/ obj-$(CONFIG_INFINIBAND_NES) += nes/ obj-$(CONFIG_INFINIBAND_OCRDMA) += ocrdma/ obj-$(CONFIG_INFINIBAND_USNIC) += usnic/ +obj-$(CONFIG_INFINIBAND_HFI1) += hfi1/
drivers/infiniband/hw/hfi1/Kconfig renamed from drivers/staging/rdma/hfi1/Kconfig +0 -0
drivers/infiniband/hw/hfi1/Makefile renamed from drivers/staging/rdma/hfi1/Makefile +0 -0
drivers/infiniband/hw/hfi1/affinity.c renamed from drivers/staging/rdma/hfi1/affinity.c +0 -0
drivers/infiniband/hw/hfi1/affinity.h renamed from drivers/staging/rdma/hfi1/affinity.h +0 -0
drivers/infiniband/hw/hfi1/aspm.h renamed from drivers/staging/rdma/hfi1/aspm.h +0 -0
drivers/infiniband/hw/hfi1/chip.c renamed from drivers/staging/rdma/hfi1/chip.c +0 -0
drivers/infiniband/hw/hfi1/chip.h renamed from drivers/staging/rdma/hfi1/chip.h +0 -0
drivers/infiniband/hw/hfi1/chip_registers.h renamed from drivers/staging/rdma/hfi1/chip_registers.h +0 -0
drivers/infiniband/hw/hfi1/common.h renamed from drivers/staging/rdma/hfi1/common.h +0 -0
drivers/infiniband/hw/hfi1/debugfs.c renamed from drivers/staging/rdma/hfi1/debugfs.c +0 -0
drivers/infiniband/hw/hfi1/debugfs.h renamed from drivers/staging/rdma/hfi1/debugfs.h +0 -0
drivers/infiniband/hw/hfi1/device.c renamed from drivers/staging/rdma/hfi1/device.c +0 -0
drivers/infiniband/hw/hfi1/device.h renamed from drivers/staging/rdma/hfi1/device.h +0 -0
drivers/infiniband/hw/hfi1/diag.c renamed from drivers/staging/rdma/hfi1/diag.c +0 -0
drivers/infiniband/hw/hfi1/dma.c renamed from drivers/staging/rdma/hfi1/dma.c +0 -0
drivers/infiniband/hw/hfi1/driver.c renamed from drivers/staging/rdma/hfi1/driver.c +0 -0
drivers/infiniband/hw/hfi1/efivar.c renamed from drivers/staging/rdma/hfi1/efivar.c +0 -0
drivers/infiniband/hw/hfi1/efivar.h renamed from drivers/staging/rdma/hfi1/efivar.h +0 -0
drivers/infiniband/hw/hfi1/eprom.c renamed from drivers/staging/rdma/hfi1/eprom.c +0 -0
drivers/infiniband/hw/hfi1/eprom.h renamed from drivers/staging/rdma/hfi1/eprom.h +0 -0
drivers/infiniband/hw/hfi1/file_ops.c renamed from drivers/staging/rdma/hfi1/file_ops.c +0 -0
drivers/infiniband/hw/hfi1/firmware.c renamed from drivers/staging/rdma/hfi1/firmware.c +0 -0
drivers/infiniband/hw/hfi1/hfi.h renamed from drivers/staging/rdma/hfi1/hfi.h +0 -0
drivers/infiniband/hw/hfi1/init.c renamed from drivers/staging/rdma/hfi1/init.c +0 -0
drivers/infiniband/hw/hfi1/intr.c renamed from drivers/staging/rdma/hfi1/intr.c +0 -0
drivers/infiniband/hw/hfi1/iowait.h renamed from drivers/staging/rdma/hfi1/iowait.h +0 -0
drivers/infiniband/hw/hfi1/mad.c renamed from drivers/staging/rdma/hfi1/mad.c +0 -0
drivers/infiniband/hw/hfi1/mad.h renamed from drivers/staging/rdma/hfi1/mad.h +0 -0
drivers/infiniband/hw/hfi1/opa_compat.h renamed from drivers/staging/rdma/hfi1/opa_compat.h +0 -0
drivers/infiniband/hw/hfi1/pcie.c renamed from drivers/staging/rdma/hfi1/pcie.c +0 -0
drivers/infiniband/hw/hfi1/pio.c renamed from drivers/staging/rdma/hfi1/pio.c +0 -0
drivers/infiniband/hw/hfi1/pio.h renamed from drivers/staging/rdma/hfi1/pio.h +0 -0
drivers/infiniband/hw/hfi1/pio_copy.c renamed from drivers/staging/rdma/hfi1/pio_copy.c +0 -0
drivers/infiniband/hw/hfi1/platform.c renamed from drivers/staging/rdma/hfi1/platform.c +0 -0
drivers/infiniband/hw/hfi1/platform.h renamed from drivers/staging/rdma/hfi1/platform.h +0 -0
drivers/infiniband/hw/hfi1/qp.c renamed from drivers/staging/rdma/hfi1/qp.c +0 -0
drivers/infiniband/hw/hfi1/qp.h renamed from drivers/staging/rdma/hfi1/qp.h +0 -0
drivers/infiniband/hw/hfi1/qsfp.c renamed from drivers/staging/rdma/hfi1/qsfp.c +0 -0
drivers/infiniband/hw/hfi1/qsfp.h renamed from drivers/staging/rdma/hfi1/qsfp.h +0 -0
drivers/infiniband/hw/hfi1/rc.c renamed from drivers/staging/rdma/hfi1/rc.c +0 -0
drivers/infiniband/hw/hfi1/ruc.c renamed from drivers/staging/rdma/hfi1/ruc.c +0 -0
drivers/infiniband/hw/hfi1/sdma.c renamed from drivers/staging/rdma/hfi1/sdma.c +0 -0
drivers/infiniband/hw/hfi1/sdma.h renamed from drivers/staging/rdma/hfi1/sdma.h +0 -0
drivers/infiniband/hw/hfi1/sdma_txreq.h renamed from drivers/staging/rdma/hfi1/sdma_txreq.h +0 -0
drivers/infiniband/hw/hfi1/sysfs.c renamed from drivers/staging/rdma/hfi1/sysfs.c +0 -0
drivers/infiniband/hw/hfi1/trace.c renamed from drivers/staging/rdma/hfi1/trace.c +0 -0
drivers/infiniband/hw/hfi1/trace.h renamed from drivers/staging/rdma/hfi1/trace.h +0 -0
drivers/infiniband/hw/hfi1/twsi.c renamed from drivers/staging/rdma/hfi1/twsi.c +0 -0
drivers/infiniband/hw/hfi1/twsi.h renamed from drivers/staging/rdma/hfi1/twsi.h +0 -0
drivers/infiniband/hw/hfi1/uc.c renamed from drivers/staging/rdma/hfi1/uc.c +0 -0
drivers/infiniband/hw/hfi1/ud.c renamed from drivers/staging/rdma/hfi1/ud.c +0 -0
drivers/infiniband/hw/hfi1/user_exp_rcv.c renamed from drivers/staging/rdma/hfi1/user_exp_rcv.c +0 -0
drivers/infiniband/hw/hfi1/user_exp_rcv.h renamed from drivers/staging/rdma/hfi1/user_exp_rcv.h +0 -0
drivers/infiniband/hw/hfi1/user_pages.c renamed from drivers/staging/rdma/hfi1/user_pages.c +0 -0
drivers/infiniband/hw/hfi1/user_sdma.c renamed from drivers/staging/rdma/hfi1/user_sdma.c +0 -0
drivers/infiniband/hw/hfi1/user_sdma.h renamed from drivers/staging/rdma/hfi1/user_sdma.h +0 -0
drivers/infiniband/hw/hfi1/verbs.c renamed from drivers/staging/rdma/hfi1/verbs.c +0 -0
drivers/infiniband/hw/hfi1/verbs.h renamed from drivers/staging/rdma/hfi1/verbs.h +0 -0
drivers/infiniband/hw/hfi1/verbs_txreq.c renamed from drivers/staging/rdma/hfi1/verbs_txreq.c +0 -0
drivers/infiniband/hw/hfi1/verbs_txreq.h renamed from drivers/staging/rdma/hfi1/verbs_txreq.h +0 -0
drivers/staging/rdma/Kconfig +0 -2
@@ -22,6 +22,4 @@ menuconfig STAGING_RDMA # Please keep entries in alphabetic order if STAGING_RDMA -source "drivers/staging/rdma/hfi1/Kconfig" - endif
drivers/staging/rdma/Makefile +0 -1
@@ -1,2 +1 @@ # Entries for RDMA_STAGING tree -obj-$(CONFIG_INFINIBAND_HFI1) += hfi1/
drivers/staging/rdma/hfi1/TODO deleted +0 -6
@@ -1,6 +0,0 @@ -July, 2015 - -- Remove unneeded file entries in sysfs -- Remove software processing of IB protocol and place in library for use - by qib, ipath (if still present), hfi1, and eventually soft-roce -
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 3 lines · Dennis Dalessandro
We believe the TODO list has been satisfied for the hfi1 driver. The main item was removing the code duplication between hfi1 and qib. That has been handled by the introduction of rdmavt in previously posted patch series.
How many lines were actually merged? It still looks like there is lots of duplication.
Jason
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
A message that is not in the archive (sent off-list or not yet received): 20160226222104.GA8736-ePGOBjL8dl3ta4EC/59zMFaTQe2KTcn/@public.gmane.org
Quoted 7 lines · Jason Gunthorpe
Quoted 3 lines · Dennis Dalessandro
We believe the TODO list has been satisfied for the hfi1 driver. The main item was removing the code duplication between hfi1 and qib. That has been handled by the introduction of rdmavt in previously posted patch series.
How many lines were actually merged? It still looks like there is lots of duplication.
Jason,
Fair question. It's difficult to say how many lines were merged. Not sure that is the best metric to use. I suppose one could 'wc -l' the files. However the key take away here is that the high level verbs functionality and data structures have been moved to rdmavt, things like the qp, ah, cq, etc. Some things, for instance the MAD processing, were not moved because it
is very different between hfi1 and qib.
The code which is left that is similar between the qib and hfi1 drivers has subtle differences which are very important to performance. This mainly consists of the code to put the packets on the wire. We are investigating how best, if at all, to incorporate that into rdmavt. We have to be very careful here, not only for the performance impact, but adding this into rdmavt makes it very Intel centric rather than the generic verbs library it wants to be.
Our hope is to go with the nearly 300 patches pending for rdmavt and hfi1 for 4.6 and incrementally work on adding other things in subsequent releases. There is a lot of code, a lot of things are changing and it's probably best to let things settle out for 4.6.
The code is cleaned up from a style point of view, the checkpatch issues etc are dealt with. We have moved the verbs functionality to rdmavt. We feel it's appropriate to move out of staging at this point.
-Denny
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html