ifcvf: implement config interrupt in IFCVF

This commit implements config interrupt support
in IFC VF

Signed-off-by: Zhu Lingshan <lingshan.zhu@intel.com>
Acked-by: Jason Wang <jasowang@redhat.com>
Link: https://lore.kernel.org/r/1591352835-22441-6-git-send-email-lingshan.zhu@intel.com
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

diff --git a/drivers/vdpa/ifcvf/ifcvf_base.c b/drivers/vdpa/ifcvf/ifcvf_base.c
index e24371d644b5062c41357bf14eef66ffa76977be..94bf0328b68d6c96fea45152ae7e02cfe9c0c77c 100644 (file)
--- a/drivers/vdpa/ifcvf/ifcvf_base.c
+++ b/drivers/vdpa/ifcvf/ifcvf_base.c
@@ -185,6 +185,9 @@ void ifcvf_set_status(struct ifcvf_hw *hw, u8 status)
 
 void ifcvf_reset(struct ifcvf_hw *hw)
 {
+       hw->config_cb.callback = NULL;
+       hw->config_cb.private = NULL;
+
        ifcvf_set_status(hw, 0);
        /* flush set_status, make sure VF is stopped, reset */
        ifcvf_get_status(hw);

diff --git a/drivers/vdpa/ifcvf/ifcvf_base.h b/drivers/vdpa/ifcvf/ifcvf_base.h
index e80307092351c6fe6bf367ac766a96f588a598fa..f4554412e607fb0d5200363269c0690efae04531 100644 (file)
--- a/drivers/vdpa/ifcvf/ifcvf_base.h
+++ b/drivers/vdpa/ifcvf/ifcvf_base.h
@@ -27,6 +27,7 @@
                ((1ULL << VIRTIO_NET_F_MAC)                     | \
                 (1ULL << VIRTIO_F_ANY_LAYOUT)                  | \
                 (1ULL << VIRTIO_F_VERSION_1)                   | \
+                (1ULL << VIRTIO_NET_F_STATUS)                  | \
                 (1ULL << VIRTIO_F_ORDER_PLATFORM)              | \
                 (1ULL << VIRTIO_F_IOMMU_PLATFORM)              | \
                 (1ULL << VIRTIO_NET_F_MRG_RXBUF))
@@ -81,6 +82,9 @@ struct ifcvf_hw {
        void __iomem *net_cfg;
        struct vring_info vring[IFCVF_MAX_QUEUE_PAIRS * 2];
        void __iomem * const *base;
+       char config_msix_name[256];
+       struct vdpa_callback config_cb;
+
 };
 
 struct ifcvf_adapter {

diff --git a/drivers/vdpa/ifcvf/ifcvf_main.c b/drivers/vdpa/ifcvf/ifcvf_main.c
index 63a6366b43554b64fa5538b04afc59a6a1090ba0..f5a60c14b979975dd616deefa6ce2a448121c482 100644 (file)
--- a/drivers/vdpa/ifcvf/ifcvf_main.c
+++ b/drivers/vdpa/ifcvf/ifcvf_main.c
@@ -18,6 +18,16 @@
 #define DRIVER_AUTHOR   "Intel Corporation"
 #define IFCVF_DRIVER_NAME       "ifcvf"
 
+static irqreturn_t ifcvf_config_changed(int irq, void *arg)
+{
+       struct ifcvf_hw *vf = arg;
+
+       if (vf->config_cb.callback)
+               return vf->config_cb.callback(vf->config_cb.private);
+
+       return IRQ_HANDLED;
+}
+
 static irqreturn_t ifcvf_intr_handler(int irq, void *arg)
 {
        struct vring_info *vring = arg;
@@ -59,6 +69,14 @@ static int ifcvf_request_irq(struct ifcvf_adapter *adapter)
                return ret;
        }
 
+       snprintf(vf->config_msix_name, 256, "ifcvf[%s]-config\n",
+                pci_name(pdev));
+       vector = 0;
+       irq = pci_irq_vector(pdev, vector);
+       ret = devm_request_irq(&pdev->dev, irq,
+                              ifcvf_config_changed, 0,
+                              vf->config_msix_name, vf);
+
        for (i = 0; i < IFCVF_MAX_QUEUE_PAIRS * 2; i++) {
                snprintf(vf->vring[i].msix_name, 256, "ifcvf[%s]-%d\n",
                         pci_name(pdev), i);
@@ -328,7 +346,10 @@ static void ifcvf_vdpa_set_config(struct vdpa_device *vdpa_dev,
 static void ifcvf_vdpa_set_config_cb(struct vdpa_device *vdpa_dev,
                                     struct vdpa_callback *cb)
 {
-       /* We don't support config interrupt */
+       struct ifcvf_hw *vf = vdpa_to_vf(vdpa_dev);
+
+       vf->config_cb.callback = cb->callback;
+       vf->config_cb.private = cb->private;
 }
 
 /*