The purpose of this patch series is to get the hfi1 driver out of staging and into the drivers/infiniband mainline. We have made significant changes beyond what was originally requested in the TODO list. The biggest areas of contention have simply been removed: snoop/capture, eprom, ui and the write()/writev() problem has been solved. We will be working with the community to get back the removed functionality, particularly the snoop/capture. This patch series combines the previously posted series which converts write() to ioctl() [1] and the previously posted series to remove cdevs [2]. These have been merged into a single series to have a more logical order and aid in review. For instance there is no change to convert eprom to ioctl then remove it. It is just removed. Other changes in this series which were not included in [1] and [2] include: * Dropped sysfs version file * Added a new ioctl to get the sw version * Remove ioctl access OK helper function and rely on get_user and friends * Adds kref object accounting for opening/closing the cdev to prevent parent structure from being removed. This patch series should apply on Doug's k.o/for-4.7 branch. Patches can also be viewed in my repo at: https://github.com/ddalessa/kernel/tree/for-4.7 For history on the two patch sets please see: [1] http://marc.info/?l=linux-rdma&m=146307351401595&w=2 [2] http://marc.info/?l=linux-rdma&m=146307407201814&w=2 --- Dennis Dalessandro (10): IB/hfi1: Remove multiple device cdev IB/hfi1: Remove UI char device IB/hfi1: Remove EPROM functionality from data device IB/hfi1: Remove snoop/diag interface IB/hfi1: Remove unused user command IB/hfi1: Add ioctl() interface for user commands IB/hfi1: Remove write(), use ioctl() for user cmds IB/hfi1: Add trace message in user IOCTL handling IB/hfi1: Do not free hfi1 cdev parent structure early IB/hfi1: Move driver out of staging MAINTAINERS | 13 drivers/infiniband/Kconfig | 2 drivers/infiniband/hw/Makefile | 1 drivers/infiniband/hw/hfi1/Kconfig | 0 drivers/infiniband/hw/hfi1/Makefile | 2 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 | 5 drivers/infiniband/hw/hfi1/debugfs.c | 0 drivers/infiniband/hw/hfi1/debugfs.h | 0 drivers/infiniband/hw/hfi1/device.c | 4 drivers/infiniband/hw/hfi1/device.h | 3 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 | 84 + drivers/infiniband/hw/hfi1/eprom.h | 0 drivers/infiniband/hw/hfi1/file_ops.c | 549 ++------ drivers/infiniband/hw/hfi1/firmware.c | 0 drivers/infiniband/hw/hfi1/hfi.h | 1 drivers/infiniband/hw/hfi1/init.c | 14 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/mmu_rb.c | 0 drivers/infiniband/hw/hfi1/mmu_rb.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 | 1 drivers/infiniband/hw/hfi1/trace.h | 1 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 drivers/staging/rdma/hfi1/diag.c | 1925 --------------------------- drivers/staging/rdma/hfi1/eprom.c | 471 ------- include/uapi/rdma/hfi/hfi1_user.h | 75 + 70 files changed, 267 insertions(+), 2893 deletions(-) rename drivers/{staging/rdma/hfi1/Kconfig => infiniband/hw/hfi1/Kconfig} (100%) rename drivers/{staging/rdma/hfi1/Makefile => infiniband/hw/hfi1/Makefile} (88%) 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} (98%) 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} (98%) rename drivers/{staging/rdma/hfi1/device.h => infiniband/hw/hfi1/device.h} (97%) 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%) copy drivers/{staging/rdma/hfi1/user_sdma.h => infiniband/hw/hfi1/eprom.c} (61%) 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} (78%) 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} (99%) 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} (100%) rename drivers/{staging/rdma/hfi1/mad.h => infiniband/hw/hfi1/mad.h} (100%) rename drivers/{staging/rdma/hfi1/mmu_rb.c => infiniband/hw/hfi1/mmu_rb.c} (100%) rename drivers/{staging/rdma/hfi1/mmu_rb.h => infiniband/hw/hfi1/mmu_rb.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} (99%) rename drivers/{staging/rdma/hfi1/trace.h => infiniband/hw/hfi1/trace.h} (99%) 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/TODO delete mode 100644 drivers/staging/rdma/hfi1/diag.c delete mode 100644 drivers/staging/rdma/hfi1/eprom.c -- -Denny -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
