diff -r 2bbab0c39a06 -r fea54b084a37 sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h --- a/sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h Tue Apr 21 15:19:04 2020 -0700 +++ b/sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h Mon Apr 13 22:38:45 2020 -0700 @@ -261,6 +261,7 @@ out: struct c4iw_dev { struct ib_device ibdev; + struct pci_dev pdev; struct c4iw_rdev rdev; u32 device_cap_flags; struct idr cqidr; diff -r 2bbab0c39a06 -r fea54b084a37 sys/dev/cxgbe/iw_cxgbe/provider.c --- a/sys/dev/cxgbe/iw_cxgbe/provider.c Tue Apr 21 15:19:04 2020 -0700 +++ b/sys/dev/cxgbe/iw_cxgbe/provider.c Mon Apr 13 22:38:45 2020 -0700 @@ -434,6 +434,9 @@ c4iw_register_device(struct c4iw_dev *de CTR3(KTR_IW_CXGBE, "%s c4iw_dev %p, adapter %p", __func__, dev, sc); BUG_ON(!sc->port[0]); + ret = linux_pci_attach_device(sc->dev, NULL, NULL, &dev->pdev); + if (ret) + return (ret); strlcpy(ibdev->name, device_get_nameunit(sc->dev), sizeof(ibdev->name)); memset(&ibdev->node_guid, 0, sizeof(ibdev->node_guid)); memcpy(&ibdev->node_guid, sc->port[0]->vi[0].hw_addr, ETHER_ADDR_LEN); @@ -465,7 +468,7 @@ c4iw_register_device(struct c4iw_dev *de strlcpy(ibdev->node_desc, C4IW_NODE_DESC, sizeof(ibdev->node_desc)); ibdev->phys_port_cnt = sc->params.nports; ibdev->num_comp_vectors = 1; - ibdev->dma_device = NULL; + ibdev->dma_device = &dev->pdev.dev; ibdev->query_device = c4iw_query_device; ibdev->query_port = c4iw_query_port; ibdev->modify_port = c4iw_modify_port; @@ -517,8 +520,10 @@ c4iw_register_device(struct c4iw_dev *de ibdev->iwcm = iwcm; ret = ib_register_device(&dev->ibdev, NULL); - if (ret) + if (ret) { kfree(iwcm); + linux_pci_detach_device(sc->dev, &dev->pdev); + } return (ret); } @@ -526,11 +531,12 @@ c4iw_register_device(struct c4iw_dev *de void c4iw_unregister_device(struct c4iw_dev *dev) { + struct adapter *sc = dev->rdev.adap; - CTR3(KTR_IW_CXGBE, "%s c4iw_dev %p, adapter %p", __func__, dev, - dev->rdev.adap); + CTR3(KTR_IW_CXGBE, "%s c4iw_dev %p, adapter %p", __func__, dev, sc); ib_unregister_device(&dev->ibdev); kfree(dev->ibdev.iwcm); + linux_pci_detach_device(sc->dev, &dev->pdev); return; } #endif