ice: check if SF is ready in ethtool ops

Now there is another type of port representor. Correct checking if
parent device is ready to reflect also new PR type.

Reviewed-by: Simon Horman <horms@kernel.org>
Reviewed-by: Wojciech Drewek <wojciech.drewek@intel.com>
Signed-off-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
Tested-by: Rafal Romanowski <rafal.romanowski@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>

diff --git a/drivers/net/ethernet/intel/ice/ice_ethtool.c b/drivers/net/ethernet/intel/ice/ice_ethtool.c
index 793a64d44aa35e83d08a36584d722e1954258ae8..d5cc934d1359491bbadd61b91984618a88764720 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_ethtool.c
+++ b/drivers/net/ethernet/intel/ice/ice_ethtool.c
@@ -4412,7 +4412,7 @@ ice_repr_get_drvinfo(struct net_device *netdev,
 {
        struct ice_repr *repr = ice_netdev_to_repr(netdev);
 
-       if (ice_check_vf_ready_for_cfg(repr->vf))
+       if (repr->ops.ready(repr))
                return;
 
        __ice_get_drvinfo(netdev, drvinfo, repr->src_vsi);
@@ -4424,8 +4424,7 @@ ice_repr_get_strings(struct net_device *netdev, u32 stringset, u8 *data)
        struct ice_repr *repr = ice_netdev_to_repr(netdev);
 
        /* for port representors only ETH_SS_STATS is supported */
-       if (ice_check_vf_ready_for_cfg(repr->vf) ||
-           stringset != ETH_SS_STATS)
+       if (repr->ops.ready(repr) || stringset != ETH_SS_STATS)
                return;
 
        __ice_get_strings(netdev, stringset, data, repr->src_vsi);
@@ -4438,7 +4437,7 @@ ice_repr_get_ethtool_stats(struct net_device *netdev,
 {
        struct ice_repr *repr = ice_netdev_to_repr(netdev);
 
-       if (ice_check_vf_ready_for_cfg(repr->vf))
+       if (repr->ops.ready(repr))
                return;
 
        __ice_get_ethtool_stats(netdev, stats, data, repr->src_vsi);

diff --git a/drivers/net/ethernet/intel/ice/ice_repr.c b/drivers/net/ethernet/intel/ice/ice_repr.c
index 5ea8b512c42129400d48a9b0ad110b8afada8c97..229831fe2cd23c84d9302d4e4316287272286ba7 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_repr.c
+++ b/drivers/net/ethernet/intel/ice/ice_repr.c
@@ -283,6 +283,16 @@ ice_repr_reg_netdev(struct net_device *netdev)
        return register_netdev(netdev);
 }
 
+static int ice_repr_ready_vf(struct ice_repr *repr)
+{
+       return !ice_check_vf_ready_for_cfg(repr->vf);
+}
+
+static int ice_repr_ready_sf(struct ice_repr *repr)
+{
+       return !repr->sf->active;
+}
+
 /**
  * ice_repr_destroy - remove representor from VF
  * @repr: pointer to representor structure
@@ -420,6 +430,7 @@ struct ice_repr *ice_repr_create_vf(struct ice_vf *vf)
        repr->vf = vf;
        repr->ops.add = ice_repr_add_vf;
        repr->ops.rem = ice_repr_rem_vf;
+       repr->ops.ready = ice_repr_ready_vf;
 
        ether_addr_copy(repr->parent_mac, vf->hw_lan_addr);
 
@@ -466,6 +477,7 @@ struct ice_repr *ice_repr_create_sf(struct ice_dynamic_port *sf)
        repr->sf = sf;
        repr->ops.add = ice_repr_add_sf;
        repr->ops.rem = ice_repr_rem_sf;
+       repr->ops.ready = ice_repr_ready_sf;
 
        ether_addr_copy(repr->parent_mac, sf->hw_addr);
 

diff --git a/drivers/net/ethernet/intel/ice/ice_repr.h b/drivers/net/ethernet/intel/ice/ice_repr.h
index ee28632e87b4baf78b54a54fd903e14faa4b01c6..35bd93165e1ea7b4237f51bda090dc8c48da4107 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_repr.h
+++ b/drivers/net/ethernet/intel/ice/ice_repr.h
@@ -36,6 +36,7 @@ struct ice_repr {
        struct {
                int (*add)(struct ice_repr *repr);
                void (*rem)(struct ice_repr *repr);
+               int (*ready)(struct ice_repr *repr);
        } ops;
 };