ice: introduce .irq_close VF operation

The Scalable IOV implementation will require notifying the VDCM driver when
an IRQ must be closed. This allows the VDCM to handle releasing stale IRQ
context values and properly reconfigure.

To handle this, introduce a new optional .irq_close callback to the VF
operations structure. This will be implemented by Scalable IOV to handle
the shutdown of the IRQ context.

Since the SR-IOV implementation does not need this, we must check that its
non-NULL before calling it.

Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Marek Szlosek <marek.szlosek@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>

diff --git a/drivers/net/ethernet/intel/ice/ice_sriov.c b/drivers/net/ethernet/intel/ice/ice_sriov.c
index 4d8930b83b35ea2cf0f07421ddf17d21e6546fa9..356ac76ef90f02ac00067efe0dbf334c4c95a05a 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_sriov.c
+++ b/drivers/net/ethernet/intel/ice/ice_sriov.c
@@ -807,6 +807,7 @@ static const struct ice_vf_ops ice_sriov_vf_ops = {
        .trigger_reset_register = ice_sriov_trigger_reset_register,
        .poll_reset_status = ice_sriov_poll_reset_status,
        .clear_reset_trigger = ice_sriov_clear_reset_trigger,
+       .irq_close = NULL,
        .create_vsi = ice_sriov_create_vsi,
        .post_vsi_rebuild = ice_sriov_post_vsi_rebuild,
 };

diff --git a/drivers/net/ethernet/intel/ice/ice_vf_lib.c b/drivers/net/ethernet/intel/ice/ice_vf_lib.c
index 2ea801ebb2ac0a67d07a282d6d3ac37664f70736..d16c2ea83873aa9cbe7b8cd130102f659fd66376 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_vf_lib.c
+++ b/drivers/net/ethernet/intel/ice/ice_vf_lib.c
@@ -237,6 +237,10 @@ static void ice_vf_clear_counters(struct ice_vf *vf)
  */
 static void ice_vf_pre_vsi_rebuild(struct ice_vf *vf)
 {
+       /* Close any IRQ mapping now */
+       if (vf->vf_ops->irq_close)
+               vf->vf_ops->irq_close(vf);
+
        ice_vf_clear_counters(vf);
        vf->vf_ops->clear_reset_trigger(vf);
 }

diff --git a/drivers/net/ethernet/intel/ice/ice_vf_lib.h b/drivers/net/ethernet/intel/ice/ice_vf_lib.h
index 5bb75edb6cefa25869dad9402acb1c1ef86e8f6b..b4e6480f30a73e80ac1a8461bdcdb611b2ff4513 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_vf_lib.h
+++ b/drivers/net/ethernet/intel/ice/ice_vf_lib.h
@@ -61,6 +61,7 @@ struct ice_vf_ops {
        void (*trigger_reset_register)(struct ice_vf *vf, bool is_vflr);
        bool (*poll_reset_status)(struct ice_vf *vf);
        void (*clear_reset_trigger)(struct ice_vf *vf);
+       void (*irq_close)(struct ice_vf *vf);
        int (*create_vsi)(struct ice_vf *vf);
        void (*post_vsi_rebuild)(struct ice_vf *vf);
 };